diff --git a/config.properties b/config.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/src/hos_cosgi_core/CMakeLists.txt b/src/hos_cosgi_core/CMakeLists.txt index ad112a06..d1d44ee6 100644 --- a/src/hos_cosgi_core/CMakeLists.txt +++ b/src/hos_cosgi_core/CMakeLists.txt @@ -8,7 +8,7 @@ find_package(catkin REQUIRED COMPONENTS hos_celix roscpp hos_cpp_utils - hos_libvariant + hos_deps ) ## System dependencies are found with CMake's conventions diff --git a/src/hos_cosgi_core/package.xml b/src/hos_cosgi_core/package.xml index 216f662a..7a8d8715 100644 --- a/src/hos_cosgi_core/package.xml +++ b/src/hos_cosgi_core/package.xml @@ -43,11 +43,11 @@ hos_celix roscpp hos_cpp_utils - hos_libvariant + hos_deps hos_celix roscpp hos_cpp_utils - hos_libvariant + hos_deps diff --git a/src/hos_cosgi_devicerepository/CMakeLists.txt b/src/hos_cosgi_devicerepository/CMakeLists.txt index 8129a6ae..9a8c42b7 100644 --- a/src/hos_cosgi_devicerepository/CMakeLists.txt +++ b/src/hos_cosgi_devicerepository/CMakeLists.txt @@ -8,7 +8,7 @@ find_package(catkin REQUIRED COMPONENTS hos_celix hos_core_msgs hos_cosgi_core - hos_libvariant + hos_deps hos_cpp_utils roscpp ) @@ -25,6 +25,7 @@ find_package(catkin REQUIRED COMPONENTS find_package(APR REQUIRED) find_package(CELIX REQUIRED) find_package(Boost REQUIRED) +find_package(libvariant REQUIRED) ################################################ @@ -90,7 +91,7 @@ find_package(Boost REQUIRED) catkin_package( INCLUDE_DIRS include/${PROJECT_NAME}/ # LIBRARIES hos_cosgi_devicerepository - CATKIN_DEPENDS hos_celix hos_core_msgs hos_cosgi_core roscpp hos_libvariant hos_cpp_utils + CATKIN_DEPENDS hos_celix hos_core_msgs hos_cosgi_core roscpp hos_deps hos_cpp_utils # DEPENDS system_lib ) @@ -110,7 +111,7 @@ include_directories( ${APR_INCLUDE_DIR} ${APR_INCLUDE_DIR}/apr-1.0 include/${PROJECT_NAME}/ - ${hos_libvariant_INCLUDE_DIRS}/hos_libvariant + ${libvariant_INCLUDE_DIR} ) set(BUNDLE_SYMBOLICNAME "hos.hos_devicerepository") @@ -125,6 +126,7 @@ bundle(hos_cosgi_devicerepository target_link_libraries(hos_cosgi_devicerepository ${catkin_LIBRARIES} ${APR_LIBRARIES} + ${libvariant_LIBRARY} ) ## Declare a cpp library diff --git a/src/hos_cosgi_devicerepository/include/hos_cosgi_devicerepository/hos/cosgi/service/devicerepository/devicerepository_service.h b/src/hos_cosgi_devicerepository/include/hos_cosgi_devicerepository/hos/cosgi/service/devicerepository/devicerepository_service.h index 83a51fea..382fb621 100644 --- a/src/hos_cosgi_devicerepository/include/hos_cosgi_devicerepository/hos/cosgi/service/devicerepository/devicerepository_service.h +++ b/src/hos_cosgi_devicerepository/include/hos_cosgi_devicerepository/hos/cosgi/service/devicerepository/devicerepository_service.h @@ -3,7 +3,6 @@ #include -#include #include #include #include diff --git a/src/hos_cosgi_devicerepository/package.xml b/src/hos_cosgi_devicerepository/package.xml index 9ab268bb..ac926b46 100644 --- a/src/hos_cosgi_devicerepository/package.xml +++ b/src/hos_cosgi_devicerepository/package.xml @@ -44,13 +44,13 @@ hos_core_msgs hos_cosgi_core roscpp - hos_libvariant + hos_deps hos_cpp_utils hos_celix hos_core_msgs hos_cosgi_core roscpp - hos_libvariant + hos_deps hos_cpp_utils diff --git a/src/hos_cosgi_devicerepository/src/bundle_activator.cpp b/src/hos_cosgi_devicerepository/src/bundle_activator.cpp index 815b2132..82c16af8 100644 --- a/src/hos_cosgi_devicerepository/src/bundle_activator.cpp +++ b/src/hos_cosgi_devicerepository/src/bundle_activator.cpp @@ -14,7 +14,6 @@ extern "C" { #include #include "hos/cosgi/service/devicerepository/devicerepository_serviceimpl.h" -#include #include #include diff --git a/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/devicerepository_serviceimpl.cpp b/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/devicerepository_serviceimpl.cpp index f645d978..acff5891 100644 --- a/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/devicerepository_serviceimpl.cpp +++ b/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/devicerepository_serviceimpl.cpp @@ -84,7 +84,7 @@ void DeviceRepositoryServiceImpl::init() { } } hosStatusSub = nodehandle->subscribe(hosStatusTopic, 1000, &DeviceRepositoryServiceImpl::hosStatusMsgCallback, this); - schemaLoader.reset(new libvariant::HosSchemaLoader()); + schemaLoader.reset(new utils::SchemaLoader()); initialized = true; ROS_INFO_STREAM("DeviceRepositoryService: Initialized and Ready."); } diff --git a/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/devicerepository_serviceimpl.h b/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/devicerepository_serviceimpl.h index 9193cc2e..8be740b7 100644 --- a/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/devicerepository_serviceimpl.h +++ b/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/devicerepository_serviceimpl.h @@ -9,7 +9,7 @@ #define SRC_HOS_COSGI_SERVICE_DEVICEREPOSITORY_DEVICEREPOSITORY_SERVICEIMPL_H_ #include -#include +#include #include #include #include @@ -113,7 +113,7 @@ private: long sequenceNumber = 0; ros::Subscriber hosStatusSub; - std::unique_ptr schemaLoader; + std::unique_ptr schemaLoader; bool initialized = false; @@ -144,7 +144,7 @@ public: /* Internal Stuff */ bool isInitialized() { return initialized; } - libvariant::HosSchemaLoader* getHosSchemaLoader() { return schemaLoader.get(); } + utils::SchemaLoader* getHosSchemaLoader() { return schemaLoader.get(); } void sendDeviceCommand(Device* device, const Variant& cmd); }; diff --git a/src/hos_cosgi_ruleengine/CMakeLists.txt b/src/hos_cosgi_ruleengine/CMakeLists.txt index f403fc78..3f6f339f 100644 --- a/src/hos_cosgi_ruleengine/CMakeLists.txt +++ b/src/hos_cosgi_ruleengine/CMakeLists.txt @@ -10,7 +10,7 @@ find_package(catkin REQUIRED COMPONENTS hos_cosgi_core hos_cosgi_scripting hos_cpp_utils - hos_libvariant + hos_deps roscpp hos_cpp_cron ) @@ -27,6 +27,7 @@ find_package(catkin REQUIRED COMPONENTS find_package(APR REQUIRED) find_package(CELIX REQUIRED) find_package(Boost REQUIRED) +find_package(libvariant REQUIRED) ################################################ ## Declare ROS messages, services and actions ## @@ -90,7 +91,7 @@ find_package(Boost REQUIRED) catkin_package( INCLUDE_DIRS include/${PROJECT_NAME}/ # LIBRARIES hos_cosgi_ruleengine - CATKIN_DEPENDS hos_celix hos_cosgi_devicerepository hos_cosgi_core hos_cpp_utils hos_libvariant roscpp hos_cpp_cron hos_cosgi_scripting + CATKIN_DEPENDS hos_celix hos_cosgi_devicerepository hos_cosgi_core hos_cpp_utils hos_deps roscpp hos_cpp_cron hos_cosgi_scripting # DEPENDS system_lib ) @@ -110,7 +111,7 @@ include_directories( ${APR_INCLUDE_DIR} ${APR_INCLUDE_DIR}/apr-1.0 include/${PROJECT_NAME}/ - ${hos_libvariant_INCLUDE_DIRS}/hos_libvariant + ${libvariant_INCLUDE_DIR} ) set(BUNDLE_SYMBOLICNAME "hos.hos_ruleengine") @@ -128,6 +129,7 @@ bundle(hos_cosgi_ruleengine target_link_libraries(hos_cosgi_ruleengine ${catkin_LIBRARIES} ${APR_LIBRARIES} + ${libvariant_LIBRARY} ) ## Declare a cpp library diff --git a/src/hos_cosgi_ruleengine/include/hos_cosgi_ruleengine/hos/cosgi/service/ruleengine/rule/Rule.h b/src/hos_cosgi_ruleengine/include/hos_cosgi_ruleengine/hos/cosgi/service/ruleengine/rule/Rule.h index 2d1dd39b..1fbc9073 100644 --- a/src/hos_cosgi_ruleengine/include/hos_cosgi_ruleengine/hos/cosgi/service/ruleengine/rule/Rule.h +++ b/src/hos_cosgi_ruleengine/include/hos_cosgi_ruleengine/hos/cosgi/service/ruleengine/rule/Rule.h @@ -37,8 +37,8 @@ class Script; } } } -namespace libvariant { -class HosSchemaLoader; +namespace utils { +class SchemaLoader; } } @@ -79,7 +79,7 @@ public: std::shared_ptr createRuleCondition(Variant raw); - libvariant::HosSchemaLoader* getHOSSchemaLoader(); + utils::SchemaLoader* getHOSSchemaLoader(); devicerepository::DeviceRepositoryService* getDeviceRepository(); }; diff --git a/src/hos_cosgi_ruleengine/include/hos_cosgi_ruleengine/hos/cosgi/service/ruleengine/ruleengine_service.h b/src/hos_cosgi_ruleengine/include/hos_cosgi_ruleengine/hos/cosgi/service/ruleengine/ruleengine_service.h index c9a819fd..c84b32cb 100644 --- a/src/hos_cosgi_ruleengine/include/hos_cosgi_ruleengine/hos/cosgi/service/ruleengine/ruleengine_service.h +++ b/src/hos_cosgi_ruleengine/include/hos_cosgi_ruleengine/hos/cosgi/service/ruleengine/ruleengine_service.h @@ -10,7 +10,6 @@ #include -#include #include #include diff --git a/src/hos_cosgi_ruleengine/package.xml b/src/hos_cosgi_ruleengine/package.xml index e4578a7b..33853b8c 100644 --- a/src/hos_cosgi_ruleengine/package.xml +++ b/src/hos_cosgi_ruleengine/package.xml @@ -45,14 +45,14 @@ hos_cosgi_core hos_cosgi_scripting hos_cpp_utils - hos_libvariant + hos_deps roscpp hos_cpp_cron hos_celix hos_cosgi_devicerepository hos_cosgi_core hos_cpp_utils - hos_libvariant + hos_deps roscpp hos_cpp_cron hos_cosgi_scripting diff --git a/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/rule/Rule.cpp b/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/rule/Rule.cpp index 8fa0668f..2ee15c05 100644 --- a/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/rule/Rule.cpp +++ b/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/rule/Rule.cpp @@ -15,7 +15,7 @@ #include "RulePackage.h" #include #include -#include +#include #include "../ruleengine_serviceimpl.h" @@ -30,7 +30,7 @@ Rule::Rule(RulePackage* parent, std::string name) : parent(parent), name(name) {} -libvariant::HosSchemaLoader* Rule::getHOSSchemaLoader() { +utils::SchemaLoader* Rule::getHOSSchemaLoader() { return parent->parent->getHOSSchemaLoader(); } diff --git a/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/ruleengine_serviceimpl.cpp b/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/ruleengine_serviceimpl.cpp index 223789a6..7023a58e 100644 --- a/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/ruleengine_serviceimpl.cpp +++ b/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/ruleengine_serviceimpl.cpp @@ -61,7 +61,7 @@ void RuleEngineServiceImpl::init() { nodehandle->getParam("ruleengine_prefix", ruleEnginePrefix); XmlRpc::XmlRpcValue rawValue; nodehandle->getParam(ruleEnginePrefix, rawValue); - schemaLoader.reset(new libvariant::HosSchemaLoader()); + schemaLoader.reset(new utils::SchemaLoader()); registerRuleConditionFactory("logical_or", std::make_shared()); registerRuleConditionFactory("logical_and", std::make_shared()); registerRuleConditionFactory("devicestatusmsg", std::make_shared()); diff --git a/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/ruleengine_serviceimpl.h b/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/ruleengine_serviceimpl.h index df68e854..8919d36b 100644 --- a/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/ruleengine_serviceimpl.h +++ b/src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/ruleengine_serviceimpl.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -72,7 +72,7 @@ private: execServiceMap_t execServices; condFactoryMap_t condFactories; - std::unique_ptr schemaLoader; + std::unique_ptr schemaLoader; bool initialized = false; @@ -106,7 +106,7 @@ public: std::shared_ptr getRuleConditionFactory(std::string type) { return condFactories[type]; } - libvariant::HosSchemaLoader* getHOSSchemaLoader() { return schemaLoader.get(); } + utils::SchemaLoader* getHOSSchemaLoader() { return schemaLoader.get(); } devicerepository::DeviceRepositoryService* getDeviceRepository() { return repoService; } diff --git a/src/hos_cosgi_scripting/CMakeLists.txt b/src/hos_cosgi_scripting/CMakeLists.txt index 018f6d3c..d4fff600 100644 --- a/src/hos_cosgi_scripting/CMakeLists.txt +++ b/src/hos_cosgi_scripting/CMakeLists.txt @@ -6,9 +6,13 @@ project(hos_cosgi_scripting) ## is used, also find other catkin packages find_package(catkin REQUIRED COMPONENTS hos_cosgi_core - hos_libvariant + hos_deps ) + +find_package(libvariant REQUIRED) + + ## System dependencies are found with CMake's conventions # find_package(Boost REQUIRED COMPONENTS system) @@ -81,7 +85,7 @@ find_package(catkin REQUIRED COMPONENTS catkin_package( INCLUDE_DIRS include/${PROJECT_NAME}/ # LIBRARIES hos_cosgi_scripting - CATKIN_DEPENDS hos_cosgi_core hos_libvariant + CATKIN_DEPENDS hos_cosgi_core hos_deps # DEPENDS system_lib ) @@ -92,9 +96,6 @@ catkin_package( ## Specify additional locations of header files ## Your package locations should be listed before other locations # include_directories(include) -include_directories( - ${catkin_INCLUDE_DIRS} -) ## Declare a cpp library # add_library(hos_cosgi_scripting diff --git a/src/hos_cosgi_scripting/package.xml b/src/hos_cosgi_scripting/package.xml index 79be0ac1..ecaee6ad 100644 --- a/src/hos_cosgi_scripting/package.xml +++ b/src/hos_cosgi_scripting/package.xml @@ -41,9 +41,9 @@ catkin hos_cosgi_core - hos_libvariant + hos_deps hos_cosgi_core - hos_libvariant + hos_deps diff --git a/src/hos_cosgi_scripting_python/CMakeLists.txt b/src/hos_cosgi_scripting_python/CMakeLists.txt index 19c12217..c244ddbc 100644 --- a/src/hos_cosgi_scripting_python/CMakeLists.txt +++ b/src/hos_cosgi_scripting_python/CMakeLists.txt @@ -10,7 +10,7 @@ find_package(catkin REQUIRED COMPONENTS hos_cosgi_scripting hos_cosgi_devicerepository hos_cpp_utils - hos_libvariant + hos_deps ) ## System dependencies are found with CMake's conventions @@ -25,6 +25,7 @@ find_package(catkin REQUIRED COMPONENTS find_package(APR REQUIRED) find_package(CELIX REQUIRED) find_package(Boost REQUIRED COMPONENTS python) +find_package(libvariant REQUIRED) ################################################ @@ -90,7 +91,7 @@ find_package(Boost REQUIRED COMPONENTS python) catkin_package( # INCLUDE_DIRS include # LIBRARIES hos_cosgi_ruleexecution_python - CATKIN_DEPENDS hos_celix hos_cosgi_core hos_cosgi_scripting hos_cpp_utils hos_libvariant hos_cosgi_devicerepository + CATKIN_DEPENDS hos_celix hos_cosgi_core hos_cosgi_scripting hos_cpp_utils hos_deps hos_cosgi_devicerepository # DEPENDS system_lib ) @@ -110,7 +111,7 @@ include_directories( ${APR_INCLUDE_DIR} ${APR_INCLUDE_DIR}/apr-1.0 include - ${hos_libvariant_INCLUDE_DIRS}/hos_libvariant + ${libvariant_INCLUDE_DIR} /usr/include/python2.7 ) @@ -128,6 +129,7 @@ target_link_libraries(hos_cosgi_scripting_python ${catkin_LIBRARIES} ${APR_LIBRARIES} ${Boost_LIBRARIES} + ${libvariant_LIBRARY} python2.7 ) diff --git a/src/hos_cosgi_scripting_python/package.xml b/src/hos_cosgi_scripting_python/package.xml index 66971f1d..4d5606ab 100644 --- a/src/hos_cosgi_scripting_python/package.xml +++ b/src/hos_cosgi_scripting_python/package.xml @@ -44,13 +44,13 @@ hos_cosgi_core hos_cosgi_scripting hos_cpp_utils - hos_libvariant + hos_deps hos_cosgi_devicerepository hos_celix hos_cosgi_core hos_cosgi_scripting hos_cpp_utils - hos_libvariant + hos_deps hos_cosgi_devicerepository diff --git a/src/hos_cosgi_webserver/CMakeLists.txt b/src/hos_cosgi_webserver/CMakeLists.txt index bd2d57ef..e318223e 100644 --- a/src/hos_cosgi_webserver/CMakeLists.txt +++ b/src/hos_cosgi_webserver/CMakeLists.txt @@ -9,8 +9,7 @@ find_package(catkin REQUIRED COMPONENTS hos_cosgi_devicerepository hos_cosgi_core hos_cpp_utils - hos_libhttpserver - hos_libvariant + hos_deps roscpp ) @@ -26,6 +25,8 @@ find_package(catkin REQUIRED COMPONENTS find_package(APR REQUIRED) find_package(CELIX REQUIRED) find_package(Boost REQUIRED) +find_package(libvariant REQUIRED) +find_package(libhttpserver REQUIRED) ################################################ ## Declare ROS messages, services and actions ## @@ -110,7 +111,8 @@ include_directories( ${APR_INCLUDE_DIR} ${APR_INCLUDE_DIR}/apr-1.0 include/${PROJECT_NAME}/ - ${hos_libvariant_INCLUDE_DIRS}/hos_libvariant + ${libvariant_INCLUDE_DIR} + ${libhttpserver_INCLUDE_DIRS} ) set(BUNDLE_SYMBOLICNAME "hos.hos_webserver") @@ -127,6 +129,8 @@ bundle(hos_cosgi_webserver target_link_libraries(hos_cosgi_webserver ${catkin_LIBRARIES} ${APR_LIBRARIES} + ${libvariant_LIBRARY} + ${libhttpserver_LIBRARY} ) diff --git a/src/hos_cosgi_webserver/include/hos_cosgi_webserver/hos/cosgi/service/webserver/webserver_service.h b/src/hos_cosgi_webserver/include/hos_cosgi_webserver/hos/cosgi/service/webserver/webserver_service.h index 94412c96..2958c967 100644 --- a/src/hos_cosgi_webserver/include/hos_cosgi_webserver/hos/cosgi/service/webserver/webserver_service.h +++ b/src/hos_cosgi_webserver/include/hos_cosgi_webserver/hos/cosgi/service/webserver/webserver_service.h @@ -7,8 +7,6 @@ #pragma once - -#include #include #include #include diff --git a/src/hos_cosgi_webserver/package.xml b/src/hos_cosgi_webserver/package.xml index 408045c1..119010d3 100644 --- a/src/hos_cosgi_webserver/package.xml +++ b/src/hos_cosgi_webserver/package.xml @@ -44,15 +44,13 @@ hos_cosgi_devicerepository hos_cosgi_core hos_cpp_utils - hos_libhttpserver - hos_libvariant + hos_deps roscpp hos_celix hos_cosgi_devicerepository hos_cosgi_core hos_cpp_utils - hos_libhttpserver - hos_libvariant + hos_deps roscpp diff --git a/src/hos_cosgi_webserver/src/hos/cosgi/service/webserver/resources/SchemaHTTPResource.cpp b/src/hos_cosgi_webserver/src/hos/cosgi/service/webserver/resources/SchemaHTTPResource.cpp index 470f589f..9f8be790 100644 --- a/src/hos_cosgi_webserver/src/hos/cosgi/service/webserver/resources/SchemaHTTPResource.cpp +++ b/src/hos_cosgi_webserver/src/hos/cosgi/service/webserver/resources/SchemaHTTPResource.cpp @@ -11,14 +11,14 @@ namespace webserver { namespace resources { using namespace httpserver; -using namespace ::libvariant; +using namespace libvariant; SchemaHTTPResource::SchemaHTTPResource(ros::NodeHandle* nodehandle, size_t prefixPathPieces) : nodehandle(nodehandle), prefixPathPieces(prefixPathPieces) { disallow_all(); set_allowing(MHD_HTTP_METHOD_GET, true); - schemaLoader.reset(new libvariant::HosSchemaLoader()); + schemaLoader.reset(new utils::SchemaLoader()); } diff --git a/src/hos_cosgi_webserver/src/hos/cosgi/service/webserver/resources/SchemaHTTPResource.h b/src/hos_cosgi_webserver/src/hos/cosgi/service/webserver/resources/SchemaHTTPResource.h index 8b90270d..b8424f13 100644 --- a/src/hos_cosgi_webserver/src/hos/cosgi/service/webserver/resources/SchemaHTTPResource.h +++ b/src/hos_cosgi_webserver/src/hos/cosgi/service/webserver/resources/SchemaHTTPResource.h @@ -4,7 +4,7 @@ #include #include -#include +#include // Service Namespace namespace hos { @@ -18,7 +18,7 @@ namespace resources { class SchemaHTTPResource : public httpserver::http_resource { private: ros::NodeHandle* nodehandle = nullptr; - std::unique_ptr schemaLoader; + std::unique_ptr schemaLoader; size_t prefixPathPieces; public: SchemaHTTPResource(ros::NodeHandle* nodehandle, size_t prefixPathPieces); diff --git a/src/hos_cpp_utils/CMakeLists.txt b/src/hos_cpp_utils/CMakeLists.txt index cb44c95a..881459af 100644 --- a/src/hos_cpp_utils/CMakeLists.txt +++ b/src/hos_cpp_utils/CMakeLists.txt @@ -5,10 +5,15 @@ project(hos_cpp_utils) ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## is used, also find other catkin packages find_package(catkin REQUIRED COMPONENTS - hos_libvariant roscpp + hos_deps ) +message("CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}") +find_package(libvariant REQUIRED) +message("libvariant_INCLUDE_DIR: ${libvariant_INCLUDE_DIR}") +message("libvariant_LIBRARY: ${libvariant_LIBRARY}") + ## System dependencies are found with CMake's conventions # find_package(Boost REQUIRED COMPONENTS system) @@ -81,8 +86,6 @@ find_package(catkin REQUIRED COMPONENTS catkin_package( INCLUDE_DIRS include/${PROJECT_NAME}/ LIBRARIES hos_cpp_utils - CATKIN_DEPENDS roscpp -# DEPENDS system_lib ) ########### @@ -96,16 +99,17 @@ add_definitions( include_directories( ${catkin_INCLUDE_DIRS} - include - include/hos_libvariant + ${libvariant_INCLUDE_DIR} + include/hos_cpp_utils ) ## Declare a cpp library add_library(hos_cpp_utils STATIC - src/HosSchemaLoader/HosSchemaLoader.cpp + src/hos/utils/SchemaLoader.cpp ) target_link_libraries(hos_cpp_utils ${catkin_LIBRARIES} + ${libvariant_LIBRARY} ) ## Specify additional locations of header files diff --git a/src/hos_cpp_utils/include/hos_cpp_utils/hos/utils/observable.h b/src/hos_cpp_utils/include/hos_cpp_utils/hos/utils/Observable.h similarity index 100% rename from src/hos_cpp_utils/include/hos_cpp_utils/hos/utils/observable.h rename to src/hos_cpp_utils/include/hos_cpp_utils/hos/utils/Observable.h diff --git a/src/hos_libvariant/include/hos_libvariant/HosSchemaLoader/HosSchemaLoader.h b/src/hos_cpp_utils/include/hos_cpp_utils/hos/utils/SchemaLoader.h similarity index 53% rename from src/hos_libvariant/include/hos_libvariant/HosSchemaLoader/HosSchemaLoader.h rename to src/hos_cpp_utils/include/hos_cpp_utils/hos/utils/SchemaLoader.h index 7bca8f8b..e57878ce 100644 --- a/src/hos_libvariant/include/hos_libvariant/HosSchemaLoader/HosSchemaLoader.h +++ b/src/hos_cpp_utils/include/hos_cpp_utils/hos/utils/SchemaLoader.h @@ -1,37 +1,33 @@ -/* - * HosSchemaLoader.h - * - * Created on: 24.04.2015 - * Author: matzman - */ -#ifndef SRC_HOSSCHEMALOADER_H_ -#define SRC_HOSSCHEMALOADER_H_ +#pragma once + + #include #include #include + namespace hos { -namespace libvariant { +namespace utils { -class HosSchemaLoader: public ::libvariant::SchemaLoader { + +class SchemaLoader: public libvariant::SchemaLoader { private: std::string ros_param_ns; std::string prefix; ros::NodeHandle nodeHandle; bool loadTypeSchema(std::string schema); public: - HosSchemaLoader(std::string ns = "/hos/types/repository", std::string prefix = "hos:schema://") + SchemaLoader(std::string ns = "/hos/types/repository", std::string prefix = "hos:schema://") : ros_param_ns(ns), prefix(prefix), nodeHandle("~") {} virtual bool HandleMissing(const std::string &uri, LoaderError &error); }; + } // namespace libvariant } // namespace hos - -#endif /* SRC_HOSSCHEMALOADER_H_ */ diff --git a/src/hos_cpp_utils/package.xml b/src/hos_cpp_utils/package.xml index d30640da..4eb5ef65 100644 --- a/src/hos_cpp_utils/package.xml +++ b/src/hos_cpp_utils/package.xml @@ -33,7 +33,7 @@ - @@ -43,7 +43,11 @@ catkin hos_libvariant + roscpp + hos_deps hos_libvariant + roscpp + hos_deps @@ -51,4 +55,4 @@ - \ No newline at end of file + diff --git a/src/hos_libvariant/src/HosSchemaLoader/HosSchemaLoader.cpp b/src/hos_cpp_utils/src/hos/utils/SchemaLoader.cpp similarity index 67% rename from src/hos_libvariant/src/HosSchemaLoader/HosSchemaLoader.cpp rename to src/hos_cpp_utils/src/hos/utils/SchemaLoader.cpp index 626089bf..07a9c8bf 100644 --- a/src/hos_libvariant/src/HosSchemaLoader/HosSchemaLoader.cpp +++ b/src/hos_cpp_utils/src/hos/utils/SchemaLoader.cpp @@ -1,18 +1,14 @@ -/* - * HosSchemaLoader.cpp - * - * Created on: 24.04.2015 - * Author: matzman - */ -#include + +#include + namespace hos { -namespace libvariant { +namespace utils { -bool HosSchemaLoader::HandleMissing(const std::string &uri, LoaderError &error) { +bool SchemaLoader::HandleMissing(const std::string &uri, LoaderError &error) { if (uri.compare(0, prefix.size(), prefix) == 0) { return loadTypeSchema(uri.substr(prefix.size())); } else { @@ -20,7 +16,7 @@ bool HosSchemaLoader::HandleMissing(const std::string &uri, LoaderError &error) } } -bool HosSchemaLoader::loadTypeSchema(std::string schema) { +bool SchemaLoader::loadTypeSchema(std::string schema) { std::string pkey = std::string(ros_param_ns).append("/").append(schema); std::string pvalue; nodeHandle.getParam(pkey, pvalue); diff --git a/src/hos_deps/CMakeLists.txt b/src/hos_deps/CMakeLists.txt new file mode 100644 index 00000000..70a83ec7 --- /dev/null +++ b/src/hos_deps/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 2.8.3) +project(hos_deps) + + +find_package(catkin REQUIRED) + + +################################### +## catkin specific configuration ## +################################### + +catkin_package( + CFG_EXTRAS hos_deps.cmake +) + + +############# +## Install ## +############# + +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/cmake/ +# FILES_MATCHING PATTERN "*.cmake" +) \ No newline at end of file diff --git a/src/hos_deps/cmake/Modules/Findlibhttpserver.cmake b/src/hos_deps/cmake/Modules/Findlibhttpserver.cmake new file mode 100644 index 00000000..7410f168 --- /dev/null +++ b/src/hos_deps/cmake/Modules/Findlibhttpserver.cmake @@ -0,0 +1,23 @@ + +find_path(libhttpserver_INCLUDE_DIR httpserver.hpp + PATHS $ENV{HOS_PREFIX}/libhttpserver + PATH_SUFFIXES include +) + +find_path(libmicrohttpd_INCLUDE_DIR microhttpd.h + PATHS $ENV{HOS_PREFIX}/libmicrohttpd + PATH_SUFFIXES include +) + +find_library(libhttpserver_LIBRARY httpserver + PATHS $ENV{HOS_PREFIX}/libhttpserver + PATH_SUFFIXES lib lib64 +) + +find_library(libmicrohttpd_LIBRARY microhttpd + PATHS $ENV{HOS_PREFIX}/libmicrohttpd + PATH_SUFFIXES lib lib64 +) + +set(libhttpserver_INCLUDE_DIRS "${libhttpserver_INCLUDE_DIR}" "${libmicrohttpd_INCLUDE_DIR}") +set(libhttpserver_LIBRARIES "${libhttpserver_LIBRARY}" "${libmicrohttpd_LIBRARY}") \ No newline at end of file diff --git a/src/hos_deps/cmake/Modules/Findlibvariant.cmake b/src/hos_deps/cmake/Modules/Findlibvariant.cmake new file mode 100644 index 00000000..a2b0f0c8 --- /dev/null +++ b/src/hos_deps/cmake/Modules/Findlibvariant.cmake @@ -0,0 +1,10 @@ + +find_path(libvariant_INCLUDE_DIR Variant/Variant.h + PATHS $ENV{HOS_PREFIX}/libvariant + PATH_SUFFIXES include +) + +find_library(libvariant_LIBRARY Variant + PATHS $ENV{HOS_PREFIX}/libvariant + PATH_SUFFIXES lib lib64 +) diff --git a/src/hos_deps/cmake/hos_deps.cmake.develspace.in b/src/hos_deps/cmake/hos_deps.cmake.develspace.in new file mode 100644 index 00000000..bcab58b4 --- /dev/null +++ b/src/hos_deps/cmake/hos_deps.cmake.develspace.in @@ -0,0 +1,2 @@ +# Append cmake modules from source directory to the cmake module path +list(APPEND CMAKE_MODULE_PATH "@CMAKE_CURRENT_SOURCE_DIR@/cmake/Modules") \ No newline at end of file diff --git a/src/hos_deps/cmake/hos_deps.cmake.installspace.in b/src/hos_deps/cmake/hos_deps.cmake.installspace.in new file mode 100644 index 00000000..e17ae5be --- /dev/null +++ b/src/hos_deps/cmake/hos_deps.cmake.installspace.in @@ -0,0 +1,2 @@ + # Append the installed cmake modules to the cmake module path +list(APPEND CMAKE_MODULE_PATH "${hos_deps_DIR}/Modules") \ No newline at end of file diff --git a/src/hos_deps/dependencies_install.sh b/src/hos_deps/dependencies_install.sh new file mode 100755 index 00000000..9542c40f --- /dev/null +++ b/src/hos_deps/dependencies_install.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +CWD=`dirname "$0"`/scripts +cd $CWD + +echo "Installing libvariant" +./libvariant_install.sh + +echo "Installing libgcrypt" +./libgcrypt_install.sh + +echo "Installing libmicrohttpd" +./libmicrohttpd_install.sh + +echo "Installing libhttpserver" +./libhttpserver_install.sh diff --git a/src/hos_libhttpserver/package.xml b/src/hos_deps/package.xml similarity index 91% rename from src/hos_libhttpserver/package.xml rename to src/hos_deps/package.xml index 5d067a03..d04fa915 100644 --- a/src/hos_libhttpserver/package.xml +++ b/src/hos_deps/package.xml @@ -1,8 +1,8 @@ - hos_libhttpserver + hos_deps 0.0.0 - The hos_libhttpserver package + The hos_deps package @@ -19,7 +19,7 @@ - + diff --git a/src/hos_deps/scripts/environment.setup b/src/hos_deps/scripts/environment.setup new file mode 100644 index 00000000..9bd46a14 --- /dev/null +++ b/src/hos_deps/scripts/environment.setup @@ -0,0 +1,20 @@ +# +# This script should be included by all installation scripts to set up environment parameters. +# + +# determine working directory +CWD=${1:-`dirname "$0"`} +export CWD=`realpath "$CWD"` + +# determine installation directory +export PREFIX=${PREFIX:-${CWD}/../deps-install} + +# determine temporary directory +export TMP=${TMP:-${CWD}/../deps-tmp} + +# determine number of cores to be used for compiling code (default = all) +export SLOTS=${SLOTS:-`grep 'processor' /proc/cpuinfo | sort -u | wc -l`} + +# using default system compiler +export CC=${CC:-gcc} +export CXX=${CXX:-g++} diff --git a/src/hos_deps/scripts/libgcrypt_install.sh b/src/hos_deps/scripts/libgcrypt_install.sh new file mode 100755 index 00000000..b1e3c4c9 --- /dev/null +++ b/src/hos_deps/scripts/libgcrypt_install.sh @@ -0,0 +1,36 @@ +#!/bin/bash +. ./environment.setup + + +NAME=libgcrypt +VERSION=1.6.3 +PACKAGE=$NAME-$VERSION +FILE=$PACKAGE.tar.bz2 +URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/$FILE + + +# Download +if [ -f $TMP/$FILE ]; then + echo "$TMP/$FILE already exists" +else + wget -nd $URL -O $TMP/$FILE + RET=$? + if [ $RET -ne 0 ]; then + exit $RET + fi +fi +rm -rf $TMP/$PACKAGE +tar xf $TMP/$FILE -C $TMP + + +# Compile +cd ${TMP}/$PACKAGE +mkdir build +cd build +CC=$CC CXX=$CXX CFLAGS=$CFLAGS ../configure --prefix $PREFIX/$NAME +make all -j $SLOTS + + +#Install +make install + diff --git a/src/hos_deps/scripts/libhttpserver_install.sh b/src/hos_deps/scripts/libhttpserver_install.sh new file mode 100755 index 00000000..4a0288ac --- /dev/null +++ b/src/hos_deps/scripts/libhttpserver_install.sh @@ -0,0 +1,38 @@ +#!/bin/bash +. ./environment.setup + + +NAME=libhttpserver +VERSION=0.9.0 +PACKAGE=$NAME-$VERSION +FILE=$PACKAGE.tar.gz +DOWNLOADFILE=v$VERSION.tar.gz +URL=https://github.com/etr/libhttpserver/archive/$DOWNLOADFILE + + +# Download +if [ -f $TMP/$FILE ]; then + echo "$TMP/$FILE already exists" +else + wget -nd $URL -O $TMP/$FILE + RET=$? + if [ $RET -ne 0 ]; then + exit $RET + fi +fi +rm -rf $TMP/$PACKAGE +tar xf $TMP/$FILE -C $TMP + + +# Compile +cd ${TMP}/$PACKAGE +./bootstrap +mkdir build +cd build +PKG_CONFIG_PATH=$PREFIX/libmicrohttpd/lib/pkgconfig:$PREFIX/libmicrohttpd/lib64/pkgconfig CC=$CC CXX=$CXX CFLAGS=$CFLAGS ../configure --prefix $PREFIX/$NAME --enable-cpp11 +make all -j $SLOTS + + +#Install +make install + diff --git a/src/hos_deps/scripts/libmicrohttpd_install.sh b/src/hos_deps/scripts/libmicrohttpd_install.sh new file mode 100755 index 00000000..c15fab4d --- /dev/null +++ b/src/hos_deps/scripts/libmicrohttpd_install.sh @@ -0,0 +1,36 @@ +#!/bin/bash +. ./environment.setup + + +NAME=libmicrohttpd +VERSION=0.9.42 +PACKAGE=$NAME-$VERSION +FILE=$PACKAGE.tar.gz +URL=http://ftp.gnu.org/gnu/libmicrohttpd/$FILE + + +# Download +if [ -f $TMP/$FILE ]; then + echo "$TMP/$FILE already exists" +else + wget -nd $URL -O $TMP/$FILE + RET=$? + if [ $RET -ne 0 ]; then + exit $RET + fi +fi +rm -rf $TMP/$PACKAGE +tar xf $TMP/$FILE -C $TMP + + +# Compile +cd ${TMP}/$PACKAGE +mkdir build +cd build +CC=$CC CXX=$CXX CFLAGS=$CFLAGS ../configure --prefix $PREFIX/$NAME --with-libgcrypt-prefix=$PREFIX/libgcrypt +make all -j $SLOTS + + +#Install +make install + diff --git a/src/hos_deps/scripts/libvariant_install.sh b/src/hos_deps/scripts/libvariant_install.sh new file mode 100755 index 00000000..32555106 --- /dev/null +++ b/src/hos_deps/scripts/libvariant_install.sh @@ -0,0 +1,30 @@ +#!/bin/bash +. ./environment.setup + + +HG_REPO_URL=https://bitbucket.org/gallen/libvariant + + +# Download +hg clone $HG_REPO_URL $TMP/libvariant + + +# Compile +cd $TMP/libvariant +mkdir build +cd build +CC=$CC CXX=$CXX CFLAGS=$CFLAGS cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX/libvariant \ + -DBUILD_SHARED_LIBS=TRUE \ + -DLIBVARIANT_BUILD_EXAMPLES=FALSE \ + -DLIBVARIANT_BUILD_TESTS=FALSE \ + -DLIBVARIANT_BUILD_WALL=TRUE \ + -DLIBVARIANT_ENABLE_CURL=TRUE \ + -DLIBVARIANT_ENABLE_MSGPACK=FALSE \ + -DLIBVARIANT_ENABLE_XML=TRUE \ + -DLIBVARIANT_ENABLE_YAML=TRUE +make all -j $SLOTS + + +#Install +make install + diff --git a/src/hos_libhttpserver/CMakeLists.txt b/src/hos_libhttpserver/CMakeLists.txt deleted file mode 100644 index 13ce829a..00000000 --- a/src/hos_libhttpserver/CMakeLists.txt +++ /dev/null @@ -1,210 +0,0 @@ -cmake_minimum_required(VERSION 2.8.3) -project(hos_libhttpserver) - -## Find catkin macros and libraries -## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) -## is used, also find other catkin packages -find_package(catkin REQUIRED) - -## System dependencies are found with CMake's conventions -# find_package(Boost REQUIRED COMPONENTS system) - - -## Uncomment this if the package has a setup.py. This macro ensures -## modules and global scripts declared therein get installed -## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html -# catkin_python_setup() - -################################################ -## Declare ROS messages, services and actions ## -################################################ - -## To declare and build messages, services or actions from within this -## package, follow these steps: -## * Let MSG_DEP_SET be the set of packages whose message types you use in -## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...). -## * In the file package.xml: -## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET -## * If MSG_DEP_SET isn't empty the following dependencies might have been -## pulled in transitively but can be declared for certainty nonetheless: -## * add a build_depend tag for "message_generation" -## * add a run_depend tag for "message_runtime" -## * In this file (CMakeLists.txt): -## * add "message_generation" and every package in MSG_DEP_SET to -## find_package(catkin REQUIRED COMPONENTS ...) -## * add "message_runtime" and every package in MSG_DEP_SET to -## catkin_package(CATKIN_DEPENDS ...) -## * uncomment the add_*_files sections below as needed -## and list every .msg/.srv/.action file to be processed -## * uncomment the generate_messages entry below -## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...) - -## Generate messages in the 'msg' folder -# add_message_files( -# FILES -# Message1.msg -# Message2.msg -# ) - -## Generate services in the 'srv' folder -# add_service_files( -# FILES -# Service1.srv -# Service2.srv -# ) - -## Generate actions in the 'action' folder -# add_action_files( -# FILES -# Action1.action -# Action2.action -# ) - -## Generate added messages and services with any dependencies listed here -# generate_messages( -# DEPENDENCIES -# std_msgs # Or other packages containing msgs -# ) - -################################### -## catkin specific configuration ## -################################### -## The catkin_package macro generates cmake config files for your package -## Declare things to be passed to dependent projects -## INCLUDE_DIRS: uncomment this if you package contains header files -## LIBRARIES: libraries you create in this project that dependent projects also need -## CATKIN_DEPENDS: catkin_packages dependent projects also need -## DEPENDS: system dependencies of this project that dependent projects also need -catkin_package( - INCLUDE_DIRS include/${PROJECT_NAME}/ - LIBRARIES gcrypt microhttpd httpserver -# CATKIN_DEPENDS other_catkin_pkg -# DEPENDS system_lib -) - -########### -## Build ## -########### - - -include(ExternalProject) - -ExternalProject_Add( libgcrypt_project - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libgcrypt - CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/src/libgcrypt/configure --prefix ${CATKIN_DEVEL_PREFIX} --libdir=${CATKIN_DEVEL_PREFIX}/lib - BUILD_COMMAND make all - INSTALL_COMMAND make install -) - -add_library( gcrypt SHARED IMPORTED ) -set_property( TARGET gcrypt PROPERTY IMPORTED_LOCATION "${CATKIN_DEVEL_PREFIX}/lib/libgcrypt.so") -add_dependencies( gcrypt libgcrypt_project ) - - -ExternalProject_Add( libmicrohttpd_project - DEPENDS libgcrypt_project - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libmicrohttpd - CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/src/libmicrohttpd/configure --prefix ${CATKIN_DEVEL_PREFIX} --with-libgcrypt-prefix=${CATKIN_DEVEL_PREFIX} --libdir=${CATKIN_DEVEL_PREFIX}/lib - BUILD_COMMAND make all - INSTALL_COMMAND make install -) - -add_library( microhttpd SHARED IMPORTED ) -set_property( TARGET microhttpd PROPERTY IMPORTED_LOCATION "${CATKIN_DEVEL_PREFIX}/lib/libmicrohttpd.so") -add_dependencies( microhttpd libmicrohttpd_project ) - - -ExternalProject_Add( libhttpserver_project - DEPENDS libmicrohttpd_project - #SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libhttpserver - DOWNLOAD_COMMAND cp -rf ${CMAKE_CURRENT_SOURCE_DIR}/src/libhttpserver ${CMAKE_CURRENT_BINARY_DIR} && cd ${CMAKE_CURRENT_BINARY_DIR}/libhttpserver && ./bootstrap - CONFIGURE_COMMAND PKG_CONFIG_PATH=${CATKIN_DEVEL_PREFIX}/lib/pkgconfig ${CMAKE_CURRENT_BINARY_DIR}/libhttpserver/configure --prefix ${CATKIN_DEVEL_PREFIX} --libdir=${CATKIN_DEVEL_PREFIX}/lib --enable-cpp11 - BUILD_COMMAND make - INSTALL_COMMAND make install -) - -add_library( httpserver SHARED IMPORTED ) -set_property( TARGET httpserver PROPERTY IMPORTED_LOCATION "${CATKIN_DEVEL_PREFIX}/lib/libhttpserver.so") -add_dependencies( httpserver libhttpserver_project ) - - -## Specify additional locations of header files -## Your package locations should be listed before other locations -# include_directories(include) - -## Declare a cpp library -# add_library(hos_libhttpserver -# src/${PROJECT_NAME}/hos_libhttpserver.cpp -# ) - -## Declare a cpp executable -# add_executable(hos_libhttpserver_node src/hos_libhttpserver_node.cpp) - -## Add cmake target dependencies of the executable/library -## as an example, message headers may need to be generated before nodes -# add_dependencies(hos_libhttpserver_node hos_libhttpserver_generate_messages_cpp) - -## Specify libraries to link a library or executable target against -# target_link_libraries(hos_libhttpserver_node -# ${catkin_LIBRARIES} -# ) - -############# -## Install ## -############# - - -install(DIRECTORY include/${PROJECT_NAME}/ - DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} -) -install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/lib/ - DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -) -install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/bin/ - DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} - USE_SOURCE_PERMISSIONS -) - -# all install targets should use catkin DESTINATION variables -# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html - -## Mark executable scripts (Python etc.) for installation -## in contrast to setup.py, you can choose the destination -# install(PROGRAMS -# scripts/my_python_script -# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -# ) - -## Mark executables and/or libraries for installation -# install(TARGETS hos_libhttpserver hos_libhttpserver_node -# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -# ) - -## Mark cpp header files for installation -# install(DIRECTORY include/${PROJECT_NAME}/ -# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} -# FILES_MATCHING PATTERN "*.h" -# PATTERN ".svn" EXCLUDE -# ) - -## Mark other files for installation (e.g. launch and bag files, etc.) -# install(FILES -# # myfile1 -# # myfile2 -# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -# ) - -############# -## Testing ## -############# - -## Add gtest based cpp test target and link libraries -# catkin_add_gtest(${PROJECT_NAME}-test test/test_hos_libhttpserver.cpp) -# if(TARGET ${PROJECT_NAME}-test) -# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) -# endif() - -## Add folders to be run by python nosetests -# catkin_add_nosetests(test) diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/gcrypt.h b/src/hos_libhttpserver/include/hos_libhttpserver/gcrypt.h deleted file mode 100644 index 9f43c08f..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/gcrypt.h +++ /dev/null @@ -1,1681 +0,0 @@ -/* gcrypt.h - GNU Cryptographic Library Interface -*- c -*- - * Copyright (C) 1998-2015 Free Software Foundation, Inc. - * Copyright (C) 2012-2015 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - * - * File: src/gcrypt.h. Generated from gcrypt.h.in by configure. - */ - -#ifndef _GCRYPT_H -#define _GCRYPT_H - -#include -#include -#include - -#include - -#include - -#if defined _WIN32 || defined __WIN32__ -# include -# include -# include -# ifndef __GNUC__ - typedef long ssize_t; - typedef int pid_t; -# endif /*!__GNUC__*/ -#else -# include -# include -# include -#endif /*!_WIN32*/ - -typedef socklen_t gcry_socklen_t; - -/* This is required for error code compatibility. */ -#define _GCRY_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GCRYPT - -#ifdef __cplusplus -extern "C" { -#if 0 /* (Keep Emacsens' auto-indent happy.) */ -} -#endif -#endif - -/* The version of this header should match the one of the library. It - should not be used by a program because gcry_check_version() should - return the same version. The purpose of this macro is to let - autoconf (using the AM_PATH_GCRYPT macro) check that this header - matches the installed library. */ -#define GCRYPT_VERSION "1.6.3" - -/* The version number of this header. It may be used to handle minor - API incompatibilities. */ -#define GCRYPT_VERSION_NUMBER 0x010603 - - -/* Internal: We can't use the convenience macros for the multi - precision integer functions when building this library. */ -#ifdef _GCRYPT_IN_LIBGCRYPT -#ifndef GCRYPT_NO_MPI_MACROS -#define GCRYPT_NO_MPI_MACROS 1 -#endif -#endif - -/* We want to use gcc attributes when possible. Warning: Don't use - these macros in your programs: As indicated by the leading - underscore they are subject to change without notice. */ -#ifdef __GNUC__ - -#define _GCRY_GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) - -#if _GCRY_GCC_VERSION >= 30100 -#define _GCRY_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__)) -#endif - -#if _GCRY_GCC_VERSION >= 29600 -#define _GCRY_GCC_ATTR_PURE __attribute__ ((__pure__)) -#endif - -#if _GCRY_GCC_VERSION >= 30200 -#define _GCRY_GCC_ATTR_MALLOC __attribute__ ((__malloc__)) -#endif - -#define _GCRY_GCC_ATTR_PRINTF(f,a) __attribute__ ((format (printf,f,a))) - -#if _GCRY_GCC_VERSION >= 40000 -#define _GCRY_GCC_ATTR_SENTINEL(a) __attribute__ ((sentinel(a))) -#endif - -#endif /*__GNUC__*/ - -#ifndef _GCRY_GCC_ATTR_DEPRECATED -#define _GCRY_GCC_ATTR_DEPRECATED -#endif -#ifndef _GCRY_GCC_ATTR_PURE -#define _GCRY_GCC_ATTR_PURE -#endif -#ifndef _GCRY_GCC_ATTR_MALLOC -#define _GCRY_GCC_ATTR_MALLOC -#endif -#ifndef _GCRY_GCC_ATTR_PRINTF -#define _GCRY_GCC_ATTR_PRINTF(f,a) -#endif -#ifndef _GCRY_GCC_ATTR_SENTINEL -#define _GCRY_GCC_ATTR_SENTINEL(a) -#endif - -/* Make up an attribute to mark functions and types as deprecated but - allow internal use by Libgcrypt. */ -#ifdef _GCRYPT_IN_LIBGCRYPT -#define _GCRY_ATTR_INTERNAL -#else -#define _GCRY_ATTR_INTERNAL _GCRY_GCC_ATTR_DEPRECATED -#endif - -/* Wrappers for the libgpg-error library. */ - -typedef gpg_error_t gcry_error_t; -typedef gpg_err_code_t gcry_err_code_t; -typedef gpg_err_source_t gcry_err_source_t; - -static GPG_ERR_INLINE gcry_error_t -gcry_err_make (gcry_err_source_t source, gcry_err_code_t code) -{ - return gpg_err_make (source, code); -} - -/* The user can define GPG_ERR_SOURCE_DEFAULT before including this - file to specify a default source for gpg_error. */ -#ifndef GCRY_ERR_SOURCE_DEFAULT -#define GCRY_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_USER_1 -#endif - -static GPG_ERR_INLINE gcry_error_t -gcry_error (gcry_err_code_t code) -{ - return gcry_err_make (GCRY_ERR_SOURCE_DEFAULT, code); -} - -static GPG_ERR_INLINE gcry_err_code_t -gcry_err_code (gcry_error_t err) -{ - return gpg_err_code (err); -} - - -static GPG_ERR_INLINE gcry_err_source_t -gcry_err_source (gcry_error_t err) -{ - return gpg_err_source (err); -} - -/* Return a pointer to a string containing a description of the error - code in the error value ERR. */ -const char *gcry_strerror (gcry_error_t err); - -/* Return a pointer to a string containing a description of the error - source in the error value ERR. */ -const char *gcry_strsource (gcry_error_t err); - -/* Retrieve the error code for the system error ERR. This returns - GPG_ERR_UNKNOWN_ERRNO if the system error is not mapped (report - this). */ -gcry_err_code_t gcry_err_code_from_errno (int err); - -/* Retrieve the system error for the error code CODE. This returns 0 - if CODE is not a system error code. */ -int gcry_err_code_to_errno (gcry_err_code_t code); - -/* Return an error value with the error source SOURCE and the system - error ERR. */ -gcry_error_t gcry_err_make_from_errno (gcry_err_source_t source, int err); - -/* Return an error value with the system error ERR. */ -gcry_err_code_t gcry_error_from_errno (int err); - - -/* NOTE: Since Libgcrypt 1.6 the thread callbacks are not anymore - used. However we keep it to allow for some source code - compatibility if used in the standard way. */ - -/* Constants defining the thread model to use. Used with the OPTION - field of the struct gcry_thread_cbs. */ -#define GCRY_THREAD_OPTION_DEFAULT 0 -#define GCRY_THREAD_OPTION_USER 1 -#define GCRY_THREAD_OPTION_PTH 2 -#define GCRY_THREAD_OPTION_PTHREAD 3 - -/* The version number encoded in the OPTION field of the struct - gcry_thread_cbs. */ -#define GCRY_THREAD_OPTION_VERSION 1 - -/* Wrapper for struct ath_ops. */ -struct gcry_thread_cbs -{ - /* The OPTION field encodes the thread model and the version number - of this structure. - Bits 7 - 0 are used for the thread model - Bits 15 - 8 are used for the version number. */ - unsigned int option; -} _GCRY_ATTR_INTERNAL; - -#define GCRY_THREAD_OPTION_PTH_IMPL \ - static struct gcry_thread_cbs gcry_threads_pth = { \ - (GCRY_THREAD_OPTION_PTH | (GCRY_THREAD_OPTION_VERSION << 8))} - -#define GCRY_THREAD_OPTION_PTHREAD_IMPL \ - static struct gcry_thread_cbs gcry_threads_pthread = { \ - (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8))} - - - -/* A generic context object as used by some functions. */ -struct gcry_context; -typedef struct gcry_context *gcry_ctx_t; - -/* The data objects used to hold multi precision integers. */ -struct gcry_mpi; -typedef struct gcry_mpi *gcry_mpi_t; -struct gcry_mpi_point; -typedef struct gcry_mpi_point *gcry_mpi_point_t; - -#ifndef GCRYPT_NO_DEPRECATED -typedef struct gcry_mpi *GCRY_MPI _GCRY_GCC_ATTR_DEPRECATED; -typedef struct gcry_mpi *GcryMPI _GCRY_GCC_ATTR_DEPRECATED; -#endif - -/* A structure used for scatter gather hashing. */ -typedef struct -{ - size_t size; /* The allocated size of the buffer or 0. */ - size_t off; /* Offset into the buffer. */ - size_t len; /* The used length of the buffer. */ - void *data; /* The buffer. */ -} gcry_buffer_t; - - - - -/* Check that the library fulfills the version requirement. */ -const char *gcry_check_version (const char *req_version); - -/* Codes for function dispatchers. */ - -/* Codes used with the gcry_control function. */ -enum gcry_ctl_cmds - { - /* Note: 1 .. 2 are not anymore used. */ - GCRYCTL_CFB_SYNC = 3, - GCRYCTL_RESET = 4, /* e.g. for MDs */ - GCRYCTL_FINALIZE = 5, - GCRYCTL_GET_KEYLEN = 6, - GCRYCTL_GET_BLKLEN = 7, - GCRYCTL_TEST_ALGO = 8, - GCRYCTL_IS_SECURE = 9, - GCRYCTL_GET_ASNOID = 10, - GCRYCTL_ENABLE_ALGO = 11, - GCRYCTL_DISABLE_ALGO = 12, - GCRYCTL_DUMP_RANDOM_STATS = 13, - GCRYCTL_DUMP_SECMEM_STATS = 14, - GCRYCTL_GET_ALGO_NPKEY = 15, - GCRYCTL_GET_ALGO_NSKEY = 16, - GCRYCTL_GET_ALGO_NSIGN = 17, - GCRYCTL_GET_ALGO_NENCR = 18, - GCRYCTL_SET_VERBOSITY = 19, - GCRYCTL_SET_DEBUG_FLAGS = 20, - GCRYCTL_CLEAR_DEBUG_FLAGS = 21, - GCRYCTL_USE_SECURE_RNDPOOL= 22, - GCRYCTL_DUMP_MEMORY_STATS = 23, - GCRYCTL_INIT_SECMEM = 24, - GCRYCTL_TERM_SECMEM = 25, - GCRYCTL_DISABLE_SECMEM_WARN = 27, - GCRYCTL_SUSPEND_SECMEM_WARN = 28, - GCRYCTL_RESUME_SECMEM_WARN = 29, - GCRYCTL_DROP_PRIVS = 30, - GCRYCTL_ENABLE_M_GUARD = 31, - GCRYCTL_START_DUMP = 32, - GCRYCTL_STOP_DUMP = 33, - GCRYCTL_GET_ALGO_USAGE = 34, - GCRYCTL_IS_ALGO_ENABLED = 35, - GCRYCTL_DISABLE_INTERNAL_LOCKING = 36, - GCRYCTL_DISABLE_SECMEM = 37, - GCRYCTL_INITIALIZATION_FINISHED = 38, - GCRYCTL_INITIALIZATION_FINISHED_P = 39, - GCRYCTL_ANY_INITIALIZATION_P = 40, - GCRYCTL_SET_CBC_CTS = 41, - GCRYCTL_SET_CBC_MAC = 42, - /* Note: 43 is not anymore used. */ - GCRYCTL_ENABLE_QUICK_RANDOM = 44, - GCRYCTL_SET_RANDOM_SEED_FILE = 45, - GCRYCTL_UPDATE_RANDOM_SEED_FILE = 46, - GCRYCTL_SET_THREAD_CBS = 47, - GCRYCTL_FAST_POLL = 48, - GCRYCTL_SET_RANDOM_DAEMON_SOCKET = 49, - GCRYCTL_USE_RANDOM_DAEMON = 50, - GCRYCTL_FAKED_RANDOM_P = 51, - GCRYCTL_SET_RNDEGD_SOCKET = 52, - GCRYCTL_PRINT_CONFIG = 53, - GCRYCTL_OPERATIONAL_P = 54, - GCRYCTL_FIPS_MODE_P = 55, - GCRYCTL_FORCE_FIPS_MODE = 56, - GCRYCTL_SELFTEST = 57, - /* Note: 58 .. 62 are used internally. */ - GCRYCTL_DISABLE_HWF = 63, - GCRYCTL_SET_ENFORCED_FIPS_FLAG = 64, - GCRYCTL_SET_PREFERRED_RNG_TYPE = 65, - GCRYCTL_GET_CURRENT_RNG_TYPE = 66, - GCRYCTL_DISABLE_LOCKED_SECMEM = 67, - GCRYCTL_DISABLE_PRIV_DROP = 68, - GCRYCTL_SET_CCM_LENGTHS = 69, - GCRYCTL_CLOSE_RANDOM_DEVICE = 70, - GCRYCTL_INACTIVATE_FIPS_FLAG = 71, - GCRYCTL_REACTIVATE_FIPS_FLAG = 72 - }; - -/* Perform various operations defined by CMD. */ -gcry_error_t gcry_control (enum gcry_ctl_cmds CMD, ...); - - -/* S-expression management. */ - -/* The object to represent an S-expression as used with the public key - functions. */ -struct gcry_sexp; -typedef struct gcry_sexp *gcry_sexp_t; - -#ifndef GCRYPT_NO_DEPRECATED -typedef struct gcry_sexp *GCRY_SEXP _GCRY_GCC_ATTR_DEPRECATED; -typedef struct gcry_sexp *GcrySexp _GCRY_GCC_ATTR_DEPRECATED; -#endif - -/* The possible values for the S-expression format. */ -enum gcry_sexp_format - { - GCRYSEXP_FMT_DEFAULT = 0, - GCRYSEXP_FMT_CANON = 1, - GCRYSEXP_FMT_BASE64 = 2, - GCRYSEXP_FMT_ADVANCED = 3 - }; - -/* Create an new S-expression object from BUFFER of size LENGTH and - return it in RETSEXP. With AUTODETECT set to 0 the data in BUFFER - is expected to be in canonized format. */ -gcry_error_t gcry_sexp_new (gcry_sexp_t *retsexp, - const void *buffer, size_t length, - int autodetect); - - /* Same as gcry_sexp_new but allows to pass a FREEFNC which has the - effect to transfer ownership of BUFFER to the created object. */ -gcry_error_t gcry_sexp_create (gcry_sexp_t *retsexp, - void *buffer, size_t length, - int autodetect, void (*freefnc) (void *)); - -/* Scan BUFFER and return a new S-expression object in RETSEXP. This - function expects a printf like string in BUFFER. */ -gcry_error_t gcry_sexp_sscan (gcry_sexp_t *retsexp, size_t *erroff, - const char *buffer, size_t length); - -/* Same as gcry_sexp_sscan but expects a string in FORMAT and can thus - only be used for certain encodings. */ -gcry_error_t gcry_sexp_build (gcry_sexp_t *retsexp, size_t *erroff, - const char *format, ...); - -/* Like gcry_sexp_build, but uses an array instead of variable - function arguments. */ -gcry_error_t gcry_sexp_build_array (gcry_sexp_t *retsexp, size_t *erroff, - const char *format, void **arg_list); - -/* Release the S-expression object SEXP */ -void gcry_sexp_release (gcry_sexp_t sexp); - -/* Calculate the length of an canonized S-expresion in BUFFER and - check for a valid encoding. */ -size_t gcry_sexp_canon_len (const unsigned char *buffer, size_t length, - size_t *erroff, gcry_error_t *errcode); - -/* Copies the S-expression object SEXP into BUFFER using the format - specified in MODE. */ -size_t gcry_sexp_sprint (gcry_sexp_t sexp, int mode, void *buffer, - size_t maxlength); - -/* Dumps the S-expression object A in a format suitable for debugging - to Libgcrypt's logging stream. */ -void gcry_sexp_dump (const gcry_sexp_t a); - -gcry_sexp_t gcry_sexp_cons (const gcry_sexp_t a, const gcry_sexp_t b); -gcry_sexp_t gcry_sexp_alist (const gcry_sexp_t *array); -gcry_sexp_t gcry_sexp_vlist (const gcry_sexp_t a, ...); -gcry_sexp_t gcry_sexp_append (const gcry_sexp_t a, const gcry_sexp_t n); -gcry_sexp_t gcry_sexp_prepend (const gcry_sexp_t a, const gcry_sexp_t n); - -/* Scan the S-expression for a sublist with a type (the car of the - list) matching the string TOKEN. If TOKLEN is not 0, the token is - assumed to be raw memory of this length. The function returns a - newly allocated S-expression consisting of the found sublist or - `NULL' when not found. */ -gcry_sexp_t gcry_sexp_find_token (gcry_sexp_t list, - const char *tok, size_t toklen); -/* Return the length of the LIST. For a valid S-expression this - should be at least 1. */ -int gcry_sexp_length (const gcry_sexp_t list); - -/* Create and return a new S-expression from the element with index - NUMBER in LIST. Note that the first element has the index 0. If - there is no such element, `NULL' is returned. */ -gcry_sexp_t gcry_sexp_nth (const gcry_sexp_t list, int number); - -/* Create and return a new S-expression from the first element in - LIST; this called the "type" and should always exist and be a - string. `NULL' is returned in case of a problem. */ -gcry_sexp_t gcry_sexp_car (const gcry_sexp_t list); - -/* Create and return a new list form all elements except for the first - one. Note, that this function may return an invalid S-expression - because it is not guaranteed, that the type exists and is a string. - However, for parsing a complex S-expression it might be useful for - intermediate lists. Returns `NULL' on error. */ -gcry_sexp_t gcry_sexp_cdr (const gcry_sexp_t list); - -gcry_sexp_t gcry_sexp_cadr (const gcry_sexp_t list); - - -/* This function is used to get data from a LIST. A pointer to the - actual data with index NUMBER is returned and the length of this - data will be stored to DATALEN. If there is no data at the given - index or the index represents another list, `NULL' is returned. - *Note:* The returned pointer is valid as long as LIST is not - modified or released. */ -const char *gcry_sexp_nth_data (const gcry_sexp_t list, int number, - size_t *datalen); - -/* This function is used to get data from a LIST. A malloced buffer to the - data with index NUMBER is returned and the length of this - data will be stored to RLENGTH. If there is no data at the given - index or the index represents another list, `NULL' is returned. */ -void *gcry_sexp_nth_buffer (const gcry_sexp_t list, int number, - size_t *rlength); - -/* This function is used to get and convert data from a LIST. The - data is assumed to be a Nul terminated string. The caller must - release the returned value using `gcry_free'. If there is no data - at the given index, the index represents a list or the value can't - be converted to a string, `NULL' is returned. */ -char *gcry_sexp_nth_string (gcry_sexp_t list, int number); - -/* This function is used to get and convert data from a LIST. This - data is assumed to be an MPI stored in the format described by - MPIFMT and returned as a standard Libgcrypt MPI. The caller must - release this returned value using `gcry_mpi_release'. If there is - no data at the given index, the index represents a list or the - value can't be converted to an MPI, `NULL' is returned. */ -gcry_mpi_t gcry_sexp_nth_mpi (gcry_sexp_t list, int number, int mpifmt); - -/* Convenience fucntion to extract parameters from an S-expression - * using a list of single letter parameters. */ -gpg_error_t gcry_sexp_extract_param (gcry_sexp_t sexp, - const char *path, - const char *list, - ...) _GCRY_GCC_ATTR_SENTINEL(0); - - -/******************************************* - * * - * Multi Precision Integer Functions * - * * - *******************************************/ - -/* Different formats of external big integer representation. */ -enum gcry_mpi_format - { - GCRYMPI_FMT_NONE= 0, - GCRYMPI_FMT_STD = 1, /* Twos complement stored without length. */ - GCRYMPI_FMT_PGP = 2, /* As used by OpenPGP (unsigned only). */ - GCRYMPI_FMT_SSH = 3, /* As used by SSH (like STD but with length). */ - GCRYMPI_FMT_HEX = 4, /* Hex format. */ - GCRYMPI_FMT_USG = 5, /* Like STD but unsigned. */ - GCRYMPI_FMT_OPAQUE = 8 /* Opaque format (some functions only). */ - }; - -/* Flags used for creating big integers. */ -enum gcry_mpi_flag - { - GCRYMPI_FLAG_SECURE = 1, /* Allocate the number in "secure" memory. */ - GCRYMPI_FLAG_OPAQUE = 2, /* The number is not a real one but just - a way to store some bytes. This is - useful for encrypted big integers. */ - GCRYMPI_FLAG_IMMUTABLE = 4, /* Mark the MPI as immutable. */ - GCRYMPI_FLAG_CONST = 8, /* Mark the MPI as a constant. */ - GCRYMPI_FLAG_USER1 = 0x0100,/* User flag 1. */ - GCRYMPI_FLAG_USER2 = 0x0200,/* User flag 2. */ - GCRYMPI_FLAG_USER3 = 0x0400,/* User flag 3. */ - GCRYMPI_FLAG_USER4 = 0x0800,/* User flag 4. */ - }; - - -/* Macros to return pre-defined MPI constants. */ -#define GCRYMPI_CONST_ONE (_gcry_mpi_get_const (1)) -#define GCRYMPI_CONST_TWO (_gcry_mpi_get_const (2)) -#define GCRYMPI_CONST_THREE (_gcry_mpi_get_const (3)) -#define GCRYMPI_CONST_FOUR (_gcry_mpi_get_const (4)) -#define GCRYMPI_CONST_EIGHT (_gcry_mpi_get_const (8)) - -/* Allocate a new big integer object, initialize it with 0 and - initially allocate memory for a number of at least NBITS. */ -gcry_mpi_t gcry_mpi_new (unsigned int nbits); - -/* Same as gcry_mpi_new() but allocate in "secure" memory. */ -gcry_mpi_t gcry_mpi_snew (unsigned int nbits); - -/* Release the number A and free all associated resources. */ -void gcry_mpi_release (gcry_mpi_t a); - -/* Create a new number with the same value as A. */ -gcry_mpi_t gcry_mpi_copy (const gcry_mpi_t a); - -/* Store the big integer value U in W and release U. */ -void gcry_mpi_snatch (gcry_mpi_t w, gcry_mpi_t u); - -/* Store the big integer value U in W. */ -gcry_mpi_t gcry_mpi_set (gcry_mpi_t w, const gcry_mpi_t u); - -/* Store the unsigned integer value U in W. */ -gcry_mpi_t gcry_mpi_set_ui (gcry_mpi_t w, unsigned long u); - -/* Swap the values of A and B. */ -void gcry_mpi_swap (gcry_mpi_t a, gcry_mpi_t b); - -/* Return 1 if A is negative; 0 if zero or positive. */ -int gcry_mpi_is_neg (gcry_mpi_t a); - -/* W = - U */ -void gcry_mpi_neg (gcry_mpi_t w, gcry_mpi_t u); - -/* W = [W] */ -void gcry_mpi_abs (gcry_mpi_t w); - -/* Compare the big integer number U and V returning 0 for equality, a - positive value for U > V and a negative for U < V. */ -int gcry_mpi_cmp (const gcry_mpi_t u, const gcry_mpi_t v); - -/* Compare the big integer number U with the unsigned integer V - returning 0 for equality, a positive value for U > V and a negative - for U < V. */ -int gcry_mpi_cmp_ui (const gcry_mpi_t u, unsigned long v); - -/* Convert the external representation of an integer stored in BUFFER - with a length of BUFLEN into a newly create MPI returned in - RET_MPI. If NSCANNED is not NULL, it will receive the number of - bytes actually scanned after a successful operation. */ -gcry_error_t gcry_mpi_scan (gcry_mpi_t *ret_mpi, enum gcry_mpi_format format, - const void *buffer, size_t buflen, - size_t *nscanned); - -/* Convert the big integer A into the external representation - described by FORMAT and store it in the provided BUFFER which has - been allocated by the user with a size of BUFLEN bytes. NWRITTEN - receives the actual length of the external representation unless it - has been passed as NULL. */ -gcry_error_t gcry_mpi_print (enum gcry_mpi_format format, - unsigned char *buffer, size_t buflen, - size_t *nwritten, - const gcry_mpi_t a); - -/* Convert the big integer A int the external representation described - by FORMAT and store it in a newly allocated buffer which address - will be put into BUFFER. NWRITTEN receives the actual lengths of the - external representation. */ -gcry_error_t gcry_mpi_aprint (enum gcry_mpi_format format, - unsigned char **buffer, size_t *nwritten, - const gcry_mpi_t a); - -/* Dump the value of A in a format suitable for debugging to - Libgcrypt's logging stream. Note that one leading space but no - trailing space or linefeed will be printed. It is okay to pass - NULL for A. */ -void gcry_mpi_dump (const gcry_mpi_t a); - - -/* W = U + V. */ -void gcry_mpi_add (gcry_mpi_t w, gcry_mpi_t u, gcry_mpi_t v); - -/* W = U + V. V is an unsigned integer. */ -void gcry_mpi_add_ui (gcry_mpi_t w, gcry_mpi_t u, unsigned long v); - -/* W = U + V mod M. */ -void gcry_mpi_addm (gcry_mpi_t w, gcry_mpi_t u, gcry_mpi_t v, gcry_mpi_t m); - -/* W = U - V. */ -void gcry_mpi_sub (gcry_mpi_t w, gcry_mpi_t u, gcry_mpi_t v); - -/* W = U - V. V is an unsigned integer. */ -void gcry_mpi_sub_ui (gcry_mpi_t w, gcry_mpi_t u, unsigned long v ); - -/* W = U - V mod M */ -void gcry_mpi_subm (gcry_mpi_t w, gcry_mpi_t u, gcry_mpi_t v, gcry_mpi_t m); - -/* W = U * V. */ -void gcry_mpi_mul (gcry_mpi_t w, gcry_mpi_t u, gcry_mpi_t v); - -/* W = U * V. V is an unsigned integer. */ -void gcry_mpi_mul_ui (gcry_mpi_t w, gcry_mpi_t u, unsigned long v ); - -/* W = U * V mod M. */ -void gcry_mpi_mulm (gcry_mpi_t w, gcry_mpi_t u, gcry_mpi_t v, gcry_mpi_t m); - -/* W = U * (2 ^ CNT). */ -void gcry_mpi_mul_2exp (gcry_mpi_t w, gcry_mpi_t u, unsigned long cnt); - -/* Q = DIVIDEND / DIVISOR, R = DIVIDEND % DIVISOR, - Q or R may be passed as NULL. ROUND should be negative or 0. */ -void gcry_mpi_div (gcry_mpi_t q, gcry_mpi_t r, - gcry_mpi_t dividend, gcry_mpi_t divisor, int round); - -/* R = DIVIDEND % DIVISOR */ -void gcry_mpi_mod (gcry_mpi_t r, gcry_mpi_t dividend, gcry_mpi_t divisor); - -/* W = B ^ E mod M. */ -void gcry_mpi_powm (gcry_mpi_t w, - const gcry_mpi_t b, const gcry_mpi_t e, - const gcry_mpi_t m); - -/* Set G to the greatest common divisor of A and B. - Return true if the G is 1. */ -int gcry_mpi_gcd (gcry_mpi_t g, gcry_mpi_t a, gcry_mpi_t b); - -/* Set X to the multiplicative inverse of A mod M. - Return true if the value exists. */ -int gcry_mpi_invm (gcry_mpi_t x, gcry_mpi_t a, gcry_mpi_t m); - -/* Create a new point object. NBITS is usually 0. */ -gcry_mpi_point_t gcry_mpi_point_new (unsigned int nbits); - -/* Release the object POINT. POINT may be NULL. */ -void gcry_mpi_point_release (gcry_mpi_point_t point); - -/* Store the projective coordinates from POINT into X, Y, and Z. */ -void gcry_mpi_point_get (gcry_mpi_t x, gcry_mpi_t y, gcry_mpi_t z, - gcry_mpi_point_t point); - -/* Store the projective coordinates from POINT into X, Y, and Z and - release POINT. */ -void gcry_mpi_point_snatch_get (gcry_mpi_t x, gcry_mpi_t y, gcry_mpi_t z, - gcry_mpi_point_t point); - -/* Store the projective coordinates X, Y, and Z into POINT. */ -gcry_mpi_point_t gcry_mpi_point_set (gcry_mpi_point_t point, - gcry_mpi_t x, gcry_mpi_t y, gcry_mpi_t z); - -/* Store the projective coordinates X, Y, and Z into POINT and release - X, Y, and Z. */ -gcry_mpi_point_t gcry_mpi_point_snatch_set (gcry_mpi_point_t point, - gcry_mpi_t x, gcry_mpi_t y, - gcry_mpi_t z); - -/* Allocate a new context for elliptic curve operations based on the - parameters given by KEYPARAM or using CURVENAME. */ -gpg_error_t gcry_mpi_ec_new (gcry_ctx_t *r_ctx, - gcry_sexp_t keyparam, const char *curvename); - -/* Get a named MPI from an elliptic curve context. */ -gcry_mpi_t gcry_mpi_ec_get_mpi (const char *name, gcry_ctx_t ctx, int copy); - -/* Get a named point from an elliptic curve context. */ -gcry_mpi_point_t gcry_mpi_ec_get_point (const char *name, - gcry_ctx_t ctx, int copy); - -/* Store a named MPI into an elliptic curve context. */ -gpg_error_t gcry_mpi_ec_set_mpi (const char *name, gcry_mpi_t newvalue, - gcry_ctx_t ctx); - -/* Store a named point into an elliptic curve context. */ -gpg_error_t gcry_mpi_ec_set_point (const char *name, gcry_mpi_point_t newvalue, - gcry_ctx_t ctx); - -/* Store the affine coordinates of POINT into X and Y. */ -int gcry_mpi_ec_get_affine (gcry_mpi_t x, gcry_mpi_t y, gcry_mpi_point_t point, - gcry_ctx_t ctx); - -/* W = 2 * U. */ -void gcry_mpi_ec_dup (gcry_mpi_point_t w, gcry_mpi_point_t u, gcry_ctx_t ctx); - -/* W = U + V. */ -void gcry_mpi_ec_add (gcry_mpi_point_t w, - gcry_mpi_point_t u, gcry_mpi_point_t v, gcry_ctx_t ctx); - -/* W = N * U. */ -void gcry_mpi_ec_mul (gcry_mpi_point_t w, gcry_mpi_t n, gcry_mpi_point_t u, - gcry_ctx_t ctx); - -/* Return true if POINT is on the curve described by CTX. */ -int gcry_mpi_ec_curve_point (gcry_mpi_point_t w, gcry_ctx_t ctx); - -/* Return the number of bits required to represent A. */ -unsigned int gcry_mpi_get_nbits (gcry_mpi_t a); - -/* Return true when bit number N (counting from 0) is set in A. */ -int gcry_mpi_test_bit (gcry_mpi_t a, unsigned int n); - -/* Set bit number N in A. */ -void gcry_mpi_set_bit (gcry_mpi_t a, unsigned int n); - -/* Clear bit number N in A. */ -void gcry_mpi_clear_bit (gcry_mpi_t a, unsigned int n); - -/* Set bit number N in A and clear all bits greater than N. */ -void gcry_mpi_set_highbit (gcry_mpi_t a, unsigned int n); - -/* Clear bit number N in A and all bits greater than N. */ -void gcry_mpi_clear_highbit (gcry_mpi_t a, unsigned int n); - -/* Shift the value of A by N bits to the right and store the result in X. */ -void gcry_mpi_rshift (gcry_mpi_t x, gcry_mpi_t a, unsigned int n); - -/* Shift the value of A by N bits to the left and store the result in X. */ -void gcry_mpi_lshift (gcry_mpi_t x, gcry_mpi_t a, unsigned int n); - -/* Store NBITS of the value P points to in A and mark A as an opaque - value. On success A received the the ownership of the value P. - WARNING: Never use an opaque MPI for anything thing else than - gcry_mpi_release, gcry_mpi_get_opaque. */ -gcry_mpi_t gcry_mpi_set_opaque (gcry_mpi_t a, void *p, unsigned int nbits); - -/* Store NBITS of the value P points to in A and mark A as an opaque - value. The function takes a copy of the provided value P. - WARNING: Never use an opaque MPI for anything thing else than - gcry_mpi_release, gcry_mpi_get_opaque. */ -gcry_mpi_t gcry_mpi_set_opaque_copy (gcry_mpi_t a, - const void *p, unsigned int nbits); - -/* Return a pointer to an opaque value stored in A and return its size - in NBITS. Note that the returned pointer is still owned by A and - that the function should never be used for an non-opaque MPI. */ -void *gcry_mpi_get_opaque (gcry_mpi_t a, unsigned int *nbits); - -/* Set the FLAG for the big integer A. Currently only the flag - GCRYMPI_FLAG_SECURE is allowed to convert A into an big intger - stored in "secure" memory. */ -void gcry_mpi_set_flag (gcry_mpi_t a, enum gcry_mpi_flag flag); - -/* Clear FLAG for the big integer A. Note that this function is - currently useless as no flags are allowed. */ -void gcry_mpi_clear_flag (gcry_mpi_t a, enum gcry_mpi_flag flag); - -/* Return true if the FLAG is set for A. */ -int gcry_mpi_get_flag (gcry_mpi_t a, enum gcry_mpi_flag flag); - -/* Private function - do not use. */ -gcry_mpi_t _gcry_mpi_get_const (int no); - -/* Unless the GCRYPT_NO_MPI_MACROS is used, provide a couple of - convenience macros for the big integer functions. */ -#ifndef GCRYPT_NO_MPI_MACROS -#define mpi_new(n) gcry_mpi_new( (n) ) -#define mpi_secure_new( n ) gcry_mpi_snew( (n) ) -#define mpi_release(a) \ - do \ - { \ - gcry_mpi_release ((a)); \ - (a) = NULL; \ - } \ - while (0) - -#define mpi_copy( a ) gcry_mpi_copy( (a) ) -#define mpi_snatch( w, u) gcry_mpi_snatch( (w), (u) ) -#define mpi_set( w, u) gcry_mpi_set( (w), (u) ) -#define mpi_set_ui( w, u) gcry_mpi_set_ui( (w), (u) ) -#define mpi_abs( w ) gcry_mpi_abs( (w) ) -#define mpi_neg( w, u) gcry_mpi_neg( (w), (u) ) -#define mpi_cmp( u, v ) gcry_mpi_cmp( (u), (v) ) -#define mpi_cmp_ui( u, v ) gcry_mpi_cmp_ui( (u), (v) ) -#define mpi_is_neg( a ) gcry_mpi_is_neg ((a)) - -#define mpi_add_ui(w,u,v) gcry_mpi_add_ui((w),(u),(v)) -#define mpi_add(w,u,v) gcry_mpi_add ((w),(u),(v)) -#define mpi_addm(w,u,v,m) gcry_mpi_addm ((w),(u),(v),(m)) -#define mpi_sub_ui(w,u,v) gcry_mpi_sub_ui ((w),(u),(v)) -#define mpi_sub(w,u,v) gcry_mpi_sub ((w),(u),(v)) -#define mpi_subm(w,u,v,m) gcry_mpi_subm ((w),(u),(v),(m)) -#define mpi_mul_ui(w,u,v) gcry_mpi_mul_ui ((w),(u),(v)) -#define mpi_mul_2exp(w,u,v) gcry_mpi_mul_2exp ((w),(u),(v)) -#define mpi_mul(w,u,v) gcry_mpi_mul ((w),(u),(v)) -#define mpi_mulm(w,u,v,m) gcry_mpi_mulm ((w),(u),(v),(m)) -#define mpi_powm(w,b,e,m) gcry_mpi_powm ( (w), (b), (e), (m) ) -#define mpi_tdiv(q,r,a,m) gcry_mpi_div ( (q), (r), (a), (m), 0) -#define mpi_fdiv(q,r,a,m) gcry_mpi_div ( (q), (r), (a), (m), -1) -#define mpi_mod(r,a,m) gcry_mpi_mod ((r), (a), (m)) -#define mpi_gcd(g,a,b) gcry_mpi_gcd ( (g), (a), (b) ) -#define mpi_invm(g,a,b) gcry_mpi_invm ( (g), (a), (b) ) - -#define mpi_point_new(n) gcry_mpi_point_new((n)) -#define mpi_point_release(p) \ - do \ - { \ - gcry_mpi_point_release ((p)); \ - (p) = NULL; \ - } \ - while (0) -#define mpi_point_get(x,y,z,p) gcry_mpi_point_get((x),(y),(z),(p)) -#define mpi_point_snatch_get(x,y,z,p) gcry_mpi_point_snatch_get((x),(y),(z),(p)) -#define mpi_point_set(p,x,y,z) gcry_mpi_point_set((p),(x),(y),(z)) -#define mpi_point_snatch_set(p,x,y,z) gcry_mpi_point_snatch_set((p),(x),(y),(z)) - -#define mpi_get_nbits(a) gcry_mpi_get_nbits ((a)) -#define mpi_test_bit(a,b) gcry_mpi_test_bit ((a),(b)) -#define mpi_set_bit(a,b) gcry_mpi_set_bit ((a),(b)) -#define mpi_set_highbit(a,b) gcry_mpi_set_highbit ((a),(b)) -#define mpi_clear_bit(a,b) gcry_mpi_clear_bit ((a),(b)) -#define mpi_clear_highbit(a,b) gcry_mpi_clear_highbit ((a),(b)) -#define mpi_rshift(a,b,c) gcry_mpi_rshift ((a),(b),(c)) -#define mpi_lshift(a,b,c) gcry_mpi_lshift ((a),(b),(c)) - -#define mpi_set_opaque(a,b,c) gcry_mpi_set_opaque( (a), (b), (c) ) -#define mpi_get_opaque(a,b) gcry_mpi_get_opaque( (a), (b) ) -#endif /* GCRYPT_NO_MPI_MACROS */ - - - -/************************************ - * * - * Symmetric Cipher Functions * - * * - ************************************/ - -/* The data object used to hold a handle to an encryption object. */ -struct gcry_cipher_handle; -typedef struct gcry_cipher_handle *gcry_cipher_hd_t; - -#ifndef GCRYPT_NO_DEPRECATED -typedef struct gcry_cipher_handle *GCRY_CIPHER_HD _GCRY_GCC_ATTR_DEPRECATED; -typedef struct gcry_cipher_handle *GcryCipherHd _GCRY_GCC_ATTR_DEPRECATED; -#endif - -/* All symmetric encryption algorithms are identified by their IDs. - More IDs may be registered at runtime. */ -enum gcry_cipher_algos - { - GCRY_CIPHER_NONE = 0, - GCRY_CIPHER_IDEA = 1, - GCRY_CIPHER_3DES = 2, - GCRY_CIPHER_CAST5 = 3, - GCRY_CIPHER_BLOWFISH = 4, - GCRY_CIPHER_SAFER_SK128 = 5, - GCRY_CIPHER_DES_SK = 6, - GCRY_CIPHER_AES = 7, - GCRY_CIPHER_AES192 = 8, - GCRY_CIPHER_AES256 = 9, - GCRY_CIPHER_TWOFISH = 10, - - /* Other cipher numbers are above 300 for OpenPGP reasons. */ - GCRY_CIPHER_ARCFOUR = 301, /* Fully compatible with RSA's RC4 (tm). */ - GCRY_CIPHER_DES = 302, /* Yes, this is single key 56 bit DES. */ - GCRY_CIPHER_TWOFISH128 = 303, - GCRY_CIPHER_SERPENT128 = 304, - GCRY_CIPHER_SERPENT192 = 305, - GCRY_CIPHER_SERPENT256 = 306, - GCRY_CIPHER_RFC2268_40 = 307, /* Ron's Cipher 2 (40 bit). */ - GCRY_CIPHER_RFC2268_128 = 308, /* Ron's Cipher 2 (128 bit). */ - GCRY_CIPHER_SEED = 309, /* 128 bit cipher described in RFC4269. */ - GCRY_CIPHER_CAMELLIA128 = 310, - GCRY_CIPHER_CAMELLIA192 = 311, - GCRY_CIPHER_CAMELLIA256 = 312, - GCRY_CIPHER_SALSA20 = 313, - GCRY_CIPHER_SALSA20R12 = 314, - GCRY_CIPHER_GOST28147 = 315 - }; - -/* The Rijndael algorithm is basically AES, so provide some macros. */ -#define GCRY_CIPHER_AES128 GCRY_CIPHER_AES -#define GCRY_CIPHER_RIJNDAEL GCRY_CIPHER_AES -#define GCRY_CIPHER_RIJNDAEL128 GCRY_CIPHER_AES128 -#define GCRY_CIPHER_RIJNDAEL192 GCRY_CIPHER_AES192 -#define GCRY_CIPHER_RIJNDAEL256 GCRY_CIPHER_AES256 - -/* The supported encryption modes. Note that not all of them are - supported for each algorithm. */ -enum gcry_cipher_modes - { - GCRY_CIPHER_MODE_NONE = 0, /* Not yet specified. */ - GCRY_CIPHER_MODE_ECB = 1, /* Electronic codebook. */ - GCRY_CIPHER_MODE_CFB = 2, /* Cipher feedback. */ - GCRY_CIPHER_MODE_CBC = 3, /* Cipher block chaining. */ - GCRY_CIPHER_MODE_STREAM = 4, /* Used with stream ciphers. */ - GCRY_CIPHER_MODE_OFB = 5, /* Outer feedback. */ - GCRY_CIPHER_MODE_CTR = 6, /* Counter. */ - GCRY_CIPHER_MODE_AESWRAP= 7, /* AES-WRAP algorithm. */ - GCRY_CIPHER_MODE_CCM = 8, /* Counter with CBC-MAC. */ - GCRY_CIPHER_MODE_GCM = 9 /* Galois Counter Mode. */ - }; - -/* Flags used with the open function. */ -enum gcry_cipher_flags - { - GCRY_CIPHER_SECURE = 1, /* Allocate in secure memory. */ - GCRY_CIPHER_ENABLE_SYNC = 2, /* Enable CFB sync mode. */ - GCRY_CIPHER_CBC_CTS = 4, /* Enable CBC cipher text stealing (CTS). */ - GCRY_CIPHER_CBC_MAC = 8 /* Enable CBC message auth. code (MAC). */ - }; - -/* GCM works only with blocks of 128 bits */ -#define GCRY_GCM_BLOCK_LEN (128 / 8) - -/* CCM works only with blocks of 128 bits. */ -#define GCRY_CCM_BLOCK_LEN (128 / 8) - -/* Create a handle for algorithm ALGO to be used in MODE. FLAGS may - be given as an bitwise OR of the gcry_cipher_flags values. */ -gcry_error_t gcry_cipher_open (gcry_cipher_hd_t *handle, - int algo, int mode, unsigned int flags); - -/* Close the cioher handle H and release all resource. */ -void gcry_cipher_close (gcry_cipher_hd_t h); - -/* Perform various operations on the cipher object H. */ -gcry_error_t gcry_cipher_ctl (gcry_cipher_hd_t h, int cmd, void *buffer, - size_t buflen); - -/* Retrieve various information about the cipher object H. */ -gcry_error_t gcry_cipher_info (gcry_cipher_hd_t h, int what, void *buffer, - size_t *nbytes); - -/* Retrieve various information about the cipher algorithm ALGO. */ -gcry_error_t gcry_cipher_algo_info (int algo, int what, void *buffer, - size_t *nbytes); - -/* Map the cipher algorithm whose ID is contained in ALGORITHM to a - string representation of the algorithm name. For unknown algorithm - IDs this function returns "?". */ -const char *gcry_cipher_algo_name (int algorithm) _GCRY_GCC_ATTR_PURE; - -/* Map the algorithm name NAME to an cipher algorithm ID. Return 0 if - the algorithm name is not known. */ -int gcry_cipher_map_name (const char *name) _GCRY_GCC_ATTR_PURE; - -/* Given an ASN.1 object identifier in standard IETF dotted decimal - format in STRING, return the encryption mode associated with that - OID or 0 if not known or applicable. */ -int gcry_cipher_mode_from_oid (const char *string) _GCRY_GCC_ATTR_PURE; - -/* Encrypt the plaintext of size INLEN in IN using the cipher handle H - into the buffer OUT which has an allocated length of OUTSIZE. For - most algorithms it is possible to pass NULL for in and 0 for INLEN - and do a in-place decryption of the data provided in OUT. */ -gcry_error_t gcry_cipher_encrypt (gcry_cipher_hd_t h, - void *out, size_t outsize, - const void *in, size_t inlen); - -/* The counterpart to gcry_cipher_encrypt. */ -gcry_error_t gcry_cipher_decrypt (gcry_cipher_hd_t h, - void *out, size_t outsize, - const void *in, size_t inlen); - -/* Set KEY of length KEYLEN bytes for the cipher handle HD. */ -gcry_error_t gcry_cipher_setkey (gcry_cipher_hd_t hd, - const void *key, size_t keylen); - - -/* Set initialization vector IV of length IVLEN for the cipher handle HD. */ -gcry_error_t gcry_cipher_setiv (gcry_cipher_hd_t hd, - const void *iv, size_t ivlen); - -/* Provide additional authentication data for AEAD modes/ciphers. */ -gcry_error_t gcry_cipher_authenticate (gcry_cipher_hd_t hd, const void *abuf, - size_t abuflen); - -/* Get authentication tag for AEAD modes/ciphers. */ -gcry_error_t gcry_cipher_gettag (gcry_cipher_hd_t hd, void *outtag, - size_t taglen); - -/* Check authentication tag for AEAD modes/ciphers. */ -gcry_error_t gcry_cipher_checktag (gcry_cipher_hd_t hd, const void *intag, - size_t taglen); - -/* Reset the handle to the state after open. */ -#define gcry_cipher_reset(h) gcry_cipher_ctl ((h), GCRYCTL_RESET, NULL, 0) - -/* Perform the OpenPGP sync operation if this is enabled for the - cipher handle H. */ -#define gcry_cipher_sync(h) gcry_cipher_ctl( (h), GCRYCTL_CFB_SYNC, NULL, 0) - -/* Enable or disable CTS in future calls to gcry_encrypt(). CBC mode only. */ -#define gcry_cipher_cts(h,on) gcry_cipher_ctl( (h), GCRYCTL_SET_CBC_CTS, \ - NULL, on ) - -/* Set counter for CTR mode. (CTR,CTRLEN) must denote a buffer of - block size length, or (NULL,0) to set the CTR to the all-zero block. */ -gpg_error_t gcry_cipher_setctr (gcry_cipher_hd_t hd, - const void *ctr, size_t ctrlen); - -/* Retrieve the key length in bytes used with algorithm A. */ -size_t gcry_cipher_get_algo_keylen (int algo); - -/* Retrieve the block length in bytes used with algorithm A. */ -size_t gcry_cipher_get_algo_blklen (int algo); - -/* Return 0 if the algorithm A is available for use. */ -#define gcry_cipher_test_algo(a) \ - gcry_cipher_algo_info( (a), GCRYCTL_TEST_ALGO, NULL, NULL ) - - -/************************************ - * * - * Asymmetric Cipher Functions * - * * - ************************************/ - -/* The algorithms and their IDs we support. */ -enum gcry_pk_algos - { - GCRY_PK_RSA = 1, /* RSA */ - GCRY_PK_RSA_E = 2, /* (deprecated: use 1). */ - GCRY_PK_RSA_S = 3, /* (deprecated: use 1). */ - GCRY_PK_ELG_E = 16, /* (deprecated: use 20). */ - GCRY_PK_DSA = 17, /* Digital Signature Algorithm. */ - GCRY_PK_ECC = 18, /* Generic ECC. */ - GCRY_PK_ELG = 20, /* Elgamal */ - GCRY_PK_ECDSA = 301, /* (deprecated: use 18). */ - GCRY_PK_ECDH = 302 /* (deprecated: use 18). */ - }; - -/* Flags describing usage capabilities of a PK algorithm. */ -#define GCRY_PK_USAGE_SIGN 1 /* Good for signatures. */ -#define GCRY_PK_USAGE_ENCR 2 /* Good for encryption. */ -#define GCRY_PK_USAGE_CERT 4 /* Good to certify other keys. */ -#define GCRY_PK_USAGE_AUTH 8 /* Good for authentication. */ -#define GCRY_PK_USAGE_UNKN 128 /* Unknown usage flag. */ - -/* Modes used with gcry_pubkey_get_sexp. */ -#define GCRY_PK_GET_PUBKEY 1 -#define GCRY_PK_GET_SECKEY 2 - -/* Encrypt the DATA using the public key PKEY and store the result as - a newly created S-expression at RESULT. */ -gcry_error_t gcry_pk_encrypt (gcry_sexp_t *result, - gcry_sexp_t data, gcry_sexp_t pkey); - -/* Decrypt the DATA using the private key SKEY and store the result as - a newly created S-expression at RESULT. */ -gcry_error_t gcry_pk_decrypt (gcry_sexp_t *result, - gcry_sexp_t data, gcry_sexp_t skey); - -/* Sign the DATA using the private key SKEY and store the result as - a newly created S-expression at RESULT. */ -gcry_error_t gcry_pk_sign (gcry_sexp_t *result, - gcry_sexp_t data, gcry_sexp_t skey); - -/* Check the signature SIGVAL on DATA using the public key PKEY. */ -gcry_error_t gcry_pk_verify (gcry_sexp_t sigval, - gcry_sexp_t data, gcry_sexp_t pkey); - -/* Check that private KEY is sane. */ -gcry_error_t gcry_pk_testkey (gcry_sexp_t key); - -/* Generate a new key pair according to the parameters given in - S_PARMS. The new key pair is returned in as an S-expression in - R_KEY. */ -gcry_error_t gcry_pk_genkey (gcry_sexp_t *r_key, gcry_sexp_t s_parms); - -/* Catch all function for miscellaneous operations. */ -gcry_error_t gcry_pk_ctl (int cmd, void *buffer, size_t buflen); - -/* Retrieve information about the public key algorithm ALGO. */ -gcry_error_t gcry_pk_algo_info (int algo, int what, - void *buffer, size_t *nbytes); - -/* Map the public key algorithm whose ID is contained in ALGORITHM to - a string representation of the algorithm name. For unknown - algorithm IDs this functions returns "?". */ -const char *gcry_pk_algo_name (int algorithm) _GCRY_GCC_ATTR_PURE; - -/* Map the algorithm NAME to a public key algorithm Id. Return 0 if - the algorithm name is not known. */ -int gcry_pk_map_name (const char* name) _GCRY_GCC_ATTR_PURE; - -/* Return what is commonly referred as the key length for the given - public or private KEY. */ -unsigned int gcry_pk_get_nbits (gcry_sexp_t key) _GCRY_GCC_ATTR_PURE; - -/* Return the so called KEYGRIP which is the SHA-1 hash of the public - key parameters expressed in a way depending on the algorithm. */ -unsigned char *gcry_pk_get_keygrip (gcry_sexp_t key, unsigned char *array); - -/* Return the name of the curve matching KEY. */ -const char *gcry_pk_get_curve (gcry_sexp_t key, int iterator, - unsigned int *r_nbits); - -/* Return an S-expression with the parameters of the named ECC curve - NAME. ALGO must be set to an ECC algorithm. */ -gcry_sexp_t gcry_pk_get_param (int algo, const char *name); - -/* Return 0 if the public key algorithm A is available for use. */ -#define gcry_pk_test_algo(a) \ - gcry_pk_algo_info( (a), GCRYCTL_TEST_ALGO, NULL, NULL ) - -/* Return an S-expression representing the context CTX. */ -gcry_error_t gcry_pubkey_get_sexp (gcry_sexp_t *r_sexp, - int mode, gcry_ctx_t ctx); - - - -/************************************ - * * - * Cryptograhic Hash Functions * - * * - ************************************/ - -/* Algorithm IDs for the hash functions we know about. Not all of them - are implemnted. */ -enum gcry_md_algos - { - GCRY_MD_NONE = 0, - GCRY_MD_MD5 = 1, - GCRY_MD_SHA1 = 2, - GCRY_MD_RMD160 = 3, - GCRY_MD_MD2 = 5, - GCRY_MD_TIGER = 6, /* TIGER/192 as used by gpg <= 1.3.2. */ - GCRY_MD_HAVAL = 7, /* HAVAL, 5 pass, 160 bit. */ - GCRY_MD_SHA256 = 8, - GCRY_MD_SHA384 = 9, - GCRY_MD_SHA512 = 10, - GCRY_MD_SHA224 = 11, - GCRY_MD_MD4 = 301, - GCRY_MD_CRC32 = 302, - GCRY_MD_CRC32_RFC1510 = 303, - GCRY_MD_CRC24_RFC2440 = 304, - GCRY_MD_WHIRLPOOL = 305, - GCRY_MD_TIGER1 = 306, /* TIGER fixed. */ - GCRY_MD_TIGER2 = 307, /* TIGER2 variant. */ - GCRY_MD_GOSTR3411_94 = 308, /* GOST R 34.11-94. */ - GCRY_MD_STRIBOG256 = 309, /* GOST R 34.11-2012, 256 bit. */ - GCRY_MD_STRIBOG512 = 310 /* GOST R 34.11-2012, 512 bit. */ - }; - -/* Flags used with the open function. */ -enum gcry_md_flags - { - GCRY_MD_FLAG_SECURE = 1, /* Allocate all buffers in "secure" memory. */ - GCRY_MD_FLAG_HMAC = 2, /* Make an HMAC out of this algorithm. */ - GCRY_MD_FLAG_BUGEMU1 = 0x0100 - }; - -/* (Forward declaration.) */ -struct gcry_md_context; - -/* This object is used to hold a handle to a message digest object. - This structure is private - only to be used by the public gcry_md_* - macros. */ -typedef struct gcry_md_handle -{ - /* Actual context. */ - struct gcry_md_context *ctx; - - /* Buffer management. */ - int bufpos; - int bufsize; - unsigned char buf[1]; -} *gcry_md_hd_t; - -/* Compatibility types, do not use them. */ -#ifndef GCRYPT_NO_DEPRECATED -typedef struct gcry_md_handle *GCRY_MD_HD _GCRY_GCC_ATTR_DEPRECATED; -typedef struct gcry_md_handle *GcryMDHd _GCRY_GCC_ATTR_DEPRECATED; -#endif - -/* Create a message digest object for algorithm ALGO. FLAGS may be - given as an bitwise OR of the gcry_md_flags values. ALGO may be - given as 0 if the algorithms to be used are later set using - gcry_md_enable. */ -gcry_error_t gcry_md_open (gcry_md_hd_t *h, int algo, unsigned int flags); - -/* Release the message digest object HD. */ -void gcry_md_close (gcry_md_hd_t hd); - -/* Add the message digest algorithm ALGO to the digest object HD. */ -gcry_error_t gcry_md_enable (gcry_md_hd_t hd, int algo); - -/* Create a new digest object as an exact copy of the object HD. */ -gcry_error_t gcry_md_copy (gcry_md_hd_t *bhd, gcry_md_hd_t ahd); - -/* Reset the digest object HD to its initial state. */ -void gcry_md_reset (gcry_md_hd_t hd); - -/* Perform various operations on the digest object HD. */ -gcry_error_t gcry_md_ctl (gcry_md_hd_t hd, int cmd, - void *buffer, size_t buflen); - -/* Pass LENGTH bytes of data in BUFFER to the digest object HD so that - it can update the digest values. This is the actual hash - function. */ -void gcry_md_write (gcry_md_hd_t hd, const void *buffer, size_t length); - -/* Read out the final digest from HD return the digest value for - algorithm ALGO. */ -unsigned char *gcry_md_read (gcry_md_hd_t hd, int algo); - -/* Convenience function to calculate the hash from the data in BUFFER - of size LENGTH using the algorithm ALGO avoiding the creating of a - hash object. The hash is returned in the caller provided buffer - DIGEST which must be large enough to hold the digest of the given - algorithm. */ -void gcry_md_hash_buffer (int algo, void *digest, - const void *buffer, size_t length); - -/* Convenience function to hash multiple buffers. */ -gpg_error_t gcry_md_hash_buffers (int algo, unsigned int flags, void *digest, - const gcry_buffer_t *iov, int iovcnt); - -/* Retrieve the algorithm used with HD. This does not work reliable - if more than one algorithm is enabled in HD. */ -int gcry_md_get_algo (gcry_md_hd_t hd); - -/* Retrieve the length in bytes of the digest yielded by algorithm - ALGO. */ -unsigned int gcry_md_get_algo_dlen (int algo); - -/* Return true if the the algorithm ALGO is enabled in the digest - object A. */ -int gcry_md_is_enabled (gcry_md_hd_t a, int algo); - -/* Return true if the digest object A is allocated in "secure" memory. */ -int gcry_md_is_secure (gcry_md_hd_t a); - -/* Retrieve various information about the object H. */ -gcry_error_t gcry_md_info (gcry_md_hd_t h, int what, void *buffer, - size_t *nbytes); - -/* Retrieve various information about the algorithm ALGO. */ -gcry_error_t gcry_md_algo_info (int algo, int what, void *buffer, - size_t *nbytes); - -/* Map the digest algorithm id ALGO to a string representation of the - algorithm name. For unknown algorithms this function returns - "?". */ -const char *gcry_md_algo_name (int algo) _GCRY_GCC_ATTR_PURE; - -/* Map the algorithm NAME to a digest algorithm Id. Return 0 if - the algorithm name is not known. */ -int gcry_md_map_name (const char* name) _GCRY_GCC_ATTR_PURE; - -/* For use with the HMAC feature, the set MAC key to the KEY of - KEYLEN bytes. */ -gcry_error_t gcry_md_setkey (gcry_md_hd_t hd, const void *key, size_t keylen); - -/* Start or stop debugging for digest handle HD; i.e. create a file - named dbgmd-. while hashing. If SUFFIX is NULL, - debugging stops and the file will be closed. */ -void gcry_md_debug (gcry_md_hd_t hd, const char *suffix); - - -/* Update the hash(s) of H with the character C. This is a buffered - version of the gcry_md_write function. */ -#define gcry_md_putc(h,c) \ - do { \ - gcry_md_hd_t h__ = (h); \ - if( (h__)->bufpos == (h__)->bufsize ) \ - gcry_md_write( (h__), NULL, 0 ); \ - (h__)->buf[(h__)->bufpos++] = (c) & 0xff; \ - } while(0) - -/* Finalize the digest calculation. This is not really needed because - gcry_md_read() does this implicitly. */ -#define gcry_md_final(a) \ - gcry_md_ctl ((a), GCRYCTL_FINALIZE, NULL, 0) - -/* Return 0 if the algorithm A is available for use. */ -#define gcry_md_test_algo(a) \ - gcry_md_algo_info( (a), GCRYCTL_TEST_ALGO, NULL, NULL ) - -/* Return an DER encoded ASN.1 OID for the algorithm A in buffer B. N - must point to size_t variable with the available size of buffer B. - After return it will receive the actual size of the returned - OID. */ -#define gcry_md_get_asnoid(a,b,n) \ - gcry_md_algo_info((a), GCRYCTL_GET_ASNOID, (b), (n)) - - - -/********************************************** - * * - * Message Authentication Code Functions * - * * - **********************************************/ - -/* The data object used to hold a handle to an encryption object. */ -struct gcry_mac_handle; -typedef struct gcry_mac_handle *gcry_mac_hd_t; - -/* Algorithm IDs for the hash functions we know about. Not all of them - are implemented. */ -enum gcry_mac_algos - { - GCRY_MAC_NONE = 0, - - GCRY_MAC_HMAC_SHA256 = 101, - GCRY_MAC_HMAC_SHA224 = 102, - GCRY_MAC_HMAC_SHA512 = 103, - GCRY_MAC_HMAC_SHA384 = 104, - GCRY_MAC_HMAC_SHA1 = 105, - GCRY_MAC_HMAC_MD5 = 106, - GCRY_MAC_HMAC_MD4 = 107, - GCRY_MAC_HMAC_RMD160 = 108, - GCRY_MAC_HMAC_TIGER1 = 109, /* The fixed TIGER variant */ - GCRY_MAC_HMAC_WHIRLPOOL = 110, - GCRY_MAC_HMAC_GOSTR3411_94 = 111, - GCRY_MAC_HMAC_STRIBOG256 = 112, - GCRY_MAC_HMAC_STRIBOG512 = 113, - - GCRY_MAC_CMAC_AES = 201, - GCRY_MAC_CMAC_3DES = 202, - GCRY_MAC_CMAC_CAMELLIA = 203, - GCRY_MAC_CMAC_CAST5 = 204, - GCRY_MAC_CMAC_BLOWFISH = 205, - GCRY_MAC_CMAC_TWOFISH = 206, - GCRY_MAC_CMAC_SERPENT = 207, - GCRY_MAC_CMAC_SEED = 208, - GCRY_MAC_CMAC_RFC2268 = 209, - GCRY_MAC_CMAC_IDEA = 210, - GCRY_MAC_CMAC_GOST28147 = 211, - - GCRY_MAC_GMAC_AES = 401, - GCRY_MAC_GMAC_CAMELLIA = 402, - GCRY_MAC_GMAC_TWOFISH = 403, - GCRY_MAC_GMAC_SERPENT = 404, - GCRY_MAC_GMAC_SEED = 405 - }; - -/* Flags used with the open function. */ -enum gcry_mac_flags - { - GCRY_MAC_FLAG_SECURE = 1, /* Allocate all buffers in "secure" memory. */ - }; - -/* Create a MAC handle for algorithm ALGO. FLAGS may be given as an bitwise OR - of the gcry_mac_flags values. CTX maybe NULL or gcry_ctx_t object to be - associated with HANDLE. */ -gcry_error_t gcry_mac_open (gcry_mac_hd_t *handle, int algo, - unsigned int flags, gcry_ctx_t ctx); - -/* Close the MAC handle H and release all resource. */ -void gcry_mac_close (gcry_mac_hd_t h); - -/* Perform various operations on the MAC object H. */ -gcry_error_t gcry_mac_ctl (gcry_mac_hd_t h, int cmd, void *buffer, - size_t buflen); - -/* Retrieve various information about the MAC algorithm ALGO. */ -gcry_error_t gcry_mac_algo_info (int algo, int what, void *buffer, - size_t *nbytes); - -/* Set KEY of length KEYLEN bytes for the MAC handle HD. */ -gcry_error_t gcry_mac_setkey (gcry_mac_hd_t hd, const void *key, - size_t keylen); - -/* Set initialization vector IV of length IVLEN for the MAC handle HD. */ -gcry_error_t gcry_mac_setiv (gcry_mac_hd_t hd, const void *iv, - size_t ivlen); - -/* Pass LENGTH bytes of data in BUFFER to the MAC object HD so that - it can update the MAC values. */ -gcry_error_t gcry_mac_write (gcry_mac_hd_t hd, const void *buffer, - size_t length); - -/* Read out the final authentication code from the MAC object HD to BUFFER. */ -gcry_error_t gcry_mac_read (gcry_mac_hd_t hd, void *buffer, size_t *buflen); - -/* Verify the final authentication code from the MAC object HD with BUFFER. */ -gcry_error_t gcry_mac_verify (gcry_mac_hd_t hd, const void *buffer, - size_t buflen); - -/* Retrieve the length in bytes of the MAC yielded by algorithm ALGO. */ -unsigned int gcry_mac_get_algo_maclen (int algo); - -/* Retrieve the default key length in bytes used with algorithm A. */ -unsigned int gcry_mac_get_algo_keylen (int algo); - -/* Map the MAC algorithm whose ID is contained in ALGORITHM to a - string representation of the algorithm name. For unknown algorithm - IDs this function returns "?". */ -const char *gcry_mac_algo_name (int algorithm) _GCRY_GCC_ATTR_PURE; - -/* Map the algorithm name NAME to an MAC algorithm ID. Return 0 if - the algorithm name is not known. */ -int gcry_mac_map_name (const char *name) _GCRY_GCC_ATTR_PURE; - -/* Reset the handle to the state after open/setkey. */ -#define gcry_mac_reset(h) gcry_mac_ctl ((h), GCRYCTL_RESET, NULL, 0) - -/* Return 0 if the algorithm A is available for use. */ -#define gcry_mac_test_algo(a) \ - gcry_mac_algo_info( (a), GCRYCTL_TEST_ALGO, NULL, NULL ) - - -/****************************** - * * - * Key Derivation Functions * - * * - ******************************/ - -/* Algorithm IDs for the KDFs. */ -enum gcry_kdf_algos - { - GCRY_KDF_NONE = 0, - GCRY_KDF_SIMPLE_S2K = 16, - GCRY_KDF_SALTED_S2K = 17, - GCRY_KDF_ITERSALTED_S2K = 19, - GCRY_KDF_PBKDF1 = 33, - GCRY_KDF_PBKDF2 = 34, - GCRY_KDF_SCRYPT = 48 - }; - -/* Derive a key from a passphrase. */ -gpg_error_t gcry_kdf_derive (const void *passphrase, size_t passphraselen, - int algo, int subalgo, - const void *salt, size_t saltlen, - unsigned long iterations, - size_t keysize, void *keybuffer); - - - - -/************************************ - * * - * Random Generating Functions * - * * - ************************************/ - -/* The type of the random number generator. */ -enum gcry_rng_types - { - GCRY_RNG_TYPE_STANDARD = 1, /* The default CSPRNG generator. */ - GCRY_RNG_TYPE_FIPS = 2, /* The FIPS X9.31 AES generator. */ - GCRY_RNG_TYPE_SYSTEM = 3 /* The system's native generator. */ - }; - -/* The possible values for the random quality. The rule of thumb is - to use STRONG for session keys and VERY_STRONG for key material. - WEAK is usually an alias for STRONG and should not be used anymore - (except with gcry_mpi_randomize); use gcry_create_nonce instead. */ -typedef enum gcry_random_level - { - GCRY_WEAK_RANDOM = 0, - GCRY_STRONG_RANDOM = 1, - GCRY_VERY_STRONG_RANDOM = 2 - } -gcry_random_level_t; - -/* Fill BUFFER with LENGTH bytes of random, using random numbers of - quality LEVEL. */ -void gcry_randomize (void *buffer, size_t length, - enum gcry_random_level level); - -/* Add the external random from BUFFER with LENGTH bytes into the - pool. QUALITY should either be -1 for unknown or in the range of 0 - to 100 */ -gcry_error_t gcry_random_add_bytes (const void *buffer, size_t length, - int quality); - -/* If random numbers are used in an application, this macro should be - called from time to time so that new stuff gets added to the - internal pool of the RNG. */ -#define gcry_fast_random_poll() gcry_control (GCRYCTL_FAST_POLL, NULL) - - -/* Return NBYTES of allocated random using a random numbers of quality - LEVEL. */ -void *gcry_random_bytes (size_t nbytes, enum gcry_random_level level) - _GCRY_GCC_ATTR_MALLOC; - -/* Return NBYTES of allocated random using a random numbers of quality - LEVEL. The random numbers are created returned in "secure" - memory. */ -void *gcry_random_bytes_secure (size_t nbytes, enum gcry_random_level level) - _GCRY_GCC_ATTR_MALLOC; - - -/* Set the big integer W to a random value of NBITS using a random - generator with quality LEVEL. Note that by using a level of - GCRY_WEAK_RANDOM gcry_create_nonce is used internally. */ -void gcry_mpi_randomize (gcry_mpi_t w, - unsigned int nbits, enum gcry_random_level level); - - -/* Create an unpredicable nonce of LENGTH bytes in BUFFER. */ -void gcry_create_nonce (void *buffer, size_t length); - - - - - -/*******************************/ -/* */ -/* Prime Number Functions */ -/* */ -/*******************************/ - -/* Mode values passed to a gcry_prime_check_func_t. */ -#define GCRY_PRIME_CHECK_AT_FINISH 0 -#define GCRY_PRIME_CHECK_AT_GOT_PRIME 1 -#define GCRY_PRIME_CHECK_AT_MAYBE_PRIME 2 - -/* The function should return 1 if the operation shall continue, 0 to - reject the prime candidate. */ -typedef int (*gcry_prime_check_func_t) (void *arg, int mode, - gcry_mpi_t candidate); - -/* Flags for gcry_prime_generate(): */ - -/* Allocate prime numbers and factors in secure memory. */ -#define GCRY_PRIME_FLAG_SECRET (1 << 0) - -/* Make sure that at least one prime factor is of size - `FACTOR_BITS'. */ -#define GCRY_PRIME_FLAG_SPECIAL_FACTOR (1 << 1) - -/* Generate a new prime number of PRIME_BITS bits and store it in - PRIME. If FACTOR_BITS is non-zero, one of the prime factors of - (prime - 1) / 2 must be FACTOR_BITS bits long. If FACTORS is - non-zero, allocate a new, NULL-terminated array holding the prime - factors and store it in FACTORS. FLAGS might be used to influence - the prime number generation process. */ -gcry_error_t gcry_prime_generate (gcry_mpi_t *prime, - unsigned int prime_bits, - unsigned int factor_bits, - gcry_mpi_t **factors, - gcry_prime_check_func_t cb_func, - void *cb_arg, - gcry_random_level_t random_level, - unsigned int flags); - -/* Find a generator for PRIME where the factorization of (prime-1) is - in the NULL terminated array FACTORS. Return the generator as a - newly allocated MPI in R_G. If START_G is not NULL, use this as - teh start for the search. */ -gcry_error_t gcry_prime_group_generator (gcry_mpi_t *r_g, - gcry_mpi_t prime, - gcry_mpi_t *factors, - gcry_mpi_t start_g); - - -/* Convenience function to release the FACTORS array. */ -void gcry_prime_release_factors (gcry_mpi_t *factors); - - -/* Check wether the number X is prime. */ -gcry_error_t gcry_prime_check (gcry_mpi_t x, unsigned int flags); - - - -/************************************ - * * - * Miscellaneous Stuff * - * * - ************************************/ - -/* Release the context object CTX. */ -void gcry_ctx_release (gcry_ctx_t ctx); - -/* Log data using Libgcrypt's own log interface. */ -void gcry_log_debug (const char *fmt, ...) _GCRY_GCC_ATTR_PRINTF(1,2); -void gcry_log_debughex (const char *text, const void *buffer, size_t length); -void gcry_log_debugmpi (const char *text, gcry_mpi_t mpi); -void gcry_log_debugpnt (const char *text, - gcry_mpi_point_t point, gcry_ctx_t ctx); -void gcry_log_debugsxp (const char *text, gcry_sexp_t sexp); - - -/* Log levels used by the internal logging facility. */ -enum gcry_log_levels - { - GCRY_LOG_CONT = 0, /* (Continue the last log line.) */ - GCRY_LOG_INFO = 10, - GCRY_LOG_WARN = 20, - GCRY_LOG_ERROR = 30, - GCRY_LOG_FATAL = 40, - GCRY_LOG_BUG = 50, - GCRY_LOG_DEBUG = 100 - }; - -/* Type for progress handlers. */ -typedef void (*gcry_handler_progress_t) (void *, const char *, int, int, int); - -/* Type for memory allocation handlers. */ -typedef void *(*gcry_handler_alloc_t) (size_t n); - -/* Type for secure memory check handlers. */ -typedef int (*gcry_handler_secure_check_t) (const void *); - -/* Type for memory reallocation handlers. */ -typedef void *(*gcry_handler_realloc_t) (void *p, size_t n); - -/* Type for memory free handlers. */ -typedef void (*gcry_handler_free_t) (void *); - -/* Type for out-of-memory handlers. */ -typedef int (*gcry_handler_no_mem_t) (void *, size_t, unsigned int); - -/* Type for fatal error handlers. */ -typedef void (*gcry_handler_error_t) (void *, int, const char *); - -/* Type for logging handlers. */ -typedef void (*gcry_handler_log_t) (void *, int, const char *, va_list); - -/* Certain operations can provide progress information. This function - is used to register a handler for retrieving these information. */ -void gcry_set_progress_handler (gcry_handler_progress_t cb, void *cb_data); - - -/* Register a custom memory allocation functions. */ -void gcry_set_allocation_handler ( - gcry_handler_alloc_t func_alloc, - gcry_handler_alloc_t func_alloc_secure, - gcry_handler_secure_check_t func_secure_check, - gcry_handler_realloc_t func_realloc, - gcry_handler_free_t func_free); - -/* Register a function used instead of the internal out of memory - handler. */ -void gcry_set_outofcore_handler (gcry_handler_no_mem_t h, void *opaque); - -/* Register a function used instead of the internal fatal error - handler. */ -void gcry_set_fatalerror_handler (gcry_handler_error_t fnc, void *opaque); - -/* Register a function used instead of the internal logging - facility. */ -void gcry_set_log_handler (gcry_handler_log_t f, void *opaque); - -/* Reserved for future use. */ -void gcry_set_gettext_handler (const char *(*f)(const char*)); - -/* Libgcrypt uses its own memory allocation. It is important to use - gcry_free () to release memory allocated by libgcrypt. */ -void *gcry_malloc (size_t n) _GCRY_GCC_ATTR_MALLOC; -void *gcry_calloc (size_t n, size_t m) _GCRY_GCC_ATTR_MALLOC; -void *gcry_malloc_secure (size_t n) _GCRY_GCC_ATTR_MALLOC; -void *gcry_calloc_secure (size_t n, size_t m) _GCRY_GCC_ATTR_MALLOC; -void *gcry_realloc (void *a, size_t n); -char *gcry_strdup (const char *string) _GCRY_GCC_ATTR_MALLOC; -void *gcry_xmalloc (size_t n) _GCRY_GCC_ATTR_MALLOC; -void *gcry_xcalloc (size_t n, size_t m) _GCRY_GCC_ATTR_MALLOC; -void *gcry_xmalloc_secure (size_t n) _GCRY_GCC_ATTR_MALLOC; -void *gcry_xcalloc_secure (size_t n, size_t m) _GCRY_GCC_ATTR_MALLOC; -void *gcry_xrealloc (void *a, size_t n); -char *gcry_xstrdup (const char * a) _GCRY_GCC_ATTR_MALLOC; -void gcry_free (void *a); - -/* Return true if A is allocated in "secure" memory. */ -int gcry_is_secure (const void *a) _GCRY_GCC_ATTR_PURE; - -/* Return true if Libgcrypt is in FIPS mode. */ -#define gcry_fips_mode_active() !!gcry_control (GCRYCTL_FIPS_MODE_P, 0) - - -#if 0 /* (Keep Emacsens' auto-indent happy.) */ -{ -#endif -#ifdef __cplusplus -} -#endif -#endif /* _GCRYPT_H */ -/* -Local Variables: -buffer-read-only: t -End: -*/ diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver.hpp deleted file mode 100644 index 74470d37..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver.hpp +++ /dev/null @@ -1,37 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#ifndef _HTTPSERVER_HPP_ -#define _HTTPSERVER_HPP_ - -#define _HTTPSERVER_HPP_INSIDE_ - -#include "httpserver/http_utils.hpp" -#include "httpserver/details/http_endpoint.hpp" -#include "httpserver/http_resource.hpp" -#include "httpserver/http_response.hpp" -#include "httpserver/http_response_builder.hpp" -#include "httpserver/http_request.hpp" -#include "httpserver/event_supplier.hpp" -#include "httpserver/details/event_tuple.hpp" -#include "httpserver/details/http_resource_mirror.hpp" -#include "httpserver/webserver.hpp" - -#endif diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/binders.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/binders.hpp deleted file mode 100644 index c1ce3007..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/binders.hpp +++ /dev/null @@ -1,374 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _BINDERS_HPP_ -#define _BINDERS_HPP_ - -namespace httpserver { -namespace details -{ - namespace binders - { - class generic_class; - const int MEMFUNC_SIZE = sizeof(void (generic_class::*)()); - - template - struct converter - { - template - inline static generic_class* convert( - X* pmem, - func_type func, - generic_mem_func_type &bound - ) - { - return 0; - } - }; - - template<> - struct converter - { - template - inline static generic_class* convert( - X* pmem, - func_type func, - generic_mem_func_type &bound - ) - { - bound = reinterpret_cast(func); - return reinterpret_cast(pmem); - } - }; - - template - class binder - { - private: - typedef void (generic_class::*generic_mem_fun)(); - typedef void (*generic_mem_ptr)(); - - generic_class *pmem; - generic_mem_fun _pfunc; - generic_mem_ptr _spfunc; - - public: - binder() - { - } - - binder(const binder& o): - pmem(o.pmem), - _pfunc(o._pfunc), - _spfunc(o._spfunc) - { - } - - template - binder(X* pmem, Y fun): - pmem(converter::convert(pmem, fun, _pfunc)), - _spfunc(0) - { - } - - template - binder(DC* pp, parent_invoker invoker, static_function fun): - pmem(converter::convert(pp, invoker, _pfunc)), - _spfunc(reinterpret_cast(fun)) - { - } - - inline generic_class* exec() const - { - return pmem; - } - inline generic_mem get_mem_ptr() const - { - return reinterpret_cast(_pfunc); - } - inline void_static_function get_static_func() const - { - return reinterpret_cast(_spfunc); - } - }; - - template - class functor_zero - { - private: - typedef RET_TYPE (*static_function)(); - typedef RET_TYPE (*void_static_function)(); - typedef RET_TYPE (generic_class::*generic_mem)(); - typedef binder binder_type; - binder_type _binder; - - RET_TYPE exec_static() const - { - return (*(_binder.get_static_func()))(); - } - - functor_zero& operator=(const functor_zero&) - { - return *this; - } - public: - typedef functor_zero type; - functor_zero() { } - - template - functor_zero(Y* pmem, RET_TYPE(X::*func)()): - _binder(reinterpret_cast(pmem), func) - { - } - - template - functor_zero(Y* pmem, RET_TYPE(X::*func)() const ): - _binder(reinterpret_cast(pmem), func) - { - } - - functor_zero(RET_TYPE(*func)() ): - _binder(this, &functor_zero::exec_static, func) - { - } - - RET_TYPE operator() () const - { - return (_binder.exec()->*(_binder.get_mem_ptr()))(); - } - }; - - template - class functor_one - { - private: - typedef RET_TYPE (*static_function)(PAR1 p1); - typedef RET_TYPE (*void_static_function)(PAR1 p1); - typedef RET_TYPE (generic_class::*generic_mem)(PAR1 p1); - typedef binder binder_type; - binder_type _binder; - - RET_TYPE exec_static(PAR1 p1) const - { - return (*(_binder.get_static_func()))(p1); - } - - functor_one& operator=(const functor_one&) - { - return *this; - } - public: - typedef functor_one type; - functor_one() { } - - template - functor_one(Y* pmem, RET_TYPE(X::*func)(PAR1 p1) ): - _binder(reinterpret_cast(pmem), func) - { - } - - template - functor_one(Y* pmem, RET_TYPE(X::*func)(PAR1 p1) const ): - _binder(reinterpret_cast(pmem), func) - { - } - - functor_one(RET_TYPE(*func)(PAR1 p1) ): - _binder(this, &functor_one::exec_static, func) - { - } - - RET_TYPE operator() (PAR1 p1) const - { - return (_binder.exec()->*(_binder.get_mem_ptr()))(p1); - } - }; - - template - class functor_two - { - private: - typedef RET_TYPE (*static_function)(PAR1 p1, PAR2 p2); - typedef RET_TYPE (*void_static_function)(PAR1 p1, PAR2 p2); - - typedef RET_TYPE - (generic_class::*generic_mem)(PAR1 p1, PAR2 p2); - - typedef binder< - generic_mem, static_function, void_static_function - > binder_type; - - binder_type _binder; - - RET_TYPE exec_static(PAR1 p1, PAR2 p2) const - { - return (*(_binder.get_static_func()))(p1, p2); - } - public: - typedef functor_two type; - functor_two() { } - - functor_two(const functor_two& o): - _binder(o._binder) - { - } - - template - functor_two(Y* pmem, RET_TYPE(X::*func)(PAR1 p1, PAR2 p2) const ): - _binder(reinterpret_cast(pmem), func) - { - } - - template - functor_two(Y* pmem, RET_TYPE(X::*func)(PAR1 p1, PAR2 p2) ): - _binder(reinterpret_cast(pmem), func) - { - } - - functor_two(RET_TYPE(*func)(PAR1 p1, PAR2 p2) ): - _binder(this, &functor_two::exec_static, func) - { - } - - RET_TYPE operator() (PAR1 p1, PAR2 p2) const - { - return (_binder.exec()->*(_binder.get_mem_ptr()))(p1, p2); - } - }; - - template - class functor_three - { - private: - typedef RET_TYPE (*static_function)(PAR1 p1, PAR2 p2, PAR3 p3); - typedef RET_TYPE (*void_static_function)(PAR1 p1, PAR2 p2, PAR3 p3); - - typedef RET_TYPE - (generic_class::*generic_mem)(PAR1 p1, PAR2 p2, PAR3 p3); - - typedef binder< - generic_mem, static_function, void_static_function - > binder_type; - - binder_type _binder; - - RET_TYPE exec_static(PAR1 p1, PAR2 p2, PAR3 p3) const - { - return (*(_binder.get_static_func()))(p1, p2, p3); - } - public: - typedef functor_three type; - functor_three() { } - - functor_three(const functor_three& o): - _binder(o._binder) - { - } - - template - functor_three(Y* pmem, RET_TYPE(X::*func)(PAR1 p1, PAR2 p2, PAR3 p3) const ): - _binder(reinterpret_cast(pmem), func) - { - } - - template - functor_three(Y* pmem, RET_TYPE(X::*func)(PAR1 p1, PAR2 p2, PAR3 p3) ): - _binder(reinterpret_cast(pmem), func) - { - } - - functor_three(RET_TYPE(*func)(PAR1 p1, PAR2 p2, PAR3 p3) ): - _binder(this, &functor_three::exec_static, func) - { - } - - RET_TYPE operator() (PAR1 p1, PAR2 p2, PAR3 p3) const - { - return (_binder.exec()->*(_binder.get_mem_ptr()))(p1, p2, p3); - } - }; - - template - class functor_four - { - private: - typedef RET_TYPE (*static_function)(PAR1 p1, PAR2 p2, PAR3 p3, PAR4 p4); - typedef RET_TYPE (*void_static_function)(PAR1 p1, PAR2 p2, PAR3 p3, PAR4 p4); - - typedef RET_TYPE - (generic_class::*generic_mem)(PAR1 p1, PAR2 p2, PAR3 p3, PAR4 p4); - - typedef binder< - generic_mem, static_function, void_static_function - > binder_type; - - binder_type _binder; - - RET_TYPE exec_static(PAR1 p1, PAR2 p2, PAR3 p3, PAR4 p4) const - { - return (*(_binder.get_static_func()))(p1, p2, p3, p4); - } - public: - typedef functor_four type; - functor_four() { } - - functor_four(const functor_four& o): - _binder(o._binder) - { - } - - template - functor_four(Y* pmem, RET_TYPE(X::*func)(PAR1 p1, PAR2 p2, PAR3 p3, PAR4 p4) const ): - _binder(reinterpret_cast(pmem), func) - { - } - - template - functor_four(Y* pmem, RET_TYPE(X::*func)(PAR1 p1, PAR2 p2, PAR3 p3, PAR4 p4) ): - _binder(reinterpret_cast(pmem), func) - { - } - - functor_four(RET_TYPE(*func)(PAR1 p1, PAR2 p2, PAR3 p3, PAR4 p4) ): - _binder(this, &functor_four::exec_static, func) - { - } - - RET_TYPE operator() (PAR1 p1, PAR2 p2, PAR3 p3, PAR4 p4) const - { - return (_binder.exec()->*(_binder.get_mem_ptr()))(p1, p2, p3, p4); - } - }; - } -}} - -#endif diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/create_webserver.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/create_webserver.hpp deleted file mode 100644 index 02d2ae8a..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/create_webserver.hpp +++ /dev/null @@ -1,363 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _CREATE_WEBSERVER_HPP_ -#define _CREATE_WEBSERVER_HPP_ - -#include -#include "httpserver/http_utils.hpp" - -#define DEFAULT_WS_TIMEOUT 180 -#define DEFAULT_WS_PORT 9898 - -namespace httpserver { - -class webserver; -class http_request; -class http_response; - -typedef void(*render_ptr)(const http_request&, http_response**); -typedef bool(*validator_ptr)(const std::string&); -typedef void(*unescaper_ptr)(char*); -typedef void(*log_access_ptr)(const std::string&); -typedef void(*log_error_ptr)(const std::string&); - -class create_webserver -{ - public: - create_webserver(): - _port(DEFAULT_WS_PORT), - _start_method(http::http_utils::INTERNAL_SELECT), - _max_threads(0), - _max_connections(0), - _memory_limit(0), - _connection_timeout(DEFAULT_WS_TIMEOUT), - _per_IP_connection_limit(0), - _log_access(0x0), - _log_error(0x0), - _validator(0x0), - _unescaper(0x0), - _bind_address(0x0), - _bind_socket(0), - _max_thread_stack_size(0), - _use_ssl(false), - _use_ipv6(false), - _debug(false), - _pedantic(false), - _https_mem_key(""), - _https_mem_cert(""), - _https_mem_trust(""), - _https_priorities(""), - _cred_type(http::http_utils::NONE), - _digest_auth_random(""), - _nonce_nc_size(0), - _default_policy(http::http_utils::ACCEPT), - _basic_auth_enabled(true), - _digest_auth_enabled(true), - _regex_checking(true), - _ban_system_enabled(true), - _post_process_enabled(true), - _single_resource(0x0), - _not_found_resource(0x0), - _method_not_allowed_resource(0x0), - _method_not_acceptable_resource(0x0), - _internal_error_resource(0x0) - { - } - - explicit create_webserver(uint16_t port): - _port(port), - _start_method(http::http_utils::INTERNAL_SELECT), - _max_threads(0), - _max_connections(0), - _memory_limit(0), - _connection_timeout(DEFAULT_WS_TIMEOUT), - _per_IP_connection_limit(0), - _log_access(0x0), - _log_error(0x0), - _validator(0x0), - _unescaper(0x0), - _bind_address(0x0), - _bind_socket(0), - _max_thread_stack_size(0), - _use_ssl(false), - _use_ipv6(false), - _debug(false), - _pedantic(false), - _https_mem_key(""), - _https_mem_cert(""), - _https_mem_trust(""), - _https_priorities(""), - _cred_type(http::http_utils::NONE), - _digest_auth_random(""), - _nonce_nc_size(0), - _default_policy(http::http_utils::ACCEPT), - _basic_auth_enabled(true), - _digest_auth_enabled(true), - _regex_checking(true), - _ban_system_enabled(true), - _post_process_enabled(true), - _single_resource(0x0), - _not_found_resource(0x0), - _method_not_allowed_resource(0x0), - _method_not_acceptable_resource(0x0), - _internal_error_resource(0x0) - { - } - - create_webserver& port(uint16_t port) { _port = port; return *this; } - create_webserver& start_method( - const http::http_utils::start_method_T& start_method - ) - { - _start_method = start_method; return *this; - } - create_webserver& max_threads(int max_threads) - { - _max_threads = max_threads; return *this; - } - create_webserver& max_connections(int max_connections) - { - _max_connections = max_connections; return *this; - } - create_webserver& memory_limit(int memory_limit) - { - _memory_limit = memory_limit; return *this; - } - create_webserver& connection_timeout(int connection_timeout) - { - _connection_timeout = connection_timeout; return *this; - } - create_webserver& per_IP_connection_limit(int per_IP_connection_limit) - { - _per_IP_connection_limit = per_IP_connection_limit; return *this; - } - create_webserver& log_access(log_access_ptr log_access) - { - _log_access = log_access; return *this; - } - create_webserver& log_error(log_error_ptr log_error) - { - _log_error = log_error; return *this; - } - create_webserver& validator(validator_ptr validator) - { - _validator = validator; return *this; - } - create_webserver& unescaper(unescaper_ptr unescaper) - { - _unescaper = unescaper; return *this; - } - create_webserver& bind_address(const struct sockaddr* bind_address) - { - _bind_address = bind_address; return *this; - } - create_webserver& bind_socket(int bind_socket) - { - _bind_socket = bind_socket; return *this; - } - create_webserver& max_thread_stack_size(int max_thread_stack_size) - { - _max_thread_stack_size = max_thread_stack_size; return *this; - } - create_webserver& use_ssl() { _use_ssl = true; return *this; } - create_webserver& no_ssl() { _use_ssl = false; return *this; } - create_webserver& use_ipv6() { _use_ipv6 = true; return *this; } - create_webserver& no_ipv6() { _use_ipv6 = false; return *this; } - create_webserver& debug() { _debug = true; return *this; } - create_webserver& no_debug() { _debug = false; return *this; } - create_webserver& pedantic() { _pedantic = true; return *this; } - create_webserver& no_pedantic() { _pedantic = false; return *this; } - create_webserver& https_mem_key(const std::string& https_mem_key) - { - char* _https_mem_key_pt = http::load_file(https_mem_key.c_str()); - _https_mem_key = _https_mem_key_pt; - free(_https_mem_key_pt); - return *this; - } - create_webserver& https_mem_cert(const std::string& https_mem_cert) - { - char* _https_mem_cert_pt = http::load_file(https_mem_cert.c_str()); - _https_mem_cert = _https_mem_cert_pt; - free(_https_mem_cert_pt); - return *this; - } - create_webserver& https_mem_trust(const std::string& https_mem_trust) - { - char* _https_mem_trust_pt = http::load_file(https_mem_trust.c_str()); - _https_mem_trust = _https_mem_trust_pt; - free(_https_mem_trust_pt); - return *this; - } - create_webserver& raw_https_mem_key(const std::string& https_mem_key) - { - _https_mem_key = https_mem_key; return *this; - } - create_webserver& raw_https_mem_cert(const std::string& https_mem_cert) - { - _https_mem_cert = https_mem_cert; return *this; - } - create_webserver& raw_https_mem_trust( - const std::string& https_mem_trust - ) - { - _https_mem_trust = https_mem_trust; return *this; - } - create_webserver& https_priorities(const std::string& https_priorities) - { - _https_priorities = https_priorities; return *this; - } - create_webserver& cred_type(const http::http_utils::cred_type_T& cred_type) - { - _cred_type = cred_type; return *this; - } - create_webserver& digest_auth_random( - const std::string& digest_auth_random - ) - { - _digest_auth_random = digest_auth_random; return *this; - } - create_webserver& nonce_nc_size(int nonce_nc_size) - { - _nonce_nc_size = nonce_nc_size; return *this; - } - create_webserver& default_policy( - const http::http_utils::policy_T& default_policy - ) - { - _default_policy = default_policy; return *this; - } - create_webserver& basic_auth() - { - _basic_auth_enabled = true; return *this; - } - create_webserver& no_basic_auth() - { - _basic_auth_enabled = false; return *this; - } - create_webserver& digest_auth() - { - _digest_auth_enabled = true; return *this; - } - create_webserver& no_digest_auth() - { - _digest_auth_enabled = false; return *this; - } - create_webserver& regex_checking() - { - _regex_checking = true; return *this; - } - create_webserver& no_regex_checking() - { - _regex_checking = false; return *this; - } - create_webserver& ban_system() - { - _ban_system_enabled = true; return *this; - } - create_webserver& no_ban_system() - { - _ban_system_enabled = false; return *this; - } - create_webserver& post_process() - { - _post_process_enabled = true; return *this; - } - create_webserver& no_post_process() - { - _post_process_enabled = false; return *this; - } - create_webserver& single_resource(render_ptr single_resource) - { - _single_resource = single_resource; return *this; - } - create_webserver& not_found_resource(render_ptr not_found_resource) - { - _not_found_resource = not_found_resource; return *this; - } - create_webserver& method_not_allowed_resource( - render_ptr method_not_allowed_resource - ) - { - _method_not_allowed_resource = method_not_allowed_resource; - return *this; - } - create_webserver& method_not_acceptable_resource( - render_ptr method_not_acceptable_resource - ) - { - _method_not_acceptable_resource = method_not_acceptable_resource; - return *this; - } - create_webserver& internal_error_resource( - render_ptr internal_error_resource - ) - { - _internal_error_resource = internal_error_resource; return *this; - } - - private: - uint16_t _port; - http::http_utils::start_method_T _start_method; - int _max_threads; - int _max_connections; - int _memory_limit; - int _connection_timeout; - int _per_IP_connection_limit; - log_access_ptr _log_access; - log_error_ptr _log_error; - validator_ptr _validator; - unescaper_ptr _unescaper; - const struct sockaddr* _bind_address; - int _bind_socket; - int _max_thread_stack_size; - bool _use_ssl; - bool _use_ipv6; - bool _debug; - bool _pedantic; - std::string _https_mem_key; - std::string _https_mem_cert; - std::string _https_mem_trust; - std::string _https_priorities; - http::http_utils::cred_type_T _cred_type; - std::string _digest_auth_random; - int _nonce_nc_size; - http::http_utils::policy_T _default_policy; - bool _basic_auth_enabled; - bool _digest_auth_enabled; - bool _regex_checking; - bool _ban_system_enabled; - bool _post_process_enabled; - render_ptr _single_resource; - render_ptr _not_found_resource; - render_ptr _method_not_allowed_resource; - render_ptr _method_not_acceptable_resource; - render_ptr _internal_error_resource; - - friend class webserver; -}; - -} //httpserver - -#endif //_CREATE_WEBSERVER_HPP_ diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/details/event_tuple.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/details/event_tuple.hpp deleted file mode 100644 index 8a005c6e..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/details/event_tuple.hpp +++ /dev/null @@ -1,69 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _EVENT_TUPLE_HPP_ -#define _EVENT_TUPLE_HPP_ - -#include "httpserver/event_supplier.hpp" -#include "httpserver/binders.hpp" - -namespace httpserver { - -namespace details -{ - class http_endpoint; - struct modded_request; - struct daemon_item; - - class event_tuple - { - private: - typedef void(*supply_events_ptr)( - fd_set*, - fd_set*, - fd_set*, - MHD_socket* - ); - - binders::functor_four supply_events; - binders::functor_zero get_timeout; - binders::functor_zero dispatch_events; - - event_tuple(); - - friend class ::httpserver::webserver; - public: - template - event_tuple(event_supplier* es): - supply_events(binders::functor_four(es, &T::supply_events)), - get_timeout(binders::functor_zero(es, &T::get_timeout)), - dispatch_events(binders::functor_zero(es, &T::dispatch_events)) - { - } - }; -} //details - -} //httpserver - -#endif //_EVENT_TUPLE_HPP_ diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/details/http_endpoint.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/details/http_endpoint.hpp deleted file mode 100644 index a514f7e7..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/details/http_endpoint.hpp +++ /dev/null @@ -1,250 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _HTTP_ENDPOINT_HPP_ -#define _HTTP_ENDPOINT_HPP_ - -#include -#include -#include -#include - -namespace httpserver -{ - -class webserver; - -namespace details -{ - -class http_resource_mirror; - -/** - * Exception class throwed when a bad formatted http url is used -**/ -class bad_http_endpoint : public std::exception -{ - /** - * Method used to see error details - * @return a const char* containing the error message - **/ - virtual const char* what() const throw() - { - return "Bad url format!"; - } -}; - -/** - * Class representing an Http Endpoint. It is an abstraction used by the APIs. -**/ -class http_endpoint -{ - private: - /** - * Copy constructor. It is useful expecially to copy regex_t structure that contains dinamically allocated data. - * @param h The http_endpoint to copy - **/ - http_endpoint(const http_endpoint& h); - /** - * Class Destructor - **/ - ~http_endpoint(); //if inlined it causes problems during ruby wrapper compiling - /** - * Operator overload for "less than operator". It is used to order endpoints in maps. - * @param b The http_endpoint to compare to - * @return boolean indicating if this is less than b. - **/ - bool operator <(const http_endpoint& b) const; - /** - * Operator overload for "assignment operator". It is used to copy endpoints to existing objects. - * Is is functional expecially to copy regex_t structure that contains dinamically allocated data. - * @param h The http_endpoint to copy - * @return a reference to the http_endpoint obtained - **/ - http_endpoint& operator =(const http_endpoint& h); - /** - * Method indicating if this endpoint 'matches' with the one passed. A passed endpoint matches a registered endpoint if - * the regex represented by the registered endpoint matches the passed one. - * @param url The endpoint to match - * @return true if the passed endpoint matches this. - **/ - bool match(const http_endpoint& url) const; - /** - * Method used to get the complete endpoint url - * @return a string representing the url - **/ - const std::string get_url_complete() const - { - return this->url_complete; - } - /** - * Method used to get the complete endpoint url - * @param result a string reference that will be filled with the url - **/ - void get_url_complete(std::string& result) const - { - result = this->url_complete; - } - /** - * Method used to find the size of the complete endpoint url - * @return the size - **/ - size_t get_url_complete_size() const - { - return this->url_complete.size(); - } - /** - * Method used to get all pars defined inside an url. - * @return a vector of strings representing all found pars. - **/ - const std::vector get_url_pars() const - { - return this->url_pars; - } - size_t get_url_pars(std::vector& result) const - { - result = this->url_pars; - return result.size(); - } - /** - * Method used to get all pieces of an url; considering an url splitted by '/'. - * @return a vector of strings representing all found pieces. - **/ - const std::vector get_url_pieces() const - { - return this->url_pieces; - } - /** - * Method used to get all pieces of an url; considering an url splittet by '/'. - * @param result a vector of strings to fill with url pieces. - * @return the size of the vector in output - **/ - size_t get_url_pieces(std::vector& result) const - { - result = this->url_pieces; - return result.size(); - } - /** - * Method used to get the number of pieces the url is composed of - * @return the number of pieces - **/ - size_t get_url_pieces_num() const - { - return this->url_pieces.size(); - } - /** - * Method used to get indexes of all parameters inside url - * @return a vector of int indicating all positions. - **/ - const std::vector get_chunk_positions() const - { - return this->chunk_positions; - } - /** - * Method used to get indexes of all parameters inside url - * @param result a vector to fill with ints indicating chunk positions - * @return the size of the vector filled - **/ - size_t get_chunk_positions(std::vector& result) const - { - result = this->chunk_positions; - return result.size(); - } - /** - * Default constructor of the class. - * @param family boolean that indicates if the endpoint is a family endpoint. - * A family endpoint is an endpoint that identifies a root and all its child like the same resource. - * For example, if I identify "/path/" like a family endpoint and I associate to it the resource "A", also - * "/path/to/res/" is automatically associated to resource "A". - **/ - http_endpoint(bool family = false): - url_complete("/"), - url_modded("/"), - family_url(family), - reg_compiled(false) - { - } - /** - * Constructor of the class http_endpoint. It is used to initialize an http_endpoint starting from a string form URL. - * @param url The string representation of the endpoint. All endpoints are in the form "/path/to/resource". - * @param family boolean that indicates if the endpoint is a family endpoint. - * A family endpoint is an endpoint that identifies a root and all its child like the same resource. - * For example, if I identify "/path/" like a family endpoint and I associate to it the resource "A", also - * "/path/to/res/" is automatically associated to resource "A". Default is false. - * @param registration boolean that indicates to the system if this is an endpoint that need to be registered to a webserver - * or it is simply an endpoint to be used for comparisons. Default is false. - * @param use_regex boolean that indicates if regexes are checked or not. Default is true. - **/ - http_endpoint(const std::string& url, - bool family = false, - bool registration = false, - bool use_regex = true - ); - /** - * The complete url extracted - **/ - std::string url_complete; - /** - * The url standardized in order to use standard comparisons or regexes - **/ - std::string url_modded; - /** - * Vector containing parameters extracted from url - **/ - std::vector url_pars; - /** - * Pieces the url can be splitted into (consider '/' as separator) - **/ - std::vector url_pieces; - /** - * Position of url pieces representing parameters - **/ - std::vector chunk_positions; - /** - * Regex used in comparisons - **/ - regex_t re_url_modded; - /** - * Boolean indicating wheter the endpoint represents a family - **/ - bool family_url; - /** - * Boolean indicating if the regex is compiled - **/ - bool reg_compiled; - friend class httpserver::webserver; - friend void _register_resource( - webserver*, - const std::string&, - details::http_resource_mirror&, - bool - ); - template friend struct std::pair; - template friend struct std::less; -}; - -}; - -}; -#endif diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/details/http_resource_mirror.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/details/http_resource_mirror.hpp deleted file mode 100644 index e8b9d12a..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/details/http_resource_mirror.hpp +++ /dev/null @@ -1,206 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _HTTP_RESOURCE_MIRROR_HPP_ -#define _HTTP_RESOURCE_MIRROR_HPP_ - -#include "httpserver/binders.hpp" - -#define CREATE_METHOD_DETECTOR(X) \ - template \ - class has_##X \ - { \ - template struct Check; \ - template static char func(Check *); \ - template static int func(...); \ - public: \ - enum { value = sizeof(func(0)) == sizeof(char) }; \ - }; - -#define HAS_METHOD(X, T, RESULT, ARG1, ARG2) \ - has_##X::value - -namespace httpserver { - -template class http_resource; -class http_request; -class http_response; -class webserver; - -namespace details -{ - class http_endpoint; - struct modded_request; - struct daemon_item; - typedef bool(*is_allowed_ptr)(const std::string&); - - CREATE_METHOD_DETECTOR(render); - CREATE_METHOD_DETECTOR(render_GET); - CREATE_METHOD_DETECTOR(render_POST); - CREATE_METHOD_DETECTOR(render_PUT); - CREATE_METHOD_DETECTOR(render_HEAD); - CREATE_METHOD_DETECTOR(render_DELETE); - CREATE_METHOD_DETECTOR(render_TRACE); - CREATE_METHOD_DETECTOR(render_OPTIONS); - CREATE_METHOD_DETECTOR(render_CONNECT); - CREATE_METHOD_DETECTOR(render_not_acceptable); - - void empty_render(const http_request& r, http_response** res); - void empty_not_acceptable_render( - const http_request& r, http_response** res - ); - bool empty_is_allowed(const std::string& method); - - class http_resource_mirror - { - public: - http_resource_mirror() - { - } - - ~http_resource_mirror() - { - } - private: - typedef binders::functor_two functor; - - typedef binders::functor_one functor_allowed; - - const functor render; - const functor render_GET; - const functor render_POST; - const functor render_PUT; - const functor render_HEAD; - const functor render_DELETE; - const functor render_TRACE; - const functor render_OPTIONS; - const functor render_CONNECT; - const functor_allowed is_allowed; - - functor method_not_acceptable_resource; - - http_resource_mirror& operator= (const http_resource_mirror& o) - { - return *this; - } - - template - http_resource_mirror(http_resource* res): - render( - HAS_METHOD(render, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render) : functor(&empty_render) - ), - render_GET( - HAS_METHOD(render_GET, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render_GET) : - ( - HAS_METHOD(render, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render) : functor(&empty_render) - ) - ), - render_POST( - HAS_METHOD(render_POST, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render_POST) : - ( - HAS_METHOD(render, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render) : functor(&empty_render) - ) - ), - render_PUT( - HAS_METHOD(render_PUT, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render_PUT) : - ( - HAS_METHOD(render, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render) : functor(&empty_render) - ) - ), - render_HEAD( - HAS_METHOD(render_HEAD, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render_HEAD) : - ( - HAS_METHOD(render, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render) : functor(&empty_render) - ) - ), - render_DELETE( - HAS_METHOD(render_DELETE, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render_DELETE) : - ( - HAS_METHOD(render, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render) : functor(&empty_render) - ) - ), - render_TRACE( - HAS_METHOD(render_TRACE, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render_TRACE) : - ( - HAS_METHOD(render, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render) : functor(&empty_render) - ) - ), - render_OPTIONS( - HAS_METHOD(render_OPTIONS, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render_OPTIONS) : - ( - HAS_METHOD(render, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render) : functor(&empty_render) - ) - ), - render_CONNECT( - HAS_METHOD(render_CONNECT, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render_CONNECT) : - ( - HAS_METHOD(render, T, void, - const http_request&, http_response** - ) ? functor(res, &T::render) : functor(&empty_render) - ) - ), - is_allowed(res, &T::is_allowed) - { - } - - friend class ::httpserver::webserver; - }; -} //details -} //httpserver - -#endif //_HTTP_RESOURCE_MIRROR_HPP_ diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/event_supplier.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/event_supplier.hpp deleted file mode 100644 index 64a0bba6..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/event_supplier.hpp +++ /dev/null @@ -1,67 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _EVENT_SUPPLIER_HPP_ -#define _EVENT_SUPPLIER_HPP_ - -namespace httpserver { - -template -class event_supplier -{ - public: - event_supplier() - { - } - - ~event_supplier() - { - } - - void supply_events( - fd_set* read_fdset, - fd_set* write_fdset, - fd_set* exc_fdset, - MHD_socket* max - ) const - { - static_cast(this)->supply_events( - read_fdset, write_fdset, exc_fdset, max - ); - } - - struct timeval get_timeout() const - { - return static_cast(this)->get_timeout(); - } - - void dispatch_events() const - { - static_cast(this)->dispatch_events(); - } -}; - -} //event_supplier - -#endif //_EVENT_SUPPLIER_HPP_ diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_request.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_request.hpp deleted file mode 100644 index b367aa52..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_request.hpp +++ /dev/null @@ -1,594 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _HTTP_REQUEST_HPP_ -#define _HTTP_REQUEST_HPP_ - -#include -#include -#include -#include -#include - -struct MHD_Connection; - -namespace httpserver -{ - -class webserver; - -namespace http -{ - class header_comparator; - class arg_comparator; -}; - -using namespace http; - -/** - * Class representing an abstraction for an Http Request. It is used from classes using these apis to receive information through http protocol. -**/ -class http_request -{ - public: - - /** - * Method used to get the username eventually passed through basic authentication. - * @return string representation of the username. - **/ - const std::string get_user() const - { - return this->user; - } - /** - * Method used to get the username eventually passed through basic authentication. - * @param result string that will be filled with the username - **/ - void get_user(std::string& result) const - { - result = this->user; - } - /** - * Method used to get the username extracted from a digest authentication - * @return the username - **/ - const std::string get_digested_user() const - { - return this->digested_user; - } - /** - * Method used to get the username extracted from a digest authentication - * @param result string that will be filled with the username - **/ - void get_digested_user(std::string& result) const - { - result = this->digested_user; - } - /** - * Method used to get the password eventually passed through basic authentication. - * @return string representation of the password. - **/ - const std::string get_pass() const - { - return this->pass; - } - /** - * Method used to get the password eventually passed through basic authentication. - * @param result string that will be filled with the password. - **/ - void get_pass(std::string& result) const - { - result = this->pass; - } - /** - * Method used to get the path requested - * @return string representing the path requested. - **/ - const std::string get_path() const - { - return this->path; - } - /** - * Method used to get the path requested - * @param result string that will be filled with the path. - **/ - void get_path(std::string& result) const - { - result = this->path; - } - /** - * Method used to get all pieces of the path requested; considering an url splitted by '/'. - * @return a vector of strings containing all pieces - **/ - const std::vector get_path_pieces() const - { - return this->post_path; - } - /** - * Method used to get all pieces of the path requested; considering an url splitted by '/'. - * @param result vector of strings containing the path - * @return the size of the vector filled - **/ - size_t get_path_pieces(std::vector& result) const - { - result = this->post_path; - return result.size(); - } - /** - * Method used to obtain the size of path in terms of pieces; considering an url splitted by '/'. - * @return an integer representing the number of pieces - **/ - size_t get_path_pieces_size() const - { - return this->post_path.size(); - } - /** - * Method used to obtain a specified piece of the path; considering an url splitted by '/'. - * @param index the index of the piece selected - * @return the selected piece in form of string - **/ - const std::string get_path_piece(int index) const - { - if(((int)(this->post_path.size())) > index) - return this->post_path[index]; - return ""; - } - /** - * Method used to obtain a specified piece of the path; considering an url splitted by '/'. - * @param index the index of the piece selected - * @param result a string that will be filled with the piece found - * @return the length of the piece found - **/ - size_t get_path_piece(int index, std::string& result) const - { - if(((int)(this->post_path.size())) > index) - { - result = this->post_path[index]; - return result.size(); - } - else - { - result = ""; - return result.size(); - } - } - /** - * Method used to get the METHOD used to make the request. - * @return string representing the method. - **/ - const std::string get_method() const - { - return this->method; - } - /** - * Method used to get the METHOD used to make the request. - * @param result string that will be filled with the method. - **/ - void get_method(std::string& result) const - { - result = this->method; - } - /** - * Method used to get all headers passed with the request. - * @param result a map > that will be filled with all headers - * @result the size of the map - **/ - size_t get_headers(std::map& result) const; - /** - * Method used to get all footers passed with the request. - * @param result a map > that will be filled with all footers - * @result the size of the map - **/ - size_t get_footers(std::map& result) const; - /** - * Method used to get all cookies passed with the request. - * @param result a map > that will be filled with all cookies - * @result the size of the map - **/ - size_t get_cookies(std::map& result) const; - /** - * Method used to get all args passed with the request. - * @param result a map > that will be filled with all args - * @result the size of the map - **/ - size_t get_args(std::map& result) const; - /** - * Method used to get a specific header passed with the request. - * @param key the specific header to get the value from - * @return the value of the header. - **/ - const std::string get_header(const std::string& key) const - { - std::map::const_iterator it = - this->headers.find(key); - if(it != this->headers.end()) - return it->second; - else - return ""; - } - void get_header(const std::string& key, std::string& result) const - { - std::map::const_iterator it = - this->headers.find(key); - if(it != this->headers.end()) - result = it->second; - else - result = ""; - } - const std::string get_cookie(const std::string& key) const - { - std::map::const_iterator it = - this->cookies.find(key); - if(it != this->cookies.end()) - return it->second; - else - return ""; - } - void get_cookie(const std::string& key, std::string& result) const - { - std::map::const_iterator it = - this->cookies.find(key); - if(it != this->cookies.end()) - result = it->second; - else - result = ""; - } - /** - * Method used to get a specific footer passed with the request. - * @param key the specific footer to get the value from - * @return the value of the footer. - **/ - const std::string get_footer(const std::string& key) const - { - std::map::const_iterator it = - this->footers.find(key); - if(it != this->footers.end()) - return it->second; - else - return ""; - } - void get_footer(const std::string& key, std::string& result) const - { - std::map::const_iterator it = - this->footers.find(key); - if(it != this->footers.end()) - result = it->second; - else - result = ""; - } - /** - * Method used to get a specific argument passed with the request. - * @param ket the specific argument to get the value from - * @return the value of the arg. - **/ - const std::string get_arg(const std::string& key) const - { - std::map::const_iterator it = - this->args.find(key); - if(it != this->args.end()) - return it->second; - else - return ""; - } - void get_arg(const std::string& key, std::string& result) const - { - std::map::const_iterator it = - this->args.find(key); - if(it != this->args.end()) - result = it->second; - else - result = ""; - } - /** - * Method used to get the content of the request. - * @return the content in string representation - **/ - const std::string get_content() const - { - return this->content; - } - void get_content(std::string& result) const - { - result = this->content; - } - const std::string get_querystring() const - { - return this->querystring; - } - void get_querystring(std::string& result) const - { - result = this->querystring; - } - /** - * Method used to get the version of the request. - * @return the version in string representation - **/ - const std::string get_version() const - { - return this->version; - } - void get_version(std::string& result) const - { - result = this->version; - } - /** - * Method used to get the requestor. - * @return the requestor - **/ - const std::string get_requestor() const - { - return this->requestor; - } - void get_requestor(std::string& result) const - { - result = this->requestor; - } - /** - * Method used to get the requestor port used. - * @return the requestor port - **/ - short get_requestor_port() const - { - return this->requestor_port; - } - bool check_digest_auth(const std::string& realm, - const std::string& password, - int nonce_timeout, bool& reload_nonce - ) const; - - friend std::ostream &operator<< (std::ostream &os, const http_request &r); - private: - /** - * Default constructor of the class. It is a specific responsibility of apis to initialize this type of objects. - **/ - http_request(): - content("") - { - } - /** - * Copy constructor. - * @param b http_request b to copy attributes from. - **/ - http_request(const http_request& b): - user(b.user), - pass(b.pass), - path(b.path), - digested_user(b.digested_user), - method(b.method), - post_path(b.post_path), - headers(b.headers), - footers(b.footers), - cookies(b.cookies), - args(b.args), - querystring(b.querystring), - content(b.content), - version(b.version), - requestor(b.requestor), - underlying_connection(b.underlying_connection) - { - } - std::string user; - std::string pass; - std::string path; - std::string digested_user; - std::string method; - std::vector post_path; - std::map headers; - std::map footers; - std::map cookies; - std::map args; - std::string querystring; - std::string content; - std::string version; - std::string requestor; - - short requestor_port; - struct MHD_Connection* underlying_connection; - - void set_underlying_connection(struct MHD_Connection* conn) - { - this->underlying_connection = conn; - } - /** - * Method used to set an header value by key. - * @param key The name identifying the header - * @param value The value assumed by the header - **/ - void set_header(const std::string& key, const std::string& value) - { - this->headers[key] = value; - } - /** - * Method used to set a footer value by key. - * @param key The name identifying the footer - * @param value The value assumed by the footer - **/ - void set_footer(const std::string& key, const std::string& value) - { - this->footers[key] = value; - } - /** - * Method used to set a cookie value by key. - * @param key The name identifying the cookie - * @param value The value assumed by the cookie - **/ - void set_cookie(const std::string& key, const std::string& value) - { - this->cookies[key] = value; - } - /** - * Method used to set an argument value by key. - * @param key The name identifying the argument - * @param value The value assumed by the argument - **/ - void set_arg(const std::string& key, const std::string& value) - { - this->args[key] = value; - } - /** - * Method used to set an argument value by key. - * @param key The name identifying the argument - * @param value The value assumed by the argument - * @param size The size in number of char of the value parameter. - **/ - void set_arg(const char* key, const char* value, size_t size) - { - this->args[key] = std::string(value, size); - } - /** - * Method used to set the content of the request - * @param content The content to set. - **/ - void set_content(const std::string& content) - { - this->content = content; - } - /** - * Method used to append content to the request preserving the previous inserted content - * @param content The content to append. - * @param size The size of the data to append. - **/ - void grow_content(const char* content, size_t size) - { - this->content.append(content, size); - } - /** - * Method used to set the path requested. - * @param path The path searched by the request. - **/ - void set_path(const std::string& path) - { - this->path = path; - std::vector complete_path; - http_utils::tokenize_url(this->path, complete_path); - for(unsigned int i = 0; i < complete_path.size(); i++) - { - this->post_path.push_back(complete_path[i]); - } - } - /** - * Method used to set the request METHOD - * @param method The method to set for the request - **/ - void set_method(const std::string& method); - /** - * Method used to set the request http version (ie http 1.1) - * @param version The version to set in form of string - **/ - void set_version(const std::string& version) - { - this->version = version; - } - /** - * Method used to set the requestor - * @param requestor The requestor to set - **/ - void set_requestor(const std::string& requestor) - { - this->requestor = requestor; - } - /** - * Method used to set the requestor port - * @param requestor The requestor port to set - **/ - void set_requestor_port(short requestor_port) - { - this->requestor_port = requestor_port; - } - /** - * Method used to remove an header previously inserted - * @param key The key identifying the header to remove. - **/ - void remove_header(const std::string& key) - { - this->headers.erase(key); - } - /** - * Method used to set all headers of the request. - * @param headers The headers key-value map to set for the request. - **/ - void set_headers(const std::map& headers) - { - std::map::const_iterator it; - for(it = headers.begin(); it != headers.end(); ++it) - this->headers[it->first] = it->second; - } - /** - * Method used to set all footers of the request. - * @param footers The footers key-value map to set for the request. - **/ - void set_footers(const std::map& footers) - { - std::map::const_iterator it; - for(it = footers.begin(); it != footers.end(); ++it) - this->footers[it->first] = it->second; - } - /** - * Method used to set all cookies of the request. - * @param cookies The cookies key-value map to set for the request. - **/ - void set_cookies(const std::map& cookies) - { - std::map::const_iterator it; - for(it = cookies.begin(); it != cookies.end(); ++it) - this->cookies[it->first] = it->second; - } - /** - * Method used to set all arguments of the request. - * @param args The args key-value map to set for the request. - **/ - void set_args(const std::map& args) - { - std::map::const_iterator it; - for(it = args.begin(); it != args.end(); ++it) - this->args[it->first] = it->second; - } - /** - * Method used to set the username of the request. - * @param user The username to set. - **/ - void set_user(const std::string& user) - { - this->user = user; - } - void set_digested_user(const std::string& digested_user) - { - this->digested_user = digested_user; - } - /** - * Method used to set the password of the request. - * @param pass The password to set. - **/ - void set_pass(const std::string& pass) - { - this->pass = pass; - } - - friend class webserver; -}; - -std::ostream &operator<< (std::ostream &os, const http_request &r); - -}; -#endif diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_resource.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_resource.hpp deleted file mode 100644 index 3755c32d..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_resource.hpp +++ /dev/null @@ -1,218 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _http_resource_hpp_ -#define _http_resource_hpp_ -#include -#include - -#ifdef DEBUG -#include -#endif - -namespace httpserver -{ - -class webserver; -class http_request; -class http_response; - -/** - * Class representing a callable http resource. -**/ - -void resource_init(std::map& res); - -template -class http_resource -{ - public: - /** - * Method used to answer to a generic request - * @param req Request passed through http - * @return A http_response object - **/ - void render(const http_request& r, http_response** res) - { - static_cast(this)->render(r, res); - } - /** - * Method used to answer to a GET request - * @param req Request passed through http - * @return A http_response object - **/ - void render_GET(const http_request& req, http_response** res) - { - static_cast(this)->render_GET(req, res); - } - /** - * Method used to answer to a POST request - * @param req Request passed through http - * @return A http_response object - **/ - void render_POST(const http_request& req, http_response** res) - { - static_cast(this)->render_POST(req, res); - } - /** - * Method used to answer to a PUT request - * @param req Request passed through http - * @return A http_response object - **/ - void render_PUT(const http_request& req, http_response** res) - { - static_cast(this)->render_PUT(req, res); - } - /** - * Method used to answer to a HEAD request - * @param req Request passed through http - * @return A http_response object - **/ - void render_HEAD(const http_request& req, http_response** res) - { - static_cast(this)->render_HEAD(req, res); - } - /** - * Method used to answer to a DELETE request - * @param req Request passed through http - * @return A http_response object - **/ - void render_DELETE(const http_request& req, http_response** res) - { - static_cast(this)->render_DELETE(req, res); - } - /** - * Method used to answer to a TRACE request - * @param req Request passed through http - * @return A http_response object - **/ - void render_TRACE(const http_request& req, http_response** res) - { - static_cast(this)->render_TRACE(req, res); - } - /** - * Method used to answer to a OPTIONS request - * @param req Request passed through http - * @return A http_response object - **/ - void render_OPTIONS(const http_request& req, http_response** res) - { - static_cast(this)->render_OPTIONS(req, res); - } - /** - * Method used to answer to a CONNECT request - * @param req Request passed through http - * @return A http_response object - **/ - void render_CONNECT(const http_request& req, http_response** res) - { - static_cast(this)->render_CONNECT(req, res); - } - /** - * Method used to set if a specific method is allowed or not on this request - * @param method method to set permission on - * @param allowed boolean indicating if the method is allowed or not - **/ - void set_allowing(const std::string& method, bool allowed) - { - if(this->allowed_methods.count(method)) - { - this->allowed_methods[method] = allowed; - } - } - /** - * Method used to implicitly allow all methods - **/ - void allow_all() - { - std::map::iterator it; - for ( it=this->allowed_methods.begin() ; it != this->allowed_methods.end(); ++it ) - this->allowed_methods[(*it).first] = true; - } - /** - * Method used to implicitly disallow all methods - **/ - void disallow_all() - { - std::map::iterator it; - for ( it=this->allowed_methods.begin() ; it != this->allowed_methods.end(); ++it ) - this->allowed_methods[(*it).first] = false; - } - /** - * Method used to discover if an http method is allowed or not for this resource - * @param method Method to discover allowings - * @return true if the method is allowed - **/ - bool is_allowed(const std::string& method) - { - if(this->allowed_methods.count(method)) - { - return this->allowed_methods[method]; - } - else - { -#ifdef DEBUG - std::map::iterator it; - for(it = allowed_methods.begin(); it != allowed_methods.end(); ++it) - { - std::cout << (*it).first << " -> " << (*it).second << std::endl; - } -#endif //DEBUG - return false; - } - } - protected: - /** - * Constructor of the class - **/ - http_resource() - { - resource_init(allowed_methods); - } - /** - * Copy constructor - **/ - http_resource(const http_resource& b) : allowed_methods(b.allowed_methods) { } - - http_resource& operator = (const http_resource& b) - { - allowed_methods = b.allowed_methods; - return (*this); - } - - /** - * Class destructor - **/ - ~http_resource() - { - } - - private: - friend class webserver; - friend void resource_init(std::map& res); - std::map allowed_methods; -}; - -}; -#endif diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_response.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_response.hpp deleted file mode 100644 index 53711e78..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_response.hpp +++ /dev/null @@ -1,311 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _HTTP_RESPONSE_HPP_ -#define _HTTP_RESPONSE_HPP_ -#include -#include -#include -#include - -#include "httpserver/details/http_resource_mirror.hpp" - -struct MHD_Connection; - -namespace httpserver -{ - -class webserver; -class http_response_builder; - -namespace http -{ - class header_comparator; - class arg_comparator; -}; - -namespace details -{ - struct http_response_ptr; - ssize_t cb(void*, uint64_t, char*, size_t); - struct cache_entry; -}; - -using namespace http; - -class bad_caching_attempt: public std::exception -{ - virtual const char* what() const throw() - { - return "You cannot pass ce = 0x0 without key!"; - } -}; - -typedef ssize_t(*cycle_callback_ptr)(char*, size_t); - -/** - * Class representing an abstraction for an Http Response. It is used from classes using these apis to send information through http protocol. -**/ -class http_response -{ - public: - - http_response(const http_response_builder& builder); - - /** - * Copy constructor - * @param b The http_response object to copy attributes value from. - **/ - http_response(const http_response& b): - content(b.content), - response_code(b.response_code), - autodelete(b.autodelete), - realm(b.realm), - opaque(b.opaque), - reload_nonce(b.reload_nonce), - fp(b.fp), - filename(b.filename), - headers(b.headers), - footers(b.footers), - cookies(b.cookies), - topics(b.topics), - keepalive_secs(b.keepalive_secs), - keepalive_msg(b.keepalive_msg), - send_topic(b.send_topic), - underlying_connection(b.underlying_connection), - ca(0x0), - closure_data(0x0), - ce(b.ce), - cycle_callback(b.cycle_callback), - get_raw_response(b.get_raw_response), - decorate_response(b.decorate_response), - enqueue_response(b.enqueue_response), - completed(b.completed), - ws(b.ws), - connection_id(b.connection_id) - { - } - - ~http_response(); - /** - * Method used to get the content from the response. - * @return the content in string form - **/ - const std::string get_content() - { - return this->content; - } - - void get_content(std::string& result) - { - result = this->content; - } - - /** - * Method used to get a specified header defined for the response - * @param key The header identification - * @return a string representing the value assumed by the header - **/ - const std::string get_header(const std::string& key) - { - return this->headers[key]; - } - - void get_header(const std::string& key, std::string& result) - { - result = this->headers[key]; - } - - /** - * Method used to get a specified footer defined for the response - * @param key The footer identification - * @return a string representing the value assumed by the footer - **/ - const std::string get_footer(const std::string& key) - { - return this->footers[key]; - } - - void get_footer(const std::string& key, std::string& result) - { - result = this->footers[key]; - } - - const std::string get_cookie(const std::string& key) - { - return this->cookies[key]; - } - - void get_cookie(const std::string& key, std::string& result) - { - result = this->cookies[key]; - } - - /** - * Method used to get all headers passed with the request. - * @return a map containing all headers. - **/ - size_t get_headers( - std::map& result - ) const; - - /** - * Method used to get all footers passed with the request. - * @return a map containing all footers. - **/ - size_t get_footers( - std::map& result - ) const; - - size_t get_cookies( - std::map& result - ) const; - - /** - * Method used to get the response code from the response - * @return The response code - **/ - int get_response_code() - { - return this->response_code; - } - - const std::string get_realm() const - { - return this->realm; - } - - void get_realm(std::string& result) const - { - result = this->realm; - } - - const std::string get_opaque() const - { - return this->opaque; - } - - void get_opaque(std::string& result) const - { - result = this->opaque; - } - - const bool need_nonce_reload() const - { - return this->reload_nonce; - } - - int get_switch_callback() const - { - return 0; - } - - bool is_autodelete() const - { - return autodelete; - } - - size_t get_topics(std::vector& topics) const - { - typedef std::vector::const_iterator topics_it; - for(topics_it it=this->topics.begin();it != this->topics.end();++it) - topics.push_back(*it); - return topics.size(); - } - protected: - typedef details::binders::functor_two get_raw_response_t; - - typedef details::binders::functor_one decorate_response_t; - - typedef details::binders::functor_two enqueue_response_t; - - std::string content; - int response_code; - bool autodelete; - std::string realm; - std::string opaque; - bool reload_nonce; - int fp; - std::string filename; - std::map headers; - std::map footers; - std::map cookies; - std::vector topics; - int keepalive_secs; - std::string keepalive_msg; - std::string send_topic; - struct MHD_Connection* underlying_connection; - void(*ca)(void*); - void* closure_data; - details::cache_entry* ce; - cycle_callback_ptr cycle_callback; - - const get_raw_response_t get_raw_response; - const decorate_response_t decorate_response; - const enqueue_response_t enqueue_response; - - bool completed; - - webserver* ws; - struct httpserver_ska connection_id; - - void get_raw_response_str(MHD_Response** res, webserver* ws = 0x0); - void get_raw_response_file(MHD_Response** res, webserver* ws = 0x0); - void get_raw_response_switch_r(MHD_Response** res, webserver* ws = 0x0); - - void get_raw_response_lp_receive(MHD_Response** res, - webserver* ws = 0x0); - - void get_raw_response_lp_send(MHD_Response** res, webserver* ws = 0x0); - void get_raw_response_cache(MHD_Response** res, webserver* ws = 0x0); - void get_raw_response_deferred(MHD_Response** res, webserver* ws = 0x0); - void decorate_response_str(MHD_Response* res); - void decorate_response_cache(MHD_Response* res); - void decorate_response_deferred(MHD_Response* res); - int enqueue_response_str(MHD_Connection* connection, MHD_Response* res); - - int enqueue_response_basic(MHD_Connection* connection, - MHD_Response* res - ); - - int enqueue_response_digest(MHD_Connection* connection, - MHD_Response* res - ); - - friend class webserver; - friend struct details::http_response_ptr; - friend class http_response_builder; - friend void clone_response(const http_response& hr, http_response** dhr); - friend ssize_t details::cb(void* cls, uint64_t pos, char* buf, size_t max); - friend std::ostream &operator<< (std::ostream &os, const http_response &r); - private: - http_response& operator=(const http_response& b); - - static ssize_t data_generator (void* cls, uint64_t pos, char* buf, size_t max); -}; - -std::ostream &operator<< (std::ostream &os, const http_response &r); - -}; -#endif diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_response_builder.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_response_builder.hpp deleted file mode 100644 index c405e234..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_response_builder.hpp +++ /dev/null @@ -1,298 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _HTTP_RESPONSE_BUILDER_HPP_ -#define _HTTP_RESPONSE_BUILDER_HPP_ -#include -#include -#include "httpserver/http_response.hpp" - -struct MHD_Connection; - -namespace httpserver -{ - -class webserver; - -namespace http -{ - class header_comparator; -}; - -namespace details -{ - struct cache_entry; -}; - -using namespace http; - -struct byte_string -{ - public: - byte_string(const char* content_hook, size_t content_length): - content_hook(content_hook), - content_length(content_length) - { - } - - const char* get_content_hook() const - { - return content_hook; - } - - size_t get_content_length() const - { - return content_length; - } - - private: - const char* content_hook; - size_t content_length; -}; - -class http_response_builder -{ - public: - explicit http_response_builder( - const std::string& content_hook, - int response_code = 200, - const std::string& content_type = "text/plain", - bool autodelete = true - ): - _content_hook(content_hook), - _response_code(response_code), - _autodelete(autodelete), - _realm(""), - _opaque(""), - _reload_nonce(false), - _headers(std::map()), - _footers(std::map()), - _cookies(std::map()), - _topics(std::vector()), - _keepalive_secs(-1), - _keepalive_msg(""), - _send_topic(""), - _ce(0x0), - _get_raw_response(&http_response::get_raw_response_str), - _decorate_response(&http_response::decorate_response_str), - _enqueue_response(&http_response::enqueue_response_str) - { - _headers[http_utils::http_header_content_type] = content_type; - } - - http_response_builder( - const byte_string& content_hook, - int response_code = 200, - const std::string& content_type = "text/plain", - bool autodelete = true - ): - _content_hook(std::string(content_hook.get_content_hook(), content_hook.get_content_length())), - _response_code(response_code), - _autodelete(autodelete), - _realm(""), - _opaque(""), - _reload_nonce(false), - _headers(std::map()), - _footers(std::map()), - _cookies(std::map()), - _topics(std::vector()), - _keepalive_secs(-1), - _keepalive_msg(""), - _send_topic(""), - _ce(0x0), - _get_raw_response(&http_response::get_raw_response_str), - _decorate_response(&http_response::decorate_response_str), - _enqueue_response(&http_response::enqueue_response_str) - { - _headers[http_utils::http_header_content_type] = content_type; - } - - http_response_builder(const http_response_builder& b): - _content_hook(b._content_hook), - _response_code(b._response_code), - _autodelete(b._autodelete), - _realm(b._realm), - _opaque(b._opaque), - _reload_nonce(b._reload_nonce), - _headers(b._headers), - _footers(b._footers), - _cookies(b._cookies), - _topics(b._topics), - _keepalive_secs(b._keepalive_secs), - _keepalive_msg(b._keepalive_msg), - _send_topic(b._send_topic), - _ce(b._ce), - _get_raw_response(b._get_raw_response), - _decorate_response(b._decorate_response), - _enqueue_response(b._enqueue_response) - { - } - - http_response_builder& operator=(const http_response_builder& b) - { - _content_hook = b._content_hook; - _response_code = b._response_code; - _autodelete = b._autodelete; - _realm = b._realm; - _opaque = b._opaque; - _reload_nonce = b._reload_nonce; - _headers = b._headers; - _footers = b._footers; - _cookies = b._cookies; - _topics = b._topics; - _keepalive_secs = b._keepalive_secs; - _keepalive_msg = b._keepalive_msg; - _send_topic = b._send_topic; - _ce = b._ce; - _get_raw_response = b._get_raw_response; - _decorate_response = b._decorate_response; - _enqueue_response = b._enqueue_response; - return *this; - } - - ~http_response_builder() - { - } - - http_response_builder& string_response() - { - return *this; - } - - http_response_builder& file_response() - { - _get_raw_response = &http_response::get_raw_response_file; - return *this; - } - - http_response_builder& basic_auth_fail_response(const std::string& realm = "") - { - _realm = realm; - _enqueue_response = &http_response::enqueue_response_basic; - return *this; - } - - http_response_builder& digest_auth_fail_response( - const std::string& realm = "", - const std::string& opaque = "", - bool reload_nonce = false - ) - { - _realm = realm; - _opaque = opaque; - _reload_nonce = reload_nonce; - _enqueue_response = &http_response::enqueue_response_digest; - return *this; - } - - http_response_builder& long_polling_receive_response( - const std::vector& topics, - int keepalive_secs = -1, - std::string keepalive_msg = "" - ) - { - _topics = topics; - _keepalive_secs = keepalive_secs; - _keepalive_msg = keepalive_msg; - _get_raw_response = &http_response::get_raw_response_lp_receive; - return *this; - } - - http_response_builder& long_polling_send_response(const std::string& send_topic) - { - _send_topic = send_topic; - _get_raw_response = &http_response::get_raw_response_lp_send; - return *this; - } - - http_response_builder& cache_response() - { - _get_raw_response = &http_response::get_raw_response_cache; - _decorate_response = &http_response::decorate_response_cache; - return *this; - } - - http_response_builder& deferred_response(cycle_callback_ptr cycle_callback) - { - _cycle_callback = cycle_callback; - _get_raw_response = &http_response::get_raw_response_deferred; - _decorate_response = &http_response::decorate_response_deferred; - return *this; - } - - http_response_builder& shoutCAST_response() - { - _response_code |= http_utils::shoutcast_response; - return *this; - } - - http_response_builder& with_header(const std::string& key, const std::string& value) - { - _headers[key] = value; return *this; - } - - http_response_builder& with_footer(const std::string& key, const std::string& value) - { - _footers[key] = value; return *this; - } - - http_response_builder& with_cookie(const std::string& key, const std::string& value) - { - _cookies[key] = value; return *this; - } - - private: - std::string _content_hook; - int _response_code; - bool _autodelete; - std::string _realm; - std::string _opaque; - bool _reload_nonce; - std::map _headers; - std::map _footers; - std::map _cookies; - std::vector _topics; - int _keepalive_secs; - std::string _keepalive_msg; - std::string _send_topic; - cycle_callback_ptr _cycle_callback; - details::cache_entry* _ce; - - void (http_response::*_get_raw_response)(MHD_Response**, webserver*); - void (http_response::*_decorate_response)(MHD_Response*); - int (http_response::*_enqueue_response)(MHD_Connection*, MHD_Response*); - - http_response_builder& cache_response(details::cache_entry* ce) - { - _ce = ce; - _get_raw_response = &http_response::get_raw_response_cache; - _decorate_response = &http_response::decorate_response_cache; - return *this; - } - - friend class http_response; -}; - -}; -#endif //_HTTP_RESPONSE_BUILDER_HPP_ diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_utils.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_utils.hpp deleted file mode 100644 index 58bc8f6e..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/http_utils.hpp +++ /dev/null @@ -1,422 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _HTTPUTILS_H_ -#define _HTTPUTILS_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_GNUTLS -#include -#endif - -#define DEFAULT_MASK_VALUE 0xFFFF - -namespace httpserver { -namespace http { - -class bad_ip_format_exception: public std::exception -{ - virtual const char* what() const throw() - { - return "IP is badly formatted!"; - } -}; - -class file_access_exception: public std::exception -{ - virtual const char* what() const throw() - { - return "Unable to open file!"; - } -}; - -class http_utils -{ - public: - - enum cred_type_T - { - NONE = -1 -#ifdef HAVE_GNUTLS - ,CERTIFICATE = GNUTLS_CRD_CERTIFICATE, - ANON = GNUTLS_CRD_ANON, - SRP = GNUTLS_CRD_SRP, - PSK = GNUTLS_CRD_PSK, - IA = GNUTLS_CRD_IA -#endif - }; - - enum start_method_T - { - INTERNAL_SELECT = MHD_NO_FLAG, - THREADS = MHD_USE_THREAD_PER_CONNECTION, - POLL = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL - }; - - enum policy_T - { - ACCEPT, - REJECT - }; - - enum IP_version_T - { - IPV4 = 4, IPV6 = 16 - }; - - static const short http_method_connect_code; - static const short http_method_delete_code; - static const short http_method_get_code; - static const short http_method_head_code; - static const short http_method_options_code; - static const short http_method_post_code; - static const short http_method_put_code; - static const short http_method_trace_code; - static const short http_method_unknown_code; - - static const int http_continue; - static const int http_switching_protocol; - static const int http_processing; - - static const int http_ok; - static const int http_created; - static const int http_accepted; - static const int http_non_authoritative_information; - static const int http_no_content; - static const int http_reset_content; - static const int http_partial_content; - static const int http_multi_status; - - static const int http_multiple_choices; - static const int http_moved_permanently; - static const int http_found; - static const int http_see_other; - static const int http_not_modified; - static const int http_use_proxy; - static const int http_switch_proxy; - static const int http_temporary_redirect; - - static const int http_bad_request; - static const int http_unauthorized; - static const int http_payment_required; - static const int http_forbidden; - static const int http_not_found; - static const int http_method_not_allowed; - static const int http_method_not_acceptable; - static const int http_proxy_authentication_required; - static const int http_request_timeout; - static const int http_conflict; - static const int http_gone; - static const int http_length_required; - static const int http_precondition_failed; - static const int http_request_entity_too_large; - static const int http_request_uri_too_long; - static const int http_unsupported_media_type; - static const int http_requested_range_not_satisfiable; - static const int http_expectation_failed; - static const int http_unprocessable_entity; - static const int http_locked; - static const int http_failed_dependency; - static const int http_unordered_collection; - static const int http_upgrade_required; - static const int http_retry_with; - - static const int http_internal_server_error; - static const int http_not_implemented; - static const int http_bad_gateway; - static const int http_service_unavailable; - static const int http_gateway_timeout; - static const int http_version_not_supported; - static const int http_variant_also_negotiated; - static const int http_insufficient_storage; - static const int http_bandwidth_limit_exceeded; - static const int http_not_extended; - - static const int shoutcast_response; - - /* See also: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html */ - static const std::string http_header_accept; - static const std::string http_header_accept_charset; - static const std::string http_header_accept_encoding; - static const std::string http_header_accept_language; - static const std::string http_header_accept_ranges; - static const std::string http_header_age; - static const std::string http_header_allow; - static const std::string http_header_authorization; - static const std::string http_header_cache_control; - static const std::string http_header_connection; - static const std::string http_header_content_encoding; - static const std::string http_header_content_language; - static const std::string http_header_content_length; - static const std::string http_header_content_location; - static const std::string http_header_content_md5; - static const std::string http_header_content_range; - static const std::string http_header_content_type; - static const std::string http_header_date; - static const std::string http_header_etag; - static const std::string http_header_expect; - static const std::string http_header_expires; - static const std::string http_header_from; - static const std::string http_header_host; - static const std::string http_header_if_match; - static const std::string http_header_if_modified_since; - static const std::string http_header_if_none_match; - static const std::string http_header_if_range; - static const std::string http_header_if_unmodified_since; - static const std::string http_header_last_modified; - static const std::string http_header_location; - static const std::string http_header_max_forwards; - static const std::string http_header_pragma; - static const std::string http_header_proxy_authenticate; - static const std::string http_header_proxy_authentication; - static const std::string http_header_range; - static const std::string http_header_referer; - static const std::string http_header_retry_after; - static const std::string http_header_server; - static const std::string http_header_te; - static const std::string http_header_trailer; - static const std::string http_header_transfer_encoding; - static const std::string http_header_upgrade; - static const std::string http_header_user_agent; - static const std::string http_header_vary; - static const std::string http_header_via; - static const std::string http_header_warning; - static const std::string http_header_www_authenticate; - - static const std::string http_version_1_0; - static const std::string http_version_1_1; - - static const std::string http_method_connect; - static const std::string http_method_delete; - static const std::string http_method_head; - static const std::string http_method_get; - static const std::string http_method_options; - static const std::string http_method_post; - static const std::string http_method_put; - static const std::string http_method_trace; - - static const std::string http_post_encoding_form_urlencoded; - static const std::string http_post_encoding_multipart_formdata; - static size_t tokenize_url(const std::string&, - std::vector& result, const char separator = '/' - ); - static void standardize_url(const std::string&, std::string& result); -}; - -#define COMPARATOR(x, y, op) \ - { \ - size_t l1 = (x).size();\ - size_t l2 = (y).size();\ - if (l1 < l2) return true;\ - if (l1 > l2) return false;\ - \ - for (size_t n = 0; n < l1; n++)\ - {\ - int xc = op((x)[n]);\ - int yc = op((y)[n]);\ - if (xc < yc) return true;\ - if (xc > yc) return false;\ - }\ - return false;\ - } - -class header_comparator { - public: - /** - * Operator used to compare strings. - * @param first string - * @param second string - **/ - bool operator()(const std::string& x,const std::string& y) const - { - COMPARATOR(x, y, std::toupper); - } -}; - -/** - * Operator Class that is used to compare two strings. The comparison can be sensitive or insensitive. - * The default comparison is case sensitive. To obtain insensitive comparison you have to pass in - * compilation phase the flag CASE_INSENSITIVE to the preprocessor. -**/ -class arg_comparator { - public: - /** - * Operator used to compare strings. - * @param first string - * @param second string - **/ - bool operator()(const std::string& x,const std::string& y) const - { -#ifdef CASE_INSENSITIVE - COMPARATOR(x, y, std::toupper); -#else - COMPARATOR(x, y, ); -#endif - } -}; - -struct ip_representation -{ - http_utils::IP_version_T ip_version; - unsigned short pieces[16]; - unsigned int mask:16; - - ip_representation(http_utils::IP_version_T ip_version) : - ip_version(ip_version) - { - mask = DEFAULT_MASK_VALUE; - std::fill(pieces, pieces + 16, 0); - } - - ip_representation(const std::string& ip); - ip_representation(const struct sockaddr* ip); - - bool operator <(const ip_representation& b) const; - const int weight() const - { - //variable-precision SWAR algorithm - unsigned int x = mask; - x = x - ((x >> 1) & 0x55555555); - x = (x & 0x33333333) + ((x >> 2) & 0x33333333); - return (((x + (x >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24; - } -}; - -/** - * Method used to get an ip in form of string from a sockaddr structure - * @param sa The sockaddr object to find the ip address from - * @param maxlen Maxlen of the address (automatically discovered if not passed) - * @return string containing the ip address -**/ -void get_ip_str(const struct sockaddr *sa, - std::string& result, socklen_t maxlen = 0 -); - -std::string get_ip_str_new(const struct sockaddr* sa, - socklen_t maxlen = 0 -); -/** - * Method used to get a port from a sockaddr - * @param sa The sockaddr object to find the port from - * @return short representing the port -**/ -short get_port(const struct sockaddr* sa); - -/** - * Method to output the contents of a headers map to a std::ostream - * @param os The ostream - * @param prefix Prefix to identify the map - * @param map -**/ -void dump_header_map(std::ostream &os, const std::string &prefix, - const std::map &map); - -/** - * Method to output the contents of an arguments map to a std::ostream - * @param os The ostream - * @param prefix Prefix to identify the map - * @param map -**/ -void dump_arg_map(std::ostream &os, const std::string &prefix, - const std::map &map); - -/** - * Process escape sequences ('+'=space, %HH) Updates val in place; the - * result should be UTF-8 encoded and cannot be larger than the input. - * The result must also still be 0-terminated. - * - * @param val the string to unescape - * @return length of the resulting val (strlen(val) maybe - * shorter afterwards due to elimination of escape sequences) - */ -size_t http_unescape (char *val); - -char* load_file (const char *filename); - -size_t load_file (const char* filename, char** content); - -struct httpserver_ska -{ - httpserver_ska(struct sockaddr* addr): - addr(addr), - ip(get_ip_str_new(addr)), - port(get_port(addr)) - { - } - - httpserver_ska(): addr(0x0) { } - - httpserver_ska(const httpserver_ska& o): - addr(o.addr), - ip(o.ip), - port(o.port) - { - } - - bool operator<(const httpserver_ska& o) const - { - if(this->ip < o.ip) - return true; - else if(this->ip > o.ip) - return false; - else if(this->port < o.port) - return true; - else - return false; - } - - httpserver_ska& operator=(const httpserver_ska& o) - { - this->addr = o.addr; - this->ip = o.ip; - this->port = o.port; - return *this; - } - - httpserver_ska& operator=(struct sockaddr* addr) - { - this->addr = addr; - this->ip = get_ip_str_new(addr); - this->port = get_port(addr); - return *this; - } - - struct sockaddr* addr; - std::string ip; - int port; -}; - - - -}; -}; -#endif - diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/webserver.hpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/webserver.hpp deleted file mode 100644 index 9a8e172f..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserver/webserver.hpp +++ /dev/null @@ -1,364 +0,0 @@ -/* - This file is part of libhttpserver - Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA -*/ - -#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION) -#error "Only or can be included directly." -#endif - -#ifndef _FRAMEWORK_WEBSERVER_HPP_ -#define _FRAMEWORK_WEBSERVER_HPP_ - -#define NOT_FOUND_ERROR "Not Found" -#define METHOD_ERROR "Method not Allowed" -#define NOT_METHOD_ERROR "Method not Acceptable" -#define GENERIC_ERROR "Internal Error" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "httpserver/create_webserver.hpp" - -namespace httpserver { - -template class http_resource; -class http_response; -template class event_supplier; -class create_webserver; - -namespace http { -struct ip_representation; -struct httpserver_ska; -}; - -namespace details { - class http_resource_mirror; - class event_tuple; - class http_endpoint; - struct daemon_item; - struct modded_request; - struct cache_entry; - class comet_manager; -} - -/** - * Class representing the webserver. Main class of the apis. -**/ -class webserver -{ - public: - webserver(const create_webserver& params); - /** - * Destructor of the class - **/ - ~webserver(); - /** - * Method used to start the webserver. - * This method can be blocking or not. - * @param blocking param indicating if the method is blocking or not - * @return a boolean indicating if the webserver is running or not. - **/ - bool start(bool blocking = false); - /** - * Method used to stop the webserver. - * @return true if the webserver is stopped. - **/ - bool stop(); - /** - * Method used to evaluate if the server is running or not. - * @return true if the webserver is running - **/ - bool is_running(); - /** - * Method used to register a resource with the webserver. - * @param resource The url pointing to the resource. This url could be also parametrized in the form /path/to/url/{par1}/and/{par2} - * or a regular expression. - * @param http_resource http_resource pointer to register. - * @param family boolean indicating whether the resource is registered for the endpoint and its child or not. - * @return true if the resource was registered - **/ - template - bool register_resource(const std::string& resource, - http_resource* res, bool family = false - ) - { - details::http_resource_mirror hrm(res); - return register_resource(resource, hrm, family); - } - - void unregister_resource(const std::string& resource); - void ban_ip(const std::string& ip); - void allow_ip(const std::string& ip); - void unban_ip(const std::string& ip); - void disallow_ip(const std::string& ip); - - void send_message_to_topic(const std::string& topic, - const std::string& message - ); - void send_message_to_consumer(const http::httpserver_ska& connection_id, - const std::string& message, bool to_lock = true - ); - void register_to_topics(const std::vector& topics, - const http::httpserver_ska& connection_id, int keepalive_secs = -1, - std::string keepalive_msg = "" - ); - size_t read_message(const http::httpserver_ska& connection_id, - std::string& message - ); - size_t get_topic_consumers(const std::string& topic, - std::set& consumers - ); - bool pop_signaled(const http::httpserver_ska& consumer); - - http_response* get_from_cache(const std::string& key, bool* valid, - bool lock = false, bool write = false - ); - http_response* get_from_cache(const std::string& key, bool* valid, - details::cache_entry** ce, bool lock = false, bool write = false - ); - void lock_cache_element(details::cache_entry* ce, bool write = false); - void unlock_cache_element(details::cache_entry* ce); - details::cache_entry* put_in_cache(const std::string& key, http_response* value, - bool* new_elem, bool lock = false, - bool write = false, int validity = -1 - ); - void remove_from_cache(const std::string& key); - bool is_valid(const std::string& key); - void clean_cache(); - - const log_access_ptr get_access_logger() const - { - return this->log_access; - } - - const log_error_ptr get_error_logger() const - { - return this->log_error; - } - - const validator_ptr get_request_validator() const - { - return this->validator; - } - - const unescaper_ptr get_unescaper() const - { - return this->unescaper; - } - - template - void register_event_supplier(const std::string& id, - event_supplier* ev_supplier - ) - { - register_event_supplier(id, details::event_tuple(ev_supplier)); - } - - void remove_event_supplier(const std::string& id); - - /** - * Method used to kill the webserver waiting for it to terminate - **/ - void sweet_kill(); - - protected: - webserver& operator=(const webserver& other); - - private: - const uint16_t port; - http::http_utils::start_method_T start_method; - const int max_threads; - const int max_connections; - const int memory_limit; - const int connection_timeout; - const int per_IP_connection_limit; - log_access_ptr log_access; - log_error_ptr log_error; - validator_ptr validator; - unescaper_ptr unescaper; - const struct sockaddr* bind_address; - /* Changed type to MHD_socket because this type will always reflect the - platform's actual socket type (e.g. SOCKET on windows, int on unixes)*/ - MHD_socket bind_socket; - const int max_thread_stack_size; - const bool use_ssl; - const bool use_ipv6; - const bool debug; - const bool pedantic; - const std::string https_mem_key; - const std::string https_mem_cert; - const std::string https_mem_trust; - const std::string https_priorities; - const http::http_utils::cred_type_T cred_type; - const std::string digest_auth_random; - const int nonce_nc_size; - bool running; - const http::http_utils::policy_T default_policy; - const bool basic_auth_enabled; - const bool digest_auth_enabled; - const bool regex_checking; - const bool ban_system_enabled; - const bool post_process_enabled; - bool single_resource; - pthread_mutex_t mutexwait; - pthread_rwlock_t runguard; - pthread_cond_t mutexcond; - render_ptr not_found_resource; - render_ptr method_not_allowed_resource; - render_ptr method_not_acceptable_resource; - render_ptr internal_error_resource; - std::map registered_resources; - std::map registered_resources_str; - - std::map response_cache; - int next_to_choose; - pthread_rwlock_t cache_guard; - std::set bans; - std::set allowances; - - std::vector daemons; - std::vector threads; - - std::map event_suppliers; - - details::comet_manager* internal_comet_manager; - - static void* select(void* self); - static void* cleaner(void* self); - - bool register_resource(const std::string& resource, - details::http_resource_mirror hrm, bool family = false - ); - - void method_not_allowed_page(http_response** dhrs, - details::modded_request* mr - ); - void internal_error_page(http_response** dhrs, - details::modded_request* mr, bool force_our = false - ); - void not_found_page(http_response** dhrs, details::modded_request* mr); - - static int method_not_acceptable_page - ( - const void *cls, - struct MHD_Connection *connection - ); - static void request_completed(void *cls, - struct MHD_Connection *connection, void **con_cls, - enum MHD_RequestTerminationCode toe - ); - static int build_request_header (void *cls, enum MHD_ValueKind kind, - const char *key, const char *value - ); - static int build_request_footer (void *cls, enum MHD_ValueKind kind, - const char *key, const char *value - ); - static int build_request_cookie (void *cls, enum MHD_ValueKind kind, - const char *key, const char *value - ); - static int build_request_args (void *cls, enum MHD_ValueKind kind, - const char *key, const char *value - ); - static int answer_to_connection - ( - void* cls, MHD_Connection* connection, - const char* url, const char* method, - const char* version, const char* upload_data, - size_t* upload_data_size, void** con_cls - ); - static int post_iterator - ( - void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *data, uint64_t off, size_t size - ); - static void upgrade_handler - ( - void *cls, - struct MHD_Connection* connection, - void **con_cls, int upgrade_socket - ); - - static void unlock_cache_entry(details::cache_entry*); - static void lock_cache_entry(details::cache_entry*); - static void get_response(details::cache_entry*, http_response** res); - - int bodyless_requests_answer(MHD_Connection* connection, - const char* method, const char* version, - struct details::modded_request* mr - ); - - int bodyfull_requests_answer_first_step(MHD_Connection* connection, - struct details::modded_request* mr - ); - - int bodyfull_requests_answer_second_step(MHD_Connection* connection, - const char* method, const char* version, const char* upload_data, - size_t* upload_data_size, struct details::modded_request* mr - ); - - void end_request_construction(MHD_Connection* connection, - struct details::modded_request* mr, const char* version, - const char* method, char* user, char* pass, char* digested_user - ); - - int finalize_answer(MHD_Connection* connection, - struct details::modded_request* mr, const char* method - ); - - int complete_request(MHD_Connection* connection, - struct details::modded_request* mr, - const char* version, const char* method - ); - - void register_event_supplier(const std::string& id, const details::event_tuple& evt); - - bool use_internal_select() - { - return this->start_method == http::http_utils::INTERNAL_SELECT; - } - - friend int policy_callback (void *cls, - const struct sockaddr* addr, socklen_t addrlen - ); - friend void error_log(void* cls, const char* fmt, va_list ap); - friend void access_log(webserver* cls, std::string uri); - friend void* uri_log(void* cls, const char* uri); - friend size_t unescaper_func(void * cls, - struct MHD_Connection *c, char *s - ); - friend size_t internal_unescaper(void * cls, char *s); - friend class http_response; -}; - -}; -#endif //_FRAMEWORK_WEBSERVER_HPP__ diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/httpserverpp b/src/hos_libhttpserver/include/hos_libhttpserver/httpserverpp deleted file mode 120000 index 6b58f80c..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/httpserverpp +++ /dev/null @@ -1 +0,0 @@ -httpserver.hpp \ No newline at end of file diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/microhttpd.h b/src/hos_libhttpserver/include/hos_libhttpserver/microhttpd.h deleted file mode 100644 index ca3bb869..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/microhttpd.h +++ /dev/null @@ -1,2675 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2006-2015 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file microhttpd.h - * @brief public interface to libmicrohttpd - * @author Christian Grothoff - * @author Chris GauthierDickey - * - * All symbols defined in this header start with MHD. MHD is a small - * HTTP daemon library. As such, it does not have any API for logging - * errors (you can only enable or disable logging to stderr). Also, - * it may not support all of the HTTP features directly, where - * applicable, portions of HTTP may have to be handled by clients of - * the library. - * - * The library is supposed to handle everything that it must handle - * (because the API would not allow clients to do this), such as basic - * connection management; however, detailed interpretations of headers - * -- such as range requests -- and HTTP methods are left to clients. - * The library does understand HEAD and will only send the headers of - * the response and not the body, even if the client supplied a body. - * The library also understands headers that control connection - * management (specifically, "Connection: close" and "Expect: 100 - * continue" are understood and handled automatically). - * - * MHD understands POST data and is able to decode certain formats - * (at the moment only "application/x-www-form-urlencoded" and - * "mulitpart/formdata"). Unsupported encodings and large POST - * submissions may require the application to manually process - * the stream, which is provided to the main application (and thus can be - * processed, just not conveniently by MHD). - * - * The header file defines various constants used by the HTTP protocol. - * This does not mean that MHD actually interprets all of these - * values. The provided constants are exported as a convenience - * for users of the library. MHD does not verify that transmitted - * HTTP headers are part of the standard specification; users of the - * library are free to define their own extensions of the HTTP - * standard and use those with MHD. - * - * All functions are guaranteed to be completely reentrant and - * thread-safe (with the exception of #MHD_set_connection_value, - * which must only be used in a particular context). - * - * NEW: Before including "microhttpd.h" you should add the necessary - * includes to define the `uint64_t`, `size_t`, `fd_set`, `socklen_t` - * and `struct sockaddr` data types (which headers are needed may - * depend on your platform; for possible suggestions consult - * "platform.h" in the MHD distribution). If you have done so, you - * should also have a line with "#define MHD_PLATFORM_H" which will - * prevent this header from trying (and, depending on your platform, - * failing) to include the right headers. - * - * @defgroup event event-loop control - * MHD API to start and stop the HTTP server and manage the event loop. - * @defgroup response generation of responses - * MHD API used to generate responses. - * @defgroup request handling of requests - * MHD API used to access information about requests. - * @defgroup authentication HTTP authentication - * MHD API related to basic and digest HTTP authentication. - * @defgroup logging logging - * MHD API to mange logging and error handling - * @defgroup specialized misc. specialized functions - * This group includes functions that do not fit into any particular - * category and that are rarely used. - */ - -#ifndef MHD_MICROHTTPD_H -#define MHD_MICROHTTPD_H - -#ifdef __cplusplus -extern "C" -{ -#if 0 /* keep Emacsens' auto-indent happy */ -} -#endif -#endif - -/* While we generally would like users to use a configure-driven - build process which detects which headers are present and - hence works on any platform, we use "standard" includes here - to build out-of-the-box for beginning users on common systems. - - Once you have a proper build system and go for more exotic - platforms, you should define MHD_PLATFORM_H in some header that - you always include *before* "microhttpd.h". Then the following - "standard" includes won't be used (which might be a good - idea, especially on platforms where they do not exist). */ -#ifndef MHD_PLATFORM_H -#include -#include -#include -#if defined(_WIN32) && !defined(__CYGWIN__) -#include -#if defined(_MSC_FULL_VER) && !defined (_SSIZE_T_DEFINED) -#define _SSIZE_T_DEFINED -typedef intptr_t ssize_t; -#endif // !_SSIZE_T_DEFINED */ -#else -#include -#include -#include -#endif -#endif - -#if defined(__CYGWIN__) && !defined(_SYS_TYPES_FD_SET) -/* Do not define __USE_W32_SOCKETS under Cygwin! */ -#error Cygwin with winsock fd_set is not supported -#endif - -/** - * Current version of the library. - * 0x01093001 = 1.9.30-1. - */ -#define MHD_VERSION 0x00094200 - -/** - * MHD-internal return code for "YES". - */ -#define MHD_YES 1 - -/** - * MHD-internal return code for "NO". - */ -#define MHD_NO 0 - -/** - * MHD digest auth internal code for an invalid nonce. - */ -#define MHD_INVALID_NONCE -1 - -/** - * Constant used to indicate unknown size (use when - * creating a response). - */ -#ifdef UINT64_MAX -#define MHD_SIZE_UNKNOWN UINT64_MAX -#else -#define MHD_SIZE_UNKNOWN ((uint64_t) -1LL) -#endif - -#ifdef SIZE_MAX -#define MHD_CONTENT_READER_END_OF_STREAM SIZE_MAX -#define MHD_CONTENT_READER_END_WITH_ERROR (SIZE_MAX - 1) -#else -#define MHD_CONTENT_READER_END_OF_STREAM ((size_t) -1LL) -#define MHD_CONTENT_READER_END_WITH_ERROR (((size_t) -1LL) - 1) -#endif - -#ifndef _MHD_EXTERN -#if defined(_WIN32) && defined(MHD_W32LIB) -#define _MHD_EXTERN extern -#elif defined (_WIN32) && defined(MHD_W32DLL) -/* Define MHD_W32DLL when using MHD as W32 .DLL to speed up linker a little */ -#define _MHD_EXTERN __declspec(dllimport) -#else -#define _MHD_EXTERN extern -#endif -#endif - -#ifndef MHD_SOCKET_DEFINED -/** - * MHD_socket is type for socket FDs - */ -#if !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) -#define MHD_POSIX_SOCKETS 1 -typedef int MHD_socket; -#define MHD_INVALID_SOCKET (-1) -#else /* !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) */ -#define MHD_WINSOCK_SOCKETS 1 -#include -typedef SOCKET MHD_socket; -#define MHD_INVALID_SOCKET (INVALID_SOCKET) -#endif /* !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) */ -#define MHD_SOCKET_DEFINED 1 -#endif /* MHD_SOCKET_DEFINED */ - -/** - * Not all architectures and `printf()`'s support the `long long` type. - * This gives the ability to replace `long long` with just a `long`, - * standard `int` or a `short`. - */ -#ifndef MHD_LONG_LONG -/** - * @deprecated use #MHD_UNSIGNED_LONG_LONG instead! - */ -#define MHD_LONG_LONG long long -#define MHD_UNSIGNED_LONG_LONG unsigned long long -#endif -/** - * Format string for printing a variable of type #MHD_LONG_LONG. - * You should only redefine this if you also define #MHD_LONG_LONG. - */ -#ifndef MHD_LONG_LONG_PRINTF -/** - * @deprecated use #MHD_UNSIGNED_LONG_LONG_PRINTF instead! - */ -#define MHD_LONG_LONG_PRINTF "ll" -#define MHD_UNSIGNED_LONG_LONG_PRINTF "%llu" -#endif - - -/** - * @defgroup httpcode HTTP response codes. - * These are the status codes defined for HTTP responses. - * @{ - */ -#define MHD_HTTP_CONTINUE 100 -#define MHD_HTTP_SWITCHING_PROTOCOLS 101 -#define MHD_HTTP_PROCESSING 102 - -#define MHD_HTTP_OK 200 -#define MHD_HTTP_CREATED 201 -#define MHD_HTTP_ACCEPTED 202 -#define MHD_HTTP_NON_AUTHORITATIVE_INFORMATION 203 -#define MHD_HTTP_NO_CONTENT 204 -#define MHD_HTTP_RESET_CONTENT 205 -#define MHD_HTTP_PARTIAL_CONTENT 206 -#define MHD_HTTP_MULTI_STATUS 207 - -#define MHD_HTTP_MULTIPLE_CHOICES 300 -#define MHD_HTTP_MOVED_PERMANENTLY 301 -#define MHD_HTTP_FOUND 302 -#define MHD_HTTP_SEE_OTHER 303 -#define MHD_HTTP_NOT_MODIFIED 304 -#define MHD_HTTP_USE_PROXY 305 -#define MHD_HTTP_SWITCH_PROXY 306 -#define MHD_HTTP_TEMPORARY_REDIRECT 307 - -#define MHD_HTTP_BAD_REQUEST 400 -#define MHD_HTTP_UNAUTHORIZED 401 -#define MHD_HTTP_PAYMENT_REQUIRED 402 -#define MHD_HTTP_FORBIDDEN 403 -#define MHD_HTTP_NOT_FOUND 404 -#define MHD_HTTP_METHOD_NOT_ALLOWED 405 -#define MHD_HTTP_NOT_ACCEPTABLE 406 -/** @deprecated */ -#define MHD_HTTP_METHOD_NOT_ACCEPTABLE 406 -#define MHD_HTTP_PROXY_AUTHENTICATION_REQUIRED 407 -#define MHD_HTTP_REQUEST_TIMEOUT 408 -#define MHD_HTTP_CONFLICT 409 -#define MHD_HTTP_GONE 410 -#define MHD_HTTP_LENGTH_REQUIRED 411 -#define MHD_HTTP_PRECONDITION_FAILED 412 -#define MHD_HTTP_REQUEST_ENTITY_TOO_LARGE 413 -#define MHD_HTTP_REQUEST_URI_TOO_LONG 414 -#define MHD_HTTP_UNSUPPORTED_MEDIA_TYPE 415 -#define MHD_HTTP_REQUESTED_RANGE_NOT_SATISFIABLE 416 -#define MHD_HTTP_EXPECTATION_FAILED 417 -#define MHD_HTTP_UNPROCESSABLE_ENTITY 422 -#define MHD_HTTP_LOCKED 423 -#define MHD_HTTP_FAILED_DEPENDENCY 424 -#define MHD_HTTP_UNORDERED_COLLECTION 425 -#define MHD_HTTP_UPGRADE_REQUIRED 426 -#define MHD_HTTP_NO_RESPONSE 444 -#define MHD_HTTP_RETRY_WITH 449 -#define MHD_HTTP_BLOCKED_BY_WINDOWS_PARENTAL_CONTROLS 450 -#define MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS 451 - -#define MHD_HTTP_INTERNAL_SERVER_ERROR 500 -#define MHD_HTTP_NOT_IMPLEMENTED 501 -#define MHD_HTTP_BAD_GATEWAY 502 -#define MHD_HTTP_SERVICE_UNAVAILABLE 503 -#define MHD_HTTP_GATEWAY_TIMEOUT 504 -#define MHD_HTTP_HTTP_VERSION_NOT_SUPPORTED 505 -#define MHD_HTTP_VARIANT_ALSO_NEGOTIATES 506 -#define MHD_HTTP_INSUFFICIENT_STORAGE 507 -#define MHD_HTTP_BANDWIDTH_LIMIT_EXCEEDED 509 -#define MHD_HTTP_NOT_EXTENDED 510 - -/** @} */ /* end of group httpcode */ - -/** - * Flag to be or-ed with MHD_HTTP status code for - * SHOUTcast. This will cause the response to begin - * with the SHOUTcast "ICY" line instad of "HTTP". - * @ingroup specialized - */ -#define MHD_ICY_FLAG ((uint32_t)(((uint32_t)1) << 31)) - -/** - * @defgroup headers HTTP headers - * These are the standard headers found in HTTP requests and responses. - * @{ - */ -/* See also: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html */ -#define MHD_HTTP_HEADER_ACCEPT "Accept" -#define MHD_HTTP_HEADER_ACCEPT_CHARSET "Accept-Charset" -#define MHD_HTTP_HEADER_ACCEPT_ENCODING "Accept-Encoding" -#define MHD_HTTP_HEADER_ACCEPT_LANGUAGE "Accept-Language" -#define MHD_HTTP_HEADER_ACCEPT_RANGES "Accept-Ranges" -#define MHD_HTTP_HEADER_AGE "Age" -#define MHD_HTTP_HEADER_ALLOW "Allow" -#define MHD_HTTP_HEADER_AUTHORIZATION "Authorization" -#define MHD_HTTP_HEADER_CACHE_CONTROL "Cache-Control" -#define MHD_HTTP_HEADER_CONNECTION "Connection" -#define MHD_HTTP_HEADER_CONTENT_ENCODING "Content-Encoding" -#define MHD_HTTP_HEADER_CONTENT_LANGUAGE "Content-Language" -#define MHD_HTTP_HEADER_CONTENT_LENGTH "Content-Length" -#define MHD_HTTP_HEADER_CONTENT_LOCATION "Content-Location" -#define MHD_HTTP_HEADER_CONTENT_MD5 "Content-MD5" -#define MHD_HTTP_HEADER_CONTENT_RANGE "Content-Range" -#define MHD_HTTP_HEADER_CONTENT_TYPE "Content-Type" -#define MHD_HTTP_HEADER_COOKIE "Cookie" -#define MHD_HTTP_HEADER_DATE "Date" -#define MHD_HTTP_HEADER_ETAG "ETag" -#define MHD_HTTP_HEADER_EXPECT "Expect" -#define MHD_HTTP_HEADER_EXPIRES "Expires" -#define MHD_HTTP_HEADER_FROM "From" -#define MHD_HTTP_HEADER_HOST "Host" -#define MHD_HTTP_HEADER_IF_MATCH "If-Match" -#define MHD_HTTP_HEADER_IF_MODIFIED_SINCE "If-Modified-Since" -#define MHD_HTTP_HEADER_IF_NONE_MATCH "If-None-Match" -#define MHD_HTTP_HEADER_IF_RANGE "If-Range" -#define MHD_HTTP_HEADER_IF_UNMODIFIED_SINCE "If-Unmodified-Since" -#define MHD_HTTP_HEADER_LAST_MODIFIED "Last-Modified" -#define MHD_HTTP_HEADER_LOCATION "Location" -#define MHD_HTTP_HEADER_MAX_FORWARDS "Max-Forwards" -#define MHD_HTTP_HEADER_PRAGMA "Pragma" -#define MHD_HTTP_HEADER_PROXY_AUTHENTICATE "Proxy-Authenticate" -#define MHD_HTTP_HEADER_PROXY_AUTHORIZATION "Proxy-Authorization" -#define MHD_HTTP_HEADER_RANGE "Range" -/* This is not a typo, see HTTP spec */ -#define MHD_HTTP_HEADER_REFERER "Referer" -#define MHD_HTTP_HEADER_RETRY_AFTER "Retry-After" -#define MHD_HTTP_HEADER_SERVER "Server" -#define MHD_HTTP_HEADER_SET_COOKIE "Set-Cookie" -#define MHD_HTTP_HEADER_SET_COOKIE2 "Set-Cookie2" -#define MHD_HTTP_HEADER_TE "TE" -#define MHD_HTTP_HEADER_TRAILER "Trailer" -#define MHD_HTTP_HEADER_TRANSFER_ENCODING "Transfer-Encoding" -#define MHD_HTTP_HEADER_UPGRADE "Upgrade" -#define MHD_HTTP_HEADER_USER_AGENT "User-Agent" -#define MHD_HTTP_HEADER_VARY "Vary" -#define MHD_HTTP_HEADER_VIA "Via" -#define MHD_HTTP_HEADER_WARNING "Warning" -#define MHD_HTTP_HEADER_WWW_AUTHENTICATE "WWW-Authenticate" -#define MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN "Access-Control-Allow-Origin" - -/** @} */ /* end of group headers */ - -/** - * @defgroup versions HTTP versions - * These strings should be used to match against the first line of the - * HTTP header. - * @{ - */ -#define MHD_HTTP_VERSION_1_0 "HTTP/1.0" -#define MHD_HTTP_VERSION_1_1 "HTTP/1.1" - -/** @} */ /* end of group versions */ - -/** - * @defgroup methods HTTP methods - * Standard HTTP methods (as strings). - * @{ - */ -#define MHD_HTTP_METHOD_CONNECT "CONNECT" -#define MHD_HTTP_METHOD_DELETE "DELETE" -#define MHD_HTTP_METHOD_GET "GET" -#define MHD_HTTP_METHOD_HEAD "HEAD" -#define MHD_HTTP_METHOD_OPTIONS "OPTIONS" -#define MHD_HTTP_METHOD_POST "POST" -#define MHD_HTTP_METHOD_PUT "PUT" -#define MHD_HTTP_METHOD_PATCH "PATCH" -#define MHD_HTTP_METHOD_TRACE "TRACE" - -/** @} */ /* end of group methods */ - -/** - * @defgroup postenc HTTP POST encodings - * See also: http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4 - * @{ - */ -#define MHD_HTTP_POST_ENCODING_FORM_URLENCODED "application/x-www-form-urlencoded" -#define MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA "multipart/form-data" - -/** @} */ /* end of group postenc */ - - -/** - * @brief Handle for the daemon (listening on a socket for HTTP traffic). - * @ingroup event - */ -struct MHD_Daemon; - -/** - * @brief Handle for a connection / HTTP request. - * - * With HTTP/1.1, multiple requests can be run over the same - * connection. However, MHD will only show one request per TCP - * connection to the client at any given time. - * @ingroup request - */ -struct MHD_Connection; - -/** - * @brief Handle for a response. - * @ingroup response - */ -struct MHD_Response; - -/** - * @brief Handle for POST processing. - * @ingroup response - */ -struct MHD_PostProcessor; - - -/** - * @brief Flags for the `struct MHD_Daemon`. - * - * Note that if neither #MHD_USE_THREAD_PER_CONNECTION nor - * #MHD_USE_SELECT_INTERNALLY is used, the client wants control over - * the process and will call the appropriate microhttpd callbacks. - * - * Starting the daemon may also fail if a particular option is not - * implemented or not supported on the target platform (i.e. no - * support for SSL, threads or IPv6). - */ -enum MHD_FLAG -{ - /** - * No options selected. - */ - MHD_NO_FLAG = 0, - - /** - * Run in debug mode. If this flag is used, the library should - * print error messages and warnings to `stderr`. - */ - MHD_USE_DEBUG = 1, - - /** - * Run in HTTPS mode. - */ - MHD_USE_SSL = 2, - - /** - * Run using one thread per connection. - */ - MHD_USE_THREAD_PER_CONNECTION = 4, - - /** - * Run using an internal thread (or thread pool) doing `select()`. - */ - MHD_USE_SELECT_INTERNALLY = 8, - - /** - * Run using the IPv6 protocol (otherwise, MHD will just support - * IPv4). If you want MHD to support IPv4 and IPv6 using a single - * socket, pass #MHD_USE_DUAL_STACK, otherwise, if you only pass - * this option, MHD will try to bind to IPv6-only (resulting in - * no IPv4 support). - */ - MHD_USE_IPv6 = 16, - - /** - * Be pedantic about the protocol (as opposed to as tolerant as - * possible). Specifically, at the moment, this flag causes MHD to - * reject HTTP 1.1 connections without a "Host" header. This is - * required by the standard, but of course in violation of the "be - * as liberal as possible in what you accept" norm. It is - * recommended to turn this ON if you are testing clients against - * MHD, and OFF in production. - */ - MHD_USE_PEDANTIC_CHECKS = 32, - - /** - * Use `poll()` instead of `select()`. This allows sockets with `fd >= - * FD_SETSIZE`. This option is not compatible with using an - * 'external' `select()` mode (as there is no API to get the file - * descriptors for the external select from MHD) and must also not - * be used in combination with #MHD_USE_EPOLL_LINUX_ONLY. - */ - MHD_USE_POLL = 64, - - /** - * Run using an internal thread (or thread pool) doing `poll()`. - */ - MHD_USE_POLL_INTERNALLY = MHD_USE_SELECT_INTERNALLY | MHD_USE_POLL, - - /** - * Suppress (automatically) adding the 'Date:' header to HTTP responses. - * This option should ONLY be used on systems that do not have a clock - * and that DO provide other mechanisms for cache control. See also - * RFC 2616, section 14.18 (exception 3). - */ - MHD_SUPPRESS_DATE_NO_CLOCK = 128, - - /** - * Run without a listen socket. This option only makes sense if - * #MHD_add_connection is to be used exclusively to connect HTTP - * clients to the HTTP server. This option is incompatible with - * using a thread pool; if it is used, #MHD_OPTION_THREAD_POOL_SIZE - * is ignored. - */ - MHD_USE_NO_LISTEN_SOCKET = 256, - - /** - * Use `epoll()` instead of `select()` or `poll()` for the event loop. - * This option is only available on Linux; using the option on - * non-Linux systems will cause #MHD_start_daemon to fail. - */ - MHD_USE_EPOLL_LINUX_ONLY = 512, - - /** - * Run using an internal thread (or thread pool) doing `epoll()`. - * This option is only available on Linux; using the option on - * non-Linux systems will cause #MHD_start_daemon to fail. - */ - MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY = MHD_USE_SELECT_INTERNALLY | MHD_USE_EPOLL_LINUX_ONLY, - - /** - * Force MHD to use a signal pipe to notify the event loop (of - * threads) of our shutdown. This is required if an appliction uses - * #MHD_USE_SELECT_INTERNALLY or #MHD_USE_THREAD_PER_CONNECTION and - * then performs #MHD_quiesce_daemon (which eliminates our ability - * to signal termination via the listen socket). In these modes, - * #MHD_quiesce_daemon will fail if this option was not set. Also, - * use of this option is automatic (as in, you do not even have to - * specify it), if #MHD_USE_NO_LISTEN_SOCKET is specified. In - * "external" `select()` mode, this option is always simply ignored. - * MHD can be build for use a pair of sockets instead of a pipe. - * Pair of sockets is forced on W32. - * - * You must also use this option if you use internal select mode - * or a thread pool in conjunction with #MHD_add_connection. - */ - MHD_USE_PIPE_FOR_SHUTDOWN = 1024, - - /** - * Use a single socket for IPv4 and IPv6. - */ - MHD_USE_DUAL_STACK = MHD_USE_IPv6 | 2048, - - /** - * Enable `epoll()` turbo. Disables certain calls to `shutdown()` - * and enables aggressive non-blocking optimisitc reads. - * Most effects only happen with #MHD_USE_EPOLL_LINUX_ONLY. - * Enalbed always on W32 as winsock does not properly behave - * with `shutdown()` and this then fixes potential problems. - */ - MHD_USE_EPOLL_TURBO = 4096, - - /** - * Enable suspend/resume functions, which also implies setting up - * pipes to signal resume. - */ - MHD_USE_SUSPEND_RESUME = 8192 | MHD_USE_PIPE_FOR_SHUTDOWN, - - /** - * Enable TCP_FASTOPEN option. This option is only available on Linux with a - * kernel >= 3.6. On other systems, using this option cases #MHD_start_daemon - * to fail. - */ - MHD_USE_TCP_FASTOPEN = 16384 - -}; - - -/** - * Type of a callback function used for logging by MHD. - * - * @param cls closure - * @param fm format string (`printf()`-style) - * @param ap arguments to @a fm - * @ingroup logging - */ -typedef void (*MHD_LogCallback)(void *cls, const char *fm, va_list ap); - - -/** - * @brief MHD options. - * - * Passed in the varargs portion of #MHD_start_daemon. - */ -enum MHD_OPTION -{ - - /** - * No more options / last option. This is used - * to terminate the VARARGs list. - */ - MHD_OPTION_END = 0, - - /** - * Maximum memory size per connection (followed by a `size_t`). - * Default is 32 kb (#MHD_POOL_SIZE_DEFAULT). - * Values above 128k are unlikely to result in much benefit, as half - * of the memory will be typically used for IO, and TCP buffers are - * unlikely to support window sizes above 64k on most systems. - */ - MHD_OPTION_CONNECTION_MEMORY_LIMIT = 1, - - /** - * Maximum number of concurrent connections to - * accept (followed by an `unsigned int`). - */ - MHD_OPTION_CONNECTION_LIMIT = 2, - - /** - * After how many seconds of inactivity should a - * connection automatically be timed out? (followed - * by an `unsigned int`; use zero for no timeout). - */ - MHD_OPTION_CONNECTION_TIMEOUT = 3, - - /** - * Register a function that should be called whenever a request has - * been completed (this can be used for application-specific clean - * up). Requests that have never been presented to the application - * (via #MHD_AccessHandlerCallback) will not result in - * notifications. - * - * This option should be followed by TWO pointers. First a pointer - * to a function of type #MHD_RequestCompletedCallback and second a - * pointer to a closure to pass to the request completed callback. - * The second pointer maybe NULL. - */ - MHD_OPTION_NOTIFY_COMPLETED = 4, - - /** - * Limit on the number of (concurrent) connections made to the - * server from the same IP address. Can be used to prevent one - * IP from taking over all of the allowed connections. If the - * same IP tries to establish more than the specified number of - * connections, they will be immediately rejected. The option - * should be followed by an `unsigned int`. The default is - * zero, which means no limit on the number of connections - * from the same IP address. - */ - MHD_OPTION_PER_IP_CONNECTION_LIMIT = 5, - - /** - * Bind daemon to the supplied `struct sockaddr`. This option should - * be followed by a `struct sockaddr *`. If #MHD_USE_IPv6 is - * specified, the `struct sockaddr*` should point to a `struct - * sockaddr_in6`, otherwise to a `struct sockaddr_in`. - */ - MHD_OPTION_SOCK_ADDR = 6, - - /** - * Specify a function that should be called before parsing the URI from - * the client. The specified callback function can be used for processing - * the URI (including the options) before it is parsed. The URI after - * parsing will no longer contain the options, which maybe inconvenient for - * logging. This option should be followed by two arguments, the first - * one must be of the form - * - * void * my_logger(void *cls, const char *uri, struct MHD_Connection *con) - * - * where the return value will be passed as - * (`* con_cls`) in calls to the #MHD_AccessHandlerCallback - * when this request is processed later; returning a - * value of NULL has no special significance (however, - * note that if you return non-NULL, you can no longer - * rely on the first call to the access handler having - * `NULL == *con_cls` on entry;) - * "cls" will be set to the second argument following - * #MHD_OPTION_URI_LOG_CALLBACK. Finally, uri will - * be the 0-terminated URI of the request. - * - * Note that during the time of this call, most of the connection's - * state is not initialized (as we have not yet parsed he headers). - * However, information about the connecting client (IP, socket) - * is available. - */ - MHD_OPTION_URI_LOG_CALLBACK = 7, - - /** - * Memory pointer for the private key (key.pem) to be used by the - * HTTPS daemon. This option should be followed by a - * `const char *` argument. - * This should be used in conjunction with #MHD_OPTION_HTTPS_MEM_CERT. - */ - MHD_OPTION_HTTPS_MEM_KEY = 8, - - /** - * Memory pointer for the certificate (cert.pem) to be used by the - * HTTPS daemon. This option should be followed by a - * `const char *` argument. - * This should be used in conjunction with #MHD_OPTION_HTTPS_MEM_KEY. - */ - MHD_OPTION_HTTPS_MEM_CERT = 9, - - /** - * Daemon credentials type. - * Followed by an argument of type - * `gnutls_credentials_type_t`. - */ - MHD_OPTION_HTTPS_CRED_TYPE = 10, - - /** - * Memory pointer to a `const char *` specifying the - * cipher algorithm (default: "NORMAL"). - */ - MHD_OPTION_HTTPS_PRIORITIES = 11, - - /** - * Pass a listen socket for MHD to use (systemd-style). If this - * option is used, MHD will not open its own listen socket(s). The - * argument passed must be of type `int` and refer to an - * existing socket that has been bound to a port and is listening. - */ - MHD_OPTION_LISTEN_SOCKET = 12, - - /** - * Use the given function for logging error messages. This option - * must be followed by two arguments; the first must be a pointer to - * a function of type #MHD_LogCallback and the second a pointer - * `void *` which will be passed as the first argument to the log - * callback. - * - * Note that MHD will not generate any log messages - * if it was compiled without the "--enable-messages" - * flag being set. - */ - MHD_OPTION_EXTERNAL_LOGGER = 13, - - /** - * Number (`unsigned int`) of threads in thread pool. Enable - * thread pooling by setting this value to to something - * greater than 1. Currently, thread model must be - * #MHD_USE_SELECT_INTERNALLY if thread pooling is enabled - * (#MHD_start_daemon returns NULL for an unsupported thread - * model). - */ - MHD_OPTION_THREAD_POOL_SIZE = 14, - - /** - * Additional options given in an array of `struct MHD_OptionItem`. - * The array must be terminated with an entry `{MHD_OPTION_END, 0, NULL}`. - * An example for code using #MHD_OPTION_ARRAY is: - * - * struct MHD_OptionItem ops[] = { - * { MHD_OPTION_CONNECTION_LIMIT, 100, NULL }, - * { MHD_OPTION_CONNECTION_TIMEOUT, 10, NULL }, - * { MHD_OPTION_END, 0, NULL } - * }; - * d = MHD_start_daemon (0, 8080, NULL, NULL, dh, NULL, - * MHD_OPTION_ARRAY, ops, - * MHD_OPTION_END); - * - * For options that expect a single pointer argument, the - * second member of the `struct MHD_OptionItem` is ignored. - * For options that expect two pointer arguments, the first - * argument must be cast to `intptr_t`. - */ - MHD_OPTION_ARRAY = 15, - - /** - * Specify a function that should be called for unescaping escape - * sequences in URIs and URI arguments. Note that this function - * will NOT be used by the `struct MHD_PostProcessor`. If this - * option is not specified, the default method will be used which - * decodes escape sequences of the form "%HH". This option should - * be followed by two arguments, the first one must be of the form - * - * size_t my_unescaper(void *cls, - * struct MHD_Connection *c, - * char *s) - * - * where the return value must be "strlen(s)" and "s" should be - * updated. Note that the unescape function must not lengthen "s" - * (the result must be shorter than the input and still be - * 0-terminated). "cls" will be set to the second argument - * following #MHD_OPTION_UNESCAPE_CALLBACK. - */ - MHD_OPTION_UNESCAPE_CALLBACK = 16, - - /** - * Memory pointer for the random values to be used by the Digest - * Auth module. This option should be followed by two arguments. - * First an integer of type `size_t` which specifies the size - * of the buffer pointed to by the second argument in bytes. - * Note that the application must ensure that the buffer of the - * second argument remains allocated and unmodified while the - * deamon is running. - */ - MHD_OPTION_DIGEST_AUTH_RANDOM = 17, - - /** - * Size of the internal array holding the map of the nonce and - * the nonce counter. This option should be followed by an `unsigend int` - * argument. - */ - MHD_OPTION_NONCE_NC_SIZE = 18, - - /** - * Desired size of the stack for threads created by MHD. Followed - * by an argument of type `size_t`. Use 0 for system default. - */ - MHD_OPTION_THREAD_STACK_SIZE = 19, - - /** - * Memory pointer for the certificate (ca.pem) to be used by the - * HTTPS daemon for client authentification. - * This option should be followed by a `const char *` argument. - */ - MHD_OPTION_HTTPS_MEM_TRUST = 20, - - /** - * Increment to use for growing the read buffer (followed by a - * `size_t`). Must fit within #MHD_OPTION_CONNECTION_MEMORY_LIMIT. - */ - MHD_OPTION_CONNECTION_MEMORY_INCREMENT = 21, - - /** - * Use a callback to determine which X.509 certificate should be - * used for a given HTTPS connection. This option should be - * followed by a argument of type `gnutls_certificate_retrieve_function2 *`. - * This option provides an - * alternative to #MHD_OPTION_HTTPS_MEM_KEY, - * #MHD_OPTION_HTTPS_MEM_CERT. You must use this version if - * multiple domains are to be hosted at the same IP address using - * TLS's Server Name Indication (SNI) extension. In this case, - * the callback is expected to select the correct certificate - * based on the SNI information provided. The callback is expected - * to access the SNI data using `gnutls_server_name_get()`. - * Using this option requires GnuTLS 3.0 or higher. - */ - MHD_OPTION_HTTPS_CERT_CALLBACK = 22, - - /** - * When using #MHD_USE_TCP_FASTOPEN, this option changes the default TCP - * fastopen queue length of 50. Note that having a larger queue size can - * cause resource exhaustion attack as the TCP stack has to now allocate - * resources for the SYN packet along with its DATA. This option should be - * followed by an `unsigned int` argument. - */ - MHD_OPTION_TCP_FASTOPEN_QUEUE_SIZE = 23, - - /** - * Memory pointer for the Diffie-Hellman parameters (dh.pem) to be used by the - * HTTPS daemon for key exchange. - * This option must be followed by a `const char *` argument. - */ - MHD_OPTION_HTTPS_MEM_DHPARAMS = 24, - - /** - * If present and set to true, allow reusing address:port socket - * (by using SO_REUSEPORT on most platform, or platform-specific ways). - * If present and set to false, disallow reusing address:port socket - * (does nothing on most plaform, but uses SO_EXCLUSIVEADDRUSE on Windows). - * This option must be followed by a `unsigned int` argument. - */ - MHD_OPTION_LISTENING_ADDRESS_REUSE = 25, - - /** - * Memory pointer for a password that decrypts the private key (key.pem) - * to be used by the HTTPS daemon. This option should be followed by a - * `const char *` argument. - * This should be used in conjunction with #MHD_OPTION_HTTPS_MEM_KEY. - * @sa ::MHD_FEATURE_HTTPS_KEY_PASSWORD - */ - MHD_OPTION_HTTPS_KEY_PASSWORD = 26, - - /** - * Register a function that should be called whenever a connection is - * started or closed. - * - * This option should be followed by TWO pointers. First a pointer - * to a function of type #MHD_NotifyConnectionCallback and second a - * pointer to a closure to pass to the request completed callback. - * The second pointer maybe NULL. - */ - MHD_OPTION_NOTIFY_CONNECTION = 27 - -}; - - -/** - * Entry in an #MHD_OPTION_ARRAY. - */ -struct MHD_OptionItem -{ - /** - * Which option is being given. Use #MHD_OPTION_END - * to terminate the array. - */ - enum MHD_OPTION option; - - /** - * Option value (for integer arguments, and for options requiring - * two pointer arguments); should be 0 for options that take no - * arguments or only a single pointer argument. - */ - intptr_t value; - - /** - * Pointer option value (use NULL for options taking no arguments - * or only an integer option). - */ - void *ptr_value; - -}; - - -/** - * The `enum MHD_ValueKind` specifies the source of - * the key-value pairs in the HTTP protocol. - */ -enum MHD_ValueKind -{ - - /** - * Response header - */ - MHD_RESPONSE_HEADER_KIND = 0, - - /** - * HTTP header. - */ - MHD_HEADER_KIND = 1, - - /** - * Cookies. Note that the original HTTP header containing - * the cookie(s) will still be available and intact. - */ - MHD_COOKIE_KIND = 2, - - /** - * POST data. This is available only if a content encoding - * supported by MHD is used (currently only URL encoding), - * and only if the posted content fits within the available - * memory pool. Note that in that case, the upload data - * given to the #MHD_AccessHandlerCallback will be - * empty (since it has already been processed). - */ - MHD_POSTDATA_KIND = 4, - - /** - * GET (URI) arguments. - */ - MHD_GET_ARGUMENT_KIND = 8, - - /** - * HTTP footer (only for HTTP 1.1 chunked encodings). - */ - MHD_FOOTER_KIND = 16 -}; - - -/** - * The `enum MHD_RequestTerminationCode` specifies reasons - * why a request has been terminated (or completed). - * @ingroup request - */ -enum MHD_RequestTerminationCode -{ - - /** - * We finished sending the response. - * @ingroup request - */ - MHD_REQUEST_TERMINATED_COMPLETED_OK = 0, - - /** - * Error handling the connection (resources - * exhausted, other side closed connection, - * application error accepting request, etc.) - * @ingroup request - */ - MHD_REQUEST_TERMINATED_WITH_ERROR = 1, - - /** - * No activity on the connection for the number - * of seconds specified using - * #MHD_OPTION_CONNECTION_TIMEOUT. - * @ingroup request - */ - MHD_REQUEST_TERMINATED_TIMEOUT_REACHED = 2, - - /** - * We had to close the session since MHD was being - * shut down. - * @ingroup request - */ - MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN = 3, - - /** - * We tried to read additional data, but the other side closed the - * connection. This error is similar to - * #MHD_REQUEST_TERMINATED_WITH_ERROR, but specific to the case where - * the connection died because the other side did not send expected - * data. - * @ingroup request - */ - MHD_REQUEST_TERMINATED_READ_ERROR = 4, - - /** - * The client terminated the connection by closing the socket - * for writing (TCP half-closed); MHD aborted sending the - * response according to RFC 2616, section 8.1.4. - * @ingroup request - */ - MHD_REQUEST_TERMINATED_CLIENT_ABORT = 5 - -}; - - -/** - * The `enum MHD_ConnectionNotificationCode` specifies types - * of connection notifications. - * @ingroup request - */ -enum MHD_ConnectionNotificationCode -{ - - /** - * A new connection has been started. - * @ingroup request - */ - MHD_CONNECTION_NOTIFY_STARTED = 0, - - /** - * A connection is closed. - * @ingroup request - */ - MHD_CONNECTION_NOTIFY_CLOSED = 1 - -}; - - -/** - * Information about a connection. - */ -union MHD_ConnectionInfo -{ - - /** - * Cipher algorithm used, of type "enum gnutls_cipher_algorithm". - */ - int /* enum gnutls_cipher_algorithm */ cipher_algorithm; - - /** - * Protocol used, of type "enum gnutls_protocol". - */ - int /* enum gnutls_protocol */ protocol; - - /** - * Connect socket - */ - MHD_socket connect_fd; - - /** - * GNUtls session handle, of type "gnutls_session_t". - */ - void * /* gnutls_session_t */ tls_session; - - /** - * GNUtls client certificate handle, of type "gnutls_x509_crt_t". - */ - void * /* gnutls_x509_crt_t */ client_cert; - - /** - * Address information for the client. - */ - struct sockaddr *client_addr; - - /** - * Which daemon manages this connection (useful in case there are many - * daemons running). - */ - struct MHD_Daemon *daemon; - - /** - * Socket-specific client context. Points to the same address as - * the "socket_context" of the #MHD_NotifyConnectionCallback. - */ - void **socket_context; -}; - - -/** - * Values of this enum are used to specify what - * information about a connection is desired. - * @ingroup request - */ -enum MHD_ConnectionInfoType -{ - /** - * What cipher algorithm is being used. - * Takes no extra arguments. - * @ingroup request - */ - MHD_CONNECTION_INFO_CIPHER_ALGO, - - /** - * - * Takes no extra arguments. - * @ingroup request - */ - MHD_CONNECTION_INFO_PROTOCOL, - - /** - * Obtain IP address of the client. Takes no extra arguments. - * Returns essentially a `struct sockaddr **` (since the API returns - * a `union MHD_ConnectionInfo *` and that union contains a `struct - * sockaddr *`). - * @ingroup request - */ - MHD_CONNECTION_INFO_CLIENT_ADDRESS, - - /** - * Get the gnuTLS session handle. - * @ingroup request - */ - MHD_CONNECTION_INFO_GNUTLS_SESSION, - - /** - * Get the gnuTLS client certificate handle. Dysfunctional (never - * implemented, deprecated). Use #MHD_CONNECTION_INFO_GNUTLS_SESSION - * to get the `gnutls_session_t` and then call - * gnutls_certificate_get_peers(). - */ - MHD_CONNECTION_INFO_GNUTLS_CLIENT_CERT, - - /** - * Get the `struct MHD_Daemon *` responsible for managing this connection. - * @ingroup request - */ - MHD_CONNECTION_INFO_DAEMON, - - /** - * Request the file descriptor for the listening socket. - * No extra arguments should be passed. - * @ingroup request - */ - MHD_CONNECTION_INFO_CONNECTION_FD, - - /** - * Returns the client-specific pointer to a `void *` that was (possibly) - * set during a #MHD_NotifyConnectionCallback when the socket was - * first accepted. Note that this is NOT the same as the "con_cls" - * argument of the #MHD_AccessHandlerCallback. The "con_cls" is - * fresh for each HTTP request, while the "socket_context" is fresh - * for each socket. - */ - MHD_CONNECTION_INFO_SOCKET_CONTEXT - -}; - - -/** - * Values of this enum are used to specify what - * information about a deamon is desired. - */ -enum MHD_DaemonInfoType -{ - /** - * No longer supported (will return NULL). - */ - MHD_DAEMON_INFO_KEY_SIZE, - - /** - * No longer supported (will return NULL). - */ - MHD_DAEMON_INFO_MAC_KEY_SIZE, - - /** - * Request the file descriptor for the listening socket. - * No extra arguments should be passed. - */ - MHD_DAEMON_INFO_LISTEN_FD, - - /** - * Request the file descriptor for the external epoll. - * No extra arguments should be passed. - */ - MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY, - - /** - * Request the number of current connections handled by the daemon. - * No extra arguments should be passed. - */ - MHD_DAEMON_INFO_CURRENT_CONNECTIONS -}; - - -/** - * Callback for serious error condition. The default action is to print - * an error message and `abort()`. - * - * @param cls user specified value - * @param file where the error occured - * @param line where the error occured - * @param reason error detail, may be NULL - * @ingroup logging - */ -typedef void -(*MHD_PanicCallback) (void *cls, - const char *file, - unsigned int line, - const char *reason); - -/** - * Allow or deny a client to connect. - * - * @param cls closure - * @param addr address information from the client - * @param addrlen length of @a addr - * @return #MHD_YES if connection is allowed, #MHD_NO if not - */ -typedef int -(*MHD_AcceptPolicyCallback) (void *cls, - const struct sockaddr *addr, - socklen_t addrlen); - - -/** - * A client has requested the given url using the given method - * (#MHD_HTTP_METHOD_GET, #MHD_HTTP_METHOD_PUT, - * #MHD_HTTP_METHOD_DELETE, #MHD_HTTP_METHOD_POST, etc). The callback - * must call MHD callbacks to provide content to give back to the - * client and return an HTTP status code (i.e. #MHD_HTTP_OK, - * #MHD_HTTP_NOT_FOUND, etc.). - * - * @param cls argument given together with the function - * pointer when the handler was registered with MHD - * @param url the requested url - * @param method the HTTP method used (#MHD_HTTP_METHOD_GET, - * #MHD_HTTP_METHOD_PUT, etc.) - * @param version the HTTP version string (i.e. - * #MHD_HTTP_VERSION_1_1) - * @param upload_data the data being uploaded (excluding HEADERS, - * for a POST that fits into memory and that is encoded - * with a supported encoding, the POST data will NOT be - * given in upload_data and is instead available as - * part of #MHD_get_connection_values; very large POST - * data *will* be made available incrementally in - * @a upload_data) - * @param upload_data_size set initially to the size of the - * @a upload_data provided; the method must update this - * value to the number of bytes NOT processed; - * @param con_cls pointer that the callback can set to some - * address and that will be preserved by MHD for future - * calls for this request; since the access handler may - * be called many times (i.e., for a PUT/POST operation - * with plenty of upload data) this allows the application - * to easily associate some request-specific state. - * If necessary, this state can be cleaned up in the - * global #MHD_RequestCompletedCallback (which - * can be set with the #MHD_OPTION_NOTIFY_COMPLETED). - * Initially, `*con_cls` will be NULL. - * @return #MHD_YES if the connection was handled successfully, - * #MHD_NO if the socket must be closed due to a serios - * error while handling the request - */ -typedef int -(*MHD_AccessHandlerCallback) (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, - void **con_cls); - - -/** - * Signature of the callback used by MHD to notify the - * application about completed requests. - * - * @param cls client-defined closure - * @param connection connection handle - * @param con_cls value as set by the last call to - * the #MHD_AccessHandlerCallback - * @param toe reason for request termination - * @see #MHD_OPTION_NOTIFY_COMPLETED - * @ingroup request - */ -typedef void -(*MHD_RequestCompletedCallback) (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe); - -/** - * Signature of the callback used by MHD to notify the - * application about started/stopped connections - * - * @param cls client-defined closure - * @param connection connection handle - * @param socket_context socket-specific pointer where the - * client can associate some state specific - * to the TCP connection; note that this is - * different from the "con_cls" which is per - * HTTP request. The client can initialize - * during #MHD_CONNECTION_NOTIFY_STARTED and - * cleanup during #MHD_CONNECTION_NOTIFY_CLOSED - * and access in the meantime using - * #MHD_CONNECTION_INFO_SOCKET_CONTEXT. - * @param toe reason for connection notification - * @see #MHD_OPTION_NOTIFY_CONNECTION - * @ingroup request - */ -typedef void -(*MHD_NotifyConnectionCallback) (void *cls, - struct MHD_Connection *connection, - void **socket_context, - enum MHD_ConnectionNotificationCode toe); - - -/** - * Iterator over key-value pairs. This iterator - * can be used to iterate over all of the cookies, - * headers, or POST-data fields of a request, and - * also to iterate over the headers that have been - * added to a response. - * - * @param cls closure - * @param kind kind of the header we are looking at - * @param key key for the value, can be an empty string - * @param value corresponding value, can be NULL - * @return #MHD_YES to continue iterating, - * #MHD_NO to abort the iteration - * @ingroup request - */ -typedef int -(*MHD_KeyValueIterator) (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *value); - - -/** - * Callback used by libmicrohttpd in order to obtain content. The - * callback is to copy at most @a max bytes of content into @a buf. The - * total number of bytes that has been placed into @a buf should be - * returned. - * - * Note that returning zero will cause libmicrohttpd to try again. - * Thus, returning zero should only be used in conjunction - * with MHD_suspend_connection() to avoid busy waiting. - * - * @param cls extra argument to the callback - * @param pos position in the datastream to access; - * note that if a `struct MHD_Response` object is re-used, - * it is possible for the same content reader to - * be queried multiple times for the same data; - * however, if a `struct MHD_Response` is not re-used, - * libmicrohttpd guarantees that "pos" will be - * the sum of all non-negative return values - * obtained from the content reader so far. - * @param buf where to copy the data - * @param max maximum number of bytes to copy to @a buf (size of @a buf) - * @return number of bytes written to @a buf; - * 0 is legal unless we are running in internal select mode (since - * this would cause busy-waiting); 0 in external select mode - * will cause this function to be called again once the external - * select calls MHD again; - * #MHD_CONTENT_READER_END_OF_STREAM (-1) for the regular - * end of transmission (with chunked encoding, MHD will then - * terminate the chunk and send any HTTP footers that might be - * present; without chunked encoding and given an unknown - * response size, MHD will simply close the connection; note - * that while returning #MHD_CONTENT_READER_END_OF_STREAM is not technically - * legal if a response size was specified, MHD accepts this - * and treats it just as #MHD_CONTENT_READER_END_WITH_ERROR; - * #MHD_CONTENT_READER_END_WITH_ERROR (-2) to indicate a server - * error generating the response; this will cause MHD to simply - * close the connection immediately. If a response size was - * given or if chunked encoding is in use, this will indicate - * an error to the client. Note, however, that if the client - * does not know a response size and chunked encoding is not in - * use, then clients will not be able to tell the difference between - * #MHD_CONTENT_READER_END_WITH_ERROR and #MHD_CONTENT_READER_END_OF_STREAM. - * This is not a limitation of MHD but rather of the HTTP protocol. - */ -typedef ssize_t -(*MHD_ContentReaderCallback) (void *cls, - uint64_t pos, - char *buf, - size_t max); - - -/** - * This method is called by libmicrohttpd if we - * are done with a content reader. It should - * be used to free resources associated with the - * content reader. - * - * @param cls closure - * @ingroup response - */ -typedef void -(*MHD_ContentReaderFreeCallback) (void *cls); - - -/** - * Iterator over key-value pairs where the value - * maybe made available in increments and/or may - * not be zero-terminated. Used for processing - * POST data. - * - * @param cls user-specified closure - * @param kind type of the value, always #MHD_POSTDATA_KIND when called from MHD - * @param key 0-terminated key for the value - * @param filename name of the uploaded file, NULL if not known - * @param content_type mime-type of the data, NULL if not known - * @param transfer_encoding encoding of the data, NULL if not known - * @param data pointer to @a size bytes of data at the - * specified offset - * @param off offset of data in the overall value - * @param size number of bytes in @a data available - * @return #MHD_YES to continue iterating, - * #MHD_NO to abort the iteration - */ -typedef int -(*MHD_PostDataIterator) (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *data, - uint64_t off, - size_t size); - -/* **************** Daemon handling functions ***************** */ - -/** - * Start a webserver on the given port. - * - * @param flags combination of `enum MHD_FLAG` values - * @param port port to bind to (in host byte order) - * @param apc callback to call to check which clients - * will be allowed to connect; you can pass NULL - * in which case connections from any IP will be - * accepted - * @param apc_cls extra argument to apc - * @param dh handler called for all requests (repeatedly) - * @param dh_cls extra argument to @a dh - * @param ap list of options (type-value pairs, - * terminated with #MHD_OPTION_END). - * @return NULL on error, handle to daemon on success - * @ingroup event - */ -_MHD_EXTERN struct MHD_Daemon * -MHD_start_daemon_va (unsigned int flags, - uint16_t port, - MHD_AcceptPolicyCallback apc, void *apc_cls, - MHD_AccessHandlerCallback dh, void *dh_cls, - va_list ap); - - -/** - * Start a webserver on the given port. Variadic version of - * #MHD_start_daemon_va. - * - * @param flags combination of `enum MHD_FLAG` values - * @param port port to bind to - * @param apc callback to call to check which clients - * will be allowed to connect; you can pass NULL - * in which case connections from any IP will be - * accepted - * @param apc_cls extra argument to apc - * @param dh handler called for all requests (repeatedly) - * @param dh_cls extra argument to @a dh - * @return NULL on error, handle to daemon on success - * @ingroup event - */ -_MHD_EXTERN struct MHD_Daemon * -MHD_start_daemon (unsigned int flags, - uint16_t port, - MHD_AcceptPolicyCallback apc, void *apc_cls, - MHD_AccessHandlerCallback dh, void *dh_cls, - ...); - - -/** - * Stop accepting connections from the listening socket. Allows - * clients to continue processing, but stops accepting new - * connections. Note that the caller is responsible for closing the - * returned socket; however, if MHD is run using threads (anything but - * external select mode), it must not be closed until AFTER - * #MHD_stop_daemon has been called (as it is theoretically possible - * that an existing thread is still using it). - * - * Note that some thread modes require the caller to have passed - * #MHD_USE_PIPE_FOR_SHUTDOWN when using this API. If this daemon is - * in one of those modes and this option was not given to - * #MHD_start_daemon, this function will return #MHD_INVALID_SOCKET. - * - * @param daemon daemon to stop accepting new connections for - * @return old listen socket on success, #MHD_INVALID_SOCKET if - * the daemon was already not listening anymore - * @ingroup specialized - */ -_MHD_EXTERN MHD_socket -MHD_quiesce_daemon (struct MHD_Daemon *daemon); - - -/** - * Shutdown an HTTP daemon. - * - * @param daemon daemon to stop - * @ingroup event - */ -_MHD_EXTERN void -MHD_stop_daemon (struct MHD_Daemon *daemon); - - -/** - * Add another client connection to the set of connections managed by - * MHD. This API is usually not needed (since MHD will accept inbound - * connections on the server socket). Use this API in special cases, - * for example if your HTTP server is behind NAT and needs to connect - * out to the HTTP client, or if you are building a proxy. - * - * If you use this API in conjunction with a internal select or a - * thread pool, you must set the option - * #MHD_USE_PIPE_FOR_SHUTDOWN to ensure that the freshly added - * connection is immediately processed by MHD. - * - * The given client socket will be managed (and closed!) by MHD after - * this call and must no longer be used directly by the application - * afterwards. - * - * Per-IP connection limits are ignored when using this API. - * - * @param daemon daemon that manages the connection - * @param client_socket socket to manage (MHD will expect - * to receive an HTTP request from this socket next). - * @param addr IP address of the client - * @param addrlen number of bytes in @a addr - * @return #MHD_YES on success, #MHD_NO if this daemon could - * not handle the connection (i.e. `malloc()` failed, etc). - * The socket will be closed in any case; `errno` is - * set to indicate further details about the error. - * @ingroup specialized - */ -_MHD_EXTERN int -MHD_add_connection (struct MHD_Daemon *daemon, - MHD_socket client_socket, - const struct sockaddr *addr, - socklen_t addrlen); - - -/** - * Obtain the `select()` sets for this daemon. - * Daemon's FDs will be added to fd_sets. To get only - * daemon FDs in fd_sets, call FD_ZERO for each fd_set - * before calling this function. FD_SETSIZE is assumed - * to be platform's default. - * - * @param daemon daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @param max_fd increased to largest FD added (if larger - * than existing value); can be NULL - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call or any FD didn't - * fit fd_set. - * @ingroup event - */ -_MHD_EXTERN int -MHD_get_fdset (struct MHD_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set, - MHD_socket *max_fd); - - -/** - * Obtain the `select()` sets for this daemon. - * Daemon's FDs will be added to fd_sets. To get only - * daemon FDs in fd_sets, call FD_ZERO for each fd_set - * before calling this function. Passing custom FD_SETSIZE - * as @a fd_setsize allow usage of larger/smaller than - * platform's default fd_sets. - * - * @param daemon daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @param max_fd increased to largest FD added (if larger - * than existing value); can be NULL - * @param fd_setsize value of FD_SETSIZE - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call or any FD didn't - * fit fd_set. - * @ingroup event - */ -_MHD_EXTERN int -MHD_get_fdset2 (struct MHD_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set, - MHD_socket *max_fd, - unsigned int fd_setsize); - - -/** - * Obtain the `select()` sets for this daemon. - * Daemon's FDs will be added to fd_sets. To get only - * daemon FDs in fd_sets, call FD_ZERO for each fd_set - * before calling this function. Size of fd_set is - * determined by current value of FD_SETSIZE. - * - * @param daemon daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @param max_fd increased to largest FD added (if larger - * than existing value); can be NULL - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call or any FD didn't - * fit fd_set. - * @ingroup event - */ -#define MHD_get_fdset(daemon,read_fd_set,write_fd_set,except_fd_set,max_fd) \ - MHD_get_fdset2((daemon),(read_fd_set),(write_fd_set),(except_fd_set),(max_fd),FD_SETSIZE) - - -/** - * Obtain timeout value for `select()` for this daemon (only needed if - * connection timeout is used). The returned value is how many milliseconds - * `select()` or `poll()` should at most block, not the timeout value set for - * connections. This function MUST NOT be called if MHD is running with - * #MHD_USE_THREAD_PER_CONNECTION. - * - * @param daemon daemon to query for timeout - * @param timeout set to the timeout (in milliseconds) - * @return #MHD_YES on success, #MHD_NO if timeouts are - * not used (or no connections exist that would - * necessiate the use of a timeout right now). - * @ingroup event - */ -_MHD_EXTERN int -MHD_get_timeout (struct MHD_Daemon *daemon, - MHD_UNSIGNED_LONG_LONG *timeout); - - -/** - * Run webserver operations (without blocking unless in client - * callbacks). This method should be called by clients in combination - * with #MHD_get_fdset if the client-controlled select method is used. - * - * This function is a convenience method, which is useful if the - * fd_sets from #MHD_get_fdset were not directly passed to `select()`; - * with this function, MHD will internally do the appropriate `select()` - * call itself again. While it is always safe to call #MHD_run (in - * external select mode), you should call #MHD_run_from_select if - * performance is important (as it saves an expensive call to - * `select()`). - * - * @param daemon daemon to run - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call. - * @ingroup event - */ -_MHD_EXTERN int -MHD_run (struct MHD_Daemon *daemon); - - -/** - * Run webserver operations. This method should be called by clients - * in combination with #MHD_get_fdset if the client-controlled select - * method is used. - * - * You can use this function instead of #MHD_run if you called - * `select()` on the result from #MHD_get_fdset. File descriptors in - * the sets that are not controlled by MHD will be ignored. Calling - * this function instead of #MHD_run is more efficient as MHD will - * not have to call `select()` again to determine which operations are - * ready. - * - * @param daemon daemon to run select loop for - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set (not used, can be NULL) - * @return #MHD_NO on serious errors, #MHD_YES on success - * @ingroup event - */ -_MHD_EXTERN int -MHD_run_from_select (struct MHD_Daemon *daemon, - const fd_set *read_fd_set, - const fd_set *write_fd_set, - const fd_set *except_fd_set); - - - - -/* **************** Connection handling functions ***************** */ - -/** - * Get all of the headers from the request. - * - * @param connection connection to get values from - * @param kind types of values to iterate over - * @param iterator callback to call on each header; - * maybe NULL (then just count headers) - * @param iterator_cls extra argument to @a iterator - * @return number of entries iterated over - * @ingroup request - */ -_MHD_EXTERN int -MHD_get_connection_values (struct MHD_Connection *connection, - enum MHD_ValueKind kind, - MHD_KeyValueIterator iterator, void *iterator_cls); - - -/** - * This function can be used to add an entry to the HTTP headers of a - * connection (so that the #MHD_get_connection_values function will - * return them -- and the `struct MHD_PostProcessor` will also see - * them). This maybe required in certain situations (see Mantis - * #1399) where (broken) HTTP implementations fail to supply values - * needed by the post processor (or other parts of the application). - * - * This function MUST only be called from within the - * #MHD_AccessHandlerCallback (otherwise, access maybe improperly - * synchronized). Furthermore, the client must guarantee that the key - * and value arguments are 0-terminated strings that are NOT freed - * until the connection is closed. (The easiest way to do this is by - * passing only arguments to permanently allocated strings.). - * - * @param connection the connection for which a - * value should be set - * @param kind kind of the value - * @param key key for the value - * @param value the value itself - * @return #MHD_NO if the operation could not be - * performed due to insufficient memory; - * #MHD_YES on success - * @ingroup request - */ -_MHD_EXTERN int -MHD_set_connection_value (struct MHD_Connection *connection, - enum MHD_ValueKind kind, - const char *key, - const char *value); - - -/** - * Sets the global error handler to a different implementation. @a cb - * will only be called in the case of typically fatal, serious - * internal consistency issues. These issues should only arise in the - * case of serious memory corruption or similar problems with the - * architecture. While @a cb is allowed to return and MHD will then - * try to continue, this is never safe. - * - * The default implementation that is used if no panic function is set - * simply prints an error message and calls `abort()`. Alternative - * implementations might call `exit()` or other similar functions. - * - * @param cb new error handler - * @param cls passed to @a cb - * @ingroup logging - */ -_MHD_EXTERN void -MHD_set_panic_func (MHD_PanicCallback cb, void *cls); - - -/** - * Process escape sequences ('%HH') Updates val in place; the - * result should be UTF-8 encoded and cannot be larger than the input. - * The result must also still be 0-terminated. - * - * @param val value to unescape (modified in the process) - * @return length of the resulting val (`strlen(val)` may be - * shorter afterwards due to elimination of escape sequences) - */ -_MHD_EXTERN size_t -MHD_http_unescape (char *val); - - -/** - * Get a particular header value. If multiple - * values match the kind, return any one of them. - * - * @param connection connection to get values from - * @param kind what kind of value are we looking for - * @param key the header to look for, NULL to lookup 'trailing' value without a key - * @return NULL if no such item was found - * @ingroup request - */ -_MHD_EXTERN const char * -MHD_lookup_connection_value (struct MHD_Connection *connection, - enum MHD_ValueKind kind, - const char *key); - - -/** - * Queue a response to be transmitted to the client (as soon as - * possible but after #MHD_AccessHandlerCallback returns). - * - * @param connection the connection identifying the client - * @param status_code HTTP status code (i.e. #MHD_HTTP_OK) - * @param response response to transmit - * @return #MHD_NO on error (i.e. reply already sent), - * #MHD_YES on success or if message has been queued - * @ingroup response - */ -_MHD_EXTERN int -MHD_queue_response (struct MHD_Connection *connection, - unsigned int status_code, - struct MHD_Response *response); - - -/** - * Suspend handling of network data for a given connection. This can - * be used to dequeue a connection from MHD's event loop (external - * select, internal select or thread pool; not applicable to - * thread-per-connection!) for a while. - * - * If you use this API in conjunction with a internal select or a - * thread pool, you must set the option #MHD_USE_PIPE_FOR_SHUTDOWN to - * ensure that a resumed connection is immediately processed by MHD. - * - * Suspended connections continue to count against the total number of - * connections allowed (per daemon, as well as per IP, if such limits - * are set). Suspended connections will NOT time out; timeouts will - * restart when the connection handling is resumed. While a - * connection is suspended, MHD will not detect disconnects by the - * client. - * - * The only safe time to suspend a connection is from the - * #MHD_AccessHandlerCallback. - * - * Finally, it is an API violation to call #MHD_stop_daemon while - * having suspended connections (this will at least create memory and - * socket leaks or lead to undefined behavior). You must explicitly - * resume all connections before stopping the daemon. - * - * @param connection the connection to suspend - */ -_MHD_EXTERN void -MHD_suspend_connection (struct MHD_Connection *connection); - - -/** - * Resume handling of network data for suspended connection. It is - * safe to resume a suspended connection at any time. Calling this - * function on a connection that was not previously suspended will - * result in undefined behavior. - * - * @param connection the connection to resume - */ -_MHD_EXTERN void -MHD_resume_connection (struct MHD_Connection *connection); - - -/* **************** Response manipulation functions ***************** */ - - -/** - * Flags for special handling of responses. - */ -enum MHD_ResponseFlags -{ - /** - * Default: no special flags. - */ - MHD_RF_NONE = 0, - - /** - * Only respond in conservative HTTP 1.0-mode. In particular, - * do not (automatically) sent "Connection" headers and always - * close the connection after generating the response. - */ - MHD_RF_HTTP_VERSION_1_0_ONLY = 1 - -}; - - -/** - * MHD options (for future extensions). - */ -enum MHD_ResponseOptions -{ - /** - * End of the list of options. - */ - MHD_RO_END = 0 -}; - - -/** - * Set special flags and options for a response. - * - * @param response the response to modify - * @param flags to set for the response - * @param ... #MHD_RO_END terminated list of options - * @return #MHD_YES on success, #MHD_NO on error - */ -_MHD_EXTERN int -MHD_set_response_options (struct MHD_Response *response, - enum MHD_ResponseFlags flags, - ...); - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response, #MHD_SIZE_UNKNOWN for unknown - * @param block_size preferred block size for querying crc (advisory only, - * MHD may still call @a crc using smaller chunks); this - * is essentially the buffer size used for IO, clients - * should pick a value that is appropriate for IO and - * memory performance requirements - * @param crc callback to use to obtain response data - * @param crc_cls extra argument to @a crc - * @param crfc callback to call to free @a crc_cls resources - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -_MHD_EXTERN struct MHD_Response * -MHD_create_response_from_callback (uint64_t size, - size_t block_size, - MHD_ContentReaderCallback crc, void *crc_cls, - MHD_ContentReaderFreeCallback crfc); - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the @a data portion of the response - * @param data the data itself - * @param must_free libmicrohttpd should free data when done - * @param must_copy libmicrohttpd must make a copy of @a data - * right away, the data maybe released anytime after - * this call returns - * @return NULL on error (i.e. invalid arguments, out of memory) - * @deprecated use #MHD_create_response_from_buffer instead - * @ingroup response - */ -_MHD_EXTERN struct MHD_Response * -MHD_create_response_from_data (size_t size, - void *data, - int must_free, - int must_copy); - - -/** - * Specification for how MHD should treat the memory buffer - * given for the response. - * @ingroup response - */ -enum MHD_ResponseMemoryMode -{ - - /** - * Buffer is a persistent (static/global) buffer that won't change - * for at least the lifetime of the response, MHD should just use - * it, not free it, not copy it, just keep an alias to it. - * @ingroup response - */ - MHD_RESPMEM_PERSISTENT, - - /** - * Buffer is heap-allocated with `malloc()` (or equivalent) and - * should be freed by MHD after processing the response has - * concluded (response reference counter reaches zero). - * @ingroup response - */ - MHD_RESPMEM_MUST_FREE, - - /** - * Buffer is in transient memory, but not on the heap (for example, - * on the stack or non-`malloc()` allocated) and only valid during the - * call to #MHD_create_response_from_buffer. MHD must make its - * own private copy of the data for processing. - * @ingroup response - */ - MHD_RESPMEM_MUST_COPY - -}; - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response - * @param buffer size bytes containing the response's data portion - * @param mode flags for buffer management - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -_MHD_EXTERN struct MHD_Response * -MHD_create_response_from_buffer (size_t size, - void *buffer, - enum MHD_ResponseMemoryMode mode); - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response - * @param fd file descriptor referring to a file on disk with the - * data; will be closed when response is destroyed; - * fd should be in 'blocking' mode - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -_MHD_EXTERN struct MHD_Response * -MHD_create_response_from_fd (size_t size, - int fd); - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response - * @param fd file descriptor referring to a file on disk with the - * data; will be closed when response is destroyed; - * fd should be in 'blocking' mode - * @param offset offset to start reading from in the file; - * Be careful! `off_t` may have been compiled to be a - * 64-bit variable for MHD, in which case your application - * also has to be compiled using the same options! Read - * the MHD manual for more details. - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -_MHD_EXTERN struct MHD_Response * -MHD_create_response_from_fd_at_offset (size_t size, - int fd, - off_t offset); - - -#if 0 -/** - * Enumeration for actions MHD should perform on the underlying socket - * of the upgrade. This API is not finalized, and in particular - * the final set of actions is yet to be decided. This is just an - * idea for what we might want. - */ -enum MHD_UpgradeAction -{ - - /** - * Close the socket, the application is done with it. - * - * Takes no extra arguments. - * - * NOTE: it is unclear if we want to have this in the - * "final" API, this is all just ideas. - */ - MHD_UPGRADE_ACTION_CLOSE = 0, - - /** - * Uncork the TCP write buffer (that is, tell the OS to transmit all - * bytes in the buffer now, and to not use TCP-CORKing). - * - * Takes no extra arguments. - * - * NOTE: it is unclear if we want to have this in the - * "final" API, this is all just ideas. - */ - MHD_UPGRADE_ACTION_CORK - -}; - - -/** - * This connection-specific callback is provided by MHD to - * applications (unusual) during the #MHD_UpgradeHandler. - * It allows applications to perform 'special' actions on - * the underlying socket from the upgrade. - * - * @param cls the closure (from `upgrade_action_cls`) - * @param action which action should be performed - * @param ... arguments to the action (depends on the action) - * @return #MHD_NO on error, #MHD_YES on success - */ -typedef int -(*MHD_UpgradeActionCallback)(void *cls, - enum MHD_UpgradeAction action, - ...); - -/** - * Function called after a protocol "upgrade" response was sent - * successfully and the socket should now be controlled by some - * protocol other than HTTP. - * - * Any data received on the socket will be made available in - * 'data_in'. The function should update 'data_in_size' to - * reflect the number of bytes consumed from 'data_in' (the remaining - * bytes will be made available in the next call to the handler). - * - * Any data that should be transmitted on the socket should be - * stored in 'data_out'. '*data_out_size' is initially set to - * the available buffer space in 'data_out'. It should be set to - * the number of bytes stored in 'data_out' (which can be zero). - * - * The return value is a BITMASK that indicates how the function - * intends to interact with the event loop. It can request to be - * notified for reading, writing, request to UNCORK the send buffer - * (which MHD is allowed to ignore, if it is not possible to uncork on - * the local platform), to wait for the 'external' select loop to - * trigger another round. It is also possible to specify "no events" - * to terminate the connection; in this case, the - * #MHD_RequestCompletedCallback will be called and all resources of - * the connection will be released. - * - * Except when in 'thread-per-connection' mode, implementations - * of this function should never block (as it will still be called - * from within the main event loop). - * - * @param cls closure - * @param connection original HTTP connection handle, - * giving the function a last chance - * to inspect the original HTTP request - * @param sock socket to use for bi-directional communication - * with the client. For HTTPS, this may not be a socket - * that is directly connected to the client and thus certain - * operations (TCP-specific setsockopt(), getsockopt(), etc.) - * may not work as expected (as the socket could be from a - * socketpair() or a TCP-loopback) - * @param upgrade_action function that can be used to perform actions - * on the @a sock (like those that cannot be done explicitly). - * Applications must use this callback to perform the - * close() action on the @a sock. - * @param upgrade_action_cls closure that must be passed to @a upgrade_action - */ -typedef void -(*MHD_UpgradeHandler)(void *cls, - struct MHD_Connection *connection, - MHD_SOCKET sock, - MHD_UpgradeActionCallback upgrade_action, - void *upgrade_action_cls); - - -/** - * Create a response object that can be used for 101 UPGRADE - * responses, for example to implement WebSockets. After sending the - * response, control over the data stream is given to the callback (which - * can then, for example, start some bi-directional communication). - * If the response is queued for multiple connections, the callback - * will be called for each connection. The callback - * will ONLY be called after the response header was successfully passed - * to the OS; if there are communication errors before, the usual MHD - * connection error handling code will be performed. - * - * Setting the correct HTTP code (i.e. MHD_HTTP_SWITCHING_PROTOCOLS) - * and setting correct HTTP headers for the upgrade must be done - * manually (this way, it is possible to implement most existing - * WebSocket versions using this API; in fact, this API might be useful - * for any protocol switch, not just WebSockets). Note that - * draft-ietf-hybi-thewebsocketprotocol-00 cannot be implemented this - * way as the header "HTTP/1.1 101 WebSocket Protocol Handshake" - * cannot be generated; instead, MHD will always produce "HTTP/1.1 101 - * Switching Protocols" (if the response code 101 is used). - * - * As usual, the response object can be extended with header - * information and then be used any number of times (as long as the - * header information is not connection-specific). - * - * @param upgrade_handler function to call with the 'upgraded' socket - * @param upgrade_handler_cls closure for @a upgrade_handler - * @return NULL on error (i.e. invalid arguments, out of memory) - */ -struct MHD_Response * -MHD_create_response_for_upgrade (MHD_UpgradeHandler upgrade_handler, - void *upgrade_handler_cls); -#endif - -/** - * Destroy a response object and associated resources. Note that - * libmicrohttpd may keep some of the resources around if the response - * is still in the queue for some clients, so the memory may not - * necessarily be freed immediatley. - * - * @param response response to destroy - * @ingroup response - */ -_MHD_EXTERN void -MHD_destroy_response (struct MHD_Response *response); - - -/** - * Add a header line to the response. - * - * @param response response to add a header to - * @param header the header to add - * @param content value to add - * @return #MHD_NO on error (i.e. invalid header or content format), - * or out of memory - * @ingroup response - */ -_MHD_EXTERN int -MHD_add_response_header (struct MHD_Response *response, - const char *header, - const char *content); - - -/** - * Add a footer line to the response. - * - * @param response response to remove a header from - * @param footer the footer to delete - * @param content value to delete - * @return #MHD_NO on error (i.e. invalid footer or content format). - * @ingroup response - */ -_MHD_EXTERN int -MHD_add_response_footer (struct MHD_Response *response, - const char *footer, - const char *content); - - -/** - * Delete a header (or footer) line from the response. - * - * @param response response to remove a header from - * @param header the header to delete - * @param content value to delete - * @return #MHD_NO on error (no such header known) - * @ingroup response - */ -_MHD_EXTERN int -MHD_del_response_header (struct MHD_Response *response, - const char *header, - const char *content); - - -/** - * Get all of the headers (and footers) added to a response. - * - * @param response response to query - * @param iterator callback to call on each header; - * maybe NULL (then just count headers) - * @param iterator_cls extra argument to @a iterator - * @return number of entries iterated over - * @ingroup response - */ -_MHD_EXTERN int -MHD_get_response_headers (struct MHD_Response *response, - MHD_KeyValueIterator iterator, void *iterator_cls); - - -/** - * Get a particular header (or footer) from the response. - * - * @param response response to query - * @param key which header to get - * @return NULL if header does not exist - * @ingroup response - */ -_MHD_EXTERN const char * -MHD_get_response_header (struct MHD_Response *response, - const char *key); - - -/* ********************** PostProcessor functions ********************** */ - -/** - * Create a `struct MHD_PostProcessor`. - * - * A `struct MHD_PostProcessor` can be used to (incrementally) parse - * the data portion of a POST request. Note that some buggy browsers - * fail to set the encoding type. If you want to support those, you - * may have to call #MHD_set_connection_value with the proper encoding - * type before creating a post processor (if no supported encoding - * type is set, this function will fail). - * - * @param connection the connection on which the POST is - * happening (used to determine the POST format) - * @param buffer_size maximum number of bytes to use for - * internal buffering (used only for the parsing, - * specifically the parsing of the keys). A - * tiny value (256-1024) should be sufficient. - * Do NOT use a value smaller than 256. For good - * performance, use 32 or 64k (i.e. 65536). - * @param iter iterator to be called with the parsed data, - * Must NOT be NULL. - * @param iter_cls first argument to @a iter - * @return NULL on error (out of memory, unsupported encoding), - * otherwise a PP handle - * @ingroup request - */ -_MHD_EXTERN struct MHD_PostProcessor * -MHD_create_post_processor (struct MHD_Connection *connection, - size_t buffer_size, - MHD_PostDataIterator iter, void *iter_cls); - - -/** - * Parse and process POST data. Call this function when POST data is - * available (usually during an #MHD_AccessHandlerCallback) with the - * "upload_data" and "upload_data_size". Whenever possible, this will - * then cause calls to the #MHD_PostDataIterator. - * - * @param pp the post processor - * @param post_data @a post_data_len bytes of POST data - * @param post_data_len length of @a post_data - * @return #MHD_YES on success, #MHD_NO on error - * (out-of-memory, iterator aborted, parse error) - * @ingroup request - */ -_MHD_EXTERN int -MHD_post_process (struct MHD_PostProcessor *pp, - const char *post_data, size_t post_data_len); - - -/** - * Release PostProcessor resources. - * - * @param pp the PostProcessor to destroy - * @return #MHD_YES if processing completed nicely, - * #MHD_NO if there were spurious characters / formatting - * problems; it is common to ignore the return - * value of this function - * @ingroup request - */ -_MHD_EXTERN int -MHD_destroy_post_processor (struct MHD_PostProcessor *pp); - - -/* ********************* Digest Authentication functions *************** */ - - -/** - * Constant to indicate that the nonce of the provided - * authentication code was wrong. - * @ingroup authentication - */ -#define MHD_INVALID_NONCE -1 - - -/** - * Get the username from the authorization header sent by the client - * - * @param connection The MHD connection structure - * @return NULL if no username could be found, a pointer - * to the username if found - * @ingroup authentication - */ -_MHD_EXTERN char * -MHD_digest_auth_get_username (struct MHD_Connection *connection); - - -/** - * Authenticates the authorization header sent by the client - * - * @param connection The MHD connection structure - * @param realm The realm presented to the client - * @param username The username needs to be authenticated - * @param password The password used in the authentication - * @param nonce_timeout The amount of time for a nonce to be - * invalid in seconds - * @return #MHD_YES if authenticated, #MHD_NO if not, - * #MHD_INVALID_NONCE if nonce is invalid - * @ingroup authentication - */ -_MHD_EXTERN int -MHD_digest_auth_check (struct MHD_Connection *connection, - const char *realm, - const char *username, - const char *password, - unsigned int nonce_timeout); - - -/** - * Queues a response to request authentication from the client - * - * @param connection The MHD connection structure - * @param realm The realm presented to the client - * @param opaque string to user for opaque value - * @param response reply to send; should contain the "access denied" - * body; note that this function will set the "WWW Authenticate" - * header and that the caller should not do this - * @param signal_stale #MHD_YES if the nonce is invalid to add - * 'stale=true' to the authentication header - * @return #MHD_YES on success, #MHD_NO otherwise - * @ingroup authentication - */ -_MHD_EXTERN int -MHD_queue_auth_fail_response (struct MHD_Connection *connection, - const char *realm, - const char *opaque, - struct MHD_Response *response, - int signal_stale); - - -/** - * Get the username and password from the basic authorization header sent by the client - * - * @param connection The MHD connection structure - * @param password a pointer for the password - * @return NULL if no username could be found, a pointer - * to the username if found - * @ingroup authentication - */ -_MHD_EXTERN char * -MHD_basic_auth_get_username_password (struct MHD_Connection *connection, - char** password); - - -/** - * Queues a response to request basic authentication from the client - * The given response object is expected to include the payload for - * the response; the "WWW-Authenticate" header will be added and the - * response queued with the 'UNAUTHORIZED' status code. - * - * @param connection The MHD connection structure - * @param realm the realm presented to the client - * @param response response object to modify and queue - * @return #MHD_YES on success, #MHD_NO otherwise - * @ingroup authentication - */ -_MHD_EXTERN int -MHD_queue_basic_auth_fail_response (struct MHD_Connection *connection, - const char *realm, - struct MHD_Response *response); - -/* ********************** generic query functions ********************** */ - - -/** - * Obtain information about the given connection. - * - * @param connection what connection to get information about - * @param info_type what information is desired? - * @param ... depends on @a info_type - * @return NULL if this information is not available - * (or if the @a info_type is unknown) - * @ingroup specialized - */ -_MHD_EXTERN const union MHD_ConnectionInfo * -MHD_get_connection_info (struct MHD_Connection *connection, - enum MHD_ConnectionInfoType info_type, - ...); - - -/** - * MHD connection options. Given to #MHD_set_connection_option to - * set custom options for a particular connection. - */ -enum MHD_CONNECTION_OPTION -{ - - /** - * Set a custom timeout for the given connection. Specified - * as the number of seconds, given as an `unsigned int`. Use - * zero for no timeout. - */ - MHD_CONNECTION_OPTION_TIMEOUT - -}; - - -/** - * Set a custom option for the given connection, overriding defaults. - * - * @param connection connection to modify - * @param option option to set - * @param ... arguments to the option, depending on the option type - * @return #MHD_YES on success, #MHD_NO if setting the option failed - * @ingroup specialized - */ -_MHD_EXTERN int -MHD_set_connection_option (struct MHD_Connection *connection, - enum MHD_CONNECTION_OPTION option, - ...); - - -/** - * Information about an MHD daemon. - */ -union MHD_DaemonInfo -{ - /** - * Size of the key, no longer supported. - * @deprecated - */ - size_t key_size; - - /** - * Size of the mac key, no longer supported. - * @deprecated - */ - size_t mac_key_size; - - /** - * Listen socket file descriptor, for #MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY - * and #MHD_DAEMON_INFO_LISTEN_FD. - */ - MHD_socket listen_fd; - - /** - * Number of active connections, for #MHD_DAEMON_INFO_CURRENT_CONNECTIONS. - */ - unsigned int num_connections; -}; - - -/** - * Obtain information about the given daemon - * (not fully implemented!). - * - * @param daemon what daemon to get information about - * @param info_type what information is desired? - * @param ... depends on @a info_type - * @return NULL if this information is not available - * (or if the @a info_type is unknown) - * @ingroup specialized - */ -_MHD_EXTERN const union MHD_DaemonInfo * -MHD_get_daemon_info (struct MHD_Daemon *daemon, - enum MHD_DaemonInfoType info_type, - ...); - - -/** - * Obtain the version of this library - * - * @return static version string, e.g. "0.9.9" - * @ingroup specialized - */ -_MHD_EXTERN const char* -MHD_get_version (void); - - -/** - * Types of information about MHD features, - * used by #MHD_is_feature_supported(). - */ -enum MHD_FEATURE -{ - /** - * Get whether messages are supported. If supported then in debug - * mode messages can be printed to stderr or to external logger. - */ - MHD_FEATURE_MESSGES = 1, - - /** - * Get whether HTTPS is supported. If supported then flag - * #MHD_USE_SSL and options #MHD_OPTION_HTTPS_MEM_KEY, - * #MHD_OPTION_HTTPS_MEM_CERT, #MHD_OPTION_HTTPS_MEM_TRUST, - * #MHD_OPTION_HTTPS_MEM_DHPARAMS, #MHD_OPTION_HTTPS_CRED_TYPE, - * #MHD_OPTION_HTTPS_PRIORITIES can be used. - */ - MHD_FEATURE_SSL = 2, - - /** - * Get whether option #MHD_OPTION_HTTPS_CERT_CALLBACK is - * supported. - */ - MHD_FEATURE_HTTPS_CERT_CALLBACK = 3, - - /** - * Get whether IPv6 is supported. If supported then flag - * #MHD_USE_IPv6 can be used. - */ - MHD_FEATURE_IPv6 = 4, - - /** - * Get whether IPv6 without IPv4 is supported. If not supported - * then IPv4 is always enabled in IPv6 sockets and - * flag #MHD_USE_DUAL_STACK if always used when #MHD_USE_IPv6 is - * specified. - */ - MHD_FEATURE_IPv6_ONLY = 5, - - /** - * Get whether `poll()` is supported. If supported then flag - * #MHD_USE_POLL can be used. - */ - MHD_FEATURE_POLL = 6, - - /** - * Get whether `epoll()` is supported. If supported then Flags - * #MHD_USE_EPOLL_LINUX_ONLY and - * #MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY can be used. - */ - MHD_FEATURE_EPOLL = 7, - - /** - * Get whether shutdown on listen socket to signal other - * threads is supported. If not supported flag - * #MHD_USE_PIPE_FOR_SHUTDOWN is automatically forced. - */ - MHD_FEATURE_SHUTDOWN_LISTEN_SOCKET = 8, - - /** - * Get whether socketpair is used internally instead of pipe to - * signal other threads. - */ - MHD_FEATURE_SOCKETPAIR = 9, - - /** - * Get whether TCP Fast Open is supported. If supported then - * flag #MHD_USE_TCP_FASTOPEN and option - * #MHD_OPTION_TCP_FASTOPEN_QUEUE_SIZE can be used. - */ - MHD_FEATURE_TCP_FASTOPEN = 10, - - /** - * Get whether HTTP Basic authorization is supported. If supported - * then functions #MHD_basic_auth_get_username_password and - * #MHD_queue_basic_auth_fail_response can be used. - */ - MHD_FEATURE_BASIC_AUTH = 11, - - /** - * Get whether HTTP Digest authorization is supported. If - * supported then options #MHD_OPTION_DIGEST_AUTH_RANDOM, - * #MHD_OPTION_NONCE_NC_SIZE and - * #MHD_digest_auth_check() can be used. - */ - MHD_FEATURE_DIGEST_AUTH = 12, - - /** - * Get whether postprocessor is supported. If supported then - * functions #MHD_create_post_processor(), #MHD_post_process() and - * #MHD_destroy_post_processor() can - * be used. - */ - MHD_FEATURE_POSTPROCESSOR = 13, - - /** - * Get whether password encrypted private key for HTTPS daemon is - * supported. If supported then option - * ::MHD_OPTION_HTTPS_KEY_PASSWORD can be used. - */ - MHD_FEATURE_HTTPS_KEY_PASSWORD = 14 -}; - - -/** - * Get information about supported MHD features. - * Indicate that MHD was compiled with or without support for - * particular feature. Some features require additional support - * by kernel. Kernel support is not checked by this function. - * - * @param feature type of requested information - * @return #MHD_YES if feature is supported by MHD, #MHD_NO if - * feature is not supported or feature is unknown. - * @ingroup specialized - */ -_MHD_EXTERN int -MHD_is_feature_supported(enum MHD_FEATURE feature); - - -#if 0 /* keep Emacsens' auto-indent happy */ -{ -#endif -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/hos_libhttpserver/include/hos_libhttpserver/microspdy.h b/src/hos_libhttpserver/include/hos_libhttpserver/microspdy.h deleted file mode 100644 index 7da5fbe6..00000000 --- a/src/hos_libhttpserver/include/hos_libhttpserver/microspdy.h +++ /dev/null @@ -1,1380 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012, 2013 Christian Grothoff - - 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 3 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, see . -*/ - -/** - * @file microspdy.h - * @brief public interface to libmicrospdy - * @author Andrey Uzunov - * @author Christian Grothoff - * - * All symbols defined in this header start with SPDY_. libmisrospdy is a small - * SPDY daemon library. The application can start multiple daemons - * and they are independent.

- * - * The header file defines various constants used by the SPDY and the HTTP protocol. - * This does not mean that the lib actually interprets all of these - * values. Not everything is implemented. The provided constants are exported as a convenience - * for users of the library. The lib does not verify that provided - * HTTP headers and if their values conform to the SPDY protocol, - * it only checks if the required headers for the SPDY requests and - * responses are provided.

- * - * The library uses just a single thread.

- * - * Before including "microspdy.h" you should add the necessary - * includes to define the types used in this file (which headers are needed may - * depend on your platform; for possible suggestions consult - * "platform.h" in the libmicrospdy distribution).

- * - * All of the functions returning SPDY_YES/SPDY_NO return - * SPDY_INPUT_ERROR when any of the parameters are invalid, e.g. - * required parameter is NULL.

- * - * The library does not check if anything at the application layer -- - * requests and responses -- is correct. For example, it - * is up to the user to check if a client is sending HTTP body but the - * method is GET.

- * - * The SPDY flow control is just partially implemented: the receiving - * window is updated, and the client is notified, to prevent a client - * from stop sending POST body data, for example. - */ -#ifndef SPDY_MICROSPDY_H -#define SPDY_MICROSPDY_H - -#include -#include - -/* While we generally would like users to use a configure-driven - build process which detects which headers are present and - hence works on any platform, we use "standard" includes here - to build out-of-the-box for beginning users on common systems. - - Once you have a proper build system and go for more exotic - platforms, you should define MHD_PLATFORM_H in some header that - you always include *before* "microhttpd.h". Then the following - "standard" includes won't be used (which might be a good - idea, especially on platforms where they do not exist). */ -#ifndef MHD_PLATFORM_H -#include -#include -#include -#ifdef __MINGW32__ -#include -#else -#include -#include -#include -#endif -#endif - -#ifndef _MHD_EXTERN -#define _MHD_EXTERN extern -#endif - -/** - * return code for "YES". - */ -#define SPDY_YES 1 - -/** - * return code for "NO". - */ -#define SPDY_NO 0 - -/** - * return code for error when input parameters are wrong. To be returned - * only by functions which return int. The others will return NULL on - * input error. - */ -#define SPDY_INPUT_ERROR -1 - -/** - * SPDY version supported by the lib. - */ -#define SPDY_VERSION 3 - -/** - * The maximum allowed size (without 8 byte headers) of - * SPDY frames (value length) is 8192. The lib will accept and - * send frames with length at most this value here. - */ -#define SPDY_MAX_SUPPORTED_FRAME_SIZE 8192 - -/** - * HTTP response codes. - */ -#define SPDY_HTTP_CONTINUE 100 -#define SPDY_HTTP_SWITCHING_PROTOCOLS 101 -#define SPDY_HTTP_PROCESSING 102 - -#define SPDY_HTTP_OK 200 -#define SPDY_HTTP_CREATED 201 -#define SPDY_HTTP_ACCEPTED 202 -#define SPDY_HTTP_NON_AUTHORITATIVE_INFORMATION 203 -#define SPDY_HTTP_NO_CONTENT 204 -#define SPDY_HTTP_RESET_CONTENT 205 -#define SPDY_HTTP_PARTIAL_CONTENT 206 -#define SPDY_HTTP_MULTI_STATUS 207 - -#define SPDY_HTTP_MULTIPLE_CHOICES 300 -#define SPDY_HTTP_MOVED_PERMANENTLY 301 -#define SPDY_HTTP_FOUND 302 -#define SPDY_HTTP_SEE_OTHER 303 -#define SPDY_HTTP_NOT_MODIFIED 304 -#define SPDY_HTTP_USE_PROXY 305 -#define SPDY_HTTP_SWITCH_PROXY 306 -#define SPDY_HTTP_TEMPORARY_REDIRECT 307 - -#define SPDY_HTTP_BAD_REQUEST 400 -#define SPDY_HTTP_UNAUTHORIZED 401 -#define SPDY_HTTP_PAYMENT_REQUIRED 402 -#define SPDY_HTTP_FORBIDDEN 403 -#define SPDY_HTTP_NOT_FOUND 404 -#define SPDY_HTTP_METHOD_NOT_ALLOWED 405 -#define SPDY_HTTP_METHOD_NOT_ACCEPTABLE 406 -#define SPDY_HTTP_PROXY_AUTHENTICATION_REQUIRED 407 -#define SPDY_HTTP_REQUEST_TIMEOUT 408 -#define SPDY_HTTP_CONFLICT 409 -#define SPDY_HTTP_GONE 410 -#define SPDY_HTTP_LENGTH_REQUIRED 411 -#define SPDY_HTTP_PRECONDITION_FAILED 412 -#define SPDY_HTTP_REQUEST_ENTITY_TOO_LARGE 413 -#define SPDY_HTTP_REQUEST_URI_TOO_LONG 414 -#define SPDY_HTTP_UNSUPPORTED_MEDIA_TYPE 415 -#define SPDY_HTTP_REQUESTED_RANGE_NOT_SATISFIABLE 416 -#define SPDY_HTTP_EXPECTATION_FAILED 417 -#define SPDY_HTTP_UNPROCESSABLE_ENTITY 422 -#define SPDY_HTTP_LOCKED 423 -#define SPDY_HTTP_FAILED_DEPENDENCY 424 -#define SPDY_HTTP_UNORDERED_COLLECTION 425 -#define SPDY_HTTP_UPGRADE_REQUIRED 426 -#define SPDY_HTTP_NO_RESPONSE 444 -#define SPDY_HTTP_RETRY_WITH 449 -#define SPDY_HTTP_BLOCKED_BY_WINDOWS_PARENTAL_CONTROLS 450 -#define SPDY_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS 451 - -#define SPDY_HTTP_INTERNAL_SERVER_ERROR 500 -#define SPDY_HTTP_NOT_IMPLEMENTED 501 -#define SPDY_HTTP_BAD_GATEWAY 502 -#define SPDY_HTTP_SERVICE_UNAVAILABLE 503 -#define SPDY_HTTP_GATEWAY_TIMEOUT 504 -#define SPDY_HTTP_HTTP_VERSION_NOT_SUPPORTED 505 -#define SPDY_HTTP_VARIANT_ALSO_NEGOTIATES 506 -#define SPDY_HTTP_INSUFFICIENT_STORAGE 507 -#define SPDY_HTTP_BANDWIDTH_LIMIT_EXCEEDED 509 -#define SPDY_HTTP_NOT_EXTENDED 510 - -/** - * HTTP headers are used in SPDY, but all of them MUST be lowercase. - * Some are not valid in SPDY and MUST not be used - */ -#define SPDY_HTTP_HEADER_ACCEPT "accept" -#define SPDY_HTTP_HEADER_ACCEPT_CHARSET "accept-charset" -#define SPDY_HTTP_HEADER_ACCEPT_ENCODING "accept-encoding" -#define SPDY_HTTP_HEADER_ACCEPT_LANGUAGE "accept-language" -#define SPDY_HTTP_HEADER_ACCEPT_RANGES "accept-ranges" -#define SPDY_HTTP_HEADER_AGE "age" -#define SPDY_HTTP_HEADER_ALLOW "allow" -#define SPDY_HTTP_HEADER_AUTHORIZATION "authorization" -#define SPDY_HTTP_HEADER_CACHE_CONTROL "cache-control" -/* Connection header is forbidden in SPDY */ -#define SPDY_HTTP_HEADER_CONNECTION "connection" -#define SPDY_HTTP_HEADER_CONTENT_ENCODING "content-encoding" -#define SPDY_HTTP_HEADER_CONTENT_LANGUAGE "content-language" -#define SPDY_HTTP_HEADER_CONTENT_LENGTH "content-length" -#define SPDY_HTTP_HEADER_CONTENT_LOCATION "content-location" -#define SPDY_HTTP_HEADER_CONTENT_MD5 "content-md5" -#define SPDY_HTTP_HEADER_CONTENT_RANGE "content-range" -#define SPDY_HTTP_HEADER_CONTENT_TYPE "content-type" -#define SPDY_HTTP_HEADER_COOKIE "cookie" -#define SPDY_HTTP_HEADER_DATE "date" -#define SPDY_HTTP_HEADER_ETAG "etag" -#define SPDY_HTTP_HEADER_EXPECT "expect" -#define SPDY_HTTP_HEADER_EXPIRES "expires" -#define SPDY_HTTP_HEADER_FROM "from" -/* Host header is forbidden in SPDY */ -#define SPDY_HTTP_HEADER_HOST "host" -#define SPDY_HTTP_HEADER_IF_MATCH "if-match" -#define SPDY_HTTP_HEADER_IF_MODIFIED_SINCE "if-modified-since" -#define SPDY_HTTP_HEADER_IF_NONE_MATCH "if-none-match" -#define SPDY_HTTP_HEADER_IF_RANGE "if-range" -#define SPDY_HTTP_HEADER_IF_UNMODIFIED_SINCE "if-unmodified-since" -/* Keep-Alive header is forbidden in SPDY */ -#define SPDY_HTTP_HEADER_KEEP_ALIVE "keep-alive" -#define SPDY_HTTP_HEADER_LAST_MODIFIED "last-modified" -#define SPDY_HTTP_HEADER_LOCATION "location" -#define SPDY_HTTP_HEADER_MAX_FORWARDS "max-forwards" -#define SPDY_HTTP_HEADER_PRAGMA "pragma" -#define SPDY_HTTP_HEADER_PROXY_AUTHENTICATE "proxy-authenticate" -#define SPDY_HTTP_HEADER_PROXY_AUTHORIZATION "proxy-authorization" -/* Proxy-Connection header is forbidden in SPDY */ -#define SPDY_HTTP_HEADER_PROXY_CONNECTION "proxy-connection" -#define SPDY_HTTP_HEADER_RANGE "range" -#define SPDY_HTTP_HEADER_REFERER "referer" -#define SPDY_HTTP_HEADER_RETRY_AFTER "retry-after" -#define SPDY_HTTP_HEADER_SERVER "server" -#define SPDY_HTTP_HEADER_SET_COOKIE "set-cookie" -#define SPDY_HTTP_HEADER_SET_COOKIE2 "set-cookie2" -#define SPDY_HTTP_HEADER_TE "te" -#define SPDY_HTTP_HEADER_TRAILER "trailer" -/* Transfer-Encoding header is forbidden in SPDY */ -#define SPDY_HTTP_HEADER_TRANSFER_ENCODING "transfer-encoding" -#define SPDY_HTTP_HEADER_UPGRADE "upgrade" -#define SPDY_HTTP_HEADER_USER_AGENT "user-agent" -#define SPDY_HTTP_HEADER_VARY "vary" -#define SPDY_HTTP_HEADER_VIA "via" -#define SPDY_HTTP_HEADER_WARNING "warning" -#define SPDY_HTTP_HEADER_WWW_AUTHENTICATE "www-authenticate" - -/** - * HTTP versions (a value must be provided in SPDY requests/responses). - */ -#define SPDY_HTTP_VERSION_1_0 "HTTP/1.0" -#define SPDY_HTTP_VERSION_1_1 "HTTP/1.1" - -/** - * HTTP methods - */ -#define SPDY_HTTP_METHOD_CONNECT "CONNECT" -#define SPDY_HTTP_METHOD_DELETE "DELETE" -#define SPDY_HTTP_METHOD_GET "GET" -#define SPDY_HTTP_METHOD_HEAD "HEAD" -#define SPDY_HTTP_METHOD_OPTIONS "OPTIONS" -#define SPDY_HTTP_METHOD_POST "POST" -#define SPDY_HTTP_METHOD_PUT "PUT" -#define SPDY_HTTP_METHOD_TRACE "TRACE" - -/** - * HTTP POST encodings, see also - * http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4 - */ -#define SPDY_HTTP_POST_ENCODING_FORM_URLENCODED "application/x-www-form-urlencoded" -#define SPDY_HTTP_POST_ENCODING_MULTIPART_FORMDATA "multipart/form-data" - - -/** - * Handle for the daemon (listening on a socket). - */ -struct SPDY_Daemon; - - -/** - * Handle for a SPDY session/connection. - */ -struct SPDY_Session; - - -/** - * Handle for a SPDY request sent by a client. The structure has pointer - * to the session's handler - */ -struct SPDY_Request; - - -/** - * Handle for a response containing HTTP headers and data to be sent. - * The structure has pointer to the session's handler - * for this response. - */ -struct SPDY_Response; - - -/** - * Collection of tuples of an HTTP header and values used in requests - * and responses. - */ -struct SPDY_NameValue; - - -/** - * Collection of tuples of a SPDY setting ID, value - * and flags used to control the sessions. - */ -struct SPDY_Settings; - - -/** - * SPDY IO sybsystem flags used by SPDY_init() and SPDY_deinit().

- * - * The values are used internally as flags, that is why they must be - * powers of 2. - */ -enum SPDY_IO_SUBSYSTEM -{ - - /** - * No subsystem. For internal use. - */ - SPDY_IO_SUBSYSTEM_NONE = 0, - - /** - * Default TLS implementation provided by openSSL/libssl. - */ - SPDY_IO_SUBSYSTEM_OPENSSL = 1, - - /** - * No TLS is used. - */ - SPDY_IO_SUBSYSTEM_RAW = 2 -}; - - -/** - * SPDY daemon options. Passed in the varargs portion of - * SPDY_start_daemon to customize the daemon. Each option must - * be followed by a value of a specific type.

- * - * The values are used internally as flags, that is why they must be - * powers of 2. - */ -enum SPDY_DAEMON_OPTION -{ - - /** - * No more options / last option. This is used - * to terminate the VARARGs list. - */ - SPDY_DAEMON_OPTION_END = 0, - - /** - * Set a custom timeout for all connections. Must be followed by - * a number of seconds, given as an 'unsigned int'. Use - * zero for no timeout. - */ - SPDY_DAEMON_OPTION_SESSION_TIMEOUT = 1, - - /** - * Bind daemon to the supplied sockaddr. This option must be - * followed by a 'struct sockaddr *'. The 'struct sockaddr*' - * should point to a 'struct sockaddr_in6' or to a - * 'struct sockaddr_in'. - */ - SPDY_DAEMON_OPTION_SOCK_ADDR = 2, - - /** - * Flags for the daemon. Must be followed by a SPDY_DAEMON_FLAG value - * which is the result of bitwise OR of desired flags. - */ - SPDY_DAEMON_OPTION_FLAGS = 4, - - /** - * IO subsystem type used by daemon and all its sessions. If not set, - * TLS provided by openssl is used. Must be followed by a - * SPDY_IO_SUBSYSTEM value. - */ - SPDY_DAEMON_OPTION_IO_SUBSYSTEM = 8, - - /** - * Maximum number of frames to be written to the socket at once. The - * library tries to send max_num_frames in a single call to SPDY_run - * for a single session. This means no requests can be received nor - * other sessions can send data as long the current one has enough - * frames to send and there is no error on writing. Thus, a big value - * will affect the performance. Small value gives fairnes for sessions. - * Must be followed by a positive integer (uin32_t). If not set, the - * default value 10 will be used. - */ - SPDY_DAEMON_OPTION_MAX_NUM_FRAMES = 16 -}; - - -/** - * Flags for starting SPDY daemon. They are used to set some settings - * for the daemon, which do not require values. - */ -enum SPDY_DAEMON_FLAG -{ - /** - * No flags selected. - */ - SPDY_DAEMON_FLAG_NO = 0, - - /** - * The server will bind only on IPv6 addresses. If the flag is set and - * the daemon is provided with IPv4 address or IPv6 is not supported, - * starting daemon will fail. - */ - SPDY_DAEMON_FLAG_ONLY_IPV6 = 1, - - /** - * All sessions' sockets will be set with TCP_NODELAY if the flag is - * used. Option considered only by SPDY_IO_SUBSYSTEM_RAW. - */ - SPDY_DAEMON_FLAG_NO_DELAY = 2 -}; - - -/** - * SPDY settings IDs sent by both client and server in SPDY SETTINGS frame. - * They affect the whole SPDY session. Defined in SPDY Protocol - Draft 3. - */ -enum SPDY_SETTINGS -{ - - /** - * Allows the sender to send its expected upload bandwidth on this - * channel. This number is an estimate. The value should be the - * integral number of kilobytes per second that the sender predicts - * as an expected maximum upload channel capacity. - */ - SPDY_SETTINGS_UPLOAD_BANDWIDTH = 1, - - /** - * Allows the sender to send its expected download bandwidth on this - * channel. This number is an estimate. The value should be the - * integral number of kilobytes per second that the sender predicts as - * an expected maximum download channel capacity. - */ - SPDY_SETTINGS_DOWNLOAD_BANDWIDTH = 2, - - /** - * Allows the sender to send its expected round-trip-time on this - * channel. The round trip time is defined as the minimum amount of - * time to send a control frame from this client to the remote and - * receive a response. The value is represented in milliseconds. - */ - SPDY_SETTINGS_ROUND_TRIP_TIME = 3, - - /** - * Allows the sender to inform the remote endpoint the maximum number - * of concurrent streams which it will allow. By default there is no - * limit. For implementors it is recommended that this value be no - * smaller than 100. - */ - SPDY_SETTINGS_MAX_CONCURRENT_STREAMS = 4, - - /** - * Allows the sender to inform the remote endpoint of the current TCP - * CWND value. - */ - SPDY_SETTINGS_CURRENT_CWND = 5, - - /** - * Allows the sender to inform the remote endpoint the retransmission - * rate (bytes retransmitted / total bytes transmitted). - */ - SPDY_SETTINGS_DOWNLOAD_RETRANS_RATE = 6, - - /** - * Allows the sender to inform the remote endpoint the initial window - * size (in bytes) for new streams. - */ - SPDY_SETTINGS_INITIAL_WINDOW_SIZE = 7, - - /** - * Allows the server to inform the client if the new size of the - * client certificate vector. - */ - SPDY_SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE = 8 -}; - - -/** - * Flags for each individual SPDY setting in the SPDY SETTINGS frame. - * They affect only one setting to which they are set. - * Defined in SPDY Protocol - Draft 3. - */ -enum SPDY_FLAG_SETTINGS -{ - - /** - * When set, the sender of this SETTINGS frame is requesting that the - * recipient persist the ID/Value and return it in future SETTINGS - * frames sent from the sender to this recipient. Because persistence - * is only implemented on the client, this flag is only sent by the - * server. - */ - SPDY_FLAG_SETTINGS_PERSIST_VALUE = 1, - - /** - * When set, the sender is notifying the recipient that this ID/Value - * pair was previously sent to the sender by the recipient with the - * #SPDY_FLAG_SETTINGS_PERSIST_VALUE, and the sender is returning it. - * Because persistence is only implemented on the client, this flag is - * only sent by the client. - */ - SPDY_FLAG_SETTINGS_PERSISTED = 2 -}; - - -/** - * Flag associated with a whole SPDY SETTINGS frame. Affect all the - * settings in the frame. Defined in SPDY Protocol - Draft 3. - */ -enum SPDY_FLAG_SETTINGS_FRAME -{ - - /** - * When set, the client should clear any previously persisted SETTINGS - * ID/Value pairs. If this frame contains ID/Value pairs with the - * #SPDY_FLAG_SETTINGS_PERSIST_VALUE set, then the client will first - * clear its existing, persisted settings, and then persist the values - * with the flag set which are contained within this frame. Because - * persistence is only implemented on the client, this flag can only - * be used when the sender is the server. - */ - SPDY_FLAG_SETTINGS_CLEAR_SETTINGS = 1 -}; - - -/** - * SPDY settings function options. Passed in the varargs portion of - * SPDY_SettingsReceivedCallback and SPDY_send_settings to customize - * more the settings handling. Each option must - * be followed by a value of a specific type.

- * - * The values are used internally as flags, that is why they must be - * powers of 2. - */ -enum SPDY_SETTINGS_OPTION -{ - - /** - * No more options / last option. This is used - * to terminate the VARARGs list. - */ - SPDY_SETTINGS_OPTION_END = 0 -}; - - -/** - * Used as a parameter for SPDY_ResponseResultCallback and shows if the - * response was actually written to the TLS socket or discarded by the - * lib for any reason (and respectively the reason). - */ -enum SPDY_RESPONSE_RESULT -{ - - /** - * The lib has written the full response to the TLS socket. - */ - SPDY_RESPONSE_RESULT_SUCCESS = 0, - - /** - * The session is being closed, so the data is being discarded - */ - SPDY_RESPONSE_RESULT_SESSION_CLOSED = 1, - - /** - * The stream for this response has been closed. May happen when the - * sender had sent first SYN_STREAM and after that RST_STREAM. - */ - SPDY_RESPONSE_RESULT_STREAM_CLOSED = 2 -}; - - -/** - * Callback for serious error condition. The default action is to print - * an error message and abort(). - * - * @param cls user specified value - * @param file where the error occured - * @param line where the error occured - * @param reason error details message, may be NULL - */ -typedef void -(*SPDY_PanicCallback) (void * cls, - const char *file, - unsigned int line, - const char *reason); - - -/** - * Callback for new SPDY session established by a client. Called - * immediately after the TCP connection was established. - * - * @param cls client-defined closure - * @param session handler for the new SPDY session - */ -typedef void -(*SPDY_NewSessionCallback) (void * cls, - struct SPDY_Session * session); - - -/** - * Callback for closed session. Called after the TCP connection was - * closed. In this callback function the user has the last - * chance to access the SPDY_Session structure. After that the latter - * will be cleaned! - * - * @param cls client-defined closure - * @param session handler for the closed SPDY session - * @param by_client #SPDY_YES if the session close was initiated by the - * client; - * #SPDY_NO if closed by the server - */ -typedef void -(*SPDY_SessionClosedCallback) (void *cls, - struct SPDY_Session *session, - int by_client); - - -/** - * Iterator over name-value pairs. - * - * @param cls client-defined closure - * @param name of the pair - * @param value of the pair - * @return #SPDY_YES to continue iterating, - * #SPDY_NO to abort the iteration - */ -typedef int -(*SPDY_NameValueIterator) (void *cls, - const char *name, - const char * const * value, - int num_values); - - -/** - * Callback for received SPDY request. The functions is called whenever - * a reqest comes, but will also be called if more headers/trailers are - * received. - * - * @param cls client-defined closure - * @param request handler. The request object is required for - * sending responses. - * @param priority of the SPDY stream which the request was - * sent over - * @param method HTTP method - * @param path HTTP path - * @param version HTTP version just like in HTTP request/response: - * "HTTP/1.0" or "HTTP/1.1" currently - * @param host called host as in HTTP - * @param scheme used ("http" or "https"). In SPDY 3 it is only "https". - * @param headers other HTTP headers from the request - * @param more a flag saying if more data related to the request is - * expected to be received. HTTP body may arrive (e.g. POST data); - * then SPDY_NewDataCallback will be called for the connection. - * It is also possible that more headers/trailers arrive; - * then the same callback will be invoked. The user should detect - * that it is not the first invocation of the function for that - * request. - */ -typedef void -(*SPDY_NewRequestCallback) (void *cls, - struct SPDY_Request *request, - uint8_t priority, - const char *method, - const char *path, - const char *version, - const char *host, - const char *scheme, - struct SPDY_NameValue *headers, - bool more); - - -/** - * Callback for received new data chunk (HTTP body) from a given - * request (e.g. POST data). - * - * @param cls client-defined closure - * @param request handler - * @param buf data chunk from the POST data - * @param size the size of the data chunk 'buf' in bytes. Note that it - * may be 0. - * @param more false if this is the last chunk from the data. Note: - * true does not mean that more data will come, exceptional - * situation is possible - * @return #SPDY_YES to continue calling the function, - * #SPDY_NO to stop calling the function for this request - */ -typedef int -(*SPDY_NewDataCallback) (void *cls, - struct SPDY_Request *request, - const void *buf, - size_t size, - bool more); -// How about passing POST encoding information -// here as well? -//TODO - - -/** - * Callback to be used with SPDY_build_response_with_callback. The - * callback will be called when the lib wants to write to the TLS socket. - * The application should provide the data to be sent. - * - * @param cls client-defined closure - * @param max maximum number of bytes that are allowed to be written - * to the buffer. - * @param more true if more data will be sent (i.e. the function must - * be calleed again), - * false if this is the last chunk, the lib will close - * the stream - * @return number of bytes written to buffer. On error the call MUST - * return value less than 0 to indicate the library. - */ -typedef ssize_t -(*SPDY_ResponseCallback) (void *cls, - void *buffer, - size_t max, - bool *more); - - -/** - * Callback to be called when the last bytes from the response was sent - * to the client or when the response was discarded from the lib. This - * callback is a very good place to discard the request and the response - * objects, if they will not be reused (e.g., sending the same response - * again). If the stream is closed it is safe to discard the request - * object. - * - * @param cls client-defined closure - * @param response handler to the response that was just sent - * @param request handler to the request for which the response was sent - * @param status shows if actually the response was sent or it was - * discarded by the lib for any reason (e.g., closing session, - * closing stream, stopping daemon, etc.). It is possible that - * status indicates an error but parts of the response headers - * and/or body (in one - * or several frames) were already sent to the client. - * @param streamopened indicates if the the stream for this request/ - * response pair is still opened. If yes, the server may want - * to use SPDY push to send something additional to the client - * and/or close the stream. - */ -typedef void -(*SPDY_ResponseResultCallback) (void * cls, - struct SPDY_Response *response, - struct SPDY_Request *request, - enum SPDY_RESPONSE_RESULT status, - bool streamopened); - - -/** - * Callback to notify when SPDY ping response is received. - * - * @param session handler for which the ping request was sent - * @param rtt the timespan between sending ping request and receiving it - * from the library - */ -typedef void -(*SPDY_PingCallback) (void * cls, - struct SPDY_Session *session, - struct timeval *rtt); - - -/** - * Iterator over settings ID/Value/Flags tuples. - * - * @param cls client-defined closure - * @param id SPDY settings ID - * @param value value for this setting - * @param flags flags for this tuple; use - * `enum SPDY_FLAG_SETTINGS` - * @return #SPDY_YES to continue iterating, - * #SPDY_NO to abort the iteration - */ -typedef int -(*SPDY_SettingsIterator) (void *cls, - enum SPDY_SETTINGS id, - int32_t value, - uint8_t flags); - - -/** - * Callback to notify when SPDY SETTINGS are received from the client. - * - * @param session handler for which settings are received - * @param settings ID/value/flags tuples of the settings - * @param flags for the whole settings frame; use - * enum SPDY_FLAG_SETTINGS_FRAME - * @param ... list of options (type-value pairs, - * terminated with #SPDY_SETTINGS_OPTION_END). - */ -typedef void -(*SPDY_SettingsReceivedCallback) (struct SPDY_Session *session, - struct SPDY_Settings *settings, - uint8_t flags, - ...); - - -/* Global functions for the library */ - - -/** - * Init function for the whole library. It MUST be called before any - * other function of the library to initialize things like TLS context - * and possibly other stuff needed by the lib. Currently the call - * always returns #SPDY_YES. - * - * @param io_subsystem the IO subsystem that will - * be initialized. Several can be used with bitwise OR. If no - * parameter is set, the default openssl subsystem will be used. - * @return #SPDY_YES if the library was correctly initialized and its - * functions can be used now; - * #SPDY_NO on error - */ -_MHD_EXTERN int -(SPDY_init) (enum SPDY_IO_SUBSYSTEM io_subsystem, ...); -#define SPDY_init() SPDY_init (SPDY_IO_SUBSYSTEM_OPENSSL) - - -/** - * Deinit function for the whole lib. It can be called after finishing - * using the library. It frees and cleans up resources allocated in - * SPDY_init. Currently the function does not do anything. - */ -_MHD_EXTERN void -SPDY_deinit (void); - - -/** - * Sets the global error handler to a different implementation. "cb" - * will only be called in the case of typically fatal, serious - * internal consistency issues. These issues should only arise in the - * case of serious memory corruption or similar problems with the - * architecture as well as failed assertions. While "cb" is allowed to - * return and the lib will then try to continue, this is never safe. - * - * The default implementation that is used if no panic function is set - * simply prints an error message and calls "abort". Alternative - * implementations might call "exit" or other similar functions. - * - * @param cb new error handler - * @param cls passed to error handler - */ -_MHD_EXTERN void -SPDY_set_panic_func (SPDY_PanicCallback cb, - void *cls); - - -/* Daemon functions */ - - -/** - * Start a SPDY webserver on the given port. - * - * @param port to bind to. The value is ignored if address structure - * is passed as daemon option - * @param certfile path to the certificate that will be used by server - * @param keyfile path to the keyfile for the certificate - * @param nscb callback called when a new SPDY session is - * established by a client - * @param sccb callback called when a session is closed - * @param nrcb callback called when a client sends request - * @param npdcb callback called when HTTP body (POST data) is received - * after request - * @param cls common extra argument to all of the callbacks - * @param ... list of options (type-value pairs, - * terminated with #SPDY_DAEMON_OPTION_END). - * @return NULL on error, handle to daemon on success - */ -_MHD_EXTERN struct SPDY_Daemon * -SPDY_start_daemon (uint16_t port, - const char *certfile, - const char *keyfile, - SPDY_NewSessionCallback nscb, - SPDY_SessionClosedCallback sccb, - SPDY_NewRequestCallback nrcb, - SPDY_NewDataCallback npdcb, - void *cls, - ...); - - -/** - * Shutdown the daemon. First all sessions are closed. It is NOT safe - * to call this function in user callbacks. - * - * @param daemon to stop - */ -_MHD_EXTERN void -SPDY_stop_daemon (struct SPDY_Daemon *daemon); - - -/** - * Obtain the select sets for this daemon. Only those are retrieved, - * which some processing should be done for, i.e. not all sockets are - * added to write_fd_set.

- * - * It is possible that there is - * nothing to be read from a socket but there is data either in the - * TLS subsystem's read buffers or in libmicrospdy's read buffers, which - * waits for being processed. In such case the file descriptor will be - * added to write_fd_set. Since it is very likely for the socket to be - * ready for writing, the select used in the application's event loop - * will return with success, SPDY_run will be called, the data will be - * processed and maybe something will be written to the socket. Without - * this behaviour, considering a proper event loop, data may stay in the - * buffers, but run is never called. - * - * @param daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @return largest FD added to any of the sets - */ -_MHD_EXTERN int -SPDY_get_fdset (struct SPDY_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set); - - -/** - * Obtain timeout value for select for this daemon. The returned value - * is how long select - * should at most block, not the timeout value set for connections. - * - * @param daemon to query for timeout - * @param timeout will be set to the timeout value (in milliseconds) - * @return #SPDY_YES on success - * #SPDY_NO if no connections exist that - * would necessiate the use of a timeout right now - */ -_MHD_EXTERN int -SPDY_get_timeout (struct SPDY_Daemon *daemon, - unsigned long long *timeout); - - -/** - * Run webserver operations. This method must be called in - * the client event loop. - * - * @param daemon to run - */ -_MHD_EXTERN void -SPDY_run (struct SPDY_Daemon *daemon); - - -/* SPDY Session handling functions */ - - -/** - * Closes a SPDY session. SPDY clients and servers are expected to keep - * sessions opened as long as possible. However, the server may want to - * close some connections, e.g. if there are too many, to free some - * resources. The function can also be used to close a specific session - * if the client is not desired. - * - * @param session handler to be closed - */ -_MHD_EXTERN void -SPDY_close_session (struct SPDY_Session * session); - - -/** - * Associate a void pointer with a session. The data accessible by the - * pointer can later be used wherever the session handler is available. - * - * @param session handler - * @param cls any data pointed by a pointer to be accessible later - */ -_MHD_EXTERN void -SPDY_set_cls_to_session (struct SPDY_Session *session, - void *cls); - - -/** - * Retrieves the pointer associated with SPDY_set_cls_to_session(). - * - * @param session handler to get its cls - * @return same pointer added by SPDY_set_cls_to_session() or - * NULL when nothing was associated - */ -_MHD_EXTERN void * -SPDY_get_cls_from_session (struct SPDY_Session *session); - - -/** - * Retrieves the remote address of a given session. - * - * @param session handler to get its remote address - * @param addr out parameter; pointing to remote address - * @return length of the address structure - */ -_MHD_EXTERN socklen_t -SPDY_get_remote_addr (struct SPDY_Session *session, - struct sockaddr **addr); - - -/* SPDY name/value data structure handling functions */ - - -/** - * Create a new NameValue structure. It is needed for putting inside the - * HTTP headers and their values for a response. The user should later - * destroy alone the structure. - * - * @return handler to the new empty structure or NULL on error - */ -_MHD_EXTERN struct SPDY_NameValue * -SPDY_name_value_create (void); - - -/** - * Add name/value pair to a NameValue structure. SPDY_NO will be returned - * if the name/value pair is already in the structure. It is legal to - * add different values for the same name. - * - * @param container structure to which the new pair is added - * @param name for the value. Null-terminated string. - * @param value the value itself. Null-terminated string. - * @return #SPDY_NO on error or #SPDY_YES on success - */ -_MHD_EXTERN int -SPDY_name_value_add (struct SPDY_NameValue *container, - const char *name, - const char *value); - - -/** - * Lookup value for a name in a name/value structure. - * - * @param container structure in which to lookup - * @param name the name to look for - * @param num_values length of the returned array with values - * @return NULL if no such item was found, or an array containing the - * values - */ -_MHD_EXTERN const char * const * -SPDY_name_value_lookup (struct SPDY_NameValue *container, - const char *name, - int *num_values); - - -/** - * Iterate over name/value structure. - * - * @param container structure which to iterate over - * @param iterator callback to call on each name/value pair; - * maybe NULL (then just count headers) - * @param iterator_cls extra argument to @a iterator - * @return number of entries iterated over - */ -_MHD_EXTERN int -SPDY_name_value_iterate (struct SPDY_NameValue *container, - SPDY_NameValueIterator iterator, - void *iterator_cls); - - -/** - * Destroy a NameValue structure. Use this function to destroy only - * objects which, after passed to, will not be destroied by other - * functions. - * - */ -_MHD_EXTERN void -SPDY_name_value_destroy (struct SPDY_NameValue *container); - - -/* SPDY request handling functions */ - - -/** - * Gets the session responsible for the given - * request. - * - * @param request for which the session is wanted - * @return session handler for the request - */ -_MHD_EXTERN struct SPDY_Session * -SPDY_get_session_for_request (const struct SPDY_Request *request); - - -/** - * Associate a void pointer with a request. The data accessible by the - * pointer can later be used wherever the request handler is available. - * - * @param request with which to associate a pointer - * @param cls any data pointed by a pointer to be accessible later - */ -_MHD_EXTERN void -SPDY_set_cls_to_request (struct SPDY_Request *request, - void *cls); - - -/** - * Retrieves the pointer associated with the request by - * SPDY_set_cls_to_request(). - * - * @param request to get its cls - * @return same pointer added by SPDY_set_cls_to_request() or - * NULL when nothing was associated - */ -_MHD_EXTERN void * -SPDY_get_cls_from_request (struct SPDY_Request *request); - - -/* SPDY response handling functions */ - - -/** - * Create response object containing all needed headers and data. The - * response object is not bound to a request, so it can be used multiple - * times with SPDY_queue_response() and schould be - * destroied by calling the SPDY_destroy_response().

- * - * Currently the library does not provide compression of the body data. - * It is up to the user to pass already compressed data and the - * appropriate headers to this function when desired. - * - * @param status HTTP status code for the response (e.g. 404) - * @param statustext HTTP status message for the response, which will - * be appended to the status code (e.g. "OK"). Can be NULL - * @param version HTTP version for the response (e.g. "http/1.1") - * @param headers name/value structure containing additional HTTP headers. - * Can be NULL. Can be used multiple times, it is up to - * the user to destoy the object when not needed anymore. - * @param data the body of the response. The lib will make a copy of it, - * so it is up to the user to take care of the memory - * pointed by data - * @param size length of @a data. It can be 0, then the lib will send only - * headers - * @return NULL on error, handle to response object on success - */ -_MHD_EXTERN struct SPDY_Response * -SPDY_build_response (int status, - const char *statustext, - const char *version, - struct SPDY_NameValue *headers, - const void *data, - size_t size); - - -/** - * Create response object containing all needed headers. The data will - * be provided later when the lib calls the callback function (just - * before writing it to the TLS socket). The - * response object is not bound to a request, so it can be used multiple - * times with SPDY_queue_response() and schould be - * destroied by calling the SPDY_destroy_response().

- * - * Currently the library does not provide compression of the body data. - * It is up to the user to pass already compressed data and the - * appropriate headers to this function and the callback when desired. - * - * @param status HTTP status code for the response (e.g. 404) - * @param statustext HTTP status message for the response, which will - * be appended to the status code (e.g. "OK"). Can be NULL - * @param version HTTP version for the response (e.g. "http/1.1") - * @param headers name/value structure containing additional HTTP headers. - * Can be NULL. Can be used multiple times, it is up to - * the user to destoy the object when not needed anymore. - * @param rcb callback to use to obtain response data - * @param rcb_cls extra argument to @a rcb - * @param block_size preferred block size for querying rcb (advisory only, - * the lib will call rcb specifying the block size); clients - * should pick a value that is appropriate for IO and - * memory performance requirements. The function will - * fail if the value is bigger than the maximum - * supported value (SPDY_MAX_SUPPORTED_FRAME_SIZE). - * Can be 0, then the lib will use - * #SPDY_MAX_SUPPORTED_FRAME_SIZE instead. - * @return NULL on error, handle to response object on success - */ -_MHD_EXTERN struct SPDY_Response * -SPDY_build_response_with_callback(int status, - const char *statustext, - const char *version, - struct SPDY_NameValue *headers, - SPDY_ResponseCallback rcb, - void *rcb_cls, - uint32_t block_size); - - -/** - * Queue response object to be sent to the client. A successfully queued - * response may never be sent, e.g. when the stream gets closed. The - * data will be added to the output queue. The call will fail, if the - * output for this session - * is closed (i.e. the session is closed, half or full) or the output - * channel for the stream, on which the request was received, is closed - * (i.e. the stream is closed, half or full). - * - * @param request object identifying the request to which the - * response is returned - * @param response object containg headers and data to be sent - * @param closestream TRUE if the server does NOT intend to PUSH - * something more associated to this request/response later, - * FALSE otherwise - * @param consider_priority if FALSE, the response will be added to the - * end of the queue. If TRUE, the response will be added after - * the last previously added response with priority of the - * request grater or equal to that of the current one. This - * means that the function should be called with TRUE each time - * if one wants to be sure that the output queue behaves like - * a priority queue - * @param rrcb callback called when all the data was sent (last frame - * from response) or when that frame was discarded (e.g. the - * stream has been closed meanwhile) - * @param rrcb_cls extra argument to @a rrcb - * @return #SPDY_NO on error or #SPDY_YES on success - */ -_MHD_EXTERN int -SPDY_queue_response (struct SPDY_Request *request, - struct SPDY_Response *response, - bool closestream, - bool consider_priority, - SPDY_ResponseResultCallback rrcb, - void *rrcb_cls); - - -/** - * Destroy a response structure. It should be called for all objects - * returned by SPDY_build_response*() functions to free the memory - * associated with the prepared response. It is safe to call this - * function not before being sure that the response will not be used by - * the lib anymore, this means after SPDY_ResponseResultCallback - * callbacks were called for all calls to SPDY_queue_response() passing - * this response. - * - * @param response to destroy - */ -_MHD_EXTERN void -SPDY_destroy_response (struct SPDY_Response *response); - - -/* SPDY settings ID/value data structure handling functions */ - - -/** - * Create a new SettingsIDValue structure. It is needed for putting - * inside tuples of SPDY option, flags and value for sending to the - * client. - * - * @return hendler to the new empty structure or NULL on error - */ -_MHD_EXTERN const struct SPDY_Settings * -SPDY_settings_create (void); - - -/** - * Add or update a tuple to a SettingsIDValue structure. - * - * @param container structure to which the new tuple is added - * @param id SPDY settings ID that will be sent. If this ID already in - * container, the tupple for it will be updated (value and/or - * flags). If it is not in the container, a new tupple will be - * added. - * @param flags SPDY settings flags applied only to this setting - * @param value of the setting - * @return #SPDY_NO on error - * or #SPDY_YES if a new setting was added - */ -_MHD_EXTERN int -SPDY_settings_add (struct SPDY_Settings *container, - enum SPDY_SETTINGS id, - enum SPDY_FLAG_SETTINGS flags, - int32_t value); - - -/** - * Lookup value and flags for an ID in a settings ID/value structure. - * - * @param container structure in which to lookup - * @param id SPDY settings ID to search for - * @param flags out param for SPDY settings flags for this setting; - * check it against the flags in enum SPDY_FLAG_SETTINGS - * @param value out param for the value of this setting - * @return #SPDY_NO if the setting is not into the structure - * or #SPDY_YES if it is into it - */ -_MHD_EXTERN int -SPDY_settings_lookup (const struct SPDY_Settings *container, - enum SPDY_SETTINGS id, - enum SPDY_FLAG_SETTINGS *flags, - int32_t *value); - - -/** - * Iterate over settings ID/value structure. - * - * @param container structure which to iterate over - * @param iterator callback to call on each ID/value pair; - * maybe NULL (then just count number of settings) - * @param iterator_cls extra argument to iterator - * @return number of entries iterated over - */ -_MHD_EXTERN int -SPDY_settings_iterate (const struct SPDY_Settings *container, - SPDY_SettingsIterator iterator, - void *iterator_cls); - - -/** - * Destroy a settings ID/value structure. Use this function to destroy - * only objects which, after passed to, will not be destroied by other - * functions. - * - * @param container structure which to detroy - */ -_MHD_EXTERN void -SPDY_settings_destroy (struct SPDY_Settings * container); - - -/* SPDY SETTINGS handling functions */ - - -/** - * Send SPDY SETTINGS to the client. The call will return fail if there - * in invald setting into the settings container (e.g. invalid setting - * ID). - * - * @param session SPDY_Session handler for which settings are being sent - * @param settings ID/value pairs of the settings to be sent. - * Can be used multiple times, it is up to the user to destoy - * the object when not needed anymore. - * @param flags for the whole settings frame. They are valid for all tuples - * @param ... list of options (type-value pairs, - * terminated with #SPDY_SETTINGS_OPTION_END). - * @return SPDY_NO on error or SPDY_YES on - * success - */ -_MHD_EXTERN int -SPDY_send_settings (struct SPDY_Session *session, - struct SPDY_Settings *settings, - enum SPDY_FLAG_SETTINGS_FRAME flags, - ...); - - -/* SPDY misc functions */ - - -/** - * Destroy a request structure. It should be called for all objects - * received as a parameter in SPDY_NewRequestCallback to free the memory - * associated with the request. It is safe to call this - * function not before being sure that the request will not be used by - * the lib anymore, this means after the stream, on which this request - * had been sent, was closed and all SPDY_ResponseResultCallback - * callbacks were called for all calls to SPDY_queue_response() passing - * this request object. - * - * @param request to destroy - */ -_MHD_EXTERN void -SPDY_destroy_request (struct SPDY_Request * request); - - -/** - * Send SPDY ping to the client - * - * @param session handler for which the ping request is sent - * @param rttcb callback called when ping response to the request is - * received - * @param rttcb_cls extra argument to @a rttcb - * @return #SPDY_NO on error or #SPDY_YES on success - */ -_MHD_EXTERN int -SPDY_send_ping (struct SPDY_Session *session, - SPDY_PingCallback rttcb, - void *rttcb_cls); - -#endif diff --git a/src/hos_libhttpserver/notes.txt b/src/hos_libhttpserver/notes.txt deleted file mode 100644 index 28f024fb..00000000 --- a/src/hos_libhttpserver/notes.txt +++ /dev/null @@ -1,3 +0,0 @@ -GNU libgcrypt: 1.6.3 -GNU libmicrohttpd: 0.9.42 -libhttpserver: https://github.com/etr/libhttpserver diff --git a/src/hos_libhttpserver/src/libgcrypt/AUTHORS b/src/hos_libhttpserver/src/libgcrypt/AUTHORS deleted file mode 100644 index 823b0d6e..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/AUTHORS +++ /dev/null @@ -1,208 +0,0 @@ -Library: Libgcrypt -Homepage: https://www.gnu.org/software/libgcrypt/ -Maintainer: Werner Koch -Bug reports: http://bugs.gnupg.org -Security related bug reports: -License (library): LGPLv2.1+ -License (manual and tools): GPLv2+ - -Libgcrypt is free software. See the files COPYING.LIB and COPYING for -copying conditions, and LICENSES for notices about a few contributions -that require these additional notices to be distributed. License -copyright years may be listed using range notation, e.g., 2000-2013, -indicating that every year in the range, inclusive, is a copyrightable -year that would otherwise be listed individually. - - -List of Copyright holders -========================= - - Copyright (C) 1989,1991-2015 Free Software Foundation, Inc. - Copyright (C) 1994 X Consortium - Copyright (C) 1996 L. Peter Deutsch - Copyright (C) 1997 Werner Koch - Copyright (C) 1998 The Internet Society - Copyright (C) 1996-1999 Peter Gutmann, Paul Kendall, and Chris Wedgwood - Copyright (C) 1996-2006 Peter Gutmann, Matt Thomlinson and Blake Coverett - Copyright (C) 2003 Nikos Mavroyanopoulos - Copyright (C) 2006-2007 NTT (Nippon Telegraph and Telephone Corporation) - Copyright (C) 2012-2015 g10 Code GmbH - Copyright (C) 2012 Simon Josefsson, Niels Möller - Copyright (c) 2012 Intel Corporation - Copyright (C) 2013 Christian Grothoff - Copyright (C) 2013-2015 Jussi Kivilinna - Copyright (C) 2013-2014 Dmitry Eremin-Solenikov - - -Authors with a FSF copyright assignment -======================================= - -LIBGCRYPT Werner Koch 2001-06-07 -Assigns past and future changes. -Assignment for future changes terminated on 2012-12-04. -wk@gnupg.org -Designed and implemented Libgcrypt. - -GNUPG Matthew Skala 1998-08-10 -Disclaims changes. -mskala@ansuz.sooke.bc.ca -Wrote cipher/twofish.c. - -GNUPG Natural Resources Canada 1998-08-11 -Disclaims changes by Matthew Skala. - -GNUPG Michael Roth Germany 1998-09-17 -Assigns changes. -mroth@nessie.de -Wrote cipher/des.c. -Changes and bug fixes all over the place. - -GNUPG Niklas Hernaeus 1998-09-18 -Disclaims changes. -nh@df.lth.se -Weak key patches. - -GNUPG Rémi Guyomarch 1999-05-25 -Assigns past and future changes. (g10/compress.c, g10/encr-data.c, -g10/free-packet.c, g10/mdfilter.c, g10/plaintext.c, util/iobuf.c) -rguyom@mail.dotcom.fr - -ANY g10 Code GmbH 2001-06-07 -Assignment for future changes terminated on 2012-12-04. -Code marked with ChangeLog entries of g10 Code employees. - -LIBGCRYPT Timo Schulz 2001-08-31 -Assigns past and future changes. -twoaday@freakmail.de - -LIBGCRYPT Simon Josefsson 2002-10-25 -Assigns past and future changes to FSF (cipher/{md4,crc}.c, CTR mode, -CTS/MAC flags, self test improvements) -simon@josefsson.org - -LIBGCRYPT Moritz Schulte 2003-04-17 -Assigns past and future changes. -moritz@g10code.com - -GNUTLS Nikolaos Mavrogiannopoulos 2003-11-22 -nmav@gnutls.org -Original code for cipher/rfc2268.c. - -LIBGCRYPT The Written Word 2005-04-15 -Assigns past and future changes. (new: src/libgcrypt.pc.in, -src/Makefile.am, src/secmem.c, mpi/hppa1.1/mpih-mul3.S, -mpi/hppa1.1/udiv-qrnnd.S, mpi/hppa1.1/mpih-mul2.S, -mpi/hppa1.1/mpih-mul1.S, mpi/Makefile.am, tests/prime.c, -tests/register.c, tests/ac.c, tests/basic.c, tests/tsexp.c, -tests/keygen.c, tests/pubkey.c, configure.ac, acinclude.m4) - -LIBGCRYPT Brad Hards 2006-02-09 -Assigns Past and Future Changes -bradh@frogmouth.net -(Added OFB mode. Changed cipher/cipher.c, test/basic.c doc/gcrypt.tex. - added SHA-224, changed cipher/sha256.c, added HMAC tests.) - -LIBGCRYPT Hye-Shik Chang 2006-09-07 -Assigns Past and Future Changes -perky@freebsd.org -(SEED cipher) - -LIBGCRYPT Werner Dittmann 2009-05-20 -Assigns Past and Future Changes -werner.dittmann@t-online.de -(mpi/amd64, tests/mpitests.c) - -GNUPG David Shaw -Assigns past and future changes. -dshaw@jabberwocky.com -(cipher/camellia-glue.c and related stuff) - -LIBGCRYPT Andrey Jivsov 2010-12-09 -Assigns Past and Future Changes -openpgp@brainhub.org -(cipher/ecc.c and related files) - -LIBGCRYPT Ulrich Müller 2012-02-15 -Assigns Past and Future Changes -ulm@gentoo.org -(Changes to cipher/idea.c and related files) - -LIBGCRYPT Vladimir Serbinenko 2012-04-26 -Assigns Past and Future Changes -phcoder@gmail.com -(cipher/serpent.c) - - -Authors with a DCO -================== - -Christian Aistleitner -2013-02-26:20130226110144.GA12678@quelltextlich.at: - -Christian Grothoff -2013-03-21:514B5D8A.6040705@grothoff.org: - -Dmitry Eremin-Solenikov -2013-07-13:20130713144407.GA27334@fangorn.rup.mentorg.com: - -Dmitry Kasatkin -2012-12-14:50CAE2DB.80302@intel.com: - -Jussi Kivilinna -2012-11-15:20121115172331.150537dzb5i6jmy8@www.dalek.fi: - -Jussi Kivilinna -2013-05-06:5186720A.4090101@iki.fi: - -Rafaël Carré -2012-04-20:4F91988B.1080502@videolan.org: - -Sergey V. -2013-11-07:2066221.5IYa7Yq760@darkstar: - -Tomáš Mráz -2012-04-16:1334571250.5056.52.camel@vespa.frost.loc: - -Werner Koch (g10 Code GmbH) -2012-12-05:87obi8u4h2.fsf@vigenere.g10code.de: - - -More credits -============ - -Libgcrypt used to be part of GnuPG but has been taken out into its own -package on 2000-12-21. - -The ATH implementation (src/ath*) has been taken from GPGME and -relicensed to the LGPL by the copyright holder of GPGME (g10 Code -GmbH); it is now considered to be a part of Libgcrypt. - -Most of the stuff in mpi has been taken from an old GMP library -version by Torbjorn Granlund . - -The files cipher/rndunix.c and cipher/rndw32.c are based on those -files from Cryptlib. Copyright Peter Gutmann, Paul Kendall, and Chris -Wedgwood 1996-1999. - -The ECC code cipher/ecc.c was based on code by Sergi Blanch i Torne, -sergi at calcurco dot org. - -The implementation of the Camellia cipher has been been taken from the -original NTT provided GPL source. - -The CAVS testing program tests/cavs_driver.pl is not to be considered -a part of libgcrypt proper. We distribute it merely for convenience. -It has a permissive license and is copyrighted by atsec information -security corporation. See the file for details. - -The file salsa20.c is based on D.J. Bernstein's public domain code and -taken from Nettle. Copyright 2012 Simon Josefsson and Niels Möller. - - - This file is free software; as a special exception the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. - - This file is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/src/hos_libhttpserver/src/libgcrypt/COPYING b/src/hos_libhttpserver/src/libgcrypt/COPYING deleted file mode 100644 index d60c31a9..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/src/hos_libhttpserver/src/libgcrypt/COPYING.LIB b/src/hos_libhttpserver/src/libgcrypt/COPYING.LIB deleted file mode 100644 index cf9b6b99..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/COPYING.LIB +++ /dev/null @@ -1,510 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. -^L - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. -^L - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. -^L - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. -^L - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. -^L - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. -^L - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. -^L - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS -^L - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the library, -if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James - Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/src/hos_libhttpserver/src/libgcrypt/ChangeLog b/src/hos_libhttpserver/src/libgcrypt/ChangeLog deleted file mode 100644 index 6ce9b8d9..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/ChangeLog +++ /dev/null @@ -1,4389 +0,0 @@ -2015-02-27 Werner Koch - - Release 1.6.3. - - doc: Update yat2m to current upstream version (GnuPG). - (cherry picked from commit dd5df198727ea5d8f6b04288e14fd732051453c8) - - w32: Use -static-libgcc to avoid linking to libgcc_s_sjlj-1.dll. - * src/Makefile.am (extra_ltoptions): New. - (libgcrypt_la_LDFLAGS): Use it. - - build: Update build-aux files. - - build: Require automake 1.14. - * configure.ac (AM_INIT_AUTOMAKE): Add serial-tests and dist-bzip2. - * Makefile.am (AUTOMAKE_OPTIONS): Remove. - -2015-02-26 NIIBE Yutaka - - mpi: Avoid data-dependent timing variations in mpi_powm. - * mpi/mpi-pow.c (mpi_powm): Access all data in the table by - mpi_set_cond. - - mpi: Revise mpi_powm. - * mpi/mpi-pow.c (_gcry_mpi_powm): Rename the table to PRECOMP. - - mpi: Add mpi_set_cond. - * mpi/mpiutil.c (_gcry_mpi_set_cond): New. - * src/mpi.h (mpi_set_cond): New. - -2015-02-23 Werner Koch - - cipher: Use ciphertext blinding for Elgamal decryption. - * cipher/elgamal.c (USE_BLINDING): New. - (decrypt): Rewrite to use ciphertext blinding. - -2014-10-08 Werner Koch - - Fix prime test for 2 and lower and add check command to mpicalc. - * cipher/primegen.c (check_prime): Return true for the small primes. - (_gcry_prime_check): Return correct values for 2 and lower numbers. - - * src/mpicalc.c (do_primecheck): New. - (main): Add command 'P'. - (main): Allow for larger input data. - -2014-09-30 Werner Koch - - mac: Fix gcry_mac_close to allow for a NULL handle. - * cipher/mac.c (_gcry_mac_close): Check for NULL. - -2014-09-02 Werner Koch - - asm: Allow building x86 and amd64 using old compilers. - * src/hwf-x86.c (get_xgetbv): Build only if AVX support is enabled. - -2014-08-21 Werner Koch - - Release 1.6.2. - * configure.ac: Set LT version to C20/A0/R2. - - build: Fix typo in help string. - * configure.ac: Fix. - - sexp: Check args of gcry_sexp_build. - * src/sexp.c (do_vsexp_sscan): Return error for invalid args. - - cipher: Fix a segv in case of calling with wrong parameters. - * cipher/md.c (_gcry_md_info): Fix arg testing. - - cipher: Fix possible NULL deref in call to prime generator. - * cipher/primegen.c (_gcry_generate_elg_prime): Change to return an - error code. - * cipher/dsa.c (generate): Take care of new return code. - * cipher/elgamal.c (generate): Change to return an error code. Take - care of _gcry_generate_elg_prime return code. - (generate_using_x): Take care of _gcry_generate_elg_prime return code. - (elg_generate): Propagate return code from generate. - -2014-08-20 Werner Koch - - ecc: Support the non-standard 0x40 compression flag for EdDSA. - * cipher/ecc.c (ecc_generate): Check the "comp" flag for EdDSA. - * cipher/ecc-eddsa.c (eddsa_encode_x_y): Add arg WITH_PREFIX. - (_gcry_ecc_eddsa_encodepoint): Ditto. - (_gcry_ecc_eddsa_ensure_compact): Handle the 0x40 compression prefix. - (_gcry_ecc_eddsa_decodepoint): Ditto. - * tests/keygrip.c: Check an compresssed with prefix Ed25519 key. - * tests/t-ed25519.inp: Ditto. - - mpi: Extend the internal mpi_get_buffer. - * mpi/mpicoder.c (do_get_buffer): Add arg EXTRAALLOC. - (_gcry_mpi_get_buffer_extra): New. - -2014-08-05 Werner Koch - - mpi: Fix regression for powerpc-apple-darwin detection. - * mpi/config.links: Add separate entry for powerpc-apple-darwin. - - Fix bug inhibiting the use of the sentinel attribute. - * src/gcrypt.h.in: Fix typo in macro. - - mpi: Use BSD syntax for x86_64-apple-darwin. - * mpi/config.links: Add case for x86_64-apple-darwin. - -2014-08-05 Kristian Fiskerstrand - - Fix building for the x32 target without asm modules. - * mpi/generic/mpi-asm-defs.h: Use a fixed value for the x32 ABI. - -2014-05-20 Jussi Kivilinna - - Fix ARM assembly when building __PIC__ - * cipher/camellia-arm.S (GET_DATA_POINTER): New. - (_gcry_camellia_arm_encrypt_block): Use GET_DATA_POINTER. - (_gcry_camellia_arm_decrypt_block): Ditto. - * cipher/cast5-arm.S (GET_DATA_POINTER): New. - (_gcry_cast5_arm_encrypt_block, _gcry_cast5_arm_decrypt_block) - (_gcry_cast5_arm_enc_blk2, _gcry_cast5_arm_dec_blk2): Use - GET_DATA_POINTER. - * cipher/rijndael-arm.S (GET_DATA_POINTER): New. - (_gcry_aes_arm_encrypt_block, _gcry_aes_arm_decrypt_block): Use - GET_DATA_POINTER. - -2014-05-09 Werner Koch - - mpi: Fix a subtle bug setting spurious bits with in mpi_set_bit. - * mpi/mpi-bit.c (_gcry_mpi_set_bit, _gcry_mpi_set_highbit): Clear - allocated but not used bits before resizing. - * tests/t-mpi-bits.c (set_bit_with_resize): New. - -2014-04-24 Werner Koch - - Support building using the latest mingw-w64 toolchain. - * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Change mingw detection. - - Use internal malloc function in fips.c. - * src/fips.c (check_binary_integrity): s/gcry_malloc/xtrymalloc/. - -2014-04-22 Werner Koch - - random: Small patch for consistency and really burn the stack. - * random/rndlinux.c (_gcry_rndlinux_gather_random): s/int/size_t/. - (_gcry_rndlinux_gather_random): Replace memset by wipememory. - -2014-04-16 Werner Koch - - pubkey: Re-map all deprecated RSA algo numbers. - * cipher/pubkey.c (map_algo): Mape RSA_E and RSA_S. - - cipher: Fix possible NULL dereference. - * cipher/md.c (_gcry_md_selftest): Check for spec being NULL. - -2014-02-20 Jussi Kivilinna - - Fix ARMv6 detection when CFLAGS modify target CPU architecture. - * configure.ac (gcry_cv_cc_arm_arch_is_v6): Use compiler test instead - of preprocessor test. - -2014-01-31 Jussi Kivilinna - - Parse /proc/cpuinfo for ARM HW features. - * src/hwf-arm.c [__linux__] (HAS_PROC_CPUINFO) - (detect_arm_proc_cpuinfo): New. - (_gcry_hwf_detect_arm) [HAS_PROC_CPUINFO]: Check '/proc/cpuinfo' for - HW features. - -2014-01-29 Werner Koch - - cipher: Take care of ENABLE_NEON_SUPPORT. - * cipher/salsa20.c (USE_ARM_NEON_ASM): Define only if - ENABLE_NEON_SUPPORT is defined. - * cipher/serpent.c (USE_NEON): Ditto. - * cipher/sha512.c (USE_ARM_NEON_ASM): Ditto. - - Release 1.6.1. - * configure.ac: Set LT version to C20/A0/R1. - - Reserve control code for FIPS extensions. - * src/gcrypt.h.in (GCRYCTL_INACTIVATE_FIPS_FLAG): New. - (GCRYCTL_REACTIVATE_FIPS_FLAG): New. - * src/global.c (_gcry_vcontrol): Add them but return not_implemented. - - (cherry picked from commit aea96a64fbc58a0b6f9f435e97e93294c6eb1052) - - Support non weak symbol pthread platforms. - * m4/lock.m4, m4/threadlib.m4: New. From libgpg-error master. - * m4/Makefile.am (EXTRA_DIST): Add them. - * configure.ac (HAVE_PTHREAD): Remove test and ac_define. - (gl_LOCK): Do not use under Windows. - (LIBGCRYPT_CONFIG_LIBS): Add LIBTHREAD to support non-ELF pthread - systems. - * src/Makefile.am (dumpsexp_LDADD, mpicalc_LDADD, hmac256_LDADD) - (gcryptrnd_LDADD): Add LIBTHREAD. - * src/ath.c: Include pthread for any pthread version. - (ath_init, ath_install, ath_mutex_init, ath_mutex_destroy) - (ath_mutex_lock, ath_mutex_unlock): Support non-weak symbol pthread - systems. - * tests/Makefile.am (LDADD): Add LIBTHREAD. - * tests/t-lock.c: Replace HAVE_PTHREAD by USE_POSIX_THREADS - (run_test): Run only under W32 or pthread. - - tests: Remove non-portable format specifiers. - * tests/basic.c: Replace "%zi" by "%d" and casts. - -2014-01-29 NIIBE Yutaka - - Fix RSA Blinding. - * cipher/rsa.c (rsa_decrypt): Loop to get multiplicative inverse. - - (cherry picked from commit 121a90d8931944974054f7d94f63b7f89df87fa5) - -2014-01-28 Werner Koch - - sexp: Fix broken gcry_sexp_nth. - * src/sexp.c (_gcry_sexp_nth): Return a valid S-expression for a data - element. - (NODE): Remove unused typedef. - (ST_HINT): Comment unused macro. - - * tests/tsexp.c (bug_1594): New. - (main): Run new test. - -2014-01-27 Werner Koch - - mpi: Minor fix for Atari-mint. - * mpi/config.links [m68k-atari-mint]: Do not assume 68020. Suggested - by Alan Hourihane. - -2014-01-27 Dmitry Eremin-Solenikov - - tests: Pass -no-install to libtool. - * tests/Makefile.am: add AM_LDFLAGS = -no-install - - Fix most of memory leaks in tests code. - * tests/basic.c (check_ccm_cipher): Close cipher after use. - * tests/basic.c (check_one_cipher): Correct length of used buffer. - * tests/benchmark.c (cipher_bench): Use xcalloc to make buffer - initialized. - * tests/keygen.c (check_ecc_keys): Release generated key. - * tests/t-mpi-point.c (context_param): Release mpi Q. - * tests/t-sexp.c (check_extract_param): Release extracted number. - - Fix memory leaks in ecc code. - * cipher/ecc-curves.c (_gcry_ecc_update_curve_param): Release passed mpi - values. - * cipher/ecc.c (compute_keygrip): Fix potential memory leak in error - path. - * cipher/ecc.c (_gcry_ecc_get_curve): Release temporary mpi. - -2014-01-24 Werner Koch - - Check compiler features only for the relevant platform. - * mpi/config.links (mpi_cpu_arch): Always set for ARM. Set for HPPA. - Set to "undefined" for unknown platforms. - (try_asm_modules): Act upon only after having detected the CPU. - * configure.ac: Move the call to config.links before the platform - specific compiler checks. Check platform specific features only if - the platform is targeted. - -2014-01-24 Dmitry Eremin-Solenikov - - Truncate hash values for ECDSA signature scheme. - * cipher/dsa-common (_gcry_dsa_normalize_hash): New. Truncate opaque - mpis as required for DSA and ECDSA signature schemas. - * cipher/dsa.c (verify): Return gpg_err_code_t value from verify() to - behave like the rest of internal sign/verify functions. - * cipher/dsa.c (sign, verify, dsa_verify): Factor out hash truncation. - * cipher/ecc-ecdsa.c (_gcry_ecc_ecdsa_sign): Factor out hash truncation. - * cipher/ecc-ecdsa.c (_gcry_ecc_ecdsa_verify): - as required by ECDSA scheme, truncate hash values to bitlength of - used curve. - * tests/pubkey.c (check_ecc_sample_key): add a testcase for hash - truncation. - - (cherry picked from commit 9edcf1090e0485f9f383b6c54b18ea8ca3d4a225) - -2014-01-24 Werner Koch - - Support locking under Windows. - * src/ath.c: Add support for Windows. - * src/global.c (external_lock_test): New. - (_gcry_vcontrol): Call new function with formerly reserved code 61. - - * tests/t-common.h: New. Taken from current libgpg-error. - * tests/t-lock.c: New. Based on t-lock.c from libgpg-error. - * configure.ac (HAVE_PTHREAD): Set macro to 1 if defined. - (AC_CHECK_FUNCS): Check for flockfile. - * tests/Makefile.am (tests_bin): Add t-lock. - (noinst_HEADERS): Add t-common.h - (LDADD): Move value to ... - (default_ldadd): new. - (t_lock_LDADD): New. - -2014-01-20 Werner Koch - - cipher: Fix commit 77f28793. - * cipher/tiger.c (tiger_init): Add arg FLAGS. - (tiger1_init, tiger2_init): Ditto. - - (cherry picked from commit dad06e4d1b835bac778b87090b1d3894b7535b14) - - md: Add Whirlpool bug emulation feature. - * src/gcrypt.h.in (GCRY_MD_FLAG_BUGEMU1): New. - * src/cipher-proto.h (gcry_md_init_t): Add arg FLAGS. Change all code - to implement that flag. - * cipher/md.c (gcry_md_context): Replace SECURE and FINALIZED by bit - field FLAGS. Add flag BUGEMU1. Change all users. - (md_open): Replace args SECURE and HMAC by FLAGS. Init flags.bugemu1. - (_gcry_md_open): Add for GCRY_MD_FLAG_BUGEMU1. - (md_enable): Pass bugemu1 flag to the hash init function. - (_gcry_md_reset): Ditto. - -2014-01-14 Milan Broz - - PBKDF2: Use gcry_md_reset to speed up calculation. - * cipher/kdf.c (_gcry_kdf_pkdf2): Use gcry_md_reset - to speed up calculation. - -2014-01-13 Werner Koch - - Fix macro conflict in NetBSD. - * cipher/bithelp.h (bswap32): Rename to _gcry_bswap32. - (bswap64): Rename to _gcry_bswap64. - -2014-01-13 Dmitry Eremin-Solenikov - - Fix typo in search_oid. - * cipher/md.c (search_oid): Invert condition on oid comparison. - - Correct formatting of gcry_mac_get_algo_keylen documentation. - * doc/gcrypt.texi: add braces near gcry_mac_get_algo_keylen - documentation. - - Use braces around unsigned int in gcry_mac_get_algo_keylen - documentation, otherwise texinfo breaks that and uses 'int' as a - function definition. - -2014-01-12 Jussi Kivilinna - - * cipher/Makefile.am: Add 'blowfish-arm.S' and 'serpent-armv7-neon.S'. -- - Fix for bug https://bugs.g10code.com/gnupg/issue1584 - - (cherry picked from commit 7fef7f481c0a1542be34d1dc831f58d41846ac29) - - Fix buggy/incomplete detection of AVX/AVX2 support. - * configure.ac: Also check for 'xgetbv' instruction in AVX and AVX2 - inline assembly checks. - * src/hwf-x86.c [__i386__] (get_xgetbv): New function. - [__x86_64__] (get_xgetbv): New function. - [HAS_X86_CPUID] (detect_x86_gnuc): Check for OSXSAVE and OS support for - XMM&YMM registers and enable AVX/AVX2 only if XMM&YMM registers are - supported by OS. - -2014-01-10 Werner Koch - - Use the generic autogen.sh script. - * autogen.rc: New. - * Makefile.am (EXTRA_DIST): Add it. - * autogen.sh: Update from current GnuPG. - - (cherry picked from commit b0ac1f9b143aa15855914ba93fef900288d45c9c) - - Move all helper scripts to build-aux/ - * scripts/: Rename to build-aux/. - * compile, config.guess, config.rpath, config.sub - * depcomp, doc/mdate-sh, doc/texinfo.tex - * install-sh, ltmain.sh, missing: Move to build-aux/. - * Makefile.am (EXTRA_DIST): Adjust. - * configure.ac (AC_CONFIG_AUX_DIR): New. - (AM_SILENT_RULES): New. - - (cherry picked from commit df9b4eabf52faee6f289a4bc62219684442ae383) - -2013-12-16 Werner Koch - - Release 1.6.0. - - doc: Change yat2m to allow arbitrary condition names. - * doc/yat2m.c (MAX_CONDITION_NESTING): New. - (gpgone_defined): Remove. - (condition_s, condition_stack, condition_stack_idx): New. - (cond_is_active, cond_in_verbatim): New. - (add_predefined_macro, set_macro, macro_set_p): New. - (evaluate_conditions, push_condition, pop_condition): New. - (parse_file): Rewrite to use the condition stack. - (top_parse_file): Set prefined macros. - (main): Change -D to define arbitrary macros. - - tests: Add SHA-512 to the long hash test. - * tests/hashtest.c (testvectors): Add vectors for 256GiB SHA-512. - * tests/hashtest-256g.in (algos): Add test for SHA-512. - - Add configure option --enable-large-data-tests. - * configure.ac: Add option --enable-large-data-tests. - * tests/hashtest-256g.in: New. - * tests/Makefile.am (EXTRA_DIST): Add hashtest-256g.in. - (TESTS): Split up into tests_bin, tests_bin_last, tests_sh, and - tests_sh_last. - (tests_sh_last): Add hashtest-256g - (noinst_PROGRAMS): Add only tests_bin and tests_bin_last. - (bench-slope.log, hashtest-256g.log): New rules to enforce serial run. - - random: Call random progress handler more often. - * random/rndlinux.c (_gcry_rndlinux_gather_random): Update progress - indicator earlier. - - cipher: Normalize the MPIs used as input to secret key functions. - * cipher/dsa.c (sign): Normalize INPUT. - * cipher/elgamal.c (decrypt): Normalize A and B. - * cipher/rsa.c (secret): Normalize the INPUT. - (rsa_decrypt): Reduce DATA before passing to secret. - -2013-12-16 Jussi Kivilinna - - Change dummy variable in mpih-div.c to mpi_limb_t type. - * mpi/mpih-div.c (_gcry_mpih_mod_1, _gcry_mpih_divmod_1): Change dummy - variable to 'mpi_limb_t' type from 'int'. - - Remove duplicate gcry_mac_hd_t typedef. - * cipher/mac-internal.h (gcry_mac_hd_t): Remove. - -2013-12-15 Jussi Kivilinna - - Use u64 for CCM data lengths. - * cipher/cipher-ccm.c: Move code inside [HAVE_U64_TYPEDEF]. - [HAVE_U64_TYPEDEF] (_gcry_cipher_ccm_set_lengths): Use 'u64' for - data lengths. - [!HAVE_U64_TYPEDEF] (_gcry_cipher_ccm_encrypt) - (_gcry_cipher_ccm_decrypt, _gcry_cipher_ccm_set_nonce) - (_gcry_cipher_ccm_authenticate, _gcry_cipher_ccm_get_tag) - (_gcry_cipher_ccm_check_tag): Dummy functions returning - GPG_ERROR_NOT_SUPPORTED. - * cipher/cipher-internal.h (gcry_cipher_handle.u_mode.ccm) - (_gcry_cipher_ccm_set_lengths): Move inside [HAVE_U64_TYPEDEF] and use - u64 instead of size_t for CCM data lengths. - * cipher/cipher.c (_gcry_cipher_open_internal, cipher_reset) - (_gcry_cipher_ctl) [!HAVE_U64_TYPEDEF]: Return GPG_ERR_NOT_SUPPORTED - for CCM. - (_gcry_cipher_ctl) [HAVE_U64_TYPEDEF]: Use u64 for - GCRYCTL_SET_CCM_LENGTHS length parameters. - * tests/basic.c: Do not use CCM if !HAVE_U64_TYPEDEF. - * tests/bench-slope.c: Ditto. - * tests/benchmark.c: Ditto. - -2013-12-14 Werner Koch - - tests: Prevent rare failure of gcry_pk_decrypt test. - * tests/basic.c (check_pubkey_crypt): Add special mode 1. - (main): Add option --loop. - -2013-12-14 Jussi Kivilinna - - Minor fixes to SHA assembly implementations. - * cipher/Makefile.am: Correct 'sha256-avx*.S' to 'sha512-avx*.S'. - * cipher/sha1-ssse3-amd64.S: First line, correct filename. - * cipher/sha256-ssse3-amd64.S: Return correct stack burn depth. - * cipher/sha512-avx-amd64.S: Use 'vzeroall' to clear registers. - * cipher/sha512-avx2-bmi2-amd64.S: Ditto and return correct stack burn - depth. - - SHA-1/SSSE3: Do not check for Intel syntax assembly support. - * cipher/sha1-ssse3-amd64.S: Remove check for - HAVE_INTEL_SYNTAX_PLATFORM_AS. - * cipher/sha1.c [USE_SSSE3]: Ditto. - -2013-12-13 Jussi Kivilinna - - Convert SHA-1 SSSE3 implementation from mixed asm&C to pure asm. - * cipher/Makefile.am: Change 'sha1-ssse3-amd64.c' to - 'sha1-ssse3-amd64.S'. - * cipher/sha1-ssse3-amd64.c: Remove. - * cipher/sha1-ssse3-amd64.S: New. - - SHA-1: Add SSSE3 implementation. - * cipher/Makefile.am: Add 'sha1-ssse3-amd64.c'. - * cipher/sha1-ssse3-amd64.c: New. - * cipher/sha1.c (USE_SSSE3): New. - (SHA1_CONTEXT) [USE_SSSE3]: Add 'use_ssse3'. - (sha1_init) [USE_SSSE3]: Initialize 'use_ssse3'. - (transform): Rename to... - (_transform): this. - (transform): New. - * configure.ac [host=x86_64]: Add 'sha1-ssse3-amd64.lo'. - - Add missing register clearing in to SHA-256 and SHA-512 assembly. - * cipher/sha256-ssse3-amd64.S: Clear used XMM/YMM registers at return. - * cipher/sha512-avx-amd64.S: Ditto. - * cipher/sha512-avx2-bmi2-amd64.S: Ditto. - * cipher/sha512-ssse3-amd64.S: Ditto. - -2013-12-13 Werner Koch - - Update license information. - * LICENSES: New. - * Makefile.am (EXTRA_DIST): Add LICENSES. - * AUTHORS: Add list of copyright holders. - * README: Reference AUTHORS. - -2013-12-13 Jussi Kivilinna - - Fix empty clobber in AVX2 assembly check. - * configure.ac (gcry_cv_gcc_inline_asm_avx2): Add "cc" as assembly - globber. - - Fix W32 build. - * random/rndw32.c (register_poll, slow_gatherer): Change gcry_xmalloc to - xmalloc, and gcry_xrealloc to xrealloc. - -2013-12-12 Jussi Kivilinna - - SHA-512: Add AVX and AVX2 implementations for x86-64. - * cipher/Makefile.am: Add 'sha512-avx-amd64.S' and - 'sha512-avx2-bmi2-amd64.S'. - * cipher/sha512-avx-amd64.S: New. - * cipher/sha512-avx2-bmi2-amd64.S: New. - * cipher/sha512.c (USE_AVX, USE_AVX2): New. - (SHA512_CONTEXT) [USE_AVX]: Add 'use_avx'. - (SHA512_CONTEXT) [USE_AVX2]: Add 'use_avx2'. - (sha512_init, sha384_init) [USE_AVX]: Initialize 'use_avx'. - (sha512_init, sha384_init) [USE_AVX2]: Initialize 'use_avx2'. - [USE_AVX] (_gcry_sha512_transform_amd64_avx): New. - [USE_AVX2] (_gcry_sha512_transform_amd64_avx2): New. - (transform) [USE_AVX2]: Add call for AVX2 implementation. - (transform) [USE_AVX]: Add call for AVX implementation. - * configure.ac (HAVE_GCC_INLINE_ASM_BMI2): New check. - (sha512): Add 'sha512-avx-amd64.lo' and 'sha512-avx2-bmi2-amd64.lo'. - * doc/gcrypt.texi: Document 'intel-cpu' and 'intel-bmi2'. - * src/g10lib.h (HWF_INTEL_CPU, HWF_INTEL_BMI2): New. - * src/hwfeatures.c (hwflist): Add "intel-cpu" and "intel-bmi2". - * src/hwf-x86.c (detect_x86_gnuc): Check for HWF_INTEL_CPU and - HWF_INTEL_BMI2. - - SHA-512: Add SSSE3 implementation for x86-64. - * cipher/Makefile.am: Add 'sha512-ssse3-amd64.S'. - * cipher/sha512-ssse3-amd64.S: New. - * cipher/sha512.c (USE_SSSE3): New. - (SHA512_CONTEXT) [USE_SSSE3]: Add 'use_ssse3'. - (sha512_init, sha384_init) [USE_SSSE3]: Initialize 'use_ssse3'. - [USE_SSSE3] (_gcry_sha512_transform_amd64_ssse3): New. - (transform) [USE_SSSE3]: Call SSSE3 implementation. - * configure.ac (sha512): Add 'sha512-ssse3-amd64.lo'. - - SHA-256: Add SSSE3 implementation for x86-64. - * cipher/Makefile.am: Add 'sha256-ssse3-amd64.S'. - * cipher/sha256-ssse3-amd64.S: New. - * cipher/sha256.c (USE_SSSE3): New. - (SHA256_CONTEXT) [USE_SSSE3]: Add 'use_ssse3'. - (sha256_init, sha224_init) [USE_SSSE3]: Initialize 'use_ssse3'. - (transform): Rename to... - (_transform): This. - [USE_SSSE3] (_gcry_sha256_transform_amd64_ssse3): New. - (transform): New. - * configure.ac (HAVE_INTEL_SYNTAX_PLATFORM_AS): New check. - (sha256): Add 'sha256-ssse3-amd64.lo'. - * doc/gcrypt.texi: Document 'intel-ssse3'. - * src/g10lib.h (HWF_INTEL_SSSE3): New. - * src/hwfeatures.c (hwflist): Add "intel-ssse3". - * src/hwf-x86.c (detect_x86_gnuc): Test for SSSE3. - -2013-12-12 Werner Koch - - Add a configuration file to disable hardware features. - * src/hwfeatures.c: Inclyde syslog.h and ctype.h. - (HWF_DENY_FILE): New. - (my_isascii): New. - (parse_hwf_deny_file): New. - (_gcry_detect_hw_features): Call it. - - * src/mpicalc.c (main): Correctly initialize Libgcrypt. Add options - "--print-config" and "--disable-hwf". - - Move list of hardware features to hwfeatures.c. - * src/global.c (hwflist, disabled_hw_features): Move to .. - * src/hwfeatures.c: here. - (_gcry_disable_hw_feature): New. - (_gcry_enum_hw_features): New. - (_gcry_detect_hw_features): Remove arg DISABLED_FEATURES. - * src/global.c (print_config, _gcry_vcontrol, global_init): Adjust - accordingly. - - Remove macro hacks for internal vs. external functions. Part 2 and last. - * src/visibility.h: Remove remaining define/undef hacks for symbol - visibility. Add macros to detect the use of the public functions. - Change all affected functions by replacing them by the x-macros. - * src/g10lib.h: Add internal prototypes. - (xtrymalloc, xtrycalloc, xtrymalloc_secure, xtrycalloc_secure) - (xtryrealloc, xtrystrdup, xmalloc, xcalloc, xmalloc_secure) - (xcalloc_secure, xrealloc, xstrdup, xfree): New macros. - -2013-12-11 Werner Koch - - random: Add a feature to close device file descriptors. - * src/gcrypt.h.in (GCRYCTL_CLOSE_RANDOM_DEVICE): New. - * src/global.c (_gcry_vcontrol): Call _gcry_random_close_fds. - * random/random.c (_gcry_random_close_fds): New. - * random/random-csprng.c (_gcry_rngcsprng_close_fds): New. - * random/random-fips.c (_gcry_rngfips_close_fds): New. - * random/random-system.c (_gcry_rngsystem_close_fds): New. - * random/rndlinux.c (open_device): Add arg retry. - (_gcry_rndlinux_gather_random): Add mode to close open fds. - - * tests/random.c (check_close_random_device): New. - (main): Call new test. - -2013-12-10 Werner Koch - - Fix last commit (9a37470c) - * src/secmem.c (lock_pool): Remove remaining line. Reported by Ian - Goldberg. - -2013-12-09 Werner Koch - - Fix one-off memory leak when build with Linux capability support. - * src/secmem.c (lock_pool, secmem_init): Use cap_free. Reported by - Mike Crowe . - -2013-12-09 David 'Digit' Turner - - Update libtool to support Android. - * m4/libtool.m4: Add "linux*android*" case. Taken from the libtool - repository. - -2013-12-09 Werner Koch - - tests: Speed up benchmarks in regression test mode. - * tests/tsexp.c (check_extract_param): Fix compiler warning. - * tests/Makefile.am (TESTS_ENVIRONMENT): Set GCRYPT_IN_REGRESSION_TEST. - * tests/bench-slope.c (main): Speed up if in regression test mode. - * tests/benchmark.c (main): Ditto. - - tests: Add --csv option to bench-slope. - * tests/bench-slope.c (STR, STR2): New. - (cvs_mode): New. - (num_measurement_repetitions): New. Replace use of - NUM_MEASUREMENT_REPETITIONS by this. - (current_section_name, current_algo_name, current_mode_name): New. - (bench_print_result_csv): New. - (bench_print_result_std): Rename from bench_print_result. - (bench_print_result): New. Divert depending on CSV_MODE. - (bench_print_header, bench_print_footer): take care of CSV_MODE. - (bench_print_algo, bench_print_mode): New. Use them instead of - explicit printfs. - (main): Add options --csv and --repetitions. - -2013-12-07 Werner Koch - - sexp: Allow long names and white space in gcry_sexp_extract_param. - * src/sexp.c (_gcry_sexp_vextract_param): Skip white space. Support - long parameter names. - * tests/tsexp.c (check_extract_param): Add test cases for long parameter - names and white space. - -2013-12-06 Werner Koch - - ecc: Merge partly duplicated code. - * cipher/ecc-eddsa.c (_gcry_ecc_eddsa_sign): Factor A hashing out to ... - (_gcry_ecc_eddsa_compute_h_d): new function. - * cipher/ecc-misc.c (_gcry_ecc_compute_public): Use new function. - (reverse_buffer): Remove. - - ecc: Remove unused internal function. - * src/cipher-proto.h (gcry_pk_spec): Remove get_param. - * cipher/ecc-curves.c (_gcry_ecc_get_param_sexp): Merge in code from - _gcry_ecc_get_param. - (_gcry_ecc_get_param): Remove. - * cipher/ecc.c (_gcry_pubkey_spec_ecc): Remove _gcry_ecc_get_param. - -2013-12-06 Jussi Kivilinna - - Fix building on mingw32. - * src/gcrypt-int.h: Include . - -2013-12-05 Werner Koch - - ecc: Change OID for Ed25519. - * cipher/ecc-curves.c (curve_aliased): Add more suitable OID for - Ed25519. - - Remove macro hacks for internal vs. external functions. Part 1. - * src/visibility.h: Remove almost all define/undef hacks for symbol - visibility. Add macros to detect the use of the public functions. - Change all affected functions by prefixing them explicitly with an - underscore and change all internal callers to call the underscore - prefixed versions. Provide convenience macros from sexp and mpi - functions. - * src/visibility.c: Change all functions to use only gpg_err_code_t - and translate to gpg_error_t only in visibility.c. - -2013-12-04 Jussi Kivilinna - - mpi: add inline assembly for x86-64. - * mpi/longlong.h [__x86_64] (add_ssaaaa, sub_ddmmss, umul_ppmm) - (udiv_qrnnd, count_leading_zeros, count_trailing_zeros): New. - -2013-12-04 NIIBE Yutaka - - mpi: fix gcry_mpi_powm for negative base. - * mpi/mpi-pow.c (gcry_mpi_powm) [USE_ALGORITHM_SIMPLE_EXPONENTIATION]: - Fix for the case where BASE is negative. - * tests/mpitests.c (test_powm): Add a test case of (-17)^6 mod 19. - -2013-12-03 Werner Koch - - Add build support for ppc64le. - * config.guess, config.sub: Update to latest version (2013-11-29). - * m4/libtool.m4: Add patches for ppc64le. - -2013-12-03 Jussi Kivilinna - - rijndael: fix compiler warning on aarch64. - * cipher/rijndael.c (do_setkey): Use braces for empty if statement - instead of semicolon. - - Add aarch64 (arm64) mpi assembly. - * mpi/aarch64/mpi-asm-defs.h: New. - * mpi/aarch64/mpih-add1.S: New. - * mpi/aarch64/mpih-mul1.S: New. - * mpi/aarch64/mpih-mul2.S: New. - * mpi/aarch64/mpih-mul3.S: New. - * mpi/aarch64/mpih-sub1.S: New. - * mpi/config.links [host=aarch64-*-*]: Add configguration for aarch64 - assembly. - * mpi/longlong.h [__aarch64__] (add_ssaaaa, sub_ddmmss, umul_ppmm) - (count_leading_zeros): New. - -2013-12-02 Werner Koch - - ecc: Use constant time point operation for Twisted Edwards. - * mpi/ec.c (_gcry_mpi_ec_mul_point): Try to do a constant time - operation if needed. - * tests/benchmark.c (main): Add option --use-secmem. - - ecc: Make gcry_pk_testkey work for Ed25519. - * cipher/ecc-misc.c (_gcry_ecc_compute_public): Add optional args G - and d. Change all callers. - * cipher/ecc.c (gen_y_2): Remove. - (check_secret_key): Use generic public key compute function. Adjust - for use with Ed25519 and EdDSA. - (nist_generate_key): Do not use the compliant key thingy for Ed25519. - (ecc_check_secret_key): Make parameter parsing similar to the other - functions. - * cipher/ecc-curves.c (domain_parms): Zero prefix some parameters so - that _gcry_ecc_update_curve_param works correctly. - * tests/keygen.c (check_ecc_keys): Add "param" flag. Check all - Ed25519 keys. - - ecc: Fix eddsa point decompression. - * cipher/ecc-eddsa.c (_gcry_ecc_eddsa_recover_x): Fix the negative - case. - - ecc: Fix gcry_mpi_ec_curve_point for Weierstrass. - * mpi/ec.c (_gcry_mpi_ec_curve_point): Use correct equation. - (ec_pow3): New. - (ec_p_init): Always copy B. - - mpi: Introduce 4 user flags for gcry_mpi_t. - * src/gcrypt.h.in (GCRYMPI_FLAG_USER1, GCRYMPI_FLAG_USER2) - (GCRYMPI_FLAG_USER3, GCRYMPI_FLAG_USER4): New. - * mpi/mpiutil.c (gcry_mpi_set_flag, gcry_mpi_clear_flag) - (gcry_mpi_get_flag, _gcry_mpi_free): Implement them. - (gcry_mpi_set_opaque): Keep user flags. - -2013-11-29 Vladimir 'φ-coder/phcoder' Serbinenko - - Fix armv3 compile error. - * mpi/longlong.h [__arm__ && __ARM_ARCH < 4] (umul_ppmm): Use - __AND_CLOBBER_CC instead of __CLOBBER_CC. - - longlong.h on mips with clang. - * mpi/longlong.h [__mips__]: Use C-language version with clang. - -2013-11-24 Jussi Kivilinna - - Camellia: Tweaks for AES-NI implementations. - * cipher/camellia-aesni-avx-amd64.S: Align stack to 16 bytes; tweak - key-setup for small speed up. - * cipher/camellia-aesni-avx2-amd64.S: Use vmovdqu even with aligned - stack; reorder vinsert128 instructions; use rbp for stack frame. - -2013-11-21 Jussi Kivilinna - - Add GMAC to MAC API. - * cipher/Makefile.am: Add 'mac-gmac.c'. - * cipher/mac-gmac.c: New. - * cipher/mac-internal.h (gcry_mac_handle): Add 'u.gcm'. - (_gcry_mac_type_spec_gmac_aes, _gcry_mac_type_spec_gmac_twofish) - (_gcry_mac_type_spec_gmac_serpent, _gcry_mac_type_spec_gmac_seed) - (_gcry_mac_type_spec_gmac_camellia): New externs. - * cipher/mac.c (mac_list): Add GMAC specifications. - * doc/gcrypt.texi: Add mention of GMAC. - * src/gcrypt.h.in (gcry_mac_algos): Add GCM algorithms. - * tests/basic.c (check_one_mac): Add support for MAC IVs. - (check_mac): Add support for MAC IVs and add GMAC test vectors. - * tests/bench-slope.c (mac_bench): Iterate algorithm numbers to 499. - * tests/benchmark.c (mac_bench): Iterate algorithm numbers to 499. - - GCM: Move gcm_table initialization to setkey. - * cipher/cipher-gcm.c: Change all 'c->u_iv.iv' to - 'c->u_mode.gcm.u_ghash_key.key'. - (_gcry_cipher_gcm_setkey): New. - (_gcry_cipher_gcm_initiv): Move ghash initialization to function above. - * cipher/cipher-internal.h (gcry_cipher_handle): Add - 'u_mode.gcm.u_ghash_key'; Reorder 'u_mode.gcm' members for partial - clearing in gcry_cipher_reset. - (_gcry_cipher_gcm_setkey): New prototype. - * cipher/cipher.c (cipher_setkey): Add GCM setkey. - (cipher_reset): Clear 'u_mode' only partially for GCM. - -2013-11-20 Jussi Kivilinna - - GCM: Add support for split data buffers and online operation. - * cipher/cipher-gcm.c (do_ghash_buf): Add buffering for less than - blocksize length input and padding handling. - (_gcry_cipher_gcm_encrypt, _gcry_cipher_gcm_decrypt): Add handling - for AAD padding and check if data has already being padded. - (_gcry_cipher_gcm_authenticate): Check that AAD or data has not being - padded yet. - (_gcry_cipher_gcm_initiv): Clear padding marks. - (_gcry_cipher_gcm_tag): Add finalization and padding; Clear sensitive - data from cipher handle, since they are not used after generating tag. - * cipher/cipher-internal.h (gcry_cipher_handle): Add 'u_mode.gcm.macbuf', - 'u_mode.gcm.mac_unused', 'u_mode.gcm.ghash_data_finalized' and - 'u_mode.gcm.ghash_aad_finalized'. - * tests/basic.c (check_gcm_cipher): Rename to... - (_check_gcm_cipher): ...this and add handling for different buffer step - lengths; Enable per byte buffer testing. - (check_gcm_cipher): Call _check_gcm_cipher with different buffer step - sizes. - - GCM: Use size_t for buffer sizes. - * cipher/cipher-gcm.c (ghash, gcm_bytecounter_add, do_ghash_buf) - (_gcry_cipher_gcm_encrypt, _gcry_cipher_gcm_decrypt) - (_gcry_cipher_gcm_authenticate, _gcry_cipher_gcm_geniv) - (_gcry_cipher_gcm_tag): Use size_t for buffer lengths. - * cipher/cipher-internal.h (_gcry_cipher_gcm_encrypt) - (_gcry_cipher_gcm_decrypt, _gcry_cipher_gcm_authenticate): Use size_t - for buffer lengths. - - GCM: add FIPS mode restrictions. - * cipher/cipher-gcm.c (_gcry_cipher_gcm_encrypt) - (_gcry_cipher_gcm_get_tag): Do not allow using in FIPS mode is setiv - was invocated directly. - (_gcry_cipher_gcm_setiv): Rename to... - (_gcry_cipher_gcm_initiv): ...this. - (_gcry_cipher_gcm_setiv): New setiv function with check for FIPS mode. - [TODO] (_gcry_cipher_gcm_getiv): New. - * cipher/cipher-internal.h (gcry_cipher_handle): Add - 'u_mode.gcm.disallow_encryption_because_of_setiv_in_fips_mode'. - - GCM: Add clearing and checking of marks.tag. - * cipher/cipher-gcm.c (_gcry_cipher_gcm_encrypt) - (_gcry_cipher_gcm_decrypt, _gcry_cipher_gcm_authenticate): Make sure - that tag has not been finalized yet. - (_gcry_cipher_gcm_setiv): Clear 'marks.tag'. - - GCM: Add stack burning. - * cipher/cipher-gcm.c (do_ghash, ghash): Return stack burn depth. - (setupM): Wipe 'tmp' buffer. - (do_ghash_buf): Wipe 'tmp' buffer and add stack burning. - - Add aggregated bulk processing for GCM on x86-64. - * cipher/cipher-gcm.c [__x86_64__] (gfmul_pclmul_aggr4): New. - (ghash) [GCM_USE_INTEL_PCLMUL]: Add aggregated bulk processing - for __x86_64__. - (setupM) [__x86_64__]: Add initialization for aggregated bulk - processing. - - GCM: Tweak Intel PCLMUL ghash loop for small speed-up. - * cipher/cipher-gcm.c (do_ghash): Mark 'inline'. - [GCM_USE_INTEL_PCLMUL] (do_ghash_pclmul): Rename to... - [GCM_USE_INTEL_PCLMUL] (gfmul_pclmul): ..this and make inline function. - (ghash) [GCM_USE_INTEL_PCLMUL]: Preload data before ghash-pclmul loop. - - GCM: Use counter mode code for speed-up. - * cipher/cipher-gcm.c (ghash): Add process for multiple blocks. - (gcm_bytecounter_add, gcm_add32_be128, gcm_check_datalen) - (gcm_check_aadlen_or_ivlen, do_ghash_buf): New functions. - (_gcry_cipher_gcm_encrypt, _gcry_cipher_gcm_decrypt) - (_gcry_cipher_gcm_authenticate, _gcry_cipher_gcm_set_iv) - (_gcry_cipher_gcm_tag): Adjust to use above new functions and - counter mode functions for encryption/decryption. - * cipher/cipher-internal.h (gcry_cipher_handle): Remove 'length'; Add - 'u_mode.gcm.(addlen|datalen|tagiv|datalen_over_limits)'. - (_gcry_cipher_gcm_setiv): Return gcry_err_code_t. - * cipher/cipher.c (cipher_setiv): Return error code. - (_gcry_cipher_setiv): Handle error code from 'cipher_setiv'. - - Add Intel PCLMUL acceleration for GCM. - * cipher/cipher-gcm.c (fillM): Rename... - (do_fillM): ...to this. - (ghash): Remove. - (fillM): New macro. - (GHASH): Use 'do_ghash' instead of 'ghash'. - [GCM_USE_INTEL_PCLMUL] (do_ghash_pclmul): New. - (ghash): New. - (setupM): New. - (_gcry_cipher_gcm_encrypt, _gcry_cipher_gcm_decrypt) - (_gcry_cipher_gcm_authenticate, _gcry_cipher_gcm_setiv) - (_gcry_cipher_gcm_tag): Use 'ghash' instead of 'GHASH' and - 'c->u_mode.gcm.u_tag.tag' instead of 'c->u_tag.tag'. - * cipher/cipher-internal.h (GCM_USE_INTEL_PCLMUL): New. - (gcry_cipher_handle): Move 'u_tag' and 'gcm_table' under - 'u_mode.gcm'. - * configure.ac (pclmulsupport, gcry_cv_gcc_inline_asm_pclmul): New. - * src/g10lib.h (HWF_INTEL_PCLMUL): New. - * src/global.c: Add "intel-pclmul". - * src/hwf-x86.c (detect_x86_gnuc): Add check for Intel PCLMUL. - - GCM: GHASH optimizations. - * cipher/cipher-gcm.c [GCM_USE_TABLES] (gcmR, ghash): Replace with new. - [GCM_USE_TABLES] [GCM_TABLES_USE_U64] (bshift, fillM, do_ghash): New. - [GCM_USE_TABLES] [!GCM_TABLES_USE_U64] (bshift, fillM): Replace with - new. - [GCM_USE_TABLES] [!GCM_TABLES_USE_U64] (do_ghash): New. - (_gcry_cipher_gcm_tag): Remove extra memcpy to outbuf and use - buf_eq_const for comparing authentication tag. - * cipher/cipher-internal.h (gcry_cipher_handle): Different 'gcm_table' - for 32-bit and 64-bit platforms. - - Add some documentation for GCM mode. - * doc/gcrypt.texi: Add mention of GCM mode. - -2013-11-19 Dmitry Eremin-Solenikov - - Initial implementation of GCM. - * cipher/Makefile.am: Add 'cipher-gcm.c'. - * cipher/cipher-ccm.c (_gcry_ciphert_ccm_set_lengths) - (_gcry_cipher_ccm_authenticate, _gcry_cipher_ccm_tag) - (_gcry_cipher_ccm_encrypt, _gcry_cipher_ccm_decrypt): Change - 'c->u_mode.ccm.tag' to 'c->marks.tag'. - * cipher/cipher-gcm.c: New. - * cipher/cipher-internal.h (GCM_USE_TABLES): New. - (gcry_cipher_handle): Add 'marks.tag', 'u_tag', 'length' and - 'gcm_table'; Remove 'u_mode.ccm.tag'. - (_gcry_cipher_gcm_encrypt, _gcry_cipher_gcm_decrypt) - (_gcry_cipher_gcm_setiv, _gcry_cipher_gcm_authenticate) - (_gcry_cipher_gcm_get_tag, _gcry_cipher_gcm_check_tag): New. - * cipher/cipher.c (_gcry_cipher_open_internal, cipher_setkey) - (cipher_encrypt, cipher_decrypt, _gcry_cipher_authenticate) - (_gcry_cipher_gettag, _gcry_cipher_checktag): Add GCM mode handling. - * src/gcrypt.h.in (gcry_cipher_modes): Add GCRY_CIPHER_MODE_GCM. - (GCRY_GCM_BLOCK_LEN): New. - * tests/basic.c (check_gcm_cipher): New. - (check_ciphers): Add GCM check. - (check_cipher_modes): Call 'check_gcm_cipher'. - * tests/bench-slope.c (bench_gcm_encrypt_do_bench) - (bench_gcm_decrypt_do_bench, bench_gcm_authenticate_do_bench) - (gcm_encrypt_ops, gcm_decrypt_ops, gcm_authenticate_ops): New. - (cipher_modes): Add GCM enc/dec/auth. - (cipher_bench_one): Limit GCM to block ciphers with 16 byte block-size. - * tests/benchmark.c (cipher_bench): Add GCM. - -2013-11-19 Jussi Kivilinna - - Camellia: fix compiler warning. - * cipher/camellia-glue.c (camellia_setkey): Use braces around empty if - statement. - - Tweak Camellia-AVX key-setup for small speed-up. - * cipher/camellia-aesni-avx-amd64.S (camellia_f): Merge S-function output - rotation with P-function. - - Add CMAC (Cipher-based MAC) to MAC API. - * cipher/Makefile.am: Add 'cipher-cmac.c' and 'mac-cmac.c'. - * cipher/cipher-cmac.c: New. - * cipher/cipher-internal.h (gcry_cipher_handle.u_mode): Add 'cmac'. - * cipher/cipher.c (gcry_cipher_open): Rename to... - (_gcry_cipher_open_internal): ...this and add CMAC. - (gcry_cipher_open): New wrapper that disallows use of internal - modes (CMAC) from outside. - (cipher_setkey, cipher_encrypt, cipher_decrypt) - (_gcry_cipher_authenticate, _gcry_cipher_gettag) - (_gcry_cipher_checktag): Add handling for CMAC mode. - (cipher_reset): Do not reset 'marks.key' and do not clear subkeys in - 'u_mode' in CMAC mode. - * cipher/mac-cmac.c: New. - * cipher/mac-internal.h: Add CMAC support and algorithms. - * cipher/mac.c: Add CMAC algorithms. - * doc/gcrypt.texi: Add documentation for CMAC. - * src/cipher.h (gcry_cipher_internal_modes): New. - (_gcry_cipher_open_internal, _gcry_cipher_cmac_authenticate) - (_gcry_cipher_cmac_get_tag, _gcry_cipher_cmac_check_tag) - (_gcry_cipher_cmac_set_subkeys): New prototypes. - * src/gcrypt.h.in (gcry_mac_algos): Add CMAC algorithms. - * tests/basic.c (check_mac): Add CMAC test vectors. - -2013-11-16 Jussi Kivilinna - - Add new MAC API, initially with HMAC. - * cipher/Makefile.am: Add 'mac.c', 'mac-internal.h' and 'mac-hmac.c'. - * cipher/bufhelp.h (buf_eq_const): New. - * cipher/cipher-ccm.c (_gcry_cipher_ccm_tag): Use 'buf_eq_const' for - constant-time compare. - * cipher/mac-hmac.c: New. - * cipher/mac-internal.h: New. - * cipher/mac.c: New. - * doc/gcrypt.texi: Add documentation for MAC API. - * src/gcrypt-int.h [GPG_ERROR_VERSION_NUMBER < 1.13] - (GPG_ERR_MAC_ALGO): New. - * src/gcrypt.h.in (gcry_mac_handle, gcry_mac_hd_t, gcry_mac_algos) - (gcry_mac_flags, gcry_mac_open, gcry_mac_close, gcry_mac_ctl) - (gcry_mac_algo_info, gcry_mac_setkey, gcry_mac_setiv, gcry_mac_write) - (gcry_mac_read, gcry_mac_verify, gcry_mac_get_algo_maclen) - (gcry_mac_get_algo_keylen, gcry_mac_algo_name, gcry_mac_map_name) - (gcry_mac_reset, gcry_mac_test_algo): New. - * src/libgcrypt.def (gcry_mac_open, gcry_mac_close, gcry_mac_ctl) - (gcry_mac_algo_info, gcry_mac_setkey, gcry_mac_setiv, gcry_mac_write) - (gcry_mac_read, gcry_mac_verify, gcry_mac_get_algo_maclen) - (gcry_mac_get_algo_keylen, gcry_mac_algo_name, gcry_mac_map_name): New. - * src/libgcrypt.vers (gcry_mac_open, gcry_mac_close, gcry_mac_ctl) - (gcry_mac_algo_info, gcry_mac_setkey, gcry_mac_setiv, gcry_mac_write) - (gcry_mac_read, gcry_mac_verify, gcry_mac_get_algo_maclen) - (gcry_mac_get_algo_keylen, gcry_mac_algo_name, gcry_mac_map_name): New. - * src/visibility.c (gcry_mac_open, gcry_mac_close, gcry_mac_ctl) - (gcry_mac_algo_info, gcry_mac_setkey, gcry_mac_setiv, gcry_mac_write) - (gcry_mac_read, gcry_mac_verify, gcry_mac_get_algo_maclen) - (gcry_mac_get_algo_keylen, gcry_mac_algo_name, gcry_mac_map_name): New. - * src/visibility.h (gcry_mac_open, gcry_mac_close, gcry_mac_ctl) - (gcry_mac_algo_info, gcry_mac_setkey, gcry_mac_setiv, gcry_mac_write) - (gcry_mac_read, gcry_mac_verify, gcry_mac_get_algo_maclen) - (gcry_mac_get_algo_keylen, gcry_mac_algo_name, gcry_mac_map_name): New. - * tests/basic.c (check_one_mac, check_mac): New. - (main): Call 'check_mac'. - * tests/bench-slope.c (bench_print_header, bench_print_footer): Allow - variable algorithm name width. - (_cipher_bench, hash_bench): Update to above change. - (bench_hash_do_bench): Add 'gcry_md_reset'. - (bench_mac_mode, bench_mac_init, bench_mac_free, bench_mac_do_bench) - (mac_ops, mac_modes, mac_bench_one, _mac_bench, mac_bench): New. - (main): Add 'mac' benchmark options. - * tests/benchmark.c (mac_repetitions, mac_bench): New. - (main): Add 'mac' benchmark options. - - Use correct blocksize of 32 bytes for GOSTR3411-94 HMAC. - * cipher/md.c (md_open): Set macpads_Bsize to 32 for - GCRY_MD_GOST24311_94. - -2013-11-15 Jussi Kivilinna - - cipher: use size_t for internal buffer lengths. - * cipher/arcfour.c (do_encrypt_stream, encrypt_stream): Use 'size_t' - for buffer lengths. - * cipher/blowfish.c (_gcry_blowfish_ctr_enc, _gcry_blowfish_cbc_dec) - (_gcry_blowfish_cfb_dec): Ditto. - * cipher/camellia-glue.c (_gcry_camellia_ctr_enc) - (_gcry_camellia_cbc_dec, _gcry_blowfish_cfb_dec): Ditto. - * cipher/cast5.c (_gcry_cast5_ctr_enc, _gcry_cast5_cbc_dec) - (_gcry_cast5_cfb_dec): Ditto. - * cipher/cipher-aeswrap.c (_gcry_cipher_aeswrap_encrypt) - (_gcry_cipher_aeswrap_decrypt): Ditto. - * cipher/cipher-cbc.c (_gcry_cipher_cbc_encrypt) - (_gcry_cipher_cbc_decrypt): Ditto. - * cipher/cipher-ccm.c (_gcry_cipher_ccm_encrypt) - (_gcry_cipher_ccm_decrypt): Ditto. - * cipher/cipher-cfb.c (_gcry_cipher_cfb_encrypt) - (_gcry_cipher_cfb_decrypt): Ditto. - * cipher/cipher-ctr.c (_gcry_cipher_ctr_encrypt): Ditto. - * cipher/cipher-internal.h (gcry_cipher_handle->bulk) - (_gcry_cipher_cbc_encrypt, _gcry_cipher_cbc_decrypt) - (_gcry_cipher_cfb_encrypt, _gcry_cipher_cfb_decrypt) - (_gcry_cipher_ofb_encrypt, _gcry_cipher_ctr_encrypt) - (_gcry_cipher_aeswrap_encrypt, _gcry_cipher_aeswrap_decrypt) - (_gcry_cipher_ccm_encrypt, _gcry_cipher_ccm_decrypt): Ditto. - * cipher/cipher-ofb.c (_gcry_cipher_cbc_encrypt): Ditto. - * cipher/cipher-selftest.h (gcry_cipher_bulk_cbc_dec_t) - (gcry_cipher_bulk_cfb_dec_t, gcry_cipher_bulk_ctr_enc_t): Ditto. - * cipher/cipher.c (cipher_setkey, cipher_setiv, do_ecb_crypt) - (do_ecb_encrypt, do_ecb_decrypt, cipher_encrypt) - (cipher_decrypt): Ditto. - * cipher/rijndael.c (_gcry_aes_ctr_enc, _gcry_aes_cbc_dec) - (_gcry_aes_cfb_dec, _gcry_aes_cbc_enc, _gcry_aes_cfb_enc): Ditto. - * cipher/salsa20.c (salsa20_setiv, salsa20_do_encrypt_stream) - (salsa20_encrypt_stream, salsa20r12_encrypt_stream): Ditto. - * cipher/serpent.c (_gcry_serpent_ctr_enc, _gcry_serpent_cbc_dec) - (_gcry_serpent_cfb_dec): Ditto. - * cipher/twofish.c (_gcry_twofish_ctr_enc, _gcry_twofish_cbc_dec) - (_gcry_twofish_cfb_dec): Ditto. - * src/cipher-proto.h (gcry_cipher_stencrypt_t) - (gcry_cipher_stdecrypt_t, cipher_setiv_fuct_t): Ditto. - * src/cipher.h (_gcry_aes_cfb_enc, _gcry_aes_cfb_dec) - (_gcry_aes_cbc_enc, _gcry_aes_cbc_dec, _gcry_aes_ctr_enc) - (_gcry_blowfish_cfb_dec, _gcry_blowfish_cbc_dec) - (_gcry_blowfish_ctr_enc, _gcry_cast5_cfb_dec, _gcry_cast5_cbc_dec) - (_gcry_cast5_ctr_enc, _gcry_camellia_cfb_dec, _gcry_camellia_cbc_dec) - (_gcry_camellia_ctr_enc, _gcry_serpent_cfb_dec, _gcry_serpent_cbc_dec) - (_gcry_serpent_ctr_enc, _gcry_twofish_cfb_dec, _gcry_twofish_cbc_dec) - (_gcry_twofish_ctr_enc): Ditto. - - Camellia: Add AVX/AES-NI key setup. - * cipher/camellia-aesni-avx-amd64.S (key_bitlength, key_table): New - order of fields in ctx. - (camellia_f, vec_rol128, vec_ror128): New macros. - (__camellia_avx_setup128, __camellia_avx_setup256) - (_gcry_camellia_aesni_avx_keygen): New functions. - * cipher/camellia-aesni-avx2-amd64.S (key_bitlength, key_table): New - order of fields in ctx. - * cipher/camellia-arm.S (CAMELLIA_TABLE_BYTE_LEN, key_length): Remove - unused macros. - * cipher/camellia-glue.c (CAMELLIA_context): Move keytable to head for - better alignment; Make 'use_aesni_avx' and 'use_aesni_avx2' bitfield - members. - [USE_AESNI_AVX] (_gcry_camellia_aesni_avx_keygen): New prototype. - (camellia_setkey) [USE_AESNI_AVX || USE_AESNI_AVX2]: Read hw features - to variable 'hwf' and match features from it. - (camellia_setkey) [USE_AESNI_AVX]: Use AES-NI/AVX key setup if - available. - - Avoid unneeded stack burning with AES-NI and reduce number of 'decryption_prepared' checks - * cipher/rijndael.c (RIJNDAEL_context): Make 'decryption_prepared', - 'use_padlock' and 'use_aesni' 1-bit members in bitfield. - (do_setkey): Move 'hwfeatures' inside [USE_AESNI || USE_PADLOCK]. - (do_aesni_enc_aligned): Rename to... - (do_aesni_enc): ...this, as function does not require aligned input. - (do_aesni_dec_aligned): Rename to... - (do_aesni_dec): ...this, as function does not require aligned input. - (do_aesni): Remove. - (rijndael_encrypt): Call 'do_aesni_enc' instead of 'do_aesni'. - (rijndael_decrypt): Call 'do_aesni_dec' instead of 'do_aesni'. - (check_decryption_preparation): New. - (do_decrypt): Remove 'decryption_prepared' check. - (rijndael_decrypt): Ditto and call 'check_decryption_preparation'. - (_gcry_aes_cbc_dec): Ditto. - (_gcry_aes_cfb_enc): Add 'burn_depth' and burn stack only when needed. - (_gcry_aes_cbc_enc): Ditto. - (_gcry_aes_ctr_enc): Ditto. - (_gcry_aes_cfb_dec): Ditto. - (_gcry_aes_cbc_dec): Ditto and correct clearing of 'savebuf'. - -2013-11-14 Werner Koch - - md: Fix hashing for data >= 256 GB. - * cipher/hash-common.h (gcry_md_block_ctx): Add "nblocks_high". - * cipher/hash-common.c (_gcry_md_block_write): Bump NBLOCKS_HIGH. - * cipher/md4.c (md4_init, md4_final): Take care of NBLOCKS_HIGH. - * cipher/md5.c (md5_init, md5_final): Ditto. - * cipher/rmd160.c (_gcry_rmd160_init, rmd160_final): Ditto. - * cipher/sha1.c (sha1_init, sha1_final): Ditto. - * cipher/sha256.c (sha256_init, sha224_init, sha256_final): Ditto. - * cipher/sha512.c (sha512_init, sha384_init, sha512_final): Ditto. - * cipher/tiger.c (do_init, tiger_final): Ditto. - * cipher/whirlpool.c (whirlpool_final): Ditto. - - * cipher/md.c (gcry_md_algo_info): Add GCRYCTL_SELFTEST. - (_gcry_md_selftest): Return "not implemented" as required. - * tests/hashtest.c: New. - * tests/genhashdata.c: New. - * tests/Makefile.am (TESTS): Add hashtest. - (noinst_PROGRAMS): Add genhashdata - -2013-11-13 Christian Grothoff - - ecc: Fix key generation for a plain Ed25519 key. - * cipher/ecc.c (nist_generate_key): Use custom code for ED25519. - - ecc: Fix some memory leaks. - * cipher/ecc-curves.c (_gcry_mpi_ec_new): Free ec->b before assigning. - * cipher/ecc.c (nist_generate_key): Release Q. - * cipher/ecc-eddsa.c (_gcry_ecc_eddsa_genkey): Ditto. - -2013-11-11 Werner Koch - - ecc: Change keygrip computation for Ed25519+EdDSA. - * cipher/ecc.c (compute_keygrip): Rework. - * cipher/ecc-eddsa.c (_gcry_ecc_eddsa_ensure_compact): New. - * cipher/ecc-curves.c (_gcry_ecc_update_curve_param): New. - * tests/keygrip.c (key_grips): Add flag param and test cases for - Ed25519. - - mpi: Add special format GCRYMPI_FMT_OPAQUE. - * src/gcrypt.h.in (GCRYMPI_FMT_OPAQUE): New. - (_gcry_sexp_nth_opaque_mpi): Remove. - * src/sexp.c (gcry_sexp_nth_mpi): Add support for GCRYMPI_FMT_OPAQUE. - (_gcry_sexp_vextract_param): Replace removed function by - GCRYMPI_FMT_OPAQUE. - -2013-11-10 Jussi Kivilinna - - Fix error output in CTR selftest. - * cipher/cipher-selftest.c (_gcry_selftest_helper_ctr): Change - fprintf(stderr,...) to syslog(); Correct error output for bulk - IV check, plaintext mismatch => ciphertext mismatch. - -2013-11-09 Jussi Kivilinna - - Fix Serpent-AVX2 and Camellia-AVX2 counter modes. - * cipher/camellia-aesni-avx2-amd64.S - (_gcry_camellia_aesni_avx2_ctr_enc): Byte-swap before checking for - overflow handling. - * cipher/camellia-glue.c (selftest_ctr_128, selftest_cfb_128) - (selftest_cbc_128): Add 16 to nblocks. - * cipher/cipher-selftest.c (_gcry_selftest_helper_ctr): Add test with - non-overflowing IV and modify overflow IV to detect broken endianness - handling. - * cipher/serpent-avx2-amd64.S (_gcry_serpent_avx2_ctr_enc): Byte-swap - before checking for overflow handling; Fix crazy-mixed-endian IV - construction to big-endian. - * cipher/serpent.c (selftest_ctr_128, selftest_cfb_128) - (selftest_cbc_128): Add 8 to nblocks. - -2013-11-09 Sergey V - - cipher/gost28147: optimization: use precomputed S-box tables. - * cipher/gost.h (GOST28147_context): Remove unneeded subst and - subst_set members. - * cipher/gost28147.c (max): Remove unneeded macro. - (test_sbox): Replace with new precomputed tables. - (gost_set_subst): Remove function. - (gost_val): Use new S-box tables. - (gost_encrypt_block, gost_decrypt_block): Tweak to use new ctx and - S-box tables. - -2013-11-09 Jussi Kivilinna - - Fix tail handling for AES-NI counter mode. - * cipher/rijndael.c (do_aesni_ctr): Fix outputting of updated - counter-IV. - -2013-11-08 Werner Koch - - ecc: Improve gcry_pk_get_curve. - * cipher/ecc-curves.c (_gcry_ecc_fill_in_curve): Factor some code out - to .. - (find_domain_parms_idx): new. - (_gcry_ecc_get_curve): Find by curve name on error. - - cipher: Avoid signed divisions in idea.c. - * cipher/idea.c (mul_inv): Use unsigned division. - - ecc: Implement the "nocomp" flag for key generation. - * cipher/ecc.c (ecc_generate): Support the "nocomp" flag. - * tests/keygen.c (check_ecc_keys): Add a test for it. - - ecc: Make "noparam" the default and replace by "param". - * src/cipher.h (PUBKEY_FLAG_NOCOMP): New. - (PUBKEY_FLAG_NOPARAM): Remove. - (PUBKEY_FLAG_PARAM): New. - * cipher/pubkey-util.c (_gcry_pk_util_parse_flaglist): Support the new - flags and ignore the obsolete "noparam" flag. - * cipher/ecc-curves.c (_gcry_ecc_fill_in_curve): Return the curve name - also for curves selected by NBITS. - (_gcry_mpi_ec_new): Support the "param" flag. - * cipher/ecc.c (ecc_generate, ecc_sign, ecc_verify): Ditto. - * tests/keygen.c (check_ecc_keys): Remove the "noparam" flag. - -2013-11-07 Jussi Kivilinna - - Fix decryption function size in AES AMD64 assembly. - * cipher/rijndael-amd64.S (_gcry_aes_amd64_decrypt_block): Set '.size' - for '_gcry_aes_amd64_decrypt_block', not '..._encrypt_block'. - - Change 64-bit shift to 32-bit in AES AMD64 assembly. - * cipher/rijndael-amd64.S (do16bit_shr): Change 'shrq' to 'shrl'. - -2013-11-06 Jussi Kivilinna - - Speed-up AES-NI key setup. - * cipher/rijndael.c [USE_AESNI] (m128i_t): Remove. - [USE_AESNI] (u128_t): New. - [USE_AESNI] (aesni_do_setkey): New. - (do_setkey) [USE_AESNI]: Move AES-NI accelerated key setup to - 'aesni_do_setkey'. - (do_setkey): Call _gcry_get_hw_features only once. Clear stack after - use in generic key setup part. - (rijndael_setkey): Remove stack burning. - (prepare_decryption) [USE_AESNI]: Use 'u128_t' instead of 'm128i_t' to - avoid compiler generated SSE2 instructions and XMM register usage, - unroll 'aesimc' setup loop - (prepare_decryption): Clear stack after use. - [USE_AESNI] (do_aesni_enc_aligned): Update comment about alignment. - (do_decrypt): Do not burning stack after prepare_decryption. - - Avoid burn stack in Arcfour setkey. - * cipher/arcfour.c (arcfour_setkey): Remove stack burning. - - Avoid burn_stack in CAST5 setkey. - * cipher/cast5.c (do_cast_setkey): Use wipememory instead of memset. - (cast_setkey): Remove stack burning. - - Improve Serpent key setup speed. - * cipher/serpent.c (SBOX, SBOX_INVERSE): Remove index argument. - (serpent_subkeys_generate): Use smaller temporary arrays for subkey - generation and perform stack clearing locally. - (serpent_setkey_internal): Use wipememory to clear stack and remove - _gcry_burn_stack. - (serpent_setkey): Remove unneeded _gcry_burn_stack. - - Modify encrypt/decrypt arguments for in-place. - * cipher/cipher.c (gcry_cipher_encrypt, gcry_cipher_decrypt): Modify - local arguments if in-place operation. - - Speed up Stribog. - * cipher/stribog.c (STRIBOG_TABLES): Remove. - (Pi): Remove. - [!STRIBOG_TABLES] (A, strido): Remove. - (stribog_table): New table pre-reordered with Pi values. - (strido): Rewrite for new table. - (LPSX): Rewrite for new table. - (xor): Remove. - (g): Small tweaks. - - Tweak AES-NI bulk CTR mode slightly. - * cipher/rijndael.c [USE_AESNI] (aesni_cleanup_2_5): Rename to... - (aesni_cleanup_2_6): ...this and clear also 'xmm6'. - [USE_AESNI && __i386__] (do_aesni_ctr, do_aesni_ctr_4): Prevent - inlining only on i386, allow on AMD64. - [USE_AESNI] (do_aesni_ctr, do_aesni_ctr_4): Use counter block from - 'xmm5' and byte-swap mask from 'xmm6'. - (_gcry_aes_ctr_enc) [USE_AESNI]: Preload counter block to 'xmm5' and - byte-swap mask to 'xmm6'. - (_gcry_aes_ctr_enc, _gcry_aes_cfb_dec, _gcry_aes_cbc_dec): Use - 'aesni_cleanup_2_6'. - - Tweak bench-slope parameters. - * tests/bench-slope.c (BUF_STEP_SIZE): Half step size to 64. - (NUM_MEASUREMENT_REPETITIONS): Double repetitions to 64. - - Optimize Blowfish weak key check. - * cipher/blowfish.c (hashset_elem, val_to_hidx, add_val): New. - (do_bf_setkey): Use faster algorithm for detecting weak keys. - (bf_setkey): Move stack burning to do_bf_setkey. - - Fix __builtin_bswap32/64 checks. - * configure.ac (gcry_cv_have_builtin_bswap32) - (gcry_cv_have_builtin_bswap64): Change compile checks to link checks. - - Fix 'u32' build error with Camellia. - * cipher/camellia.c: Add include for and "types.h". - (u32): Remove. - (u8): Typedef as 'byte'. - -2013-11-06 Werner Koch - - pubkey: Add forward compatibility feature. - * cipher/pubkey-util.c (_gcry_pk_util_parse_flaglist): Add - "igninvflag". - -2013-11-05 Werner Koch - - ecc: Require "eddsa" flag for curve Ed25519. - * src/cipher.h (PUBKEY_FLAG_ECDSA): Remove. - * cipher/pubkey-util.c (_gcry_pk_util_parse_flaglist): Remove "ecdsa". - * cipher/ecc.c (ecc_generate, ecc_sign, ecc_verify): Require "eddsa" flag. - * cipher/ecc-misc.c (_gcry_ecc_compute_public): Depend "eddsa" flag. - * tests/benchmark.c, tests/keygen.c, tests/pubkey.c - * tests/t-ed25519.c, tests/t-mpi-point.c: Adjust for changed flags. - - ecc: Fully implement Ed25519 compression in ECDSA mode. - * src/ec-context.h (mpi_ec_ctx_s): Add field FLAGS. - * mpi/ec.c (ec_p_init): Add arg FLAGS. Change all callers to pass it. - * cipher/ecc-curves.c (point_from_keyparam): Add arg EC, parse as - opaque mpi and use eddsa decoding depending on the flag. - (_gcry_mpi_ec_new): Rearrange to parse Q and D after knowing the - curve. - - mpi: Add function gcry_mpi_set_opaque_copy. - * src/gcrypt.h.in (gcry_mpi_set_opaque_copy): New. - * src/visibility.c (gcry_mpi_set_opaque_copy): New. - * src/visibility.h (gcry_mpi_set_opaque_copy): Mark visible. - * src/libgcrypt.def, src/libgcrypt.vers: Add new API. - * tests/mpitests.c (test_opaque): Add test. - -2013-11-04 Jussi Kivilinna - - Make test vectors 'static const' - * cipher/arcfour.c (selftest): Change test vectors to 'static const'. - * cipher/blowfish.c (selftest): Ditto. - * cipher/camellia-glue.c (selftest): Ditto. - * cipher/cast5.c (selftest): Ditto. - * cipher/des.c (selftest): Ditto. - * cipher/rijndael.c (selftest): Ditto. - * tests/basic.c (cipher_cbc_mac_cipher, check_aes128_cbc_cts_cipher) - (check_ctr_cipher, check_cfb_cipher, check_ofb_cipher) - (check_ccm_cipher, check_stream_cipher) - (check_stream_cipher_large_block, check_bulk_cipher_modes) - (check_ciphers, check_digests, check_hmac, check_pubkey_sign) - (check_pubkey_sign_ecdsa, check_pubkey_crypt, check_pubkey): Ditto. - -2013-11-03 Jussi Kivilinna - - Make jump labels local in Salsa20 assembly. - * cipher/salsa20-amd64.S: Rename '._labels' to '.L_labels'. - * cipher/salsa20-armv7-neon.S: Ditto. - -2013-10-30 Jussi Kivilinna - - bithelp: fix undefined behaviour with rol and ror. - * cipher/bithelp.h (rol, ror): Mask shift with 31. - -2013-10-29 Werner Koch - - tests: Add feature to skip benchmarks. - * tests/benchmark.c (main): Add feature to skip the test. - * tests/bench-slope.c (main): Ditto. - (get_slope): Repace C++ style comment. - (double_cmp, cipher_bench, _hash_bench): Repalce system reserved - symbols. - - ecc: Finish Ed25519/ECDSA hack. - * cipher/ecc.c (ecc_generate): Fix Ed25519/ECDSA case. - (ecc_verify): Implement ED25519/ECDSA uncompression. - - ecc: Add flags "noparam" and "comp". - * src/cipher.h (PUBKEY_FLAG_NOPARAM, PUBKEY_FLAG_COMP): New. - * cipher/pubkey-util.c (_gcry_pk_util_parse_flaglist): Parse new flags - and change code for possible faster parsing. - * cipher/ecc.c (ecc_generate): Implement the "noparam" flag. - (ecc_sign): Ditto. - (ecc_verify): Ditto. - * tests/keygen.c (check_ecc_keys): Use the "noparam" flag. - - * cipher/ecc.c (ecc_generate): Fix parsing of the deprecated - transient-flag parameter. - (ecc_verify): Do not make Q optional in the extract-param call. - -2013-10-28 Jussi Kivilinna - - Fix typos in documentation. - * doc/gcrypt.texi: Fix some typos. - - Add ARM NEON assembly implementation of Serpent. - * cipher/Makefile.am: Add 'serpent-armv7-neon.S'. - * cipher/serpent-armv7-neon.S: New. - * cipher/serpent.c (USE_NEON): New macro. - (serpent_context_t) [USE_NEON]: Add 'use_neon'. - [USE_NEON] (_gcry_serpent_neon_ctr_enc, _gcry_serpent_neon_cfb_dec) - (_gcry_serpent_neon_cbc_dec): New prototypes. - (serpent_setkey_internal) [USE_NEON]: Detect NEON support. - (_gcry_serpent_neon_ctr_enc, _gcry_serpent_neon_cfb_dec) - (_gcry_serpent_neon_cbc_dec) [USE_NEON]: Use NEON implementations - to process eight blocks in parallel. - * configure.ac [neonsupport]: Add 'serpent-armv7-neon.lo'. - - Add ARM NEON assembly implementation of Salsa20. - * cipher/Makefile.am: Add 'salsa20-armv7-neon.S'. - * cipher/salsa20-armv7-neon.S: New. - * cipher/salsa20.c [USE_ARM_NEON_ASM]: New macro. - (struct SALSA20_context_s, salsa20_core_t, salsa20_keysetup_t) - (salsa20_ivsetup_t): New. - (SALSA20_context_t) [USE_ARM_NEON_ASM]: Add 'use_neon'. - (SALSA20_context_t): Add 'keysetup', 'ivsetup' and 'core'. - (salsa20_core): Change 'src' argument to 'ctx'. - [USE_ARM_NEON_ASM] (_gcry_arm_neon_salsa20_encrypt): New prototype. - [USE_ARM_NEON_ASM] (salsa20_core_neon, salsa20_keysetup_neon) - (salsa20_ivsetup_neon): New. - (salsa20_do_setkey): Setup keysetup, ivsetup and core with default - functions. - (salsa20_do_setkey) [USE_ARM_NEON_ASM]: When NEON support detect, - set keysetup, ivsetup and core with ARM NEON functions. - (salsa20_do_setkey): Call 'ctx->keysetup'. - (salsa20_setiv): Call 'ctx->ivsetup'. - (salsa20_do_encrypt_stream) [USE_ARM_NEON_ASM]: Process large buffers - in ARM NEON implementation. - (salsa20_do_encrypt_stream): Call 'ctx->core' instead of directly - calling 'salsa20_core'. - (selftest): Add test to check large buffer processing and block counter - updating. - * configure.ac [neonsupport]: 'Add salsa20-armv7-neon.lo'. - - Add AMD64 assembly implementation of Salsa20. - * cipher/Makefile.am: Add 'salsa20-amd64.S'. - * cipher/salsa20-amd64.S: New. - * cipher/salsa20.c (USE_AMD64): New macro. - [USE_AMD64] (_gcry_salsa20_amd64_keysetup, _gcry_salsa20_amd64_ivsetup) - (_gcry_salsa20_amd64_encrypt_blocks): New prototypes. - [USE_AMD64] (salsa20_keysetup, salsa20_ivsetup, salsa20_core): New. - [!USE_AMD64] (salsa20_core): Change 'src' to non-constant, update block - counter in 'salsa20_core' and return burn stack depth. - [!USE_AMD64] (salsa20_keysetup, salsa20_ivsetup): New. - (salsa20_do_setkey): Move generic key setup to 'salsa20_keysetup'. - (salsa20_setkey): Fix burn stack depth. - (salsa20_setiv): Move generic IV setup to 'salsa20_ivsetup'. - (salsa20_do_encrypt_stream) [USE_AMD64]: Process large buffers in AMD64 - implementation. - (salsa20_do_encrypt_stream): Move stack burning to this function... - (salsa20_encrypt_stream, salsa20r12_encrypt_stream): ...from these - functions. - * configure.ac [x86-64]: Add 'salsa20-amd64.lo'. - - Add new benchmarking utility, bench-slope. - * tests/Makefile.am (TESTS): Add 'bench-slope'. - * tests/bench-slope.c: New. - - Change .global to .globl in assembly files. - * cipher/blowfish-arm.S: Change '.global' to '.globl'. - * cipher/camellia-aesni-avx-amd64.S: Ditto. - * cipher/camellia-aesni-avx2-amd64.S: Ditto. - * cipher/camellia-arm.S: Ditto. - * cipher/cast5-amd64.S: Ditto. - * cipher/rijndael-amd64.S: Ditto. - * cipher/rijndael-arm.S: Ditto. - * cipher/serpent-avx2-amd64.S: Ditto. - * cipher/serpent-sse2-amd64.S: Ditto. - * cipher/twofish-amd64.S: Ditto. - * cipher/twofish-arm.S: Ditto. - -2013-10-26 Jussi Kivilinna - - Deduplicate code for ECB encryption and decryption. - * cipher/cipher.c (do_ecb_crypt): New, based on old 'do_ecb_encrypt'. - (do_ecb_encrypt): Use 'do_ecb_crypt', pass encryption function. - (do_ecb_decrypt): Use 'do_ecb_crypt', pass decryption function. - -2013-10-26 Dmitry Eremin-Solenikov - - Drop _gcry_cipher_ofb_decrypt as it duplicates _gcry_cipher_ofb_encrypt. - * cipher/cipher.c (cipher_decrypt): Use _gcry_cipher_ofb_encrypt for OFB - decryption. - * cipher/cipher-internal.h: Remove _gcry_cipher_ofb_decrypt declaration. - * cipher/cipher-ofb.c (_gcry_cipher_ofb_decrypt): Remove. - (_gcry_cipher_ofb_encrypt): remove copying of IV to lastiv, it's - unused there. - -2013-10-25 Werner Koch - - tests: Add tests for mpi_cmp. - * tests/mpitests.c (die): Modernize. - (fail): New. - (test_opaque, test_add, test_sub, test_mul): Use gcry_log_xx - (main): Return error count. - (test_cmp): New. - -2013-10-24 Werner Koch - - ecc: Change algorithm for Ed25519 x recovery. - * cipher/ecc-eddsa.c (scanval): Add as temporary hack. - (_gcry_ecc_eddsa_recover_x): Use the algorithm from page 15 of the - paper. Return an error code. - (_gcry_ecc_eddsa_decodepoint): Take care of the error code. - * mpi/mpi-mul.c (gcry_mpi_mulm): Use truncated division. - - ecc: Refactor _gcry_ecc_eddsa_decodepoint. - * cipher/ecc-eddsa.c (_gcry_ecc_eddsa_decodepoint): Factor some code - out to .. - (_gcry_ecc_eddsa_recover_x): new. - -2013-10-24 Jussi Kivilinna - - ecc-gost: Add missing include. - * ecc-gost.c: Include "pubkey-internal.h". - -2013-10-23 Jussi Kivilinna - - Replace architecture specific fast_wipememory2 with generic. - * src/g10lib.h (fast_wipememory2): Remove architecture specific - implementations and add generic implementation. - - Improve the speed of the cipher mode code. - * cipher/bufhelp.h (buf_cpy): New. - (buf_xor, buf_xor_2dst): If buffers unaligned, always jump to per-byte - processing. - (buf_xor_n_copy_2): New. - (buf_xor_n_copy): Use 'buf_xor_n_copy_2'. - * cipher/blowfish.c (_gcry_blowfish_cbc_dec): Avoid extra memory copy - and use new 'buf_xor_n_copy_2'. - * cipher/camellia-glue.c (_gcry_camellia_cbc_dec): Ditto. - * cipher/cast5.c (_gcry_cast_cbc_dec): Ditto. - * cipher/serpent.c (_gcry_serpent_cbc_dec): Ditto. - * cipher/twofish.c (_gcry_twofish_cbc_dec): Ditto. - * cipher/rijndael.c (_gcry_aes_cbc_dec): Ditto. - (do_encrypt, do_decrypt): Use 'buf_cpy' instead of 'memcpy'. - (_gcry_aes_cbc_enc): Avoid copying IV, use 'last_iv' pointer instead. - * cipher/cipher-cbc.c (_gcry_cipher_cbc_encrypt): Avoid copying IV, - update pointer to IV instead. - (_gcry_cipher_cbc_decrypt): Avoid extra memory copy and use new - 'buf_xor_n_copy_2'. - (_gcry_cipher_cbc_encrypt, _gcry_cipher_cbc_decrypt): Avoid extra - accesses to c->spec, use 'buf_cpy' instead of memcpy. - * cipher/cipher-ccm.c (do_cbc_mac): Ditto. - * cipher/cipher-cfb.c (_gcry_cipher_cfb_encrypt) - (_gcry_cipher_cfb_decrypt): Ditto. - * cipher/cipher-ctr.c (_gcry_cipher_ctr_encrypt): Ditto. - * cipher/cipher-ofb.c (_gcry_cipher_ofb_encrypt) - (_gcry_cipher_ofb_decrypt): Ditto. - * cipher/cipher.c (do_ecb_encrypt, do_ecb_decrypt): Ditto. - - bufhelp: enable unaligned memory accesses for AArch64 (64-bit ARM) - * cipher/bufhelp.h [__aarch64__] (BUFHELP_FAST_UNALIGNED_ACCESS): Set - macro on AArch64. - -2013-10-23 Dmitry Eremin-Solenikov - - Enable assembler optimizations on earlier ARM cores. - * cipher/blowfish-armv6.S => cipher/blowfish-arm.S: adapt to pre-armv6 CPUs. - * cipher/blowfish.c: enable assembly on armv4/armv5 little-endian CPUs. - * cipher/camellia-armv6.S => cipher/camellia-arm.S: adapt to pre-armv6 CPUs. - * cipher/camellia.c, cipher-camellia-glue.c: enable assembly on armv4/armv5 - little-endian CPUs. - * cipher/cast5-armv6.S => cipher/cast5-arm.S: adapt to pre-armv6 CPUs. - * cipher/cast5.c: enable assembly on armv4/armv5 little-endian CPUs. - * cipher/rijndael-armv6.S => cipher/rijndael-arm.S: adapt to pre-armv6 CPUs. - * cipher/rijndael.c: enable assembly on armv4/armv5 little-endian CPUs. - * cipher/twofish-armv6.S => cipher/twofish-arm.S: adapt to pre-armv6 CPUs. - * cipher/twofish.c: enable assembly on armv4/armv5 little-endian CPUs. - - mpi: enable assembler on all arm architectures. - * mpi/config.links: remove check for arm >= v6 - * mpi/armv6 => mpi/arm: rename directory to reflect that is is generic - enough - - Correct ASM assembly test in configure.ac. - * configure.ac: correct HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS test to - require neither ARMv6, nor thumb mode. Our assembly code works - perfectly even on ARMv4 now. - -2013-10-23 Werner Koch - - ecc: Refactor ecc.c. - * cipher/ecc-ecdsa.c, cipher/ecc-eddsa.c, cipher/ecc-gost.c: New. - * cipher/Makefile.am (EXTRA_libcipher_la_SOURCES): Add new files. - * configure.ac (GCRYPT_PUBKEY_CIPHERS): Add new files. - * cipher/ecc.c (point_init, point_free): Move to ecc-common.h. - (sign_ecdsa): Move to ecc-ecdsa.c as _gcry_ecc_ecdsa_sign. - (verify_ecdsa): Move to ecc-ecdsa.c as _gcry_ecc_ecdsa_verify. - (sign_gost): Move to ecc-gots.c as _gcry_ecc_gost_sign. - (verify_gost): Move to ecc-gost.c as _gcry_ecc_gost_verify. - (sign_eddsa): Move to ecc-eddsa.c as _gcry_ecc_eddsa_sign. - (verify_eddsa): Move to ecc-eddsa.c as _gcry_ecc_eddsa_verify. - (eddsa_generate_key): Move to ecc-eddsa.c as _gcry_ecc_eddsa_genkey. - (reverse_buffer): Move to ecc-eddsa.c. - (eddsa_encodempi, eddsa_encode_x_y): Ditto. - (_gcry_ecc_eddsa_encodepoint, _gcry_ecc_eddsa_decodepoint): Ditto. - - mpi: Fix scanning of negative SSH formats and add more tests. - * mpi/mpicoder.c (gcry_mpi_scan): Fix sign setting for SSH format. - * tests/t-convert.c (negative_zero): Test all formats. - (check_formats): Add tests for PGP and scan tests for SSH and USG. - - * src/gcrypt.h.in (mpi_is_neg): Fix macro. - - * mpi/mpi-scan.c (_gcry_mpi_getbyte, _gcry_mpi_putbyte): Comment out - these unused functions. - -2013-10-22 Jussi Kivilinna - - twofish: add ARMv6 assembly implementation. - * cipher/Makefile.am: Add 'twofish-armv6.S'. - * cipher/twofish-armv6.S: New. - * cipher/twofish.c (USE_ARMV6_ASM): New macro. - [USE_ARMV6_ASM] (_gcry_twofish_armv6_encrypt_block) - (_gcry_twofish_armv6_decrypt_block): New prototypes. - [USE_AMDV6_ASM] (twofish_encrypt, twofish_decrypt): Add. - [USE_AMD64_ASM] (do_twofish_encrypt, do_twofish_decrypt): Remove. - (_gcry_twofish_ctr_enc, _gcry_twofish_cfb_dec): Use 'twofish_encrypt' - instead of 'do_twofish_encrypt'. - (_gcry_twofish_cbc_dec): Use 'twofish_decrypt' instead of - 'do_twofish_decrypt'. - * configure.ac [arm]: Add 'twofish-armv6.lo'. - - mpi: allow building with clang on ARM. - * mpi/longlong.h [__arm__] (add_ssaaaa, sub_ddmmss, umul_ppmm) - (count_leading_zeros): Do not cast assembly output arguments. - [__arm__] (umul_ppmm): Remove the extra '%' ahead of assembly comment. - [_ARM_ARCH >= 4] (umul_ppmm): Use correct inputs and outputs instead of - registers. - - serpent-amd64: do not use GAS macros. - * cipher/serpent-avx2-amd64.S: Remove use of GAS macros. - * cipher/serpent-sse2-amd64.S: Ditto. - * configure.ac [HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS]: Do not check - for GAS macros. - - Add Counter with CBC-MAC mode (CCM) - * cipher/Makefile.am: Add 'cipher-ccm.c'. - * cipher/cipher-ccm.c: New. - * cipher/cipher-internal.h (gcry_cipher_handle): Add 'u_mode'. - (_gcry_cipher_ccm_encrypt, _gcry_cipher_ccm_decrypt) - (_gcry_cipher_ccm_set_nonce, _gcry_cipher_ccm_authenticate) - (_gcry_cipher_ccm_get_tag, _gcry_cipher_ccm_check_tag) - (_gcry_cipher_ccm_set_lengths): New prototypes. - * cipher/cipher.c (gcry_cipher_open, cipher_encrypt, cipher_decrypt) - (_gcry_cipher_setiv, _gcry_cipher_authenticate, _gcry_cipher_gettag) - (_gcry_cipher_checktag, gry_cipher_ctl): Add handling for CCM mode. - * doc/gcrypt.texi: Add documentation for GCRY_CIPHER_MODE_CCM. - * src/gcrypt.h.in (gcry_cipher_modes): Add 'GCRY_CIPHER_MODE_CCM'. - (gcry_ctl_cmds): Add 'GCRYCTL_SET_CCM_LENGTHS'. - (GCRY_CCM_BLOCK_LEN): New. - * tests/basic.c (check_ccm_cipher): New. - (check_cipher_modes): Call 'check_ccm_cipher'. - * tests/benchmark.c (ccm_aead_init): New. - (cipher_bench): Add handling for AEAD modes and add CCM benchmarking. - - Add API to support AEAD cipher modes. - * cipher/cipher.c (_gcry_cipher_authenticate, _gcry_cipher_checktag) - (_gcry_cipher_gettag): New. - * doc/gcrypt.texi: Add documentation for new API functions. - * src/visibility.c (gcry_cipher_authenticate, gcry_cipher_checktag) - (gcry_cipher_gettag): New. - * src/gcrypt.h.in, src/visibility.h: add declarations of these - functions. - * src/libgcrypt.defs, src/libgcrypt.vers: export functions. - -2013-10-22 NIIBE Yutaka - - ecc: Correct compliant key generation for Edwards curves. - * cipher/ecc.c: Add case for Edwards curves. - -2013-10-17 Werner Koch - - tests: Add test options to keygen. - * tests/keygen.c (usage): New. - (main): Print usage info. Allow running just one algo. - - mpi: Do not clear the sign of the mpi_mod result. - * mpi/mpi-mod.c (_gcry_mpi_mod): Remove sign setting. - - ecc: Put the curve name again into the output of gcry_pk_genkey. - * cipher/ecc.c (ecc_generate): Use the correct var. Release - CURVE_FLAGS. - - ecc: Support Weierstrass curves in gcry_mpi_ec_curve_point. - * mpi/ec.c (_gcry_mpi_ec_curve_point): Support MPI_EC_WEIERSTRASS. - -2013-10-16 Jussi Kivilinna - - arcfour: more optimized version for non-i386 architectures. - * cipher/arcfour.c (ARCFOUR_context): Reorder members. - (do_encrypt_stream) [!__i386__]: Faster implementation for non-i386. - (do_arcfour_setkey): Avoid modulo operations. - - Avoid void* pointer arithmetic. - * tests/tsexp.c (check_extract_param): Cast void* pointers to char* - before doing arithmetics. - -2013-10-16 Dmitry Eremin-Solenikov - - ecc: Add support for GOST R 34.10-2001/-2012 signatures. - * src/cipher.h: define PUBKEY_FLAG_GOST - * cipher/ecc-curves.c: Add GOST2001-test and GOST2012-test curves - defined in standards. Typical applications would use either those - curves, or curves defined in RFC 4357 (will be added later). - * cipher/ecc.c (sign_gost, verify_gost): New. - (ecc_sign, ecc_verify): use sign_gost/verify_gost if PUBKEY_FLAG_GOST - is set. - (ecc_names): add "gost" for gost signatures. - * cipher/pubkey-util.c (_gcry_pk_util_parse_flaglist, - _gcry_pk_util_preparse_sigval): set PUBKEY_FLAG_GOST if gost flag - is present in s-exp. - * tests/benchmark.c (ecc_bench): also benchmark GOST signatures. - * tests/basic.c (check_pubkey): add two public keys from - GOST R 34.10-2012 standard. - (check_pubkey_sign_ecdsa): add two data sets to check gost signatures. - * tests/curves.c: correct N_CURVES as we now have 2 more curves. - - - Removed some comments from the new curve definitions in ecc-curves.c - to avoid line wrapping. Eventually we will develop a precompiler to - avoid parsing those hex strings. -wk - - Fix 256-bit ecdsa test key definition. - * tests/basic.c (check_pubkey): fix nistp256 testing key declaration - - add missing comma. - -2013-10-16 Werner Koch - - sexp: Add function gcry_sexp_extract_param. - * src/gcrypt.h.in (_GCRY_GCC_ATTR_SENTINEL): New. - (gcry_sexp_extract_param): New. - * src/visibility.c (gcry_sexp_extract_param): New. - * src/visibility.h (gcry_sexp_extract_param): Add hack to detect - internal use. - * cipher/pubkey-util.c (_gcry_pk_util_extract_mpis): Move and split - into ... - * src/sexp.c (_gcry_sexp_vextract_param) - (_gcry_sexp_extract_param): this. Change all callers. Add support for buffer - descriptors and a path option/ - - * tests/tsexp.c (die, hex2buffer, hex2mpi, hex2mpiopa): New. - (cmp_mpihex, cmp_bufhex): New. - (check_extract_param): New. - -2013-10-16 NIIBE Yutaka - - mpi: mpi-pow improvement. - * mpi/mpi-pow.c (gcry_mpi_powm): New implementation of left-to-right - k-ary exponentiation. - -2013-10-15 Werner Koch - - ecc: Support use of Ed25519 with ECDSA. - * src/cipher.h (PUBKEY_FLAG_ECDSA): New. - * cipher/pubkey-util.c (_gcry_pk_util_parse_flaglist): Add flag "ecdsa". - * cipher/ecc.c (verify_ecdsa, verify_eddsa): Remove some debug output. - (ecc_generate, ecc_sign, ecc_verify): Support Ed25519 with ECDSA. - * tests/keygen.c (check_ecc_keys): Create such a test key. - * tests/pubkey.c (fail, info, data_from_hex, extract_cmp_data): New. - Take from dsa-6979.c - (check_ed25519ecdsa_sample_key): new. - (main): Call new test. - -2013-10-14 Werner Koch - - pubkey: Support flags list in gcry_pk_genkey. - * src/cipher.h (PUBKEY_FLAG_TRANSIENT_KEY): New. - (PUBKEY_FLAG_USE_X931): New. - (PUBKEY_FLAG_USE_FIPS186): New. - (PUBKEY_FLAG_USE_FIPS186_2): New. - * cipher/pubkey-util.c (_gcry_pk_util_parse_flaglist): Rename from - parse_flags_list. Parse new flags. - * cipher/dsa.c (dsa_generate): Support flag list. - * cipher/ecc.c (ecc_generate): Ditto. - * cipher/rsa.c (rsa_generate): Ditto. - - pubkey: Remove duplicated flag parsing code. - * cipher/pubkey-util.c (_gcry_pk_util_preparse_encval) - (_gcry_pk_util_data_to_mpi): Factor flag parsing code out to .. - (parse_flag_list): New. - * src/cipher.h (PUBKEY_FLAG_RAW_FLAG): New. - - mpicalc: Accept lowercase hex digits. - * src/mpicalc.c (main): Test for lowercase hex digits. - -2013-10-11 Werner Koch - - pubkey: Move sexp parsing of remaining fucntions to the modules. - * cipher/pubkey.c (release_mpi_array): Remove. - (pubkey_check_secret_key): Remove. - (sexp_elements_extract): Remove. - (sexp_elements_extract_ecc): Remove. - (sexp_to_key): Remove. - (get_hash_algo): Remove. - (gcry_pk_testkey): Revamp. - (gcry_pk_get_curve): Revamp. - * cipher/rsa.c (rsa_check_secret_key): Revamp. - * cipher/elgamal.c (elg_check_secret_key): Revamp. - * cipher/dsa.c (dsa_check_secret_key): Revamp. - * cipher/ecc.c (ecc_check_secret_key): Revamp. - * cipher/ecc-curves.c: Include cipher.h and pubkey-internal.h - (_gcry_ecc_get_curve): Revamp. - - * cipher/pubkey-util.c (_gcry_pk_util_extract_mpis): Set passed and - used parameters on error to NULL. - - pubkey: Move sexp parsing for gcry_pk_decrypt to the modules. - * cipher/rsa.c (rsa_decrypt): Revamp. - * cipher/elgamal.c (elg_decrypt): Revamp. - * cipher/ecc.c (ecc_decrypt_raw): Revamp. - * cipher/pubkey.c (gcry_pk_decrypt): Simplify. - (sexp_to_enc): Remove. - * cipher/pubkey-util.c (_gcry_pk_util_preparse_encval): New. - - pubkey: Move sexp parsing for gcry_pk_encrypt to the modules. - * cipher/rsa.c (rsa_encrypt): Revamp. - * cipher/elgamal.c (elg_encrypt): Revamp. - * cipher/ecc.c (ecc_encrypt_raw): Revamp. - * cipher/pubkey.c (gcry_pk_encrypt): Simplify. - - * tests/basic.c (check_pubkey_crypt): Init plain, ciph, and data so - that they are initialized even after an encrypt failure. - - pubkey: Move sexp parsing for gcry_pk_sign to the modules. - * cipher/rsa.c (rsa_sign): Revamp. - * cipher/dsa.c (dsa_sign): Revamp. - * cipher/elgamal.c (elg_sign): Revamp. - * cipher/ecc.c (ecc_sign): Revamp. - * cipher/pubkey.c (gcry_pk_sign): Simplify. - -2013-10-10 Jussi Kivilinna - - Prevent tail call optimization with _gcry_burn_stack. - * configure.ac: New check, HAVE_GCC_ASM_VOLATILE_MEMORY. - * src/g10lib.h (_gcry_burn_stack): Rename to __gcry_burn_stack. - (__gcry_burn_stack_dummy): New. - (_gcry_burn_stack): New macro. - * src/misc.c (_gcry_burn_stack): Rename to __gcry_burn_stack. - (__gcry_burn_stack_dummy): New. - -2013-10-09 Werner Koch - - pubkey: Move sexp parsing for gcry_pk_verify to the modules. - * cipher/rsa.c (rsa_verify): Revamp. - * cipher/dsa.c (dsa_verify): Revamp. - * cipher/elgamal.c (elg_verify): Revamp. - * cipher/ecc.c (ecc_verify): Revamp. - * cipher/pubkey.c (sexp_to_sig): Remove. - (pss_verify_cmp): Move to pubkey-util.c - (sexp_data_to_mpi): Ditto. - (init_encoding_ctx): Ditto. - (gcry_pk_verify): Simplify. - * cipher/pubkey-util.c (_gcry_pk_util_init_encoding_ctx): Add. Take - from pubkey.c - (get_hash_algo): Ditto. - (_gcry_pk_util_data_to_mpi): Ditto. - (pss_verify_cmp): Ditto. - (_gcry_pk_util_extract_mpis): New. - (_gcry_pk_util_preparse_sigval): New. - (_gcry_pk_util_free_encoding_ctx): New. - * cipher/ecc-curves.c (_gcry_ecc_fill_in_curve): Make curve init - optional. - - * src/g10lib.h (GCC_ATTR_SENTINEL): New. - - * tests/basic.c (check_pubkey_sign): Print the algo name. - (main): Add option --pubkey. - -2013-10-08 Werner Koch - - pubkey: Move sexp parsing for gcry_pk_get_nbits to the modules. - * cipher/pubkey.c (spec_from_sexp): New. - (gcry_pk_get_nbits): Simplify. - * cipher/rsa.c (rsa_get_nbits): Take only PARMS as args and do sexp - parsing here. - * cipher/dsa.c (dsa_get_nbits): Ditto. - * cipher/elgamal.c (elg_get_nbits): Ditto. - * cipher/ecc.c (ecc_get_nbits): Ditto. - * cipher/ecc-curves.c (_gcry_ecc_fill_in_curve): Allow NULL for arg - CURVE. - - pubkey: Move sexp parsing for gcry_pk_getkey to the modules. - * cipher/pubkey-util.c: New. - (_gcry_pk_util_get_nbits): New. Based on code from gcry_pk_genkey. - (_gcry_pk_util_get_rsa_use_e): Ditto. - * cipher/pubkey.c (gcry_pk_genkey): Strip most code and pass. - * cipher/rsa.c (rsa_generate): Remove args ALGO, NBITS and EVALUE. - Call new fucntions to get these values. - * cipher/dsa.c (dsa_generate): Remove args ALGO, NBITS and EVALUE. - Call _gcry_pk_util_get_nbits to get nbits. Always parse genparms. - * cipher/elgamal.c (elg_generate): Ditto. - * cipher/ecc.c (ecc_generate): Ditto. - - cipher: Deprecate GCRY_PK_ELG_E. - * cipher/elgamal.c (_gcry_pubkey_spec_elg_e): Remove. - * cipher/pubkey.c (pubkey_list): Remove double included - _gcry_pubkey_spec_elg. - (map_algo): MAke ELG_E to ELG. - -2013-10-02 Werner Koch - - Provide Pth compatiblity for use with GnuPG 2.0. - * src/ath.c (ath_install): Call ath_init and declare Pth as - compatible. - -2013-10-02 Jussi Kivilinna - - sha512: fix building on ARM. - * cipher/sha512.c (transform) [USE_ARM_NEON_ASM]: Fix 'hd' to 'ctx'. - -2013-10-02 Werner Koch - - Remove deprecated control codes. - * src/gcrypt.h.in (GCRYCTL_SET_KEY): Remove. - (GCRYCTL_SET_IV): Remove. - (GCRYCTL_SET_CTR): Remove. - * cipher/md.c (gcry_md_ctl): Remove deprecated GCRYCTL_SET_KEY. - * cipher/cipher.c (gcry_cipher_ctl): Remove deprecated - GCRYCTL_SET_KEY, GCRYCTL_SET_IV, GCRYCTL_SET_CTR. - -2013-10-02 Dmitry Eremin-Solenikov - - Fix errors when building with Clang on PPC. - * mpi/longlong.h (add_ssaaaa, sub_ddmmss, count_leading_zeros, - umul_ppmm): Do not cast asm output to USItype. - -2013-10-02 Werner Koch - - Remove last remains of the former module system. - * src/gcrypt-module.h, src/module.c: Remove. - * src/visibility.h: Do not include gcrypt-module.h. - * src/g10lib.h: Remove all prototypes from module.c - (gcry_module): Remove. - * cipher/cipher-internal.h (gcry_cipher_handle): Remove unused field. - - Fix missing prototype warning in visibility.c. - * src/ec-context.h (_gcry_mpi_ec_new): Move prototype to mpi.h. - - md: Simplify the message digest dispatcher md.c. - * src/gcrypt-module.h (gcry_md_spec_t): Move to ... - * src/cipher-proto.h: here. Merge with md_extra_spec_t. Add fields - ALGO and FLAGS. Set these fields in all digest modules. - * cipher/md.c: Change most code to replace the former module - system by a simpler system to gain information about the algorithms. - -2013-10-01 Werner Koch - - cipher: Simplify the cipher dispatcher cipher.c. - * src/gcrypt-module.h (gcry_cipher_spec_t): Move to ... - * src/cipher-proto.h (gcry_cipher_spec_t): here. Merge with - cipher_extra_spec_t. Add fields ALGO and FLAGS. Set these fields in - all cipher modules. - * cipher/cipher.c: Change most code to replace the former module - system by a simpler system to gain information about the algorithms. - (disable_pubkey_algo): Simplified. Not anymore thread-safe, though. - - * cipher/md.c (_gcry_md_selftest): Use correct structure. Not a real - problem because both define the same function as their first field. - - * cipher/pubkey.c (_gcry_pk_selftest): Take care of the disabled flag. - - mpi: Fix gcry_mpi_neg. - * mpi/mpiutil.c (_gcry_mpi_neg): Copy U to W. - -2013-10-01 Peter Wu - - cipher: Add support for 128-bit keys in RC2. - * cipher/rfc2268.c (oids_rfc2268_128): New - (_gcry_cipher_spec_rfc2268_128): New. - * cipher/cipher.c (cipher_table_entry): Add GCRY_CIPHER_RFC2268_128. - -2013-09-30 Werner Koch - - ecc: Use faster b parameter for Ed25519. - * cipher/ecc-curves.c (domain_parms): Replace b. - * tests/t-mpi-point.c (test_curve): Ditto. - - ecc: Prepare for future Ed25519 optimization. - * mpi/ec-ed25519.c: New but empty file. - * mpi/ec-internal.h: New. - * mpi/ec.c: Include ec-internal.h. - (ec_mod): New. - (ec_addm): Use ec_mod. - (ec_mulm): Remove commented code. Use ec_mod. - (ec_subm): Call simple sub. - (ec_pow2): Use ec_mulm. - (ec_mul2): New. - (dup_point_weierstrass): Use ec_mul2. - (dup_point_twistededwards): Add special case for a == -1. Use - ec_mul2. - (add_points_weierstrass): Use ec_mul2. - (add_points_twistededwards): Add special case for a == -1. - (_gcry_mpi_ec_curve_point): Ditto. - (ec_p_init): Add hack to test Barrett functions. - * src/ec-context.h (mpi_ec_ctx_s): Add P_BARRETT. - - * mpi/mpi-mod.c (_gcry_mpi_mod_barrett): Fix sign problem. - - ecc: Fix recomputing of Q for Ed25519. - * cipher/ecc-misc.c (reverse_buffer): New. - (_gcry_ecc_compute_public): Add ED255519 specific code. - * cipher/ecc.c (sign_eddsa): Allocate DIGEST in secure memory. Get - rid of HASH_D. - * tests/t-mpi-point.c (context_param): Test recomputing of Q for - Ed25519. - - log: Try to print s-expressions in a more compact format. - * src/misc.c (count_closing_parens): New. - (_gcry_log_printsxp): Use new function. - * mpi/ec.c (_gcry_mpi_point_log): Take care of a NULL point. - -2013-09-30 Jussi Kivilinna - - Make Whirlpool use the _gcry_md_block_write helper. - * cipher/whirlpool.c (whirlpool_context_t): Add 'bctx', remove - 'buffer', 'count' and 'nblocks'. - (whirlpool_init): Initialize 'bctx'. - (whirlpool_transform): Adjust context argument type and burn stack - depth. - (whirlpool_add): Remove. - (whirlpool_write): Use _gcry_md_block_write. - (whirlpool_final, whirlpool_read): Adjust for 'bctx' usage. - - whirlpool: add stack burning after transform. - * cipher/whirlpool.c (whirlpool_transform): Return burn stack depth. - (whirlpool_add): Do burn_stack. - - whirlpool: do bitcount calculation in finalization part. - * cipher/whirlpool.c (whirlpool_context_t): Remove 'length', add - 'nblocks'. - (whirlpool_add): Update 'nblocks' instead of 'length', and add early - return at one spot. - (whirlpool_write): Check for 'nblocks' overflow. - (whirlpool_final): Convert 'nblocks' to bit-counter, and use - whirlpool_write instead of whirlpool_add. - -2013-09-30 Werner Koch - - Add logging functions to the API. - * src/gcrypt.h.in (_GCRY_GCC_ATTR_PRINTF): New. - (gcry_log_debug, gcry_log_debughex, gcry_log_debugmpi): New. - (gcry_log_debugpnt, gcry_log_debugsxp): New. - * src/visibility.c (gcry_log_debug): New. - (gcry_log_debughex, gcry_log_debugmpi, gcry_log_debugpnt): New. - (gcry_log_debugsxp): New. - * src/libgcrypt.def, src/libgcrypt.vers: Add new functions. - * src/misc.c (_gcry_logv): Make public. - (_gcry_log_printsxp): New. - * src/g10lib.h (log_printsxp): New macro. - -2013-09-26 Jussi Kivilinna - - Make libgcrypt build with Clang on i386. - * cipher/longlong.h [__i386__] (add_ssaaaa, sub_ddmmss) - (umul_ppmm, udiv_qrnnd): Do not cast asm output to USItype. - -2013-09-25 Werner Koch - - mpi: Change not yet used _gcry_mpi_set_opaque_copy. - * mpi/mpiutil.c (_gcry_mpi_set_opaque_copy): Change prototype. - (_gcry_mpi_get_opaque_copy): Take care of gcry_malloc failure. - - sexp: Improve printing of data with a leading zero. - * src/sexp.c (suitable_encoding): Detect leading zero byte. - - ecc: Allow the name "q@eddsa" to get/set the public key. - * cipher/ecc-curves.c (_gcry_ecc_get_mpi): Support "q@eddsa". - (_gcry_ecc_set_mpi): Support "q". - * cipher/ecc.c (eddsa_encodepoint): Rename to ... - (_gcry_ecc_eddsa_encodepoint): this and make global. Remove arg - MINLEN and take from context. - (eddsa_decodepoint): Rename to - (_gcry_ecc_eddsa_decodepoint): this and make global. Remove arg LEN - and take from context. - (sign_eddsa, verify_eddsa): Take B from context. - (ecc_sign, ecc_verify): Add hack to set DIALECT. - (_gcry_pk_ecc_get_sexp): Use _gcry_ecc_compute_public. Handle EdDSA. - * src/ec-context.h (mpi_ec_ctx_s): Add field NBITS. - * mpi/ec.c (ec_p_init): Init NBITS. - * tests/t-mpi-point.c (test_curve): Add Ed25519. - (sample_ed25519_q): New. - (context_param): Check new sample key. - (hex2buffer, hex2mpiopa): New. - (cmp_mpihex): Take care of opaque MPIs. - - mpicalc: Add statement to compute the number of bits. - * src/mpicalc.c (do_nbits): New. - (main): Add statement 'b'. - - ecc: Refactor low-level access functions. - * mpi/ec.c (point_copy): Move to cipher/ecc-curves.c. - (ec_get_reset): Rename to _gcry_mpi_ec_get_reset and make global. - (_gcry_mpi_ec_get_mpi): Factor most code out to _gcry_ecc_get_mpi. - (_gcry_mpi_ec_get_point): Factor most code out to _gcry_ecc_get_point. - (_gcry_mpi_ec_set_mpi): Factor most code out to _gcry_ecc_set_mpi. - (_gcry_mpi_ec_set_point): Factor most code out to _gcry_ecc_set_point. - * cipher/ecc-curves.c (_gcry_ecc_get_mpi): New. - (_gcry_ecc_get_point, _gcry_ecc_set_mpi, _gcry_ecc_set_point): New. - * cipher/ecc-misc.c (_gcry_ecc_compute_public): New. - - ecc: Fix highly unlikely endless loop in sign_ecdsa. - * cipher/ecc.c (sign_ecdsa): Turn while-do into do-while loops. - -2013-09-24 Werner Koch - - ecc: Allow the use of an uncompressed public key. - * cipher/ecc.c (eddsa_encodepoint): Factor most code out to ... - (eddsa_encode_x_y): new fucntion. - (eddsa_decodepoint): Allow use of an uncompressed public key. - * tests/t-ed25519.c (N_TESTS): Adjust. - * tests/t-ed25519.inp: Add test 1025. - -2013-09-23 Werner Koch - - pk: Add algo id GCRY_PK_ECC and deprecate ECDSA and ECDH. - * src/gcrypt.h.in (GCRY_PK_ECC): New. - * cipher/pubkey.c (map_algo): New. - (spec_from_algo, gcry_pk_get_param, _gcry_pk_selftest): Use it. - * cipher/ecc.c (selftests_ecdsa): Report using GCRY_PK_ECC. - (run_selftests): Simplify. - (ecdh_names, ecdsa_names): Merge into a new ecc_names. - (_gcry_pubkey_spec_ecdh, _gcry_pubkey_spec_ecdsa): Merge into new - _gcry_pubkey_spec_ecc. - - ec: Use mpi_mulm instead of mpi_powm. - * mpi/ec.c (ec_pow2): New. - (ec_powm): Remove call to mpi_abs. - (dup_point_weierstrass, dup_point_twistededwards) - (add_points_weierstrass, add_points_twistededwards) - (_gcry_mpi_ec_curve_point): Use ec_pow2. - -2013-09-21 Jussi Kivilinna - - bufhelp: enable fast unaligned memory accesses on powerpc. - * cipher/bufhelp.h [__powerpc__] (BUFHELP_FAST_UNALIGNED_ACCESS): Set - macro enabled. - [__powerpc64__] (BUFHELP_FAST_UNALIGNED_ACCESS): Ditto. - - Remove i386 inline assembly version of rotation functions. - * cipher/bithelp.h (rol, ror): Remove i386 version, change - macros to inline functions. - * src/hmac256.c (ror): Ditto. - - Optimize and cleanup 32-bit and 64-bit endianess transforms. - * cipher/bithelp.h (bswap32, bswap64, le_bswap32, be_bswap32) - (le_bswap64, be_bswap64): New. - * cipher/bufhelp.h (buf_get_be32, buf_get_le32, buf_put_le32) - (buf_put_be32, buf_get_be64, buf_get_le64, buf_put_be64) - (buf_put_le64): New. - * cipher/blowfish.c (do_encrypt_block, do_decrypt_block): Use new - endian conversion helpers. - (do_bf_setkey): Turn endian specific code to generic. - * cipher/camellia.c (GETU32, PUTU32): Use new endian conversion - helpers. - * cipher/cast5.c (rol): Remove, use rol from bithelp. - (F1, F2, F3): Fix to use rol from bithelp. - (do_encrypt_block, do_decrypt_block, do_cast_setkey): Use new endian - conversion helpers. - * cipher/des.c (READ_64BIT_DATA, WRITE_64BIT_DATA): Ditto. - * cipher/md4.c (transform, md4_final): Ditto. - * cipher/md5.c (transform, md5_final): Ditto. - * cipher/rmd160.c (transform, rmd160_final): Ditto. - * cipher/salsa20.c (LE_SWAP32, LE_READ_UINT32): Ditto. - * cipher/scrypt.c (READ_UINT64, LE_READ_UINT64, LE_SWAP32): Ditto. - * cipher/seed.c (GETU32, PUTU32): Ditto. - * cipher/serpent.c (byte_swap_32): Remove. - (serpent_key_prepare, serpent_encrypt_internal) - (serpent_decrypt_internal): Use new endian conversion helpers. - * cipher/sha1.c (transform, sha1_final): Ditto. - * cipher/sha256.c (transform, sha256_final): Ditto. - * cipher/sha512.c (__transform, sha512_final): Ditto. - * cipher/stribog.c (transform, stribog_final): Ditto. - * cipher/tiger.c (transform, tiger_final): Ditto. - * cipher/twofish.c (INPACK, OUTUNPACK): Ditto. - * cipher/whirlpool.c (buffer_to_block, block_to_buffer): Ditto. - * configure.ac (gcry_cv_have_builtin_bswap32): Check for compiler - provided __builtin_bswap32. - (gcry_cv_have_builtin_bswap64): Check for compiler provided - __builtin_bswap64. - - gostr3411_94: set better burn stack depth estimate. - * cipher/gost28147.c (_gcry_gost_enc_one): Account function stack to - burn stack depth. - * cipher/gostr3411-94.c (max): New macro. - (do_hash_step, transform): Return stack burn depth. - - Use hash transform function return type for passing burn stack depth. - * cipher/gostr4311-94.c (transform): Return stack burn depth. - * cipher/hash-common.c (_gcry_md_block_write): Use stack burn depth - returned by 'hd->bwrite'. - * cipher/hash-common.h (_gcry_md_block_write_t): Change return type to - 'unsigned int'. - (gry_md_block_ctx_t): Remove 'stack_burn'. - * cipher/md4.c (transform): Return stack burn depth. - (md4_final): Use stack burn depth from transform. - * cipher/md5.c (transform): Return stack burn depth. - (md5_final): Use stack burn depth from transform. - * cipher/rmd160.c (transform): Return stack burn depth. - (rmd160_final): Use stack burn depth from transform. - * cipher/sha1.c (transform): Return stack burn depth. - (sha1_final): Use stack burn depth from transform. - * cipher/sha256.c (transform): Return stack burn depth. - (sha256_final): Use stack burn depth from transform. - * cipher/sha512.c (__transform, transform): Return stack burn depth. - (sha512_final): Use stack burn depth from transform. - * cipher/stribog.c (transform64): Return stack burn depth. - * cipher/tiger.c (transform): Return stack burn depth. - (tiger_final): Use stack burn depth from transform. - - Make STRIBOG use the new _gcry_md_block_write helper. - * cipher/stribog.c (STRIBOG_STRUCT): Add 'bctx' and remove 'buf' and - 'count'. - (stribog_init_512): Initialize 'bctx'. - (transform64): New function. - (stribog_write): Remove. - (stribog_final): Use _gcry_md_block_write and bctx. - (_gcry_digest_spec_stribog_256, _gcry_digest_spec_stribog_512): Use - _gcry_md_block_write. - - Make SHA-512 use the new _gcry_md_block_write helper. - * cipher/hash-common.c (_gcry_md_block_write): Check that hd->buf is - large enough. - * cipher/hash-common.h (MD_BLOCK_MAX_BLOCKSIZE, MD_NBLOCKS_TYPE): New - macros. - (gcry_md_block_ctx_t): Use above macros for 'nblocks' and 'buf'. - * cipher/sha512.c (SHA512_STATE): New struct. - (SHA512_CONTEXT): Add 'bctx' and 'state'. - (sha512_init, sha384_init): Initialize 'bctx'. - (__transform, _gcry_sha512_transform_armv7_neon): Use SHA512_STATE for - 'hd'. - (transform): For now, do not return burn stack. - (sha512_write): Remove. - (sha512_final): Use _gcry_md_block_write and bctx. - (_gcry_digest_spec_sha512, _gcry_digest_spec_sha384): Use - _gcry_md_block_write. - -2013-09-20 Werner Koch - - sexp: Change internal versions to always use gpg_err_code_t. - * src/sexp.c (gcry_sexp_new, gcry_sexp_create, gcry_sexp_build) - (gcry_sexp_build_array, gcry_sexp_canon_len): Change error return type - from gpg_error_t to gpg_err_code_t. Remove all calls to gpg_error. - * src/visibility.c (gcry_sexp_new, gcry_sexp_create, gcry_sexp_sscan) - (gcry_sexp_build, gcry_sexp_build_array, gcry_sexp_canon_len): Map - error codes via gpg_error. - * cipher/dsa.c, cipher/ecc.c, cipher/elgamal.c, cipher/rsa.c: Remove - use gpg_err_code wrappers. - - pk: Move s-exp creation for gcry_pk_decrypt to the modules. - * cipher/pubkey.c (sexp_to_enc): Remove RET_MODERN arg and merge it - into FLAGS. - (gcry_pk_decrypt): Move result s-exp building into the modules. - * src/cipher-proto.h (gcry_pk_decrypt_t): Add some args. - * cipher/ecc.c (ecc_decrypt_raw): Change to return an s-exp. - * cipher/elgamal.c (elg_decrypt): Ditto. - * cipher/rsa.c (rsa_decrypt): Ditto. - (rsa_blind, rsa_unblind): Merge into rsa_decrypt. This saves several - extra MPI allocations. - - pk: Remove unused function. - * cipher/pubkey.c (_gcry_pk_aliased_algo_name): Remove - -2013-09-19 Werner Koch - - Beautify debug output of the prime generator. - * cipher/primegen.c: Adjust output of log_mpidump to recently changed - log_mpidump code changes. - - pk: Move s-expr creation for genkey to the modules. - * cipher/pubkey.c (pubkey_generate): Fold into gcry_pk_genkey - (gcry_pk_genkey): Move result s-exp creation into the modules. - * cipher/dsa.c (dsa_generate): Create result as s-exp. - * cipher/elgamal.c (elg_generate): Ditto. - * cipher/rsa.c (rsa_generate): Ditto. - * cipher/ecc.c (ecc_generate): Ditto. - * src/cipher-proto.h (pk_ext_generate_t): Remove type - (gcry_pk_spec): and remove from struct. - - tests: Beautify some diagnostics. - * tests/benchmark.c (ecc_bench): Print the key sexp in very verbose - mode. - (main): Add option --pk-count. - * tests/keygen.c: Add Elgamal generation and improved diagnostics. - * tests/t-ed25519.c (check_ed25519): Print running number of tests - done. - - sexp: Improve printing data representing a negative number. - * src/sexp.c (suitable_encoding): Detect a negative number. - - pk: Move RSA encoding functions to a new file. - * cipher/rsa-common: New. - * cipher/pubkey.c (pkcs1_encode_for_encryption): Move to rsa-common.c - and rename to _gcry_rsa_pkcs1_encode_for_enc. - (pkcs1_decode_for_encryption): Move to rsa-common.c and rename to - _gcry_rsa_pkcs1_decode_for_enc. - (pkcs1_encode_for_signature): Move to rsa-common.c and rename to - _gcry_rsa_pkcs1_encode_for_sig. - (oaep_encode): Move to rsa-common.c and rename to - _gcry_rsa_oaep_encode. - (oaep_decode): Move to rsa-common.c and rename to - _gcry_rsa_oaep_decode. - (pss_encode): Move to rsa-common.c and rename to _gcry_rsa_pss_encode. - (pss_verify): Move to rsa-common.c and rename to _gcry_rsa_pss_decode. - (octet_string_from_mpi, mgf1): Move to rsa-common.c. - - pk: Move s-expr creation for sign and encrypt to the modules. - * cipher/pubkey.c (pubkey_encrypt): Fold into gcry_pk_encrypt. - (pubkey_decrypt): Fold into gcry_pk_decrypt. - (pubkey_sign): Fold into gcry_pk_sign. - (pubkey_verify): Fold into gcry_pk_verify. - (octet_string_from_mpi): Make it a wrapper and factor code out to ... - * mpi/mpicoder.c (_gcry_mpi_to_octet_string): New function. - - * src/cipher.h (PUBKEY_FLAG_FIXEDLEN): New. - * cipher/pubkey.c (sexp_data_to_mpi): Set flag for some encodings. - (gcry_pk_encrypt): Simply by moving the s-expr generation to the modules. - (gcry_pk_sign): Ditto. - * cipher/dsa.c (dsa_sign): Create s-expr. - * cipher/elgamal.c (elg_encrypt, elg_sign): Ditto. - * cipher/rsa.c (rsa_encrypt, rsa_sign): Ditto. - * cipher/ecc.c (ecc_sign, ecc_encrypt_raw): Ditto. - (ecdsa_names): Add "eddsa". - * tests/t-ed25519.c (one_test): Expect "eddsa" token. - -2013-09-19 Dmitry Eremin-Solenikov - - Fix Stribog digest on bigendian platforms. - * cipher/stribog.c (stribog_final): swap bytes in the result of digest - calculations. - -2013-09-18 Werner Koch - - pk: Simplify the public key dispatcher pubkey.c. - * src/cipher-proto.h (gcry_pk_spec_t): Add fields ALGO and FLAGS. - * cipher/dsa.c (_gcry_pubkey_spec_dsa): Set these fields. - * cipher/ecc.c (_gcry_pubkey_spec_ecdsa): Ditto. - (_gcry_pubkey_spec_ecdh): Ditto. - * cipher/rsa.c (_gcry_pubkey_spec_rsa): Ditto. - * cipher/elgamal.c (_gcry_pubkey_spec_elg): Ditto - (_gcry_pubkey_spec_elg_e): New. - * cipher/pubkey.c: Change most code to replace the former module - system by a simpler system to gain information about the algorithms. - (disable_pubkey_algo): SImplified. Not anymore thread-safe, though. - - pk: Merge extraspecs struct with standard specs struct. - * src/gcrypt-module.h (gcry_pk_spec_t): Move this typedef and the - corresponding function typedefs to ... - * src/cipher-proto.h: here. - (pk_extra_spec_t): Remove typedef and merge fields into - gcry_pk_spec_t. - * cipher/rsa.c, cipher/dsa.c, cipher/elg.c, cipher/ecc.c: Ditto. - * cipher/pubkey.c: Change accordingly. - * src/cipher.h (_gcry_pubkey_extraspec_rsa): Remove. - (_gcry_pubkey_extraspec_dsa): Remove. - (_gcry_pubkey_extraspec_elg): Remove. - (_gcry_pubkey_extraspec_ecdsa): Remove. - -2013-09-18 Jussi Kivilinna - - Fix encryption/decryption return type for GOST28147. - * cipher/gost.h (_gcry_gost_enc_one): Change return type to - 'unsigned int'. - * cipher/gost28147.c (max): New macro. - (gost_encrypt_block, gost_decrypt_block): Return burn stack depth. - (_gcry_gost_enc_one): Return burn stack depth from gost_encrypt_block. - -2013-09-18 Dmitry Eremin-Solenikov - - doc: fix building of ps and pdf documentation. - * doc/gcrypt.texi, doc/gpl.texi, doc/lgpl.texi: fix texinfo errors. - - Add GOST R 34.11-2012 implementation (Stribog) - * src/gcrypt.h.in (GCRY_MD_GOSTR3411_12_256) - (GCRY_MD_GOSTR3411_12_512): New. - * cipher/stribog.c: New. - * configure.ac (available_digests_64): Add stribog. - * src/cipher.h: Declare Stribog declarations. - * cipher/md.c: Register Stribog digest. - * tests/basic.c (check_digests) Add 4 testcases for Stribog from - standard. - * doc/gcrypt.texi: Document new constants. - - Add basic implementation of GOST R 34.11-94 message digest. - * src/gcrypt.h.in (GCRY_MD_GOSTR3411_94): New. - * cipher/gostr3411-94.c: New. - * configure.ac (available_digests): Add gostr3411-94. - * src/cipher.h: Add gostr3411-94 definitions. - * cipher/md.c: Register GOST R 34.11-94. - * tests/basic.c (check_digests): Add 4 tests for GOST R 34.11-94 - hash algo. Two are defined in the standard itself, two other are - more or less common tests - an empty string an exclamation mark. - * doc/gcrypt.texi: Add an entry describing GOST R 34.11-94 to the MD - algorithms table. - - Separate common md block code. - * cipher/hash-common.c (_gcry_md_block_write): New function to handle - block md operations. The current implementation is limited to 64 byte - buffer and u32 block counter. - - * cipher/md4.c, cipher/md5.c, cipher/rmd.h, cipher/rmd160.c - *cipher/sha1.c, cipher/sha256.c, cipher/tiger.c: Convert to use - _gcry_md_block_write. - - Add limited implementation of GOST 28147-89 cipher. - * src/gcrypt.h.in (GCRY_CIPHER_GOST28147): New. - * cipher/gost.h, cipher/gost28147.c: New. - * configure.ac (available_ciphers): Add gost28147. - * src/cipher.h: Add gost28147 definitions. - * cipher/cipher.c: Register gost28147. - * tests/basic.c (check_ciphers): Enable simple test for gost28147. - * doc/gcrypt.texi: document GCRY_CIPHER_GOST28147. - -2013-09-18 Werner Koch - - ecc: Add Ed25519 key generation and prepare for optimizations. - * src/mpi.h (enum ecc_dialects): New. - * src/ec-context.h (mpi_ec_ctx_s): Add field DIALECT. - * cipher/ecc-common.h (elliptic_curve_t): Ditto. - * cipher/ecc-curves.c (ecc_domain_parms_t): Ditto. - (domain_parms): Add dialect values. - (_gcry_ecc_fill_in_curve): Set dialect. - (_gcry_ecc_get_curve): Ditto. - (_gcry_mpi_ec_new): Ditto. - (_gcry_ecc_get_param): Use ECC_DIALECT_STANDARD for now. - * cipher/ecc-misc.c (_gcry_ecc_curve_copy): Copy dialect. - (_gcry_ecc_dialect2str): New. - * mpi/ec.c (ec_p_init): Add arg DIALECT. - (_gcry_mpi_ec_p_internal_new): Ditto. - (_gcry_mpi_ec_p_new): Ditto. - - * mpi/mpiutil.c (gcry_mpi_set_opaque): Set the secure flag. - (_gcry_mpi_set_opaque_copy): New. - - * cipher/ecc-misc.c (_gcry_ecc_os2ec): Take care of an opaque MPI. - * cipher/ecc.c (eddsa_generate_key): New. - (generate_key): Rename to nist_generate_key and factor some code out - to ... - (ecc_generate_ext): here. Divert to eddsa_generate_key if desired. - (eddsa_decodepoint): Take care of an opaque MPI. - (ecc_check_secret_key): Ditto. - (ecc_sign): Ditto. - * cipher/pubkey.c (sexp_elements_extract_ecc): Store public and secret - key as opaque MPIs. - (gcry_pk_genkey): Add the curve_name also to the private key part of - the result. - - * tests/benchmark.c (ecc_bench): Support Ed25519. - (main): Add option --debug. - * tests/curves.c (sample_key_2): Make sure that P and N are positive. - * tests/keygen.c (show): New. - (check_ecc_keys): Support Ed25519. - -2013-09-17 Werner Koch - - mpi: Support printing of negative numbers. - * mpi/mpicoder.c (twocompl, onecompl): New. - (gcry_mpi_print): Use it for STD and SSH. - (gcry_mpi_scan): Use it for STD and SSH. Always set NSCANNED. - (gcry_mpi_aprint): Clear the extra allocated byte. - * tests/t-convert.c (showhex, showmpi): New. - (mpi2bitstr_nlz): New. - (check_formats): New. - (main): Call new test. - -2013-09-16 Werner Koch - - Fix bug in _gcry_mpi_tdiv_q_2exp. - * mpi/mpi-internal.h (MPN_COPY_INCR): Make it work. - - ecc: Implement Curve Ed25519 signing and verification. - * cipher/ecc-curves.c (domain_parms): Add curve "Ed25519". - * cipher/ecc.c (reverse_buffer): New. - (eddsa_encodempi): New. - (eddsa_encodepoint): New. - (eddsa_decodepoint): New. - (sign_eddsa): Implement. - (verify_eddsa): Implement. - (ecc_sign): Init unused Q. Pass public key to sign_eddsa. - (ecc_verify): Init pk.Q if not used. Pass public key verbatim to - verify_eddsa. - * cipher/pubkey.c (sexp_elements_extract): Add arg OPAQUE. Change all - callers to pass 0. - (sexp_to_sig): Add arg OPAQUE and pass it to sexp_elements_extract. - (sexp_data_to_mpi): Allow for a zero length "value". - (gcry_pk_verify): Reorder parameter processing. Pass OPAQUE flag as - required. - * mpi/ec.c (ec_invm): Print a warning if the inverse does not exist. - (_gcry_mpi_ec_get_affine): Implement for our Twisted Edwards curve - model. - (dup_point_twistededwards): Implement. - (add_points_twistededwards): Implement. - (_gcry_mpi_ec_mul_point): Support Twisted Edwards. - - * mpi/mpicoder.c (do_get_buffer): Add arg FILL_LE. - (_gcry_mpi_get_buffer): Ditto. Change all callers. - (_gcry_mpi_get_secure_buffer): Ditto. - - * src/sexp.c (_gcry_sexp_nth_opaque_mpi): New. - - * tests/t-ed25519.c: New. - * tests/t-ed25519.inp: New. - * tests/t-mpi-point.c (basic_ec_math_simplified): Print some output - only in debug mode. - (twistededwards_math): New test. - (main): Call new test. - - mpi: Add internal convenience function. - * mpi/mpiutil.c (_gcry_mpi_get_opaque_copy): New. - - mpi: Add debug function to print a point. - * mpi/ec.c (_gcry_mpi_point_log): New. - * src/mpi.h (log_printpnt): new macro. - - tests: Factor time measurement code out. - * tests/benchmark.c (started_at, stopped_at, start_timer, stop_timer) - (elapsed time): Factor out to .. - * tests/stopwatch.h: new file. - -2013-09-12 Werner Koch - - Fix _gcry_log_printmpi to print 00 instead of a sole sign. - * src/misc.c: Special case an mpi length of 0. - -2013-09-11 Werner Koch - - Streamline the use of the internal mpi and hex debug functions. - * mpi/mpicoder.c (gcry_mpi_dump): Remove. - (_gcry_log_mpidump): Remove. - * src/misc.c (_gcry_log_printhex): Factor all code out to ... - (do_printhex): new. Add line wrapping a and compact printing. - (_gcry_log_printmpi): New. - * src/mpi.h (log_mpidump): Remove macro. - * src/g10lib.h (log_mpidump): Add compatibility macro. - (log_printmpi): New macro - * src/visibility.c (gcry_mpi_dump): Call _gcry_log_printmpi. - * cipher/primegen.c (prime_generate_internal): Replace gcry_mpi_dump - by log_printmpi. - (gcry_prime_group_generator): Ditto. - * cipher/pubkey.c: Remove extra colons from log_mpidump call. - * cipher/rsa.c (stronger_key_check): Use log_printmpi. - -2013-09-10 Werner Koch - - md: Add function gcry_md_hash_buffers. - * src/gcrypt.h.in (gcry_buffer_t): new. - (gcry_md_hash_buffers): New. - * src/visibility.c, src/visibility.h: Add wrapper for new function. - * src/libgcrypt.def, src/libgcrypt.vers: Export new function. - * cipher/md.c (gcry_md_hash_buffers): New. - * cipher/sha1.c (_gcry_sha1_hash_buffers): New. - * tests/basic.c (check_one_md_multi): New. - (check_digests): Run that test. - * tests/hmac.c (check_hmac_multi): New. - (main): Run that test. - - md: Fix Whirlpool flaw. - * cipher/whirlpool.c (whirlpool_add): Remove shortcut return so that - byte counter is always properly updated. - -2013-09-07 Jussi Kivilinna - - Fix static build on AMD64. - * cipher/rijndael-amd64.S: Correct 'RIP' macro for non-PIC build. - - scrypt: fix for big-endian systems. - * cipher/scrypt.c (_salsa20_core): Fix endianess issues. - -2013-09-07 Werner Koch - - Use gcc "unused" attribute only with gcc >= 3.5. - * src/g10lib.h (GCC_ATTR_UNUSED): Fix gcc version detection. - -2013-09-07 Dmitry Eremin-Solenikov - - Add support for Salsa20/12 - 12 round version of Salsa20. - * src/gcrypt.h.in (GCRY_CIPHER_SALSA20R12): New. - * src/salsa20.c (salsa20_core, salsa20_do_encrypt_stream): Add support - for reduced round versions. - (salsa20r12_encrypt_stream, _gcry_cipher_spec_salsa20r12): Implement - Salsa20/12 - a 12 round version of Salsa20 selected by eStream. - * src/cipher.h: Declsare Salsa20/12 definition. - * cipher/cipher.c: Register Salsa20/12 - * tests/basic.c: (check_stream_cipher, check_stream_cipher_large_block): - Populate Salsa20/12 tests with test vectors from ecrypt - (check_ciphers): Add simple test for Salsa20/12 - -2013-09-07 Werner Koch - - Add configure option --disable-amd64-as-feature-detection. - * configure.ac: Implement new disable flag. - - mpi: Improve support for non-Weierstrass support. - * mpi/ec.c (ec_p_init): Add args MODEL and P. Change all callers. - (_gcry_mpi_ec_p_internal_new): Ditto. - (_gcry_mpi_ec_p_new): Ditto. - * cipher/ecc-curves.c (_gcry_ecc_fill_in_curve): Return - GPG_ERR_UNKNOWN_CURVE instead of invalid value. Init curve model. - * cipher/ecc.c (ecc_verify, ecc_encrypt_raw): Ditto. - * cipher/pubkey.c (sexp_data_to_mpi): Fix EDDSA flag error checking. - - mpi: Add gcry_mpi_ec_curve_point. - * mpi/ec.c (_gcry_mpi_ec_curve_point): New. - (ec_powm): Return the absolute value. - * src/visibility.c, src/visibility.c: Add wrappers. - * src/libgcrypt.def, src/libgcrypt.vers: Export them. - - mpi: Add functions to manipulate the sign. - * src/gcrypt.h.in (gcry_mpi_is_neg): New. - (gcry_mpi_neg, gcry_mpi_abs): New. - * mpi/mpiutil.c (_gcry_mpi_is_neg): New. - (_gcry_mpi_neg, _gcry_mpi_abs): New. - * src/visibility.c, src/visibility.h: Add wrappers. - * src/libgcrypt.def, src/libgcrypt.vers: Export them. - * src/mpi.h (mpi_is_neg): New. Rename old macro to mpi_has_sign. - * mpi/mpi-mod.c (_gcry_mpi_mod_barrett): Use mpi_has_sign. - * mpi/mpi-mpow.c (calc_barrett): Ditto. - * cipher/primegen.c (_gcry_derive_x931_prime): Ditto - * cipher/rsa.c (secret): Ditto. - -2013-09-06 Jussi Kivilinna - - Tune armv6 mpi assembly. - * mpi/armv6/mpih-mul1.S: Tune assembly for Cortex-A8. - * mpi/armv6/mpih-mul2.S: Ditto. - * mpi/armv6/mpih-mul3.S: Ditto. - -2013-09-05 Jussi Kivilinna - - Change _gcry_burn_stack take burn depth as unsigned integer. - * src/misc.c (_gcry_burn_stack): Change to handle 'unsigned int' bytes. - - mpicalc: fix building on linux and win32. - * src/Makefile.am (mpicalc): Adjust CFLAGS and LDADD. - -2013-09-04 Werner Koch - - Change mpicalc to use Libgcrypt and install it. - * src/mpicalc.c: Make use of gcry_ functions. - (MPICALC_VERSION): New. Set to 2.0. - (strusage): Remove. - (scan_mpi): New. Replaces mpi_fromstr. - (print_mpi): New. Replaces mpi_print. - (my_getc): New. - (print_help): New. - (main): Use simple option parser and print version info. - * src/Makefile.am (bin_PROGRAMS): Add mpicalc. - (mpicalc_SOURCES, mpicalc_CFLAGS, mpicalc_LDADD): New. - - Add mpicalc.c to help with testing. - * src/mpicalc.c: Take from GnuPG 1.4 - - Prepare support for EdDSA. - * src/cipher.h (PUBKEY_FLAG_EDDSA): New. - * cipher/pubkey.c (pubkey_verify): Repalce args CMP and OPAQUEV by - CTX. Pass flags and hash algo to the verify function. Change all - verify functions to accept these args. - (sexp_data_to_mpi): Implement new flag "eddsa". - (gcry_pk_verify): Pass CTX instead of the compare function to - pubkey_verify. - * cipher/ecc.c (sign): Rename to sign_ecdsa. Change all callers. - (verify): Rename to verify_ecdsa. Change all callers. - (sign_eddsa, verify_eddsa): New stub functions. - (ecc_sign): Divert to sign_ecdsa or sign_eddsa. - (ecc_verify): Divert to verify_ecdsa or verify_eddsa. - - Prepare support for non-Weierstrass EC equations. - * src/mpi.h (gcry_mpi_ec_models): New. - * src/ec-context.h (mpi_ec_ctx_s): Add MODEL. - * cipher/ecc-common.h (elliptic_curve_t): Ditto. - * cipher/ecc-curves.c (ecc_domain_parms_t): Ditto. - (domain_parms): Mark als as Weierstrass. - (_gcry_ecc_fill_in_curve): Check model. - (_gcry_ecc_get_curve): Set model to Weierstrass. - * cipher/ecc-misc.c (_gcry_ecc_model2str): New. - * cipher/ecc.c (generate_key, ecc_generate_ext): Print model in the - debug output. - - * mpi/ec.c (_gcry_mpi_ec_dup_point): Switch depending on model. - Factor code out to ... - (dup_point_weierstrass): new. - (dup_point_montgomery, dup_point_twistededwards): New stub functions. - (_gcry_mpi_ec_add_points): Switch depending on model. Factor code out - to ... - (add_points_weierstrass): new. - (add_points_montgomery, add_points_twistededwards): New stub - functions. - - * tests/Makefile.am (TESTS): Reorder tests. - - mpi: Suppress newer gcc warnings. - * src/g10lib.h (GCC_ATTR_UNUSED): Define for gcc >= 3.5. - * mpi/mpih-div.c (_gcry_mpih_mod_1, _gcry_mpih_divmod_1): Mark dummy - as unused. - * mpi/mpi-internal.h (UDIV_QRNND_PREINV): Mark _ql as unused. - - Do not check with cpp for typedefed constants. - * src/gcrypt-int.h: Include error code replacements depeding on the - version of libgpg-error. - -2013-09-04 Jussi Kivilinna - - Make _gcry_burn_stack use variable length array. - * configure.ac (HAVE_VLA): Add check. - * src/misc.c (_gcry_burn_stack) [HAVE_VLA]: Add VLA code. - - Move stack burning from block ciphers to cipher modes. - * src/gcrypt-module.h (gcry_cipher_encrypt_t) - (gcry_cipher_decrypt_t): Return 'unsigned int'. - * cipher/cipher.c (dummy_encrypt_block, dummy_decrypt_block): Return - zero. - (do_ecb_encrypt, do_ecb_decrypt): Get largest stack burn depth from - block cipher crypt function and burn stack at end. - * cipher/cipher-aeswrap.c (_gcry_cipher_aeswrap_encrypt) - (_gcry_cipher_aeswrap_decrypt): Ditto. - * cipher/cipher-cbc.c (_gcry_cipher_cbc_encrypt) - (_gcry_cipher_cbc_decrypt): Ditto. - * cipher/cipher-cfb.c (_gcry_cipher_cfb_encrypt) - (_gcry_cipher_cfb_decrypt): Ditto. - * cipher/cipher-ctr.c (_gcry_cipher_cbc_encrypt): Ditto. - * cipher/cipher-ofb.c (_gcry_cipher_ofb_encrypt) - (_gcry_cipher_ofb_decrypt): Ditto. - * cipher/blowfish.c (encrypt_block, decrypt_block): Return burn stack - depth. - * cipher/camellia-glue.c (camellia_encrypt, camellia_decrypt): Ditto. - * cipher/cast5.c (encrypt_block, decrypt_block): Ditto. - * cipher/des.c (do_tripledes_encrypt, do_tripledes_decrypt) - (do_des_encrypt, do_des_decrypt): Ditto. - * cipher/idea.c (idea_encrypt, idea_decrypt): Ditto. - * cipher/rijndael.c (rijndael_encrypt, rijndael_decrypt): Ditto. - * cipher/seed.c (seed_encrypt, seed_decrypt): Ditto. - * cipher/serpent.c (serpent_encrypt, serpent_decrypt): Ditto. - * cipher/twofish.c (twofish_encrypt, twofish_decrypt): Ditto. - * cipher/rfc2268.c (encrypt_block, decrypt_block): New. - (_gcry_cipher_spec_rfc2268_40): Use encrypt_block and decrypt_block. - -2013-09-01 Jussi Kivilinna - - camellia-aesni-avx2-amd64: Move register clearing to assembly functions. - * cipher/camellia-aesni-avx2-amd64.S - (_gcry_camellia_aesni_avx2_ctr_enc): Add 'vzeroall'. - (_gcry_camellia_aesni_avx2_cbc_dec) - (_gcry_camellia_aesni_avx2_cfb_dec): Add 'vzeroupper' at head and - 'vzeroall' at tail. - * cipher/camellia-glue.c (_gcry_serpent_ctr_enc, _gcry_serpent_cbc_dec) - (_gcry_serpent_avx2_cfb_dec) [USE_AESNI_AVX2]: Remove register - clearing. - - camellia-aesni-avx-amd64: Move register clearing to assembly functions. - * cipher/camellia-aesni-avx-amd64.S (_gcry_camellia_aesni_avx_ctr_enc) - (_gcry_camellia_aesni_avx_cbc_dec) - (_gcry_camellia_aesni_avx_cfb_dec): Add 'vzeroupper' at head and - 'vzeroall' at tail. - * cipher/camellia-glue.c (_gcry_serpent_ctr_enc, _gcry_serpent_cbc_dec) - (_gcry_serpent_avx2_cfb_dec) [USE_AESNI_AVX]: Remove register clearing. - - serpent-avx2-amd64: Move register clearing to assembly. - * cipher/serpent-avx2-amd64.S (_gcry_serpent_avx2_ctr_enc) - (_gcry_serpent_avx2_cbc_dec, _gcry_serpent_avx2_cfb_dec): Change last - 'vzeroupper' to 'vzeroall'. - * cipher/serpent.c (_gcry_serpent_ctr_enc, _gcry_serpent_cbc_dec) - (_gcry_serpent_avx2_cfb_dec) [USE_AVX2]: Remove register clearing with - 'vzeroall'. - - Fix building for x32 target. - * mpi/amd64/mpi-asm-defs.h: New file. - * random/rndhw.c (poll_padlock) [__x86_64__]: Also check if __LP64__ is - defined. - [USE_DRNG, __x86_64__]: Also check if __LP64__ is defined. - -2013-08-31 Jussi Kivilinna - - sha512: add ARM/NEON assembly version of transform function. - * cipher/Makefile.am: Add 'sha512-armv7-neon.S'. - * cipher/sha512-armv7-neon.S: New file. - * cipher/sha512.c (USE_ARM_NEON_ASM): New macro. - (SHA512_CONTEXT) [USE_ARM_NEON_ASM]: Add 'use_neon'. - (sha512_init, sha384_init) [USE_ARM_NEON_ASM]: Enable 'use_neon' if - CPU support NEON instructions. - (k): Round constant array moved outside of 'transform' function. - (__transform): Renamed from 'tranform' function. - [USE_ARM_NEON_ASM] (_gcry_sha512_transform_armv7_neon): New prototype. - (transform): New wrapper function for different transform versions. - (sha512_write, sha512_final): Burn stack by the amount returned by - transform function. - * configure.ac (sha512) [neonsupport]: Add 'sha512-armv7-neon.lo'. - - sha512: reduce stack use in transform function by 512 bytes. - * cipher/sha512.c (transform): Change 'u64 w[80]' to 'u64 w[16]' and - inline input expansion to first 64 rounds. - (sha512_write, sha512_final): Reduce burn_stack depth by 512 bytes. - - Add ARM HW feature detection module and add NEON detection. - * configure.ac: Add option --disable-neon-support. - (HAVE_GCC_INLINE_ASM_NEON): New. - (ENABLE_NEON_SUPPORT): New. - [arm]: Add 'hwf-arm.lo' as HW feature module. - * src/Makefile.am: Add 'hwf-arm.c'. - * src/g10lib.h (HWF_ARM_NEON): New macro. - * src/global.c (hwflist): Add HWF_ARM_NEON entry. - * src/hwf-arm.c: New file. - * src/hwf-common.h (_gcry_hwf_detect_arm): New prototype. - * src/hwfeatures.c (_gcry_detect_hw_features) [HAVE_CPU_ARCH_ARM]: Add - call to _gcry_hwf_detect_arm. - - Correct mpi_cpu_arch for ARMv6. - * mpi/config.links [armv6]: Set mpi_cpu_arch to "arm", instead of - "armv6". - -2013-08-30 Werner Koch - - mpi: Make gcry_mpi_print work with negative zeroes. - * mpi/mpicoder.c (gcry_mpi_print): Take care of negative zero. - (gcry_mpi_aprint): Allocate at least 1 byte. - * tests/t-convert.c: New. - * tests/Makefile.am (TESTS): Add t-convert. - - Refactor the ECC code into 3 files. - * cipher/ecc-common.h, cipher/ecc-curves.c, cipher/ecc-misc.c: New. - * cipher/Makefile.am (EXTRA_libcipher_la_SOURCES): Add new files. - * configure.ac (GCRYPT_PUBKEY_CIPHERS): Add new .c files. - * cipher/ecc.c (curve_aliases, ecc_domain_parms_t, domain_parms) - (scanval): Move to ecc-curves.c. - (fill_in_curve): Move to ecc-curve.c as _gcry_ecc_fill_in_curve. - (ecc_get_curve): Move to ecc-curve.c as _gcry_ecc_get_curve. - (_gcry_mpi_ec_ec2os): Move to ecc-misc.c. - (ec2os): Move to ecc-misc.c as _gcry_ecc_ec2os. - (os2ec): Move to ecc-misc.c as _gcry_ecc_os2ec. - (point_set): Move as inline function to ecc-common.h. - (_gcry_ecc_curve_free): Move to ecc-misc.c as _gcry_ecc_curve_free. - (_gcry_ecc_curve_copy): Move to ecc-misc.c as _gcry_ecc_curve_copy. - (mpi_from_keyparam, point_from_keyparam): Move to ecc-curves.c. - (_gcry_mpi_ec_new): Move to ecc-curves.c. - (ecc_get_param): Move to ecc-curves.c as _gcry_ecc_get_param. - (ecc_get_param_sexp): Move to ecc-curves.c as _gcry_ecc_get_param_sexp. - -2013-08-22 Jussi Kivilinna - - serpent-sse2-amd64: Move register clearing to assembly functions. - cipher/serpent-sse2-amd64.S (_gcry_serpent_sse2_ctr_enc) - (_gcry_serpent_sse2_cbc_dec, _gcry_serpent_sse2_cfb_dec): Clear used - XMM registers. - cipher/serpent.c (_gcry_serpent_ctr_enc, _gcry_serpent_cbc_dec) - ( _gcry_serpent_cfb_dec) [USE_SSE2]: Remove XMM register clearing from - bulk functions. - - twofish-amd64: do not make __twofish_dec_blk3 global. - * cipher/twofish-amd64.S (__twofish_dec_blk3): Do not export symbol as - global. - (__twofish_dec_blk3): Mark symbol as function. - -2013-08-20 Jussi Kivilinna - - mpi: add ARMv6 assembly. - * mpi/armv6/mpi-asm-defs.h: New. - * mpi/armv6/mpih-add1.S: New. - * mpi/armv6/mpih-mul1.S: New. - * mpi/armv6/mpih-mul2.S: New. - * mpi/armv6/mpih-mul3.S: New. - * mpi/armv6/mpih-sub1.S: New. - * mpi/config.links [arm]: Enable ARMv6 assembly. - - Move ARMv6 detection to configure.ac. - * cipher/blowfish-armv6.S: Replace __ARM_ARCH >= 6 checks with - HAVE_ARM_ARCH_V6. - * cipher/blowfish.c: Ditto. - * cipher/camellia-armv6.S: Ditto. - * cipher/camellia.h: Ditto. - * cipher/cast5-armv6.S: Ditto. - * cipher/cast5.c: Ditto. - * cipher/rijndael-armv6.S: Ditto. - * cipher/rijndael.c: Ditto. - * configure.ac: Add HAVE_ARM_ARCH_V6 check. - -2013-08-19 Jussi Kivilinna - - Add optimized wipememory for ARM. - src/g10lib.h [__arm__] (fast_wipememory2_unaligned_head) - (fast_wipememory2): New macros. - - cipher: bufhelp: allow unaligned memory accesses on ARM. - * cipher/bufhelp.h [__arm__ && __ARM_FEATURE_UNALIGNED]: Enable - BUFHELP_FAST_UNALIGNED_ACCESS. - -2013-08-17 Jussi Kivilinna - - Remove burn_stack optimization. - * src/misc.c (_gcry_burn_stack): Remove SIZEOF_UNSIGNED_LONG == 4 or 8 - optimization. - -2013-08-16 Jussi Kivilinna - - camellia: add ARMv6 assembly implementation. - * cipher/Makefile.am: Add 'camellia-armv6.S'. - * cipher/camellia-armv6.S: New file. - * cipher/camellia-glue.c [USE_ARMV6_ASM] - (_gcry_camellia_armv6_encrypt_block) - (_gcry_camellia_armv6_decrypt_block): New prototypes. - [USE_ARMV6_ASM] (Camellia_EncryptBlock, Camellia_DecryptBlock) - (camellia_encrypt, camellia_decrypt): New functions. - * cipher/camellia.c [!USE_ARMV6_ASM]: Compile encryption and decryption - routines if USE_ARMV6_ASM macro is _not_ defined. - * cipher/camellia.h (USE_ARMV6_ASM): New macro. - [!USE_ARMV6_ASM] (Camellia_EncryptBlock, Camellia_DecryptBlock): If - USE_ARMV6_ASM is defined, disable these function prototypes. - (camellia) [arm]: Add 'camellia-armv6.lo'. - - blowfish: add ARMv6 assembly implementation. - * cipher/Makefile.am: Add 'blowfish-armv6.S'. - * cipher/blowfish-armv6.S: New file. - * cipher/blowfish.c (USE_ARMV6_ASM): New macro. - [USE_ARMV6_ASM] (_gcry_blowfish_armv6_do_encrypt) - (_gcry_blowfish_armv6_encrypt_block) - (_gcry_blowfish_armv6_decrypt_block, _gcry_blowfish_armv6_ctr_enc) - (_gcry_blowfish_armv6_cbc_dec, _gcry_blowfish_armv6_cfb_dec): New - prototypes. - [USE_ARMV6_ASM] (do_encrypt, do_encrypt_block, do_decrypt_block) - (encrypt_block, decrypt_block): New functions. - (_gcry_blowfish_ctr_enc) [USE_ARMV6_ASM]: Use ARMv6 assembly function. - (_gcry_blowfish_cbc_dec) [USE_ARMV6_ASM]: Use ARMv6 assembly function. - (_gcry_blowfish_cfb_dec) [USE_ARMV6_ASM]: Use ARMv6 assembly function. - * configure.ac (blowfish) [arm]: Add 'blowfish-armv6.lo'. - - cast5: add ARMv6 assembly implementation. - * cipher/Makefile.am: Add 'cast5-armv6.S'. - * cipher/cast5-armv6.S: New file. - * cipher/cast5.c (USE_ARMV6_ASM): New macro. - (CAST5_context) [USE_ARMV6_ASM]: New members 'Kr_arm_enc' and - 'Kr_arm_dec'. - [USE_ARMV6_ASM] (_gcry_cast5_armv6_encrypt_block) - (_gcry_cast5_armv6_decrypt_block, _gcry_cast5_armv6_ctr_enc) - (_gcry_cast5_armv6_cbc_dec, _gcry_cast5_armv6_cfb_dec): New prototypes. - [USE_ARMV6_ASM] (do_encrypt_block, do_decrypt_block, encrypt_block) - (decrypt_block): New functions. - (_gcry_cast5_ctr_enc) [USE_ARMV6_ASM]: Use ARMv6 assembly function. - (_gcry_cast5_cbc_dec) [USE_ARMV6_ASM]: Use ARMv6 assembly function. - (_gcry_cast5_cfb_dec) [USE_ARMV6_ASM]: Use ARMv6 assembly function. - (do_cast_setkey) [USE_ARMV6_ASM]: Initialize 'Kr_arm_enc' and - 'Kr_arm_dec'. - * configure.ac (cast5) [arm]: Add 'cast5-armv6.lo'. - -2013-08-14 Jussi Kivilinna - - rijndael: add ARMv6 assembly implementation. - * cipher/Makefile.am: Add 'rijndael-armv6.S'. - * cipher/rijndael-armv6.S: New file. - * cipher/rijndael.c (USE_ARMV6_ASM): New macro. - [USE_ARMV6_ASM] (_gcry_aes_armv6_encrypt_block) - (_gcry_aes_armv6_decrypt_block): New prototypes. - (do_encrypt_aligned) [USE_ARMV6_ASM]: Use ARMv6 assembly function. - (do_encrypt): Disable input/output alignment when USE_ARMV6_ASM. - (do_decrypt_aligned) [USE_ARMV6_ASM]: Use ARMv6 assembly function. - (do_decrypt): Disable input/output alignment when USE_ARMV6_ASM. - * configure.ac (HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS): New check for - gcc/as compatibility with ARM assembly implementations. - (aes) [arm]: Add 'rijndael-armv6.lo'. - -2013-08-09 NIIBE Yutaka - - cipher: fix memory leak. - * cipher/pubkey.c (gcry_pk_sign): Handle the specific case of ECC, - where there is NULL whichi is not the sentinel. - -2013-08-08 Werner Koch - - mpi: Clear immutable flag on the result of gcry_mpi_set. - * mpi/mpiutil.c (gcry_mpi_set): Reset immutable and const flags. - * tests/mpitests.c (test_const_and_immutable): Add a test for this. - -2013-08-07 NIIBE Yutaka - - tests: fix memory leaks. - * tests/benchmark.c (dsa_bench): Release SIG. - - * tests/mpitests.c (test_powm): Release BASE, EXP, MOD, and RES. - - * tests/prime.c (check_primes): Release PRIME. - - * tests/tsexp.c (basic): Use intermediate variable M for constant. - Release S1, S2 and A. - -2013-08-07 Jussi Kivilinna - - Fix building on W32 (cannot export symbol 'gcry_sexp_get_buffer') - * src/libgcrypt.def: Change 'gcry_sexp_get_buffer' to - 'gcry_sexp_nth_buffer'. - -2013-08-06 NIIBE Yutaka - - cipher: fix another memory leak. - * cipher/ecc.c (ecc_get_curve): Free TMP. - - tests: fix memory leaks. - * tests/pubkey.c (check_keys_crypt): Release L, X0, and X1. - (check_keys): Release X. - - cipher: fix memory leaks. - * cipher/elgamal.c (elg_generate_ext): Free XVALUE. - - * cipher/pubkey.c (sexp_elements_extract): Don't use IDX for loop. - Call mpi_free. - (sexp_elements_extract_ecc): Call mpi_free. - -2013-08-05 Werner Koch - - mpi: Improve gcry_mpi_invm to detect bad input. - * mpi/mpi-inv.c (gcry_mpi_invm): Return 0 for bad input. - -2013-07-31 Dmitry Eremin-Solenikov - - Correct checks for ecc secret key. - * cipher/ecc.c (check_secret_key): replace wrong comparison of Q and - sk->Q points with correct one. - -2013-07-29 Werner Koch - - sexp: Allow white space anywhere in a hex format. - * src/sexp.c (hextobyte): Remove. - (hextonibble): New. - (vsexp_sscan): Skip whtespace between hex nibbles. - - Implement deterministic ECDSA as specified by rfc-6979. - * cipher/ecc.c (sign): Add args FLAGS and HASHALGO. Convert an opaque - MPI as INPUT. Implement rfc-6979. - (ecc_sign): Remove the opaque MPI code and pass FLAGS to sign. - (verify): Do not allocate and compute Y; it is not used. - (ecc_verify): Truncate the hash value if needed. - * tests/dsa-rfc6979.c (check_dsa_rfc6979): Add ECDSA test cases. - -2013-07-26 Werner Koch - - Implement deterministic DSA as specified by rfc-6979. - * cipher/dsa.c (dsa_sign): Move opaque mpi extraction to sign. - (sign): Add args FLAGS and HASHALGO. Implement deterministic DSA. - Add code path for R==0 to comply with the standard. - (dsa_verify): Left fill opaque mpi based hash values. - * cipher/dsa-common.c (int2octets, bits2octets): New. - (_gcry_dsa_gen_rfc6979_k): New. - * tests/dsa-rfc6979.c: New. - * tests/Makefile.am (TESTS): Add dsa-rfc6979. - - Allow the use of a private-key s-expression with gcry_pk_verify. - * cipher/pubkey.c (sexp_to_key): Fallback to private key. - -2013-07-25 Werner Koch - - Mitigate a flush+reload cache attack on RSA secret exponents. - * mpi/mpi-pow.c (gcry_mpi_powm): Always perfrom the mpi_mul for - exponents in secure memory. - -2013-07-19 Werner Koch - - pk: Allow the use of a hash element for DSA sign and verify. - * cipher/pubkey.c (pubkey_sign): Add arg ctx and pass it to the sign - module. - (gcry_pk_sign): Pass CTX to pubkey_sign. - (sexp_data_to_mpi): Add flag rfc6979 and code to alls hash with *DSA - * cipher/rsa.c (rsa_sign, rsa_verify): Return an error if an opaque - MPI is given for DATA/HASH. - * cipher/elgamal.c (elg_sign, elg_verify): Ditto. - * cipher/dsa.c (dsa_sign, dsa_verify): Convert a given opaque MPI. - * cipher/ecc.c (ecc_sign, ecc_verify): Ditto. - * tests/basic.c (check_pubkey_sign_ecdsa): Add a test for using a hash - element with DSA. - - sexp: Add function gcry_sexp_nth_buffer. - * src/sexp.c (gcry_sexp_nth_buffer): New. - * src/visibility.c, src/visibility.h: Add function wrapper. - * src/libgcrypt.vers, src/libgcrypt.def: Add to API. - * src/gcrypt.h.in: Add prototype. - -2013-07-18 Werner Koch - - Add support for Salsa20. - * src/gcrypt.h.in (GCRY_CIPHER_SALSA20): New. - * cipher/salsa20.c: New. - * configure.ac (available_ciphers): Add Salsa20. - * cipher/cipher.c: Register Salsa20. - (cipher_setiv): Allow to divert an IV to a cipher module. - * src/cipher-proto.h (cipher_setiv_func_t): New. - (cipher_extra_spec): Add field setiv. - * src/cipher.h: Declare Salsa20 definitions. - * tests/basic.c (check_stream_cipher): New. - (check_stream_cipher_large_block): New. - (check_cipher_modes): Run new test functions. - (check_ciphers): Add simple test for Salsa20. - -2013-07-17 Werner Koch - - Allow gcry_mpi_dump to print opaque MPIs. - * mpi/mpicoder.c (gcry_mpi_dump): Detect abd print opaque MPIs. - * tests/mpitests.c (test_opaque): New. - (main): Call new test. - - cipher: Prepare to pass extra info to the sign functions. - * src/gcrypt-module.h (gcry_pk_sign_t): Add parms flags and hashalgo. - * cipher/rsa.c (rsa_sign): Add parms and mark them as unused. - * cipher/dsa.c (dsa_sign): Ditto. - * cipher/elgamal.c (elg_sign): Ditto. - * cipher/pubkey.c (dummy_sign): Ditto. - (pubkey_sign): Pass 0 for the new args. - - Fix a special case bug in mpi_powm for e==0. - * mpi/mpi-pow.c (gcry_mpi_powm): For a zero exponent, make sure that - the result has been allocated. - -2013-07-15 Dmitry Eremin-Solenikov - - Fix memory leak in t-mpi-point test. - * tests/t-mpi-point.c (basic_ec_math, basic_ec_math_simplified): add - calls to gcry_ctx_release() to free contexts after they become unused. - -2013-07-10 Jussi Kivilinna - - Fix 'Please include winsock2.h before windows.h' warnings with mingw32. - * random/rndw32.c: include winsock2.h before windows.h. - * src/ath.h [_WIN32]: Ditto. - * tests/benchmark.c [_WIN32]: Ditto. - - Remove duplicate header from mpi/amd64/mpih-mul2.S. - * mpi/amd64/mpih-mul2.S: remove duplicated header. - - Fix i386/amd64 inline assembly "cc" clobbers. - * cipher/bithelp.h [__GNUC__, __i386__] (rol, ror): add "cc" globber - for inline assembly. - * cipher/cast5.c [__GNUC__, __i386__] (rol): Ditto. - * random/rndhw.c [USE_DRNG] (rdrand_long): Ditto. - * src/hmac256.c [__GNUC__, __i386__] (ror): Ditto. - * mpi/longlong.c [__i386__] (add_ssaaaa, sub_ddmmss, umul_ppmm) - (udiv_qrnnd, count_leading_zeros, count_trailing_zeros): Ditto. - - bufhelp: Suppress 'cast increases required alignment' warning. - * cipher/bufhelp.h (buf_xor, buf_xor_2dst, buf_xor_n_copy): Cast - to larger element pointer through (void *) to suppress -Wcast-error. - - mpi: Add __ARM_ARCH for older GCC. - * mpi/longlong.h [__arm__]: Construct __ARM_ARCH if not provided by - compiler. - - mpi: add missing "cc" clobber for ARM assembly. - * mpi/longlong.h [__arm__] (add_ssaaaa, sub_ddmmss): Add __CLOBBER_CC. - [__arm__][__ARM_ARCH <= 3] (umul_ppmm): Ditto. - - Tweak ARM inline assembly for mpi. - mpi/longlong.h [__arm__]: Enable inline assembly if __thumb2__ is - defined. - [__arm__]: Use __ARCH_ARM when defined. - [__arm__] [__ARM_ARCH >= 5] (count_leading_zeros): New. - -2013-06-26 Werner Koch - - Make gpg-error replacement defines more robust. - * configure.ac (AH_BOTTOM): Move GPG_ERR_ replacement defines to ... - * src/gcrypt-int.h: new file. - * src/visibility.h, src/cipher.h: Replace gcrypt.h by gcrypt-int.h. - * tests/: Ditto for all test files. - -2013-06-20 Jussi Kivilinna - - Check if assembler is compatible with AMD64 assembly implementations. - * cipher/blowfish-amd64.S: Enable only if - HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS is defined. - * cipher/camellia-aesni-avx-amd64.S: Ditto. - * cipher/camellia-aesni-avx2-amd64.S: Ditto. - * cipher/cast5-amd64.S: Ditto. - * cipher/rinjdael-amd64.S: Ditto. - * cipher/serpent-avx2-amd64.S: Ditto. - * cipher/serpent-sse2-amd64.S: Ditto. - * cipher/twofish-amd64.S: Ditto. - * cipher/blowfish.c: Use AMD64 assembly implementation only if - HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS is defined - * cipher/camellia-glue.c: Ditto. - * cipher/cast5.c: Ditto. - * cipher/rijndael.c: Ditto. - * cipher/serpent.c: Ditto. - * cipher/twofish.c: Ditto. - * configure.ac: Check gcc/as compatibility with AMD64 assembly - implementations. - -2013-06-09 Jussi Kivilinna - - Optimize _gcry_burn_stack for 32-bit and 64-bit architectures. - * src/misc.c (_gcry_burn_stack): Add optimization for 32-bit and 64-bit - architectures. - - Add Camellia AES-NI/AVX2 implementation. - * cipher/Makefile.am: Add 'camellia-aesni-avx2-amd64.S'. - * cipher/camellia-aesni-avx2-amd64.S: New file. - * cipher/camellia-glue.c (USE_AESNI_AVX2): New macro. - (CAMELLIA_context) [USE_AESNI_AVX2]: Add 'use_aesni_avx2'. - [USE_AESNI_AVX2] (_gcry_camellia_aesni_avx2_ctr_enc) - (_gcry_camellia_aesni_avx2_cbc_dec) - (_gcry_camellia_aesni_avx2_cfb_dec): New prototypes. - (camellia_setkey) [USE_AESNI_AVX2]: Check AVX2+AES-NI capable hardware - and set 'ctx->use_aesni_avx2'. - (_gcry_camellia_ctr_enc) [USE_AESNI_AVX2]: Add AVX2 accelerated code. - (_gcry_camellia_cbc_dec) [USE_AESNI_AVX2]: Add AVX2 accelerated code. - (_gcry_camellia_cfb_dec) [USE_AESNI_AVX2]: Add AVX2 accelerated code. - (selftest_ctr_128, selftest_cbc_128, selftest_cfb_128): Grow 'nblocks' - so that AVX2 codepaths get tested. - * configure.ac (camellia) [avx2support, aesnisupport]: Add - 'camellia-aesni-avx2-amd64.lo'. - - Add Serpent AVX2 implementation. - * cipher/Makefile.am: Add 'serpent-avx2-amd64.S'. - * cipher/serpent-avx2-amd64.S: New file. - * cipher/serpent.c (USE_AVX2): New macro. - (serpent_context_t) [USE_AVX2]: Add 'use_avx2'. - [USE_AVX2] (_gcry_serpent_avx2_ctr_enc, _gcry_serpent_avx2_cbc_dec) - (_gcry_serpent_avx2_cfb_dec): New prototypes. - (serpent_setkey_internal) [USE_AVX2]: Check for AVX2 capable hardware - and set 'use_avx2'. - (_gcry_serpent_ctr_enc) [USE_AVX2]: Use AVX2 accelerated functions. - (_gcry_serpent_cbc_dec) [USE_AVX2]: Use AVX2 accelerated functions. - (_gcry_serpent_cfb_dec) [USE_AVX2]: Use AVX2 accelerated functions. - (selftest_ctr_128, selftest_cbc_128, selftest_cfb_128): Grow 'nblocks' - so that AVX2 codepaths are tested. - * configure.ac (serpent) [avx2support]: Add 'serpent-avx2-amd64.lo'. - - Add detection for Intel AVX2 instruction set. - * configure.ac: Add option --disable-avx2-support. - (HAVE_GCC_INLINE_ASM_AVX2): New. - (ENABLE_AVX2_SUPPORT): New. - * src/g10lib.h (HWF_INTEL_AVX2): New. - * src/global.c (hwflist): Add HWF_INTEL_AVX2. - * src/hwf-x86.c [__i386__] (get_cpuid): Initialize registers to zero - before cpuid. - [__x86_64__] (get_cpuid): Initialize registers to zero before cpuid. - (detect_x86_gnuc): Store maximum cpuid level. - (detect_x86_gnuc) [ENABLE_AVX2_SUPPORT]: Add detection for AVX2. - - twofish: add amd64 assembly implementation. - * cipher/Makefile.am: Add 'twofish-amd64.S'. - * cipher/twofish-amd64.S: New file. - * cipher/twofish.c (USE_AMD64_ASM): New macro. - [USE_AMD64_ASM] (_gcry_twofish_amd64_encrypt_block) - (_gcry_twofish_amd64_decrypt_block, _gcry_twofish_amd64_ctr_enc) - (_gcry_twofish_amd64_cbc_dec, _gcry_twofish_amd64_cfb_dec): New - prototypes. - [USE_AMD64_ASM] (do_twofish_encrypt, do_twofish_decrypt) - (twofish_encrypt, twofish_decrypt): New functions. - (_gcry_twofish_ctr_enc, _gcry_twofish_cbc_dec, _gcry_twofish_cfb_dec) - (selftest_ctr, selftest_cbc, selftest_cfb): New functions. - (selftest): Call new bulk selftests. - * cipher/cipher.c (gcry_cipher_open) [USE_TWOFISH]: Register Twofish - bulk functions for ctr-enc, cbc-dec and cfb-dec. - * configure.ac (twofish) [x86_64]: Add 'twofish-amd64.lo'. - * src/cipher.h (_gcry_twofish_ctr_enc, _gcry_twofish_cbc_dec) - (gcry_twofish_cfb_dec): New prototypes. - -2013-05-29 Jussi Kivilinna - - rinjdael: add amd64 assembly implementation. - * cipher/Makefile.am: Add 'rijndael-amd64.S'. - * cipher/rijndael-amd64.S: New file. - * cipher/rijndael.c (USE_AMD64_ASM): New macro. - [USE_AMD64_ASM] (_gcry_aes_amd64_encrypt_block) - (_gcry_aes_amd64_decrypt_block): New prototypes. - (do_encrypt_aligned) [USE_AMD64_ASM]: Use amd64 assembly function. - (do_encrypt): Disable input/output alignment when USE_AMD64_ASM is set. - (do_decrypt_aligned) [USE_AMD64_ASM]: Use amd64 assembly function. - (do_decrypt): Disable input/output alignment when USE_AMD64_AES is set. - * configure.ac (aes) [x86-64]: Add 'rijndael-amd64.lo'. - - blowfish: add amd64 assembly implementation. - * cipher/Makefile.am: Add 'blowfish-amd64.S'. - * cipher/blowfish-amd64.S: New file. - * cipher/blowfish.c (USE_AMD64_ASM): New macro. - [USE_AMD64_ASM] (_gcry_blowfish_amd64_do_encrypt) - (_gcry_blowfish_amd64_encrypt_block) - (_gcry_blowfish_amd64_decrypt_block, _gcry_blowfish_amd64_ctr_enc) - (_gcry_blowfish_amd64_cbc_dec, _gcry_blowfish_amd64_cfb_dec): New - prototypes. - [USE_AMD64_ASM] (do_encrypt, do_encrypt_block, do_decrypt_block) - (encrypt_block, decrypt_block): New functions. - (_gcry_blowfish_ctr_enc, _gcry_blowfish_cbc_dec) - (_gcry_blowfish_cfb_dec, selftest_ctr, selftest_cbc, selftest_cfb): New - functions. - (selftest): Call new bulk selftests. - * cipher/cipher.c (gcry_cipher_open) [USE_BLOWFISH]: Register Blowfish - bulk functions for ctr-enc, cbc-dec and cfb-dec. - * configure.ac (blowfish) [x86_64]: Add 'blowfish-amd64.lo'. - * src/cipher.h (_gcry_blowfish_ctr_enc, _gcry_blowfish_cbc_dec) - (gcry_blowfish_cfb_dec): New prototypes. - -2013-05-24 Werner Koch - - ecc: Simplify the compliant point generation. - * cipher/ecc.c (generate_key): Use point_snatch_set, replaces unneeded - variable copies, etc. - - ecc: Fix a minor flaw in the generation of K. - * cipher/dsa.c (gen_k): Factor code out to .. - * cipher/dsa-common.c (_gcry_dsa_gen_k): new file and function. Add - arg security_level and re-indent a bit. - * cipher/ecc.c (gen_k): Remove and change callers to _gcry_dsa_gen_k. - * cipher/dsa.c: Include pubkey-internal. - * cipher/Makefile.am (libcipher_la_SOURCES): Add dsa-common.c - -2013-05-24 Jussi Kivilinna - - cast5: add amd64 assembly implementation. - * cipher/Makefile.am: Add 'cast5-amd64.S'. - * cipher/cast5-amd64.S: New file. - * cipher/cast5.c (USE_AMD64_ASM): New macro. - (_gcry_cast5_s1tos4): Merge arrays s1, s2, s3, s4 to single array to - simplify access from assembly implementation. - (s1, s2, s3, s4): New macros pointing to subarrays in - _gcry_cast5_s1tos4. - [USE_AMD64_ASM] (_gcry_cast5_amd64_encrypt_block) - (_gcry_cast5_amd64_decrypt_block, _gcry_cast5_amd64_ctr_enc) - (_gcry_cast5_amd64_cbc_dec, _gcry_cast5_amd64_cfb_dec): New prototypes. - [USE_AMD64_ASM] (do_encrypt_block, do_decrypt_block, encrypt_block) - (decrypt_block): New functions. - (_gcry_cast5_ctr_enc, _gcry_cast5_cbc_dec, _gcry_cast5_cfb_dec) - (selftest_ctr, selftest_cbc, selftest_cfb): New functions. - (selftest): Call new bulk selftests. - * cipher/cipher.c (gcry_cipher_open) [USE_CAST5]: Register CAST5 bulk - functions for ctr-enc, cbc-dec and cfb-dec. - * configure.ac (cast5) [x86_64]: Add 'cast5-amd64.lo'. - * src/cipher.h (_gcry_cast5_ctr_enc, _gcry_cast5_cbc_dec) - (gcry_cast5_cfb_dec): New prototypes. - - cipher-selftest: make selftest work with any block-size. - * cipher/cipher-selftest.c (_gcry_selftest_helper_cbc_128) - (_gcry_selftest_helper_cfb_128, _gcry_selftest_helper_ctr_128): Renamed - functions from '_128' to ''. - (_gcry_selftest_helper_cbc, _gcry_selftest_helper_cfb) - (_gcry_selftest_helper_ctr): Make work with different block sizes. - * cipher/cipher-selftest.h (_gcry_selftest_helper_cbc_128) - (_gcry_selftest_helper_cfb_128, _gcry_selftest_helper_ctr_128): Renamed - prototypes from '_128' to ''. - * cipher/camellia-glue.c (selftest_ctr_128, selftest_cfb_128) - (selftest_ctr_128): Change to use new function names. - * cipher/rijndael.c (selftest_ctr_128, selftest_cfb_128) - (selftest_ctr_128): Change to use new function names. - * cipher/serpent.c (selftest_ctr_128, selftest_cfb_128) - (selftest_ctr_128): Change to use new function names. - -2013-05-23 Jussi Kivilinna - - serpent: add parallel processing for CFB decryption. - * cipher/cipher.c (gcry_cipher_open): Add bulf CFB decryption function - for Serpent. - * cipher/serpent-sse2-amd64.S (_gcry_serpent_sse2_cfb_dec): New - function. - * cipher/serpent.c (_gcry_serpent_sse2_cfb_dec): New prototype. - (_gcry_serpent_cfb_dec) New function. - (selftest_cfb_128) New function. - (selftest) Call selftest_cfb_128. - * src/cipher.h (_gcry_serpent_cfb_dec): New prototype. - - camellia: add parallel processing for CFB decryption. - * cipher/camellia-aesni-avx-amd64.S - (_gcry_camellia_aesni_avx_cfb_dec): New function. - * cipher/camellia-glue.c (_gcry_camellia_aesni_avx_cfb_dec): New - prototype. - (_gcry_camellia_cfb_dec): New function. - (selftest_cfb_128): New function. - (selftest): Call selftest_cfb_128. - * cipher/cipher.c (gry_cipher_open): Add bulk CFB decryption function - for Camellia. - * src/cipher.h (_gcry_camellia_cfb_dec): New prototype. - - rinjdael: add parallel processing for CFB decryption with AES-NI. - * cipher/cipher-selftest.c (_gcry_selftest_helper_cfb_128): New - function for CFB selftests. - * cipher/cipher-selftest.h (_gcry_selftest_helper_cfb_128): New - prototype. - * cipher/rijndael.c [USE_AESNI] (do_aesni_enc_vec4): New function. - (_gcry_aes_cfb_dec) [USE_AESNI]: Add parallelized CFB decryption. - (selftest_cfb_128): New function. - (selftest): Call selftest_cfb_128. - -2013-05-23 Werner Koch - - Avoid compiler warning due to the global symbol setkey. - * cipher/cipher-selftest.c (_gcry_selftest_helper_cbc_128) - (_gcry_selftest_helper_ctr_128): Rename setkey to setkey_func. - -2013-05-23 Jussi Kivilinna - - serpent: add SSE2 accelerated amd64 implementation. - * configure.ac (serpent): Add 'serpent-sse2-amd64.lo'. - * cipher/Makefile.am (EXTRA_libcipher_la_SOURCES): Add - 'serpent-sse2-amd64.S'. - * cipher/cipher.c (gcry_cipher_open) [USE_SERPENT]: Register bulk - functions for CBC-decryption and CTR-mode. - * cipher/serpent.c (USE_SSE2): New macro. - [USE_SSE2] (_gcry_serpent_sse2_ctr_enc, _gcry_serpent_sse2_cbc_dec): - New prototypes to assembler functions. - (serpent_setkey): Set 'serpent_init_done' before calling serpent_test. - (_gcry_serpent_ctr_enc): New function. - (_gcry_serpent_cbc_dec): New function. - (selftest_ctr_128): New function. - (selftest_cbc_128): New function. - (selftest): Call selftest_ctr_128 and selftest_cbc_128. - * cipher/serpent-sse2-amd64.S: New file. - * src/cipher.h (_gcry_serpent_ctr_enc): New prototype. - (_gcry_serpent_cbc_dec): New prototype. - - Serpent: faster S-box implementation. - * cipher/serpent.c (SBOX0, SBOX1, SBOX2, SBOX3, SBOX4, SBOX5, SBOX6) - (SBOX7, SBOX0_INVERSE, SBOX1_INVERSE, SBOX2_INVERSE, SBOX3_INVERSE) - (SBOX4_INVERSE, SBOX5_INVERSE, SBOX6_INVERSE, SBOX7_INVERSE): Replace - with new definitions. - -2013-05-22 Werner Koch - - w32: Fix installing of .def file. - * src/Makefile.am (install-def-file): Create libdir first. - - Add control commands to disable mlock and setuid dropping. - * src/gcrypt.h.in (GCRYCTL_DISABLE_LOCKED_SECMEM): New. - (GCRYCTL_DISABLE_PRIV_DROP): New. - * src/global.c (_gcry_vcontrol): Implement them. - * src/secmem.h (GCRY_SECMEM_FLAG_NO_MLOCK): New. - (GCRY_SECMEM_FLAG_NO_PRIV_DROP): New. - * src/secmem.c (no_mlock, no_priv_drop): New. - (_gcry_secmem_set_flags, _gcry_secmem_get_flags): Set and get them. - (lock_pool): Handle no_mlock and no_priv_drop. - - Fix libtool 2.4.2 to correctly detect .def files. - * ltmain.sh (sed_uncomment_deffile): New. - (orig_export_symbols): Uncomment def file before testing for EXPORTS. - * m4/libtool.m4: Do the same for the generated code. - -2013-05-22 Jussi Kivilinna - - Add AES bulk CBC decryption selftest. - * cipher/rinjdael.c (selftest_cbc_128): New. - (selftest): Call selftest_cbc_128. - - Change AES bulk CTR encryption selftest use new selftest helper function - * cipher/rinjdael.c: (selftest_ctr_128): Change to use new selftest - helper function. - - Convert bulk CTR and CBC selftest functions in Camellia to generic selftest helper functions - * cipher/Makefile.am (libcipher_la_SOURCES): Add cipher-selftest files. - * cipher/camellia-glue.c (selftest_ctr_128, selftest_cbc_128): Change - to use the new selftest helper functions. - * cipher/cipher-selftest.c: New. - * cipher/cipher-selftest.h: New. - - camellia: add bulk CBC decryption selftest. - * cipher/camellia-glue.c: (selftest_cbc_128): New selftest function for - bulk CBC decryption. - (selftest): Add call to selftest_cbc_128. - - camellia: Rename camellia_aesni_avx_x86-64.S to camellia-aesni-avx-amd64.S - * cipher/camellia_aesni_avx_x86-64.S: Remove. - * cipher/camellia-aesni-avx-amd64.S: New. - * cipher/Makefile.am: Use the new filename. - * configure.ac: Use the new filename. - -2013-05-21 Werner Koch - - Fix indentation and save on string space. - * cipher/ecc.c (generate_key): Use the same string for both fatal - messages. - -2013-05-20 Andrey - - cipher: Fix segv in last ECC change. - * cipher/ecc.c (generate_key): Make sure R is initialized. - -2013-05-09 Andrey - - cipher: Generate compliant ECC keys. - * cipher/ecc.c (generate_key): Make sure a key is compliant for - using the compact representation. - -2013-04-18 Werner Koch - - cipher: Fix regression in Padlock support. - * cipher/rijndael.c (do_setkey): Remove dummy padlock key generation case - and use the standard one. - - mpi: Yet another fix to get option flag munging right. - * cipher/Makefile.am (o_flag_munging): Yet another fix. - - mpi: Make using gcc's -Ofast easier. - * cipher/Makefile.am (o_flag_munging): Take -Ofast in account. - - Fix alignment problem in idea.c. - * cipher/idea.c (cipher): Rework parameter use to fix alignment - problems. - - * cipher/idea.c (FNCCAST_SETKEY, FNCCAST_CRYPT): Remove unused macros. - - Fix alignment problem in idea.c. - - * cipher/idea.c (cipher): Rework parameter use to fix alignment - problems. - - * cipher/idea.c (FNCCAST_SETKEY, FNCCAST_CRYPT): Remove unused macros. - - - (cherry picked from 4cd279556777e02eda79973f68efaa4b741f9175) - -2013-04-18 Vladimir Serbinenko - - Add some const attributes. - * cipher/md4.c (transform): Add const attribute. - * cipher/md5.c (transform): Ditto. - * cipher/rmd160.c (transform): Ditto. - - Fix alignment problem in serpent.c. - * cipher/serpent.c (serpent_key_prepare): Fix misaligned access. - (serpent_setkey): Likewise. - (serpent_encrypt_internal): Likewise. - (serpent_decrypt_internal): Likewise. - (serpent_encrypt): Don't put an alignment-increasing cast. - (serpent_decrypt): Likewise. - (serpent_test): Likewise. - -2013-04-16 Werner Koch - - Fix multiply by zero in gcry_mpi_ec_mul. - * mpi/ec.c (_gcry_mpi_ec_mul_point): Handle case of SCALAR == 0. - * tests/t-mpi-point.c (basic_ec_math): Add a test case for this. - -2013-04-15 Werner Koch - - Add macros to return pre-defined MPIs. - * src/gcrypt.h.in (GCRYMPI_CONST_ONE, GCRYMPI_CONST_TWO) - (GCRYMPI_CONST_THREE, GCRYMPI_CONST_FOUR, GCRYMPI_CONST_EIGHT): New. - (_gcry_mpi_get_const): New private function. - * src/visibility.c (_gcry_mpi_get_const): New. - * src/visibility.h: Mark it visible. - - Fix addition of EC points. - * mpi/ec.c (_gcry_mpi_ec_add_points): Fix case of P1 given in affine - coordinates. - -2013-04-12 Werner Koch - - Add hack to allow using an "ecc" key for "ecdsa" or "ecdh". - * cipher/pubkey.c (sexp_to_key): Add optional arg USE. - (gcry_pk_encrypt, gcry_pk_decrypt): Call sexp_to_key with usage sign. - (gcry_pk_sign, gcry_pk_verify): Call sexp_to_key with usage encrypt. - * tests/basic.c (show_sexp): New. - (check_pubkey_sign): Print test number and add cases for ecc. - (check_pubkey_sign_ecdsa): New. - (do_check_one_pubkey): Divert to new function. - -2013-04-11 Werner Koch - - Add gcry_pubkey_get_sexp. - * src/gcrypt.h.in (GCRY_PK_GET_PUBKEY): New. - (GCRY_PK_GET_SECKEY): New. - (gcry_pubkey_get_sexp): New. - * src/visibility.c (gcry_pubkey_get_sexp): New. - * src/visibility.h (gcry_pubkey_get_sexp): Mark visible. - * src/libgcrypt.def, src/libgcrypt.vers: Add new function. - * cipher/pubkey-internal.h: New. - * cipher/Makefile.am (libcipher_la_SOURCES): Add new file. - * cipher/ecc.c: Include pubkey-internal.h - (_gcry_pk_ecc_get_sexp): New. - * cipher/pubkey.c: Include pubkey-internal.h and context.h. - (_gcry_pubkey_get_sexp): New. - * src/context.c (_gcry_ctx_find_pointer): New. - * src/cipher-proto.h: Add _gcry_pubkey_get_sexp. - * tests/t-mpi-point.c (print_sexp): New. - (context_param, basic_ec_math_simplified): Add tests for the new - function. - - * configure.ac (NEED_GPG_ERROR_VERSION): Set to 1.11. - (AH_BOTTOM) Add error codes from gpg-error 1.12 - * src/g10lib.h (fips_not_operational): Use GPG_ERR_NOT_OPERATIONAL. - - * mpi/ec.c (_gcry_mpi_ec_get_mpi): Fix computation of Q. - (_gcry_mpi_ec_get_point): Ditto. - - Remove unused code. - * cipher/pubkey.c (_gcry_pk_module_lookup, _gcry_pk_module_release) - (_gcry_pk_get_elements): Remove. - -2013-04-05 Werner Koch - - Make the Q parameter optional for ECC signing. - * cipher/ecc.c (ecc_sign): Remove the need for Q. - * cipher/pubkey.c (sexp_elements_extract_ecc): Make Q optional for a - private key. - (sexp_to_key): Add optional arg R_IS_ECC. - (gcry_pk_sign): Do not call gcry_pk_get_nbits for ECC keys. - * tests/pubkey.c (die): Make sure to print a LF. - (check_ecc_sample_key): New. - (main): Call new test. - - Add test case for SCRYPT and rework the code. - * tests/t-kdf.c (check_scrypt): New. - (main): Call new test. - - * configure.ac: Support disabling of the scrypt algorithm. Make KDF - enabling similar to the other algorithm classes. Disable scrypt if we - don't have a 64 bit type. - * cipher/memxor.c, cipher/memxor.h: Remove. - * cipher/scrypt.h: Remove. - * cipher/kdf-internal.h: New. - * cipher/Makefile.am: Remove files. Add new file. Move scrypt.c to - EXTRA_libcipher_la_SOURCES. - (GCRYPT_MODULES): Add GCRYPT_KDFS. - * src/gcrypt.h.in (GCRY_KDF_SCRYPT): Change value. - * cipher/kdf.c (pkdf2): Rename to _gcry_kdf_pkdf2. - (_gcry_kdf_pkdf2): Don't bail out for SALTLEN==0. - (gcry_kdf_derive): Allow for a passwordlen of zero for scrypt. Check - for SALTLEN > 0 for GCRY_KDF_PBKDF2. Pass algo to _gcry_kdf_scrypt. - (gcry_kdf_derive) [!USE_SCRYPT]: Return an error. - * cipher/scrypt.c: Replace memxor.h by bufhelp.h. Replace scrypt.h by - kdf-internal.h. Enable code only if HAVE_U64_TYPEDEF is defined. - Replace C99 types uint64_t, uint32_t, and uint8_t by libgcrypt types. - (_SALSA20_INPUT_LENGTH): Remove underscore from identifier. - (_scryptBlockMix): Replace memxor by buf_xor. - (_gcry_kdf_scrypt): Use gcry_malloc and gcry_free. Check for integer - overflow. Add hack to support blocksize of 1 for tests. Return - errors from calls to _gcry_kdf_pkdf2. - - * cipher/kdf.c (openpgp_s2k): Make static. - -2013-04-04 Christian Grothoff - - Add the SCRYPT KDF function. - * scrypt.c, scrypt.h: New files. - * memxor.c, memxor.h: New files. - * cipher/Makefile.am: Add new files. - * cipher/kdf.c (gcry_kdf_derive): Support GCRY_KDF_SCRYPT. - * src/gcrypt.h.in (GCRY_KDF_SCRYPT): New. - -2013-03-22 Werner Koch - - Replace deprecated AM_CONFIG_HEADER macro. - * configure.ac: s/AM_CONFIG_HEADER/AC_CONFIG_HEADER/ - - Disable AES-NI support if as does not support SSSE3. - * configure.ac (HAVE_GCC_INLINE_ASM_SSSE3): New test. - (ENABLE_AESNI_SUPPORT): Do not define without SSSE3 support. - (HAVE_GCC_INLINE_ASM_SSSE3, ENABLE_AVX_SUPPORT): Split up detection - and definition. - -2013-03-21 Werner Koch - - Fix make dependency regression. - * src/Makefile.am (libgcrypt_la_DEPENDENCIES): Add missing backslash. - Reported by LRN. - -2013-03-20 Werner Koch - - Use finer grained on-the-fly helper computations for EC. - * src/ec-context.h (mpi_ec_ctx_s): Replace NEED_SYNC by a bitfield. - * mpi/ec.c (ec_p_sync): Remove. - (ec_get_reset, ec_get_a_is_pminus3, ec_get_two_inv_p): New. - (ec_p_init): Use ec_get_reset. - (_gcry_mpi_ec_set_mpi, _gcry_mpi_ec_dup_point) - (_gcry_mpi_ec_add_points): Replace ec_p_sync by the ec_get_ accessors. - - Allow building with w64-mingw32. - * autogen.sh <--build-w32>: Support the w64-mingw32 toolchain. Also - prepare for 64 bit building. - - Provide GCRYPT_VERSION_NUMBER macro, add build info to the binary. - * src/gcrypt.h.in (GCRYPT_VERSION_NUMBER): New. - * configure.ac (VERSION_NUMBER): New ac_subst. - * src/global.c (_gcry_vcontrol): Move call to above function ... - (gcry_check_version): .. here. - - * configure.ac (BUILD_REVISION, BUILD_FILEVERSION) - (BUILD_TIMESTAMP): Define on all platforms. - * compat/compat.c (_gcry_compat_identification): Include revision and - timestamp. - - Fix a memory leak in the new EC code. - * cipher/ecc.c (point_from_keyparam): Always call mpi_free on A. - -2013-03-19 Werner Koch - - Extend the new EC interface and fix two bugs. - * src/ec-context.h (mpi_ec_ctx_s): Add field NEED_SYNC. - * mpi/ec.c (ec_p_sync): New. - (ec_p_init): Only set NEED_SYNC. - (_gcry_mpi_ec_set_mpi): Set NEED_SYNC for 'p' and 'a'. - (_gcry_mpi_ec_dup_point, _gcry_mpi_ec_add_points) - (_gcry_mpi_ec_mul_point): Call ec_p_sync. - (_gcry_mpi_ec_get_point): Recompute 'q' is needed. - (_gcry_mpi_ec_get_mpi): Ditto. Also allow for names 'q', 'q.x', - 'q.y', and 'g'. - * cipher/ecc.c (_gcry_mpi_ec_ec2os): New. - - * cipher/ecc.c (_gcry_mpi_ec_new): Fix init from parameters 'Q'->'q', - 'G'->'q'. - -2013-03-15 Werner Koch - - mpi: Add functions to manipulate an EC context. - * src/gcrypt.h.in (gcry_mpi_ec_p_new): Remove. - (gcry_mpi_ec_new): New. - (gcry_mpi_ec_get_mpi): New. - (gcry_mpi_ec_get_point): New. - (gcry_mpi_ec_set_mpi): New. - (gcry_mpi_ec_set_point): New. - * src/visibility.c (gcry_mpi_ec_p_new): Remove. - * mpi/ec.c (_gcry_mpi_ec_p_new): Make it an internal function and - change to return an error code. - (_gcry_mpi_ec_get_mpi): New. - (_gcry_mpi_ec_get_point): New. - (_gcry_mpi_ec_set_mpi): New. - (_gcry_mpi_ec_set_point): New. - * src/mpi.h: Add new prototypes. - * src/ec-context.h: New. - * mpi/ec.c: Include that header. - (mpi_ec_ctx_s): Move to ec-context.h, add new fields, and put some - fields into an inner struct. - (point_copy): New. - * cipher/ecc.c (fill_in_curve): Allow passing NULL for R_NBITS. - (mpi_from_keyparam, point_from_keyparam): New. - (_gcry_mpi_ec_new): New. - - * tests/t-mpi-point.c (test-curve): New. - (ec_p_new): New. Use it instead of the removed gcry_mpi_ec_p_new. - (get_and_cmp_mpi, get_and_cmp_point): New. - (context_param): New test. - (basic_ec_math_simplified): New test. - (main): Call new tests. - - * src/context.c (_gcry_ctx_get_pointer): Check for a NULL CTX. - -2013-03-13 Werner Koch - - Add GCRYMPI_FLAG_CONST and make use constants. - * src/gcrypt.h.in (GCRYMPI_FLAG_CONST): New. - * src/mpi.h (mpi_is_const, mpi_const): New. - (enum gcry_mpi_constants, MPI_NUMBER_OF_CONSTANTS): New. - * mpi/mpiutil.c (_gcry_mpi_init): New. - (constants): New. - (_gcry_mpi_free): Do not release a constant flagged MPI. - (gcry_mpi_copy): Clear the const and immutable flags. - (gcry_mpi_set_flag, gcry_mpi_clear_flag, gcry_mpi_get_flag): Support - GCRYMPI_FLAG_CONST. - (_gcry_mpi_const): New. - * src/global.c (global_init): Call _gcry_mpi_init. - * mpi/ec.c (mpi_ec_ctx_s): Remove fields one, two, three, four, and - eight. Change all users to call mpi_const() instead. - - * src/mpiutils.c (gcry_mpi_set_opaque): Check the immutable flag. - - Add GCRYMPI_FLAG_IMMUTABLE to help debugging. - * src/gcrypt.h.in (GCRYMPI_FLAG_IMMUTABLE): New. - * src/mpi.h (mpi_is_immutable): New macro. - * mpi/mpiutil.c (gcry_mpi_set_flag, gcry_mpi_clear_flag) - (gcry_mpi_get_flag): Implement new flag - (_gcry_mpi_immutable_failed): New. - - * mpi/mpiutil.c (_gcry_mpi_clear, _gcry_mpi_free, gcry_mpi_snatch) - (gcry_mpi_set, gcry_mpi_randomize): Act upon the immutable flag. - * mpi/mpi-bit.c (gcry_mpi_set_bit, gcry_mpi_set_highbit) - (gcry_mpi_clear_highbit, gcry_mpi_clear_bit) - (_gcry_mpi_rshift_limbs, gcry_mpi_lshift): Ditto. - * mpi/mpicoder.c (_gcry_mpi_set_buffer): Ditto. - -2013-03-08 Werner Koch - - mpi: Add an API for EC math. - * src/context.c, src/context.h: New. - * src/Makefile.am (libgcrypt_la_SOURCES): Add new files. - * src/gcrypt.h.in (struct gcry_context, gcry_ctx_t): New types. - (gcry_ctx_release): New prototype. - (gcry_mpi_ec_p_new, gcry_mpi_ec_get_affine, gcry_mpi_ec_dup) - (gcry_mpi_ec_add, gcry_mpi_ec_mul): New prototypes. - * mpi/ec.c: Include errno.h and context.h. - (_gcry_mpi_ec_init): Rename to .. - (ec_p_init): this, make static, remove allocation and add arg CTX. - (_gcry_mpi_ec_p_internal_new): New; to replace _gcry_mpi_ec_init. - Change all callers to use this func. - (_gcry_mpi_ec_free): Factor code out to .. - (ec_deinit): New func. - (gcry_mpi_ec_p_new): New. - * src/visibility.c: Include context.h and mpi.h. - (gcry_mpi_ec_p_new, gcry_mpi_ec_get_affine, gcry_mpi_ec_dup) - (gcry_mpi_ec_add, gcry_mpi_ec_mul) - (gcry_ctx_release): New wrapper functions. - * src/visibility.h: Mark new wrapper functions visible. - * src/libgcrypt.def, src/libgcrypt.vers: Add new symbols. - * tests/t-mpi-point.c (print_mpi, hex2mpi, cmp_mpihex): New. - (context_alloc): New. - (make_point, basic_ec_math): New. - - mpi: Add an API for EC point operations. - * mpi/ec.c (gcry_mpi_point_new, gcry_mpi_point_release): New. - (gcry_mpi_point_get, gcry_mpi_point_snatch_get): New. - (gcry_mpi_point_set, gcry_mpi_point_snatch_set): New. - * src/visibility.h, src/visibility.c: Add corresponding macros and - wrappers. - * src/gcrypt.h.in (struct gcry_mpi_point, gcry_mpi_point_t): New. - (gcry_mpi_point_new, gcry_mpi_point_release, gcry_mpi_point_get) - (gcry_mpi_point_snatch_get, gcry_mpi_point_set) - (gcry_mpi_point_snatch_set): New prototypes. - (mpi_point_new, mpi_point_release, mpi_point_get, mpi_point_snatch_get) - (mpi_point_set, mpi_point_snatch_set): New macros. - * src/libgcrypt.vers (gcry_mpi_point_new, gcry_mpi_point_release) - (gcry_mpi_point_get, gcry_mpi_point_snatch_get, gcry_mpi_point_set) - (gcry_mpi_point_snatch_set): New symbols. - * src/libgcrypt.def: Ditto. - * tests/t-mpi-point.c: New. - * tests/Makefile.am (TESTS): Add t-mpi-point - -2013-03-07 Werner Koch - - mpi: Add mpi_snatch and change an internal typedef. - * src/mpi.h (struct mpi_point_s): Rename to struct gcry_mpi_point. - (mpi_point_struct): New typedef. - (mpi_point_t): Change typedef to a pointer. Replace all occurrences - to use mpi_point_struct. - * mpi/ec.c (_gcry_mpi_ec_point_init): Rename to .. - (_gcry_mpi_point_init): this. Change all callers. - (_gcry_mpi_ec_point_free): Rename to .. - (_gcry_mpi_point_free_parts): this. Change all callers. - - * mpi/mpiutil.c (gcry_mpi_snatch): New function. - * src/gcrypt.h.in (gcry_mpi_snatch, mpi_snatch): Add protoype and - macro. - * src/visibility.c (gcry_mpi_snatch): Add wrapper. - * src/visibility.h (gcry_mpi_snatch): Add macro magic. - * src/libgcrypt.def, src/libgcrypt.vers: Add new function. - - Pretty print the configure feedback. - * acinclude.m4 (GNUPG_MSG_PRINT): Remove. - (GCRY_MSG_SHOW, GCRY_MSG_WRAP): New. - * configure.ac: Use new macros for the feedback. - -2013-02-20 Werner Koch - - Fix building of hwf-x86.c. - * src/Makefile.am (AM_CFLAGS): Set to GPG_ERROR_CFLAGS - (AM_CCASFLAGS): Set NOEXECSTACK_FLAGS. - - Remove build hacks for FreeBSD. - * configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and - LDFLAGS. - -2013-02-19 Jussi Kivilinna - - Rinjdael: Fix use of SSE2 outside USE_AESNI/ctx->use_aesni. - * cipher/rijndael.c (_gcry_aes_cbc_enc): Check if AES-NI is enabled before - calling aesni_prepare() and aesni_cleanup(). - - Add AES-NI/AVX accelerated Camellia implementation. - * configure.ac: Add option --disable-avx-support. - (HAVE_GCC_INLINE_ASM_AVX): New. - (ENABLE_AVX_SUPPORT): New. - (camellia) [ENABLE_AVX_SUPPORT, ENABLE_AESNI_SUPPORT]: Add - camellia_aesni_avx_x86-64.lo. - * cipher/Makefile.am (AM_CCASFLAGS): Add. - (EXTRA_libcipher_la_SOURCES): Add camellia_aesni_avx_x86-64.S - * cipher/camellia-glue.c [ENABLE_AESNI_SUPPORT, ENABLE_AVX_SUPPORT] - [__x86_64__] (USE_AESNI_AVX): Add macro. - (struct Camellia_context) [USE_AESNI_AVX]: Add use_aesni_avx. - [USE_AESNI_AVX] (_gcry_camellia_aesni_avx_ctr_enc) - (_gcry_camellia_aesni_avx_cbc_dec): New prototypes to assembly - functions. - (camellia_setkey) [USE_AESNI_AVX]: Enable AES-NI/AVX if hardware - support both. - (_gcry_camellia_ctr_enc) [USE_AESNI_AVX]: Add AES-NI/AVX code. - (_gcry_camellia_cbc_dec) [USE_AESNI_AVX]: Add AES-NI/AVX code. - * cipher/camellia_aesni_avx_x86-64.S: New. - * src/g10lib.h (HWF_INTEL_AVX): New. - * src/global.c (hwflist): Add HWF_INTEL_AVX. - * src/hwf-x86.c (detect_x86_gnuc) [ENABLE_AVX_SUPPORT]: Add detection - for AVX. - - camellia.c: Prepare for AES-NI/AVX implementation. - * cipher/camellia-glue.c (CAMELLIA_encrypt_stack_burn_size) - (CAMELLIA_decrypt_stack_burn_size): Increase stack burn size. - * cipher/camellia.c (CAMELLIA_ROUNDSM): Move key-material mixing in - the front. - (camellia_setup128, camellia_setup256): Remove now unneeded - key-material mangling. - (camellia_encrypt128, camellia_decrypt128, amellia_encrypt256) - (camellia_decrypt256): Copy block to stack, so that compiler can - optimize it for register usage. - - Camellia, prepare glue code for AES-NI/AVX implementation. - * cipher/camellia-glue.c (ATTR_ALIGNED_16): Add macro. - (CAMELLIA_encrypt_stack_burn_size): Add macro. - (camellia_encrypt): Use macro above for stack burn size. - (CAMELLIA_decrypt_stack_burn_size): Add macro. - (camellia_decrypt): Use macro above for stack burn size. - (_gcry_camellia_ctr_enc): New function. - (_gcry_camellia_cbc_dec): New function. - (selftest_ctr_128): New function. - (selftest): Call function above. - * cipher/cipher.c (gcry_cipher_open) [USE_CAMELLIA]: Register bulk - functions for CBC-decryption and CTR-mode. - * src/cipher.h (_gcry_camellia_ctr_enc): New prototype. - (_gcry_camellia_cbc_dec): New prototype. - -2012-12-21 Werner Koch - - Prepare for hardware feature detection on other platforms. - * configure.ac (GCRYPT_HWF_MODULES): New. - (HAVE_CPU_ARCH_X86, HAVE_CPU_ARCH_ALPHA, HAVE_CPU_ARCH_SPARC) - (HAVE_CPU_ARCH_MIPS, HAVE_CPU_ARCH_M68K, HAVE_CPU_ARCH_PPC) - (HAVE_CPU_ARCH_ARM): New AC_DEFINEs. - * mpi/config.links (mpi_cpu_arch): New. - * src/global.c (print_config): Print new tag "cpu-arch". - * src/Makefile.am (libgcrypt_la_SOURCES): Add hwf-common.h - (EXTRA_libgcrypt_la_SOURCES): New. - (gcrypt_hwf_modules): New. - (libgcrypt_la_DEPENDENCIES, libgcrypt_la_LIBADD): Add that one. - * src/hwfeatures.c: Factor most code out to ... - * src/hwf-x86.c: New file. - (detect_x86_gnuc): Return the feature vector. - (_gcry_hwf_detect_x86): New. - * src/hwf-common.h: New. - * src/hwfeatures.c (_gcry_detect_hw_features): Dispatch using - HAVE_CPU_ARCH_ macros. - -2012-12-21 Jussi Kivilinna - - Clean up i386/x86-64 cpuid usage in hwfeatures.c. - * src/hwfeatures.c [__i386__ && __GNUC__] (detect_ia32_gnuc): Remove. - [__x86_64__ && __GNUC__] (detect_x86_64_gnuc): Remove. - [__i386__ && __GNUC__] (is_cpuid_available, get_cpuid) - (HAS_X86_CPUID): New. - [__x86_64__ && __GNUC__] (is_cpuid_available, get_cpuid) - (HAS_X86_CPUID): New. - [HAS_X86_CPUID] (detect_x86_gnuc): New. - (_gcry_detect_hw_features) [__i386__ && GNUC]: Remove detect_ia32_gnuc - call. - (_gcry_detect_hw_features) [__x86_64__ && GNUC]: Remove - detect_x86_64_gnuc call. - (_gcry_detect_hw_features) [HAS_X86_CPUID]: Add detect_x86_gnuc call. - -2012-12-18 Dmitry Kasatkin - - Add support for using DRNG random number generator. - * configure.ac: Add option --disable-drng-support. - (ENABLE_DRNG_SUPPORT): New. - * random/rndhw.c (USE_DRNG): New. - (rdrand_long, rdrand_nlong, poll_drng): New. - (_gcry_rndhw_poll_fast, _gcry_rndhw_poll_slow): Call poll function. - * src/g10lib.h (HWF_INTEL_RDRAND): New. - * src/global.c (hwflist): Add "intel-rdrand". - * src/hwfeatures.c (detect_x86_64_gnuc) [ENABLE_DRNG_SUPPORT]: Detect - RDRAND. - (detect_ia32_gnuc) [ENABLE_DRNG_SUPPORT]: Detect RDRAND. - -2012-12-03 Werner Koch - - random: Add a RNG selection interface and system RNG wrapper. - * random/random-system.c: New. - * random/Makefile.am (librandom_la_SOURCES): Add new module. - * random/random.c (struct rng_types): New. - (_gcry_set_preferred_rng_type, _gcry_get_rng_type): New. - (_gcry_random_initialize, gcry_random_add_bytes, do_randomize) - (_gcry_set_random_seed_file, _gcry_update_random_seed_file) - (_gcry_fast_random_poll): Dispatch to the actual RNG. - * src/gcrypt.h.in (GCRYCTL_SET_PREFERRED_RNG_TYPE): New. - GCRYCTL_GET_CURRENT_RNG_TYPE): New. - (gcry_rng_types): New. - * src/global.c (print_config): Print the TNG type. - (global_init, _gcry_vcontrol): Implement the new control codes. - * doc/gcrypt.texi (Controlling the library): Document the new control - codes. - - * tests/benchmark.c (main): Add options to test the RNG types. - * tests/random.c (main): Add new options. - (print_hex): Print to stderr. - (progress_cb, rng_type): New. - (check_rng_type_switching, check_early_rng_type_switching): New. - (run_all_rng_tests): New. - - tests: Allow use of random.c under Windows. - * tests/Makefile.am (TESTS): Always include random.c - * tests/random.c [!W32]: Include sys/wait.h. - (inf): New. - (check_forking, check_nonce_forking): Print a notice what will be done. - (main) [W32]: Do not call signal. - - Make random-fips.c work multi-threaded. - * random/random-fips.c (basic_initialization): Fix reversed logic. - - Move nonce creation from csprng backend to random main module. - * random/random-csprng.c (_gcry_rngcsprng_create_nonce): Remove. - (nonce_buffer_lock): Remove. - (initialize_basics): Remove init of nonce_buffer_lock. - * random/random.c: Add a few header files. - (nonce_buffer_lock): New. - (_gcry_random_initialize): Init nonce_buffer_lock. - (gcry_create_nonce): Add code from _gcry_rngcsprng_create_nonce. - - * random/random-daemon.c (_gcry_daemon_create_nonce): Remove. - -2012-12-03 Jussi Kivilinna - - Fix building with CC="gcc -std=c90". - * configure.ac: Add check for missing 'asm' keyword in C90 mode and - replacement with '__asm__'. - -2012-12-03 Werner Koch - - Try to use inttypes.h if stdint.h is not available. - * cipher/bufhelp.h [HAVE_INTTYPES_H]: Include inttypes.h - -2012-12-03 Jussi Kivilinna - - Optimize buffer xoring. - * cipher/Makefile.am (libcipher_la_SOURCES): Add 'bufhelp.h'. - * cipher/bufhelp.h: New. - * cipher/cipher-aeswrap.c (_gcry_cipher_aeswrap_encrypt) - (_gcry_cipher_aeswrap_decrypt): Use 'buf_xor' for buffer xoring. - * cipher/cipher-cbc.c (_gcry_cipher_cbc_encrypt) - (_gcry_cipher_cbc_decrypt): Use 'buf_xor' for buffer xoring and remove - resulting unused variables. - * cipher/cipher-cfb.c (_gcry_cipher_cfb_encrypt) Use 'buf_xor_2dst' - for buffer xoring and remove resulting unused variables. - (_gcry_cipher_cfb_decrypt): Use 'buf_xor_n_copy' for buffer xoring and - remove resulting unused variables. - * cipher/cipher-ctr.c (_gcry_cipher_ctr_encrypt): Use 'buf_xor' for - buffer xoring and remove resulting unused variables. - * cipher/cipher-ofb.c (_gcry_cipher_ofb_encrypt) - (_gcry_cipher_ofb_decrypt): Use 'buf_xor' for buffer xoring and remove - resulting used variables. - * cipher/rijndael.c (_gry_aes_cfb_enc): Use 'buf_xor_2dst' for buffer - xoring and remove resulting unused variables. - (_gry_aes_cfb_dev): Use 'buf_xor_n_copy' for buffer xoring and remove - resulting unused variables. - (_gry_aes_cbc_enc, _gry_aes_ctr_enc, _gry_aes_cbc_dec): Use 'buf_xor' - for buffer xoring and remove resulting unused variables. - -2012-11-29 Jussi Kivilinna - - Optimize AES-NI CTR mode. - * cipher/rijndael.c [USE_AESNI] (do_aesni_ctr, do_aesni_ctr_4): Make - handling of 64-bit overflow and carry conditional. Avoid generic to - vector register passing of value '1'. Generate and use '-1' instead. - -2012-11-28 Werner Koch - - Make a cpp conditional in rijndael.c better readable. - * cipher/rijndael.c (USE_AESNI): Modify cpp conditionals for better - readability. - -2012-11-28 Jussi Kivilinna - - Fix building with Clang on x86-64 and i386. - * cipher/rijndael.c [USE_AESNI] (do_aesni_enc_aligned) - (do_aesni_dec_vec4, do_aesni_cfb, do_aesni_ctr, do_aesni_ctr_4): Add - explicit suffix to 'cmp' instructions. - -2012-11-26 Jussi Kivilinna - - Optimize wipememory2 for i386 and x86-64. - * src/g10lib.h (wipememory2): Add call to fast_wipememory2. - (fast_wipememory2): New macros for i386 and x86-64 architectures. - Empty macro provided for other architectures. - - Fix missing 64bit carry handling in AES-NI CTR mode. - * cipher/rijndael.c [USE_AESNI] (do_aesni_ctr, do_aesni_ctr_4): Add - carry handling to 64-bit addition. - (selftest_ctr_128): New function for testing IV handling in bulk CTR - function. - (selftest): Add call to selftest_ctr_128. - - Add parallelized AES-NI CBC decryption. - * cipher/rijndael.c [USE_AESNI] (aesni_cleanup_5): New macro. - [USE_AESNI] (do_aesni_dec_vec4): New function. - (_gcry_aes_cbc_dec) [USE_AESNI]: Add parallelized CBC loop. - (_gcry_aes_cbc_dec) [USE_AESNI]: Change IV storage register from xmm3 - to xmm5. - - Clear xmm5 after use in AES-NI CTR mode. - * cipher/rijndael.c [USE_AESNI]: Rename aesni_cleanup_2_4 to - aesni_cleanup_2_5. - [USE_AESNI] (aesni_cleanup_2_5): Clear xmm5 register. - (_gcry_aes_ctr_enc, _gcry_aes_cbc_dec) [USE_AESNI]: Use - aesni_cleanup_2_5 instead of aesni_cleanup_2_4. - - Optimize AES-NI CBC encryption. - * cipher/rijndeal.c (_gcry_aes_cbc_enc) [USE_AESNI]: Add AES-NI - spesific loop and use SSE2 assembler for xoring and copying of - blocks. - - Improve parallelizability of CBC decryption for AES-NI. - * cipher/rijndael.c (_gcry_aes_cbc_dec) [USE_AESNI]: Add AES-NI - specific CBC mode loop with temporary block and IV stored in free SSE - registers. - - Extend test of chained modes for 128bit ciphers. - * tests/basic.c (check_one_cipher_core, check_one_cipher): Increase - input and output buffer sizes from 16 bytes to 1024+16=1040 bytes. - (check_one_cipher_core): Add asserts to verify sizes of temporary - buffers. - -2012-11-21 Werner Koch - - Fix for strict aliasing rules. - * cipher/rijndael.c (do_setkey, prepare_decryption): Use u32_a_t for - casting. - - Do not detect AES-NI support if disabled by configure. - * src/hwfeatures.c (detect_ia32_gnuc): Detect AESNI support only if - that support has been enabled. - -2012-11-21 Jussi Kivilinna - - Fix too large burn_stack in camellia-glue.c. - * cipher/camellia-glue.c (camellia_encrypt, camellia_decrypt): Do not - take full array size of KEY_TABLE_TYPE, but argument size instead. - - Add x86_64 support for AES-NI. - * cipher/rijndael.c [ENABLE_AESNI_SUPPORT]: Enable USE_AESNI on x86-64. - (do_setkey) [USE_AESNI_is_disabled_here]: Use %[key] and %[ksch] - directly as registers instead of using temporary register %%esi. - [USE_AESNI] (do_aesni_enc_aligned, do_aesni_dec_aligned, do_aesni_cfb, - do_aesni_ctr, do_aesni_ctr_4): Use %[key] directly as register instead - of using temporary register %%esi. - [USE_AESNI] (do_aesni_cfb, do_aesni_ctr, do_aesni_ctr_4): Change %[key] - from generic "g" type to register "r". - * src/hwfeatures.c (_gcry_detect_hw_features) [__x86_64__]: Do not - clear AES-NI feature flag. - - Fix cpuid vendor-id check for i386 and x86-64. - * src/hwfeatures.c (detect_x86_64_gnuc, detect_ia32_gnuc): Allow - Intel features be detect from CPU by other vendors too. - - Fix hwdetect assembler clobbers. - * src/hwfeatures.c (detect_x86_64_gnuc): Add missing %ebx assembler - clobbers. - (detect_x86_64_gnuc, detect_ia32_gnuc) [ENABLE_PADLOCK_SUPPORT]: Add - missing %ecx assembler clobbers. - -2012-11-21 Werner Koch - - Use configure test for aligned attribute. - * configure.ac (HAVE_GCC_ATTRIBUTE_ALIGNED): New test and ac_define. - * cipher/cipher-internal.h, cipher/rijndael.c, random/rndhw.c: Use new - macro instead of a fixed test for __GNUC__. - - Fix segv with AES-NI on some platforms. - * cipher/rijndael.c (RIJNDAEL_context): Align on 16 bytes. - -2012-11-16 Werner Koch - - Improve parsing of the GIT revision number. - * configure.ac (mmm4_revision): Use git rev-parse. - -2012-11-08 Werner Koch - - Fix extern inline use for gcc > 4.3 in c99 mode. - * mpi/mpi-inline.h [!G10_MPI_INLINE_DECL]: Take care of changed extern - inline semantics in gcc. - -2012-11-07 Werner Koch - - Fix memory leak in gcry_pk_testkey for ECC. - * cipher/ecc.c (check_secret_key): Restructure for easier allocation - tracking. Fix memory leak. - -2012-11-05 Werner Koch - - Prepare for a backported interface in 1.5.1. - * configure.ac: Bump LT version at C20/A0/R0 to adjust for a planned - API update in 1.5.1. - - Adjust for stricter autoconf requirements. - * configure.ac: Fix usage of AC_LANG_PROGRAM. - - Update build helper scripts. - * config.guess, config.sub: Update to version 2012-07-31. - * ltmain.sh: Update to version 2.4.2. - * install-sh, m4/libtool.m4, m4/ltoptions.m4, m4/ltversion.m4 - * m4/lt~obsolete.m4: Update to autoconf 2.69 versions. - - Do not distribute a copy of gitlog-to-changelog. - * Makefile.am (GITLOG_TO_CHANGELOG): New. - (gen-ChangeLog): Require an installed gitlog-to-changelog. - * scripts/gitlog-to-changelog: Remove. - - * README.SVN: Remove. - * REMOVE.GIT: New. - - Allow building with w64-mingw32. - * autogen.sh <--build-w32>: Support the w64-mingw32 toolchain. Also - prepare for 64 bit building. - : Remove option -c from chmod. - - Switch to the new automagic beta numbering scheme. - * configure.ac: Add all the required m4 magic. - - Avoid dereferencing pointer right after the end. - * mpi/mpicoder.c (do_get_buffer): Check the length before derefing P. - -2012-10-30 Werner Koch - - Make ancient test program useful again. - * tests/testapi.c (test_sexp): Adjust to current API. Print the - return code. Mark unused args. - (test_genkey): Mark unused args. - (main): Do not pass NULL to printf. - - tests: Add ECC key generation tests. - * tests/keygen.c (check_generated_ecc_key): New. - (check_ecc_keys): New. - (main): Call simple ECC checks. - -2012-10-30 Milan Broz - - PBKDF2: Allow empty passphrase. - * cipher/kdf.c (gcry_kdf_derive): Allow empty passphrase for PBKDF2. - * tests/t-kdf.c (check_pbkdf2): Add test case for above. - -2012-08-16 Xi Wang - - Replace deliberate division by zero with _gcry_divide_by_zero. - * mpi/mpi-pow.c: Replace 1 / msize. - * mpi/mpih-div.c: Replace 1 / dsize. - * src/misc.c: Add _gcry_divide_by_zero. - -2012-06-21 Werner Koch - - Clear AESNI feature flag for x86_64. - * src/hwfeatures.c (_gcry_detect_hw_features) [__x86_64__]: Clear - AESNI feature flag. - - Beautify last change. - * cipher/rijndael.c: Replace C99 feature from last patch. Keep cpp - lines short. - * random/rndhw.c: Keep cpp lines short. - * src/hwfeatures.c (_gcry_detect_hw_features): Make cpp def chain - better readable. - -2012-06-21 Rafaël Carré - - Enable VIA Padlock on x86_64 platforms. - * cipher/rijndael.c: Duplicate x86 assembly and convert to x86_64. - * random/rndhw.c: Likewise. - * src/hwfeatures.c: Likewise. - -2012-05-14 Werner Koch - - Add curve aliases from RFC-5656. - * cipher/ecc.c (curve_aliases): Add "nistp???" entries. - -2012-04-16 Werner Koch - - State new contribution rules. - * doc/DCO: New. - * doc/HACKING: Document new rules. - -2012-04-04 Tomas Mraz - - Add GCRYCTL_SET_ENFORCED_FIPS_FLAG command. - * doc/gcrypt.texi: Add documentation of the new command. - * src/fips.c (_gcry_enforced_fips_mode): Report the enforced fips mode - only when fips mode is enabled. - (_gcry_set_enforced_fips_mode): New function. - * src/g10lib.h: Add the _gcry_set_enforced_fips_mode prototype. - * src/gcrypt.h.in: Add the GCRYCTL_SET_ENFORCED_FIPS_FLAG. - * src/global.c (_gcry_vcontrol): Handle the new command. - -2012-02-17 Ulrich Müller - - Rework selftest in idea.c. - * cipher/idea.c (do_setkey): Execute selftest when first called. - (decrypt_block): Remove commented-out code. - (selftest): Execute all selftests. Return NULL on success, or - string in case of error. - -2012-02-16 Werner Koch - - Fix missing prototype. - * src/g10lib.h (_gcry_secmem_module_init): Make it a real prototype. - -2012-02-16 Ulrich Müller - - Add support for the IDEA cipher. - Adapt idea.c to the Libgcrypt framework. - Add IDEA to cipher_table and to the build system. - - Patents on IDEA have expired: - Europe: EP0482154 on 2011-05-16, - Japan: JP3225440 on 2011-05-16, - U.S.: 5,214,703 on 2012-01-07. - - * configure.ac: Add idea to the list of available ciphers. - Define USE_IDEA if idea is enabled. - * cipher/cipher.c (cipher_table): Add entry for IDEA. - * cipher/idea.c: Update comment about patents. - Include proper header files and remove redundant declarations. - (expand_key, cipher, do_setkey, encrypt_block, decrypt_block): - Define function arguments as const where appropriate. - (cipher): Test for !WORDS_BIGENDIAN instead of LITTLE_ENDIAN_HOST. - (do_setkey, decrypt_block): Don't call selftest. - (idea_setkey): New function, wrapper for do_setkey. - (idea_encrypt): New function, wrapper for encrypt_block. - (_gcry_cipher_spec_idea): Define. - * cipher/Makefile.am (EXTRA_libcipher_la_SOURCES): Add idea.c. - * src/cipher.h (_gcry_cipher_spec_idea): Declare. - * tests/basic.c (check_ciphers): Add GCRY_CIPHER_IDEA. - -2012-01-09 Werner Koch - - Include an IDEA implementation. - The code is the old IDEA test code, written by me back in 1997 and - distributed on a Danish FTP server. This commit is only for - reference. To use the code it has to be adjusted to the Libgcrypt - framework. - -2012-01-03 Marcus Brinkmann - - Fix pthread locking and remove defunctional support for static lock init. - * src/ath.c: Include assert.h. - (ath_mutex_destroy, ath_mutex_lock, ath_mutex_unlock): Dereference LOCK. - * src/g10lib.h (_gcry_secmem_module_init): New declaration. - * src/global.c (global_init): Call _gcry_secmem_module_init. - * src/secmem.c (_gcry_secmem_module_init): New function. - -2011-12-16 Werner Koch - - Add alignment tests for the cipher tests. - * tests/basic.c (check_one_cipher): Factor most code out to - check_one_cipher_core. Call that core function several times using - different alignment settings. - (check_one_cipher_core): New. Add extra args to allow alignment - testing. - -2011-12-07 Werner Koch - - tests/prime: Add option to create a well known private key. - * tests/prime.c (print_mpi, create_42prime): New. - (main): Add option --42. - -2011-12-01 Werner Koch - - Do not build the random-daemon by make distcheck. - * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Disable building of the - random daemon - - Generate the ChangeLog from commit logs. - * scripts/gitlog-to-changelog: New script. Taken from gnulib. - * scripts/git-log-fix: New file. - * scripts/git-log-footer: New file. - * doc/HACKING: Describe the ChangeLog policy - * ChangeLog: New file. - * Makefile.am (EXTRA_DIST): Add new files. - (gen-ChangeLog): New. - (dist-hook): Run gen-ChangeLog. - - Rename all ChangeLog files to ChangeLog-2011. - -2011-12-01 Werner Koch - - NB: Changes done before December 1st, 2011 are described in - per directory files named ChangeLog-2011. See doc/HACKING for - details. - - ----- - Copyright (C) 2011 Free Software Foundation, Inc. - - Copying and distribution of this file and/or the original GIT - commit log messages, with or without modification, are - permitted provided the copyright notice and this notice are - preserved. diff --git a/src/hos_libhttpserver/src/libgcrypt/ChangeLog-2011 b/src/hos_libhttpserver/src/libgcrypt/ChangeLog-2011 deleted file mode 100644 index 3c70a1f8..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/ChangeLog-2011 +++ /dev/null @@ -1,1499 +0,0 @@ -2011-12-01 Werner Koch - - NB: ChangeLog files are no longer manually maintained. Starting - on December 1st, 2011 we put change information only in the GIT - commit log, and generate a top-level ChangeLog file from logs at - "make dist". See doc/HACKING for details. - -2011-11-28 Jim Meyering - - accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix - * m4/gpg-error.m4: Update from git master. - -2011-09-16 Werner Koch - - * configure.ac (HAVE_PTHREAD): New. - -2011-09-15 Werner Koch - - * configure.ac: Bump LT version at C19/A0/R0 due to the ABI change. - - * configure.ac (CC_FOR_BUILD): New. - -2011-06-29 Werner Koch - - Release 1.5.0. - - * configure.ac: Keep LT version at C18/A7/R0 because it has - already been bumped up at 2010-07-09. - - * config.guess, config.sub: Update to 2011-06-03. - -2011-04-06 Werner Koch - - * configure.ac (emacs_local_vars_begin): Move more to the top to - avoid Emacs warnings. - -2011-03-30 Werner Koch - - * compat/compat.c (_gcry_compat_identification): Add version string. - -2011-03-08 Werner Koch - - * configure.ac (BUILD_REVISION): Use new git_brevis macro. - -2011-02-23 Werner Koch - - * configure.ac (LIBGCRYPT_CONFIG_HOST): New. - - * acinclude.m4 (AM_PATH_GPG_ERROR): Remove. - -2011-02-21 Werner Koch - - Release 1.5.0-beta1. - -2011-02-18 Werner Koch - - * configure.ac [GCC]: Remove the use of -fno-strict-aliasing. - -2011-02-11 Werner Koch - - * configure.ac: Add option --disbale-aesni-support. - (ENABLE_AESNI_SUPPORT): New macro. - -2011-02-04 Werner Koch - - * autogen.sh: Install the git pre-commit if not yet done. - -2010-12-23 Werner Koch - - * configure.ac (BUILD_REVISION): Use git_revision. - -2010-08-19 Werner Koch - - * configure.ac: Define GPG_ERR_ENABLE_ERRNO_MACROS. Remove - definition of _GNU_SOURCE. - (AC_GNU_SOURCE): New. - -2010-08-16 Werner Koch - - * configure.ac (INSERT_SYS_SELECT_H): New. - -2010-07-09 Werner Koch - - * configure.ac: Bump LT version to C18/A7/R0 to prepare a backport - of a new API to the 1.4 series. - -2010-04-19 Marcus Brinkmann - - * configure.ac: Check for -fno-strict-aliasing. - -2010-04-12 Brad Hards (wk) - - * configure.ac: Print more verbose info at the end. - -2010-03-24 Werner Koch - - * configure.ac (USE_RNDW32CE): New. - -2010-03-15 Werner Koch - - * configure.ac (emacs_local_vars_begin) - (emacs_local_vars_read_only, emacs_local_vars_end): New. - -2010-01-21 Werner Koch - - * compat/Makefile.am: New. - * compat/compat.c: New. - * compat/libcompat.h: New. - * compat/getpid.c, compat/clock.c: New. - - * configure.ac: Require libgpg-error 1.8. - (HAVE_W32CE_SYSTEM): New am_defines and am_conditionals. - (getpid): Check for replacement function. - (AC_CONFIG_LIBOBJ_DIR): New. - (AC_TYPE_PID_T): New. - (AM_INIT_AUTOMAKE): Use modern variant. - (AC_CONFIG_FILES): Add compat/Makfile. - * autogen.sh: Support W32CE. - * ltmain.sh: Update to 2.2.6b - (wrappers_required): Don't set for mingw32ce. - * Makefile.am (DIST_SUBDIRS, SUBDIRS): Add compat. - -2009-12-10 Werner Koch - - * configure.ac: Add option --disable-O-flag-munging. - -2009-12-08 Marcus Brinkmann - - Update to libtool 2.2.6a. - * configure.ac: Invoke AC_CONFIG_MACRO_DIR. - (AC_LIBTOOL_WIN32_DLL, AC_LIBTOOL_RC): Replace by ... - (LT_PREREQ, LT_INIT, LT_LANG): ... these. - * config.guess, config.sub, install-sh, ltmain.sh, m4/libtool.m4: - Updated to libtool 2.2.6a. - * m4/ltoptions.m4, m4/ltsugar.m4, m4/ltversion.m4, - m4/lt~obsolete.m4: New files from libtool 2.2.6a. - -2009-08-05 Werner Koch - - * configure.ac: Test for sys/msg.h. - -2009-04-23 Werner Koch - - * README: Add a section on build problems. - -2009-01-22 Werner Koch - - * configure.ac: Bump LT version to C17/A6/R0 to mark the start of - a new development series. - -2009-01-22 Werner Koch - - Release 1.4.4. - - * configure.ac: Bump LT version to C16/A5/R2. - -2008-10-30 Werner Koch - - * configure.ac: Remove option --enable-gcc-warnings. Autodetect - useful gcc warnings in maintainer mode. - -2008-09-18 Werner Koch - - Release 1.4.3. - - * configure.ac: Bump LT version to C16/A5/R1. - -2008-09-15 Werner Koch - - * configure.ac: Cehck for syslog. - -2008-09-08 Werner Koch - - Release 1.4.2. - -2008-09-01 Werner Koch - - Release 1.4.2rc2. - - * configure.ac: Update svn_revision macro. - -2008-08-22 Werner Koch - - * configure.ac: Add option --enable-hmac-binary-check. - (DL_LIBS): Check whether -ldl is required. - -2008-08-19 Werner Koch - - Release 1.4.2rc1. - - * configure.ac: Bump LT version to C16/A5/R0. - -2008-08-18 Werner Koch - - * Makefile.am (EXTRA_DIST): Remove the unused BUGS file. - -2008-08-15 Werner Koch - - * configure.ac (AH_BOTTOM): Define GCRY_GPG_ERR_NOT_OPERATIONAL. - -2008-07-05 Werner Koch - - * random/: New. - * Makefile.am (DIST_SUBDIRS): Add random. - * configure.ac (AC_CONFIG_FILES): Add random/Makefile. - -2008-04-25 Werner Koch - - Release 1.4.1. - - * configure.ac: Bump LT version to C15/A4/R4. - -2008-04-22 Werner Koch - - * configure.ac: Set version to 1.4.1rc1. - -2008-04-18 Werner Koch - - * configure.ac (AH_BOTTOM): Add CAMELLIA_EXT_SYM_PREFIX. - (NAME_OF_DEV_RANDOM): Remove special cases for Solaris etc. This - matches the gnupg 1.4.9 version. - -2008-04-01 Werner Koch - - * configure.ac (AC_INIT): Fix quoting. - -2008-03-19 Werner Koch - - * configure.ac: Fix the tests for USE_ to either define or - undef the macros. Suggested by Dirk Stoecker. - -2008-03-18 Werner Koch - - * configure.ac: Test for uintptr_t. - -2008-02-18 Werner Koch - - * configure.ac (IS_DEVELOPMENT_VERSION): Set depending on the my_svn. - -2007-12-11 Werner Koch - - * configure.ac: We actually require libgpg-error 1.4. Reported by - Tim Mooney. - -2007-12-10 Werner Koch - - Released 1.4.0. - - * configure.ac: Set LT to C15/A4/R3. - -2007-12-05 Werner Koch - - * configure.ac: Add option --disable-padlock-support. - -2007-12-03 Werner Koch - - Released 1.3.2. - - * configure.ac: Set LT to C15/A4/R2. - - * config.sub, config.guess: Update to version 2007-11-19. - -2007-10-30 Werner Koch - - * configure.ac: Protect config.h against double inclusion. - -2007-10-26 Werner Koch - - Released 1.3.1. - - * configure.ac: Set LT to C15/A4/R1. - -2007-08-22 Werner Koch - - * README: Rewrite the license description. - * configure.ac (USE_RNDW32, USE_RNDUNIX): Unmark as GPL modules. - -2007-08-08 Werner Koch - - * configure.ac: Use $host and not $target. - -2007-07-26 Werner Koch - - * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Fix a syntax error - in the test program which lurked there for 4 years. Adjusted name - of libtools global_system_pipe variable and add extra cut stage. - Reported by Gregor Riepl. - -2007-06-15 Werner Koch - - * autogen.sh (FORCE): Use = and not == in test to be POSIXly correct. - -2007-05-30 Werner Koch - - * configure.ac: Camellia is no longer GPL. - -2007-05-24 Werner Koch - - * configure.ac: Try to use -Wpointer-arith. - -2007-05-19 Marcus Brinkmann - - * configure.ac: Fix test for optional UDIV and UDIV_QRNND MPI - modules. - -2007-05-09 Marcus Brinkmann - - * configure.ac (ac_cv_mpi_config_done): Unused variable removed. - (ac_cv_mpi_mod_list, MPI_MOD_LIST_LO, MPI_MOD_LIST_O): Removed. - (MPI_MOD_ASM_MPIH_ADD1, MPI_MOD_ASM_MPIH_SUB1, - MPI_MOD_ASM_MPIH_MUL1, MPI_MOD_ASM_MPIH_MUL2, - MPI_MOD_ASM_MPIH_MUL3, MPI_MOD_ASM_MPIH_LSHIFT, - MPI_MOD_ASM_MPIH_RSHIFT, MPI_MOD_ASM_MPIH_UDIV, - MPI_MOD_ASM_MPIH_UDIV_QRNND, MPI_MOD_C_MPIH_ADD1, - MPI_MOD_C_MPIH_SUB1, MPI_MOD_C_MPIH_MUL1, MPI_MOD_C_MPIH_MUL2, - MPI_MOD_C_MPIH_MUL3, MPI_MOD_C_MPIH_LSHIFT, MPI_MOD_C_MPIH_RSHIFT, - MPI_MOD_C_MPIH_UDIV, MPI_MOD_C_MPIH_UDIV_QRNND): New automake - variables. - -2007-05-04 Werner Koch - - Released 1.3.0. - - * configure.ac: Set LT to C15/A4/R0. - - * configure.ac: Require automake 1.10 - (AM_PROG_CC_C_O): New. - -2007-05-03 Werner Koch - - * configure.ac: Fix detection of GPLed random modules. - -2007-05-02 Werner Koch - - * configure.ac (LIBGCRYPT_DIGESTS, LIBGCRYPT_CIPHERS) - (LIBGCRYPT_PUBKEY_CIPHERS): Ac_define lists of algorithms. - (default_ciphers): Don't make camellia a default. - -2007-05-02 David Shaw - - * NEWS, configure.ac: Add Camellia. - -2007-04-30 Werner Koch - - * README.apichanges: Move to doc/. - * Makefile.am (EXTRA_DIST): Removed that file. - -2007-04-28 Marcus Brinkmann - - * configure.ac: Allow to specify additional search directories - with --enable-mpi-path. - -2007-04-16 Werner Koch - - * configure.ac: Check for sysconf. - * acinclude.m4 (GNUPG_CHECK_MLOCK): Try to use sysconf to get the - page size and use getpagesize only then if available. - -2007-03-22 Werner Koch - - * configure.ac: Add support for ECC. - -2007-02-22 Werner Koch - - * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Use - --enable-random-daemon. - - * configure.ac: New option --enable-random-daemon. - Create versioninfo.rc and provide the build information. - -2007-02-21 Werner Koch - - * Makefile.am, configure.ac: Ignore w32-dll/. - -2007-02-20 Werner Koch - - * configure.ac: Bump LT version to C14/A3/R0 in preparation for a - release. - - * autogen.sh: Add option --force. - * configure.ac: New option --disable-endian-check. Use a real - noexecstack test instead of requiring an option. Add SVN version - magic. - -2007-02-02 Werner Koch - - * configure.ac (FALLBACK_SOCKLEN_T): Special case for mingw32. - -2006-11-15 Werner Koch - - * autogen.sh: Add convenience option --build-amd64. - -2006-10-20 Werner Koch - - * Makefile.am (stowinstall): New convenience target. - -2006-10-12 Marcus Brinkmann - - * configure.ac (FALLBACK_SOCKLEN_T): Third time is a charm. - Define gcry_socklen_t, to avoid conflicts with socklen_t - definitions by autoconf. - -2006-10-11 Marcus Brinkmann - - * configure.ac (FALLBACK_SOCKLEN_T): Rewrite in terms of - socklen.m4. - -2006-10-11 Marcus Brinkmann - - * acinclude.m4 (GNUPG_FIX_HDR_VERSION): Removed. - * configure.ac: Do not call GNUPG_FIX_HDR_VERSION. - -2006-10-10 Marcus Brinkmann - - * configure.ac: Invoke AC_CHECK_SOCKLEN_TYPE. - (AC_CONFIG_FILES): Add src/gcrypt.h. - (AC_CONFIG_SRCDIR): Change to src/libgcrypt.vers. - -2006-10-02 Werner Koch - - * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Test on HOST and not - TARGET. Hardwire for mingw32. Allow setting via command line when - cross compiling. - -2006-08-29 Werner Koch - - * configure.ac (USE_SEED): New. - -2006-07-26 Werner Koch - - * configure.ac: New options --enable-noexecstack and - --disable-optimization. - -2006-07-04 Marcus Brinkmann - - * configure.ac: Call AC_LIBTOO_WIN32_DLL and AC_LIBTOOL_RC. - - * configure.ac: Call gl_TYPE_SOCKLEN_T instead of the other - socklen_t checks. - -2006-06-08 Marcus Brinkmann - - * configure.ac (PTH_LIBS): Add --all to pth-config invocation. - -2006-03-14 Werner Koch - - * configure.ac: Check for fctnl and ftruncate. - (HAVE_PTH): Check for GNU Pth. - (HAVE_W32_SYSTEM): Define it. - * acinclude.m4 (GNUPG_PTH_VERSION_CHECK): New. Taken from GnuPG 1.4. - -2005-12-08 Werner Koch - - * configure.ac: Changed the random device names for netbsd. From - Christian Biere. - -2005-11-02 Moritz Schulte - - * NEWS: Documented minor API changes. - -2005-09-15 Moritz Schulte - - * Makefile.am (EXTRA_DIST): Depend on README.SVN, not on README.CVS. - -2005-06-25 Moritz Schulte - - * configure.ac: Removed src/libgcrypt.pc from AC_CONFIG_FILES. - -2005-06-10 Werner Koch - - * configure.ac: Move detection of basic stuff to the top. For - example we need to know whether gcc is used before testing for it. - Reported by Ralf Fassel. - -2005-04-23 Moritz Schulte - - * acinclude.m4 (TYPE_SOCKLEN_T): New type definition test; - provided by Albert Chin. - * configure.ac: Don't use $(CMD) as it's not portable; use CMD in - backticks instead. Simpler -lnsl/-lsocket test. Use - TYPE_SOCKLEN_T test. Don't forget to set `random_modules' - correctly. - -2005-04-22 Moritz Schulte - - * configure.ac: Added support for pkgconfig; provided by Albert - Chin. - -2005-04-11 Moritz Schulte - - * configure.ac: Integrate Whirlpool. - -2005-01-04 Werner Koch - - Updated to automake 1.9. - - * acinclude.m4: Updated for use with automake 1.9. - - * configure.ac: Require libgpg-error 1.0; not really needed but - that is the first stable version. - - * Makefile.am (ACLOCAL_AMFLAGS): New for -I m4. - (AUTOMAKE_OPTIONS): New to create a bzip archive. - -2005-02-03 Moritz Schulte - - * THANKS: Updated. - -2004-08-09 Moritz Schulte - - * THANKS: Updated. - -2004-07-04 Moritz Schulte - - * THANKS: Updated. - -2004-04-21 Werner Koch - - * configure.ac: Don't print a warning if GNU make was not found. - -2004-05-07 Moritz Schulte - - * THANKS: Updated. - -2004-04-02 Thomas Schwinge - - * autogen.sh: Added ACLOCAL_FLAGS. - -2004-04-15 Werner Koch - - Released 1.2.0. - - * configure.ac: Set LT to C12/A1/R1. - -2004-04-06 Werner Koch - - * config.guess, config.sub, ltmain.sh: Updated to those from - libtools 1.5.4. - -2004-03-29 Werner Koch - - Released 1.1.94. - - * configure.ac: Set LT to C12/A1/R0. - -2004-03-10 Marcus Brinkmann - - * configure.ac (LIBGCRYPT_CONFIG_LIBS_PTHREAD, - LIBGCRYPT_CONFIG_CFLAGS_PTHREAD, LIBGCRYPT_CONFIG_LIBS_PTH, - LIBGCRYPT_CONFIG_CFLAGS_PTH, have_pth, have_pthread, AC_CHECK_PTH, - AC_CHECK_LIB(pthread), HAVE_PTH, HAVE_PTHREAD): Removed. - -2004-03-06 Werner Koch - - Released 1.1.93. - - * configure.ac (LIBGCRYPT_CONFIG_SONAME_NUMBER): Replaced by - LIBGCRYPT_CONPIG_API_VERSION. Set it to 1. Set LT to C11/A0/R1. - -2004-03-05 Werner Koch - - * configure.ac (LIBGCRYPT_CONFIG_SONAME_NUMBER): New. - -2004-02-20 Werner Koch - - Released 1.1.92. - - * configure.ac: Set LT to C11/A0/R0. - -2004-02-11 Werner Koch - - * autogen.sh (check_version): Removed bashism and simplified. - -2004-02-06 Werner Koch - - * configure.ac: Add rfc2268 cipher algorithm. - -2004-01-25 Moritz Schulte - - * THANKS: Updated. - -2003-12-19 Werner Koch - - Released 1.1.91. - - * configure.ac: Bumbed LT version to C10/A3/R1. - -2003-12-08 Werner Koch - - * Makefile.am (dist-hook): Don't distribute stuff from the now - obsolete scripts dir. - (EXTRA_DIST): Remove README_alpha - * README-alpha: Removed. - * configure.ac (AM_CONFIG_AUX_DIR): Removed. - - * COPYING.DOC: Removed. - * Makefile.am (EXTRA_DIST): Added README.CVS and - autogen.sh. Removed COPYING.DOC. - -2003-11-14 Werner Koch - - Released 1.1.90. - - * configure.ac: Bumbed LT version to C10/A3/R0. - - * configure.ac (have_ld_version_script): Set the default in - a separate test. - (PRINTABLE_OS_NAME): Don't handle the Hurd extra, this leads to - conflicts with BSD based GNU systems. The Hurd has now a working - uname. - -2003-11-04 Werner Koch - - * configure.ac (USE_SHA1): Make sure it is always included. - (USE_RMD160): Removed this AM conditional. - -2003-10-31 Werner Koch - - * configure.ac: Bumbed version number to 1.1.90-cvs for futher - development - - Released 1.1.44. - - * acinclude.m4 (AC_CHECK_PTH): Added. - * configure.ac: Use it here instead of the generic lib test. - Bumbed LT vesion to C9/A2/R0. - -2003-10-27 Werner Koch - - * configure.ac: Give a hint on where libgpg-error is available. - Reformatted long lines. Don't include gcrypt-defs.h. - (--enable-gcc-warnings): New option. - -2003-10-24 Moritz Schulte - - * configure.ac: Check for socklen_t. - -2003-10-11 Moritz Schulte - - * acinclude.m4: Update AM_PATH_GPG_ERROR macro. - -2003-09-04 Werner Koch - - Released 1.1.43. - - * configure.ac: Require libgpg-error 0.4 due to the prime interface. - -2003-08-29 Werner Koch - - * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Re-implemented. - * configure.ac: Use it here. - -2003-08-27 Moritz Schulte - - * configure.ac: Substitute: LIBGCRYPT_CONFIG_LIBS_PTHREAD, - LIBGCRYPT_CONFIG_CFLAGS_PTHREAD, LIBGCRYPT_CONFIG_LIBS_PTH, - LIBGCRYPT_CONFIG_CFLAGS_PTH, LIBGCRYPT_THREAD_MODULES. - -2003-08-07 Moritz Schulte - - * configure.ac: Fail, if libgpg-error could not be found. - -2003-07-31 Werner Koch - - Released 1.1.42. - - * configure.ac: Set LT version to 7/0/0. - -2003-07-30 Werner Koch - - * AUTHORS (Maintainer): Assigned Moritz as Maintainer. - -2003-07-30 Moritz Schulte - - * NEWS: Include much more complete list of `Interface changes - relative to the 1.1.12 release'. - -2003-07-14 Moritz Schulte - - * configure.ac: Bumbed version number up to 1.1.42-cvs. - -2003-07-09 Moritz Schulte - - * configure.ac: Reintroduce --disable-asm, since it is needed by - mpi/config.links. - -2003-07-05 Moritz Schulte - - * README: Few changes, mention libgpg-error. - -2003-06-18 Moritz Schulte - - * configure.ac (available_ciphers): Removed Serpent, hrrm. - -2003-06-17 Moritz Schulte - - * acinclude.m4: Removed macro definitions: GNUPG_CHECK_FAQPROG, - GNUPG_CHECK_ENDIAN, GNUPG_CHECK_CACHE, GNUPG_CHECK_PIC, - GNUPG_CHECK_EXPORTDYNAMIC, GNUPG_CHECK_IPC, GNUPG_PROG_NM, - GNUPG_SYS_SYMBOL_UNDERSCORE, GNUPG_FUNC_MKDIR_TAKES_ONE_ARG, - GPH_PROG_DB2ANY. - Added macro definitions: AM_PATH_GPG_ERROR. - - * configure.ac: Use alternative approach for building based on - conditional sources, which does not make automake eat all your - memory, etc. - Removed unused tests. - Renamed --enable-static-rnd to --enable-random. - Use Autoconf's AC_C_BIGENDIAN macro instead of our own. - Re-organized the whole file. - -2003-06-16 Moritz Schulte - - * configure.ac (AC_CONFIG_FILES): Removed doc/version.sgml. - -2003-06-11 Moritz Schulte - - * configure.ac: Remove --enable-libgpg-error flag. - Ue AC_PATH_GPG_ERROR. - -2003-06-09 Moritz Schulte - - * NEWS: Mention API changes and libgpg-error. - -2003-05-25 Moritz Schulte - - * configure.ac (USE_LIBGPG_ERROR): Implementation of the - --enable-libgpg-error switch. - Define USE_LIBGPG_ERROR in LIBGCRYPT_CONFIG_FLAGS, in case - libgpg-error is used. - -2003-05-22 Moritz Schulte - - * configure.ac (AC_CHECK_HEADERS): Removed unused headers: - termio.h, langinfo.h. - (AC_CHECK_FUNCS): Removed unused functions: strsep, strlwr, - tcgetattr, setrlimit, strftime, nl_langinfo, sigaction, - sigprocmask, fopen64, fstat64. - -2003-04-27 Moritz Schulte - - * README: Documented new configure switches. - Mention the --enable-maintainer-switch. - - * configure.ac: Merged some code from GnuPG's configure.ac for - disabling sha512/tiger in case no 64 data types are available. - -2003-04-17 Moritz Schulte - - * configure.ac: Include support for sha512. - -2003-04-17 Moritz Schulte - - * AUTHORS: Updated. - -2003-04-16 Moritz Schulte - - * configure.ac: Implement command line switches: --enable-ciphers, - --enable-pubkey-ciphers and --enable-digests. - Set Automake conditionals and config.h symbols depending on the - selected ciphers, pubkey-ciphers, digests and random-modules. - - * acinclude.m4 (LIST_MEMBER): New macro. - - * configure.ac: Simplified, removed code for parsing - EXTRA_PROGRAMS from Makefile.am. - -2003-04-08 Moritz Schulte - - * configure.ac: Merged random-module selection code from GnuPG's - configure.ac. - -2003-04-07 Moritz Schulte - - * configure.ac: Removed code for generating contruct.c. - Remove digest modules from the static_modules list, only handle - random module selection. - - -2003-03-24 Moritz Schulte - - * NEWS: Mention new CBC_MAC flag. - - * AUTHORS (Maintainer): Update entry for Simon Josefsson. - -2003-03-04 Moritz Schulte - - * TODO: Remove item about resetting handles, since - gcry_cipher_reset is implemented by now. - - * NEWS: Mentioned gcry_cipher_reset. - -2003-01-21 Werner Koch - - * README (Configure options): New. - * configure.ac (have_ld_version_script): New option - --enable-ld-version-script. - -2003-01-20 Simon Josefsson - - * configure.ac (MODULES_IN_CIPHER): Add crc. - -2003-01-20 Werner Koch - - Released 1.1.12. - - * configure.ac (LIBGCRYPT_LT_REVISION): Bumbed up. - -2002-12-21 Werner Koch - - Released 1.1.11. - - * configure.ac (LIBGCRYPT_LT_CURRENT: Bumbed to 6/5/0 due to a new - interface - -2002-12-19 Werner Koch - - * configure.ac (have_pthread): Check for pthreads in libc. - (have_ld_version_script): New. - -2002-11-10 Werner Koch - - * configure.ac (MODULES_IN_CIPHER): Add md4.c. By Simon Josefsson. - -2002-09-20 Werner Koch - - Released 1.1.10. - - * configure.ac (HAVE_DEV_RANDOM_IOCTL): Don't check for it; it is - not used. - (AS_CHECK_HEADERS): Check for sys/select.h. - * Makefile.am (DIST_SUBDIRS): New to include the w32-dll directory - -2002-09-18 Timo Schulz - - * configure.ac: Added makefile for the W32 DLL. - -2002-09-17 Werner Koch - - * configure.ac: Check for Pth and Pthreads. - -2002-08-23 Werner Koch - - Released 1.1.9. - - * configure.ac (LIBGCRYPT_CONFIG_CFLAGS): Renamed from - LIBGCRYPT_CFLAGS and removed the libpath because it is set by the - config script. - (LIBGCRYPT_LT_REVISION): Set LT version to 5/4/1. - -2002-06-25 Werner Koch - - Released 1.1.8. - - * configure.ac: Set LT version to 5/4/0. - -2002-05-21 Werner Koch - - Released 1.1.7. - - * configure.ac: Set LT version to 4/3/0. - -2002-05-17 Werner Koch - - * configure.ac: Removed all the dynamic loading stuff. - -2002-05-16 Werner Koch - - * configure.ac: Reordered the C_CHECK_FUNCS. - -2002-05-15 Werner Koch - - * configure.ac: Adjusted for new MPI module stuff. - -2002-05-14 Werner Koch - - Changed license to the LGPL. - -2002-05-02 Werner Koch - - * jnlib/: Removed. - * Makefile.am (SUBDIRS): Removed jnlib. - * configure.ac (jnlib/Makefile): Removed. - - * configure.ac: Define _REENTRANT. - -2002-02-18 Werner Koch - - * configure.ac (MPI_EXTRA_ASM_OBJS): Use .lo suffix. - (AC_CANONICAL_TARGET): Added. - -2002-02-07 Werner Koch - - Released 1.1.6. - -2002-01-24 Werner Koch - - * jnlib/: Replaced by a fresh copy from GnuPG (actually the NewPG - development branch). Adjusted Makefile.am and jnlib-config.h - accordingly. - -2001-12-18 Werner Koch - - Released 1.1.5. - - * Makefile.am (dist-hook): Only look in mpi and scripts for - distfiles; this way we don't include those of a stale "make dist" - directory. - - * acinclude.m4 (GNUPG_FIX_HDR_VERSION): Make it work with the new - automake. - * configure.ac: Don't chmod db2any. - -2001-08-06 Werner Koch - - * configure.ac: Removed cross compiling hacks. - -2001-08-03 Werner Koch - - Released 1.1.4. - - * acinclude.m4 (GNUPG_CHECK_TYPEDEF): Define GNU Source. - - Migrated to autoconf 2.52. - * acinclude.m4: Removed GNUPG_LINK_FILES and converted. - * acconfig.h: Removed - * configure.in: Replaced by... - * configure.ac: and modified for use with autoconf 2.52. Replaced - GNUPG_LINK_FILES with AC_CONFIG_LINKS and moved some informational - messages to the end. Removed --enable-m-debug - - * tests/: New. - * Makefile.am: Included tests directory - - * configure.in (DYNLINK_MOD_CFLAGS): Use -shared with dec-osf. - Reported by Chris Adams. Merged some cases. - -2001-05-31 Werner Koch - - Released 1.1.3. - - * configure.in: Use _gcry_ prefix when creating the cipher constructor. - - * acconfig.h (_GCRYPT_IN_LIBGCRYPT): Define it here. - -2001-05-28 Werner Koch - - * acinclude.m4 (GPH_PROG_DOCBOOK): Removed. - (GPH_PROG_DB2ANY): New. Taken from GPH. - * configure.in: Use it here. - -2000-12-19 Werner Koch - - Major change: - Removed all GnuPG stuff and renamed this piece of software - to gcrypt. The directory gcrypt has been renamed to src. - -2000-11-14 Werner Koch - - Version 1.1.2 released. - -2000-11-13 Werner Koch - - * acinclude.m4 (GNUPG_FIX_HDR_VERSION): VPATH build fix. - -2000-10-10 Werner Koch - - * Makefile.am (dist-hook): Create the version file. - * configure.in: Set the libtool version here, removed the need - for the version file. - -Mon Sep 18 16:35:45 CEST 2000 Werner Koch - - * acinclude.m4 (GNUPG_CHECK_MLOCK): Removed that silly mkdir(). - - * configure.in: Changes to allow for Solaris random device. - By Nils Ellmenreich. - (--with-egd-socket): New. - - * configure.in (GNUPG_HOMEDIR): New. - - * configure.in: Check for fstat64 and fopen64 - - * acinclude.m4 (GNUPG_CHECK_FAQPROG): New. - * configure.in: Test for this. - - * configure.in (DYNLINK_MOD_CFLAGS): Fix by David Champion. - -Tue Aug 22 14:31:15 CEST 2000 Werner Koch - - Version 1.1.1 - -Fri Aug 18 14:27:14 CEST 2000 Werner Koch - - * agent/: New. - * Makefile.am, configure.in: Support for the new directory. - -Mon Jul 17 16:35:47 CEST 2000 Werner Koch - - * configure.in (mingw32): Changes to allow for mingw32msvc - -Fri Jul 14 19:38:23 CEST 2000 Werner Koch - - The big merge between this one and the stable branch 1.0. Still need - to merge TNANKS, AUTHORS and such. It probaly does not compile yet. - - * acinclude.m4 (GNUPG_CHECK_MLOCK): Fixed syntax error in C code. - - * configure.in: Add check for termio.h, wait unctiosn and sigaction. - - * acinclude.m4, configure.in (GNUPG_CHECK_GNUMAKE): New. - - * acinclude.m4 (MKDIR_TAKES_ONE_ARG): Check some headers. By Gaël Quéri. - - * configure.in (AM_INIT_AUTOMAKE): Use this now. By Gaël. - - * acinclude.m4 (GNUPG_CHECK_EXPORTDYNAMIC): Replacement for - GNUPG_CHECK_RDYNAMIC which should handle gcc with non GNU ld nicer. - Contributed by Dave Dykstra. - * configure.in (GNYPG_CHECK_RDYNAMIC): Replaced by the new check. - - * configure.in: Add a test for unisgned long long. - - * configure.in (DYNLINK_MOD_CFLAGS): Set different for NetBSD. - - * configure.in: Add check for clock_gettime - - * configure.in (ALL_LINGUAS): Add nl. - * configure.in (ALL_LINGUAS): Add Esperanto. - * configure.in (ALL_LINGUAS): Add sv and ja. - - * configure.in: Use /usr/local for CFLAGS and LDFLAGS when - target is freebsd. By Rémi. - - * configure.in: Do not set development version when the version has - a dash in it. Suggested by Dave Dykstra. - - * configure.in: Removed substitution for doc/gph/Makefile. - Do all the gcc warning only in maintainer mode. - - * configure.in (dlopen): Use CHECK_FUNC for a test of dlopen in libc. - Suggested by Alexandre Oliva. - (-Wall): Moved the settting of gcc warning options near to the end - so that tests don't get confused. Suggested by Paul D. Smith. - - * acinclude.m4 (GNUPG_SYS_NM_PARSE): Added BSDI support. - (GNUPG_CHECK_RDYNAMIC): Ditto. - - * acinclude.m4 (GNUPG_CHECK_MLOCK): Changed the way to test for - librt. Test suggested by Jeff Long. - - * acinclude.m4 (GNUPG_CHECK_MLOCK): Do librt check only when - we can't link a test program. This way GNU systems don't need - to link against linrt. - (GNUPG_CHECK_IPC): Fixed use of TRY_COMPILE macro. From Tim Mooney. - - * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Add support for - DJGPP. - (GNUPG_CHECK_MLOCK): Check whether mlock sits in librt. - - * acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Add NetBSD. By Thomas Klausner. - - * acconfig.h (HAVE_MLOCK): Added - -Mon Mar 13 19:22:46 CET 2000 Werner Koch - - * configure.in: Now uses the Docbook M4s from GPH. - -Mon Jan 31 17:46:35 CET 2000 Werner Koch - - * Makefile.am: Re-added tools. By Rémi. - -Mon Jan 31 16:37:34 CET 2000 Werner Koch - - * configure.in: Create a symlink for types.h in gcrypt/. - -Thu Jan 27 18:00:44 CET 2000 Werner Koch - - * configure.in (g10defs.h): Replaced by gnupg-defs.h - -Mon Jan 24 13:04:28 CET 2000 Werner Koch - - * jnlib/ : New. - - * configure.in: Do set development version when the version has - a dash in it. Suggested by Dave Dykstra. - -Thu Dec 9 17:22:27 CET 1999 Werner Koch - - * acinclude.m4 (GNUPG_FIX_HDR_VERSION): New. - * configure.in: Check and fix the version number of gcrypt/gcrypt.h - so that it is always the save as VERSION. - -Thu Oct 28 16:17:46 CEST 1999 Werner Koch - - * Started with development series 1.1 on 1999-10-26 - -Tue Oct 26 14:10:21 CEST 1999 Werner Koch - - * README-alpha: New - - * configure.in: Fixed quoting in test for development version. - - * THANKS: Add entries for Michael, Brenno and J Horacio who did - very nice Howto documents - I apoligize for forgetting to mention them - earlier. - -Fri Sep 17 12:56:42 CEST 1999 Werner Koch - - - * configure.in: Add "-lcap" when capabilities are requested. - Add the conditional CROSS_COMPILING. - * Makefile.am: Don't use checks when CROSS_COMPILING. - - -Wed Sep 15 16:22:17 CEST 1999 Werner Koch - - - * configure.in (ALL_LINGUAS): Add pt_PT. - - * configure.in: Some tweaks for cross compiling under MingW32 - * acconfig.h (USE_STATIC_RNDW32): New. - -Tue Sep 7 17:08:10 CEST 1999 Werner Koch - - - * VERSION: Set to 1.0.0. - -Mon Sep 6 19:59:08 CEST 1999 Werner Koch - - - * configure.in: Create makefile in doc/gph - - * acinclude.m4 (GNUPG_FUNC_MKDIR_TAKES_ONE_ARG): New - * configure.in: use the above. - -Thu Sep 2 16:40:55 CEST 1999 Werner Koch - - - * VERSION: Set to 0.9.11. - -Tue Aug 31 17:20:44 CEST 1999 Werner Koch - - * configure.in: Minor changes to the OS/2 and Mingw32 system labels. - Add a printable name for Hurd. - -Mon Aug 30 20:38:33 CEST 1999 Werner Koch - - * configure.in: Some support for DJGPP (Mark Elbrecht) - -Wed Aug 4 10:34:46 CEST 1999 Werner Koch - - * VERSION: Set to 0.9.10. - -Mon Jul 26 09:34:46 CEST 1999 Werner Koch - - * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): remove init of ac_cv_... - - * Makefile.am (DISCLEANFILES): New - -Fri Jul 23 13:53:03 CEST 1999 Werner Koch - - * VERSION: Set to 0.9.9. - - * configure.in: Print a notice when rndunix is used. - -Thu Jul 15 10:15:35 CEST 1999 Werner Koch - - * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Fixed last modification. - -Wed Jul 7 13:08:40 CEST 1999 Werner Koch - - * Makefile.am: Support for libtool. - * configure.in: Ditto. - -Tue Jun 29 21:44:25 CEST 1999 Werner Koch - - * configure.in (use_local_zlib): The lost dollar is back. - - * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Add EMX case. - * configure.in: Another variant of the MX vendor string - - * configure.in (--with-capabilities): Some test code (Remi). - -Sat Jun 26 12:15:59 CEST 1999 Werner Koch - - * acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Support for HPUX and IRIX. - * configure.in (HAVE_DL_SHL_LOAD): New for HPUX (Dave Dykstra). - - * VERSION: Now 0.9.8 - -Wed Jun 16 20:16:21 CEST 1999 Werner Koch - - * configure.in: Add test for docbook-to-man - -Tue Jun 15 12:21:08 CEST 1999 Werner Koch - - * acinclude.m4 (GNUPG_SYS_NM_PARSE): Support for {net,free}bsd, - -Thu Jun 10 14:18:23 CEST 1999 Werner Koch - - * configure.in (ZLIB,GDBM): Check both, header and lib. - -Sat Jun 5 15:30:33 CEST 1999 Werner Koch - - * pkclist.c (key_present_in_pk_list): New (Michael). - -Tue May 25 19:50:32 CEST 1999 Werner Koch - - * configure.in (IS_DEVELOPMENT_VERSION): Fixed detection. - -Sun May 23 14:20:22 CEST 1999 Werner Koch - - * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): assume yes when - cross-compiling. - -Mon May 17 21:54:43 CEST 1999 Werner Koch - - * configure.in (socket): Fix for Unisys by Katsuhiro Kondou. - -Sat May 8 19:28:08 CEST 1999 Werner Koch - - * NEWS: Add a marker line which I forgot to do for 0.9.6. - -Thu May 6 14:18:17 CEST 1999 Werner Koch - - * README: Minor updates - - * VERSION: Now 0.9.6 - -Thu Apr 8 09:35:53 CEST 1999 Werner Koch - - * acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Fix for - amiga-openbsd (Peter Reich) - (GNUPG_PROG_NM): Ditto - -Wed Apr 7 20:51:39 CEST 1999 Werner Koch - - * Makefile.am (g10defs.h): Removed. - * configure.in (AC_OUTPUT_COMMANDS): Create g10defs.h - -Sat Mar 20 12:55:33 CET 1999 Werner Koch - - * VERSION: Now 0.9.5 - -Sun Mar 14 19:34:36 CET 1999 Werner Koch - - * acinclude.m4 (AM_SYS_SYMBOL_UNDERSCORE): Removed because it is - now in the latest libtool. - -Thu Mar 11 16:39:46 CET 1999 Werner Koch - - * configure.in: Removed the need for libtool - -Mon Mar 8 20:47:17 CET 1999 Werner Koch - - * configure.in (DLSYM_NEEDS_UNDERSCORE): Replaced. - * acinclude.in (AM_SYS_SYMBOL_UNDERSCORE): New. - - * VERSION: Now 0.9.4 - -Sun Feb 28 19:11:00 CET 1999 Werner Koch - - * configure.in (dld): Test disabled. - -Fri Feb 26 17:55:41 CET 1999 Werner Koch - - * encode.c (encode_simple): temporary fix. - -Wed Feb 24 11:07:27 CET 1999 Werner Koch - - * configure.in: New option --enable-static-rnd. - -Mon Feb 22 20:04:00 CET 1999 Werner Koch - - * BUGS: Now we assign bug numbers. - * OBUGS: New to keep rack o fixed bugs (CVS only) - -Fri Feb 19 18:01:54 CET 1999 Werner Koch - - * VERSION: Released 0.9.3 - -Fri Feb 19 15:49:15 CET 1999 Werner Koch - - * acinclude.m4: Removed gettext macros. - -Tue Feb 16 14:10:02 CET 1999 Werner Koch - - * configure.in (socket): Check for -lsocket and -lnsl. - (osf4): Disable all warnings for DEC's cc. - (-Wall): Add more warning options for gcc - -Sat Feb 13 12:04:43 CET 1999 Werner Koch - - * configure.in: Changed detection of compiler flags. - * intl/ : Removed directory - -Wed Feb 10 17:15:39 CET 1999 Werner Koch - - * acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Fix for freebsd 2.2 - - * configure.in: a lot of changes to allow selection of modules. - Add support for OS/2. - - * acinclude.m4: add some more caching - - * README: Spelling and grammar corrections (John A. Martin) - * INSTALL: Ditto. - -Wed Jan 20 21:40:21 CET 1999 Werner Koch - - * configure.in: --enable-m-guard is now default - -Wed Jan 13 12:49:36 CET 1999 Werner Koch - - * INSTALL: Applied new information how to build rpms by Fabio Coatti - * Makefile.in (gnupg.spec): Changed the names. - -Tue Jan 12 11:17:18 CET 1999 Werner Koch - - * config.links (m68k-atari-mint): New - -Tue Jan 12 09:17:19 CET 1999 Gaël Quéri - - * all: Fixed typos all over the place - -Sat Jan 9 16:02:23 CET 1999 Werner Koch - - * configure.in: Add a way to statically link rndunix - -Sun Jan 3 15:28:44 CET 1999 Werner Koch - - * acinclude.m4 (GNUPG_CHECK_RDYNAMIC): New. - * configure.in (DYNLOAD_CFLAGS): Use result from CHECK_RDYNAMIC - -Wed Dec 23 13:18:14 CET 1998 Werner Koch - - * README: Replaced the command overview with a short intro. - -Sat Dec 12 18:40:32 CET 1998 Werner Koch - - * configure.in: Add check for dlopen in libc (Greg Troxel) - and a new define - * acconfig.h (DLSYM_NEEDS_UNDERSCORE): New. - -Thu Dec 10 20:15:36 CET 1998 Werner Koch - - * acinclude.m (GNUPG_CHECK_PIC): New - * configure.in, acinclude.m4: Renamed all WK_ to GNUPG_ - -Tue Dec 8 15:09:29 CET 1998 Werner Koch - - * VERSION: Set to 0.4.5 - -Wed Nov 25 12:38:29 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in (USE_RNDLINUX): New. - -Fri Nov 20 19:34:57 1998 Werner Koch (wk@isil.d.shuttle.de) - - * VERSION: Released 0.4.4 - - * configure.in (try_asm_modules): For option --disable-asm - -Tue Nov 10 19:32:40 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in (MPI_SFLAGS): New. - -Tue Nov 10 13:44:53 1998 Werner Koch (wk@isil.d.shuttle.de) - - * ABOUT-NLS: New - * configure.in (AC_REVISION): New. - -Sun Nov 8 18:20:35 1998 Werner Koch (wk@isil.d.shuttle.de) - - * VERSION: Set to 0.4.3 - -Sun Oct 25 19:49:37 1998 Werner Koch (wk@isil.d.shuttle.de) - - * Makefile.am (g10defs.h): New macro GNUPG_DATADIR. - -Wed Oct 21 17:24:24 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in: Removed gettext kludge - * acinclude.m4: Add patched AM_WITH_NKS macro - -Tue Oct 20 19:03:36 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in: Kludge to make AM_GNU_GETTEXT work, - changed some macors to more modern versions. Also - changeg the all makefiles to remove duplicate ../intl. - * acinclude.m4: Removed the gettext stuff, as this - already comes with automake now. - -Wed Oct 14 12:11:34 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in (NAME_OF_DEV_RANDOM): New. - (DYNLINK_MOD_CFLAGS): New. - -Thu Oct 8 10:55:15 1998 Werner Koch (wk@isil.d.shuttle.de) - - * Makefile.am (g10defs.h): creates include file - * acconfig.h: now includes g10defs.h - * configure.in: Removed G10_LOCALEDIR and GNUPG_LIB - -Thu Sep 17 18:49:40 1998 Werner Koch (wk@(none)) - - * Makefile.am (dist-hook): Now creates RPM file. - * scripts/gnupg.spec: New template file for RPMs - -Thu Jul 30 19:17:07 1998 Werner Koch (wk@(none)) - - * acinclude.h (WK_CHECK_IPC): New - * configure.in : Add checks for SysV IPC - -Thu Jun 25 11:18:49 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in (--disable-dynload): New. - -Wed Jun 10 07:48:59 1998 Werner Koch,mobil,,, (wk@tobold) - - * configure.in (GNUPG_LIBDIR): New. - -Mon May 25 19:10:59 1998 Werner Koch (wk@isil.d.shuttle.de) - - * rand-unix.c (fast_random_poll): fixed syntax bug. - -Mon May 11 10:21:31 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in (PRINTABLE_OS_NAME): Linux is now GNU/Linux - -Tue Apr 14 19:08:05 1998 Werner Koch (wk@isil.d.shuttle.de) - - * [all files]: Applied Matthew Skala's typo and grammar fixes. - -Wed Mar 4 10:32:40 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in (getrusage,gettimeofday): New tests. - -Fri Feb 27 13:14:17 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in (--disable-m-guard): New. - -Thu Feb 26 17:09:27 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in, acinclude.m4, intl/, po/: New macros taken - from GNOME, switched to automake 1.2f - -Thu Feb 26 09:05:46 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in (doc/Makefile): New - -Thu Feb 26 07:40:47 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in: Changed gettext stuff - -Wed Feb 25 11:44:10 1998 Werner Koch (wk@isil.d.shuttle.de) - - * checks/*test : restructured the directory. - -Tue Feb 24 15:59:12 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in: Changed the name of the package to GNUPG and - chnaged several other names too. - -Wed Feb 18 17:36:45 1998 Werner Koch (wk@isil.d.shuttle.de) - - * Makefile.am (checks): New. - -Sat Feb 14 15:37:55 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in (mpi_config_done): Removed asm links caching. - -Sat Feb 14 14:02:20 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in (PRINTABLE_OS_NAME): New. - * acconfig.h: Likewise. - -Fri Feb 13 19:43:41 1998 Werner Koch (wk@isil.d.shuttle.de) - - * configure.in : Fixed zlib stuff - * Makefile.am: Likewise - - - Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, - 2007, 2008, 2009, 2011 Free Software Foundation, Inc. - - This file is free software; as a special exception the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. - - This file is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - -Local Variables: -buffer-read-only: t -End: diff --git a/src/hos_libhttpserver/src/libgcrypt/INSTALL b/src/hos_libhttpserver/src/libgcrypt/INSTALL deleted file mode 100644 index 5458714e..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/INSTALL +++ /dev/null @@ -1,234 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006 Free Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/src/hos_libhttpserver/src/libgcrypt/LICENSES b/src/hos_libhttpserver/src/libgcrypt/LICENSES deleted file mode 100644 index 8594cfd8..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/LICENSES +++ /dev/null @@ -1,134 +0,0 @@ -Additional license notices for Libgcrypt. -*- org -*- - -This file contains the copying permission notices for various files in -the Libgcrypt distribution which are not covered by the GNU Lesser -General Public License (LGPL) or the GNU General Public License (GPL). - -These notices all require that a copy of the notice be included -in the accompanying documentation and be distributed with binary -distributions of the code, so be sure to include this file along -with any binary distributions derived from the GNU C Library. - -* BSD_3Clause - - For files: - - cipher/sha256-ssse3-amd64.S - - cipher/sha512-avx-amd64.S - - cipher/sha512-avx2-bmi2-amd64.S - - cipher/sha512-ssse3-amd64.S - -#+begin_quote - Copyright (c) 2012, Intel Corporation - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the - distribution. - - * Neither the name of the Intel Corporation nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - - THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#+end_quote - -* Simple permissive licenses - - For files: - - cipher/crc.c - -#+begin_quote - Copyright (c) 1996 L. Peter Deutsch - - Permission is granted to copy and distribute this document for - any purpose and without charge, including translations into - other languages and incorporation into compilations, provided - that the copyright notice and this notice are preserved, and - that any substantive changes or deletions from the original are - clearly marked. -#+end_quote - -* IETF permissive licenses - - For files: - - cipher/crc.c - -#+begin_quote - Copyright (C) The Internet Society (1998). All Rights Reserved. - - This document and translations of it may be copied and furnished - to others, and derivative works that comment on or otherwise - explain it or assist in its implementation may be prepared, - copied, published and distributed, in whole or in part, without - restriction of any kind, provided that the above copyright notice - and this paragraph are included on all such copies and derivative - works. However, this document itself may not be modified in any - way, such as by removing the copyright notice or references to - the Internet Society or other Internet organizations, except as - needed for the purpose of developing Internet standards in which - case the procedures for copyrights defined in the Internet - Standards process must be followed, or as required to translate - it into languages other than English. - - The limited permissions granted above are perpetual and will not be - revoked by the Internet Society or its successors or assigns. - - This document and the information contained herein is provided on - an "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET - ENGINEERING TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE - OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY - IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. -#+end_quote - -* X License - - For files: - - install.sh - -#+begin_quote - Copyright (C) 1994 X Consortium - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- - TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall not - be used in advertising or otherwise to promote the sale, use or other deal- - ings in this Software without prior written authorization from the X Consor- - tium. -#+end_quote diff --git a/src/hos_libhttpserver/src/libgcrypt/Makefile.am b/src/hos_libhttpserver/src/libgcrypt/Makefile.am deleted file mode 100644 index bc0e5c52..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -## Process this file with automake to produce Makefile.in -# Copyright (C) 1992, 1999, 2000, 2002 Free Software Foundation, Inc. -# -# This file is part of Libgcrypt. -# -# Libgcrypt is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# Libgcrypt 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - -ACLOCAL_AMFLAGS = -I m4 -DISTCHECK_CONFIGURE_FLAGS = --disable-random-daemon \ - --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia - -# (A suitable gitlog-to-changelog script can be found in GnuPG master.) -GITLOG_TO_CHANGELOG=gitlog-to-changelog - -DIST_SUBDIRS = m4 compat mpi cipher random src doc tests -SUBDIRS = compat mpi cipher random src doc tests - -EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \ - ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \ - m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011 \ - random/ChangeLog-2011 tests/ChangeLog-2011 mpi/ChangeLog-2011 \ - build-aux/git-log-footer build-aux/git-log-fix - -DISTCLEANFILES = - - -# Add all the files listed in "distfiles" files to the distribution, -# apply version number s to some files and create a VERSION file which -# we need for the Prereq: patch file trick. -dist-hook: gen-ChangeLog - @set -e; \ - for file in `cd $(top_srcdir); \ - find mpi -type f -name distfiles`; do \ - dir=`dirname $$file` ; $(mkinstalldirs) $(distdir)/$$dir ; \ - for i in distfiles `cat $(top_srcdir)/$$file` ; do \ - ln $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i 2> /dev/null \ - || cp -p $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i; \ - done ; \ - done - @set -e; \ - echo "$(VERSION)" > $(distdir)/VERSION - - -gen_start_date = 2011-12-01T14:00:00 -.PHONY: gen-ChangeLog -gen-ChangeLog: - if test -d $(top_srcdir)/.git; then \ - (cd $(top_srcdir) && \ - $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \ - --amend=build-aux/git-log-fix \ - --since=$(gen_start_date) ) > $(distdir)/cl-t; \ - cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\ - rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/cl-t $(distdir)/ChangeLog; \ - fi - - - -stowinstall: - $(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/libgcrypt diff --git a/src/hos_libhttpserver/src/libgcrypt/Makefile.in b/src/hos_libhttpserver/src/libgcrypt/Makefile.in deleted file mode 100644 index 34a1c779..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/Makefile.in +++ /dev/null @@ -1,924 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Copyright (C) 1992, 1999, 2000, 2002 Free Software Foundation, Inc. -# -# This file is part of Libgcrypt. -# -# Libgcrypt is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# Libgcrypt 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in COPYING COPYING.LIB THANKS TODO \ - build-aux/compile build-aux/config.guess \ - build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/mdate-sh build-aux/missing \ - mkinstalldirs build-aux/texinfo.tex build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/compile \ - $(top_srcdir)/build-aux/config.guess \ - $(top_srcdir)/build-aux/config.sub \ - $(top_srcdir)/build-aux/install-sh \ - $(top_srcdir)/build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gpg-error.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/noexecstack.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - if test -d "$(distdir)"; then \ - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -rf "$(distdir)" \ - || { sleep 5 && rm -rf "$(distdir)"; }; \ - else :; fi -am__post_remove_distdir = $(am__remove_distdir) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -GZIP_ENV = --best -DIST_TARGETS = dist-bzip2 dist-gzip -distuninstallcheck_listfiles = find . -type f -print -am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_FILEVERSION = @BUILD_FILEVERSION@ -BUILD_REVISION = @BUILD_REVISION@ -BUILD_TIMESTAMP = @BUILD_TIMESTAMP@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DL_LIBS = @DL_LIBS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ -FGREP = @FGREP@ -GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ -GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ -GCRYPT_HWF_MODULES = @GCRYPT_HWF_MODULES@ -GCRYPT_KDFS = @GCRYPT_KDFS@ -GCRYPT_PUBKEY_CIPHERS = @GCRYPT_PUBKEY_CIPHERS@ -GCRYPT_RANDOM = @GCRYPT_RANDOM@ -GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@ -GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@ -GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ -GREP = @GREP@ -INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBGCRYPT_CIPHERS = @LIBGCRYPT_CIPHERS@ -LIBGCRYPT_CONFIG_API_VERSION = @LIBGCRYPT_CONFIG_API_VERSION@ -LIBGCRYPT_CONFIG_CFLAGS = @LIBGCRYPT_CONFIG_CFLAGS@ -LIBGCRYPT_CONFIG_HOST = @LIBGCRYPT_CONFIG_HOST@ -LIBGCRYPT_CONFIG_LIBS = @LIBGCRYPT_CONFIG_LIBS@ -LIBGCRYPT_DIGESTS = @LIBGCRYPT_DIGESTS@ -LIBGCRYPT_LT_AGE = @LIBGCRYPT_LT_AGE@ -LIBGCRYPT_LT_CURRENT = @LIBGCRYPT_LT_CURRENT@ -LIBGCRYPT_LT_REVISION = @LIBGCRYPT_LT_REVISION@ -LIBGCRYPT_PUBKEY_CIPHERS = @LIBGCRYPT_PUBKEY_CIPHERS@ -LIBGCRYPT_THREAD_MODULES = @LIBGCRYPT_THREAD_MODULES@ -LIBMULTITHREAD = @LIBMULTITHREAD@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTHREAD = @LIBTHREAD@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ -LTLIBOBJS = @LTLIBOBJS@ -LTLIBTHREAD = @LTLIBTHREAD@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MPI_SFLAGS = @MPI_SFLAGS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -NOEXECSTACK_FLAGS = @NOEXECSTACK_FLAGS@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PTH_CFLAGS = @PTH_CFLAGS@ -PTH_CONFIG = @PTH_CONFIG@ -PTH_LIBS = @PTH_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -RUN_LARGE_DATA_TESTS = @RUN_LARGE_DATA_TESTS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SYS_SOCKET_H = @SYS_SOCKET_H@ -VERSION = @VERSION@ -VERSION_NUMBER = @VERSION_NUMBER@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -emacs_local_vars_begin = @emacs_local_vars_begin@ -emacs_local_vars_end = @emacs_local_vars_end@ -emacs_local_vars_read_only = @emacs_local_vars_read_only@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I m4 -DISTCHECK_CONFIGURE_FLAGS = --disable-random-daemon \ - --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia - - -# (A suitable gitlog-to-changelog script can be found in GnuPG master.) -GITLOG_TO_CHANGELOG = gitlog-to-changelog -DIST_SUBDIRS = m4 compat mpi cipher random src doc tests -SUBDIRS = compat mpi cipher random src doc tests -EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \ - ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \ - m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011 \ - random/ChangeLog-2011 tests/ChangeLog-2011 mpi/ChangeLog-2011 \ - build-aux/git-log-footer build-aux/git-log-fix - -DISTCLEANFILES = -gen_start_date = 2011-12-01T14:00:00 -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -am--refresh: Makefile - @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): - -config.h: stamp-h1 - @test -f $@ || rm -f stamp-h1 - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool config.lt - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscope: cscope.files - test ! -s cscope.files \ - || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) -clean-cscope: - -rm -f cscope.files -cscope.files: clean-cscope cscopelist -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__post_remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__post_remove_distdir) - -dist-lzip: distdir - tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__post_remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) - -dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) - -dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__post_remove_distdir) - -dist dist-all: - $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' - $(am__post_remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lz*) \ - lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir) - chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__post_remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @test -n '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: trying to run $@ with an empty' \ - '$$(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - $(am__cd) '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile config.h -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) all install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-cscope clean-generic \ - clean-libtool cscope cscopelist-am ctags ctags-am dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - - -# Add all the files listed in "distfiles" files to the distribution, -# apply version number s to some files and create a VERSION file which -# we need for the Prereq: patch file trick. -dist-hook: gen-ChangeLog - @set -e; \ - for file in `cd $(top_srcdir); \ - find mpi -type f -name distfiles`; do \ - dir=`dirname $$file` ; $(mkinstalldirs) $(distdir)/$$dir ; \ - for i in distfiles `cat $(top_srcdir)/$$file` ; do \ - ln $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i 2> /dev/null \ - || cp -p $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i; \ - done ; \ - done - @set -e; \ - echo "$(VERSION)" > $(distdir)/VERSION -.PHONY: gen-ChangeLog -gen-ChangeLog: - if test -d $(top_srcdir)/.git; then \ - (cd $(top_srcdir) && \ - $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \ - --amend=build-aux/git-log-fix \ - --since=$(gen_start_date) ) > $(distdir)/cl-t; \ - cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\ - rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/cl-t $(distdir)/ChangeLog; \ - fi - -stowinstall: - $(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/libgcrypt - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libgcrypt/NEWS b/src/hos_libhttpserver/src/libgcrypt/NEWS deleted file mode 100644 index cbc1beca..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/NEWS +++ /dev/null @@ -1,874 +0,0 @@ -Noteworthy changes in version 1.6.3 (2015-02-27) [C20/A0/R3] ------------------------------------------------- - - * Use ciphertext blinding for Elgamal decryption [CVE-2014-3591]. - See http://www.cs.tau.ac.il/~tromer/radioexp/ for details. - - * Fixed data-dependent timing variations in modular exponentiation - [related to CVE-2015-0837, Last-Level Cache Side-Channel Attacks - are Practical]. - - * Improved asm support for older toolchains. - - -Noteworthy changes in version 1.6.2 (2014-08-21) [C20/A0/R2] ------------------------------------------------- - - * Map deprecated RSA algo number to the RSA algo number for better - backward compatibility. - - * Support a 0x40 compression prefix for EdDSA. - - * Improve ARM hardware feature detection and building. - - * Fix powerpc-apple-darwin detection - - * Fix building for the x32 ABI platform. - - * Support building using the latest mingw-w64 toolchain. - - * Fix some possible NULL deref bugs. - - -Noteworthy changes in version 1.6.1 (2014-01-29) [C20/A0/R1] ------------------------------------------------- - - * Added emulation for broken Whirlpool code prior to 1.6.0. - - * Improved performance of KDF functions. - - * Improved ECDSA compliance. - - * Fixed locking for Windows and non-ELF Pthread systems (regression - in 1.6.0) - - * Fixed message digest lookup by OID (regression in 1.6.0). - - * Fixed a build problem on NetBSD. - - * Fixed memory leaks in ECC code. - - * Fixed some asm build problems and feature detection bugs. - - * Interface changes relative to the 1.6.0 release: - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - GCRY_MD_FLAG_BUGEMU1 NEW (minor API change). - - -Noteworthy changes in version 1.6.0 (2013-12-16) [C20/A0/R0] ------------------------------------------------- - - * Removed the long deprecated gcry_ac interface. Thus Libgcrypt is - not anymore ABI compatible to previous versions if they used the ac - interface. - - * Removed the module register subsystem. - - * The deprecated message digest debug macros have been removed. Use - gcry_md_debug instead. - - * Removed deprecated control codes. - - * Improved performance of most cipher algorithms as well as for the - SHA family of hash functions. - - * Added support for the IDEA cipher algorithm. - - * Added support for the Salsa20 and reduced Salsa20/12 stream ciphers. - - * Added limited support for the GOST 28147-89 cipher algorithm. - - * Added support for the GOST R 34.11-94 and R 34.11-2012 (Stribog) - hash algorithms. - - * Added a random number generator to directly use the system's RNG. - Also added an interface to prefer the use of a specified RNG. - - * Added support for the SCRYPT algorithm. - - * Mitigated the Yarom/Falkner flush+reload side-channel attack on RSA - secret keys. See [CVE-2013-4242]. - - * Added support for Deterministic DSA as per RFC-6969. - - * Added support for curve Ed25519. - - * Added a scatter gather hash convenience function. - - * Added several MPI amd SEXP helper functions. - - * Added support for negative numbers to gcry_mpi_print, - gcry_mpi_aprint and gcry_mpi_scan. - - * The algorithm ids GCRY_PK_ECDSA and GCRY_PK_ECDH are now - deprecated. Use GCRY_PK_ECC if you need an algorithm id. - - * Changed gcry_pk_genkey for "ecc" to only include the curve name and - not the parameters. The flag "param" may be used to revert this. - - * Added a feature to globally disable selected hardware features. - - * Added debug helper functions. - - * Interface changes relative to the 1.5.0 release: - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - gcry_ac_* REMOVED. - GCRY_AC_* REMOVED. - gcry_module_t REMOVED. - gcry_cipher_register REMOVED. - gcry_cipher_unregister REMOVED. - gcry_cipher_list REMOVED. - gcry_pk_register REMOVED. - gcry_pk_unregister REMOVED. - gcry_pk_list REMOVED. - gcry_md_register REMOVED. - gcry_md_unregister REMOVED. - gcry_md_list REMOVED. - gcry_md_start_debug REMOVED (macro). - gcry_md_stop_debug REMOVED (macro). - GCRYCTL_SET_KEY REMOVED. - GCRYCTL_SET_IV REMOVED. - GCRYCTL_SET_CTR REMOVED. - GCRYCTL_DISABLE_ALGO CHANGED: Not anymore thread-safe. - gcry_pk_genkey CHANGED: ECC curve params not returned. - gcry_md_hash_buffers NEW. - gcry_buffer_t NEW. - GCRYCTL_SET_ENFORCED_FIPS_FLAG NEW. - GCRYCTL_SET_PREFERRED_RNG_TYPE NEW. - GCRYCTL_GET_CURRENT_RNG_TYPE NEW. - GCRYCTL_CLOSE_RANDOM_DEVICE NEW. - GCRY_RNG_TYPE_STANDARD NEW. - GCRY_RNG_TYPE_FIPS NEW. - GCRY_RNG_TYPE_SYSTEM NEW. - gcry_mpi_is_neg NEW. - gcry_mpi_neg NEW. - gcry_mpi_abs NEW. - gcry_mpi_snatch NEW. - gcry_mpi_set_opaque_copy NEW. - gcry_mpi_point_t NEW. - gcry_mpi_point_new NEW. - gcry_mpi_point_release NEW. - gcry_mpi_point_get NEW. - gcry_mpi_point_snatch_get NEW. - gcry_mpi_point_set NEW. - gcry_mpi_point_snatch_set NEW. - gcry_ctx_t NEW. - gcry_ctx_release NEW. - gcry_mpi_ec_new NEW. - gcry_mpi_ec_get_mpi NEW. - gcry_mpi_ec_get_point NEW. - gcry_mpi_ec_set_mpi NEW. - gcry_mpi_ec_set_point NEW. - gcry_mpi_ec_get_affine NEW. - gcry_mpi_ec_dup NEW. - gcry_mpi_ec_add NEW. - gcry_mpi_ec_mul NEW. - gcry_mpi_ec_curve_point NEW. - GCRYMPI_FLAG_IMMUTABLE NEW. - GCRYMPI_FLAG_CONST NEW. - GCRYMPI_FLAG_USER1 NEW. - GCRYMPI_FLAG_USER2 NEW. - GCRYMPI_FLAG_USER3 NEW. - GCRYMPI_FLAG_USER4 NEW. - GCRYMPI_CONST_ONE NEW. - GCRYMPI_CONST_TWO NEW. - GCRYMPI_CONST_THREE NEW. - GCRYMPI_CONST_FOUR NEW. - GCRYMPI_CONST_EIGHT NEW. - GCRYMPI_FMT_OPAQUE NEW. - GCRYPT_VERSION_NUMBER NEW. - GCRY_KDF_SCRYPT NEW. - gcry_pubkey_get_sexp NEW. - GCRYCTL_DISABLE_LOCKED_SECMEM NEW. - GCRYCTL_DISABLE_PRIV_DROP NEW. - GCRY_CIPHER_SALSA20 NEW. - gcry_sexp_nth_buffer NEW. - gcry_sexp_extract_param NEW. - GCRY_CIPHER_SALSA20R12 NEW. - GCRY_CIPHER_GOST28147 NEW. - GCRY_MD_GOSTR3411_94 NEW. - GCRY_MD_STRIBOG256 NEW. - GCRY_MD_STRIBOG512 NEW. - GCRY_PK_ECC NEW. - gcry_log_debug NEW. - gcry_log_debughex NEW. - gcry_log_debugmpi NEW. - gcry_log_debugpnt NEW. - - -Noteworthy changes in version 1.5.0 (2011-06-29) ------------------------------------------------- - - * New function gcry_kdf_derive implementing OpenPGP S2K algorithms - and PBKDF2. - - * Support for WindowsCE. - - * Support for ECDH. - - * Support for OAEP and PSS methods as described by RFC-3447. - - * Fixed PKCS v1.5 code to always return the leading zero. - - * New format specifiers "%M" and "%u" for gcry_sexp_build. - - * Support opaque MPIs with "%m" and "%M" in gcry_sexp_build. - - * New functions gcry_pk_get_curve and gcry_pk_get_param to map ECC - parameters to a curve name and to retrieve parameter values. - - * gcry_mpi_cmp applied to opaque values has a defined semantic now. - - * Uses the Intel AES-NI instructions if available. - - * The use of the deprecated Alternative Public Key Interface - (gcry_ac_*) will now print compile time warnings. - - * The module register subsystem has been deprecated. This subsystem - is not flexible enough and would always require ABI changes to - extend the internal interfaces. It will eventually be removed. - Please contact us on the gcrypt-devel mailing list to discuss - whether you really need this feature or how it can be replaced by - an internal plugin mechanism. - - * CTR mode may now be used with data chunks of arbitrary length. - - * Changes also done in 1.4.6 (2010-07-13): - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - * New variants of the TIGER algorithm. - - * New cipher algorithm mode for AES-WRAP. - - * Changes also done in 1.4.5 (2009-12-11): - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - * Fixed minor memory leak in DSA key generation. - - * No more switching to FIPS mode if /proc/version is not readable. - - * Fixed sigill during Padlock detection on old CPUs. - - * Fixed a hang on some W2000 machines. - - * Boosted SHA-512 performance by 30% on ia32 boxes and gcc 4.3; - SHA-256 went up by 25%. - - * Interface changes relative to the 1.4.6 release: - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - GCRY_PK_ECDH NEW. - gcry_pk_get_curve NEW. - gcry_pk_get_param NEW. - GCRYCTL_DISABLE_HWF NEW. - gcry_kdf_derive NEW. - gcry_pk_encrypt EXTENDED: Support OAEP. - gcry_pk_decrypt EXTENDED: Support OAEP. - gcry_pk_sign EXTENDED: Support PSS. - gcry_pk_verify EXTENDED: Support PSS. - gcry_sexp_build EXTENDED: Add format specifiers M and u. - - * Interface changes relative to the 1.4.2 release: - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - GCRY_CIPHER_MODE_AESWRAP NEW. - GCRY_MD_TIGER1 NEW. - GCRY_MD_TIGER2 NEW. - - -Noteworthy changes in version 1.4.4 (2009-01-22) ------------------------------------------------- - - * Publish GCRY_MODULE_ID_USER and GCRY_MODULE_ID_USER_LAST constants. - This functionality has been in Libgcrypt since 1.3.0. - - * MD5 may now be used in non-enforced fips mode. - - * Fixed HMAC for SHA-384 and SHA-512 with keys longer than 64 bytes. - - * In fips mode, RSA keys are now generated using the X9.31 algorithm - and DSA keys using the FIPS 186-2 algorithm. - - * The transient-key flag is now also supported for DSA key - generation. DSA domain parameters may be given as well. - - -Noteworthy changes in version 1.4.3 (2008-09-18) ------------------------------------------------- - - * Try to auto-initialize Libgcrypt to minimize the effect of - applications not doing that correctly. This is not a perfect - solution but given that many applicationion would totally fail - without such a hack, we try to help at least with the most common - cases. Folks, please read the manual to learn how to properly - initialize Libgcrypt! - - * Auto-initialize the secure memory to 32k instead of aborting the - process. - - * Log fatal errors via syslog. - - * Changed the name and the semantics of the fips mode config file. - - * Add convenience macro gcry_fips_mode_active. - - * More self-tests. - - * Documentation cleanups. - - -Noteworthy changes in version 1.4.2 (2008-09-08) ------------------------------------------------- - - * The long missing gcry_mpi_lshift function has been added. - - * RSA key generation now supports a "transient-key" flag. - - * The keygrip computation for ECDSA has been implemented thus ECDSA - is now fully supported. - - * A few macros have been replaced by functions for better type - checking. - - * The thread initialization structure now carries version - information. - - * The manual describes more clearly how to initialize Libgcrypt. - - * The library may now be switched into a FIPS mode. - - * Interface changes relative to the 1.3.0 release: - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - GCRYCTL_OPERATIONAL_P NEW. - GCRYCTL_FIPS_MODE_P NEW. - GCRYCTL_FORCE_FIPS_MODE NEW. - gcry_cipher_setkey NEW: Replaces macro. - gcry_cipher_setiv NEW: Replaces macro. - gcry_cipher_setctr NEW: Replaces macro. - gcry_mpi_lshift NEW. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - -Noteworthy changes in version 1.4.1 (2008-04-25) ------------------------------------------------- - - * Fixed a bug introduced by 1.3.1 which led to the comsumption of far - too much entropy for the intial seeding. - - * Improved AES performance for CFB and CBC modes. - - * Removed build problems for the Padlock support. - - -Noteworthy changes in version 1.4.0 (2007-12-10) ------------------------------------------------- - - * New configure option --disable-padlock-support which is mostly - useful in case of build problems. - - -Noteworthy changes in version 1.3.2 (2007-12-03) ------------------------------------------------- - - * The visibility attribute is now used if supported by the toolchain. - - * The ACE engine of VIA processors is now used for AES-128. - - * The ASN.1 DER template for SHA-224 has been fixed. - - -Noteworthy changes in version 1.3.1 (2007-10-26) ------------------------------------------------- - - * The entire library is now under the LGPL. The helper programs and - the manual are under the GPL. Kudos to Peter Gutmann for giving - permissions to relicense the rndw32 and rndunix modules. - - * The Camellia cipher is now under the LGPL and included by default. - - * Fixed a bug in the detection of symbol prefixes which inhibited the - build of optimzied assembler code on certain systems. - - * Updated the entropy gatherer for W32. - - -Noteworthy changes in version 1.3.0 (2007-05-04) ------------------------------------------------- - - * Changed the way the RNG gets initialized. This allows to keep it - uninitialized as long as no random numbers are used. To override - this, the new macro gcry_fast_random_poll may be used. It is in - general a good idea to spread this macro into the application code - to make sure that these polls happen often enough. - - * Made the RNG immune against fork without exec. - - * Reading and writing the random seed file is now protected by a - fcntl style file lock on systems that provide this function. - - * Support for SHA-224 and HMAC using SHA-384 and SHA-512. - - * Support for the SEED cipher. - - * Support for the Camellia cipher. Note that Camellia is disabled by - default, and that enabling it changes the license of libgcrypt from - LGPL to GPL. - - * Support for OFB encryption mode. - - * gcry_mpi_rshift does not anymore truncate the shift count. - - * Reserved algorithm ranges for use by applications. - - * Support for DSA2. - - * The new function gcry_md_debug should be used instead of the - gcry_md_start_debug and gcry_md_stop_debug macros. - - * New configure option --enable-random-daemon to support a system - wide random daemon. The daemon code is experimental and not yet - very well working. It will eventually allow to keep a global - random pool for the sake of short living processes. - - * Non executable stack support is now used by default on systems - supporting it. - - * Support for Microsoft Windows. - - * Assembler support for the AMD64 architecture. - - * New configure option --enable-mpi-path for optimized builds. - - * Experimental support for ECDSA; should only be used for testing. - - * New control code GCRYCTL_PRINT_CONFIG to print the build - configuration. - - * Minor changes to some function declarations. Buffer arguments are - now typed as void pointer. This should not affect any compilation. - Fixed two bugs in return values and clarified documentation. - - * Interface changes relative to the 1.2.0 release: - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - gcry_fast_random_poll NEW - gcry_md_debug NEW - gcry_sexp_nth_string NEW - GCRY_MD_SHA224 NEW - GCRY_PK_USAGE_CERT NEW - GCRY_PK_USAGE_AUTH NEW - GCRY_PK_USAGE_UNKN NEW - GCRY_PK_ECDSA NEW - GCRY_CIPHER_SEED NEW - GCRY_CIPHER_CAMELLIA128 NEW - GCRY_CIPHER_CAMELLIA192 NEW - GCRY_CIPHER_CAMELLIA256 NEW - GCRYCTL_FAKED_RANDOM_P NEW - GCRYCTL_PRINT_CONFIG NEW - GCRYCTL_SET_RNDEGD_SOCKET NEW. - gcry_mpi_scan CHANGED: Argument BUFFER is now void*. - gcry_pk_algo_name CHANGED: Returns "?" instead of NULL. - gcry_cipher_algo_name CHANGED: Returns "?" instead of "". - gcry_pk_spec_t CHANGED: Element ALIASES is now const ptr. - gcry_md_write_t CHANGED: Argument BUF is now a const void*. - gcry_md_ctl CHANGED: Argument BUFFER is now void*. - gcry_cipher_encrypt CHANGED: Arguments IN and OUT are now void*. - gcry_cipher_decrypt CHANGED: Arguments IN and OUT are now void*. - gcry_sexp_sprint CHANGED: Argument BUFFER is now void*. - gcry_create_nonce CHANGED: Argument BUFFER is now void*. - gcry_randomize CHANGED: Argument BUFFER is now void*. - gcry_cipher_register CHANGED: Argument ALGORITHM_ID is now int*. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - -Noteworthy changes in version 1.2.0 (2004-04-15) ------------------------------------------------- - - * First stable release. - - -Noteworthy changes in version 1.1.94 (2004-03-29) -------------------------------------------------- - - * The support for multi-threaded users goes into its third - incarnation. We removed compile time support for thread libraries. - To support the thread library of your choice, you have to set up - callback handlers at initialization time. New data structures, a - new control command, and default initializers are provided for this - purpose. - - * Interface changes relative to the 1.1.93 release: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -libgcrypt-config --thread OBSOLETE -libgcrypt-pth.la REMOVED -libgcrypt-pthread.la REMOVED -GCRYCTL_SET_THREAD_CBS NEW -struct gcrypt_thread_cbs NEW -enum gcry_thread_option NEW -GCRY_THREAD_OPTION_PTH_IMPL NEW -GCRY_THREAD_OPTION_PTHREAD_IMPL NEW -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Noteworthy changes in version 1.1.93 (2004-03-06) -------------------------------------------------- - - * The automatic thread library detection has finally been removed. - From now on, only linking explicitely to libgcrypt, libgcrypt-pth - or libgcrypt-pthread is supported. - -Noteworthy changes in version 1.1.92 (2004-02-20) -------------------------------------------------- - - * Minor bug fixes. - - * Included a limited implementation of RFC2268. - - * Changed API of the gcry_ac_ functions. Only a very few programs - should be affected by this. - - * Interface changes relative to the 1.1.91 release: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -GCRY_CIPHER_RFC2268_40 NEW. -gcry_ac_data_set CHANGED: New argument FLAGS. -gcry_ac_data_get_name CHANGED: New argument FLAGS. -gcry_ac_data_get_index CHANGED: New argument FLAGS. -gcry_ac_key_pair_generate CHANGED: New and reordered arguments. -gcry_ac_key_test CHANGED: New argument HANDLE. -gcry_ac_key_get_nbits CHANGED: New argument HANDLE. -gcry_ac_key_get_grip CHANGED: New argument HANDLE. -gcry_ac_data_search REMOVED. -gcry_ac_data_add REMOVED. -GCRY_AC_DATA_FLAG_NO_BLINDING REMOVED. -GCRY_AC_FLAG_NO_BLINDING NEW: Replaces above. - - -Noteworthy changes in version 1.1.91 (2003-12-19) -------------------------------------------------- - - * Code cleanups and minor bug fixes. - - -Noteworthy changes in version 1.1.90 (2003-11-14) -------------------------------------------------- - - * The use of the GCRY_WEAK_RANDOM level is now deprecated in favor of - the new gcry_create_nonce function. - - * gcry_sexp_build now supports a "%b" format to include a memory buffer. - - * Minor configuration fixes. - - * Interface changes relative to the 1.1.44 release: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -gcry_create_nonce NEW -gcry_sexp_build ENHANCED - - -Noteworthy changes in version 1.1.44 (2003-10-31) -------------------------------------------------- - - * Bug fixes and more code cleanups. - - * Enhanced the prime API. - - * Interface changes relative to the 1.1.43 release: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -gcry_prime_group_generator NEW -gcry_prime_release_factors NEW - - -Noteworthy changes in version 1.1.43 (2003-09-04) -------------------------------------------------- - - * Bug fixes and internal code cleanups. - - * Support for the Serpent cipher algorithm. - - * Interface changes relative to the 1.1.42 release: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -gcry_prime_generate NEW -gcry_prime_check NEW - - -Noteworthy changes in version 1.1.42 (2003-07-31) -------------------------------------------------- - - * Major API cleanup. Applications need to be converted to the new - API. See README.apichanges for hints on how to do that. Backward - compatibility is provided where it was possible without too much - effort and did not collide with the overall sanitization effort. - However, this is only for ease of transition. NO DEPRECATED - FUNCTION OR DATA TYPE IS CONSIDERED A PART OF THE API OR ABI AND - WILL BE DROPPED IN THE FUTURE WITHOUT CHANGING THE SONAME OF THE - LIBRARY. - - * If gcrypt.h is included in sources compiled by GCC 3.1 or later, - deprecated attributes will warn about use of obsolete functions and - type definitions. You can suppress these warnings by passing - -Wno-deprecated-declarations to the gcc command. - - * gcry_check_version must be called from now on to initialize the - library, it is not longer optional. - - * Removed `libgcrypt errno' concept. - - * Libgcrypt depends on libgpg-error, a library that provides error - codes and according functions for all GnuPG components. Functions - that used to return error codes asa `int' have been changed to - return a code of type `gcry_error_t'. All GCRYERR_* error symbols - have been removed, since they are now contained in libgpg-error - (GPG_ERR_*). All functions and types in libgpg-error have also been - wrapped in Libgcrypt. The new types are gcry_err_code_t and - gcry_err_source_t. The new functions are gcry_err_code, - gcry_err_source, gcry_error, gcry_err_make, gcry_error_from_errno, - gcry_err_make_from_errno, gcry_err_code_from_errno, - gcry_err_code_to_errno, gcry_strsource. - - * New function gcry_mpi_dump to help in debugging. - - * Added alternative interface for asymmetric cryptography. - - * CRC-32, CRC-32 a'la RFC 1510, CRC-24 a'la RFC 2440 are now - supported. - - * SHA-256, SHA-384 and SHA-512 are now supported. - - * 128 bit Twofish is now supported. - - * The random module won't print the "not enough random bytes - available" anymore. A new progress status is issued instead. - - * CBC-MAC for block ciphers is now supported, by using a - GCRY_CIPHER_CBC_MAC cipher flag. - - * CTR mode for block ciphers is now supported. - - * The public RSA exponent can now be specified in key generation. - - * RSA blinding is now supported and is used automatically for RSA - decryption. It can be explicitely disabled by using the - `no-blinding' symbol in the `flags' S-Expression or by using the - GCRY_AC_FLAG_DATA_NO_BLINDING flag when using the ac interface. - - * gcry_sexp_canon_len does not use a `historically encoded' error - code anymore. - - - * Interface changes relative to the 1.1.12 release: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -GCRY_MPI DEPRECATED; Use: gcry_mpi_t -GcryMPI DEPRECATED; Use: gcry_mpi_t -GCRY_SEXP DEPRECATED; Use: gcry_sexp_t -GcrySexp DEPRECATED; Use: gcry_sexp_t -GCRY_CIPHER_HD DEPRECATED; Use: gcry_cipher_hd_t -GcryCipherHd DEPRECATED; Use: gcry_cipher_hd_t -GCRY_MD_HD DEPRECATED; Use: gcry_md_hd_t -GcryMDHd DEPRECATED; Use: gcry_md_hd_t -gcry_error_t NEW -gcry_err_code_t NEW -gcry_err_source_t NEW -gcry_err_make NEW -gcry_error NEW -gcry_err_code NEW -gcry_err_source NEW -gcry_err_code_from_errno NEW -gcry_err_code_to_errno NEW -gcry_err_make_from_errno NEW -gcry_error_from_errno NEW -gcry_strsource NEW -GCRYERR_{some error code} REMOVED; Use GPG_ERR_* - from libgpg-error instead. -gcry_errno REMOVED -gcry_sexp_canon_len CHANGED -gcry_sexp_build_array NEW -gcry_mpi_scan CHANGED: New argument to separate in/out args. -gcry_mpi_print CHANGED: Ditto. -gcry_mpi_dump NEW -gcry_cipher_open CHANGED -gcry_cipher_reset NEW -gcry_cipher_register NEW -gcry_cipher_unregister NEW -gcry_cipher_list NEW -gcry_cipher_algo_keylen REPLACED macro with function. -gcry_cipher_algo_blklen REPLACED macro with function. -gcry_pk_register NEW -gcry_pk_unregister NEW -gcry_pk_list NEW -gcry_pk_decrypt ENHANCED: Allows flag to return - complete S-expression. -gcry_md_open CHANGED -gcry_md_copy CHANGED -gcry_md_is_enabled NEW -gcry_md_is_secure NEW -gcry_md_register NEW -gcry_md_unregister NEW -gcry_md_list NEW -gcry_ac_data_t NEW -gcry_ac_key_t NEW -gcry_ac_key_pair_t NEW -gcry_ac_handle_t NEW -gcry_ac_key_spec_rsa_t NEW -gcry_ac_data_new NEW -gcry_ac_data_destroy NEW -gcry_ac_data_set NEW -gcry_ac_data_copy NEW -gcry_ac_data_length NEW -gcry_ac_data_get_name NEW -gcry_ac_data_get_index NEW -gcry_ac_data_clear NEW -gcry_ac_open NEW -gcry_ac_close NEW -gcry_ac_key_init NEW -gcry_ac_key_pair_generate NEW -gcry_ac_key_pair_extract NEW -gcry_ac_key_data_get NEW -gcry_ac_key_test NEW -gcry_ac_key_get_nbits NEW -gcry_ac_key_get_grip NEW -gcry_ac_key_destroy NEW -gcry_ac_key_pair_destroy NEW -gcry_ac_data_encrypt NEW -gcry_ac_data_decrypt NEW -gcry_ac_data_sign NEW -gcry_ac_data_verify NEW -gcry_ac_id_to_name NEW -gcry_ac_name_to_id NEW -gcry_handler_progress_t NEW -gcry_handler_alloc_t NEW -gcry_handler_secure_check_t NEW -gcry_handle_realloc_t NEW -gcry_handler_free_t NEW -gcry_handler_no_mem_t NEW -gcry_handler_error_t NEW -gcry_handler_log_t NEW -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Noteworthy changes in version 1.1.12 (2003-01-20) -------------------------------------------------- - - * gcry_pk_sign, gcry_pk_verify and gcry_pk_encrypt can now handle an - optional pkcs1 flags parameter in the S-expression. A similar flag - may be passed to gcry_pk_decrypt but it is only syntactically - implemented. - - * New convenience macro gcry_md_get_asnoid. - - * There is now some real stuff in the manual. - - -Noteworthy changes in version 1.1.11 (2002-12-21) -------------------------------------------------- - - * Don't export internal symbols anymore (currently only for GNU systems) - - * New algorithm: MD4 - - * Implemented ciphertext stealing. - - * Smaller bugs fixes and a few new OIDs. - - * Interface changes relative to the 1.1.8 release: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -gcry_cipher_cts NEW -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - -Noteworthy changes in version 1.1.10 (2002-09-20) -------------------------------------------------- - - * Fixed shared library builds for i386, PPC and Sparc. - - * Added simple benchmark tool. - - * Replaced the internal mutexes by code which automatically adapts to - the used threading library. Currently Pth and Pthread are - supported. For non-ELF systems the GNU toolchain is now required.. - - * Added untested support to build Windows DLLs. - -Noteworthy changes in version 1.1.9 (2002-08-23) ------------------------------------------------- - - * Support for plain old DES. - - -Noteworthy changes in version 1.1.8 (2002-06-25) ------------------------------------------------- - - * Minor cleanups and exported a few new functions. - - * Interface changes relative to the 1.1.7 release: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -gcry_mpi_div NEW -gcry_mpi_mod NEW -gcry_mpi_invm NEW -gcry_mpi_swap NEW -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Noteworthy changes in version 1.1.7 (2002-05-21) ------------------------------------------------- - -* Libgcrypt is now distributed under the terms of the GNU Lesser - General Public License; see the README file for details. - -* It is possible to use libgcrypt w/o intialized secure memory. - -* Libgcrypt should now be thread safe after the initialization. - gcry_control (GCRYCRL_INITIALIZATION_FINISHED,NULL,0) should have - been called before creating additional threads. - - * Interface changes relative to the 1.1.6 release: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -GCRYCTL_DISABLE_INTERNAL_LOCKING NEW -GCRYCTL_DISABLE_SECMEM NEW -GCRYCTL_INITIALIZATION_FINISHED NEW -GCRYCTL_INITIALIZATION_FINISHED_P NEW -GCRYCTL_ANY_INITIALIZATION_P NEW -gcry_strdup NEW -gcry_sexp_create NEW -gcry_sexp_new NEW -gcry_set_progress_handler NEW -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Noteworthy changes in version 1.1.6 (2002-02-07) ------------------------------------------------- - - * Enhanced the S-expression conversion functions. - -Noteworthy changes in version 1.1.5 (2001-12-18) ------------------------------------------------- - - * gcry_{cipher,md}_map_name are now able to map stringified object IDs. - - * New functions gcry_sexp_canon_len and gcry_cipher_mode_from_oid. - - * Closed some memory leaks. - - -Noteworthy changes in version 1.1.4 (2001-08-03) ------------------------------------------------- - - * Arcfour does now work. - - * Some minor fixes. - - * Added a first test program - - * Migrated to autoconf 2.52. - - -Noteworthy changes in version 1.1.3 (2001-05-31) ------------------------------------------------- - - * First release of Libgcrypt which is a result of splitting GnuPG - into into libgcrypt and GnuPG. - - -Copyright 2001, 2002, 2003, 2004, 2007, 2008, - 2009, 2011 Free Software Foundation, Inc. -Copyright 2013 g10 Code GmbH - -This file is free software; as a special exception the author gives -unlimited permission to copy and/or distribute it, with or without -modifications, as long as this notice is preserved. - -This file is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/src/hos_libhttpserver/src/libgcrypt/README b/src/hos_libhttpserver/src/libgcrypt/README deleted file mode 100644 index 53894e06..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/README +++ /dev/null @@ -1,284 +0,0 @@ - Libgcrypt - The GNU Crypto Library - ------------------------------------ - Version 1.6 - - Copyright (C) 1989,1991-2015 Free Software Foundation, Inc. - Copyright (C) 2012-2015 g10 Code GmbH - Copyright (C) 2013-2015 Jussi Kivilinna - - Libgcrypt is free software. See the file AUTHORS for full copying - notices, and LICENSES for notices about contributions that require - these additional notices to be distributed. - - - Overview - -------- - - Libgcrypt is a general purpose crypto library based on the code - used in GnuPG. Libgcrypt depends on the library `libgpg-error', - which must be installed correctly before Libgcrypt is to be built. - Libgcrypt is distributed under the LGPL, see the section "License" - below for details. - - - Build Instructions - ------------------ - - The download canonical location for libgcrypt is: - - ftp://ftp.gnupg.org/gcrypt/libgcrypt/ - - To build libgcrypt you need libgpg-error: - - ftp://ftp.gnupg.org/gcrypt/libgpg-error/ - - You should get the latest versions of course. - - After building and installing the libgpg-error package, you may - continue with Libgcrypt installation as with allmost all GNU - packages, you just have to do - - ./configure - make - make check - make install - - The "make check" is not required but a good idea to see whether - the library works as expected. The check takes some while and - prints some benchmarking results. Before doing "make install" you - probably need to become root. - - To build libgcrypt for Microsoft Windows, you need to have the - mingw32 cross-building toolchain installed. Instead of running a - plain configure you use - - ./autogen.sh --build-w32 - make - make install - - By default this command sequences expectsd a libgpg-error - installed below $HOME/w32root and installs libgcrypt to that - directory too. See the autogen.sh code for details. - - The documentation is available as an Info file (gcrypt.info). To - build documentation in PDF, run this: - - cd doc - make pdf - - - - Mailing List - ------------ - - You may want to join the developer's mailing list - gcrypt-devel@gnupg.org by sending mail with a subject of - "subscribe" to gcrypt-devel-request@gnupg.org. An archive of this - list is available at http://lists.gnupg.org . - - - Configure options - ----------------- - Here is a list of configure options which are sometimes useful - for installation. - - --enable-large-data-tests - With this option a "make check" will take really - long due to extra checks for the hash algorithms. - - --enable-m-guard - Enable the integrated malloc checking code. Please - note that this feature does not work on all CPUs - (e.g. SunOS 5.7 on UltraSparc-2) and might give - you a bus error. - - --disable-asm - Do not use assembler modules. It is not possible - to use this on some CPU types. - - --enable-ld-version-script - Libgcrypt tries to build a library where internal - symbols are not exported. This requires support - from ld and is currently enabled for a few OSes. - If you know that your ld supports the so called - ELF version scripts, you can use this option to - force its use. OTOH, if you get error message - from the linker, you probably want to use this - option to disable the use of version scripts. - Note, that you should never ever use an - undocumented symbol or one which is prefixed with - an underscore. - - --enable-ciphers=list - --enable-pubkey-ciphers=list - --enable-digests=list - If not otherwise specified, all algorithms - included in the libgcrypt source tree are built. - An exception are algorithms, which depend on - features not provided by the system, like 64bit - data types. With these switches it is possible - to select exactly those algorithm modules, which - should be built. The algorithms are to be - separated by spaces, commas or colons. To view - the list used with the current build the program - tests/version may be used. - - --disable-endian-check - Don't let configure test for the endianness but - try to use the OS provided macros at compile - time. This is helpful to create OS X fat binaries. - - --enable-random-daemon - Include support for a global random daemon and - build the daemon. This is an experimental feature. - - --enable-mpi-path=EXTRA_PATH - Prepend EXTRA_PATH to list of CPU specific - optimizations. For example, if you want to add - optimizations forn a Intel Pentium 4 compatible - CPU, you may use - --enable-mpi-path=pentium4/sse2:pentium4/mmx - Take care: The generated library may crash on - non-compatible CPUs. - - --enable-random=NAME - Force the use of the random gathering module - NAME. Default is either to use /dev/random or - the auto mode. Possible values for NAME are: - egd - Use the module which accesses the - Entropy Gathering Daemon. See the webpages - for more information about it. - unix - Use the standard Unix module which does not - have a very good performance. - linux - Use the module which accesses /dev/random. - This is the first choice and the default one - for GNU/Linux or *BSD. - auto - Compile linux, egd and unix in and - automagically select at runtime. - - --enable-hmac-binary-check - Include support to check the binary at runtime - against a HMAC checksum. This works only in FIPS - mode and on systems providing the dladdr function. - - --disable-padlock-support - Disable support for the PadLock engine of VIA - processors. The default is to use PadLock if - available. Try this if you get problems with - assembler code. - - --disable-aesni-support - Disable support for the AES-NI instructions of - newer Intel CPUs. The default is to use AES-NI - if available. Try this if you get problems with - assembler code. - - --disable-O-flag-munging - Some code is too complex for some compilers while - in higher optimization modes, thus the compiler - invocation is modified to use a lower - optimization level. Usually this works very well - but on some platforms these rules break the - invocation. This option may be used to disable - the feature under the assumption that either good - CFLAGS are given or the compiler can grok the code. - - - - - Build Problems - -------------- - - We can't check all assembler files, so if you have problems - assembling them (or the program crashes) use --disable-asm with - ./configure. If you opt to delete individual replacement files in - hopes of using the remaining ones, be aware that the configure - scripts may consider several subdirectories to get all available - assembler files; be sure to delete the correct ones. Never delete - udiv-qrnnd.S in any CPU directory, because there may be no C - substitute (in mpi/genereic). Don't forget to delete - "config.cache" and run "./config.status --recheck". We got a few - reports about problems using versions of gcc earlier than 2.96 - along with a non-GNU assembler (as). If this applies to your - platform, you can either upgrade gcc to a more recent version, or - use the GNU assembler. - - Some make tools are broken - the best solution is to use GNU's - make. Try gmake or grab the sources from a GNU archive and - install them. - - Specific problems on some machines: - - * IBM RS/6000 running AIX - - Due to a change in gcc (since version 2.8) the MPI stuff may - not build. In this case try to run configure using: - CFLAGS="-g -O2 -mcpu=powerpc" ./configure - - * SVR4.2 (ESIX V4.2 cc) - - Due to problems with the ESIX as(1), you probably want to do: - CFLAGS="-O -K pentium" ./configure --disable-asm - - * SunOS 4.1.4 - - ./configure ac_cv_sys_symbol_underscore=yes - - * Sparc64 CPUs - - We have reports about failures in the AES module when - compiling using gcc (e.g. version 4.1.2) and the option -O3; - using -O2 solves the problem. - - - License - ------- - - The library is distributed under the terms of the GNU Lesser - General Public License (LGPL); see the file COPYING.LIB for the - actual terms. The helper programs (e.g. gcryptrnd and getrandom) - as well as the documentation are distributed under the terms of - the GNU General Public License (GPL); see the file COPYING for the - actual terms. The file LICENSES has notices about contributions - that require these additional notices are distributed. - - This library used to be available under the GPL - this was changed - with version 1.1.7 with the rationale that there are now many free - crypto libraries available and many of them come with capabilities - similar to Libcrypt. We decided that to foster the use of - cryptography in Free Software an LGPLed library would make more - sense because it avoids problems due to license incompatibilities - between some Free Software licenses and the GPL. - - Please note that in many cases it is better for a library to be - licensed under the GPL, so that it provides an advantage for free - software projects. The Lesser GPL is so named because it does - less to protect the freedom of the users of the code that it - covers. See http://www.gnu.org/philosophy/why-not-lgpl.html for - more explanation. - - - Contact - ------- - - See the file AUTHORS. - - Commercial grade support for Libgcrypt is available; please see - http://www.gnupg.org/service.html . - - Commercial grade support for Libgcrypt is available; for a listing - of offers see http://www.gnupg.org/service.html . The driving - force behind the development of Libgcrypt is the company of its - principal author, Werner Koch. Maintenance and improvement of - Libgcrypt takes up a lot resources. To allow him to continue his - work, he asks to either purchase a support contract, engage them - for custom enhancements, or to donate money. See http://g10code.com . - - - This file is Free Software; as a special exception the authors gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. For conditions - of the whole package, please see the file COPYING. This file is - distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY, to the extent permitted by law; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/src/hos_libhttpserver/src/libgcrypt/README.GIT b/src/hos_libhttpserver/src/libgcrypt/README.GIT deleted file mode 100644 index ee2c6383..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/README.GIT +++ /dev/null @@ -1,49 +0,0 @@ -If you are building from GIT, run the script - -./autogen.sh - -first, to make sure that you have all the necessary maintainer tools -are installed and to build the actual configuration files. If you -have just checked out from GIT, you should add the option "--force" to -autogen.sh so that meta data is noticed by autom4te.cache. Then run - -./configure --enable-maintainer-mode - -followed by the usual make. - -If autogen.sh complains about insufficient versions of the required -tools, or the tools are not installed, you may use environment -variables to override the default tool names: - - AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake - package. For example - AUTOMAKE_SUFFIX="-1.7" ./autogen.sh - uses "automake-1.7" and "aclocal-1.7. - AUTOMAKE_PREFIX is used as a prefix for all tools from the automake - page and may be combined with AUTOMAKE_SUFFIX. e.g.: - AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh - uses "automake" and "aclocal" in the /usr/foo/bin - directory. - AUTOCONF_SUFFIX is used as a suffix for all tools from the automake - package - AUTOCONF_PREFIX is used as a prefix for all tools from the automake - package - GETTEXT_SUFFIX is used as a suffix for all tools from the gettext - package - GETTEXT_PREFIX is used as a prefix for all tools from the gettext - package - -It is also possible to use the variable name AUTOMAKE, AUTOCONF, -ACLOCAL, AUTOHEADER, GETTEXT and MSGMERGE to directly specify the name -of the programs to run. It is however better to use the suffix and -prefix forms as described above because that does not require -knowledge about the actual tools used by autogen.sh. - - -Please don't use autopoint, libtoolize or autoreconf unless you are -the current maintainer and want to update the standard configuration -files. All those files should be in GIT and only updated manually -if the maintainer decides that newer versions are required. The -maintainer should also make sure that the required version of automake -et al. are properly indicated at the top of configure.ac and take care -to copy the files and not merely use symlinks. diff --git a/src/hos_libhttpserver/src/libgcrypt/THANKS b/src/hos_libhttpserver/src/libgcrypt/THANKS deleted file mode 100644 index 6a44eade..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/THANKS +++ /dev/null @@ -1,168 +0,0 @@ -Libgcrypt is based on the GnuPG code. Here is a list of people, who -helped in GnuPG and Libgcrypt development. Please help us to keep it -complete and free of errors. - -Albert Chin china at thewrittenword com -Allan Clark allanc@sco.com -Anand Kumria wildfire@progsoc.uts.edu.au -Andreas Metzler ametzler at downhill.at.eu.org -Ariel T Glenn ariel@columbia.edu -Aurelien Jarno aurel32 at debian.org -Ben Hutchings ben decadent org uk -Bodo Moeller Bodo_Moeller@public.uni-hamburg.de -Brenno de Winter brenno@dewinter.com -Brian Moore bem@cmc.net -Brian Warner warner@lothar.com -Brieuc Jeunhomme bbp@via.ecp.fr -Bryan Fullerton bryanf@samurai.com -Caskey L. Dickson caskey@technocage.com -Cees van de Griend cees-list@griend.xs4all.nl -Charles Levert charles@comm.polymtl.ca -Christian Biere christianbiere@gmx.de -Christian Grothoff christian at grothoff org -Christian von Roques roques@pond.sub.org -Christopher Oliver oliver@fritz.traverse.net -Christian Recktenwald chris@citecs.de -Daiki Ueno ueno at unixuser org -Dan Fandrich dan at coneharvesters com -Daniel Eisenbud eisenbud@cs.swarthmore.edu -Daniel Koening dan@mail.isis.de -David Ellement ellement@sdd.hp.com -Detlef Lannert lannert@lannert.rz.uni-duesseldorf.de -Dirk Lattermann dlatt@t-online.de -Dirk Stoecker gcrypt@dstoecker.de -Ed Boraas ecxjo@esperanto.org -Elie De Brauwer elie@de-brauwer.be -Enzo Michelangeli em@MailAndNews.com -Ernst Molitor ernst.molitor@uni-bonn.de -Fabian Keil fk at fabiankeil de -Fabio Coatti cova@felix.unife.it -Felix von Leitner leitner@amdiv.de -Frank Heckenbach heckenb@mi.uni-erlangen.de -Frank Stajano frank.stajano@cl.cam.ac.uk -Gabriele Monti psicus78 gmail com -Gaël Quéri gqueri@mail.dotcom.fr -Gregor Riepl seto-kun@freesurf.ch -Gerlinde Klaes gk@u64.de -Greg Louis glouis@dynamicro.on.ca -Greg Troxel gdt@ir.bbn.com -Gregory Steuck steuck@iname.com -Geoff Keating geoffk@ozemail.com.au -Harald Denker harry@hal.westfalen.de -Hendrik Buschkamp buschkamp@rheumanet.org -Holger Schurig holger@d.om.org -Hugh Daniel hugh@toad.com -Ian McKellar imckellar@harvestroad.com.au -Ian Peters itp@ximian.com -Janusz A. Urbanowicz alex@bofh.torun.pl -James Troup james@nocrew.org -Jean-loup Gailly gzip@prep.ai.mit.edu -Jeff Johnson jbj@redhat.com -Jens Bachem bachem@rrz.uni-koeln.de -J Horacio MG homega@ciberia.es -Joachim Backes backes@rhrk.uni-kl.de -Jordi Mallach jordi@sindominio.net -John A. Martin jam@jamux.com -Johnny Teveßen j.tevessen@gmx.de -Jörg Schilling schilling@fokus.gmd.de -Jun Kuriyama kuriyama@sky.rim.or.jp -Karl Fogel kfogel@guanabana.onshore.com -Karsten Thygesen karthy@kom.auc.dk -Katsuhiro Kondou kondou@nec.co.jp -Kazu Yamamoto kazu@iijlab.net -Lars Kellogg-Stedman lars@bu.edu -Lee Fisher blibbet at gmail dot com -Marco d'Itri md@linux.it -Mark Adler madler@alumni.caltech.edu -Mark Elbrecht snowball3@bigfoot.com -Markus Friedl Markus.Friedl@informatik.uni-erlangen.de -Matthias Urlichs smurf@smurf.noris.de -Martin Kahlert martin.kahlert@provi.de -Martin Hamilton -Martin Schulte schulte@thp.uni-koeln.de -Matthew Skala mskala@ansuz.sooke.bc.ca -Max Kellermann max@duempel.org -Max Valianskiy maxcom@maxcom.ml.org -Michael Fischer v. Mollard mfvm@gmx.de -Michael Roth mroth@nessie.de -Michael Sobolev mss@despair.transas.com -Michele Baldessari michele@pupazzo.org -Modestas Vainius geromanas@mailas.com -Neil Dunbar neil.dunbar at pobox.com -Neil Spring nspring@cs.washington.edu -Newton Hammet newton@hammet.net -Nicolas Graner Nicolas.Graner@cri.u-psud.fr -NIIBE Yutaka gniibe@chroot.org -Niklas Hernaeus -Nikolay Sturm sturm@sec.informatik.tu-darmstadt.de -Nikos Mavroyanopoulos nmav@hellug.gr -Nimrod Zimerman zimerman@forfree.at -N J Doye nic@niss.ac.uk -Oliver Haakert haakert@hsp.de -Oskari Jääskeläinen f33003a@cc.hut.fi -Paul D. Smith psmith@baynetworks.com -Philippe Laliberte arsphl@oeil.qc.ca -Peter Gutmann pgut001@cs.auckland.ac.nz -QingLong qinglong@bolizm.ihep.su -Rafael Ãvila de Espíndola rafael.espindola@gmail.com -Rafaël Carré funman@videolan.org -Ralf Fassel ralf@akutech.de -Ralf Hildebrandt Ralf.Hildebrandt@innominate.com -Ralf Schneider ralf@tapfere-schneiderleins.de -Ralph Gillen gillen@theochem.uni-duesseldorf.de -Rami Lehti Rami.Lehti@finland.sun.com -Randolph Chung tausq@debian.org -Randy mcclellr@oit.edu -Rat ratinox@peorth.gweep.net -Reinhard Wobst R.Wobst@ifw-dresden.de -Rémi Guyomarch rguyom@mail.dotcom.fr -Reuben Sumner rasumner@wisdom.weizmann.ac.il -Richard Outerbridge outer@interlog.com -Roddy Strachan roddy@satlink.com.au -Roland Rosenfeld roland@spinnaker.rhein.de -Ross Golder rossigee@bigfoot.com -Serge Munhoven munhoven@mema.ucl.ac.be -Sergi Blanch i Torné sergi at calcurco cat -Simon Josefsson jas@extundo.com -SL Baur steve@xemacs.org -Stephan Austermuehle au@hcsd.de -Stephan Müller smueller at atsec com -Stephane Corthesy stephane@sente.ch -Stefan Karrmann S.Karrmann@gmx.net -Stefan Keller dres@cs.tu-berlin.de -Stefan Krüger stadtkind2 at gmx de -Steffen Ullrich ccrlphr@xensei.com -Steffen Zahn zahn@berlin.snafu.de -Steven Bakker steven@icoe.att.com -Susanne Schultz schultz@hsp.de -Sven Bjorn -Szakats Istvan szaki.ms@gmail.com -Thiago Jung Bauermann jungmann@cwb.matrix.com.br -Thomas Roessler roessler@guug.de -Tom Holroyd tomh@po.crl.go.jp -Tom Spindler dogcow@home.merit.edu -Tom Zerucha tzeruch@ceddec.com -Tomas Fasth tomas.fasth@twinspot.net -Tommi Komulainen Tommi.Komulainen@iki.fi -Thomas Mikkelsen tbm@image.dk -Ulf Möller 3umoelle@informatik.uni-hamburg.de -Umberto Salsi salsi@icosaedro.it -Uoti Urpala -Urko Lusa ulusa@euskalnet.net -Victor Stinner haypo@inl.fr -Walter Koch koch@u32.de -Werner Koch wk@gnupg.org -Wim Vandeputte wim@kd85.com - nbecker@hns.com - - - Copyright 1998, 1999, 2000, 2001, 2002, 2003, - 2009, 2011 Free Software Foundation, Inc. - - This file is free software; as a special exception the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. - - This file is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/src/hos_libhttpserver/src/libgcrypt/TODO b/src/hos_libhttpserver/src/libgcrypt/TODO deleted file mode 100644 index ffadc06d..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/TODO +++ /dev/null @@ -1,59 +0,0 @@ -# What's left to do -*- org -*- - -* Next API break: -** gcry_ac_io_t - Remove use of anonymous union. -** gcry_ac - Consider to remove it. - -* udiv-qrnbd.o should get build as *.lo [HPUX] - -* Allow operation using RSA keys consisting of the OpenSSL keys. - This requires the introduction of a parameter names (say) U which - is calculated according to OpenSSL/PKCS#1 rules. - -* linker script test - Write an autoconf test to check whether the linker supports a - version script. - -* Add attributes to the MPI functions. - -* cipher/pubkey.c and pubkey implementaions. - Don't rely on the secure memory based wiping function but add an - extra wiping. - -* Use builtin bit functions of gcc 3.4 - -* Consider using a daemon to maintain the random pool - [Partly done] The down side of this is that we can't assume that the - random has has always been stored in "secure memory". And we rely - on that sniffing of Unix domain sockets is not possible. We can - implement this simply by detecting a special prefixed random seed - name and divert in this case to the daemon. There are several - benefits with such an approach: We keep the state of the RNG over - invocations of libgcrypt based applications, don't need time - consuming initialization of the pool and in case the entropy - collectros need to run that bunch of Unix utilities we don't waste - their precious results. - -* gcryptrnd.c - Requires a test for pth [done] as well as some other tests. - -* secmem.c - Check whether the memory block is valid before releasing it and - print a diagnosic, like glibc does. - -* threads -** We need to document fork problems - In particular that reinitialization is required in random.c - However, there is no code yet to do it. - -* Tests - We need a lot more tests. Lets keep an ever growing list here. -** Write tests for the progress function -** mpitests does no real checks yet. -** pthreads - To catch simple errors like the one fixed on 2007-03-16. -** C++ tests - We have some code to allow using libgcrypt from C++, so we also - should have a test case. diff --git a/src/hos_libhttpserver/src/libgcrypt/VERSION b/src/hos_libhttpserver/src/libgcrypt/VERSION deleted file mode 100644 index 266146b8..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.6.3 diff --git a/src/hos_libhttpserver/src/libgcrypt/acinclude.m4 b/src/hos_libhttpserver/src/libgcrypt/acinclude.m4 deleted file mode 100644 index 0791b84a..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/acinclude.m4 +++ /dev/null @@ -1,393 +0,0 @@ -dnl macros to configure Libgcrypt -dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, -dnl 2003 Free Software Foundation, Inc. -dnl Copyright (C) 2013 g10 Code GmbH -dnl -dnl This file is part of Libgcrypt. -dnl -dnl Libgcrypt is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU Lesser General Public License as -dnl published by the Free Software Foundation; either version 2.1 of -dnl the License, or (at your option) any later version. -dnl -dnl Libgcrypt is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - -dnl GCRY_MSG_SHOW(PREFIX,STRING) -dnl Print a message with a prefix. -dnl -define([GCRY_MSG_SHOW], - [ - echo " $1 $2" 1>&AS_MESSAGE_FD([]) - ]) - -dnl GCRY_MSG_WRAP(PREFIX, ALGOLIST) -dnl Print a nicely formatted list of algorithms -dnl with an approriate line wrap. -dnl -define([GCRY_MSG_WRAP], - [ - tmp=" $1" - tmpi="abc" - if test "${#tmpi}" -ne 3 >/dev/null 2>&1 ; then - dnl Without a POSIX shell, we don't botter to wrap it - echo "$tmp $2" 1>&AS_MESSAGE_FD([]) - else - tmpi=`echo "$tmp"| sed 's/./ /g'` - echo $2 EOF | tr ' ' '\n' | \ - while read word; do - if test "${#tmp}" -gt 70 ; then - echo "$tmp" 1>&AS_MESSAGE_FD([]) - tmp="$tmpi" - fi - if test "$word" = "EOF" ; then - echo "$tmp" 1>&AS_MESSAGE_FD([]) - else - tmp="$tmp $word" - fi - done - fi - ]) - - -dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME) -dnl Check whether a typedef exists and create a #define $2 if it exists -dnl -AC_DEFUN([GNUPG_CHECK_TYPEDEF], - [ AC_MSG_CHECKING(for $1 typedef) - AC_CACHE_VAL(gnupg_cv_typedef_$1, - [AC_TRY_COMPILE([#define _GNU_SOURCE 1 - #include - #include ], [ - #undef $1 - int a = sizeof($1); - ], gnupg_cv_typedef_$1=yes, gnupg_cv_typedef_$1=no )]) - AC_MSG_RESULT($gnupg_cv_typedef_$1) - if test "$gnupg_cv_typedef_$1" = yes; then - AC_DEFINE($2,1,[Defined if a `]$1[' is typedef'd]) - fi - ]) - - -dnl GNUPG_CHECK_GNUMAKE -dnl -AC_DEFUN([GNUPG_CHECK_GNUMAKE], - [ - if ${MAKE-make} --version 2>/dev/null | grep '^GNU ' >/dev/null 2>&1; then - : - else - AC_MSG_WARN([[ -*** -*** It seems that you are not using GNU make. Some make tools have serious -*** flaws and you may not be able to build this software at all. Before you -*** complain, please try GNU make: GNU make is easy to build and available -*** at all GNU archives. It is always available from ftp.gnu.org:/gnu/make. -***]]) - fi - ]) - - -# -# GNUPG_SYS_SYMBOL_UNDERSCORE -# Does the compiler prefix global symbols with an underscore? -# -# Taken from GnuPG 1.2 and modified to use the libtool macros. -AC_DEFUN([GNUPG_SYS_SYMBOL_UNDERSCORE], -[tmp_do_check="no" -case "${host}" in - *-mingw32*) - ac_cv_sys_symbol_underscore=yes - ;; - i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp) - ac_cv_sys_symbol_underscore=yes - ;; - *) - if test "$cross_compiling" = yes; then - if test "x$ac_cv_sys_symbol_underscore" = x ; then - ac_cv_sys_symbol_underscore=yes - fi - else - tmp_do_check="yes" - fi - ;; -esac -if test "$tmp_do_check" = "yes"; then - AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE]) - AC_MSG_CHECKING([for _ prefix in compiled symbols]) - AC_CACHE_VAL(ac_cv_sys_symbol_underscore, - [ac_cv_sys_symbol_underscore=no - cat > conftest.$ac_ext < $ac_nlist) && test -s "$ac_nlist"; then - # See whether the symbols have a leading underscore. - if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then - ac_cv_sys_symbol_underscore=yes - else - if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then - : - else - echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC - fi - fi - else - echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC - fi - else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC - fi - rm -rf conftest* - ]) - else - AC_MSG_CHECKING([for _ prefix in compiled symbols]) - fi -AC_MSG_RESULT($ac_cv_sys_symbol_underscore) -if test x$ac_cv_sys_symbol_underscore = xyes; then - AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1, - [Defined if compiled symbols have a leading underscore]) -fi -]) - - -###################################################################### -# Check whether mlock is broken (hpux 10.20 raises a SIGBUS if mlock -# is not called from uid 0 (not tested whether uid 0 works) -# For DECs Tru64 we have also to check whether mlock is in librt -# mlock is there a macro using memlk() -###################################################################### -dnl GNUPG_CHECK_MLOCK -dnl -define(GNUPG_CHECK_MLOCK, - [ AC_CHECK_FUNCS(mlock) - if test "$ac_cv_func_mlock" = "no"; then - AC_CHECK_HEADERS(sys/mman.h) - if test "$ac_cv_header_sys_mman_h" = "yes"; then - # Add librt to LIBS: - AC_CHECK_LIB(rt, memlk) - AC_CACHE_CHECK([whether mlock is in sys/mman.h], - gnupg_cv_mlock_is_in_sys_mman, - [AC_TRY_LINK([ - #include - #ifdef HAVE_SYS_MMAN_H - #include - #endif - ], [ -int i; - -/* glibc defines this for functions which it implements - * to always fail with ENOSYS. Some functions are actually - * named something starting with __ and the normal name - * is an alias. */ -#if defined (__stub_mlock) || defined (__stub___mlock) -choke me -#else -mlock(&i, 4); -#endif -; return 0; - ], - gnupg_cv_mlock_is_in_sys_mman=yes, - gnupg_cv_mlock_is_in_sys_mman=no)]) - if test "$gnupg_cv_mlock_is_in_sys_mman" = "yes"; then - AC_DEFINE(HAVE_MLOCK,1, - [Defined if the system supports an mlock() call]) - fi - fi - fi - if test "$ac_cv_func_mlock" = "yes"; then - AC_CHECK_FUNCS(sysconf getpagesize) - AC_MSG_CHECKING(whether mlock is broken) - AC_CACHE_VAL(gnupg_cv_have_broken_mlock, - AC_TRY_RUN([ -#include -#include -#include -#include -#include -#include - -int main() -{ - char *pool; - int err; - long int pgsize; - -#if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE) - pgsize = sysconf (_SC_PAGESIZE); -#elif defined (HAVE_GETPAGESIZE) - pgsize = getpagesize(); -#else - pgsize = -1; -#endif - - if (pgsize == -1) - pgsize = 4096; - - pool = malloc( 4096 + pgsize ); - if( !pool ) - return 2; - pool += (pgsize - ((long int)pool % pgsize)); - - err = mlock( pool, 4096 ); - if( !err || errno == EPERM ) - return 0; /* okay */ - - return 1; /* hmmm */ -} - - ], - gnupg_cv_have_broken_mlock="no", - gnupg_cv_have_broken_mlock="yes", - gnupg_cv_have_broken_mlock="assume-no" - ) - ) - if test "$gnupg_cv_have_broken_mlock" = "yes"; then - AC_DEFINE(HAVE_BROKEN_MLOCK,1, - [Defined if the mlock() call does not work]) - AC_MSG_RESULT(yes) - else - if test "$gnupg_cv_have_broken_mlock" = "no"; then - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(assuming no) - fi - fi - fi - ]) - -# GNUPG_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32 -AC_DEFUN([GNUPG_SYS_LIBTOOL_CYGWIN32], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -AC_CHECK_TOOL(AS, as, false) -]) - -dnl LIST_MEMBER() -dnl Check wether an element ist contained in a list. Set `found' to -dnl `1' if the element is found in the list, to `0' otherwise. -AC_DEFUN([LIST_MEMBER], -[ -name=$1 -list=$2 -found=0 - -for n in $list; do - if test "x$name" = "x$n"; then - found=1 - fi -done -]) - - -dnl Check for socklen_t: historically on BSD it is an int, and in -dnl POSIX 1g it is a type of its own, but some platforms use different -dnl types for the argument to getsockopt, getpeername, etc. So we -dnl have to test to find something that will work. -AC_DEFUN([TYPE_SOCKLEN_T], -[ - AC_CHECK_TYPE([socklen_t], ,[ - AC_MSG_CHECKING([for socklen_t equivalent]) - AC_CACHE_VAL([socklen_t_equiv], - [ - # Systems have either "struct sockaddr *" or - # "void *" as the second argument to getpeername - socklen_t_equiv= - for arg2 in "struct sockaddr" void; do - for t in int size_t unsigned long "unsigned long"; do - AC_TRY_COMPILE([ -#include -#include - -int getpeername (int, $arg2 *, $t *); - ],[ - $t len; - getpeername(0,0,&len); - ],[ - socklen_t_equiv="$t" - break - ]) - done - done - - if test "x$socklen_t_equiv" = x; then - AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) - fi - ]) - AC_MSG_RESULT($socklen_t_equiv) - AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv, - [type to use in place of socklen_t if not defined])], - [#include -#include ]) -]) - - -# GNUPG_PTH_VERSION_CHECK(REQUIRED) -# -# If the version is sufficient, HAVE_PTH will be set to yes. -# -# Taken form the m4 macros which come with Pth -AC_DEFUN([GNUPG_PTH_VERSION_CHECK], - [ - _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'` - _req_version="ifelse([$1],,1.2.0,$1)" - - AC_MSG_CHECKING(for PTH - version >= $_req_version) - for _var in _pth_version _req_version; do - eval "_val=\"\$${_var}\"" - _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'` - _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'` - _rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'` - _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'` - case $_rtype in - "a" ) _rtype=0 ;; - "b" ) _rtype=1 ;; - "." ) _rtype=2 ;; - esac - _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \ - "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"` - eval "${_var}_hex=\"\$_hex\"" - done - have_pth=no - if test ".$_pth_version_hex" != .; then - if test ".$_req_version_hex" != .; then - if test $_pth_version_hex -ge $_req_version_hex; then - have_pth=yes - fi - fi - fi - if test $have_pth = yes; then - AC_MSG_RESULT(yes) - AC_MSG_CHECKING([whether PTH installation is sane]) - AC_CACHE_VAL(gnupg_cv_pth_is_sane,[ - _gnupg_pth_save_cflags=$CFLAGS - _gnupg_pth_save_ldflags=$LDFLAGS - _gnupg_pth_save_libs=$LIBS - CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`" - LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`" - LIBS="$LIBS `$PTH_CONFIG --libs`" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include - ], - [[ pth_init ();]])], - gnupg_cv_pth_is_sane=yes, - gnupg_cv_pth_is_sane=no) - CFLAGS=$_gnupg_pth_save_cflags - LDFLAGS=$_gnupg_pth_save_ldflags - LIBS=$_gnupg_pth_save_libs - ]) - if test $gnupg_cv_pth_is_sane != yes; then - have_pth=no - fi - AC_MSG_RESULT($gnupg_cv_pth_is_sane) - else - AC_MSG_RESULT(no) - fi - ]) diff --git a/src/hos_libhttpserver/src/libgcrypt/aclocal.m4 b/src/hos_libhttpserver/src/libgcrypt/aclocal.m4 deleted file mode 100644 index ddde9458..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/aclocal.m4 +++ /dev/null @@ -1,1218 +0,0 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. - -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically 'autoreconf'.])]) - -# Copyright (C) 2002-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# Figure out how to run the assembler. -*- Autoconf -*- - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_AS -# ---------- -AC_DEFUN([AM_PROG_AS], -[# By default we simply use the C compiler to build assembly code. -AC_REQUIRE([AC_PROG_CC]) -test "${CCAS+set}" = set || CCAS=$CC -test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS -AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) -AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) -_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl -]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is '.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -# Expand $ac_aux_dir to an absolute path. -am_aux_dir=`cd "$ac_aux_dir" && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ([2.52])dnl - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - - -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], - [$1], [CXX], [depcc="$CXX" am_compiler_list=], - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], - [$1], [UPC], [depcc="$UPC" am_compiler_list=], - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE([dependency-tracking], [dnl -AS_HELP_STRING( - [--enable-dependency-tracking], - [do not reject slow dependency extractors]) -AS_HELP_STRING( - [--disable-dependency-tracking], - [speeds up one-time build])]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -m4_define([AC_PROG_CC], -m4_defn([AC_PROG_CC]) -[_AM_PROG_CC_C_O -]) - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.65])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[AC_DIAGNOSE([obsolete], - [$0: two- and three-arguments forms are deprecated.]) -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -AM_MISSING_PROG([AUTOCONF], [autoconf]) -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -AM_MISSING_PROG([AUTOHEADER], [autoheader]) -AM_MISSING_PROG([MAKEINFO], [makeinfo]) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES([CC])], - [m4_define([AC_PROG_CC], - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES([OBJC])], - [m4_define([AC_PROG_OBJC], - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], - [_AM_DEPENDENCIES([OBJCXX])], - [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl -]) -AC_REQUIRE([AM_SILENT_RULES])dnl -dnl The testsuite driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl - -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) - fi -fi -]) - -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST([install_sh])]) - -# Copyright (C) 2003-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless 'enable' is passed literally. -# For symmetry, 'disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], - am_maintainer_other[ make rules and dependencies not useful - (and sometimes confusing) to the casual installer])], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it is modern enough. -# If it is, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) -fi -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# -------------------- -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) - -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_PROG_CC_C_O -# --------------- -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -# to automatically call this. -AC_DEFUN([_AM_PROG_CC_C_O], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -AC_LANG_PUSH([C])dnl -AC_CACHE_CHECK( - [whether $CC understands -c and -o together], - [am_cv_prog_cc_c_o], - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i]) -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -AC_LANG_POP([C])]) - -# For backward compatibility. -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; -esac - -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken - alias in your environment]) - fi - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT([yes]) -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi -AC_CONFIG_COMMANDS_PRE( - [AC_MSG_CHECKING([that generated files are newer than configure]) - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - AC_MSG_RESULT([done])]) -rm -f conftest.file -]) - -# Copyright (C) 2009-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# ("yes" being less verbose, "no" or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], [dnl -AS_HELP_STRING( - [--enable-silent-rules], - [less verbose build output (undo: "make V=1")]) -AS_HELP_STRING( - [--disable-silent-rules], - [verbose build output (undo: "make V=0")])dnl -]) -case $enable_silent_rules in @%:@ ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -dnl -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) - -# Copyright (C) 2001-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor 'install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in "make install-strip", and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of 'v7', 'ustar', or 'pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -# -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) - -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' - -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - - [m4_case([$1], - [ustar], - [# The POSIX 1988 'ustar' format is defined with fixed-size fields. - # There is notably a 21 bits limit for the UID and the GID. In fact, - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 - # and bug#13588). - am_max_uid=2097151 # 2^21 - 1 - am_max_gid=$am_max_uid - # The $UID and $GID variables are not portable, so we need to resort - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls - # below are definitely unexpected, so allow the users to see them - # (that is, avoid stderr redirection). - am_uid=`id -u || echo unknown` - am_gid=`id -g || echo unknown` - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) - if test $am_uid -le $am_max_uid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) - if test $am_gid -le $am_max_gid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi], - - [pax], - [], - - [m4_fatal([Unknown tar format])]) - - AC_MSG_CHECKING([how to create a $1 tar archive]) - - # Go ahead even if we have the value already cached. We do so because we - # need to set the values for the 'am__tar' and 'am__untar' variables. - _am_tools=${am_cv_prog_tar_$1-$_am_tools} - - for _am_tool in $_am_tools; do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works. - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi - done - rm -rf conftest.dir - - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) - AC_MSG_RESULT([$am_cv_prog_tar_$1])]) - -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -m4_include([m4/gpg-error.m4]) -m4_include([m4/libtool.m4]) -m4_include([m4/lock.m4]) -m4_include([m4/ltoptions.m4]) -m4_include([m4/ltsugar.m4]) -m4_include([m4/ltversion.m4]) -m4_include([m4/lt~obsolete.m4]) -m4_include([m4/noexecstack.m4]) -m4_include([m4/onceonly.m4]) -m4_include([m4/socklen.m4]) -m4_include([m4/sys_socket_h.m4]) -m4_include([m4/threadlib.m4]) -m4_include([acinclude.m4]) diff --git a/src/hos_libhttpserver/src/libgcrypt/autogen.rc b/src/hos_libhttpserver/src/libgcrypt/autogen.rc deleted file mode 100644 index 09a9b9c1..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/autogen.rc +++ /dev/null @@ -1,17 +0,0 @@ -# autogen.sh configuration for Libgcrypt -*- sh -*- - -case "$myhost" in - w32) - configure_opts=" - --with-gpg-error-prefix=@SYSROOT@ - " - ;; - - amd64) - configure_opts=" - --with-gpg-error-prefix=@SYSROOT@ - " - ;; -esac - -final_info="./configure --enable-maintainer-mode && make" diff --git a/src/hos_libhttpserver/src/libgcrypt/autogen.sh b/src/hos_libhttpserver/src/libgcrypt/autogen.sh deleted file mode 100755 index 471193c2..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/autogen.sh +++ /dev/null @@ -1,393 +0,0 @@ -#! /bin/sh -# autogen.sh -# Copyright (C) 2003, 2014 g10 Code GmbH -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# This is a generic script to create the configure script and handle cross -# build environments. It requires the presence of a autogen.rc file to -# configure it for the respective package. It is maintained as part of -# GnuPG and source copied by other packages. -# -# Version: 2014-01-10 - -configure_ac="configure.ac" - -cvtver () { - awk 'NR==1 {split($NF,A,".");X=1000000*A[1]+1000*A[2]+A[3];print X;exit 0}' -} - -check_version () { - if [ $(( `("$1" --version || echo "0") | cvtver` >= $2 )) = 1 ]; then - return 0 - fi - echo "**Error**: "\`$1\'" not installed or too old." >&2 - echo ' Version '$3' or newer is required.' >&2 - [ -n "$4" ] && echo ' Note that this is part of '\`$4\''.' >&2 - DIE="yes" - return 1 -} - -fatal () { - echo "autogen.sh:" "$*" >&2 - DIE=yes -} - -info () { - if [ -z "${SILENT}" ]; then - echo "autogen.sh:" "$*" - fi -} - -die_p () { - if [ "$DIE" = "yes" ]; then - echo "autogen.sh: Stop." >&2 - exit 1 - fi -} - -replace_sysroot () { - configure_opts=$(echo $configure_opts | sed "s#@SYSROOT@#${w32root}#g") - extraoptions=$(echo $extraoptions | sed "s#@SYSROOT@#${w32root}#g") -} - -# Allow to override the default tool names -AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX} -AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX} - -AUTOMAKE=${AUTOMAKE_PREFIX}${AUTOMAKE:-automake}${AUTOMAKE_SUFFIX} -ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX} - -GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX} -MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX} - -DIE=no -FORCE= -SILENT= -tmp=$(dirname "$0") -tsdir=$(cd "${tmp}"; pwd) - -if [ -n "${AUTOGEN_SH_SILENT}" ]; then - SILENT=" --silent" -fi -if test x"$1" = x"--help"; then - echo "usage: ./autogen.sh [--silent] [--force] [--build-TYPE] [ARGS]" - exit 0 -fi -if test x"$1" = x"--silent"; then - SILENT=" --silent" - shift -fi -if test x"$1" = x"--force"; then - FORCE=" --force" - shift -fi - - -# Reject unsafe characters in $HOME, $tsdir and cwd. We consider spaces -# as unsafe because it is too easy to get scripts wrong in this regard. -am_lf=' -' -case `pwd` in - *[\;\\\"\#\$\&\'\`$am_lf\ \ ]*) - fatal "unsafe working directory name" ;; -esac -case $tsdir in - *[\;\\\"\#\$\&\'\`$am_lf\ \ ]*) - fatal "unsafe source directory: \`$tsdir'" ;; -esac -case $HOME in - *[\;\\\"\#\$\&\'\`$am_lf\ \ ]*) - fatal "unsafe home directory: \`$HOME'" ;; -esac -die_p - - -# List of variables sourced from autogen.rc. The strings '@SYSROOT@' in -# these variables are replaced by the actual system root. -configure_opts= -extraoptions= -# List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc -w32_toolprefixes= -w32_extraoptions= -w32ce_toolprefixes= -w32ce_extraoptions= -w64_toolprefixes= -w64_extraoptions= -amd64_toolprefixes= -# End list of optional variables sourced from ~/.gnupg-autogen.rc -# What follows are variables which are sourced but default to -# environment variables or lacking them hardcoded values. -#w32root= -#w32ce_root= -#w64root= -#amd64root= - -# Convenience option to use certain configure options for some hosts. -myhost="" -myhostsub="" -case "$1" in - --build-w32) - myhost="w32" - shift - ;; - --build-w32ce) - myhost="w32" - myhostsub="ce" - shift - ;; - --build-w64) - myhost="w32" - myhostsub="64" - shift - ;; - --build-amd64) - myhost="amd64" - shift - ;; - --build*) - fatal "**Error**: invalid build option $1" - shift - ;; - *) - ;; -esac -die_p - - -# Source our configuration -if [ -f "${tsdir}/autogen.rc" ]; then - . "${tsdir}/autogen.rc" -fi - -# Source optional site specific configuration -if [ -f "$HOME/.gnupg-autogen.rc" ]; then - info "sourcing extra definitions from $HOME/.gnupg-autogen.rc" - . "$HOME/.gnupg-autogen.rc" -fi - -# ****************** -# W32 build script -# ****************** -if [ "$myhost" = "w32" ]; then - if [ ! -f "$tsdir/build-aux/config.guess" ]; then - fatal "$tsdir/build-aux/config.guess not found" - exit 1 - fi - build=`$tsdir/build-aux/config.guess` - - case $myhostsub in - ce) - w32root="$w32ce_root" - [ -z "$w32root" ] && w32root="$HOME/w32ce_root" - toolprefixes="$w32ce_toolprefixes arm-mingw32ce" - extraoptions="$extraoptions $w32ce_extraoptions" - ;; - 64) - w32root="$w64root" - [ -z "$w32root" ] && w32root="$HOME/w64root" - toolprefixes="$w64_toolprefixes x86_64-w64-mingw32" - extraoptions="$extraoptions $w64_extraoptions" - ;; - *) - [ -z "$w32root" ] && w32root="$HOME/w32root" - toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc" - toolprefixes="$toolprefixes i386-mingw32msvc mingw32" - extraoptions="$extraoptions $w32_extraoptions" - ;; - esac - info "Using $w32root as standard install directory" - replace_sysroot - - # Locate the cross compiler - crossbindir= - for host in $toolprefixes; do - if ${host}-gcc --version >/dev/null 2>&1 ; then - crossbindir=/usr/${host}/bin - conf_CC="CC=${host}-gcc" - break; - fi - done - if [ -z "$crossbindir" ]; then - fatal "cross compiler kit not installed" - if [ -z "$myhostsub" ]; then - info "Under Debian GNU/Linux, you may install it using" - info " apt-get install mingw32 mingw32-runtime mingw32-binutils" - fi - die_p - fi - - if [ -f "$tsdir/config.log" ]; then - if ! head $tsdir/config.log | grep "$host" >/dev/null; then - fatal "Please run a 'make distclean' first" - die_p - fi - fi - - $tsdir/configure --enable-maintainer-mode ${SILENT} \ - --prefix=${w32root} \ - --host=${host} --build=${build} \ - ${configure_opts} ${extraoptions} "$@" - rc=$? - exit $rc -fi -# ***** end W32 build script ******* - -# ***** AMD64 cross build script ******* -# Used to cross-compile for AMD64 (for testing) -if [ "$myhost" = "amd64" ]; then - shift - if [ ! -f $tsdir/build-aux/config.guess ]; then - echo "$tsdir/build-aux/config.guess not found" >&2 - exit 1 - fi - build=`$tsdir/build-aux/config.guess` - - [ -z "$amd64root" ] && amd64root="$HOME/amd64root" - info "Using $amd64root as standard install directory" - replace_sysroot - - toolprefixes="$amd64_toolprefixes x86_64-linux-gnu amd64-linux-gnu" - - # Locate the cross compiler - crossbindir= - for host in $toolprefixes ; do - if ${host}-gcc --version >/dev/null 2>&1 ; then - crossbindir=/usr/${host}/bin - conf_CC="CC=${host}-gcc" - break; - fi - done - if [ -z "$crossbindir" ]; then - echo "Cross compiler kit not installed" >&2 - echo "Stop." >&2 - exit 1 - fi - - if [ -f "$tsdir/config.log" ]; then - if ! head $tsdir/config.log | grep "$host" >/dev/null; then - echo "Please run a 'make distclean' first" >&2 - exit 1 - fi - fi - - $tsdir/configure --enable-maintainer-mode ${SILENT} \ - --prefix=${amd64root} \ - --host=${host} --build=${build} \ - ${configure_opts} ${extraoptions} "$@" - rc=$? - exit $rc -fi -# ***** end AMD64 cross build script ******* - - -# Grep the required versions from configure.ac -autoconf_vers=`sed -n '/^AC_PREREQ(/ { -s/^.*(\(.*\))/\1/p -q -}' ${configure_ac}` -autoconf_vers_num=`echo "$autoconf_vers" | cvtver` - -automake_vers=`sed -n '/^min_automake_version=/ { -s/^.*="\(.*\)"/\1/p -q -}' ${configure_ac}` -automake_vers_num=`echo "$automake_vers" | cvtver` - -if [ -d "${tsdir}/po" ]; then - gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ { -s/^.*\[\(.*\)])/\1/p -q -}' ${configure_ac}` - gettext_vers_num=`echo "$gettext_vers" | cvtver` -else - gettext_vers="n/a" -fi - -if [ -z "$autoconf_vers" -o -z "$automake_vers" -o -z "$gettext_vers" ] -then - echo "**Error**: version information not found in "\`${configure_ac}\'"." >&2 - exit 1 -fi - - -if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then - check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf -fi -if check_version $AUTOMAKE $automake_vers_num $automake_vers; then - check_version $ACLOCAL $automake_vers_num $autoconf_vers automake -fi -if [ "$gettext_vers" != "n/a" ]; then - if check_version $GETTEXT $gettext_vers_num $gettext_vers; then - check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext - fi -fi - -if [ "$DIE" = "yes" ]; then - cat < - - NB: ChangeLog files are no longer manually maintained. Starting - on December 1st, 2011 we put change information only in the GIT - commit log, and generate a top-level ChangeLog file from logs at - "make dist". See doc/HACKING for details. - -2003-12-08 Werner Koch - - * autogen.sh, config.sub, install-sh, mkinstalldirs, config.guess, - * missing: Removed - -2003-10-31 Werner Koch - - * autogen.sh: Allow to override the tool name. Do not run - libtoolize. Update required version numbers. - -2003-07-30 Werner Koch - - * config.guess, config.sub: Updated from ftp.gnu.org/gnu/config/ - -2003-07-07 Moritz Schulte - - * autogen.sh: Undo last change. - * autogen.sh: Remove -a argument for automake. - -2003-03-06 Moritz Schulte - - * autogen.sh (run): New function. - Let automake run with -a for adding missing files automatically - -2002-11-12 Werner Koch - - * config.sub, config.guess: Updated from ftp.gnu.org/gnu/config - to version 2002-11-08. - -2002-05-14 Werner Koch - - * autogen.sh: Require version 2.53 of autoconf - -2001-12-18 Werner Koch - - * distfiles: Remove files which are automatically added by automake. - -2001-08-06 Werner Koch - - * autogen.sh: Added --build-w32 option. - -2001-05-28 Werner Koch - - * db2html.in: Removed. - * db2any: New. Taken from GPH - -Mon Jul 17 16:35:47 CEST 2000 Werner Koch - - * config.gues, config.sub: Support for s390-ibm-linux-gnu; thanks - to Holger Smolinski. Add support for QNX; by Sam Roberts. - -Tue Oct 26 14:10:21 CEST 1999 Werner Koch - - * commit: Remove leading and trailing empty lines when copying - Changes to Changelog - -Wed Sep 15 16:22:17 CEST 1999 Werner Koch - - * gnupg.spec: Add Portuguese description - -Thu Sep 2 16:40:55 CEST 1999 Werner Koch - - * mkdiff: changed format of diff file name and made script more - general. - -Wed Aug 4 10:34:18 CEST 1999 Werner Koch - - * config.guess: Updated from gnu/common and applied my emx patch again. - * config.sub: Updated from gnu/common. - -Wed Jul 14 19:42:08 CEST 1999 Werner Koch - - * ltmain.sh, ltconfig.sh : Updated to libtool 1.3.3 - -Mon Jul 12 14:55:34 CEST 1999 Werner Koch - - * autogen.sh: Run libtoolize - -Sat May 22 22:47:26 CEST 1999 Werner Koch - - * autogen.sh: Fixed the error message for a missing libtool. - -Sat May 8 19:28:08 CEST 1999 Werner Koch - - * mkinstalldirs, install-sh: New from GNU repository - * config.sub, config.guess: Merged with rep version. - -Sun Mar 14 19:34:36 CET 1999 Werner Koch - - * autogen.sh: Add a check for libtool because some autoconf macros - are needed. - -Mon Feb 22 20:04:00 CET 1999 Werner Koch - - * autogen.sh: Enhanced the version testing code (Philippe Laliberte) - - * mkwebpage: Edits the buglist. - -Sat Feb 13 12:04:43 CET 1999 Werner Koch - - * autogen.sh: Now uses gettextize - -Wed Feb 10 17:15:39 CET 1999 Werner Koch - - * config.sub, config.guess: Support i386-emx-os2 - -Sun Jan 17 11:04:33 CET 1999 Werner Koch - - * autogen.sh: Now checks for installed gettext - -Sat Jan 16 09:27:30 CET 1999 Werner Koch - - * config.guess (m68k-atari-mint): New. - * config.sub: Add support for atarist-MiNT - -Wed Jan 13 12:49:36 CET 1999 Werner Koch - - * gnupg.spec.in: New - * gnupg.spec: Removed - -Wed Dec 23 13:18:14 CET 1998 Werner Koch - - * gnupg.spec: Updated version by Fabio Coatti - -Thu Dec 17 18:31:15 CET 1998 Werner Koch - - * gnupg.spec: New version by Reuben Sumner and did some more - changes. - -Fri Nov 27 12:39:29 CET 1998 Werner Koch - - - * commit: New - - -Fri Nov 20 12:01:57 1998 Werner Koch (wk@isil.d.shuttle.de) - - * mkdiff: signs the patch file - -Sat Oct 17 16:10:16 1998 Werner Koch (wk@isil.d.shuttle.de) - - * autogen.sh: New. - -Wed Oct 14 09:55:25 1998 Werner Koch (wk@isil.d.shuttle.de) - - * config.guess (FreeBSD): Changes from Jun Kuriyama to support ELF - * config.sub: (freebsd): Add to maybe_os - - - Copyright 1998,1999,2000,2001,2002 Free Software Foundation, Inc. - - This file is free software; as a special exception the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. - - This file is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -Local Variables: -buffer-read-only: t -End: diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/compile b/src/hos_libhttpserver/src/libgcrypt/build-aux/compile deleted file mode 100755 index 531136b0..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/compile +++ /dev/null @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# 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, 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, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/config.guess b/src/hos_libhttpserver/src/libgcrypt/build-aux/config.guess deleted file mode 100755 index dbfb9786..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/config.guess +++ /dev/null @@ -1,1421 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. - -timestamp='2015-01-01' - -# This file 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 3 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, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). -# -# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. -# -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -# -# Please send patches to . - - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` - ;; -esac - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi - else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf - fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} - exit ;; - or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 - fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; - NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; - x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; -esac - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/config.rpath b/src/hos_libhttpserver/src/libgcrypt/build-aux/config.rpath deleted file mode 100755 index c38b914d..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/config.rpath +++ /dev/null @@ -1,690 +0,0 @@ -#! /bin/sh -# Output a system dependent set of variables, describing how to set the -# run time search path of shared libraries in an executable. -# -# Copyright 1996-2013 Free Software Foundation, Inc. -# Taken from GNU libtool, 2001 -# Originally by Gordon Matzigkeit , 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# The first argument passed to this file is the canonical host specification, -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld -# should be set by the caller. -# -# The set of defined variables is at the end of this script. - -# Known limitations: -# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer -# than 256 bytes, otherwise the compiler driver will dump core. The only -# known workaround is to choose shorter directory names for the build -# directory and/or the installation directory. - -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -shrext=.so - -host="$1" -host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -# Code taken from libtool.m4's _LT_CC_BASENAME. - -for cc_temp in $CC""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` - -# Code taken from libtool.m4's _LT_COMPILER_PIC. - -wl= -if test "$GCC" = yes; then - wl='-Wl,' -else - case "$host_os" in - aix*) - wl='-Wl,' - ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' - ;; - irix5* | irix6* | nonstopux*) - wl='-Wl,' - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - ecc*) - wl='-Wl,' - ;; - icc* | ifort*) - wl='-Wl,' - ;; - lf95*) - wl='-Wl,' - ;; - nagfor*) - wl='-Wl,-Wl,,' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - wl='-Wl,' - ;; - ccc*) - wl='-Wl,' - ;; - xl* | bgxl* | bgf* | mpixl*) - wl='-Wl,' - ;; - como) - wl='-lopt=' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) - wl= - ;; - *Sun\ C*) - wl='-Wl,' - ;; - esac - ;; - esac - ;; - newsos6) - ;; - *nto* | *qnx*) - ;; - osf3* | osf4* | osf5*) - wl='-Wl,' - ;; - rdos*) - ;; - solaris*) - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - wl='-Qoption ld ' - ;; - *) - wl='-Wl,' - ;; - esac - ;; - sunos4*) - wl='-Qoption ld ' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - wl='-Wl,' - ;; - sysv4*MP*) - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - wl='-Wl,' - ;; - unicos*) - wl='-Wl,' - ;; - uts4*) - ;; - esac -fi - -# Code taken from libtool.m4's _LT_LINKER_SHLIBS. - -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no - -case "$host_os" in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - case "$host_os" in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - fi - ;; - amigaos*) - case "$host_cpu" in - powerpc) - ;; - m68k) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - cygwin* | mingw* | pw32* | cegcc*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - haiku*) - ;; - interix[3-9]*) - hardcode_direct=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - netbsd*) - ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) - hardcode_direct=yes - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = no; then - hardcode_libdir_flag_spec= - fi -else - case "$host_os" in - aix3*) - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - else - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - fi - hardcode_direct=yes - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - fi - # Begin _LT_AC_SYS_LIBPATH_AIX. - echo 'int main () { return 0; }' > conftest.c - ${CC} ${LDFLAGS} conftest.c -o conftest - aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - fi - if test -z "$aix_libpath"; then - aix_libpath="/usr/lib:/lib" - fi - rm -f conftest.c conftest - # End _LT_AC_SYS_LIBPATH_AIX. - if test "$aix_use_runtimelinking" = yes; then - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - else - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - fi - fi - ;; - amigaos*) - case "$host_cpu" in - powerpc) - ;; - m68k) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - bsdi[45]*) - ;; - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - libext=lib - ;; - darwin* | rhapsody*) - hardcode_direct=no - if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then - : - else - ld_shlibs=no - fi - ;; - dgux*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) - hardcode_direct=yes - hardcode_minus_L=yes - ;; - freebsd* | dragonfly*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - hpux9*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - hpux10*) - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - hpux11*) - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - ;; - *) - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - netbsd*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - newsos6) - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - *nto* | *qnx*) - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - osf3*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - osf4* | osf5*) - if test "$GCC" = yes; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - # Both cc and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - solaris*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - sunos4*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - ;; - sysv4) - case $host_vendor in - sni) - hardcode_direct=yes # is this really true??? - ;; - siemens) - hardcode_direct=no - ;; - motorola) - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - ;; - sysv4.3*) - ;; - sysv4*MP*) - if test -d /usr/nec; then - ld_shlibs=yes - fi - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - ;; - sysv5* | sco3.2v5* | sco5v6*) - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - ;; - uts4*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - *) - ld_shlibs=no - ;; - esac -fi - -# Check dynamic linker characteristics -# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. -# Unlike libtool.m4, here we don't care about _all_ names of the library, but -# only about the one the linker finds when passed -lNAME. This is the last -# element of library_names_spec in libtool.m4, or possibly two of them if the -# linker has special search rules. -library_names_spec= # the last element of library_names_spec in libtool.m4 -libname_spec='lib$name' -case "$host_os" in - aix3*) - library_names_spec='$libname.a' - ;; - aix[4-9]*) - library_names_spec='$libname$shrext' - ;; - amigaos*) - case "$host_cpu" in - powerpc*) - library_names_spec='$libname$shrext' ;; - m68k) - library_names_spec='$libname.a' ;; - esac - ;; - beos*) - library_names_spec='$libname$shrext' - ;; - bsdi[45]*) - library_names_spec='$libname$shrext' - ;; - cygwin* | mingw* | pw32* | cegcc*) - shrext=.dll - library_names_spec='$libname.dll.a $libname.lib' - ;; - darwin* | rhapsody*) - shrext=.dylib - library_names_spec='$libname$shrext' - ;; - dgux*) - library_names_spec='$libname$shrext' - ;; - freebsd* | dragonfly*) - case "$host_os" in - freebsd[123]*) - library_names_spec='$libname$shrext$versuffix' ;; - *) - library_names_spec='$libname$shrext' ;; - esac - ;; - gnu*) - library_names_spec='$libname$shrext' - ;; - haiku*) - library_names_spec='$libname$shrext' - ;; - hpux9* | hpux10* | hpux11*) - case $host_cpu in - ia64*) - shrext=.so - ;; - hppa*64*) - shrext=.sl - ;; - *) - shrext=.sl - ;; - esac - library_names_spec='$libname$shrext' - ;; - interix[3-9]*) - library_names_spec='$libname$shrext' - ;; - irix5* | irix6* | nonstopux*) - library_names_spec='$libname$shrext' - case "$host_os" in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; - *) libsuff= shlibsuff= ;; - esac - ;; - esac - ;; - linux*oldld* | linux*aout* | linux*coff*) - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - library_names_spec='$libname$shrext' - ;; - knetbsd*-gnu) - library_names_spec='$libname$shrext' - ;; - netbsd*) - library_names_spec='$libname$shrext' - ;; - newsos6) - library_names_spec='$libname$shrext' - ;; - *nto* | *qnx*) - library_names_spec='$libname$shrext' - ;; - openbsd*) - library_names_spec='$libname$shrext$versuffix' - ;; - os2*) - libname_spec='$name' - shrext=.dll - library_names_spec='$libname.a' - ;; - osf3* | osf4* | osf5*) - library_names_spec='$libname$shrext' - ;; - rdos*) - ;; - solaris*) - library_names_spec='$libname$shrext' - ;; - sunos4*) - library_names_spec='$libname$shrext$versuffix' - ;; - sysv4 | sysv4.3*) - library_names_spec='$libname$shrext' - ;; - sysv4*MP*) - library_names_spec='$libname$shrext' - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - library_names_spec='$libname$shrext' - ;; - tpf*) - library_names_spec='$libname$shrext' - ;; - uts4*) - library_names_spec='$libname$shrext' - ;; -esac - -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` -shlibext=`echo "$shrext" | sed -e 's,^\.,,'` -escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` - -LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). - - -# Please send patches to . -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright 1992-2015 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown - ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none - ;; - xscaleeb) - basic_machine=armeb-unknown - ;; - - xscaleel) - basic_machine=armel-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -nacl*) - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - c8051-*) - os=-elf - ;; - hexagon-*) - os=-elf - ;; - tic54x-*) - os=-coff - ;; - tic55x-*) - os=-coff - ;; - tic6x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -cnk*|-aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/depcomp b/src/hos_libhttpserver/src/libgcrypt/build-aux/depcomp deleted file mode 100755 index 4ebd5b3a..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/depcomp +++ /dev/null @@ -1,791 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2013-05-30.07; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. - -# 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, 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, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by 'PROGRAMS ARGS'. - object Object file output by 'PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputting dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -# Get the directory component of the given path, and save it in the -# global variables '$dir'. Note that this directory component will -# be either empty or ending with a '/' character. This is deliberate. -set_dir_from () -{ - case $1 in - */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; - *) dir=;; - esac -} - -# Get the suffix-stripped basename of the given path, and save it the -# global variable '$base'. -set_base_from () -{ - base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` -} - -# If no dependency file was actually created by the compiler invocation, -# we still have to create a dummy depfile, to avoid errors with the -# Makefile "include basename.Plo" scheme. -make_dummy_depfile () -{ - echo "#dummy" > "$depfile" -} - -# Factor out some common post-processing of the generated depfile. -# Requires the auxiliary global variable '$tmpdepfile' to be set. -aix_post_process_depfile () -{ - # If the compiler actually managed to produce a dependency file, - # post-process it. - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependency.h'. - # Do two passes, one to just change these to - # $object: dependency.h - # and one to simply output - # dependency.h: - # which is needed to avoid the deleted-header problem. - { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" - sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" - } > "$depfile" - rm -f "$tmpdepfile" - else - make_dummy_depfile - fi -} - -# A tabulation character. -tab=' ' -# A newline character. -nl=' -' -# Character ranges might be problematic outside the C locale. -# These definitions help. -upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ -lower=abcdefghijklmnopqrstuvwxyz -digits=0123456789 -alpha=${upper}${lower} - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Avoid interferences from the environment. -gccflag= dashmflag= - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -cygpath_u="cygpath -u -f -" -if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp -fi - -if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 -fi - -if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. - gccflag=-qmakedep=gcc,-MF - depmode=gcc -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. -## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. -## (see the conditional assignment to $gccflag above). -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). Also, it might not be -## supported by the other compilers which use the 'gcc' depmode. -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The second -e expression handles DOS-style file names with drive - # letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the "deleted header file" problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. -## Some versions of gcc put a space before the ':'. On the theory -## that the space means something, we add a space to the output as -## well. hp depmode also adds that space, but also prefixes the VPATH -## to the object. Take care to not repeat it in the output. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like '#:fec' to the end of the - # dependency line. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ - | tr "$nl" ' ' >> "$depfile" - echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" - else - make_dummy_depfile - fi - rm -f "$tmpdepfile" - ;; - -xlc) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts '$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - set_dir_from "$object" - set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - aix_post_process_depfile - ;; - -tcc) - # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 - # FIXME: That version still under development at the moment of writing. - # Make that this statement remains true also for stable, released - # versions. - # It will wrap lines (doesn't matter whether long or short) with a - # trailing '\', as in: - # - # foo.o : \ - # foo.c \ - # foo.h \ - # - # It will put a trailing '\' even on the last line, and will use leading - # spaces rather than leading tabs (at least since its commit 0394caf7 - # "Emit spaces for -MD"). - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. - # We have to change lines of the first kind to '$object: \'. - sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" - # And for each line of the second kind, we have to emit a 'dep.h:' - # dummy dependency, to avoid the deleted-header problem. - sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" - rm -f "$tmpdepfile" - ;; - -## The order of this option in the case statement is important, since the -## shell code in configure will try each of these formats in the order -## listed in this file. A plain '-MD' option would be understood by many -## compilers, so we must ensure this comes after the gcc and icc options. -pgcc) - # Portland's C compiler understands '-MD'. - # Will always output deps to 'file.d' where file is the root name of the - # source file under compilation, even if file resides in a subdirectory. - # The object file name does not affect the name of the '.d' file. - # pgcc 10.2 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\' : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - set_dir_from "$object" - # Use the source, not the object, to determine the base name, since - # that's sadly what pgcc will do too. - set_base_from "$source" - tmpdepfile=$base.d - - # For projects that build the same source file twice into different object - # files, the pgcc approach of using the *source* file root name can cause - # problems in parallel builds. Use a locking strategy to avoid stomping on - # the same $tmpdepfile. - lockdir=$base.d-lock - trap " - echo '$0: caught signal, cleaning up...' >&2 - rmdir '$lockdir' - exit 1 - " 1 2 13 15 - numtries=100 - i=$numtries - while test $i -gt 0; do - # mkdir is a portable test-and-set. - if mkdir "$lockdir" 2>/dev/null; then - # This process acquired the lock. - "$@" -MD - stat=$? - # Release the lock. - rmdir "$lockdir" - break - else - # If the lock is being held by a different process, wait - # until the winning process is done or we timeout. - while test -d "$lockdir" && test $i -gt 0; do - sleep 1 - i=`expr $i - 1` - done - fi - i=`expr $i - 1` - done - trap - 1 2 13 15 - if test $i -le 0; then - echo "$0: failed to acquire lock after $numtries attempts" >&2 - echo "$0: check lockdir '$lockdir'" >&2 - exit 1 - fi - - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - set_dir_from "$object" - set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" - # Add 'dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" - else - make_dummy_depfile - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - set_dir_from "$object" - set_base_from "$object" - - if test "$libtool" = yes; then - # Libtool generates 2 separate objects for the 2 libraries. These - # two compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir$base.o.d # libtool 1.5 - tmpdepfile2=$dir.libs/$base.o.d # Likewise. - tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - # Same post-processing that is required for AIX mode. - aix_post_process_depfile - ;; - -msvc7) - if test "$libtool" = yes; then - showIncludes=-Wc,-showIncludes - else - showIncludes=-showIncludes - fi - "$@" $showIncludes > "$tmpdepfile" - stat=$? - grep -v '^Note: including file: ' "$tmpdepfile" - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The first sed program below extracts the file names and escapes - # backslashes for cygpath. The second sed program outputs the file - # name when reading, but also accumulates all include files in the - # hold buffer in order to output them again at the end. This only - # works with sed implementations that can handle large buffers. - sed < "$tmpdepfile" -n ' -/^Note: including file: *\(.*\)/ { - s//\1/ - s/\\/\\\\/g - p -}' | $cygpath_u | sort -u | sed -n ' -s/ /\\ /g -s/\(.*\)/'"$tab"'\1 \\/p -s/.\(.*\) \\/\1:/ -H -$ { - s/.*/'"$tab"'/ - G - p -}' >> "$depfile" - echo >> "$depfile" # make sure the fragment doesn't end with a backslash - rm -f "$tmpdepfile" - ;; - -msvc7msys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove '-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for ':' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. - "$@" $dashmflag | - sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this sed invocation - # correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no eat=no - for arg - do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - if test $eat = yes; then - eat=no - continue - fi - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -arch) - eat=yes ;; - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix=`echo "$object" | sed 's/^.*\././'` - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - # makedepend may prepend the VPATH from the source file name to the object. - # No need to regex-escape $object, excess matching of '.' is harmless. - sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process the last invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed '1,2d' "$tmpdepfile" \ - | tr ' ' "$nl" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove '-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E \ - | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - | sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - IFS=" " - for arg - do - case "$arg" in - -o) - shift - ;; - $object) - shift - ;; - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E 2>/dev/null | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" - echo "$tab" >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvcmsys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/git-log-fix b/src/hos_libhttpserver/src/libgcrypt/build-aux/git-log-fix deleted file mode 100644 index 3e3fd95c..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/git-log-fix +++ /dev/null @@ -1,14 +0,0 @@ -# This file is expected to be used via gitlog-to-changelog's --amend=FILE -# option. It specifies what changes to make to each given SHA1's commit -# log and metadata, using Perl-eval'able expressions. - -eb4937914db3fb7317502e97e4f0e40c1857f59d -# Fix bad formatted entry dated 2013-05-20 -s/(?s)mpi_sub.*$/cipher: Fix segv in last ECC change. -* cipher\/ecc.c (generate_key): Make sure R is initialized./ - -296f38a2bd2e25788643a42e4881faed00884a40 -# Fix bad formatted entry dated 2013-05-09 -s/(?s)Generate ECC.*$/cipher: Generate compliant ECC keys. -* cipher\/ecc.c (generate_key): Make sure a key is compliant for -using the compact representation./ diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/git-log-footer b/src/hos_libhttpserver/src/libgcrypt/build-aux/git-log-footer deleted file mode 100644 index c31fe936..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/git-log-footer +++ /dev/null @@ -1,14 +0,0 @@ - -2011-12-01 Werner Koch - - NB: Changes done before December 1st, 2011 are described in - per directory files named ChangeLog-2011. See doc/HACKING for - details. - - ----- - Copyright (C) 2011 Free Software Foundation, Inc. - - Copying and distribution of this file and/or the original GIT - commit log messages, with or without modification, are - permitted provided the copyright notice and this notice are - preserved. diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/install-sh b/src/hos_libhttpserver/src/libgcrypt/build-aux/install-sh deleted file mode 100755 index 377bb868..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/install-sh +++ /dev/null @@ -1,527 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2011-11-20.07; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# 'make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call 'install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names problematic for 'test' and other utilities. - case $src in - -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - dst=$dst_arg - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/ltmain.sh b/src/hos_libhttpserver/src/libgcrypt/build-aux/ltmain.sh deleted file mode 100644 index 859599aa..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/ltmain.sh +++ /dev/null @@ -1,9664 +0,0 @@ - -# libtool (GNU libtool) 2.4.2 -# Written by Gordon Matzigkeit , 1996 - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . - -PROGRAM=libtool -PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1" -TIMESTAMP="" -package_revision=1.3337 - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" -done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL - -$lt_unset CDPATH - - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - - - -: ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" - -dirname="s,/[^/]*$,," -basename="s,^.*/,," - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} - -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} - -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result - -# Make sure we have an absolute path for reexecution: -case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) - progdir=$func_dirname_result - progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" - ;; - *) - save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break - done - IFS="$save_IFS" - test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Sed substitution to remove simple comments and empty -# lines from a Windows .def file. -sed_uncomment_deffile='/^;/d; /^[ ]*$/d' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" - -# Standard options: -opt_dry_run=false -opt_help=false -opt_quiet=false -opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} - -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} - - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} - -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -} - -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} - -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default - - -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} - - -# func_mkdir_p directory-path -# Make sure the entire path to DIRECTORY-PATH is available. -func_mkdir_p () -{ - my_directory_path="$1" - my_dir_list= - - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; - esac - - # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do - # ...make a list in topmost first order. Use a colon delimited - # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" - - # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes - # try to create one of the directories concurrently. Don't - # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : - done - IFS="$save_mkdir_p_IFS" - - # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" - fi -} - - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - - $ECHO "$my_tmpdir" -} - - -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () -{ - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac - - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac -} - - -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac - - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac - - func_quote_for_expand_result="$my_arg" -} - - -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - - -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} - - -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} - -# func_usage -# Echo short help message to standard output and exit. -func_usage () -{ - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? -} - -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. -func_help () -{ - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi -} - -# func_missing_arg argname -# Echo program name prefixed message to standard error and set global -# exit_cmd. -func_missing_arg () -{ - $opt_debug - - func_error "missing argument for $1." - exit_cmd=exit -} - - -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation - -exit_cmd=: - - - - - -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" - -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation - -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation - - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation - - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - -# func_fatal_configuration arg... -# Echo program name prefixed message to standard error, followed by -# a configuration failure hint, and exit. -func_fatal_configuration () -{ - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." -} - - -# func_config -# Display the configuration for all the tags in this script. -func_config () -{ - re_begincf='^# ### BEGIN LIBTOOL' - re_endcf='^# ### END LIBTOOL' - - # Default configuration. - $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - - # Now print the configurations for the tags. - for tagname in $taglist; do - $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" - done - - exit $? -} - -# func_features -# Display the features supported by this script. -func_features () -{ - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - - exit $? -} - -# func_enable_tag tagname -# Verify that TAGNAME is valid, and either flag an error and exit, or -# enable the TAGNAME tag. We also add TAGNAME to the global $taglist -# variable here. -func_enable_tag () -{ - # Global variable: - tagname="$1" - - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac - - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; - *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac -} - -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false - - -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - - $opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } - - - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} - - - - -## ----------- ## -## Main. ## -## ----------- ## - -# func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_lalib_p () -{ - test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -} - -# func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function implements the same check as func_lalib_p without -# resorting to external programs. To this end, it redirects stdin and -# closes it afterwards, without saving the original file descriptor. -# As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. -func_lalib_unsafe_p () -{ - lalib_p=no - if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then - for lalib_p_l in 1 2 3 4 - do - read lalib_p_line - case "$lalib_p_line" in - \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; - esac - done - exec 0<&5 5<&- - fi - test "$lalib_p" = yes -} - -# func_ltwrapper_script_p file -# True iff FILE is a libtool wrapper script -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_script_p () -{ - func_lalib_p "$1" -} - -# func_ltwrapper_executable_p file -# True iff FILE is a libtool wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_executable_p () -{ - func_ltwrapper_exec_suffix= - case $1 in - *.exe) ;; - *) func_ltwrapper_exec_suffix=.exe ;; - esac - $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -} - -# func_ltwrapper_scriptname file -# Assumes file is an ltwrapper_executable -# uses $file to determine the appropriate filename for a -# temporary ltwrapper_script. -func_ltwrapper_scriptname () -{ - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -} - -# func_ltwrapper_p file -# True iff FILE is a libtool wrapper script or wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_p () -{ - func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -} - - -# func_execute_cmds commands fail_cmd -# Execute tilde-delimited COMMANDS. -# If FAIL_CMD is given, eval that upon failure. -# FAIL_CMD may read-access the current command in variable CMD! -func_execute_cmds () -{ - $opt_debug - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs - eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -} - - -# func_source file -# Source FILE, adding directory component if necessary. -# Note that it is not necessary on cygwin/mingw to append a dot to -# FILE even if both FILE and FILE.exe exist: automatic-append-.exe -# behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. -func_source () -{ - $opt_debug - case $1 in - */* | *\\*) . "$1" ;; - *) . "./$1" ;; - esac -} - - -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - $opt_debug - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" -# else -# func_verbose "using $tagname tagged configuration" - fi - ;; - esac - fi -} - - - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () -{ - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi - - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - - $opt_dry_run || { - cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - -# func_mode_compile arg... -func_mode_compile () -{ - $opt_debug - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - pie_flag= - - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" - arg_mode=target - continue - ;; - - -pie | -fpie | -fPIE) - func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. - func_append base_compile " $lastarg" - continue - ;; - - *) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in - arg) - func_fatal_error "you must specify an argument for -Xcompile" - ;; - target) - func_fatal_error "you must specify a target with \`-o'" - ;; - *) - # Get the name of the library object. - test -z "$libobj" && { - func_basename "$srcfile" - libobj="$func_basename_result" - } - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - case $libobj in - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; - esac - - case $libobj in - *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; - *) - func_fatal_error "cannot determine name of library object from \`$libobj'" - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - continue - ;; - - -static) - build_libtool_libs=no - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ - && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." - func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname - - test -z "$base_compile" && \ - func_fatal_help "you must specify a compilation command" - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $ECHO "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code - command="$base_compile $qsrcfile" - fi - - func_mkdir_p "$xdir$objdir" - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ - 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - func_show_eval '$MV "$output_obj" "$lobj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then - suppress_output=' >/dev/null 2>&1' - fi - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code - command="$base_compile $qsrcfile$pie_flag" - else - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then - func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - func_show_eval '$MV "$output_obj" "$obj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - fi - - $opt_dry_run || { - func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - removelist=$lockfile - $RM "$lockfile" - fi - } - - exit $EXIT_SUCCESS -} - -$opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -} - -func_mode_help () -{ - # We need to display help for each of the modes. - case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. - func_help - ;; - - clean) - $ECHO \ -"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - - compile) - $ECHO \ -"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - - execute) - $ECHO \ -"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - - finish) - $ECHO \ -"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - - install) - $ECHO \ -"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The following components of INSTALL-COMMAND are treated specially: - - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - - link) - $ECHO \ -"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - - uninstall) - $ECHO \ -"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - - *) - func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - - echo - $ECHO "Try \`$progname --help' for more information about other modes." -} - -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi - - -# func_mode_execute arg... -func_mode_execute () -{ - $opt_debug - # The first argument is the command name. - cmd="$nonopt" - test -z "$cmd" && \ - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. - for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" - - # Read the libtool library. - dlname= - library_names= - func_source "$file" - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" - continue - fi - - func_dirname "$file" "" "." - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" - fi - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - func_dirname "$file" "" "." - dir="$func_dirname_result" - ;; - - *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then - func_source "$file" - # Transform arg to wrapped name. - file="$progdir/$program" - elif func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - func_source "$func_ltwrapper_scriptname_result" - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - done - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libs= - libdirs= - admincmds= - - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -'"$cmd"'"' - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" - fi - exit $EXIT_SUCCESS -} - -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - -# func_mode_install arg... -func_mode_install () -{ - $opt_debug - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " - arg=$1 - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - no_mode=: - for arg - do - arg2= - if test -n "$dest"; then - func_append files " $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - if $install_cp; then :; else - prev=$arg - fi - ;; - -g | -m | -o) - prev=$arg - ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ - func_fatal_help "you must specify an install program" - - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" - else - func_fatal_help "you must specify a destination" - fi - fi - - # Strip any trailing slash from the destination. - func_stripname '' '/' "$dest" - dest=$func_stripname_result - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" - - # Not a directory, so check to see that there is only one file specified. - set dummy $files; shift - test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - func_fatal_help "\`$destdir' must be an absolute directory name" - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - func_append staticlibs " $file" - ;; - - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" - - library_names= - old_library= - relink_command= - func_source "$file" - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" - func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" - func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' - fi - - # See the names of the shared library. - set dummy $library_names; shift - if test -n "$1"; then - realname="$1" - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) - tstripme="" - ;; - esac - ;; - esac - if test -n "$tstripme" && test -n "$striplib"; then - func_show_eval "$striplib $destdir/$realname" 'exit $?' - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - - # Install the pseudo-library for information purposes. - func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - func_lo2o "$destfile" - staticdest=$func_lo2o_result - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" - ;; - esac - - # Install the libtool object if requested. - test -n "$destfile" && \ - func_show_eval "$install_prog $file $destfile" 'exit $?' - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - func_lo2o "$file" - staticobj=$func_lo2o_result - func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - func_stripname '' '.exe' "$file" - file=$func_stripname_result - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result - else - func_stripname '' '.exe' "$file" - wrapper=$func_stripname_result - fi - ;; - *) - wrapper=$file - ;; - esac - if func_ltwrapper_script_p "$wrapper"; then - notinst_deplibs= - relink_command= - - func_source "$wrapper" - - # Check the variables that should have been set. - test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - func_source "$lib" - fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no - fi - done - - relink_command= - func_source "$wrapper" - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - $opt_dry_run || { - if test "$finalize" = yes; then - tmpdir=`func_mktempdir` - func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" - } - if eval "$relink_command"; then : - else - func_error "error: relink \`$file' with the above command before installing it" - $opt_dry_run || ${RM}r "$tmpdir" - continue - fi - file="$outputname" - else - func_warning "cannot relink \`$file'" - fi - } - else - # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - func_stripname '' '.exe' "$destfile" - destfile=$func_stripname_result - ;; - esac - ;; - esac - func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' - $opt_dry_run || if test -n "$outputname"; then - ${RM}r "$tmpdir" - fi - ;; - esac - done - - for file in $staticlibs; do - func_basename "$file" - name="$func_basename_result" - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. - func_execute_cmds "$old_postinstall_cmds" 'exit $?' - done - - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = install && func_mode_install ${1+"$@"} - - -# func_generate_dlsyms outputname originator pic_p -# Extract symbols from dlprefiles and create ${outputname}S.o with -# a dlpreopen symbol table. -func_generate_dlsyms () -{ - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` - my_dlsyms= - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" - else - func_error "not configured to extract global symbols from dlpreopened files" - fi - fi - - if test -n "$my_dlsyms"; then - case $my_dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" - - func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - - # Parse the name list into a source file. - func_verbose "creating $output_objdir/$my_dlsyms" - - $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" - - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { - eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { - eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } - fi - fi - - for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac - done - - $opt_dry_run || { - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if $GREP -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - $GREP -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - - echo >> "$output_objdir/$my_dlsyms" "\ - -/* The mapping between symbol names and symbols. */ -typedef struct { - const char *name; - void *address; -} lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," - - case $need_lib_prefix in - no) - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - *) - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac - echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_${my_prefix}_LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - } # !$opt_dry_run - - pic_flag_for_symtable= - case "$compile_command " in - *" -static "*) ;; - *) - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; - *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi - ;; - esac - ;; - esac - symtab_cflags= - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; - esac - done - - # Now compile the dynamic symbol file. - func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - - # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' - - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; - *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi -} - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. -func_win32_libid () -{ - $opt_debug - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $ECHO "$win32_libid_type" -} - -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" - fi -} - - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - $opt_debug - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - func_basename "$my_xlib" - my_xlib="$func_basename_result" - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - func_arith $extracted_serial + 1 - extracted_serial=$func_arith_result - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - - func_mkdir_p "$my_xdir" - - case $host in - *-darwin*) - func_verbose "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - $opt_dry_run || { - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` - darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` - if test -n "$darwin_arches"; then - darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ - cd "$darwin_orig_dir" - else - cd $darwin_orig_dir - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - } # !$opt_dry_run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -} - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=${1-no} - - $ECHO "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - generated_by_libtool_version='$macro_version' - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then - thisdir=\`pwd\` - fi - # remove .libs from thisdir - case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $ECHO "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $MKDIR \"\$progdir\" - else - $RM \"\$progdir/\$file\" - fi" - - $ECHO "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi - fi - - $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $RM \"\$progdir/\$program\"; - $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $RM \"\$progdir/\$file\" - fi" - else - $ECHO "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $ECHO "\ - - if test -f \"\$progdir/\$program\"; then" - - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var -" - fi - - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" -} - - -# func_emit_cwrapperexe_src -# emit the source code for a wrapper executable on stdout -# Must ONLY be called from within func_mode_link because -# it depends on a number of variable set therein. -func_emit_cwrapperexe_src () -{ - cat < -#include -#ifdef _MSC_VER -# include -# include -# include -#else -# include -# include -# ifdef __CYGWIN__ -# include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ -#endif - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef S_IXOTH -# define S_IXOTH 0 -#endif -#ifndef S_IXGRP -# define S_IXGRP 0 -#endif - -/* path handling portability macros */ -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# define FOPEN_WB "wb" -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#ifndef FOPEN_WB -# define FOPEN_WB "w" -#endif -#ifndef _O_BINARY -# define _O_BINARY 0 -#endif - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; -#else -static int lt_debug = 0; -#endif - -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - -void *xmalloc (size_t num); -char *xstrdup (const char *string); -const char *base_name (const char *name); -char *find_executable (const char *wrapper); -char *chase_symlinks (const char *pathspec); -int make_executable (const char *path); -int check_executable (const char *path); -char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); -void lt_setenv (const char *name, const char *value); -char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_update_exe_path (const char *name, const char *value); -void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); -EOF - - cat <= 0) - && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) - return 1; - else - return 0; -} - -int -make_executable (const char *path) -{ - int rval = 0; - struct stat st; - - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); - if ((!path) || (!*path)) - return 0; - - if (stat (path, &st) >= 0) - { - rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); - } - return rval; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise - Does not chase symlinks, even on platforms that support them. -*/ -char * -find_executable (const char *wrapper) -{ - int has_slash = 0; - const char *p; - const char *p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char *concat_name; - - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char *path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char *q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR (*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = - XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - return NULL; -} - -char * -chase_symlinks (const char *pathspec) -{ -#ifndef S_ISLNK - return xstrdup (pathspec); -#else - char buf[LT_PATHMAX]; - struct stat s; - char *tmp_pathspec = xstrdup (pathspec); - char *p; - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) - { - has_symlinks = 1; - break; - } - - /* search backwards for last DIR_SEPARATOR */ - p = tmp_pathspec + strlen (tmp_pathspec) - 1; - while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - p--; - if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - { - /* no more DIR_SEPARATORS left */ - break; - } - *p = '\0'; - } - else - { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); - - if (!has_symlinks) - { - return xstrdup (pathspec); - } - - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); -#endif -} - -char * -strendzap (char *str, const char *pat) -{ - size_t len, patlen; - - assert (str != NULL); - assert (pat != NULL); - - len = strlen (str); - patlen = strlen (pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp (str, pat) == 0) - *str = '\0'; - } - return str; -} - -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - -static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, - const char *message, va_list ap) -{ - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *file, int line, const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); -} - -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - -void -lt_setenv (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); - { -#ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ - char *str = xstrdup (value); - setenv (name, str, 1); -#else - int len = strlen (name) + 1 + strlen (value) + 1; - char *str = XMALLOC (char, len); - sprintf (str, "%s=%s", name, value); - if (putenv (str) != EXIT_SUCCESS) - { - XFREE (str); - } -#endif - } -} - -char * -lt_extend_str (const char *orig_value, const char *add, int to_end) -{ - char *new_value; - if (orig_value && *orig_value) - { - int orig_value_len = strlen (orig_value); - int add_len = strlen (add); - new_value = XMALLOC (char, add_len + orig_value_len + 1); - if (to_end) - { - strcpy (new_value, orig_value); - strcpy (new_value + orig_value_len, add); - } - else - { - strcpy (new_value, add); - strcpy (new_value + add_len, orig_value); - } - } - else - { - new_value = xstrdup (add); - } - return new_value; -} - -void -lt_update_exe_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - /* some systems can't cope with a ':'-terminated path #' */ - int len = strlen (new_value); - while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) - { - new_value[len-1] = '\0'; - } - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -void -lt_update_lib_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} -EOF -} -# end: func_emit_cwrapperexe_src - -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - -# func_mode_link arg... -func_mode_link () -{ - $opt_debug - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra - # flag for every libtool invocation. - # allow_undefined=no - - # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not - # even a static library is built. For now, we need to specify - # -no-undefined on the libtool link line when we can be certain - # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes - ;; - *) - allow_undefined=yes - ;; - esac - libtool_args=$nonopt - base_compile="$nonopt $@" - compile_command=$nonopt - finalize_command=$nonopt - - compile_rpath= - finalize_rpath= - compile_shlibpath= - finalize_shlibpath= - convenience= - old_convenience= - deplibs= - old_deplibs= - compiler_flags= - linker_flags= - dllsearchpath= - lib_search_path=`pwd` - inst_prefix_dir= - new_inherited_linker_flags= - - avoid_version=no - bindir= - dlfiles= - dlprefiles= - dlself=no - export_dynamic=no - export_symbols= - export_symbols_regex= - generated= - libobjs= - ltlibs= - module=no - no_install=no - objs= - non_pic_objects= - precious_files_regex= - prefer_static_libs=no - preload=no - prev= - prevarg= - release= - rpath= - xrpath= - perm_rpath= - temp_rpath= - thread_safe=no - vinfo= - vinfo_number=no - weak_libs= - single_module="${wl}-single_module" - func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - break - ;; - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - func_warning "complete static linking is impossible in this configuration" - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - func_append compile_command " @OUTPUT@" - func_append finalize_command " @OUTPUT@" - ;; - esac - - case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - func_append compile_command " @SYMFILE@" - func_append finalize_command " @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - func_append dlfiles " $arg" - else - func_append dlprefiles " $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - framework) - case $host in - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; - esac - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat "$save_arg"` - do -# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - done - else - func_fatal_error "link input file \`$arg' does not exist" - fi - arg=$save_arg - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) func_append xrpath " $arg" ;; - esac - fi - prev= - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - weak) - func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - # See comment for -static flag below, for more details. - func_append compile_command " $link_static_flag" - func_append finalize_command " $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -bindir) - prev=bindir - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - func_fatal_error "more than one -exported-symbols argument is not allowed" - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework) - prev=framework - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - func_append compile_command " $arg" - func_append finalize_command " $arg" - ;; - esac - continue - ;; - - -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; - *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - func_append deplibs " $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; - - -multi_module) - single_module="${wl}-multi_module" - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - func_stripname '-R' '' "$arg" - dir=$func_stripname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - continue - ;; - - -shared) - # The effects of -shared are defined in a previous loop. - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -weak) - prev=weak - continue - ;; - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" - func_append compiler_flags " $arg" - continue - ;; - - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - *.$objext) - # A standard object. - func_append objs " $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - ;; - - *.$libext) - # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else - func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - done # argument parsing loop - - test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - - # Determine the type of output - case $output in - "") - func_fatal_help "you must specify an output file" - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then - case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append libs " $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac - func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - - case $linkmode in - lib) - passes="conv dlpreopen link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - - for pass in $passes; do - # The preopen pass in lib mode reverses $deplibs; put it back here - # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then - ## FIXME: Find the place where the list is rebuilt in the wrong - ## order, and fix it there properly - tmp_deplibs= - for deplib in $deplibs; do - tmp_deplibs="$deplib $tmp_deplibs" - done - deplibs="$tmp_deplibs" - fi - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then - # Collect and forward deplibs of preopened libtool libs - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= - func_resolve_sysroot "$lib" - case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; - esac - done - done - libs="$dlprefiles" - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" - continue - fi - func_stripname '-l' '' "$deplib" - name=$func_stripname_result - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" - fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - # Linking convenience modules into shared libraries is allowed, - # but linking other static libraries is non-portable. - case " $dlpreconveniencelibs " in - *" $deplib "*) ;; - *) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - ;; - esac - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append newdlfiles " $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" - - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - inherited_linker_flags= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - func_source "$lib" - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" - else - func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" - func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" - fi - ;; - esac - func_basename "$lib" - laname="$func_basename_result" - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" - name=$func_stripname_result - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then - func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; - esac - # This is a shared library - - # Warn about portability, can't link against -module's on some - # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" - for dlpremoduletest in $dlprefiles; do - if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" - break - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else - $ECHO "*** Warning: Linking the shared library $output against the loadable module" - fi - $ECHO "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - shift - realname="$1" - shift - libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw* | *cegcc*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - func_basename "$soroot" - soname="$func_basename_result" - func_stripname 'lib' '.dll' "$soname" - newlib=libimp-$func_stripname_result.a - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - func_verbose "extracting exported symbol list from \`$soname'" - func_execute_cmds "$extract_expsyms_cmds" 'exit $?' - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" - func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not - # link against it, someone is ignoring the earlier warnings - if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - elif test -n "$old_library"; then - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - func_fatal_configuration "unsupported hardcode properties" - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) func_stripname '-R' '' "$libdir" - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; - esac;; - *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi - func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - path= - case $deplib in - -L*) path="$deplib" ;; - *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." - dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" - fi - ;; - esac - if $GREP "^installed=no" $deplib > /dev/null; then - case $host in - *-*-darwin*) - depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi - ;; - *) - path="-L$absdir/$objdir" - ;; - esac - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" - - path="-L$absdir" - fi - ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; - esac - ;; - *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" - - test -n "$release" && \ - func_warning "\`-release' is ignored for archives" - - test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - func_append objs "$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" - - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" - fi - fi - - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" - - set dummy $rpath - shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" - - install_libdir="$1" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" - - test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - shift - IFS="$save_ifs" - - test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$1" - number_minor="$2" - number_revision="$3" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; - esac - ;; - no) - current="$1" - revision="$2" - age="$3" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - func_arith $current + 1 - minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current" - ;; - - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - func_arith $current - $age - else - func_arith $current - $age + 1 - fi - major=$func_arith_result - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - func_arith $revision - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) # correct to gnu/linux during the next big refactor - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - ;; - - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - func_append verstring ":${current}.0" - ;; - - qnx) - major=".$current" - versuffix=".$current" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - - *) - func_fatal_configuration "unknown library version type \`$version_type'" - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - fi - - func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$ECHO "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext | *.gcno) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - func_append removelist " $p" - ;; - *) ;; - esac - done - test -n "$removelist" && \ - func_show_eval "${RM}r \$removelist" - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $opt_dry_run || $RM conftest.c - cat > conftest.c </dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | - $GREP " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a file magic. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - for a_deplib in $deplibs; do - case $a_deplib in - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a regex pattern. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi - case $tmp_deplibs in - *[!\ \ ]*) - echo - if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." - else - echo "*** Warning: inter-library dependencies are not known to be supported." - fi - echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - ;; - esac - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - func_append linknames " $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" - fi - - orig_export_symbols= - case $host_os in - cygwin* | mingw* | cegcc*) - if test -n "$export_symbols" && test -z "$export_symbols_regex"; then - # exporting using user supplied symfile - if test "x`$SED "$sed_uncomment_deffile" $export_symbols | $SED 1q`" != xEXPORTS; then - # and it's NOT already a .def file. Must figure out - # which of the given symbols are data symbols and tag - # them as such. So, trigger use of export_symbols_cmds. - # export_symbols gets reassigned inside the "prepare - # the list of exported symbols" if statement, so the - # include_expsyms logic still works. - orig_export_symbols="$export_symbols" - export_symbols= - always_export_symbols=yes - fi - fi - ;; - esac - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do - IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. - func_verbose "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - func_append tmp_deplibs " $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && - test -z "$libobjs"; then - # extract the archives, so we have objects to list. - # TODO: could optimize this to just extract one archive. - whole_archive_flag_spec= - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - func_len " $test_cmds" && - len=$func_len_result && - test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise - # or, if using GNU ld and skipped_export is not :, use a linker - # script. - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - func_basename "$output" - output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - last_robj= - k=1 - - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output - for obj in $save_libobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" - : > $output - set x $save_libobjs - shift - firstobj= - if test "$compiler_needs_object" = yes; then - firstobj="$1 " - shift - fi - for obj - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext - eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - if test "X$objlist" = X || - test "$len" -lt "$max_cmd_len"; then - func_append objlist " $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi - func_append delfiles " $output" - - else - output= - fi - - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - - test -n "$save_libobjs" && - func_verbose "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - if test -n "$export_symbols_regex" && ${skipped_export-false}; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - - if ${skipped_export-false}; then - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - fi - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - fi - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. - eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - func_show_eval '${RM}r "$gentop"' - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" - - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" - - test -n "$release" && \ - func_warning "\`-release' is ignored for objects" - - case $output in - *.lo) - test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" - - libobj=$output - func_lo2o "$libobj" - obj=$func_lo2o_result - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $opt_dry_run || $RM $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - func_execute_cmds "$reload_cmds" 'exit $?' - fi - - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" - - test -n "$release" && \ - func_warning "\`-release' is ignored for programs" - - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - case $host in - *-*-darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - - # template prelinking step - if test -n "$prelink_cmds"; then - func_execute_cmds "$prelink_cmds" 'exit $?' - fi - - wrappers_required=yes - case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' - fi - - exit $exit_status - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Now create the wrapper script. - func_verbose "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. - $opt_dry_run || { - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) func_stripname '' '.exe' "$output" - output=$func_stripname_result ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $RM $cwrappersource $cwrapper - trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - func_emit_cwrapperexe_src > $cwrappersource - - # The wrapper executable is built using the $host compiler, - # because it contains $host paths and files. If cross- - # compiling, it, like the target executable, must be - # executed on the $host or under an emulation environment. - $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource - $STRIP $cwrapper - } - - # Now, create the wrapper script for func_source use: - func_ltwrapper_scriptname $cwrapper - $RM $func_ltwrapper_scriptname_result - trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 - $opt_dry_run || { - # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then - $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else - func_emit_wrapper no > $func_ltwrapper_scriptname_result - fi - } - ;; - * ) - $RM $output - trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - - func_emit_wrapper no > $output - chmod +x $output - ;; - esac - } - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - func_basename "$obj" - $ECHO "$func_basename_result" - done | sort | sort -uc >/dev/null 2>&1); then - : - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - func_basename "$obj" - objbase="$func_basename_result" - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - func_arith $counter + 1 - counter=$func_arith_result - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" - ;; - *) func_append oldobjs " $obj" ;; - esac - done - fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - oldobjs= - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - for obj in $save_oldobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - func_append objlist " $obj" - if test "$len" -lt "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - func_execute_cmds "$cmds" 'exit $?' - done - - test -n "$generated" && \ - func_show_eval "${RM}r$generated" - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - func_verbose "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - # Only create the output if not a dry run. - $opt_dry_run || { - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - func_basename "$deplib" - name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - - for lib in $dlfiles; do - case $lib in - *.la) - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; - *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - *.la) - # Only pass preopened files to the pseudo-archive (for - # eventual linking with the app. that links it) if we - # didn't already link the preopened objects directly into - # the library: - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; - esac - $ECHO > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='$new_inherited_linker_flags' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Names of additional weak libraries provided by this library -weak_library_names='$weak_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $ECHO >> $output "\ -relink_command=\"$relink_command\"" - fi - done - } - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' - ;; - esac - exit $EXIT_SUCCESS -} - -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -# func_mode_uninstall arg... -func_mode_uninstall () -{ - $opt_debug - RM="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; - esac - done - - test -z "$RM" && \ - func_fatal_help "you must specify an RM program" - - rmdirs= - - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" - else - odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" - - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then - case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if { test -L "$file"; } >/dev/null 2>&1 || - { test -h "$file"; } >/dev/null 2>&1 || - test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if func_lalib_p "$file"; then - func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - func_append rmfiles " $odir/$n" - done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" - - case "$opt_mode" in - clean) - case " $library_names " in - *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if func_lalib_p "$file"; then - - # Read the .lo file - func_source $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) - func_stripname '' '.exe' "$file" - file=$func_stripname_result - func_stripname '' '.exe' "$name" - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe - func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. - if func_ltwrapper_p "$file"; then - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename - fi - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - func_show_eval "rmdir $dir >/dev/null 2>&1" - fi - done - - exit $exit_status -} - -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - -test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" -} - -test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" - -if test -n "$exec_cmd"; then - eval exec "$exec_cmd" - exit $EXIT_FAILURE -fi - -exit $exit_status - - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/mdate-sh b/src/hos_libhttpserver/src/libgcrypt/build-aux/mdate-sh deleted file mode 100755 index b3719cf7..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/mdate-sh +++ /dev/null @@ -1,224 +0,0 @@ -#!/bin/sh -# Get modification time of a file or directory and pretty-print it. - -scriptversion=2010-08-21.06; # UTC - -# Copyright (C) 1995-2013 Free Software Foundation, Inc. -# written by Ulrich Drepper , June 1995 -# -# 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, 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, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -fi - -case $1 in - '') - echo "$0: No file. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: mdate-sh [--help] [--version] FILE - -Pretty-print the modification day of FILE, in the format: -1 January 1970 - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "mdate-sh $scriptversion" - exit $? - ;; -esac - -error () -{ - echo "$0: $1" >&2 - exit 1 -} - - -# Prevent date giving response in another language. -LANG=C -export LANG -LC_ALL=C -export LC_ALL -LC_TIME=C -export LC_TIME - -# GNU ls changes its time format in response to the TIME_STYLE -# variable. Since we cannot assume 'unset' works, revert this -# variable to its documented default. -if test "${TIME_STYLE+set}" = set; then - TIME_STYLE=posix-long-iso - export TIME_STYLE -fi - -save_arg1=$1 - -# Find out how to get the extended ls output of a file or directory. -if ls -L /dev/null 1>/dev/null 2>&1; then - ls_command='ls -L -l -d' -else - ls_command='ls -l -d' -fi -# Avoid user/group names that might have spaces, when possible. -if ls -n /dev/null 1>/dev/null 2>&1; then - ls_command="$ls_command -n" -fi - -# A 'ls -l' line looks as follows on OS/2. -# drwxrwx--- 0 Aug 11 2001 foo -# This differs from Unix, which adds ownership information. -# drwxrwx--- 2 root root 4096 Aug 11 2001 foo -# -# To find the date, we split the line on spaces and iterate on words -# until we find a month. This cannot work with files whose owner is a -# user named "Jan", or "Feb", etc. However, it's unlikely that '/' -# will be owned by a user whose name is a month. So we first look at -# the extended ls output of the root directory to decide how many -# words should be skipped to get the date. - -# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below. -set x`$ls_command /` - -# Find which argument is the month. -month= -command= -until test $month -do - test $# -gt 0 || error "failed parsing '$ls_command /' output" - shift - # Add another shift to the command. - command="$command shift;" - case $1 in - Jan) month=January; nummonth=1;; - Feb) month=February; nummonth=2;; - Mar) month=March; nummonth=3;; - Apr) month=April; nummonth=4;; - May) month=May; nummonth=5;; - Jun) month=June; nummonth=6;; - Jul) month=July; nummonth=7;; - Aug) month=August; nummonth=8;; - Sep) month=September; nummonth=9;; - Oct) month=October; nummonth=10;; - Nov) month=November; nummonth=11;; - Dec) month=December; nummonth=12;; - esac -done - -test -n "$month" || error "failed parsing '$ls_command /' output" - -# Get the extended ls output of the file or directory. -set dummy x`eval "$ls_command \"\\\$save_arg1\""` - -# Remove all preceding arguments -eval $command - -# Because of the dummy argument above, month is in $2. -# -# On a POSIX system, we should have -# -# $# = 5 -# $1 = file size -# $2 = month -# $3 = day -# $4 = year or time -# $5 = filename -# -# On Darwin 7.7.0 and 7.6.0, we have -# -# $# = 4 -# $1 = day -# $2 = month -# $3 = year or time -# $4 = filename - -# Get the month. -case $2 in - Jan) month=January; nummonth=1;; - Feb) month=February; nummonth=2;; - Mar) month=March; nummonth=3;; - Apr) month=April; nummonth=4;; - May) month=May; nummonth=5;; - Jun) month=June; nummonth=6;; - Jul) month=July; nummonth=7;; - Aug) month=August; nummonth=8;; - Sep) month=September; nummonth=9;; - Oct) month=October; nummonth=10;; - Nov) month=November; nummonth=11;; - Dec) month=December; nummonth=12;; -esac - -case $3 in - ???*) day=$1;; - *) day=$3; shift;; -esac - -# Here we have to deal with the problem that the ls output gives either -# the time of day or the year. -case $3 in - *:*) set `date`; eval year=\$$# - case $2 in - Jan) nummonthtod=1;; - Feb) nummonthtod=2;; - Mar) nummonthtod=3;; - Apr) nummonthtod=4;; - May) nummonthtod=5;; - Jun) nummonthtod=6;; - Jul) nummonthtod=7;; - Aug) nummonthtod=8;; - Sep) nummonthtod=9;; - Oct) nummonthtod=10;; - Nov) nummonthtod=11;; - Dec) nummonthtod=12;; - esac - # For the first six month of the year the time notation can also - # be used for files modified in the last year. - if (expr $nummonth \> $nummonthtod) > /dev/null; - then - year=`expr $year - 1` - fi;; - *) year=$3;; -esac - -# The result. -echo $day $month $year - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/missing b/src/hos_libhttpserver/src/libgcrypt/build-aux/missing deleted file mode 100755 index db98974f..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/missing +++ /dev/null @@ -1,215 +0,0 @@ -#! /bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2013-10-28.13; # UTC - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard , 1996. - -# 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, 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, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/src/hos_libhttpserver/src/libgcrypt/build-aux/texinfo.tex b/src/hos_libhttpserver/src/libgcrypt/build-aux/texinfo.tex deleted file mode 100644 index a1818982..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/build-aux/texinfo.tex +++ /dev/null @@ -1,8638 +0,0 @@ -% texinfo.tex -- TeX macros to handle Texinfo files. -% -% Load plain if necessary, i.e., if running under initex. -\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi -% -\def\texinfoversion{2007-05-03.09} -% -% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, -% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007 Free Software Foundation, Inc. -% -% This texinfo.tex file 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 3, or (at -% your option) any later version. -% -% This texinfo.tex file 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 texinfo.tex file; see the file COPYING. If not, -% see . -% -% As a special exception, when this file is read by TeX when processing -% a Texinfo source document, you may use the result without -% restriction. (This has been our intent since Texinfo was invented.) -% -% Please try the latest version of texinfo.tex before submitting bug -% reports; you can get the latest version from: -% http://www.gnu.org/software/texinfo/ (the Texinfo home page), or -% ftp://tug.org/tex/texinfo.tex -% (and all CTAN mirrors, see http://www.ctan.org). -% The texinfo.tex in any given distribution could well be out -% of date, so if that's what you're using, please check. -% -% Send bug reports to bug-texinfo@gnu.org. Please include including a -% complete document in each bug report with which we can reproduce the -% problem. Patches are, of course, greatly appreciated. -% -% To process a Texinfo manual with TeX, it's most reliable to use the -% texi2dvi shell script that comes with the distribution. For a simple -% manual foo.texi, however, you can get away with this: -% tex foo.texi -% texindex foo.?? -% tex foo.texi -% tex foo.texi -% dvips foo.dvi -o # or whatever; this makes foo.ps. -% The extra TeX runs get the cross-reference information correct. -% Sometimes one run after texindex suffices, and sometimes you need more -% than two; texi2dvi does it as many times as necessary. -% -% It is possible to adapt texinfo.tex for other languages, to some -% extent. You can get the existing language-specific files from the -% full Texinfo distribution. -% -% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. - - -\message{Loading texinfo [version \texinfoversion]:} - -% If in a .fmt file, print the version number -% and turn on active characters that we couldn't do earlier because -% they might have appeared in the input file name. -\everyjob{\message{[Texinfo version \texinfoversion]}% - \catcode`+=\active \catcode`\_=\active} - - -\chardef\other=12 - -% We never want plain's \outer definition of \+ in Texinfo. -% For @tex, we can use \tabalign. -\let\+ = \relax - -% Save some plain tex macros whose names we will redefine. -\let\ptexb=\b -\let\ptexbullet=\bullet -\let\ptexc=\c -\let\ptexcomma=\, -\let\ptexdot=\. -\let\ptexdots=\dots -\let\ptexend=\end -\let\ptexequiv=\equiv -\let\ptexexclam=\! -\let\ptexfootnote=\footnote -\let\ptexgtr=> -\let\ptexhat=^ -\let\ptexi=\i -\let\ptexindent=\indent -\let\ptexinsert=\insert -\let\ptexlbrace=\{ -\let\ptexless=< -\let\ptexnewwrite\newwrite -\let\ptexnoindent=\noindent -\let\ptexplus=+ -\let\ptexrbrace=\} -\let\ptexslash=\/ -\let\ptexstar=\* -\let\ptext=\t - -% If this character appears in an error message or help string, it -% starts a new line in the output. -\newlinechar = `^^J - -% Use TeX 3.0's \inputlineno to get the line number, for better error -% messages, but if we're using an old version of TeX, don't do anything. -% -\ifx\inputlineno\thisisundefined - \let\linenumber = \empty % Pre-3.0. -\else - \def\linenumber{l.\the\inputlineno:\space} -\fi - -% Set up fixed words for English if not already set. -\ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi -\ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi -\ifx\putwordfile\undefined \gdef\putwordfile{file}\fi -\ifx\putwordin\undefined \gdef\putwordin{in}\fi -\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi -\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi -\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi -\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi -\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi -\ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi -\ifx\putwordof\undefined \gdef\putwordof{of}\fi -\ifx\putwordon\undefined \gdef\putwordon{on}\fi -\ifx\putwordpage\undefined \gdef\putwordpage{page}\fi -\ifx\putwordsection\undefined \gdef\putwordsection{section}\fi -\ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi -\ifx\putwordsee\undefined \gdef\putwordsee{see}\fi -\ifx\putwordSee\undefined \gdef\putwordSee{See}\fi -\ifx\putwordShortTOC\undefined \gdef\putwordShortTOC{Short Contents}\fi -\ifx\putwordTOC\undefined \gdef\putwordTOC{Table of Contents}\fi -% -\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi -\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi -\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi -\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi -\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi -\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi -\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi -\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi -\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi -\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi -\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi -\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi -% -\ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi -\ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi -\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi -\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi -\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi - -% Since the category of space is not known, we have to be careful. -\chardef\spacecat = 10 -\def\spaceisspace{\catcode`\ =\spacecat} - -% sometimes characters are active, so we need control sequences. -\chardef\colonChar = `\: -\chardef\commaChar = `\, -\chardef\dashChar = `\- -\chardef\dotChar = `\. -\chardef\exclamChar= `\! -\chardef\lquoteChar= `\` -\chardef\questChar = `\? -\chardef\rquoteChar= `\' -\chardef\semiChar = `\; -\chardef\underChar = `\_ - -% Ignore a token. -% -\def\gobble#1{} - -% The following is used inside several \edef's. -\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname} - -% Hyphenation fixes. -\hyphenation{ - Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script - ap-pen-dix bit-map bit-maps - data-base data-bases eshell fall-ing half-way long-est man-u-script - man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm - par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces - spell-ing spell-ings - stand-alone strong-est time-stamp time-stamps which-ever white-space - wide-spread wrap-around -} - -% Margin to add to right of even pages, to left of odd pages. -\newdimen\bindingoffset -\newdimen\normaloffset -\newdimen\pagewidth \newdimen\pageheight - -% For a final copy, take out the rectangles -% that mark overfull boxes (in case you have decided -% that the text looks ok even though it passes the margin). -% -\def\finalout{\overfullrule=0pt} - -% @| inserts a changebar to the left of the current line. It should -% surround any changed text. This approach does *not* work if the -% change spans more than two lines of output. To handle that, we would -% have adopt a much more difficult approach (putting marks into the main -% vertical list for the beginning and end of each change). -% -\def\|{% - % \vadjust can only be used in horizontal mode. - \leavevmode - % - % Append this vertical mode material after the current line in the output. - \vadjust{% - % We want to insert a rule with the height and depth of the current - % leading; that is exactly what \strutbox is supposed to record. - \vskip-\baselineskip - % - % \vadjust-items are inserted at the left edge of the type. So - % the \llap here moves out into the left-hand margin. - \llap{% - % - % For a thicker or thinner bar, change the `1pt'. - \vrule height\baselineskip width1pt - % - % This is the space between the bar and the text. - \hskip 12pt - }% - }% -} - -% Sometimes it is convenient to have everything in the transcript file -% and nothing on the terminal. We don't just call \tracingall here, -% since that produces some useless output on the terminal. We also make -% some effort to order the tracing commands to reduce output in the log -% file; cf. trace.sty in LaTeX. -% -\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}% -\def\loggingall{% - \tracingstats2 - \tracingpages1 - \tracinglostchars2 % 2 gives us more in etex - \tracingparagraphs1 - \tracingoutput1 - \tracingmacros2 - \tracingrestores1 - \showboxbreadth\maxdimen \showboxdepth\maxdimen - \ifx\eTeXversion\undefined\else % etex gives us more logging - \tracingscantokens1 - \tracingifs1 - \tracinggroups1 - \tracingnesting2 - \tracingassigns1 - \fi - \tracingcommands3 % 3 gives us more in etex - \errorcontextlines16 -}% - -% add check for \lastpenalty to plain's definitions. If the last thing -% we did was a \nobreak, we don't want to insert more space. -% -\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount - \removelastskip\penalty-50\smallskip\fi\fi} -\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount - \removelastskip\penalty-100\medskip\fi\fi} -\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount - \removelastskip\penalty-200\bigskip\fi\fi} - -% For @cropmarks command. -% Do @cropmarks to get crop marks. -% -\newif\ifcropmarks -\let\cropmarks = \cropmarkstrue -% -% Dimensions to add cropmarks at corners. -% Added by P. A. MacKay, 12 Nov. 1986 -% -\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines -\newdimen\cornerlong \cornerlong=1pc -\newdimen\cornerthick \cornerthick=.3pt -\newdimen\topandbottommargin \topandbottommargin=.75in - -% Main output routine. -\chardef\PAGE = 255 -\output = {\onepageout{\pagecontents\PAGE}} - -\newbox\headlinebox -\newbox\footlinebox - -% \onepageout takes a vbox as an argument. Note that \pagecontents -% does insertions, but you have to call it yourself. -\def\onepageout#1{% - \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi - % - \ifodd\pageno \advance\hoffset by \bindingoffset - \else \advance\hoffset by -\bindingoffset\fi - % - % Do this outside of the \shipout so @code etc. will be expanded in - % the headline as they should be, not taken literally (outputting ''code). - \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}% - \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}% - % - {% - % Have to do this stuff outside the \shipout because we want it to - % take effect in \write's, yet the group defined by the \vbox ends - % before the \shipout runs. - % - \indexdummies % don't expand commands in the output. - \normalturnoffactive % \ in index entries must not stay \, e.g., if - % the page break happens to be in the middle of an example. - % We don't want .vr (or whatever) entries like this: - % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}} - % "\acronym" won't work when it's read back in; - % it needs to be - % {\code {{\tt \backslashcurfont }acronym} - \shipout\vbox{% - % Do this early so pdf references go to the beginning of the page. - \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi - % - \ifcropmarks \vbox to \outervsize\bgroup - \hsize = \outerhsize - \vskip-\topandbottommargin - \vtop to0pt{% - \line{\ewtop\hfil\ewtop}% - \nointerlineskip - \line{% - \vbox{\moveleft\cornerthick\nstop}% - \hfill - \vbox{\moveright\cornerthick\nstop}% - }% - \vss}% - \vskip\topandbottommargin - \line\bgroup - \hfil % center the page within the outer (page) hsize. - \ifodd\pageno\hskip\bindingoffset\fi - \vbox\bgroup - \fi - % - \unvbox\headlinebox - \pagebody{#1}% - \ifdim\ht\footlinebox > 0pt - % Only leave this space if the footline is nonempty. - % (We lessened \vsize for it in \oddfootingyyy.) - % The \baselineskip=24pt in plain's \makefootline has no effect. - \vskip 24pt - \unvbox\footlinebox - \fi - % - \ifcropmarks - \egroup % end of \vbox\bgroup - \hfil\egroup % end of (centering) \line\bgroup - \vskip\topandbottommargin plus1fill minus1fill - \boxmaxdepth = \cornerthick - \vbox to0pt{\vss - \line{% - \vbox{\moveleft\cornerthick\nsbot}% - \hfill - \vbox{\moveright\cornerthick\nsbot}% - }% - \nointerlineskip - \line{\ewbot\hfil\ewbot}% - }% - \egroup % \vbox from first cropmarks clause - \fi - }% end of \shipout\vbox - }% end of group with \indexdummies - \advancepageno - \ifnum\outputpenalty>-20000 \else\dosupereject\fi -} - -\newinsert\margin \dimen\margin=\maxdimen - -\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}} -{\catcode`\@ =11 -\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi -% marginal hacks, juha@viisa.uucp (Juha Takala) -\ifvoid\margin\else % marginal info is present - \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi -\dimen@=\dp#1 \unvbox#1 -\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi -\ifr@ggedbottom \kern-\dimen@ \vfil \fi} -} - -% Here are the rules for the cropmarks. Note that they are -% offset so that the space between them is truly \outerhsize or \outervsize -% (P. A. MacKay, 12 November, 1986) -% -\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong} -\def\nstop{\vbox - {\hrule height\cornerthick depth\cornerlong width\cornerthick}} -\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong} -\def\nsbot{\vbox - {\hrule height\cornerlong depth\cornerthick width\cornerthick}} - -% Parse an argument, then pass it to #1. The argument is the rest of -% the input line (except we remove a trailing comment). #1 should be a -% macro which expects an ordinary undelimited TeX argument. -% -\def\parsearg{\parseargusing{}} -\def\parseargusing#1#2{% - \def\argtorun{#2}% - \begingroup - \obeylines - \spaceisspace - #1% - \parseargline\empty% Insert the \empty token, see \finishparsearg below. -} - -{\obeylines % - \gdef\parseargline#1^^M{% - \endgroup % End of the group started in \parsearg. - \argremovecomment #1\comment\ArgTerm% - }% -} - -% First remove any @comment, then any @c comment. -\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} -\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} - -% Each occurence of `\^^M' or `\^^M' is replaced by a single space. -% -% \argremovec might leave us with trailing space, e.g., -% @end itemize @c foo -% This space token undergoes the same procedure and is eventually removed -% by \finishparsearg. -% -\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M} -\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M} -\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% - \def\temp{#3}% - \ifx\temp\empty - % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp: - \let\temp\finishparsearg - \else - \let\temp\argcheckspaces - \fi - % Put the space token in: - \temp#1 #3\ArgTerm -} - -% If a _delimited_ argument is enclosed in braces, they get stripped; so -% to get _exactly_ the rest of the line, we had to prevent such situation. -% We prepended an \empty token at the very beginning and we expand it now, -% just before passing the control to \argtorun. -% (Similarily, we have to think about #3 of \argcheckspacesY above: it is -% either the null string, or it ends with \^^M---thus there is no danger -% that a pair of braces would be stripped. -% -% But first, we have to remove the trailing space token. -% -\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}} - -% \parseargdef\foo{...} -% is roughly equivalent to -% \def\foo{\parsearg\Xfoo} -% \def\Xfoo#1{...} -% -% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my -% favourite TeX trick. --kasal, 16nov03 - -\def\parseargdef#1{% - \expandafter \doparseargdef \csname\string#1\endcsname #1% -} -\def\doparseargdef#1#2{% - \def#2{\parsearg#1}% - \def#1##1% -} - -% Several utility definitions with active space: -{ - \obeyspaces - \gdef\obeyedspace{ } - - % Make each space character in the input produce a normal interword - % space in the output. Don't allow a line break at this space, as this - % is used only in environments like @example, where each line of input - % should produce a line of output anyway. - % - \gdef\sepspaces{\obeyspaces\let =\tie} - - % If an index command is used in an @example environment, any spaces - % therein should become regular spaces in the raw index file, not the - % expansion of \tie (\leavevmode \penalty \@M \ ). - \gdef\unsepspaces{\let =\space} -} - - -\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next} - -% Define the framework for environments in texinfo.tex. It's used like this: -% -% \envdef\foo{...} -% \def\Efoo{...} -% -% It's the responsibility of \envdef to insert \begingroup before the -% actual body; @end closes the group after calling \Efoo. \envdef also -% defines \thisenv, so the current environment is known; @end checks -% whether the environment name matches. The \checkenv macro can also be -% used to check whether the current environment is the one expected. -% -% Non-false conditionals (@iftex, @ifset) don't fit into this, so they -% are not treated as enviroments; they don't open a group. (The -% implementation of @end takes care not to call \endgroup in this -% special case.) - - -% At runtime, environments start with this: -\def\startenvironment#1{\begingroup\def\thisenv{#1}} -% initialize -\let\thisenv\empty - -% ... but they get defined via ``\envdef\foo{...}'': -\long\def\envdef#1#2{\def#1{\startenvironment#1#2}} -\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} - -% Check whether we're in the right environment: -\def\checkenv#1{% - \def\temp{#1}% - \ifx\thisenv\temp - \else - \badenverr - \fi -} - -% Evironment mismatch, #1 expected: -\def\badenverr{% - \errhelp = \EMsimple - \errmessage{This command can appear only \inenvironment\temp, - not \inenvironment\thisenv}% -} -\def\inenvironment#1{% - \ifx#1\empty - out of any environment% - \else - in environment \expandafter\string#1% - \fi -} - -% @end foo executes the definition of \Efoo. -% But first, it executes a specialized version of \checkenv -% -\parseargdef\end{% - \if 1\csname iscond.#1\endcsname - \else - % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03 - \expandafter\checkenv\csname#1\endcsname - \csname E#1\endcsname - \endgroup - \fi -} - -\newhelp\EMsimple{Press RETURN to continue.} - - -%% Simple single-character @ commands - -% @@ prints an @ -% Kludge this until the fonts are right (grr). -\def\@{{\tt\char64}} - -% This is turned off because it was never documented -% and you can use @w{...} around a quote to suppress ligatures. -%% Define @` and @' to be the same as ` and ' -%% but suppressing ligatures. -%\def\`{{`}} -%\def\'{{'}} - -% Used to generate quoted braces. -\def\mylbrace {{\tt\char123}} -\def\myrbrace {{\tt\char125}} -\let\{=\mylbrace -\let\}=\myrbrace -\begingroup - % Definitions to produce \{ and \} commands for indices, - % and @{ and @} for the aux/toc files. - \catcode`\{ = \other \catcode`\} = \other - \catcode`\[ = 1 \catcode`\] = 2 - \catcode`\! = 0 \catcode`\\ = \other - !gdef!lbracecmd[\{]% - !gdef!rbracecmd[\}]% - !gdef!lbraceatcmd[@{]% - !gdef!rbraceatcmd[@}]% -!endgroup - -% @comma{} to avoid , parsing problems. -\let\comma = , - -% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent -% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H. -\let\, = \c -\let\dotaccent = \. -\def\ringaccent#1{{\accent23 #1}} -\let\tieaccent = \t -\let\ubaraccent = \b -\let\udotaccent = \d - -% Other special characters: @questiondown @exclamdown @ordf @ordm -% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. -\def\questiondown{?`} -\def\exclamdown{!`} -\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} -\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} - -% Dotless i and dotless j, used for accents. -\def\imacro{i} -\def\jmacro{j} -\def\dotless#1{% - \def\temp{#1}% - \ifx\temp\imacro \ptexi - \else\ifx\temp\jmacro \j - \else \errmessage{@dotless can be used only with i or j}% - \fi\fi -} - -% The \TeX{} logo, as in plain, but resetting the spacing so that a -% period following counts as ending a sentence. (Idea found in latex.) -% -\edef\TeX{\TeX \spacefactor=1000 } - -% @LaTeX{} logo. Not quite the same results as the definition in -% latex.ltx, since we use a different font for the raised A; it's most -% convenient for us to use an explicitly smaller font, rather than using -% the \scriptstyle font (since we don't reset \scriptstyle and -% \scriptscriptstyle). -% -\def\LaTeX{% - L\kern-.36em - {\setbox0=\hbox{T}% - \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}% - \kern-.15em - \TeX -} - -% Be sure we're in horizontal mode when doing a tie, since we make space -% equivalent to this in @example-like environments. Otherwise, a space -% at the beginning of a line will start with \penalty -- and -% since \penalty is valid in vertical mode, we'd end up putting the -% penalty on the vertical list instead of in the new paragraph. -{\catcode`@ = 11 - % Avoid using \@M directly, because that causes trouble - % if the definition is written into an index file. - \global\let\tiepenalty = \@M - \gdef\tie{\leavevmode\penalty\tiepenalty\ } -} - -% @: forces normal size whitespace following. -\def\:{\spacefactor=1000 } - -% @* forces a line break. -\def\*{\hfil\break\hbox{}\ignorespaces} - -% @/ allows a line break. -\let\/=\allowbreak - -% @. is an end-of-sentence period. -\def\.{.\spacefactor=\endofsentencespacefactor\space} - -% @! is an end-of-sentence bang. -\def\!{!\spacefactor=\endofsentencespacefactor\space} - -% @? is an end-of-sentence query. -\def\?{?\spacefactor=\endofsentencespacefactor\space} - -% @frenchspacing on|off says whether to put extra space after punctuation. -% -\def\onword{on} -\def\offword{off} -% -\parseargdef\frenchspacing{% - \def\temp{#1}% - \ifx\temp\onword \plainfrenchspacing - \else\ifx\temp\offword \plainnonfrenchspacing - \else - \errhelp = \EMsimple - \errmessage{Unknown @frenchspacing option `\temp', must be on/off}% - \fi\fi -} - -% @w prevents a word break. Without the \leavevmode, @w at the -% beginning of a paragraph, when TeX is still in vertical mode, would -% produce a whole line of output instead of starting the paragraph. -\def\w#1{\leavevmode\hbox{#1}} - -% @group ... @end group forces ... to be all on one page, by enclosing -% it in a TeX vbox. We use \vtop instead of \vbox to construct the box -% to keep its height that of a normal line. According to the rules for -% \topskip (p.114 of the TeXbook), the glue inserted is -% max (\topskip - \ht (first item), 0). If that height is large, -% therefore, no glue is inserted, and the space between the headline and -% the text is small, which looks bad. -% -% Another complication is that the group might be very large. This can -% cause the glue on the previous page to be unduly stretched, because it -% does not have much material. In this case, it's better to add an -% explicit \vfill so that the extra space is at the bottom. The -% threshold for doing this is if the group is more than \vfilllimit -% percent of a page (\vfilllimit can be changed inside of @tex). -% -\newbox\groupbox -\def\vfilllimit{0.7} -% -\envdef\group{% - \ifnum\catcode`\^^M=\active \else - \errhelp = \groupinvalidhelp - \errmessage{@group invalid in context where filling is enabled}% - \fi - \startsavinginserts - % - \setbox\groupbox = \vtop\bgroup - % Do @comment since we are called inside an environment such as - % @example, where each end-of-line in the input causes an - % end-of-line in the output. We don't want the end-of-line after - % the `@group' to put extra space in the output. Since @group - % should appear on a line by itself (according to the Texinfo - % manual), we don't worry about eating any user text. - \comment -} -% -% The \vtop produces a box with normal height and large depth; thus, TeX puts -% \baselineskip glue before it, and (when the next line of text is done) -% \lineskip glue after it. Thus, space below is not quite equal to space -% above. But it's pretty close. -\def\Egroup{% - % To get correct interline space between the last line of the group - % and the first line afterwards, we have to propagate \prevdepth. - \endgraf % Not \par, as it may have been set to \lisppar. - \global\dimen1 = \prevdepth - \egroup % End the \vtop. - % \dimen0 is the vertical size of the group's box. - \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox - % \dimen2 is how much space is left on the page (more or less). - \dimen2 = \pageheight \advance\dimen2 by -\pagetotal - % if the group doesn't fit on the current page, and it's a big big - % group, force a page break. - \ifdim \dimen0 > \dimen2 - \ifdim \pagetotal < \vfilllimit\pageheight - \page - \fi - \fi - \box\groupbox - \prevdepth = \dimen1 - \checkinserts -} -% -% TeX puts in an \escapechar (i.e., `@') at the beginning of the help -% message, so this ends up printing `@group can only ...'. -% -\newhelp\groupinvalidhelp{% -group can only be used in environments such as @example,^^J% -where each line of input produces a line of output.} - -% @need space-in-mils -% forces a page break if there is not space-in-mils remaining. - -\newdimen\mil \mil=0.001in - -% Old definition--didn't work. -%\parseargdef\need{\par % -%% This method tries to make TeX break the page naturally -%% if the depth of the box does not fit. -%{\baselineskip=0pt% -%\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak -%\prevdepth=-1000pt -%}} - -\parseargdef\need{% - % Ensure vertical mode, so we don't make a big box in the middle of a - % paragraph. - \par - % - % If the @need value is less than one line space, it's useless. - \dimen0 = #1\mil - \dimen2 = \ht\strutbox - \advance\dimen2 by \dp\strutbox - \ifdim\dimen0 > \dimen2 - % - % Do a \strut just to make the height of this box be normal, so the - % normal leading is inserted relative to the preceding line. - % And a page break here is fine. - \vtop to #1\mil{\strut\vfil}% - % - % TeX does not even consider page breaks if a penalty added to the - % main vertical list is 10000 or more. But in order to see if the - % empty box we just added fits on the page, we must make it consider - % page breaks. On the other hand, we don't want to actually break the - % page after the empty box. So we use a penalty of 9999. - % - % There is an extremely small chance that TeX will actually break the - % page at this \penalty, if there are no other feasible breakpoints in - % sight. (If the user is using lots of big @group commands, which - % almost-but-not-quite fill up a page, TeX will have a hard time doing - % good page breaking, for example.) However, I could not construct an - % example where a page broke at this \penalty; if it happens in a real - % document, then we can reconsider our strategy. - \penalty9999 - % - % Back up by the size of the box, whether we did a page break or not. - \kern -#1\mil - % - % Do not allow a page break right after this kern. - \nobreak - \fi -} - -% @br forces paragraph break (and is undocumented). - -\let\br = \par - -% @page forces the start of a new page. -% -\def\page{\par\vfill\supereject} - -% @exdent text.... -% outputs text on separate line in roman font, starting at standard page margin - -% This records the amount of indent in the innermost environment. -% That's how much \exdent should take out. -\newskip\exdentamount - -% This defn is used inside fill environments such as @defun. -\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break} - -% This defn is used inside nofill environments such as @example. -\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount - \leftline{\hskip\leftskip{\rm#1}}}} - -% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current -% paragraph. For more general purposes, use the \margin insertion -% class. WHICH is `l' or `r'. -% -\newskip\inmarginspacing \inmarginspacing=1cm -\def\strutdepth{\dp\strutbox} -% -\def\doinmargin#1#2{\strut\vadjust{% - \nobreak - \kern-\strutdepth - \vtop to \strutdepth{% - \baselineskip=\strutdepth - \vss - % if you have multiple lines of stuff to put here, you'll need to - % make the vbox yourself of the appropriate size. - \ifx#1l% - \llap{\ignorespaces #2\hskip\inmarginspacing}% - \else - \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}% - \fi - \null - }% -}} -\def\inleftmargin{\doinmargin l} -\def\inrightmargin{\doinmargin r} -% -% @inmargin{TEXT [, RIGHT-TEXT]} -% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right; -% else use TEXT for both). -% -\def\inmargin#1{\parseinmargin #1,,\finish} -\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing. - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \def\lefttext{#1}% have both texts - \def\righttext{#2}% - \else - \def\lefttext{#1}% have only one text - \def\righttext{#1}% - \fi - % - \ifodd\pageno - \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin - \else - \def\temp{\inleftmargin\lefttext}% - \fi - \temp -} - -% @include file insert text of that file as input. -% -\def\include{\parseargusing\filenamecatcodes\includezzz} -\def\includezzz#1{% - \pushthisfilestack - \def\thisfile{#1}% - {% - \makevalueexpandable - \def\temp{\input #1 }% - \expandafter - }\temp - \popthisfilestack -} -\def\filenamecatcodes{% - \catcode`\\=\other - \catcode`~=\other - \catcode`^=\other - \catcode`_=\other - \catcode`|=\other - \catcode`<=\other - \catcode`>=\other - \catcode`+=\other - \catcode`-=\other -} - -\def\pushthisfilestack{% - \expandafter\pushthisfilestackX\popthisfilestack\StackTerm -} -\def\pushthisfilestackX{% - \expandafter\pushthisfilestackY\thisfile\StackTerm -} -\def\pushthisfilestackY #1\StackTerm #2\StackTerm {% - \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}% -} - -\def\popthisfilestack{\errthisfilestackempty} -\def\errthisfilestackempty{\errmessage{Internal error: - the stack of filenames is empty.}} - -\def\thisfile{} - -% @center line -% outputs that line, centered. -% -\parseargdef\center{% - \ifhmode - \let\next\centerH - \else - \let\next\centerV - \fi - \next{\hfil \ignorespaces#1\unskip \hfil}% -} -\def\centerH#1{% - {% - \hfil\break - \advance\hsize by -\leftskip - \advance\hsize by -\rightskip - \line{#1}% - \break - }% -} -\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}} - -% @sp n outputs n lines of vertical space - -\parseargdef\sp{\vskip #1\baselineskip} - -% @comment ...line which is ignored... -% @c is the same as @comment -% @ignore ... @end ignore is another way to write a comment - -\def\comment{\begingroup \catcode`\^^M=\other% -\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other% -\commentxxx} -{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}} - -\let\c=\comment - -% @paragraphindent NCHARS -% We'll use ems for NCHARS, close enough. -% NCHARS can also be the word `asis' or `none'. -% We cannot feasibly implement @paragraphindent asis, though. -% -\def\asisword{asis} % no translation, these are keywords -\def\noneword{none} -% -\parseargdef\paragraphindent{% - \def\temp{#1}% - \ifx\temp\asisword - \else - \ifx\temp\noneword - \defaultparindent = 0pt - \else - \defaultparindent = #1em - \fi - \fi - \parindent = \defaultparindent -} - -% @exampleindent NCHARS -% We'll use ems for NCHARS like @paragraphindent. -% It seems @exampleindent asis isn't necessary, but -% I preserve it to make it similar to @paragraphindent. -\parseargdef\exampleindent{% - \def\temp{#1}% - \ifx\temp\asisword - \else - \ifx\temp\noneword - \lispnarrowing = 0pt - \else - \lispnarrowing = #1em - \fi - \fi -} - -% @firstparagraphindent WORD -% If WORD is `none', then suppress indentation of the first paragraph -% after a section heading. If WORD is `insert', then do indent at such -% paragraphs. -% -% The paragraph indentation is suppressed or not by calling -% \suppressfirstparagraphindent, which the sectioning commands do. -% We switch the definition of this back and forth according to WORD. -% By default, we suppress indentation. -% -\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent} -\def\insertword{insert} -% -\parseargdef\firstparagraphindent{% - \def\temp{#1}% - \ifx\temp\noneword - \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent - \else\ifx\temp\insertword - \let\suppressfirstparagraphindent = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @firstparagraphindent option `\temp'}% - \fi\fi -} - -% Here is how we actually suppress indentation. Redefine \everypar to -% \kern backwards by \parindent, and then reset itself to empty. -% -% We also make \indent itself not actually do anything until the next -% paragraph. -% -\gdef\dosuppressfirstparagraphindent{% - \gdef\indent{% - \restorefirstparagraphindent - \indent - }% - \gdef\noindent{% - \restorefirstparagraphindent - \noindent - }% - \global\everypar = {% - \kern -\parindent - \restorefirstparagraphindent - }% -} - -\gdef\restorefirstparagraphindent{% - \global \let \indent = \ptexindent - \global \let \noindent = \ptexnoindent - \global \everypar = {}% -} - - -% @asis just yields its argument. Used with @table, for example. -% -\def\asis#1{#1} - -% @math outputs its argument in math mode. -% -% One complication: _ usually means subscripts, but it could also mean -% an actual _ character, as in @math{@var{some_variable} + 1}. So make -% _ active, and distinguish by seeing if the current family is \slfam, -% which is what @var uses. -{ - \catcode`\_ = \active - \gdef\mathunderscore{% - \catcode`\_=\active - \def_{\ifnum\fam=\slfam \_\else\sb\fi}% - } -} -% Another complication: we want \\ (and @\) to output a \ character. -% FYI, plain.tex uses \\ as a temporary control sequence (why?), but -% this is not advertised and we don't care. Texinfo does not -% otherwise define @\. -% -% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\. -\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} -% -\def\math{% - \tex - \mathunderscore - \let\\ = \mathbackslash - \mathactive - $\finishmath -} -\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. - -% Some active characters (such as <) are spaced differently in math. -% We have to reset their definitions in case the @math was an argument -% to a command which sets the catcodes (such as @item or @section). -% -{ - \catcode`^ = \active - \catcode`< = \active - \catcode`> = \active - \catcode`+ = \active - \gdef\mathactive{% - \let^ = \ptexhat - \let< = \ptexless - \let> = \ptexgtr - \let+ = \ptexplus - } -} - -% @bullet and @minus need the same treatment as @math, just above. -\def\bullet{$\ptexbullet$} -\def\minus{$-$} - -% @dots{} outputs an ellipsis using the current font. -% We do .5em per period so that it has the same spacing in the cm -% typewriter fonts as three actual period characters; on the other hand, -% in other typewriter fonts three periods are wider than 1.5em. So do -% whichever is larger. -% -\def\dots{% - \leavevmode - \setbox0=\hbox{...}% get width of three periods - \ifdim\wd0 > 1.5em - \dimen0 = \wd0 - \else - \dimen0 = 1.5em - \fi - \hbox to \dimen0{% - \hskip 0pt plus.25fil - .\hskip 0pt plus1fil - .\hskip 0pt plus1fil - .\hskip 0pt plus.5fil - }% -} - -% @enddots{} is an end-of-sentence ellipsis. -% -\def\enddots{% - \dots - \spacefactor=\endofsentencespacefactor -} - -% @comma{} is so commas can be inserted into text without messing up -% Texinfo's parsing. -% -\let\comma = , - -% @refill is a no-op. -\let\refill=\relax - -% If working on a large document in chapters, it is convenient to -% be able to disable indexing, cross-referencing, and contents, for test runs. -% This is done with @novalidate (before @setfilename). -% -\newif\iflinks \linkstrue % by default we want the aux files. -\let\novalidate = \linksfalse - -% @setfilename is done at the beginning of every texinfo file. -% So open here the files we need to have open while reading the input. -% This makes it possible to make a .fmt file for texinfo. -\def\setfilename{% - \fixbackslash % Turn off hack to swallow `\input texinfo'. - \iflinks - \tryauxfile - % Open the new aux file. TeX will close it automatically at exit. - \immediate\openout\auxfile=\jobname.aux - \fi % \openindices needs to do some work in any case. - \openindices - \let\setfilename=\comment % Ignore extra @setfilename cmds. - % - % If texinfo.cnf is present on the system, read it. - % Useful for site-wide @afourpaper, etc. - \openin 1 texinfo.cnf - \ifeof 1 \else \input texinfo.cnf \fi - \closein 1 - % - \comment % Ignore the actual filename. -} - -% Called from \setfilename. -% -\def\openindices{% - \newindex{cp}% - \newcodeindex{fn}% - \newcodeindex{vr}% - \newcodeindex{tp}% - \newcodeindex{ky}% - \newcodeindex{pg}% -} - -% @bye. -\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} - - -\message{pdf,} -% adobe `portable' document format -\newcount\tempnum -\newcount\lnkcount -\newtoks\filename -\newcount\filenamelength -\newcount\pgn -\newtoks\toksA -\newtoks\toksB -\newtoks\toksC -\newtoks\toksD -\newbox\boxA -\newcount\countA -\newif\ifpdf -\newif\ifpdfmakepagedest - -% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 -% can be set). So we test for \relax and 0 as well as \undefined, -% borrowed from ifpdf.sty. -\ifx\pdfoutput\undefined -\else - \ifx\pdfoutput\relax - \else - \ifcase\pdfoutput - \else - \pdftrue - \fi - \fi -\fi - -% PDF uses PostScript string constants for the names of xref targets, -% for display in the outlines, and in other places. Thus, we have to -% double any backslashes. Otherwise, a name like "\node" will be -% interpreted as a newline (\n), followed by o, d, e. Not good. -% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html -% (and related messages, the final outcome is that it is up to the TeX -% user to double the backslashes and otherwise make the string valid, so -% that's what we do). - -% double active backslashes. -% -{\catcode`\@=0 \catcode`\\=\active - @gdef@activebackslashdouble{% - @catcode`@\=@active - @let\=@doublebackslash} -} - -% To handle parens, we must adopt a different approach, since parens are -% not active characters. hyperref.dtx (which has the same problem as -% us) handles it with this amazing macro to replace tokens, with minor -% changes for Texinfo. It is included here under the GPL by permission -% from the author, Heiko Oberdiek. -% -% #1 is the tokens to replace. -% #2 is the replacement. -% #3 is the control sequence with the string. -% -\def\HyPsdSubst#1#2#3{% - \def\HyPsdReplace##1#1##2\END{% - ##1% - \ifx\\##2\\% - \else - #2% - \HyReturnAfterFi{% - \HyPsdReplace##2\END - }% - \fi - }% - \xdef#3{\expandafter\HyPsdReplace#3#1\END}% -} -\long\def\HyReturnAfterFi#1\fi{\fi#1} - -% #1 is a control sequence in which to do the replacements. -\def\backslashparens#1{% - \xdef#1{#1}% redefine it as its expansion; the definition is simply - % \lastnode when called from \setref -> \pdfmkdest. - \HyPsdSubst{(}{\realbackslash(}{#1}% - \HyPsdSubst{)}{\realbackslash)}{#1}% -} - -\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images -with PDF output, and none of those formats could be found. (.eps cannot -be supported due to the design of the PDF format; use regular TeX (DVI -output) for that.)} - -\ifpdf - \input pdfcolor - \pdfcatalog{/PageMode /UseOutlines} - % - % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). - \def\dopdfimage#1#2#3{% - \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% - \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% - % - % pdftex (and the PDF format) support .png, .jpg, .pdf (among - % others). Let's try in that order. - \let\pdfimgext=\empty - \begingroup - \openin 1 #1.png \ifeof 1 - \openin 1 #1.jpg \ifeof 1 - \openin 1 #1.jpeg \ifeof 1 - \openin 1 #1.JPG \ifeof 1 - \openin 1 #1.pdf \ifeof 1 - \errhelp = \nopdfimagehelp - \errmessage{Could not find image file #1 for pdf}% - \else \gdef\pdfimgext{pdf}% - \fi - \else \gdef\pdfimgext{JPG}% - \fi - \else \gdef\pdfimgext{jpeg}% - \fi - \else \gdef\pdfimgext{jpg}% - \fi - \else \gdef\pdfimgext{png}% - \fi - \closein 1 - \endgroup - % - % without \immediate, pdftex seg faults when the same image is - % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.) - \ifnum\pdftexversion < 14 - \immediate\pdfimage - \else - \immediate\pdfximage - \fi - \ifdim \wd0 >0pt width \imagewidth \fi - \ifdim \wd2 >0pt height \imageheight \fi - \ifnum\pdftexversion<13 - #1.\pdfimgext - \else - {#1.\pdfimgext}% - \fi - \ifnum\pdftexversion < 14 \else - \pdfrefximage \pdflastximage - \fi} - % - \def\pdfmkdest#1{{% - % We have to set dummies so commands such as @code, and characters - % such as \, aren't expanded when present in a section title. - \indexnofonts - \turnoffactive - \activebackslashdouble - \makevalueexpandable - \def\pdfdestname{#1}% - \backslashparens\pdfdestname - \safewhatsit{\pdfdest name{\pdfdestname} xyz}% - }} - % - % used to mark target names; must be expandable. - \def\pdfmkpgn#1{#1} - % - % by default, use a color that is dark enough to print on paper as - % nearly black, but still distinguishable for online viewing. - % (Defined in pdfcolor.tex.) - \let\urlcolor = \BrickRed - \let\linkcolor = \BrickRed - \def\endlink{\Black\pdfendlink} - % - % Adding outlines to PDF; macros for calculating structure of outlines - % come from Petr Olsak - \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% - \else \csname#1\endcsname \fi} - \def\advancenumber#1{\tempnum=\expnumber{#1}\relax - \advance\tempnum by 1 - \expandafter\xdef\csname#1\endcsname{\the\tempnum}} - % - % #1 is the section text, which is what will be displayed in the - % outline by the pdf viewer. #2 is the pdf expression for the number - % of subentries (or empty, for subsubsections). #3 is the node text, - % which might be empty if this toc entry had no corresponding node. - % #4 is the page number - % - \def\dopdfoutline#1#2#3#4{% - % Generate a link to the node text if that exists; else, use the - % page number. We could generate a destination for the section - % text in the case where a section has no node, but it doesn't - % seem worth the trouble, since most documents are normally structured. - \def\pdfoutlinedest{#3}% - \ifx\pdfoutlinedest\empty - \def\pdfoutlinedest{#4}% - \else - % Doubled backslashes in the name. - {\activebackslashdouble \xdef\pdfoutlinedest{#3}% - \backslashparens\pdfoutlinedest}% - \fi - % - % Also double the backslashes in the display string. - {\activebackslashdouble \xdef\pdfoutlinetext{#1}% - \backslashparens\pdfoutlinetext}% - % - \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% - } - % - \def\pdfmakeoutlines{% - \begingroup - % Thanh's hack / proper braces in bookmarks - \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace - \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace - % - % Read toc silently, to get counts of subentries for \pdfoutline. - \def\numchapentry##1##2##3##4{% - \def\thischapnum{##2}% - \def\thissecnum{0}% - \def\thissubsecnum{0}% - }% - \def\numsecentry##1##2##3##4{% - \advancenumber{chap\thischapnum}% - \def\thissecnum{##2}% - \def\thissubsecnum{0}% - }% - \def\numsubsecentry##1##2##3##4{% - \advancenumber{sec\thissecnum}% - \def\thissubsecnum{##2}% - }% - \def\numsubsubsecentry##1##2##3##4{% - \advancenumber{subsec\thissubsecnum}% - }% - \def\thischapnum{0}% - \def\thissecnum{0}% - \def\thissubsecnum{0}% - % - % use \def rather than \let here because we redefine \chapentry et - % al. a second time, below. - \def\appentry{\numchapentry}% - \def\appsecentry{\numsecentry}% - \def\appsubsecentry{\numsubsecentry}% - \def\appsubsubsecentry{\numsubsubsecentry}% - \def\unnchapentry{\numchapentry}% - \def\unnsecentry{\numsecentry}% - \def\unnsubsecentry{\numsubsecentry}% - \def\unnsubsubsecentry{\numsubsubsecentry}% - \readdatafile{toc}% - % - % Read toc second time, this time actually producing the outlines. - % The `-' means take the \expnumber as the absolute number of - % subentries, which we calculated on our first read of the .toc above. - % - % We use the node names as the destinations. - \def\numchapentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% - \def\numsecentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}% - \def\numsubsecentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}% - \def\numsubsubsecentry##1##2##3##4{% count is always zero - \dopdfoutline{##1}{}{##3}{##4}}% - % - % PDF outlines are displayed using system fonts, instead of - % document fonts. Therefore we cannot use special characters, - % since the encoding is unknown. For example, the eogonek from - % Latin 2 (0xea) gets translated to a | character. Info from - % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100. - % - % xx to do this right, we have to translate 8-bit characters to - % their "best" equivalent, based on the @documentencoding. Right - % now, I guess we'll just let the pdf reader have its way. - \indexnofonts - \setupdatafile - \catcode`\\=\active \otherbackslash - \input \jobname.toc - \endgroup - } - % - \def\skipspaces#1{\def\PP{#1}\def\D{|}% - \ifx\PP\D\let\nextsp\relax - \else\let\nextsp\skipspaces - \ifx\p\space\else\addtokens{\filename}{\PP}% - \advance\filenamelength by 1 - \fi - \fi - \nextsp} - \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax} - \ifnum\pdftexversion < 14 - \let \startlink \pdfannotlink - \else - \let \startlink \pdfstartlink - \fi - % make a live url in pdf output. - \def\pdfurl#1{% - \begingroup - % it seems we really need yet another set of dummies; have not - % tried to figure out what each command should do in the context - % of @url. for now, just make @/ a no-op, that's the only one - % people have actually reported a problem with. - % - \normalturnoffactive - \def\@{@}% - \let\/=\empty - \makevalueexpandable - \leavevmode\urlcolor - \startlink attr{/Border [0 0 0]}% - user{/Subtype /Link /A << /S /URI /URI (#1) >>}% - \endgroup} - \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} - \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} - \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} - \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}} - \def\maketoks{% - \expandafter\poptoks\the\toksA|ENDTOKS|\relax - \ifx\first0\adn0 - \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3 - \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6 - \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 - \else - \ifnum0=\countA\else\makelink\fi - \ifx\first.\let\next=\done\else - \let\next=\maketoks - \addtokens{\toksB}{\the\toksD} - \ifx\first,\addtokens{\toksB}{\space}\fi - \fi - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \next} - \def\makelink{\addtokens{\toksB}% - {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} - \def\pdflink#1{% - \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} - \linkcolor #1\endlink} - \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} -\else - \let\pdfmkdest = \gobble - \let\pdfurl = \gobble - \let\endlink = \relax - \let\linkcolor = \relax - \let\pdfmakeoutlines = \relax -\fi % \ifx\pdfoutput - - -\message{fonts,} - -% Change the current font style to #1, remembering it in \curfontstyle. -% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in -% italics, not bold italics. -% -\def\setfontstyle#1{% - \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. - \csname ten#1\endcsname % change the current font -} - -% Select #1 fonts with the current style. -% -\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname} - -\def\rm{\fam=0 \setfontstyle{rm}} -\def\it{\fam=\itfam \setfontstyle{it}} -\def\sl{\fam=\slfam \setfontstyle{sl}} -\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} -\def\tt{\fam=\ttfam \setfontstyle{tt}} - -% Texinfo sort of supports the sans serif font style, which plain TeX does not. -% So we set up a \sf. -\newfam\sffam -\def\sf{\fam=\sffam \setfontstyle{sf}} -\let\li = \sf % Sometimes we call it \li, not \sf. - -% We don't need math for this font style. -\def\ttsl{\setfontstyle{ttsl}} - - -% Default leading. -\newdimen\textleading \textleading = 13.2pt - -% Set the baselineskip to #1, and the lineskip and strut size -% correspondingly. There is no deep meaning behind these magic numbers -% used as factors; they just match (closely enough) what Knuth defined. -% -\def\lineskipfactor{.08333} -\def\strutheightpercent{.70833} -\def\strutdepthpercent {.29167} -% -\def\setleading#1{% - \normalbaselineskip = #1\relax - \normallineskip = \lineskipfactor\normalbaselineskip - \normalbaselines - \setbox\strutbox =\hbox{% - \vrule width0pt height\strutheightpercent\baselineskip - depth \strutdepthpercent \baselineskip - }% -} - -% -% PDF CMaps. See also LaTeX's t1.cmap. -% -% \cmapOT1 -\ifpdf - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1-0) -%%Title: (TeX-OT1-0 TeX OT1 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1) -/Supplement 0 ->> def -/CMapName /TeX-OT1-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -8 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<23> <26> <0023> -<28> <3B> <0028> -<3F> <5B> <003F> -<5D> <5E> <005D> -<61> <7A> <0061> -<7B> <7C> <2013> -endbfrange -40 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <00660066> -<0C> <00660069> -<0D> <0066006C> -<0E> <006600660069> -<0F> <00660066006C> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<21> <0021> -<22> <201D> -<27> <2019> -<3C> <00A1> -<3D> <003D> -<3E> <00BF> -<5C> <201C> -<5F> <02D9> -<60> <2018> -<7D> <02DD> -<7E> <007E> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -% -% \cmapOT1IT - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1IT-0) -%%Title: (TeX-OT1IT-0 TeX OT1IT 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1IT) -/Supplement 0 ->> def -/CMapName /TeX-OT1IT-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -8 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<25> <26> <0025> -<28> <3B> <0028> -<3F> <5B> <003F> -<5D> <5E> <005D> -<61> <7A> <0061> -<7B> <7C> <2013> -endbfrange -42 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <00660066> -<0C> <00660069> -<0D> <0066006C> -<0E> <006600660069> -<0F> <00660066006C> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<21> <0021> -<22> <201D> -<23> <0023> -<24> <00A3> -<27> <2019> -<3C> <00A1> -<3D> <003D> -<3E> <00BF> -<5C> <201C> -<5F> <02D9> -<60> <2018> -<7D> <02DD> -<7E> <007E> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1IT\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -% -% \cmapOT1TT - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1TT-0) -%%Title: (TeX-OT1TT-0 TeX OT1TT 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1TT) -/Supplement 0 ->> def -/CMapName /TeX-OT1TT-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -5 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<21> <26> <0021> -<28> <5F> <0028> -<61> <7E> <0061> -endbfrange -32 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <2191> -<0C> <2193> -<0D> <0027> -<0E> <00A1> -<0F> <00BF> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<20> <2423> -<27> <2019> -<60> <2018> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1TT\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -\else - \expandafter\let\csname cmapOT1\endcsname\gobble - \expandafter\let\csname cmapOT1IT\endcsname\gobble - \expandafter\let\csname cmapOT1TT\endcsname\gobble -\fi - - -% Set the font macro #1 to the font named #2, adding on the -% specified font prefix (normally `cm'). -% #3 is the font's design size, #4 is a scale factor, #5 is the CMap -% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass -% empty to omit). -\def\setfont#1#2#3#4#5{% - \font#1=\fontprefix#2#3 scaled #4 - \csname cmap#5\endcsname#1% -} -% This is what gets called when #5 of \setfont is empty. -\let\cmap\gobble - - -% Use cm as the default font prefix. -% To specify the font prefix, you must define \fontprefix -% before you read in texinfo.tex. -\ifx\fontprefix\undefined -\def\fontprefix{cm} -\fi -% Support font families that don't use the same naming scheme as CM. -\def\rmshape{r} -\def\rmbshape{bx} %where the normal face is bold -\def\bfshape{b} -\def\bxshape{bx} -\def\ttshape{tt} -\def\ttbshape{tt} -\def\ttslshape{sltt} -\def\itshape{ti} -\def\itbshape{bxti} -\def\slshape{sl} -\def\slbshape{bxsl} -\def\sfshape{ss} -\def\sfbshape{ss} -\def\scshape{csc} -\def\scbshape{csc} - -% Definitions for a main text size of 11pt. This is the default in -% Texinfo. -% -\def\definetextfontsizexi{% -% Text fonts (11.2pt, magstep1). -\def\textnominalsize{11pt} -\edef\mainmagstep{\magstephalf} -\setfont\textrm\rmshape{10}{\mainmagstep}{OT1} -\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} -\setfont\textbf\bfshape{10}{\mainmagstep}{OT1} -\setfont\textit\itshape{10}{\mainmagstep}{OT1IT} -\setfont\textsl\slshape{10}{\mainmagstep}{OT1} -\setfont\textsf\sfshape{10}{\mainmagstep}{OT1} -\setfont\textsc\scshape{10}{\mainmagstep}{OT1} -\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} -\font\texti=cmmi10 scaled \mainmagstep -\font\textsy=cmsy10 scaled \mainmagstep - -% A few fonts for @defun names and args. -\setfont\defbf\bfshape{10}{\magstep1}{OT1} -\setfont\deftt\ttshape{10}{\magstep1}{OT1TT} -\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} - -% Fonts for indices, footnotes, small examples (9pt). -\def\smallnominalsize{9pt} -\setfont\smallrm\rmshape{9}{1000}{OT1} -\setfont\smalltt\ttshape{9}{1000}{OT1TT} -\setfont\smallbf\bfshape{10}{900}{OT1} -\setfont\smallit\itshape{9}{1000}{OT1IT} -\setfont\smallsl\slshape{9}{1000}{OT1} -\setfont\smallsf\sfshape{9}{1000}{OT1} -\setfont\smallsc\scshape{10}{900}{OT1} -\setfont\smallttsl\ttslshape{10}{900}{OT1TT} -\font\smalli=cmmi9 -\font\smallsy=cmsy9 - -% Fonts for small examples (8pt). -\def\smallernominalsize{8pt} -\setfont\smallerrm\rmshape{8}{1000}{OT1} -\setfont\smallertt\ttshape{8}{1000}{OT1TT} -\setfont\smallerbf\bfshape{10}{800}{OT1} -\setfont\smallerit\itshape{8}{1000}{OT1IT} -\setfont\smallersl\slshape{8}{1000}{OT1} -\setfont\smallersf\sfshape{8}{1000}{OT1} -\setfont\smallersc\scshape{10}{800}{OT1} -\setfont\smallerttsl\ttslshape{10}{800}{OT1TT} -\font\smalleri=cmmi8 -\font\smallersy=cmsy8 - -% Fonts for title page (20.4pt): -\def\titlenominalsize{20pt} -\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -\setfont\titleit\itbshape{10}{\magstep4}{OT1IT} -\setfont\titlesl\slbshape{10}{\magstep4}{OT1} -\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} -\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} -\setfont\titlesf\sfbshape{17}{\magstep1}{OT1} -\let\titlebf=\titlerm -\setfont\titlesc\scbshape{10}{\magstep4}{OT1} -\font\titlei=cmmi12 scaled \magstep3 -\font\titlesy=cmsy10 scaled \magstep4 -\def\authorrm{\secrm} -\def\authortt{\sectt} - -% Chapter (and unnumbered) fonts (17.28pt). -\def\chapnominalsize{17pt} -\setfont\chaprm\rmbshape{12}{\magstep2}{OT1} -\setfont\chapit\itbshape{10}{\magstep3}{OT1IT} -\setfont\chapsl\slbshape{10}{\magstep3}{OT1} -\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT} -\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT} -\setfont\chapsf\sfbshape{17}{1000}{OT1} -\let\chapbf=\chaprm -\setfont\chapsc\scbshape{10}{\magstep3}{OT1} -\font\chapi=cmmi12 scaled \magstep2 -\font\chapsy=cmsy10 scaled \magstep3 - -% Section fonts (14.4pt). -\def\secnominalsize{14pt} -\setfont\secrm\rmbshape{12}{\magstep1}{OT1} -\setfont\secit\itbshape{10}{\magstep2}{OT1IT} -\setfont\secsl\slbshape{10}{\magstep2}{OT1} -\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT} -\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT} -\setfont\secsf\sfbshape{12}{\magstep1}{OT1} -\let\secbf\secrm -\setfont\secsc\scbshape{10}{\magstep2}{OT1} -\font\seci=cmmi12 scaled \magstep1 -\font\secsy=cmsy10 scaled \magstep2 - -% Subsection fonts (13.15pt). -\def\ssecnominalsize{13pt} -\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1} -\setfont\ssecit\itbshape{10}{1315}{OT1IT} -\setfont\ssecsl\slbshape{10}{1315}{OT1} -\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT} -\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT} -\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1} -\let\ssecbf\ssecrm -\setfont\ssecsc\scbshape{10}{1315}{OT1} -\font\sseci=cmmi12 scaled \magstephalf -\font\ssecsy=cmsy10 scaled 1315 - -% Reduced fonts for @acro in text (10pt). -\def\reducednominalsize{10pt} -\setfont\reducedrm\rmshape{10}{1000}{OT1} -\setfont\reducedtt\ttshape{10}{1000}{OT1TT} -\setfont\reducedbf\bfshape{10}{1000}{OT1} -\setfont\reducedit\itshape{10}{1000}{OT1IT} -\setfont\reducedsl\slshape{10}{1000}{OT1} -\setfont\reducedsf\sfshape{10}{1000}{OT1} -\setfont\reducedsc\scshape{10}{1000}{OT1} -\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT} -\font\reducedi=cmmi10 -\font\reducedsy=cmsy10 - -% reset the current fonts -\textfonts -\rm -} % end of 11pt text font size definitions - - -% Definitions to make the main text be 10pt Computer Modern, with -% section, chapter, etc., sizes following suit. This is for the GNU -% Press printing of the Emacs 22 manual. Maybe other manuals in the -% future. Used with @smallbook, which sets the leading to 12pt. -% -\def\definetextfontsizex{% -% Text fonts (10pt). -\def\textnominalsize{10pt} -\edef\mainmagstep{1000} -\setfont\textrm\rmshape{10}{\mainmagstep}{OT1} -\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} -\setfont\textbf\bfshape{10}{\mainmagstep}{OT1} -\setfont\textit\itshape{10}{\mainmagstep}{OT1IT} -\setfont\textsl\slshape{10}{\mainmagstep}{OT1} -\setfont\textsf\sfshape{10}{\mainmagstep}{OT1} -\setfont\textsc\scshape{10}{\mainmagstep}{OT1} -\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} -\font\texti=cmmi10 scaled \mainmagstep -\font\textsy=cmsy10 scaled \mainmagstep - -% A few fonts for @defun names and args. -\setfont\defbf\bfshape{10}{\magstephalf}{OT1} -\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} -\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} - -% Fonts for indices, footnotes, small examples (9pt). -\def\smallnominalsize{9pt} -\setfont\smallrm\rmshape{9}{1000}{OT1} -\setfont\smalltt\ttshape{9}{1000}{OT1TT} -\setfont\smallbf\bfshape{10}{900}{OT1} -\setfont\smallit\itshape{9}{1000}{OT1IT} -\setfont\smallsl\slshape{9}{1000}{OT1} -\setfont\smallsf\sfshape{9}{1000}{OT1} -\setfont\smallsc\scshape{10}{900}{OT1} -\setfont\smallttsl\ttslshape{10}{900}{OT1TT} -\font\smalli=cmmi9 -\font\smallsy=cmsy9 - -% Fonts for small examples (8pt). -\def\smallernominalsize{8pt} -\setfont\smallerrm\rmshape{8}{1000}{OT1} -\setfont\smallertt\ttshape{8}{1000}{OT1TT} -\setfont\smallerbf\bfshape{10}{800}{OT1} -\setfont\smallerit\itshape{8}{1000}{OT1IT} -\setfont\smallersl\slshape{8}{1000}{OT1} -\setfont\smallersf\sfshape{8}{1000}{OT1} -\setfont\smallersc\scshape{10}{800}{OT1} -\setfont\smallerttsl\ttslshape{10}{800}{OT1TT} -\font\smalleri=cmmi8 -\font\smallersy=cmsy8 - -% Fonts for title page (20.4pt): -\def\titlenominalsize{20pt} -\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -\setfont\titleit\itbshape{10}{\magstep4}{OT1IT} -\setfont\titlesl\slbshape{10}{\magstep4}{OT1} -\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} -\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} -\setfont\titlesf\sfbshape{17}{\magstep1}{OT1} -\let\titlebf=\titlerm -\setfont\titlesc\scbshape{10}{\magstep4}{OT1} -\font\titlei=cmmi12 scaled \magstep3 -\font\titlesy=cmsy10 scaled \magstep4 -\def\authorrm{\secrm} -\def\authortt{\sectt} - -% Chapter fonts (14.4pt). -\def\chapnominalsize{14pt} -\setfont\chaprm\rmbshape{12}{\magstep1}{OT1} -\setfont\chapit\itbshape{10}{\magstep2}{OT1IT} -\setfont\chapsl\slbshape{10}{\magstep2}{OT1} -\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT} -\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT} -\setfont\chapsf\sfbshape{12}{\magstep1}{OT1} -\let\chapbf\chaprm -\setfont\chapsc\scbshape{10}{\magstep2}{OT1} -\font\chapi=cmmi12 scaled \magstep1 -\font\chapsy=cmsy10 scaled \magstep2 - -% Section fonts (12pt). -\def\secnominalsize{12pt} -\setfont\secrm\rmbshape{12}{1000}{OT1} -\setfont\secit\itbshape{10}{\magstep1}{OT1IT} -\setfont\secsl\slbshape{10}{\magstep1}{OT1} -\setfont\sectt\ttbshape{12}{1000}{OT1TT} -\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT} -\setfont\secsf\sfbshape{12}{1000}{OT1} -\let\secbf\secrm -\setfont\secsc\scbshape{10}{\magstep1}{OT1} -\font\seci=cmmi12 -\font\secsy=cmsy10 scaled \magstep1 - -% Subsection fonts (10pt). -\def\ssecnominalsize{10pt} -\setfont\ssecrm\rmbshape{10}{1000}{OT1} -\setfont\ssecit\itbshape{10}{1000}{OT1IT} -\setfont\ssecsl\slbshape{10}{1000}{OT1} -\setfont\ssectt\ttbshape{10}{1000}{OT1TT} -\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT} -\setfont\ssecsf\sfbshape{10}{1000}{OT1} -\let\ssecbf\ssecrm -\setfont\ssecsc\scbshape{10}{1000}{OT1} -\font\sseci=cmmi10 -\font\ssecsy=cmsy10 - -% Reduced fonts for @acro in text (9pt). -\def\reducednominalsize{9pt} -\setfont\reducedrm\rmshape{9}{1000}{OT1} -\setfont\reducedtt\ttshape{9}{1000}{OT1TT} -\setfont\reducedbf\bfshape{10}{900}{OT1} -\setfont\reducedit\itshape{9}{1000}{OT1IT} -\setfont\reducedsl\slshape{9}{1000}{OT1} -\setfont\reducedsf\sfshape{9}{1000}{OT1} -\setfont\reducedsc\scshape{10}{900}{OT1} -\setfont\reducedttsl\ttslshape{10}{900}{OT1TT} -\font\reducedi=cmmi9 -\font\reducedsy=cmsy9 - -% reduce space between paragraphs -\divide\parskip by 2 - -% reset the current fonts -\textfonts -\rm -} % end of 10pt text font size definitions - - -% We provide the user-level command -% @fonttextsize 10 -% (or 11) to redefine the text font size. pt is assumed. -% -\def\xword{10} -\def\xiword{11} -% -\parseargdef\fonttextsize{% - \def\textsizearg{#1}% - \wlog{doing @fonttextsize \textsizearg}% - % - % Set \globaldefs so that documents can use this inside @tex, since - % makeinfo 4.8 does not support it, but we need it nonetheless. - % - \begingroup \globaldefs=1 - \ifx\textsizearg\xword \definetextfontsizex - \else \ifx\textsizearg\xiword \definetextfontsizexi - \else - \errhelp=\EMsimple - \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'} - \fi\fi - \endgroup -} - - -% In order for the font changes to affect most math symbols and letters, -% we have to define the \textfont of the standard families. Since -% texinfo doesn't allow for producing subscripts and superscripts except -% in the main text, we don't bother to reset \scriptfont and -% \scriptscriptfont (which would also require loading a lot more fonts). -% -\def\resetmathfonts{% - \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy - \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf - \textfont\ttfam=\tentt \textfont\sffam=\tensf -} - -% The font-changing commands redefine the meanings of \tenSTYLE, instead -% of just \STYLE. We do this because \STYLE needs to also set the -% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire -% \tenSTYLE to set the current font. -% -% Each font-changing command also sets the names \lsize (one size lower) -% and \lllsize (three sizes lower). These relative commands are used in -% the LaTeX logo and acronyms. -% -% This all needs generalizing, badly. -% -\def\textfonts{% - \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl - \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc - \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy - \let\tenttsl=\textttsl - \def\curfontsize{text}% - \def\lsize{reduced}\def\lllsize{smaller}% - \resetmathfonts \setleading{\textleading}} -\def\titlefonts{% - \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl - \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc - \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy - \let\tenttsl=\titlettsl - \def\curfontsize{title}% - \def\lsize{chap}\def\lllsize{subsec}% - \resetmathfonts \setleading{25pt}} -\def\titlefont#1{{\titlefonts\rm #1}} -\def\chapfonts{% - \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl - \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc - \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy - \let\tenttsl=\chapttsl - \def\curfontsize{chap}% - \def\lsize{sec}\def\lllsize{text}% - \resetmathfonts \setleading{19pt}} -\def\secfonts{% - \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl - \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc - \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy - \let\tenttsl=\secttsl - \def\curfontsize{sec}% - \def\lsize{subsec}\def\lllsize{reduced}% - \resetmathfonts \setleading{16pt}} -\def\subsecfonts{% - \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl - \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc - \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy - \let\tenttsl=\ssecttsl - \def\curfontsize{ssec}% - \def\lsize{text}\def\lllsize{small}% - \resetmathfonts \setleading{15pt}} -\let\subsubsecfonts = \subsecfonts -\def\reducedfonts{% - \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl - \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc - \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy - \let\tenttsl=\reducedttsl - \def\curfontsize{reduced}% - \def\lsize{small}\def\lllsize{smaller}% - \resetmathfonts \setleading{10.5pt}} -\def\smallfonts{% - \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl - \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc - \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy - \let\tenttsl=\smallttsl - \def\curfontsize{small}% - \def\lsize{smaller}\def\lllsize{smaller}% - \resetmathfonts \setleading{10.5pt}} -\def\smallerfonts{% - \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl - \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc - \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy - \let\tenttsl=\smallerttsl - \def\curfontsize{smaller}% - \def\lsize{smaller}\def\lllsize{smaller}% - \resetmathfonts \setleading{9.5pt}} - -% Set the fonts to use with the @small... environments. -\let\smallexamplefonts = \smallfonts - -% About \smallexamplefonts. If we use \smallfonts (9pt), @smallexample -% can fit this many characters: -% 8.5x11=86 smallbook=72 a4=90 a5=69 -% If we use \scriptfonts (8pt), then we can fit this many characters: -% 8.5x11=90+ smallbook=80 a4=90+ a5=77 -% For me, subjectively, the few extra characters that fit aren't worth -% the additional smallness of 8pt. So I'm making the default 9pt. -% -% By the way, for comparison, here's what fits with @example (10pt): -% 8.5x11=71 smallbook=60 a4=75 a5=58 -% -% I wish the USA used A4 paper. -% --karl, 24jan03. - - -% Set up the default fonts, so we can use them for creating boxes. -% -\definetextfontsizexi - -% Define these so they can be easily changed for other fonts. -\def\angleleft{$\langle$} -\def\angleright{$\rangle$} - -% Count depth in font-changes, for error checks -\newcount\fontdepth \fontdepth=0 - -% Fonts for short table of contents. -\setfont\shortcontrm\rmshape{12}{1000}{OT1} -\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 -\setfont\shortcontsl\slshape{12}{1000}{OT1} -\setfont\shortconttt\ttshape{12}{1000}{OT1TT} - -%% Add scribe-like font environments, plus @l for inline lisp (usually sans -%% serif) and @ii for TeX italic - -% \smartitalic{ARG} outputs arg in italics, followed by an italic correction -% unless the following character is such as not to need one. -\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else - \ptexslash\fi\fi\fi} -\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx} -\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx} - -% like \smartslanted except unconditionally uses \ttsl. -% @var is set to this for defun arguments. -\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx} - -% like \smartslanted except unconditionally use \sl. We never want -% ttsl for book titles, do we? -\def\cite#1{{\sl #1}\futurelet\next\smartitalicx} - -\let\i=\smartitalic -\let\slanted=\smartslanted -\let\var=\smartslanted -\let\dfn=\smartslanted -\let\emph=\smartitalic - -% @b, explicit bold. -\def\b#1{{\bf #1}} -\let\strong=\b - -% @sansserif, explicit sans. -\def\sansserif#1{{\sf #1}} - -% We can't just use \exhyphenpenalty, because that only has effect at -% the end of a paragraph. Restore normal hyphenation at the end of the -% group within which \nohyphenation is presumably called. -% -\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation} -\def\restorehyphenation{\hyphenchar\font = `- } - -% Set sfcode to normal for the chars that usually have another value. -% Can't use plain's \frenchspacing because it uses the `\x notation, and -% sometimes \x has an active definition that messes things up. -% -\catcode`@=11 - \def\plainfrenchspacing{% - \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m - \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m - \def\endofsentencespacefactor{1000}% for @. and friends - } - \def\plainnonfrenchspacing{% - \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 - \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 - \def\endofsentencespacefactor{3000}% for @. and friends - } -\catcode`@=\other -\def\endofsentencespacefactor{3000}% default - -\def\t#1{% - {\tt \rawbackslash \plainfrenchspacing #1}% - \null -} -\def\samp#1{`\tclose{#1}'\null} -\setfont\keyrm\rmshape{8}{1000}{OT1} -\font\keysy=cmsy9 -\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% - \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% - \vbox{\hrule\kern-0.4pt - \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% - \kern-0.4pt\hrule}% - \kern-.06em\raise0.4pt\hbox{\angleright}}}} -\def\key #1{{\nohyphenation \uppercase{#1}}\null} -% The old definition, with no lozenge: -%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null} -\def\ctrl #1{{\tt \rawbackslash \hat}#1} - -% @file, @option are the same as @samp. -\let\file=\samp -\let\option=\samp - -% @code is a modification of @t, -% which makes spaces the same size as normal in the surrounding text. -\def\tclose#1{% - {% - % Change normal interword space to be same as for the current font. - \spaceskip = \fontdimen2\font - % - % Switch to typewriter. - \tt - % - % But `\ ' produces the large typewriter interword space. - \def\ {{\spaceskip = 0pt{} }}% - % - % Turn off hyphenation. - \nohyphenation - % - \rawbackslash - \plainfrenchspacing - #1% - }% - \null -} - -% We *must* turn on hyphenation at `-' and `_' in @code. -% Otherwise, it is too hard to avoid overfull hboxes -% in the Emacs manual, the Library manual, etc. - -% Unfortunately, TeX uses one parameter (\hyphenchar) to control -% both hyphenation at - and hyphenation within words. -% We must therefore turn them both off (\tclose does that) -% and arrange explicitly to hyphenate at a dash. -% -- rms. -{ - \catcode`\-=\active \catcode`\_=\active - \catcode`\'=\active \catcode`\`=\active - % - \global\def\code{\begingroup - \catcode\rquoteChar=\active \catcode\lquoteChar=\active - \let'\codequoteright \let`\codequoteleft - % - \catcode\dashChar=\active \catcode\underChar=\active - \ifallowcodebreaks - \let-\codedash - \let_\codeunder - \else - \let-\realdash - \let_\realunder - \fi - \codex - } -} - -\def\realdash{-} -\def\codedash{-\discretionary{}{}{}} -\def\codeunder{% - % this is all so @math{@code{var_name}+1} can work. In math mode, _ - % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.) - % will therefore expand the active definition of _, which is us - % (inside @code that is), therefore an endless loop. - \ifusingtt{\ifmmode - \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_. - \else\normalunderscore \fi - \discretionary{}{}{}}% - {\_}% -} -\def\codex #1{\tclose{#1}\endgroup} - -% An additional complication: the above will allow breaks after, e.g., -% each of the four underscores in __typeof__. This is undesirable in -% some manuals, especially if they don't have long identifiers in -% general. @allowcodebreaks provides a way to control this. -% -\newif\ifallowcodebreaks \allowcodebreakstrue - -\def\keywordtrue{true} -\def\keywordfalse{false} - -\parseargdef\allowcodebreaks{% - \def\txiarg{#1}% - \ifx\txiarg\keywordtrue - \allowcodebreakstrue - \else\ifx\txiarg\keywordfalse - \allowcodebreaksfalse - \else - \errhelp = \EMsimple - \errmessage{Unknown @allowcodebreaks option `\txiarg'}% - \fi\fi -} - -% @kbd is like @code, except that if the argument is just one @key command, -% then @kbd has no effect. - -% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), -% `example' (@kbd uses ttsl only inside of @example and friends), -% or `code' (@kbd uses normal tty font always). -\parseargdef\kbdinputstyle{% - \def\txiarg{#1}% - \ifx\txiarg\worddistinct - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% - \else\ifx\txiarg\wordexample - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% - \else\ifx\txiarg\wordcode - \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% - \else - \errhelp = \EMsimple - \errmessage{Unknown @kbdinputstyle option `\txiarg'}% - \fi\fi\fi -} -\def\worddistinct{distinct} -\def\wordexample{example} -\def\wordcode{code} - -% Default is `distinct.' -\kbdinputstyle distinct - -\def\xkey{\key} -\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% -\ifx\one\xkey\ifx\threex\three \key{#2}% -\else{\tclose{\kbdfont\look}}\fi -\else{\tclose{\kbdfont\look}}\fi} - -% For @indicateurl, @env, @command quotes seem unnecessary, so use \code. -\let\indicateurl=\code -\let\env=\code -\let\command=\code - -% @uref (abbreviation for `urlref') takes an optional (comma-separated) -% second argument specifying the text to display and an optional third -% arg as text to display instead of (rather than in addition to) the url -% itself. First (mandatory) arg is the url. Perhaps eventually put in -% a hypertex \special here. -% -\def\uref#1{\douref #1,,,\finish} -\def\douref#1,#2,#3,#4\finish{\begingroup - \unsepspaces - \pdfurl{#1}% - \setbox0 = \hbox{\ignorespaces #3}% - \ifdim\wd0 > 0pt - \unhbox0 % third arg given, show only that - \else - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \ifpdf - \unhbox0 % PDF: 2nd arg given, show only it - \else - \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url - \fi - \else - \code{#1}% only url given, so show it - \fi - \fi - \endlink -\endgroup} - -% @url synonym for @uref, since that's how everyone uses it. -% -\let\url=\uref - -% rms does not like angle brackets --karl, 17may97. -% So now @email is just like @uref, unless we are pdf. -% -%\def\email#1{\angleleft{\tt #1}\angleright} -\ifpdf - \def\email#1{\doemail#1,,\finish} - \def\doemail#1,#2,#3\finish{\begingroup - \unsepspaces - \pdfurl{mailto:#1}% - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi - \endlink - \endgroup} -\else - \let\email=\uref -\fi - -% Check if we are currently using a typewriter font. Since all the -% Computer Modern typewriter fonts have zero interword stretch (and -% shrink), and it is reasonable to expect all typewriter fonts to have -% this property, we can check that font parameter. -% -\def\ifmonospace{\ifdim\fontdimen3\font=0pt } - -% Typeset a dimension, e.g., `in' or `pt'. The only reason for the -% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. -% -\def\dmn#1{\thinspace #1} - -\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par} - -% @l was never documented to mean ``switch to the Lisp font'', -% and it is not used as such in any manual I can find. We need it for -% Polish suppressed-l. --karl, 22sep96. -%\def\l#1{{\li #1}\null} - -% Explicit font changes: @r, @sc, undocumented @ii. -\def\r#1{{\rm #1}} % roman font -\def\sc#1{{\smallcaps#1}} % smallcaps font -\def\ii#1{{\it #1}} % italic font - -% @acronym for "FBI", "NATO", and the like. -% We print this one point size smaller, since it's intended for -% all-uppercase. -% -\def\acronym#1{\doacronym #1,,\finish} -\def\doacronym#1,#2,#3\finish{% - {\selectfonts\lsize #1}% - \def\temp{#2}% - \ifx\temp\empty \else - \space ({\unsepspaces \ignorespaces \temp \unskip})% - \fi -} - -% @abbr for "Comput. J." and the like. -% No font change, but don't do end-of-sentence spacing. -% -\def\abbr#1{\doabbr #1,,\finish} -\def\doabbr#1,#2,#3\finish{% - {\plainfrenchspacing #1}% - \def\temp{#2}% - \ifx\temp\empty \else - \space ({\unsepspaces \ignorespaces \temp \unskip})% - \fi -} - -% @pounds{} is a sterling sign, which Knuth put in the CM italic font. -% -\def\pounds{{\it\$}} - -% @euro{} comes from a separate font, depending on the current style. -% We use the free feym* fonts from the eurosym package by Henrik -% Theiling, which support regular, slanted, bold and bold slanted (and -% "outlined" (blackboard board, sort of) versions, which we don't need). -% It is available from http://www.ctan.org/tex-archive/fonts/eurosym. -% -% Although only regular is the truly official Euro symbol, we ignore -% that. The Euro is designed to be slightly taller than the regular -% font height. -% -% feymr - regular -% feymo - slanted -% feybr - bold -% feybo - bold slanted -% -% There is no good (free) typewriter version, to my knowledge. -% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide. -% Hmm. -% -% Also doesn't work in math. Do we need to do math with euro symbols? -% Hope not. -% -% -\def\euro{{\eurofont e}} -\def\eurofont{% - % We set the font at each command, rather than predefining it in - % \textfonts and the other font-switching commands, so that - % installations which never need the symbol don't have to have the - % font installed. - % - % There is only one designed size (nominal 10pt), so we always scale - % that to the current nominal size. - % - % By the way, simply using "at 1em" works for cmr10 and the like, but - % does not work for cmbx10 and other extended/shrunken fonts. - % - \def\eurosize{\csname\curfontsize nominalsize\endcsname}% - % - \ifx\curfontstyle\bfstylename - % bold: - \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize - \else - % regular: - \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize - \fi - \thiseurofont -} - -% @registeredsymbol - R in a circle. The font for the R should really -% be smaller yet, but lllsize is the best we can do for now. -% Adapted from the plain.tex definition of \copyright. -% -\def\registeredsymbol{% - $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}% - \hfil\crcr\Orb}}% - }$% -} - -% @textdegree - the normal degrees sign. -% -\def\textdegree{$^\circ$} - -% Laurent Siebenmann reports \Orb undefined with: -% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 -% so we'll define it if necessary. -% -\ifx\Orb\undefined -\def\Orb{\mathhexbox20D} -\fi - - -\message{page headings,} - -\newskip\titlepagetopglue \titlepagetopglue = 1.5in -\newskip\titlepagebottomglue \titlepagebottomglue = 2pc - -% First the title page. Must do @settitle before @titlepage. -\newif\ifseenauthor -\newif\iffinishedtitlepage - -% Do an implicit @contents or @shortcontents after @end titlepage if the -% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage. -% -\newif\ifsetcontentsaftertitlepage - \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue -\newif\ifsetshortcontentsaftertitlepage - \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue - -\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% - \endgroup\page\hbox{}\page} - -\envdef\titlepage{% - % Open one extra group, as we want to close it in the middle of \Etitlepage. - \begingroup - \parindent=0pt \textfonts - % Leave some space at the very top of the page. - \vglue\titlepagetopglue - % No rule at page bottom unless we print one at the top with @title. - \finishedtitlepagetrue - % - % Most title ``pages'' are actually two pages long, with space - % at the top of the second. We don't want the ragged left on the second. - \let\oldpage = \page - \def\page{% - \iffinishedtitlepage\else - \finishtitlepage - \fi - \let\page = \oldpage - \page - \null - }% -} - -\def\Etitlepage{% - \iffinishedtitlepage\else - \finishtitlepage - \fi - % It is important to do the page break before ending the group, - % because the headline and footline are only empty inside the group. - % If we use the new definition of \page, we always get a blank page - % after the title page, which we certainly don't want. - \oldpage - \endgroup - % - % Need this before the \...aftertitlepage checks so that if they are - % in effect the toc pages will come out with page numbers. - \HEADINGSon - % - % If they want short, they certainly want long too. - \ifsetshortcontentsaftertitlepage - \shortcontents - \contents - \global\let\shortcontents = \relax - \global\let\contents = \relax - \fi - % - \ifsetcontentsaftertitlepage - \contents - \global\let\contents = \relax - \global\let\shortcontents = \relax - \fi -} - -\def\finishtitlepage{% - \vskip4pt \hrule height 2pt width \hsize - \vskip\titlepagebottomglue - \finishedtitlepagetrue -} - -%%% Macros to be used within @titlepage: - -\let\subtitlerm=\tenrm -\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} - -\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines - \let\tt=\authortt} - -\parseargdef\title{% - \checkenv\titlepage - \leftline{\titlefonts\rm #1} - % print a rule at the page bottom also. - \finishedtitlepagefalse - \vskip4pt \hrule height 4pt width \hsize \vskip4pt -} - -\parseargdef\subtitle{% - \checkenv\titlepage - {\subtitlefont \rightline{#1}}% -} - -% @author should come last, but may come many times. -% It can also be used inside @quotation. -% -\parseargdef\author{% - \def\temp{\quotation}% - \ifx\thisenv\temp - \def\quotationauthor{#1}% printed in \Equotation. - \else - \checkenv\titlepage - \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi - {\authorfont \leftline{#1}}% - \fi -} - - -%%% Set up page headings and footings. - -\let\thispage=\folio - -\newtoks\evenheadline % headline on even pages -\newtoks\oddheadline % headline on odd pages -\newtoks\evenfootline % footline on even pages -\newtoks\oddfootline % footline on odd pages - -% Now make TeX use those variables -\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline - \else \the\evenheadline \fi}} -\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline - \else \the\evenfootline \fi}\HEADINGShook} -\let\HEADINGShook=\relax - -% Commands to set those variables. -% For example, this is what @headings on does -% @evenheading @thistitle|@thispage|@thischapter -% @oddheading @thischapter|@thispage|@thistitle -% @evenfooting @thisfile|| -% @oddfooting ||@thisfile - - -\def\evenheading{\parsearg\evenheadingxxx} -\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish} -\def\evenheadingyyy #1\|#2\|#3\|#4\finish{% -\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\def\oddheading{\parsearg\oddheadingxxx} -\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish} -\def\oddheadingyyy #1\|#2\|#3\|#4\finish{% -\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}% - -\def\evenfooting{\parsearg\evenfootingxxx} -\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish} -\def\evenfootingyyy #1\|#2\|#3\|#4\finish{% -\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\def\oddfooting{\parsearg\oddfootingxxx} -\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish} -\def\oddfootingyyy #1\|#2\|#3\|#4\finish{% - \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}% - % - % Leave some space for the footline. Hopefully ok to assume - % @evenfooting will not be used by itself. - \global\advance\pageheight by -12pt - \global\advance\vsize by -12pt -} - -\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}} - - -% @headings double turns headings on for double-sided printing. -% @headings single turns headings on for single-sided printing. -% @headings off turns them off. -% @headings on same as @headings double, retained for compatibility. -% @headings after turns on double-sided headings after this page. -% @headings doubleafter turns on double-sided headings after this page. -% @headings singleafter turns on single-sided headings after this page. -% By default, they are off at the start of a document, -% and turned `on' after @end titlepage. - -\def\headings #1 {\csname HEADINGS#1\endcsname} - -\def\HEADINGSoff{% -\global\evenheadline={\hfil} \global\evenfootline={\hfil} -\global\oddheadline={\hfil} \global\oddfootline={\hfil}} -\HEADINGSoff -% When we turn headings on, set the page number to 1. -% For double-sided printing, put current file name in lower left corner, -% chapter name on inside top of right hand pages, document -% title on inside top of left hand pages, and page numbers on outside top -% edge of all pages. -\def\HEADINGSdouble{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chapoddpage -} -\let\contentsalignmacro = \chappager - -% For single-sided printing, chapter title goes across top left of page, -% page number on top right. -\def\HEADINGSsingle{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapter\hfil\folio}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chappager -} -\def\HEADINGSon{\HEADINGSdouble} - -\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex} -\let\HEADINGSdoubleafter=\HEADINGSafter -\def\HEADINGSdoublex{% -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chapoddpage -} - -\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex} -\def\HEADINGSsinglex{% -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapter\hfil\folio}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chappager -} - -% Subroutines used in generating headings -% This produces Day Month Year style of output. -% Only define if not already defined, in case a txi-??.tex file has set -% up a different format (e.g., txi-cs.tex does this). -\ifx\today\undefined -\def\today{% - \number\day\space - \ifcase\month - \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr - \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug - \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec - \fi - \space\number\year} -\fi - -% @settitle line... specifies the title of the document, for headings. -% It generates no output of its own. -\def\thistitle{\putwordNoTitle} -\def\settitle{\parsearg{\gdef\thistitle}} - - -\message{tables,} -% Tables -- @table, @ftable, @vtable, @item(x). - -% default indentation of table text -\newdimen\tableindent \tableindent=.8in -% default indentation of @itemize and @enumerate text -\newdimen\itemindent \itemindent=.3in -% margin between end of table item and start of table text. -\newdimen\itemmargin \itemmargin=.1in - -% used internally for \itemindent minus \itemmargin -\newdimen\itemmax - -% Note @table, @ftable, and @vtable define @item, @itemx, etc., with -% these defs. -% They also define \itemindex -% to index the item name in whatever manner is desired (perhaps none). - -\newif\ifitemxneedsnegativevskip - -\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi} - -\def\internalBitem{\smallbreak \parsearg\itemzzz} -\def\internalBitemx{\itemxpar \parsearg\itemzzz} - -\def\itemzzz #1{\begingroup % - \advance\hsize by -\rightskip - \advance\hsize by -\tableindent - \setbox0=\hbox{\itemindicate{#1}}% - \itemindex{#1}% - \nobreak % This prevents a break before @itemx. - % - % If the item text does not fit in the space we have, put it on a line - % by itself, and do not allow a page break either before or after that - % line. We do not start a paragraph here because then if the next - % command is, e.g., @kindex, the whatsit would get put into the - % horizontal list on a line by itself, resulting in extra blank space. - \ifdim \wd0>\itemmax - % - % Make this a paragraph so we get the \parskip glue and wrapping, - % but leave it ragged-right. - \begingroup - \advance\leftskip by-\tableindent - \advance\hsize by\tableindent - \advance\rightskip by0pt plus1fil - \leavevmode\unhbox0\par - \endgroup - % - % We're going to be starting a paragraph, but we don't want the - % \parskip glue -- logically it's part of the @item we just started. - \nobreak \vskip-\parskip - % - % Stop a page break at the \parskip glue coming up. However, if - % what follows is an environment such as @example, there will be no - % \parskip glue; then the negative vskip we just inserted would - % cause the example and the item to crash together. So we use this - % bizarre value of 10001 as a signal to \aboveenvbreak to insert - % \parskip glue after all. Section titles are handled this way also. - % - \penalty 10001 - \endgroup - \itemxneedsnegativevskipfalse - \else - % The item text fits into the space. Start a paragraph, so that the - % following text (if any) will end up on the same line. - \noindent - % Do this with kerns and \unhbox so that if there is a footnote in - % the item text, it can migrate to the main vertical list and - % eventually be printed. - \nobreak\kern-\tableindent - \dimen0 = \itemmax \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0 - \unhbox0 - \nobreak\kern\dimen0 - \endgroup - \itemxneedsnegativevskiptrue - \fi -} - -\def\item{\errmessage{@item while not in a list environment}} -\def\itemx{\errmessage{@itemx while not in a list environment}} - -% @table, @ftable, @vtable. -\envdef\table{% - \let\itemindex\gobble - \tablecheck{table}% -} -\envdef\ftable{% - \def\itemindex ##1{\doind {fn}{\code{##1}}}% - \tablecheck{ftable}% -} -\envdef\vtable{% - \def\itemindex ##1{\doind {vr}{\code{##1}}}% - \tablecheck{vtable}% -} -\def\tablecheck#1{% - \ifnum \the\catcode`\^^M=\active - \endgroup - \errmessage{This command won't work in this context; perhaps the problem is - that we are \inenvironment\thisenv}% - \def\next{\doignore{#1}}% - \else - \let\next\tablex - \fi - \next -} -\def\tablex#1{% - \def\itemindicate{#1}% - \parsearg\tabley -} -\def\tabley#1{% - {% - \makevalueexpandable - \edef\temp{\noexpand\tablez #1\space\space\space}% - \expandafter - }\temp \endtablez -} -\def\tablez #1 #2 #3 #4\endtablez{% - \aboveenvbreak - \ifnum 0#1>0 \advance \leftskip by #1\mil \fi - \ifnum 0#2>0 \tableindent=#2\mil \fi - \ifnum 0#3>0 \advance \rightskip by #3\mil \fi - \itemmax=\tableindent - \advance \itemmax by -\itemmargin - \advance \leftskip by \tableindent - \exdentamount=\tableindent - \parindent = 0pt - \parskip = \smallskipamount - \ifdim \parskip=0pt \parskip=2pt \fi - \let\item = \internalBitem - \let\itemx = \internalBitemx -} -\def\Etable{\endgraf\afterenvbreak} -\let\Eftable\Etable -\let\Evtable\Etable -\let\Eitemize\Etable -\let\Eenumerate\Etable - -% This is the counter used by @enumerate, which is really @itemize - -\newcount \itemno - -\envdef\itemize{\parsearg\doitemize} - -\def\doitemize#1{% - \aboveenvbreak - \itemmax=\itemindent - \advance\itemmax by -\itemmargin - \advance\leftskip by \itemindent - \exdentamount=\itemindent - \parindent=0pt - \parskip=\smallskipamount - \ifdim\parskip=0pt \parskip=2pt \fi - \def\itemcontents{#1}% - % @itemize with no arg is equivalent to @itemize @bullet. - \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi - \let\item=\itemizeitem -} - -% Definition of @item while inside @itemize and @enumerate. -% -\def\itemizeitem{% - \advance\itemno by 1 % for enumerations - {\let\par=\endgraf \smallbreak}% reasonable place to break - {% - % If the document has an @itemize directly after a section title, a - % \nobreak will be last on the list, and \sectionheading will have - % done a \vskip-\parskip. In that case, we don't want to zero - % parskip, or the item text will crash with the heading. On the - % other hand, when there is normal text preceding the item (as there - % usually is), we do want to zero parskip, or there would be too much - % space. In that case, we won't have a \nobreak before. At least - % that's the theory. - \ifnum\lastpenalty<10000 \parskip=0in \fi - \noindent - \hbox to 0pt{\hss \itemcontents \kern\itemmargin}% - \vadjust{\penalty 1200}}% not good to break after first line of item. - \flushcr -} - -% \splitoff TOKENS\endmark defines \first to be the first token in -% TOKENS, and \rest to be the remainder. -% -\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}% - -% Allow an optional argument of an uppercase letter, lowercase letter, -% or number, to specify the first label in the enumerated list. No -% argument is the same as `1'. -% -\envparseargdef\enumerate{\enumeratey #1 \endenumeratey} -\def\enumeratey #1 #2\endenumeratey{% - % If we were given no argument, pretend we were given `1'. - \def\thearg{#1}% - \ifx\thearg\empty \def\thearg{1}\fi - % - % Detect if the argument is a single token. If so, it might be a - % letter. Otherwise, the only valid thing it can be is a number. - % (We will always have one token, because of the test we just made. - % This is a good thing, since \splitoff doesn't work given nothing at - % all -- the first parameter is undelimited.) - \expandafter\splitoff\thearg\endmark - \ifx\rest\empty - % Only one token in the argument. It could still be anything. - % A ``lowercase letter'' is one whose \lccode is nonzero. - % An ``uppercase letter'' is one whose \lccode is both nonzero, and - % not equal to itself. - % Otherwise, we assume it's a number. - % - % We need the \relax at the end of the \ifnum lines to stop TeX from - % continuing to look for a . - % - \ifnum\lccode\expandafter`\thearg=0\relax - \numericenumerate % a number (we hope) - \else - % It's a letter. - \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax - \lowercaseenumerate % lowercase letter - \else - \uppercaseenumerate % uppercase letter - \fi - \fi - \else - % Multiple tokens in the argument. We hope it's a number. - \numericenumerate - \fi -} - -% An @enumerate whose labels are integers. The starting integer is -% given in \thearg. -% -\def\numericenumerate{% - \itemno = \thearg - \startenumeration{\the\itemno}% -} - -% The starting (lowercase) letter is in \thearg. -\def\lowercaseenumerate{% - \itemno = \expandafter`\thearg - \startenumeration{% - % Be sure we're not beyond the end of the alphabet. - \ifnum\itemno=0 - \errmessage{No more lowercase letters in @enumerate; get a bigger - alphabet}% - \fi - \char\lccode\itemno - }% -} - -% The starting (uppercase) letter is in \thearg. -\def\uppercaseenumerate{% - \itemno = \expandafter`\thearg - \startenumeration{% - % Be sure we're not beyond the end of the alphabet. - \ifnum\itemno=0 - \errmessage{No more uppercase letters in @enumerate; get a bigger - alphabet} - \fi - \char\uccode\itemno - }% -} - -% Call \doitemize, adding a period to the first argument and supplying the -% common last two arguments. Also subtract one from the initial value in -% \itemno, since @item increments \itemno. -% -\def\startenumeration#1{% - \advance\itemno by -1 - \doitemize{#1.}\flushcr -} - -% @alphaenumerate and @capsenumerate are abbreviations for giving an arg -% to @enumerate. -% -\def\alphaenumerate{\enumerate{a}} -\def\capsenumerate{\enumerate{A}} -\def\Ealphaenumerate{\Eenumerate} -\def\Ecapsenumerate{\Eenumerate} - - -% @multitable macros -% Amy Hendrickson, 8/18/94, 3/6/96 -% -% @multitable ... @end multitable will make as many columns as desired. -% Contents of each column will wrap at width given in preamble. Width -% can be specified either with sample text given in a template line, -% or in percent of \hsize, the current width of text on page. - -% Table can continue over pages but will only break between lines. - -% To make preamble: -% -% Either define widths of columns in terms of percent of \hsize: -% @multitable @columnfractions .25 .3 .45 -% @item ... -% -% Numbers following @columnfractions are the percent of the total -% current hsize to be used for each column. You may use as many -% columns as desired. - - -% Or use a template: -% @multitable {Column 1 template} {Column 2 template} {Column 3 template} -% @item ... -% using the widest term desired in each column. - -% Each new table line starts with @item, each subsequent new column -% starts with @tab. Empty columns may be produced by supplying @tab's -% with nothing between them for as many times as empty columns are needed, -% ie, @tab@tab@tab will produce two empty columns. - -% @item, @tab do not need to be on their own lines, but it will not hurt -% if they are. - -% Sample multitable: - -% @multitable {Column 1 template} {Column 2 template} {Column 3 template} -% @item first col stuff @tab second col stuff @tab third col -% @item -% first col stuff -% @tab -% second col stuff -% @tab -% third col -% @item first col stuff @tab second col stuff -% @tab Many paragraphs of text may be used in any column. -% -% They will wrap at the width determined by the template. -% @item@tab@tab This will be in third column. -% @end multitable - -% Default dimensions may be reset by user. -% @multitableparskip is vertical space between paragraphs in table. -% @multitableparindent is paragraph indent in table. -% @multitablecolmargin is horizontal space to be left between columns. -% @multitablelinespace is space to leave between table items, baseline -% to baseline. -% 0pt means it depends on current normal line spacing. -% -\newskip\multitableparskip -\newskip\multitableparindent -\newdimen\multitablecolspace -\newskip\multitablelinespace -\multitableparskip=0pt -\multitableparindent=6pt -\multitablecolspace=12pt -\multitablelinespace=0pt - -% Macros used to set up halign preamble: -% -\let\endsetuptable\relax -\def\xendsetuptable{\endsetuptable} -\let\columnfractions\relax -\def\xcolumnfractions{\columnfractions} -\newif\ifsetpercent - -% #1 is the @columnfraction, usually a decimal number like .5, but might -% be just 1. We just use it, whatever it is. -% -\def\pickupwholefraction#1 {% - \global\advance\colcount by 1 - \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}% - \setuptable -} - -\newcount\colcount -\def\setuptable#1{% - \def\firstarg{#1}% - \ifx\firstarg\xendsetuptable - \let\go = \relax - \else - \ifx\firstarg\xcolumnfractions - \global\setpercenttrue - \else - \ifsetpercent - \let\go\pickupwholefraction - \else - \global\advance\colcount by 1 - \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a - % separator; typically that is always in the input, anyway. - \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}% - \fi - \fi - \ifx\go\pickupwholefraction - % Put the argument back for the \pickupwholefraction call, so - % we'll always have a period there to be parsed. - \def\go{\pickupwholefraction#1}% - \else - \let\go = \setuptable - \fi% - \fi - \go -} - -% multitable-only commands. -% -% @headitem starts a heading row, which we typeset in bold. -% Assignments have to be global since we are inside the implicit group -% of an alignment entry. Note that \everycr resets \everytab. -\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}% -% -% A \tab used to include \hskip1sp. But then the space in a template -% line is not enough. That is bad. So let's go back to just `&' until -% we encounter the problem it was intended to solve again. -% --karl, nathan@acm.org, 20apr99. -\def\tab{\checkenv\multitable &\the\everytab}% - -% @multitable ... @end multitable definitions: -% -\newtoks\everytab % insert after every tab. -% -\envdef\multitable{% - \vskip\parskip - \startsavinginserts - % - % @item within a multitable starts a normal row. - % We use \def instead of \let so that if one of the multitable entries - % contains an @itemize, we don't choke on the \item (seen as \crcr aka - % \endtemplate) expanding \doitemize. - \def\item{\crcr}% - % - \tolerance=9500 - \hbadness=9500 - \setmultitablespacing - \parskip=\multitableparskip - \parindent=\multitableparindent - \overfullrule=0pt - \global\colcount=0 - % - \everycr = {% - \noalign{% - \global\everytab={}% - \global\colcount=0 % Reset the column counter. - % Check for saved footnotes, etc. - \checkinserts - % Keeps underfull box messages off when table breaks over pages. - %\filbreak - % Maybe so, but it also creates really weird page breaks when the - % table breaks over pages. Wouldn't \vfil be better? Wait until the - % problem manifests itself, so it can be fixed for real --karl. - }% - }% - % - \parsearg\domultitable -} -\def\domultitable#1{% - % To parse everything between @multitable and @item: - \setuptable#1 \endsetuptable - % - % This preamble sets up a generic column definition, which will - % be used as many times as user calls for columns. - % \vtop will set a single line and will also let text wrap and - % continue for many paragraphs if desired. - \halign\bgroup &% - \global\advance\colcount by 1 - \multistrut - \vtop{% - % Use the current \colcount to find the correct column width: - \hsize=\expandafter\csname col\the\colcount\endcsname - % - % In order to keep entries from bumping into each other - % we will add a \leftskip of \multitablecolspace to all columns after - % the first one. - % - % If a template has been used, we will add \multitablecolspace - % to the width of each template entry. - % - % If the user has set preamble in terms of percent of \hsize we will - % use that dimension as the width of the column, and the \leftskip - % will keep entries from bumping into each other. Table will start at - % left margin and final column will justify at right margin. - % - % Make sure we don't inherit \rightskip from the outer environment. - \rightskip=0pt - \ifnum\colcount=1 - % The first column will be indented with the surrounding text. - \advance\hsize by\leftskip - \else - \ifsetpercent \else - % If user has not set preamble in terms of percent of \hsize - % we will advance \hsize by \multitablecolspace. - \advance\hsize by \multitablecolspace - \fi - % In either case we will make \leftskip=\multitablecolspace: - \leftskip=\multitablecolspace - \fi - % Ignoring space at the beginning and end avoids an occasional spurious - % blank line, when TeX decides to break the line at the space before the - % box from the multistrut, so the strut ends up on a line by itself. - % For example: - % @multitable @columnfractions .11 .89 - % @item @code{#} - % @tab Legal holiday which is valid in major parts of the whole country. - % Is automatically provided with highlighting sequences respectively - % marking characters. - \noindent\ignorespaces##\unskip\multistrut - }\cr -} -\def\Emultitable{% - \crcr - \egroup % end the \halign - \global\setpercentfalse -} - -\def\setmultitablespacing{% - \def\multistrut{\strut}% just use the standard line spacing - % - % Compute \multitablelinespace (if not defined by user) for use in - % \multitableparskip calculation. We used define \multistrut based on - % this, but (ironically) that caused the spacing to be off. - % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. -\ifdim\multitablelinespace=0pt -\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip -\global\advance\multitablelinespace by-\ht0 -\fi -%% Test to see if parskip is larger than space between lines of -%% table. If not, do nothing. -%% If so, set to same dimension as multitablelinespace. -\ifdim\multitableparskip>\multitablelinespace -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller - %% than skip between lines in the table. -\fi% -\ifdim\multitableparskip=0pt -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller - %% than skip between lines in the table. -\fi} - - -\message{conditionals,} - -% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext, -% @ifnotxml always succeed. They currently do nothing; we don't -% attempt to check whether the conditionals are properly nested. But we -% have to remember that they are conditionals, so that @end doesn't -% attempt to close an environment group. -% -\def\makecond#1{% - \expandafter\let\csname #1\endcsname = \relax - \expandafter\let\csname iscond.#1\endcsname = 1 -} -\makecond{iftex} -\makecond{ifnotdocbook} -\makecond{ifnothtml} -\makecond{ifnotinfo} -\makecond{ifnotplaintext} -\makecond{ifnotxml} - -% Ignore @ignore, @ifhtml, @ifinfo, and the like. -% -\def\direntry{\doignore{direntry}} -\def\documentdescription{\doignore{documentdescription}} -\def\docbook{\doignore{docbook}} -\def\html{\doignore{html}} -\def\ifdocbook{\doignore{ifdocbook}} -\def\ifhtml{\doignore{ifhtml}} -\def\ifinfo{\doignore{ifinfo}} -\def\ifnottex{\doignore{ifnottex}} -\def\ifplaintext{\doignore{ifplaintext}} -\def\ifxml{\doignore{ifxml}} -\def\ignore{\doignore{ignore}} -\def\menu{\doignore{menu}} -\def\xml{\doignore{xml}} - -% Ignore text until a line `@end #1', keeping track of nested conditionals. -% -% A count to remember the depth of nesting. -\newcount\doignorecount - -\def\doignore#1{\begingroup - % Scan in ``verbatim'' mode: - \obeylines - \catcode`\@ = \other - \catcode`\{ = \other - \catcode`\} = \other - % - % Make sure that spaces turn into tokens that match what \doignoretext wants. - \spaceisspace - % - % Count number of #1's that we've seen. - \doignorecount = 0 - % - % Swallow text until we reach the matching `@end #1'. - \dodoignore{#1}% -} - -{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source. - \obeylines % - % - \gdef\dodoignore#1{% - % #1 contains the command name as a string, e.g., `ifinfo'. - % - % Define a command to find the next `@end #1'. - \long\def\doignoretext##1^^M@end #1{% - \doignoretextyyy##1^^M@#1\_STOP_}% - % - % And this command to find another #1 command, at the beginning of a - % line. (Otherwise, we would consider a line `@c @ifset', for - % example, to count as an @ifset for nesting.) - \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}% - % - % And now expand that command. - \doignoretext ^^M% - }% -} - -\def\doignoreyyy#1{% - \def\temp{#1}% - \ifx\temp\empty % Nothing found. - \let\next\doignoretextzzz - \else % Found a nested condition, ... - \advance\doignorecount by 1 - \let\next\doignoretextyyy % ..., look for another. - % If we're here, #1 ends with ^^M\ifinfo (for example). - \fi - \next #1% the token \_STOP_ is present just after this macro. -} - -% We have to swallow the remaining "\_STOP_". -% -\def\doignoretextzzz#1{% - \ifnum\doignorecount = 0 % We have just found the outermost @end. - \let\next\enddoignore - \else % Still inside a nested condition. - \advance\doignorecount by -1 - \let\next\doignoretext % Look for the next @end. - \fi - \next -} - -% Finish off ignored text. -{ \obeylines% - % Ignore anything after the last `@end #1'; this matters in verbatim - % environments, where otherwise the newline after an ignored conditional - % would result in a blank line in the output. - \gdef\enddoignore#1^^M{\endgroup\ignorespaces}% -} - - -% @set VAR sets the variable VAR to an empty value. -% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. -% -% Since we want to separate VAR from REST-OF-LINE (which might be -% empty), we can't just use \parsearg; we have to insert a space of our -% own to delimit the rest of the line, and then take it out again if we -% didn't need it. -% We rely on the fact that \parsearg sets \catcode`\ =10. -% -\parseargdef\set{\setyyy#1 \endsetyyy} -\def\setyyy#1 #2\endsetyyy{% - {% - \makevalueexpandable - \def\temp{#2}% - \edef\next{\gdef\makecsname{SET#1}}% - \ifx\temp\empty - \next{}% - \else - \setzzz#2\endsetzzz - \fi - }% -} -% Remove the trailing space \setxxx inserted. -\def\setzzz#1 \endsetzzz{\next{#1}} - -% @clear VAR clears (i.e., unsets) the variable VAR. -% -\parseargdef\clear{% - {% - \makevalueexpandable - \global\expandafter\let\csname SET#1\endcsname=\relax - }% -} - -% @value{foo} gets the text saved in variable foo. -\def\value{\begingroup\makevalueexpandable\valuexxx} -\def\valuexxx#1{\expandablevalue{#1}\endgroup} -{ - \catcode`\- = \active \catcode`\_ = \active - % - \gdef\makevalueexpandable{% - \let\value = \expandablevalue - % We don't want these characters active, ... - \catcode`\-=\other \catcode`\_=\other - % ..., but we might end up with active ones in the argument if - % we're called from @code, as @code{@value{foo-bar_}}, though. - % So \let them to their normal equivalents. - \let-\realdash \let_\normalunderscore - } -} - -% We have this subroutine so that we can handle at least some @value's -% properly in indexes (we call \makevalueexpandable in \indexdummies). -% The command has to be fully expandable (if the variable is set), since -% the result winds up in the index file. This means that if the -% variable's value contains other Texinfo commands, it's almost certain -% it will fail (although perhaps we could fix that with sufficient work -% to do a one-level expansion on the result, instead of complete). -% -\def\expandablevalue#1{% - \expandafter\ifx\csname SET#1\endcsname\relax - {[No value for ``#1'']}% - \message{Variable `#1', used in @value, is not set.}% - \else - \csname SET#1\endcsname - \fi -} - -% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined -% with @set. -% -% To get special treatment of `@end ifset,' call \makeond and the redefine. -% -\makecond{ifset} -\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}} -\def\doifset#1#2{% - {% - \makevalueexpandable - \let\next=\empty - \expandafter\ifx\csname SET#2\endcsname\relax - #1% If not set, redefine \next. - \fi - \expandafter - }\next -} -\def\ifsetfail{\doignore{ifset}} - -% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been -% defined with @set, or has been undefined with @clear. -% -% The `\else' inside the `\doifset' parameter is a trick to reuse the -% above code: if the variable is not set, do nothing, if it is set, -% then redefine \next to \ifclearfail. -% -\makecond{ifclear} -\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}} -\def\ifclearfail{\doignore{ifclear}} - -% @dircategory CATEGORY -- specify a category of the dir file -% which this file should belong to. Ignore this in TeX. -\let\dircategory=\comment - -% @defininfoenclose. -\let\definfoenclose=\comment - - -\message{indexing,} -% Index generation facilities - -% Define \newwrite to be identical to plain tex's \newwrite -% except not \outer, so it can be used within macros and \if's. -\edef\newwrite{\makecsname{ptexnewwrite}} - -% \newindex {foo} defines an index named foo. -% It automatically defines \fooindex such that -% \fooindex ...rest of line... puts an entry in the index foo. -% It also defines \fooindfile to be the number of the output channel for -% the file that accumulates this index. The file's extension is foo. -% The name of an index should be no more than 2 characters long -% for the sake of vms. -% -\def\newindex#1{% - \iflinks - \expandafter\newwrite \csname#1indfile\endcsname - \openout \csname#1indfile\endcsname \jobname.#1 % Open the file - \fi - \expandafter\xdef\csname#1index\endcsname{% % Define @#1index - \noexpand\doindex{#1}} -} - -% @defindex foo == \newindex{foo} -% -\def\defindex{\parsearg\newindex} - -% Define @defcodeindex, like @defindex except put all entries in @code. -% -\def\defcodeindex{\parsearg\newcodeindex} -% -\def\newcodeindex#1{% - \iflinks - \expandafter\newwrite \csname#1indfile\endcsname - \openout \csname#1indfile\endcsname \jobname.#1 - \fi - \expandafter\xdef\csname#1index\endcsname{% - \noexpand\docodeindex{#1}}% -} - - -% @synindex foo bar makes index foo feed into index bar. -% Do this instead of @defindex foo if you don't want it as a separate index. -% -% @syncodeindex foo bar similar, but put all entries made for index foo -% inside @code. -% -\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}} -\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}} - -% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo), -% #3 the target index (bar). -\def\dosynindex#1#2#3{% - % Only do \closeout if we haven't already done it, else we'll end up - % closing the target index. - \expandafter \ifx\csname donesynindex#2\endcsname \undefined - % The \closeout helps reduce unnecessary open files; the limit on the - % Acorn RISC OS is a mere 16 files. - \expandafter\closeout\csname#2indfile\endcsname - \expandafter\let\csname\donesynindex#2\endcsname = 1 - \fi - % redefine \fooindfile: - \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname - \expandafter\let\csname#2indfile\endcsname=\temp - % redefine \fooindex: - \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}% -} - -% Define \doindex, the driver for all \fooindex macros. -% Argument #1 is generated by the calling \fooindex macro, -% and it is "foo", the name of the index. - -% \doindex just uses \parsearg; it calls \doind for the actual work. -% This is because \doind is more useful to call from other macros. - -% There is also \dosubind {index}{topic}{subtopic} -% which makes an entry in a two-level index such as the operation index. - -\def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer} -\def\singleindexer #1{\doind{\indexname}{#1}} - -% like the previous two, but they put @code around the argument. -\def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer} -\def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}} - -% Take care of Texinfo commands that can appear in an index entry. -% Since there are some commands we want to expand, and others we don't, -% we have to laboriously prevent expansion for those that we don't. -% -\def\indexdummies{% - \escapechar = `\\ % use backslash in output files. - \def\@{@}% change to @@ when we switch to @ as escape char in index files. - \def\ {\realbackslash\space }% - % - % Need these in case \tex is in effect and \{ is a \delimiter again. - % But can't use \lbracecmd and \rbracecmd because texindex assumes - % braces and backslashes are used only as delimiters. - \let\{ = \mylbrace - \let\} = \myrbrace - % - % I don't entirely understand this, but when an index entry is - % generated from a macro call, the \endinput which \scanmacro inserts - % causes processing to be prematurely terminated. This is, - % apparently, because \indexsorttmp is fully expanded, and \endinput - % is an expandable command. The redefinition below makes \endinput - % disappear altogether for that purpose -- although logging shows that - % processing continues to some further point. On the other hand, it - % seems \endinput does not hurt in the printed index arg, since that - % is still getting written without apparent harm. - % - % Sample source (mac-idx3.tex, reported by Graham Percival to - % help-texinfo, 22may06): - % @macro funindex {WORD} - % @findex xyz - % @end macro - % ... - % @funindex commtest - % - % The above is not enough to reproduce the bug, but it gives the flavor. - % - % Sample whatsit resulting: - % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} - % - % So: - \let\endinput = \empty - % - % Do the redefinitions. - \commondummies -} - -% For the aux and toc files, @ is the escape character. So we want to -% redefine everything using @ as the escape character (instead of -% \realbackslash, still used for index files). When everything uses @, -% this will be simpler. -% -\def\atdummies{% - \def\@{@@}% - \def\ {@ }% - \let\{ = \lbraceatcmd - \let\} = \rbraceatcmd - % - % Do the redefinitions. - \commondummies - \otherbackslash -} - -% Called from \indexdummies and \atdummies. -% -\def\commondummies{% - % - % \definedummyword defines \#1 as \string\#1\space, thus effectively - % preventing its expansion. This is used only for control% words, - % not control letters, because the \space would be incorrect for - % control characters, but is needed to separate the control word - % from whatever follows. - % - % For control letters, we have \definedummyletter, which omits the - % space. - % - % These can be used both for control words that take an argument and - % those that do not. If it is followed by {arg} in the input, then - % that will dutifully get written to the index (or wherever). - % - \def\definedummyword ##1{\def##1{\string##1\space}}% - \def\definedummyletter##1{\def##1{\string##1}}% - \let\definedummyaccent\definedummyletter - % - \commondummiesnofonts - % - \definedummyletter\_% - % - % Non-English letters. - \definedummyword\AA - \definedummyword\AE - \definedummyword\L - \definedummyword\OE - \definedummyword\O - \definedummyword\aa - \definedummyword\ae - \definedummyword\l - \definedummyword\oe - \definedummyword\o - \definedummyword\ss - \definedummyword\exclamdown - \definedummyword\questiondown - \definedummyword\ordf - \definedummyword\ordm - % - % Although these internal commands shouldn't show up, sometimes they do. - \definedummyword\bf - \definedummyword\gtr - \definedummyword\hat - \definedummyword\less - \definedummyword\sf - \definedummyword\sl - \definedummyword\tclose - \definedummyword\tt - % - \definedummyword\LaTeX - \definedummyword\TeX - % - % Assorted special characters. - \definedummyword\bullet - \definedummyword\comma - \definedummyword\copyright - \definedummyword\registeredsymbol - \definedummyword\dots - \definedummyword\enddots - \definedummyword\equiv - \definedummyword\error - \definedummyword\euro - \definedummyword\expansion - \definedummyword\minus - \definedummyword\pounds - \definedummyword\point - \definedummyword\print - \definedummyword\result - \definedummyword\textdegree - % - % We want to disable all macros so that they are not expanded by \write. - \macrolist - % - \normalturnoffactive - % - % Handle some cases of @value -- where it does not contain any - % (non-fully-expandable) commands. - \makevalueexpandable -} - -% \commondummiesnofonts: common to \commondummies and \indexnofonts. -% -\def\commondummiesnofonts{% - % Control letters and accents. - \definedummyletter\!% - \definedummyaccent\"% - \definedummyaccent\'% - \definedummyletter\*% - \definedummyaccent\,% - \definedummyletter\.% - \definedummyletter\/% - \definedummyletter\:% - \definedummyaccent\=% - \definedummyletter\?% - \definedummyaccent\^% - \definedummyaccent\`% - \definedummyaccent\~% - \definedummyword\u - \definedummyword\v - \definedummyword\H - \definedummyword\dotaccent - \definedummyword\ringaccent - \definedummyword\tieaccent - \definedummyword\ubaraccent - \definedummyword\udotaccent - \definedummyword\dotless - % - % Texinfo font commands. - \definedummyword\b - \definedummyword\i - \definedummyword\r - \definedummyword\sc - \definedummyword\t - % - % Commands that take arguments. - \definedummyword\acronym - \definedummyword\cite - \definedummyword\code - \definedummyword\command - \definedummyword\dfn - \definedummyword\emph - \definedummyword\env - \definedummyword\file - \definedummyword\kbd - \definedummyword\key - \definedummyword\math - \definedummyword\option - \definedummyword\pxref - \definedummyword\ref - \definedummyword\samp - \definedummyword\strong - \definedummyword\tie - \definedummyword\uref - \definedummyword\url - \definedummyword\var - \definedummyword\verb - \definedummyword\w - \definedummyword\xref -} - -% \indexnofonts is used when outputting the strings to sort the index -% by, and when constructing control sequence names. It eliminates all -% control sequences and just writes whatever the best ASCII sort string -% would be for a given command (usually its argument). -% -\def\indexnofonts{% - % Accent commands should become @asis. - \def\definedummyaccent##1{\let##1\asis}% - % We can just ignore other control letters. - \def\definedummyletter##1{\let##1\empty}% - % Hopefully, all control words can become @asis. - \let\definedummyword\definedummyaccent - % - \commondummiesnofonts - % - % Don't no-op \tt, since it isn't a user-level command - % and is used in the definitions of the active chars like <, >, |, etc. - % Likewise with the other plain tex font commands. - %\let\tt=\asis - % - \def\ { }% - \def\@{@}% - % how to handle braces? - \def\_{\normalunderscore}% - % - % Non-English letters. - \def\AA{AA}% - \def\AE{AE}% - \def\L{L}% - \def\OE{OE}% - \def\O{O}% - \def\aa{aa}% - \def\ae{ae}% - \def\l{l}% - \def\oe{oe}% - \def\o{o}% - \def\ss{ss}% - \def\exclamdown{!}% - \def\questiondown{?}% - \def\ordf{a}% - \def\ordm{o}% - % - \def\LaTeX{LaTeX}% - \def\TeX{TeX}% - % - % Assorted special characters. - % (The following {} will end up in the sort string, but that's ok.) - \def\bullet{bullet}% - \def\comma{,}% - \def\copyright{copyright}% - \def\registeredsymbol{R}% - \def\dots{...}% - \def\enddots{...}% - \def\equiv{==}% - \def\error{error}% - \def\euro{euro}% - \def\expansion{==>}% - \def\minus{-}% - \def\pounds{pounds}% - \def\point{.}% - \def\print{-|}% - \def\result{=>}% - \def\textdegree{degrees}% - % - % We need to get rid of all macros, leaving only the arguments (if present). - % Of course this is not nearly correct, but it is the best we can do for now. - % makeinfo does not expand macros in the argument to @deffn, which ends up - % writing an index entry, and texindex isn't prepared for an index sort entry - % that starts with \. - % - % Since macro invocations are followed by braces, we can just redefine them - % to take a single TeX argument. The case of a macro invocation that - % goes to end-of-line is not handled. - % - \macrolist -} - -\let\indexbackslash=0 %overridden during \printindex. -\let\SETmarginindex=\relax % put index entries in margin (undocumented)? - -% Most index entries go through here, but \dosubind is the general case. -% #1 is the index name, #2 is the entry text. -\def\doind#1#2{\dosubind{#1}{#2}{}} - -% Workhorse for all \fooindexes. -% #1 is name of index, #2 is stuff to put there, #3 is subentry -- -% empty if called from \doind, as we usually are (the main exception -% is with most defuns, which call us directly). -% -\def\dosubind#1#2#3{% - \iflinks - {% - % Store the main index entry text (including the third arg). - \toks0 = {#2}% - % If third arg is present, precede it with a space. - \def\thirdarg{#3}% - \ifx\thirdarg\empty \else - \toks0 = \expandafter{\the\toks0 \space #3}% - \fi - % - \edef\writeto{\csname#1indfile\endcsname}% - % - \safewhatsit\dosubindwrite - }% - \fi -} - -% Write the entry in \toks0 to the index file: -% -\def\dosubindwrite{% - % Put the index entry in the margin if desired. - \ifx\SETmarginindex\relax\else - \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}% - \fi - % - % Remember, we are within a group. - \indexdummies % Must do this here, since \bf, etc expand at this stage - \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now - % so it will be output as is; and it will print as backslash. - % - % Process the index entry with all font commands turned off, to - % get the string to sort by. - {\indexnofonts - \edef\temp{\the\toks0}% need full expansion - \xdef\indexsorttmp{\temp}% - }% - % - % Set up the complete index entry, with both the sort key and - % the original text, including any font commands. We write - % three arguments to \entry to the .?? file (four in the - % subentry case), texindex reduces to two when writing the .??s - % sorted result. - \edef\temp{% - \write\writeto{% - \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}% - }% - \temp -} - -% Take care of unwanted page breaks/skips around a whatsit: -% -% If a skip is the last thing on the list now, preserve it -% by backing up by \lastskip, doing the \write, then inserting -% the skip again. Otherwise, the whatsit generated by the -% \write or \pdfdest will make \lastskip zero. The result is that -% sequences like this: -% @end defun -% @tindex whatever -% @defun ... -% will have extra space inserted, because the \medbreak in the -% start of the @defun won't see the skip inserted by the @end of -% the previous defun. -% -% But don't do any of this if we're not in vertical mode. We -% don't want to do a \vskip and prematurely end a paragraph. -% -% Avoid page breaks due to these extra skips, too. -% -% But wait, there is a catch there: -% We'll have to check whether \lastskip is zero skip. \ifdim is not -% sufficient for this purpose, as it ignores stretch and shrink parts -% of the skip. The only way seems to be to check the textual -% representation of the skip. -% -% The following is almost like \def\zeroskipmacro{0.0pt} except that -% the ``p'' and ``t'' characters have catcode \other, not 11 (letter). -% -\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname} -% -\newskip\whatsitskip -\newcount\whatsitpenalty -% -% ..., ready, GO: -% -\def\safewhatsit#1{% -\ifhmode - #1% -\else - % \lastskip and \lastpenalty cannot both be nonzero simultaneously. - \whatsitskip = \lastskip - \edef\lastskipmacro{\the\lastskip}% - \whatsitpenalty = \lastpenalty - % - % If \lastskip is nonzero, that means the last item was a - % skip. And since a skip is discardable, that means this - % -\skip0 glue we're inserting is preceded by a - % non-discardable item, therefore it is not a potential - % breakpoint, therefore no \nobreak needed. - \ifx\lastskipmacro\zeroskipmacro - \else - \vskip-\whatsitskip - \fi - % - #1% - % - \ifx\lastskipmacro\zeroskipmacro - % If \lastskip was zero, perhaps the last item was a penalty, and - % perhaps it was >=10000, e.g., a \nobreak. In that case, we want - % to re-insert the same penalty (values >10000 are used for various - % signals); since we just inserted a non-discardable item, any - % following glue (such as a \parskip) would be a breakpoint. For example: - % - % @deffn deffn-whatever - % @vindex index-whatever - % Description. - % would allow a break between the index-whatever whatsit - % and the "Description." paragraph. - \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi - \else - % On the other hand, if we had a nonzero \lastskip, - % this make-up glue would be preceded by a non-discardable item - % (the whatsit from the \write), so we must insert a \nobreak. - \nobreak\vskip\whatsitskip - \fi -\fi -} - -% The index entry written in the file actually looks like -% \entry {sortstring}{page}{topic} -% or -% \entry {sortstring}{page}{topic}{subtopic} -% The texindex program reads in these files and writes files -% containing these kinds of lines: -% \initial {c} -% before the first topic whose initial is c -% \entry {topic}{pagelist} -% for a topic that is used without subtopics -% \primary {topic} -% for the beginning of a topic that is used with subtopics -% \secondary {subtopic}{pagelist} -% for each subtopic. - -% Define the user-accessible indexing commands -% @findex, @vindex, @kindex, @cindex. - -\def\findex {\fnindex} -\def\kindex {\kyindex} -\def\cindex {\cpindex} -\def\vindex {\vrindex} -\def\tindex {\tpindex} -\def\pindex {\pgindex} - -\def\cindexsub {\begingroup\obeylines\cindexsub} -{\obeylines % -\gdef\cindexsub "#1" #2^^M{\endgroup % -\dosubind{cp}{#2}{#1}}} - -% Define the macros used in formatting output of the sorted index material. - -% @printindex causes a particular index (the ??s file) to get printed. -% It does not print any chapter heading (usually an @unnumbered). -% -\parseargdef\printindex{\begingroup - \dobreak \chapheadingskip{10000}% - % - \smallfonts \rm - \tolerance = 9500 - \plainfrenchspacing - \everypar = {}% don't want the \kern\-parindent from indentation suppression. - % - % See if the index file exists and is nonempty. - % Change catcode of @ here so that if the index file contains - % \initial {@} - % as its first line, TeX doesn't complain about mismatched braces - % (because it thinks @} is a control sequence). - \catcode`\@ = 11 - \openin 1 \jobname.#1s - \ifeof 1 - % \enddoublecolumns gets confused if there is no text in the index, - % and it loses the chapter title and the aux file entries for the - % index. The easiest way to prevent this problem is to make sure - % there is some text. - \putwordIndexNonexistent - \else - % - % If the index file exists but is empty, then \openin leaves \ifeof - % false. We have to make TeX try to read something from the file, so - % it can discover if there is anything in it. - \read 1 to \temp - \ifeof 1 - \putwordIndexIsEmpty - \else - % Index files are almost Texinfo source, but we use \ as the escape - % character. It would be better to use @, but that's too big a change - % to make right now. - \def\indexbackslash{\backslashcurfont}% - \catcode`\\ = 0 - \escapechar = `\\ - \begindoublecolumns - \input \jobname.#1s - \enddoublecolumns - \fi - \fi - \closein 1 -\endgroup} - -% These macros are used by the sorted index file itself. -% Change them to control the appearance of the index. - -\def\initial#1{{% - % Some minor font changes for the special characters. - \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt - % - % Remove any glue we may have, we'll be inserting our own. - \removelastskip - % - % We like breaks before the index initials, so insert a bonus. - \nobreak - \vskip 0pt plus 3\baselineskip - \penalty 0 - \vskip 0pt plus -3\baselineskip - % - % Typeset the initial. Making this add up to a whole number of - % baselineskips increases the chance of the dots lining up from column - % to column. It still won't often be perfect, because of the stretch - % we need before each entry, but it's better. - % - % No shrink because it confuses \balancecolumns. - \vskip 1.67\baselineskip plus .5\baselineskip - \leftline{\secbf #1}% - % Do our best not to break after the initial. - \nobreak - \vskip .33\baselineskip plus .1\baselineskip -}} - -% \entry typesets a paragraph consisting of the text (#1), dot leaders, and -% then page number (#2) flushed to the right margin. It is used for index -% and table of contents entries. The paragraph is indented by \leftskip. -% -% A straightforward implementation would start like this: -% \def\entry#1#2{... -% But this frozes the catcodes in the argument, and can cause problems to -% @code, which sets - active. This problem was fixed by a kludge--- -% ``-'' was active throughout whole index, but this isn't really right. -% -% The right solution is to prevent \entry from swallowing the whole text. -% --kasal, 21nov03 -\def\entry{% - \begingroup - % - % Start a new paragraph if necessary, so our assignments below can't - % affect previous text. - \par - % - % Do not fill out the last line with white space. - \parfillskip = 0in - % - % No extra space above this paragraph. - \parskip = 0in - % - % Do not prefer a separate line ending with a hyphen to fewer lines. - \finalhyphendemerits = 0 - % - % \hangindent is only relevant when the entry text and page number - % don't both fit on one line. In that case, bob suggests starting the - % dots pretty far over on the line. Unfortunately, a large - % indentation looks wrong when the entry text itself is broken across - % lines. So we use a small indentation and put up with long leaders. - % - % \hangafter is reset to 1 (which is the value we want) at the start - % of each paragraph, so we need not do anything with that. - \hangindent = 2em - % - % When the entry text needs to be broken, just fill out the first line - % with blank space. - \rightskip = 0pt plus1fil - % - % A bit of stretch before each entry for the benefit of balancing - % columns. - \vskip 0pt plus1pt - % - % Swallow the left brace of the text (first parameter): - \afterassignment\doentry - \let\temp = -} -\def\doentry{% - \bgroup % Instead of the swallowed brace. - \noindent - \aftergroup\finishentry - % And now comes the text of the entry. -} -\def\finishentry#1{% - % #1 is the page number. - % - % The following is kludged to not output a line of dots in the index if - % there are no page numbers. The next person who breaks this will be - % cursed by a Unix daemon. - \def\tempa{{\rm }}% - \def\tempb{#1}% - \edef\tempc{\tempa}% - \edef\tempd{\tempb}% - \ifx\tempc\tempd - \ % - \else - % - % If we must, put the page number on a line of its own, and fill out - % this line with blank space. (The \hfil is overwhelmed with the - % fill leaders glue in \indexdotfill if the page number does fit.) - \hfil\penalty50 - \null\nobreak\indexdotfill % Have leaders before the page number. - % - % The `\ ' here is removed by the implicit \unskip that TeX does as - % part of (the primitive) \par. Without it, a spurious underfull - % \hbox ensues. - \ifpdf - \pdfgettoks#1.% - \ \the\toksA - \else - \ #1% - \fi - \fi - \par - \endgroup -} - -% Like plain.tex's \dotfill, except uses up at least 1 em. -\def\indexdotfill{\cleaders - \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill} - -\def\primary #1{\line{#1\hfil}} - -\newskip\secondaryindent \secondaryindent=0.5cm -\def\secondary#1#2{{% - \parfillskip=0in - \parskip=0in - \hangindent=1in - \hangafter=1 - \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill - \ifpdf - \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. - \else - #2 - \fi - \par -}} - -% Define two-column mode, which we use to typeset indexes. -% Adapted from the TeXbook, page 416, which is to say, -% the manmac.tex format used to print the TeXbook itself. -\catcode`\@=11 - -\newbox\partialpage -\newdimen\doublecolumnhsize - -\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns - % Grab any single-column material above us. - \output = {% - % - % Here is a possibility not foreseen in manmac: if we accumulate a - % whole lot of material, we might end up calling this \output - % routine twice in a row (see the doublecol-lose test, which is - % essentially a couple of indexes with @setchapternewpage off). In - % that case we just ship out what is in \partialpage with the normal - % output routine. Generally, \partialpage will be empty when this - % runs and this will be a no-op. See the indexspread.tex test case. - \ifvoid\partialpage \else - \onepageout{\pagecontents\partialpage}% - \fi - % - \global\setbox\partialpage = \vbox{% - % Unvbox the main output page. - \unvbox\PAGE - \kern-\topskip \kern\baselineskip - }% - }% - \eject % run that output routine to set \partialpage - % - % Use the double-column output routine for subsequent pages. - \output = {\doublecolumnout}% - % - % Change the page size parameters. We could do this once outside this - % routine, in each of @smallbook, @afourpaper, and the default 8.5x11 - % format, but then we repeat the same computation. Repeating a couple - % of assignments once per index is clearly meaningless for the - % execution time, so we may as well do it in one place. - % - % First we halve the line length, less a little for the gutter between - % the columns. We compute the gutter based on the line length, so it - % changes automatically with the paper format. The magic constant - % below is chosen so that the gutter has the same value (well, +-<1pt) - % as it did when we hard-coded it. - % - % We put the result in a separate register, \doublecolumhsize, so we - % can restore it in \pagesofar, after \hsize itself has (potentially) - % been clobbered. - % - \doublecolumnhsize = \hsize - \advance\doublecolumnhsize by -.04154\hsize - \divide\doublecolumnhsize by 2 - \hsize = \doublecolumnhsize - % - % Double the \vsize as well. (We don't need a separate register here, - % since nobody clobbers \vsize.) - \vsize = 2\vsize -} - -% The double-column output routine for all double-column pages except -% the last. -% -\def\doublecolumnout{% - \splittopskip=\topskip \splitmaxdepth=\maxdepth - % Get the available space for the double columns -- the normal - % (undoubled) page height minus any material left over from the - % previous page. - \dimen@ = \vsize - \divide\dimen@ by 2 - \advance\dimen@ by -\ht\partialpage - % - % box0 will be the left-hand column, box2 the right. - \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@ - \onepageout\pagesofar - \unvbox255 - \penalty\outputpenalty -} -% -% Re-output the contents of the output page -- any previous material, -% followed by the two boxes we just split, in box0 and box2. -\def\pagesofar{% - \unvbox\partialpage - % - \hsize = \doublecolumnhsize - \wd0=\hsize \wd2=\hsize - \hbox to\pagewidth{\box0\hfil\box2}% -} -% -% All done with double columns. -\def\enddoublecolumns{% - % The following penalty ensures that the page builder is exercised - % _before_ we change the output routine. This is necessary in the - % following situation: - % - % The last section of the index consists only of a single entry. - % Before this section, \pagetotal is less than \pagegoal, so no - % break occurs before the last section starts. However, the last - % section, consisting of \initial and the single \entry, does not - % fit on the page and has to be broken off. Without the following - % penalty the page builder will not be exercised until \eject - % below, and by that time we'll already have changed the output - % routine to the \balancecolumns version, so the next-to-last - % double-column page will be processed with \balancecolumns, which - % is wrong: The two columns will go to the main vertical list, with - % the broken-off section in the recent contributions. As soon as - % the output routine finishes, TeX starts reconsidering the page - % break. The two columns and the broken-off section both fit on the - % page, because the two columns now take up only half of the page - % goal. When TeX sees \eject from below which follows the final - % section, it invokes the new output routine that we've set after - % \balancecolumns below; \onepageout will try to fit the two columns - % and the final section into the vbox of \pageheight (see - % \pagebody), causing an overfull box. - % - % Note that glue won't work here, because glue does not exercise the - % page builder, unlike penalties (see The TeXbook, pp. 280-281). - \penalty0 - % - \output = {% - % Split the last of the double-column material. Leave it on the - % current page, no automatic page break. - \balancecolumns - % - % If we end up splitting too much material for the current page, - % though, there will be another page break right after this \output - % invocation ends. Having called \balancecolumns once, we do not - % want to call it again. Therefore, reset \output to its normal - % definition right away. (We hope \balancecolumns will never be - % called on to balance too much material, but if it is, this makes - % the output somewhat more palatable.) - \global\output = {\onepageout{\pagecontents\PAGE}}% - }% - \eject - \endgroup % started in \begindoublecolumns - % - % \pagegoal was set to the doubled \vsize above, since we restarted - % the current page. We're now back to normal single-column - % typesetting, so reset \pagegoal to the normal \vsize (after the - % \endgroup where \vsize got restored). - \pagegoal = \vsize -} -% -% Called at the end of the double column material. -\def\balancecolumns{% - \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120. - \dimen@ = \ht0 - \advance\dimen@ by \topskip - \advance\dimen@ by-\baselineskip - \divide\dimen@ by 2 % target to split to - %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}% - \splittopskip = \topskip - % Loop until we get a decent breakpoint. - {% - \vbadness = 10000 - \loop - \global\setbox3 = \copy0 - \global\setbox1 = \vsplit3 to \dimen@ - \ifdim\ht3>\dimen@ - \global\advance\dimen@ by 1pt - \repeat - }% - %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}% - \setbox0=\vbox to\dimen@{\unvbox1}% - \setbox2=\vbox to\dimen@{\unvbox3}% - % - \pagesofar -} -\catcode`\@ = \other - - -\message{sectioning,} -% Chapters, sections, etc. - -% \unnumberedno is an oxymoron, of course. But we count the unnumbered -% sections so that we can refer to them unambiguously in the pdf -% outlines by their "section number". We avoid collisions with chapter -% numbers by starting them at 10000. (If a document ever has 10000 -% chapters, we're in trouble anyway, I'm sure.) -\newcount\unnumberedno \unnumberedno = 10000 -\newcount\chapno -\newcount\secno \secno=0 -\newcount\subsecno \subsecno=0 -\newcount\subsubsecno \subsubsecno=0 - -% This counter is funny since it counts through charcodes of letters A, B, ... -\newcount\appendixno \appendixno = `\@ -% -% \def\appendixletter{\char\the\appendixno} -% We do the following ugly conditional instead of the above simple -% construct for the sake of pdftex, which needs the actual -% letter in the expansion, not just typeset. -% -\def\appendixletter{% - \ifnum\appendixno=`A A% - \else\ifnum\appendixno=`B B% - \else\ifnum\appendixno=`C C% - \else\ifnum\appendixno=`D D% - \else\ifnum\appendixno=`E E% - \else\ifnum\appendixno=`F F% - \else\ifnum\appendixno=`G G% - \else\ifnum\appendixno=`H H% - \else\ifnum\appendixno=`I I% - \else\ifnum\appendixno=`J J% - \else\ifnum\appendixno=`K K% - \else\ifnum\appendixno=`L L% - \else\ifnum\appendixno=`M M% - \else\ifnum\appendixno=`N N% - \else\ifnum\appendixno=`O O% - \else\ifnum\appendixno=`P P% - \else\ifnum\appendixno=`Q Q% - \else\ifnum\appendixno=`R R% - \else\ifnum\appendixno=`S S% - \else\ifnum\appendixno=`T T% - \else\ifnum\appendixno=`U U% - \else\ifnum\appendixno=`V V% - \else\ifnum\appendixno=`W W% - \else\ifnum\appendixno=`X X% - \else\ifnum\appendixno=`Y Y% - \else\ifnum\appendixno=`Z Z% - % The \the is necessary, despite appearances, because \appendixletter is - % expanded while writing the .toc file. \char\appendixno is not - % expandable, thus it is written literally, thus all appendixes come out - % with the same letter (or @) in the toc without it. - \else\char\the\appendixno - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} - -% Each @chapter defines this as the name of the chapter. -% page headings and footings can use it. @section does likewise. -% However, they are not reliable, because we don't use marks. -\def\thischapter{} -\def\thissection{} - -\newcount\absseclevel % used to calculate proper heading level -\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count - -% @raisesections: treat @section as chapter, @subsection as section, etc. -\def\raisesections{\global\advance\secbase by -1} -\let\up=\raisesections % original BFox name - -% @lowersections: treat @chapter as section, @section as subsection, etc. -\def\lowersections{\global\advance\secbase by 1} -\let\down=\lowersections % original BFox name - -% we only have subsub. -\chardef\maxseclevel = 3 -% -% A numbered section within an unnumbered changes to unnumbered too. -% To achive this, remember the "biggest" unnum. sec. we are currently in: -\chardef\unmlevel = \maxseclevel -% -% Trace whether the current chapter is an appendix or not: -% \chapheadtype is "N" or "A", unnumbered chapters are ignored. -\def\chapheadtype{N} - -% Choose a heading macro -% #1 is heading type -% #2 is heading level -% #3 is text for heading -\def\genhead#1#2#3{% - % Compute the abs. sec. level: - \absseclevel=#2 - \advance\absseclevel by \secbase - % Make sure \absseclevel doesn't fall outside the range: - \ifnum \absseclevel < 0 - \absseclevel = 0 - \else - \ifnum \absseclevel > 3 - \absseclevel = 3 - \fi - \fi - % The heading type: - \def\headtype{#1}% - \if \headtype U% - \ifnum \absseclevel < \unmlevel - \chardef\unmlevel = \absseclevel - \fi - \else - % Check for appendix sections: - \ifnum \absseclevel = 0 - \edef\chapheadtype{\headtype}% - \else - \if \headtype A\if \chapheadtype N% - \errmessage{@appendix... within a non-appendix chapter}% - \fi\fi - \fi - % Check for numbered within unnumbered: - \ifnum \absseclevel > \unmlevel - \def\headtype{U}% - \else - \chardef\unmlevel = 3 - \fi - \fi - % Now print the heading: - \if \headtype U% - \ifcase\absseclevel - \unnumberedzzz{#3}% - \or \unnumberedseczzz{#3}% - \or \unnumberedsubseczzz{#3}% - \or \unnumberedsubsubseczzz{#3}% - \fi - \else - \if \headtype A% - \ifcase\absseclevel - \appendixzzz{#3}% - \or \appendixsectionzzz{#3}% - \or \appendixsubseczzz{#3}% - \or \appendixsubsubseczzz{#3}% - \fi - \else - \ifcase\absseclevel - \chapterzzz{#3}% - \or \seczzz{#3}% - \or \numberedsubseczzz{#3}% - \or \numberedsubsubseczzz{#3}% - \fi - \fi - \fi - \suppressfirstparagraphindent -} - -% an interface: -\def\numhead{\genhead N} -\def\apphead{\genhead A} -\def\unnmhead{\genhead U} - -% @chapter, @appendix, @unnumbered. Increment top-level counter, reset -% all lower-level sectioning counters to zero. -% -% Also set \chaplevelprefix, which we prepend to @float sequence numbers -% (e.g., figures), q.v. By default (before any chapter), that is empty. -\let\chaplevelprefix = \empty -% -\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz -\def\chapterzzz#1{% - % section resetting is \global in case the chapter is in a group, such - % as an @include file. - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\chapno by 1 - % - % Used for \float. - \gdef\chaplevelprefix{\the\chapno.}% - \resetallfloatnos - % - \message{\putwordChapter\space \the\chapno}% - % - % Write the actual heading. - \chapmacro{#1}{Ynumbered}{\the\chapno}% - % - % So @section and the like are numbered underneath this chapter. - \global\let\section = \numberedsec - \global\let\subsection = \numberedsubsec - \global\let\subsubsection = \numberedsubsubsec -} - -\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz -\def\appendixzzz#1{% - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\appendixno by 1 - \gdef\chaplevelprefix{\appendixletter.}% - \resetallfloatnos - % - \def\appendixnum{\putwordAppendix\space \appendixletter}% - \message{\appendixnum}% - % - \chapmacro{#1}{Yappendix}{\appendixletter}% - % - \global\let\section = \appendixsec - \global\let\subsection = \appendixsubsec - \global\let\subsubsection = \appendixsubsubsec -} - -\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz -\def\unnumberedzzz#1{% - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\unnumberedno by 1 - % - % Since an unnumbered has no number, no prefix for figures. - \global\let\chaplevelprefix = \empty - \resetallfloatnos - % - % This used to be simply \message{#1}, but TeX fully expands the - % argument to \message. Therefore, if #1 contained @-commands, TeX - % expanded them. For example, in `@unnumbered The @cite{Book}', TeX - % expanded @cite (which turns out to cause errors because \cite is meant - % to be executed, not expanded). - % - % Anyway, we don't want the fully-expanded definition of @cite to appear - % as a result of the \message, we just want `@cite' itself. We use - % \the to achieve this: TeX expands \the only once, - % simply yielding the contents of . (We also do this for - % the toc entries.) - \toks0 = {#1}% - \message{(\the\toks0)}% - % - \chapmacro{#1}{Ynothing}{\the\unnumberedno}% - % - \global\let\section = \unnumberedsec - \global\let\subsection = \unnumberedsubsec - \global\let\subsubsection = \unnumberedsubsubsec -} - -% @centerchap is like @unnumbered, but the heading is centered. -\outer\parseargdef\centerchap{% - % Well, we could do the following in a group, but that would break - % an assumption that \chapmacro is called at the outermost level. - % Thus we are safer this way: --kasal, 24feb04 - \let\centerparametersmaybe = \centerparameters - \unnmhead0{#1}% - \let\centerparametersmaybe = \relax -} - -% @top is like @unnumbered. -\let\top\unnumbered - -% Sections. -\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz -\def\seczzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}% -} - -\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz -\def\appendixsectionzzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}% -} -\let\appendixsec\appendixsection - -\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz -\def\unnumberedseczzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% -} - -% Subsections. -\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz -\def\numberedsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}% -} - -\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz -\def\appendixsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Yappendix}% - {\appendixletter.\the\secno.\the\subsecno}% -} - -\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz -\def\unnumberedsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Ynothing}% - {\the\unnumberedno.\the\secno.\the\subsecno}% -} - -% Subsubsections. -\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz -\def\numberedsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Ynumbered}% - {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz -\def\appendixsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Yappendix}% - {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz -\def\unnumberedsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Ynothing}% - {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -% These macros control what the section commands do, according -% to what kind of chapter we are in (ordinary, appendix, or unnumbered). -% Define them by default for a numbered chapter. -\let\section = \numberedsec -\let\subsection = \numberedsubsec -\let\subsubsection = \numberedsubsubsec - -% Define @majorheading, @heading and @subheading - -% NOTE on use of \vbox for chapter headings, section headings, and such: -% 1) We use \vbox rather than the earlier \line to permit -% overlong headings to fold. -% 2) \hyphenpenalty is set to 10000 because hyphenation in a -% heading is obnoxious; this forbids it. -% 3) Likewise, headings look best if no \parindent is used, and -% if justification is not attempted. Hence \raggedright. - - -\def\majorheading{% - {\advance\chapheadingskip by 10pt \chapbreak }% - \parsearg\chapheadingzzz -} - -\def\chapheading{\chapbreak \parsearg\chapheadingzzz} -\def\chapheadingzzz#1{% - {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\raggedright - \rm #1\hfill}}% - \bigskip \par\penalty 200\relax - \suppressfirstparagraphindent -} - -% @heading, @subheading, @subsubheading. -\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} -\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} -\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} - -% These macros generate a chapter, section, etc. heading only -% (including whitespace, linebreaking, etc. around it), -% given all the information in convenient, parsed form. - -%%% Args are the skip and penalty (usually negative) -\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi} - -%%% Define plain chapter starts, and page on/off switching for it -% Parameter controlling skip before chapter headings (if needed) - -\newskip\chapheadingskip - -\def\chapbreak{\dobreak \chapheadingskip {-4000}} -\def\chappager{\par\vfill\supereject} -\def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi} - -\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} - -\def\CHAPPAGoff{% -\global\let\contentsalignmacro = \chappager -\global\let\pchapsepmacro=\chapbreak -\global\let\pagealignmacro=\chappager} - -\def\CHAPPAGon{% -\global\let\contentsalignmacro = \chappager -\global\let\pchapsepmacro=\chappager -\global\let\pagealignmacro=\chappager -\global\def\HEADINGSon{\HEADINGSsingle}} - -\def\CHAPPAGodd{% -\global\let\contentsalignmacro = \chapoddpage -\global\let\pchapsepmacro=\chapoddpage -\global\let\pagealignmacro=\chapoddpage -\global\def\HEADINGSon{\HEADINGSdouble}} - -\CHAPPAGon - -% Chapter opening. -% -% #1 is the text, #2 is the section type (Ynumbered, Ynothing, -% Yappendix, Yomitfromtoc), #3 the chapter number. -% -% To test against our argument. -\def\Ynothingkeyword{Ynothing} -\def\Yomitfromtockeyword{Yomitfromtoc} -\def\Yappendixkeyword{Yappendix} -% -\def\chapmacro#1#2#3{% - \pchapsepmacro - {% - \chapfonts \rm - % - % Have to define \thissection before calling \donoderef, because the - % xref code eventually uses it. On the other hand, it has to be called - % after \pchapsepmacro, or the headline will change too soon. - \gdef\thissection{#1}% - \gdef\thischaptername{#1}% - % - % Only insert the separating space if we have a chapter/appendix - % number, and don't print the unnumbered ``number''. - \def\temptype{#2}% - \ifx\temptype\Ynothingkeyword - \setbox0 = \hbox{}% - \def\toctype{unnchap}% - \gdef\thischapternum{}% - \gdef\thischapter{#1}% - \else\ifx\temptype\Yomitfromtockeyword - \setbox0 = \hbox{}% contents like unnumbered, but no toc entry - \def\toctype{omit}% - \gdef\thischapternum{}% - \gdef\thischapter{}% - \else\ifx\temptype\Yappendixkeyword - \setbox0 = \hbox{\putwordAppendix{} #3\enspace}% - \def\toctype{app}% - \xdef\thischapternum{\appendixletter}% - % We don't substitute the actual chapter name into \thischapter - % because we don't want its macros evaluated now. And we don't - % use \thissection because that changes with each section. - % - \xdef\thischapter{\putwordAppendix{} \appendixletter: - \noexpand\thischaptername}% - \else - \setbox0 = \hbox{#3\enspace}% - \def\toctype{numchap}% - \xdef\thischapternum{\the\chapno}% - \xdef\thischapter{\putwordChapter{} \the\chapno: - \noexpand\thischaptername}% - \fi\fi\fi - % - % Write the toc entry for this chapter. Must come before the - % \donoderef, because we include the current node name in the toc - % entry, and \donoderef resets it to empty. - \writetocentry{\toctype}{#1}{#3}% - % - % For pdftex, we have to write out the node definition (aka, make - % the pdfdest) after any page break, but before the actual text has - % been typeset. If the destination for the pdf outline is after the - % text, then jumping from the outline may wind up with the text not - % being visible, for instance under high magnification. - \donoderef{#2}% - % - % Typeset the actual heading. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright - \hangindent=\wd0 \centerparametersmaybe - \unhbox0 #1\par}% - }% - \nobreak\bigskip % no page break after a chapter title - \nobreak -} - -% @centerchap -- centered and unnumbered. -\let\centerparametersmaybe = \relax -\def\centerparameters{% - \advance\rightskip by 3\rightskip - \leftskip = \rightskip - \parfillskip = 0pt -} - - -% I don't think this chapter style is supported any more, so I'm not -% updating it with the new noderef stuff. We'll see. --karl, 11aug03. -% -\def\setchapterstyle #1 {\csname CHAPF#1\endcsname} -% -\def\unnchfopen #1{% -\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\raggedright - \rm #1\hfill}}\bigskip \par\nobreak -} -\def\chfopen #1#2{\chapoddpage {\chapfonts -\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% -\par\penalty 5000 % -} -\def\centerchfopen #1{% -\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt - \hfill {\rm #1}\hfill}}\bigskip \par\nobreak -} -\def\CHAPFopen{% - \global\let\chapmacro=\chfopen - \global\let\centerchapmacro=\centerchfopen} - - -% Section titles. These macros combine the section number parts and -% call the generic \sectionheading to do the printing. -% -\newskip\secheadingskip -\def\secheadingbreak{\dobreak \secheadingskip{-1000}} - -% Subsection titles. -\newskip\subsecheadingskip -\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}} - -% Subsubsection titles. -\def\subsubsecheadingskip{\subsecheadingskip} -\def\subsubsecheadingbreak{\subsecheadingbreak} - - -% Print any size, any type, section title. -% -% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is -% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the -% section number. -% -\def\sectionheading#1#2#3#4{% - {% - % Switch to the right set of fonts. - \csname #2fonts\endcsname \rm - % - % Insert space above the heading. - \csname #2headingbreak\endcsname - % - % Only insert the space after the number if we have a section number. - \def\sectionlevel{#2}% - \def\temptype{#3}% - % - \ifx\temptype\Ynothingkeyword - \setbox0 = \hbox{}% - \def\toctype{unn}% - \gdef\thissection{#1}% - \else\ifx\temptype\Yomitfromtockeyword - % for @headings -- no section number, don't include in toc, - % and don't redefine \thissection. - \setbox0 = \hbox{}% - \def\toctype{omit}% - \let\sectionlevel=\empty - \else\ifx\temptype\Yappendixkeyword - \setbox0 = \hbox{#4\enspace}% - \def\toctype{app}% - \gdef\thissection{#1}% - \else - \setbox0 = \hbox{#4\enspace}% - \def\toctype{num}% - \gdef\thissection{#1}% - \fi\fi\fi - % - % Write the toc entry (before \donoderef). See comments in \chapmacro. - \writetocentry{\toctype\sectionlevel}{#1}{#4}% - % - % Write the node reference (= pdf destination for pdftex). - % Again, see comments in \chapmacro. - \donoderef{#3}% - % - % Interline glue will be inserted when the vbox is completed. - % That glue will be a valid breakpoint for the page, since it'll be - % preceded by a whatsit (usually from the \donoderef, or from the - % \writetocentry if there was no node). We don't want to allow that - % break, since then the whatsits could end up on page n while the - % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000. - \nobreak - % - % Output the actual section heading. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright - \hangindent=\wd0 % zero if no section number - \unhbox0 #1}% - }% - % Add extra space after the heading -- half of whatever came above it. - % Don't allow stretch, though. - \kern .5 \csname #2headingskip\endcsname - % - % Do not let the kern be a potential breakpoint, as it would be if it - % was followed by glue. - \nobreak - % - % We'll almost certainly start a paragraph next, so don't let that - % glue accumulate. (Not a breakpoint because it's preceded by a - % discardable item.) - \vskip-\parskip - % - % This is purely so the last item on the list is a known \penalty > - % 10000. This is so \startdefun can avoid allowing breakpoints after - % section headings. Otherwise, it would insert a valid breakpoint between: - % - % @section sec-whatever - % @deffn def-whatever - \penalty 10001 -} - - -\message{toc,} -% Table of contents. -\newwrite\tocfile - -% Write an entry to the toc file, opening it if necessary. -% Called from @chapter, etc. -% -% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno} -% We append the current node name (if any) and page number as additional -% arguments for the \{chap,sec,...}entry macros which will eventually -% read this. The node name is used in the pdf outlines as the -% destination to jump to. -% -% We open the .toc file for writing here instead of at @setfilename (or -% any other fixed time) so that @contents can be anywhere in the document. -% But if #1 is `omit', then we don't do anything. This is used for the -% table of contents chapter openings themselves. -% -\newif\iftocfileopened -\def\omitkeyword{omit}% -% -\def\writetocentry#1#2#3{% - \edef\writetoctype{#1}% - \ifx\writetoctype\omitkeyword \else - \iftocfileopened\else - \immediate\openout\tocfile = \jobname.toc - \global\tocfileopenedtrue - \fi - % - \iflinks - {\atdummies - \edef\temp{% - \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}% - \temp - }% - \fi - \fi - % - % Tell \shipout to create a pdf destination on each page, if we're - % writing pdf. These are used in the table of contents. We can't - % just write one on every page because the title pages are numbered - % 1 and 2 (the page numbers aren't printed), and so are the first - % two pages of the document. Thus, we'd have two destinations named - % `1', and two named `2'. - \ifpdf \global\pdfmakepagedesttrue \fi -} - - -% These characters do not print properly in the Computer Modern roman -% fonts, so we must take special care. This is more or less redundant -% with the Texinfo input format setup at the end of this file. -% -\def\activecatcodes{% - \catcode`\"=\active - \catcode`\$=\active - \catcode`\<=\active - \catcode`\>=\active - \catcode`\\=\active - \catcode`\^=\active - \catcode`\_=\active - \catcode`\|=\active - \catcode`\~=\active -} - - -% Read the toc file, which is essentially Texinfo input. -\def\readtocfile{% - \setupdatafile - \activecatcodes - \input \jobname.toc -} - -\newskip\contentsrightmargin \contentsrightmargin=1in -\newcount\savepageno -\newcount\lastnegativepageno \lastnegativepageno = -1 - -% Prepare to read what we've written to \tocfile. -% -\def\startcontents#1{% - % If @setchapternewpage on, and @headings double, the contents should - % start on an odd page, unlike chapters. Thus, we maintain - % \contentsalignmacro in parallel with \pagealignmacro. - % From: Torbjorn Granlund - \contentsalignmacro - \immediate\closeout\tocfile - % - % Don't need to put `Contents' or `Short Contents' in the headline. - % It is abundantly clear what they are. - \def\thischapter{}% - \chapmacro{#1}{Yomitfromtoc}{}% - % - \savepageno = \pageno - \begingroup % Set up to handle contents files properly. - \raggedbottom % Worry more about breakpoints than the bottom. - \advance\hsize by -\contentsrightmargin % Don't use the full line length. - % - % Roman numerals for page numbers. - \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi -} - - -% Normal (long) toc. -\def\contents{% - \startcontents{\putwordTOC}% - \openin 1 \jobname.toc - \ifeof 1 \else - \readtocfile - \fi - \vfill \eject - \contentsalignmacro % in case @setchapternewpage odd is in effect - \ifeof 1 \else - \pdfmakeoutlines - \fi - \closein 1 - \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno -} - -% And just the chapters. -\def\summarycontents{% - \startcontents{\putwordShortTOC}% - % - \let\numchapentry = \shortchapentry - \let\appentry = \shortchapentry - \let\unnchapentry = \shortunnchapentry - % We want a true roman here for the page numbers. - \secfonts - \let\rm=\shortcontrm \let\bf=\shortcontbf - \let\sl=\shortcontsl \let\tt=\shortconttt - \rm - \hyphenpenalty = 10000 - \advance\baselineskip by 1pt % Open it up a little. - \def\numsecentry##1##2##3##4{} - \let\appsecentry = \numsecentry - \let\unnsecentry = \numsecentry - \let\numsubsecentry = \numsecentry - \let\appsubsecentry = \numsecentry - \let\unnsubsecentry = \numsecentry - \let\numsubsubsecentry = \numsecentry - \let\appsubsubsecentry = \numsecentry - \let\unnsubsubsecentry = \numsecentry - \openin 1 \jobname.toc - \ifeof 1 \else - \readtocfile - \fi - \closein 1 - \vfill \eject - \contentsalignmacro % in case @setchapternewpage odd is in effect - \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno -} -\let\shortcontents = \summarycontents - -% Typeset the label for a chapter or appendix for the short contents. -% The arg is, e.g., `A' for an appendix, or `3' for a chapter. -% -\def\shortchaplabel#1{% - % This space should be enough, since a single number is .5em, and the - % widest letter (M) is 1em, at least in the Computer Modern fonts. - % But use \hss just in case. - % (This space doesn't include the extra space that gets added after - % the label; that gets put in by \shortchapentry above.) - % - % We'd like to right-justify chapter numbers, but that looks strange - % with appendix letters. And right-justifying numbers and - % left-justifying letters looks strange when there is less than 10 - % chapters. Have to read the whole toc once to know how many chapters - % there are before deciding ... - \hbox to 1em{#1\hss}% -} - -% These macros generate individual entries in the table of contents. -% The first argument is the chapter or section name. -% The last argument is the page number. -% The arguments in between are the chapter number, section number, ... - -% Chapters, in the main contents. -\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}} -% -% Chapters, in the short toc. -% See comments in \dochapentry re vbox and related settings. -\def\shortchapentry#1#2#3#4{% - \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}% -} - -% Appendices, in the main contents. -% Need the word Appendix, and a fixed-size box. -% -\def\appendixbox#1{% - % We use M since it's probably the widest letter. - \setbox0 = \hbox{\putwordAppendix{} M}% - \hbox to \wd0{\putwordAppendix{} #1\hss}} -% -\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}} - -% Unnumbered chapters. -\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}} -\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}} - -% Sections. -\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}} -\let\appsecentry=\numsecentry -\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}} - -% Subsections. -\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}} -\let\appsubsecentry=\numsubsecentry -\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}} - -% And subsubsections. -\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}} -\let\appsubsubsecentry=\numsubsubsecentry -\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}} - -% This parameter controls the indentation of the various levels. -% Same as \defaultparindent. -\newdimen\tocindent \tocindent = 15pt - -% Now for the actual typesetting. In all these, #1 is the text and #2 is the -% page number. -% -% If the toc has to be broken over pages, we want it to be at chapters -% if at all possible; hence the \penalty. -\def\dochapentry#1#2{% - \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip - \begingroup - \chapentryfonts - \tocentry{#1}{\dopageno\bgroup#2\egroup}% - \endgroup - \nobreak\vskip .25\baselineskip plus.1\baselineskip -} - -\def\dosecentry#1#2{\begingroup - \secentryfonts \leftskip=\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -\def\dosubsecentry#1#2{\begingroup - \subsecentryfonts \leftskip=2\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -\def\dosubsubsecentry#1#2{\begingroup - \subsubsecentryfonts \leftskip=3\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -% We use the same \entry macro as for the index entries. -\let\tocentry = \entry - -% Space between chapter (or whatever) number and the title. -\def\labelspace{\hskip1em \relax} - -\def\dopageno#1{{\rm #1}} -\def\doshortpageno#1{{\rm #1}} - -\def\chapentryfonts{\secfonts \rm} -\def\secentryfonts{\textfonts} -\def\subsecentryfonts{\textfonts} -\def\subsubsecentryfonts{\textfonts} - - -\message{environments,} -% @foo ... @end foo. - -% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. -% -% Since these characters are used in examples, it should be an even number of -% \tt widths. Each \tt character is 1en, so two makes it 1em. -% -\def\point{$\star$} -\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} -\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}} -\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} -\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}} - -% The @error{} command. -% Adapted from the TeXbook's \boxit. -% -\newbox\errorbox -% -{\tentt \global\dimen0 = 3em}% Width of the box. -\dimen2 = .55pt % Thickness of rules -% The text. (`r' is open on the right, `e' somewhat less so on the left.) -\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} -% -\setbox\errorbox=\hbox to \dimen0{\hfil - \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. - \advance\hsize by -2\dimen2 % Rules. - \vbox{% - \hrule height\dimen2 - \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. - \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. - \kern3pt\vrule width\dimen2}% Space to right. - \hrule height\dimen2} - \hfil} -% -\def\error{\leavevmode\lower.7ex\copy\errorbox} - -% @tex ... @end tex escapes into raw Tex temporarily. -% One exception: @ is still an escape character, so that @end tex works. -% But \@ or @@ will get a plain tex @ character. - -\envdef\tex{% - \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 - \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 - \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie - \catcode `\%=14 - \catcode `\+=\other - \catcode `\"=\other - \catcode `\|=\other - \catcode `\<=\other - \catcode `\>=\other - \escapechar=`\\ - % - \let\b=\ptexb - \let\bullet=\ptexbullet - \let\c=\ptexc - \let\,=\ptexcomma - \let\.=\ptexdot - \let\dots=\ptexdots - \let\equiv=\ptexequiv - \let\!=\ptexexclam - \let\i=\ptexi - \let\indent=\ptexindent - \let\noindent=\ptexnoindent - \let\{=\ptexlbrace - \let\+=\tabalign - \let\}=\ptexrbrace - \let\/=\ptexslash - \let\*=\ptexstar - \let\t=\ptext - \let\frenchspacing=\plainfrenchspacing - % - \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% - \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}% - \def\@{@}% -} -% There is no need to define \Etex. - -% Define @lisp ... @end lisp. -% @lisp environment forms a group so it can rebind things, -% including the definition of @end lisp (which normally is erroneous). - -% Amount to narrow the margins by for @lisp. -\newskip\lispnarrowing \lispnarrowing=0.4in - -% This is the definition that ^^M gets inside @lisp, @example, and other -% such environments. \null is better than a space, since it doesn't -% have any width. -\def\lisppar{\null\endgraf} - -% This space is always present above and below environments. -\newskip\envskipamount \envskipamount = 0pt - -% Make spacing and below environment symmetrical. We use \parskip here -% to help in doing that, since in @example-like environments \parskip -% is reset to zero; thus the \afterenvbreak inserts no space -- but the -% start of the next paragraph will insert \parskip. -% -\def\aboveenvbreak{{% - % =10000 instead of <10000 because of a special case in \itemzzz and - % \sectionheading, q.v. - \ifnum \lastpenalty=10000 \else - \advance\envskipamount by \parskip - \endgraf - \ifdim\lastskip<\envskipamount - \removelastskip - % it's not a good place to break if the last penalty was \nobreak - % or better ... - \ifnum\lastpenalty<10000 \penalty-50 \fi - \vskip\envskipamount - \fi - \fi -}} - -\let\afterenvbreak = \aboveenvbreak - -% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will -% also clear it, so that its embedded environments do the narrowing again. -\let\nonarrowing=\relax - -% @cartouche ... @end cartouche: draw rectangle w/rounded corners around -% environment contents. -\font\circle=lcircle10 -\newdimen\circthick -\newdimen\cartouter\newdimen\cartinner -\newskip\normbskip\newskip\normpskip\newskip\normlskip -\circthick=\fontdimen8\circle -% -\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth -\def\ctr{{\hskip 6pt\circle\char'010}} -\def\cbl{{\circle\char'012\hskip -6pt}} -\def\cbr{{\hskip 6pt\circle\char'011}} -\def\carttop{\hbox to \cartouter{\hskip\lskip - \ctl\leaders\hrule height\circthick\hfil\ctr - \hskip\rskip}} -\def\cartbot{\hbox to \cartouter{\hskip\lskip - \cbl\leaders\hrule height\circthick\hfil\cbr - \hskip\rskip}} -% -\newskip\lskip\newskip\rskip - -\envdef\cartouche{% - \ifhmode\par\fi % can't be in the midst of a paragraph. - \startsavinginserts - \lskip=\leftskip \rskip=\rightskip - \leftskip=0pt\rightskip=0pt % we want these *outside*. - \cartinner=\hsize \advance\cartinner by-\lskip - \advance\cartinner by-\rskip - \cartouter=\hsize - \advance\cartouter by 18.4pt % allow for 3pt kerns on either - % side, and for 6pt waste from - % each corner char, and rule thickness - \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip - % Flag to tell @lisp, etc., not to narrow margin. - \let\nonarrowing = t% - \vbox\bgroup - \baselineskip=0pt\parskip=0pt\lineskip=0pt - \carttop - \hbox\bgroup - \hskip\lskip - \vrule\kern3pt - \vbox\bgroup - \kern3pt - \hsize=\cartinner - \baselineskip=\normbskip - \lineskip=\normlskip - \parskip=\normpskip - \vskip -\parskip - \comment % For explanation, see the end of \def\group. -} -\def\Ecartouche{% - \ifhmode\par\fi - \kern3pt - \egroup - \kern3pt\vrule - \hskip\rskip - \egroup - \cartbot - \egroup - \checkinserts -} - - -% This macro is called at the beginning of all the @example variants, -% inside a group. -\def\nonfillstart{% - \aboveenvbreak - \hfuzz = 12pt % Don't be fussy - \sepspaces % Make spaces be word-separators rather than space tokens. - \let\par = \lisppar % don't ignore blank lines - \obeylines % each line of input is a line of output - \parskip = 0pt - \parindent = 0pt - \emergencystretch = 0pt % don't try to avoid overfull boxes - \ifx\nonarrowing\relax - \advance \leftskip by \lispnarrowing - \exdentamount=\lispnarrowing - \else - \let\nonarrowing = \relax - \fi - \let\exdent=\nofillexdent -} - -% If you want all examples etc. small: @set dispenvsize small. -% If you want even small examples the full size: @set dispenvsize nosmall. -% This affects the following displayed environments: -% @example, @display, @format, @lisp -% -\def\smallword{small} -\def\nosmallword{nosmall} -\let\SETdispenvsize\relax -\def\setnormaldispenv{% - \ifx\SETdispenvsize\smallword - % end paragraph for sake of leading, in case document has no blank - % line. This is redundant with what happens in \aboveenvbreak, but - % we need to do it before changing the fonts, and it's inconvenient - % to change the fonts afterward. - \ifnum \lastpenalty=10000 \else \endgraf \fi - \smallexamplefonts \rm - \fi -} -\def\setsmalldispenv{% - \ifx\SETdispenvsize\nosmallword - \else - \ifnum \lastpenalty=10000 \else \endgraf \fi - \smallexamplefonts \rm - \fi -} - -% We often define two environments, @foo and @smallfoo. -% Let's do it by one command: -\def\makedispenv #1#2{ - \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2} - \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2} - \expandafter\let\csname E#1\endcsname \afterenvbreak - \expandafter\let\csname Esmall#1\endcsname \afterenvbreak -} - -% Define two synonyms: -\def\maketwodispenvs #1#2#3{ - \makedispenv{#1}{#3} - \makedispenv{#2}{#3} -} - -% @lisp: indented, narrowed, typewriter font; @example: same as @lisp. -% -% @smallexample and @smalllisp: use smaller fonts. -% Originally contributed by Pavel@xerox. -% -\maketwodispenvs {lisp}{example}{% - \nonfillstart - \tt\quoteexpand - \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. - \gobble % eat return -} -% @display/@smalldisplay: same as @lisp except keep current font. -% -\makedispenv {display}{% - \nonfillstart - \gobble -} - -% @format/@smallformat: same as @display except don't narrow margins. -% -\makedispenv{format}{% - \let\nonarrowing = t% - \nonfillstart - \gobble -} - -% @flushleft: same as @format, but doesn't obey \SETdispenvsize. -\envdef\flushleft{% - \let\nonarrowing = t% - \nonfillstart - \gobble -} -\let\Eflushleft = \afterenvbreak - -% @flushright. -% -\envdef\flushright{% - \let\nonarrowing = t% - \nonfillstart - \advance\leftskip by 0pt plus 1fill - \gobble -} -\let\Eflushright = \afterenvbreak - - -% @quotation does normal linebreaking (hence we can't use \nonfillstart) -% and narrows the margins. We keep \parskip nonzero in general, since -% we're doing normal filling. So, when using \aboveenvbreak and -% \afterenvbreak, temporarily make \parskip 0. -% -\envdef\quotation{% - {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip - \parindent=0pt - % - % @cartouche defines \nonarrowing to inhibit narrowing at next level down. - \ifx\nonarrowing\relax - \advance\leftskip by \lispnarrowing - \advance\rightskip by \lispnarrowing - \exdentamount = \lispnarrowing - \else - \let\nonarrowing = \relax - \fi - \parsearg\quotationlabel -} - -% We have retained a nonzero parskip for the environment, since we're -% doing normal filling. -% -\def\Equotation{% - \par - \ifx\quotationauthor\undefined\else - % indent a bit. - \leftline{\kern 2\leftskip \sl ---\quotationauthor}% - \fi - {\parskip=0pt \afterenvbreak}% -} - -% If we're given an argument, typeset it in bold with a colon after. -\def\quotationlabel#1{% - \def\temp{#1}% - \ifx\temp\empty \else - {\bf #1: }% - \fi -} - - -% LaTeX-like @verbatim...@end verbatim and @verb{...} -% If we want to allow any as delimiter, -% we need the curly braces so that makeinfo sees the @verb command, eg: -% `@verbx...x' would look like the '@verbx' command. --janneke@gnu.org -% -% [Knuth]: Donald Ervin Knuth, 1996. The TeXbook. -% -% [Knuth] p.344; only we need to do the other characters Texinfo sets -% active too. Otherwise, they get lost as the first character on a -% verbatim line. -\def\dospecials{% - \do\ \do\\\do\{\do\}\do\$\do\&% - \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~% - \do\<\do\>\do\|\do\@\do+\do\"% -} -% -% [Knuth] p. 380 -\def\uncatcodespecials{% - \def\do##1{\catcode`##1=\other}\dospecials} -% -% [Knuth] pp. 380,381,391 -% Disable Spanish ligatures ?` and !` of \tt font -\begingroup - \catcode`\`=\active\gdef`{\relax\lq} -\endgroup -% -% Setup for the @verb command. -% -% Eight spaces for a tab -\begingroup - \catcode`\^^I=\active - \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }} -\endgroup -% -\def\setupverb{% - \tt % easiest (and conventionally used) font for verbatim - \def\par{\leavevmode\endgraf}% - \catcode`\`=\active - \tabeightspaces - % Respect line breaks, - % print special symbols as themselves, and - % make each space count - % must do in this order: - \obeylines \uncatcodespecials \sepspaces -} - -% Setup for the @verbatim environment -% -% Real tab expansion -\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount -% -\def\starttabbox{\setbox0=\hbox\bgroup} - -% Allow an option to not replace quotes with a regular directed right -% quote/apostrophe (char 0x27), but instead use the undirected quote -% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it -% the default, but it works for pasting with more pdf viewers (at least -% evince), the lilypond developers report. xpdf does work with the -% regular 0x27. -% -\def\codequoteright{% - \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax - '% - \else - \char'15 - \fi -} -% -% and a similar option for the left quote char vs. a grave accent. -% Modern fonts display ASCII 0x60 as a grave accent, so some people like -% the code environments to do likewise. -% -\def\codequoteleft{% - \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax - `% - \else - \char'22 - \fi -} -% -\begingroup - \catcode`\^^I=\active - \gdef\tabexpand{% - \catcode`\^^I=\active - \def^^I{\leavevmode\egroup - \dimen0=\wd0 % the width so far, or since the previous tab - \divide\dimen0 by\tabw - \multiply\dimen0 by\tabw % compute previous multiple of \tabw - \advance\dimen0 by\tabw % advance to next multiple of \tabw - \wd0=\dimen0 \box0 \starttabbox - }% - } - \catcode`\'=\active - \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}% - % - \catcode`\`=\active - \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}% - % - \gdef\quoteexpand{\rquoteexpand \lquoteexpand}% -\endgroup - -% start the verbatim environment. -\def\setupverbatim{% - \let\nonarrowing = t% - \nonfillstart - % Easiest (and conventionally used) font for verbatim - \tt - \def\par{\leavevmode\egroup\box0\endgraf}% - \catcode`\`=\active - \tabexpand - \quoteexpand - % Respect line breaks, - % print special symbols as themselves, and - % make each space count - % must do in this order: - \obeylines \uncatcodespecials \sepspaces - \everypar{\starttabbox}% -} - -% Do the @verb magic: verbatim text is quoted by unique -% delimiter characters. Before first delimiter expect a -% right brace, after last delimiter expect closing brace: -% -% \def\doverb'{'#1'}'{#1} -% -% [Knuth] p. 382; only eat outer {} -\begingroup - \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other - \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next] -\endgroup -% -\def\verb{\begingroup\setupverb\doverb} -% -% -% Do the @verbatim magic: define the macro \doverbatim so that -% the (first) argument ends when '@end verbatim' is reached, ie: -% -% \def\doverbatim#1@end verbatim{#1} -% -% For Texinfo it's a lot easier than for LaTeX, -% because texinfo's \verbatim doesn't stop at '\end{verbatim}': -% we need not redefine '\', '{' and '}'. -% -% Inspired by LaTeX's verbatim command set [latex.ltx] -% -\begingroup - \catcode`\ =\active - \obeylines % - % ignore everything up to the first ^^M, that's the newline at the end - % of the @verbatim input line itself. Otherwise we get an extra blank - % line in the output. - \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}% - % We really want {...\end verbatim} in the body of the macro, but - % without the active space; thus we have to use \xdef and \gobble. -\endgroup -% -\envdef\verbatim{% - \setupverbatim\doverbatim -} -\let\Everbatim = \afterenvbreak - - -% @verbatiminclude FILE - insert text of file in verbatim environment. -% -\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude} -% -\def\doverbatiminclude#1{% - {% - \makevalueexpandable - \setupverbatim - \input #1 - \afterenvbreak - }% -} - -% @copying ... @end copying. -% Save the text away for @insertcopying later. -% -% We save the uninterpreted tokens, rather than creating a box. -% Saving the text in a box would be much easier, but then all the -% typesetting commands (@smallbook, font changes, etc.) have to be done -% beforehand -- and a) we want @copying to be done first in the source -% file; b) letting users define the frontmatter in as flexible order as -% possible is very desirable. -% -\def\copying{\checkenv{}\begingroup\scanargctxt\docopying} -\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} -% -\def\insertcopying{% - \begingroup - \parindent = 0pt % paragraph indentation looks wrong on title page - \scanexp\copyingtext - \endgroup -} - - -\message{defuns,} -% @defun etc. - -\newskip\defbodyindent \defbodyindent=.4in -\newskip\defargsindent \defargsindent=50pt -\newskip\deflastargmargin \deflastargmargin=18pt -\newcount\defunpenalty - -% Start the processing of @deffn: -\def\startdefun{% - \ifnum\lastpenalty<10000 - \medbreak - \defunpenalty=10003 % Will keep this @deffn together with the - % following @def command, see below. - \else - % If there are two @def commands in a row, we'll have a \nobreak, - % which is there to keep the function description together with its - % header. But if there's nothing but headers, we need to allow a - % break somewhere. Check specifically for penalty 10002, inserted - % by \printdefunline, instead of 10000, since the sectioning - % commands also insert a nobreak penalty, and we don't want to allow - % a break between a section heading and a defun. - % - % As a minor refinement, we avoid "club" headers by signalling - % with penalty of 10003 after the very first @deffn in the - % sequence (see above), and penalty of 10002 after any following - % @def command. - \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi - % - % Similarly, after a section heading, do not allow a break. - % But do insert the glue. - \medskip % preceded by discardable penalty, so not a breakpoint - \fi - % - \parindent=0in - \advance\leftskip by \defbodyindent - \exdentamount=\defbodyindent -} - -\def\dodefunx#1{% - % First, check whether we are in the right environment: - \checkenv#1% - % - % As above, allow line break if we have multiple x headers in a row. - % It's not a great place, though. - \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi - % - % And now, it's time to reuse the body of the original defun: - \expandafter\gobbledefun#1% -} -\def\gobbledefun#1\startdefun{} - -% \printdefunline \deffnheader{text} -% -\def\printdefunline#1#2{% - \begingroup - % call \deffnheader: - #1#2 \endheader - % common ending: - \interlinepenalty = 10000 - \advance\rightskip by 0pt plus 1fil - \endgraf - \nobreak\vskip -\parskip - \penalty\defunpenalty % signal to \startdefun and \dodefunx - % Some of the @defun-type tags do not enable magic parentheses, - % rendering the following check redundant. But we don't optimize. - \checkparencounts - \endgroup -} - -\def\Edefun{\endgraf\medbreak} - -% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; -% the only thing remainnig is to define \deffnheader. -% -\def\makedefun#1{% - \expandafter\let\csname E#1\endcsname = \Edefun - \edef\temp{\noexpand\domakedefun - \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}% - \temp -} - -% \domakedefun \deffn \deffnx \deffnheader -% -% Define \deffn and \deffnx, without parameters. -% \deffnheader has to be defined explicitly. -% -\def\domakedefun#1#2#3{% - \envdef#1{% - \startdefun - \parseargusing\activeparens{\printdefunline#3}% - }% - \def#2{\dodefunx#1}% - \def#3% -} - -%%% Untyped functions: - -% @deffn category name args -\makedefun{deffn}{\deffngeneral{}} - -% @deffn category class name args -\makedefun{defop}#1 {\defopon{#1\ \putwordon}} - -% \defopon {category on}class name args -\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } - -% \deffngeneral {subind}category name args -% -\def\deffngeneral#1#2 #3 #4\endheader{% - % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}. - \dosubind{fn}{\code{#3}}{#1}% - \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% -} - -%%% Typed functions: - -% @deftypefn category type name args -\makedefun{deftypefn}{\deftypefngeneral{}} - -% @deftypeop category class type name args -\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}} - -% \deftypeopon {category on}class type name args -\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } - -% \deftypefngeneral {subind}category type name args -% -\def\deftypefngeneral#1#2 #3 #4 #5\endheader{% - \dosubind{fn}{\code{#4}}{#1}% - \defname{#2}{#3}{#4}\defunargs{#5\unskip}% -} - -%%% Typed variables: - -% @deftypevr category type var args -\makedefun{deftypevr}{\deftypecvgeneral{}} - -% @deftypecv category class type var args -\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}} - -% \deftypecvof {category of}class type var args -\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} } - -% \deftypecvgeneral {subind}category type var args -% -\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{% - \dosubind{vr}{\code{#4}}{#1}% - \defname{#2}{#3}{#4}\defunargs{#5\unskip}% -} - -%%% Untyped variables: - -% @defvr category var args -\makedefun{defvr}#1 {\deftypevrheader{#1} {} } - -% @defcv category class var args -\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}} - -% \defcvof {category of}class var args -\def\defcvof#1#2 {\deftypecvof{#1}#2 {} } - -%%% Type: -% @deftp category name args -\makedefun{deftp}#1 #2 #3\endheader{% - \doind{tp}{\code{#2}}% - \defname{#1}{}{#2}\defunargs{#3\unskip}% -} - -% Remaining @defun-like shortcuts: -\makedefun{defun}{\deffnheader{\putwordDeffunc} } -\makedefun{defmac}{\deffnheader{\putwordDefmac} } -\makedefun{defspec}{\deffnheader{\putwordDefspec} } -\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} } -\makedefun{defvar}{\defvrheader{\putwordDefvar} } -\makedefun{defopt}{\defvrheader{\putwordDefopt} } -\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} } -\makedefun{defmethod}{\defopon\putwordMethodon} -\makedefun{deftypemethod}{\deftypeopon\putwordMethodon} -\makedefun{defivar}{\defcvof\putwordInstanceVariableof} -\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof} - -% \defname, which formats the name of the @def (not the args). -% #1 is the category, such as "Function". -% #2 is the return type, if any. -% #3 is the function name. -% -% We are followed by (but not passed) the arguments, if any. -% -\def\defname#1#2#3{% - % Get the values of \leftskip and \rightskip as they were outside the @def... - \advance\leftskip by -\defbodyindent - % - % How we'll format the type name. Putting it in brackets helps - % distinguish it from the body text that may end up on the next line - % just below it. - \def\temp{#1}% - \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi} - % - % Figure out line sizes for the paragraph shape. - % The first line needs space for \box0; but if \rightskip is nonzero, - % we need only space for the part of \box0 which exceeds it: - \dimen0=\hsize \advance\dimen0 by -\wd0 \advance\dimen0 by \rightskip - % The continuations: - \dimen2=\hsize \advance\dimen2 by -\defargsindent - % (plain.tex says that \dimen1 should be used only as global.) - \parshape 2 0in \dimen0 \defargsindent \dimen2 - % - % Put the type name to the right margin. - \noindent - \hbox to 0pt{% - \hfil\box0 \kern-\hsize - % \hsize has to be shortened this way: - \kern\leftskip - % Intentionally do not respect \rightskip, since we need the space. - }% - % - % Allow all lines to be underfull without complaint: - \tolerance=10000 \hbadness=10000 - \exdentamount=\defbodyindent - {% - % defun fonts. We use typewriter by default (used to be bold) because: - % . we're printing identifiers, they should be in tt in principle. - % . in languages with many accents, such as Czech or French, it's - % common to leave accents off identifiers. The result looks ok in - % tt, but exceedingly strange in rm. - % . we don't want -- and --- to be treated as ligatures. - % . this still does not fix the ?` and !` ligatures, but so far no - % one has made identifiers using them :). - \df \tt - \def\temp{#2}% return value type - \ifx\temp\empty\else \tclose{\temp} \fi - #3% output function name - }% - {\rm\enskip}% hskip 0.5 em of \tenrm - % - \boldbrax - % arguments will be output next, if any. -} - -% Print arguments in slanted roman (not ttsl), inconsistently with using -% tt for the name. This is because literal text is sometimes needed in -% the argument list (groff manual), and ttsl and tt are not very -% distinguishable. Prevent hyphenation at `-' chars. -% -\def\defunargs#1{% - % use sl by default (not ttsl), - % tt for the names. - \df \sl \hyphenchar\font=0 - % - % On the other hand, if an argument has two dashes (for instance), we - % want a way to get ttsl. Let's try @var for that. - \let\var=\ttslanted - #1% - \sl\hyphenchar\font=45 -} - -% We want ()&[] to print specially on the defun line. -% -\def\activeparens{% - \catcode`\(=\active \catcode`\)=\active - \catcode`\[=\active \catcode`\]=\active - \catcode`\&=\active -} - -% Make control sequences which act like normal parenthesis chars. -\let\lparen = ( \let\rparen = ) - -% Be sure that we always have a definition for `(', etc. For example, -% if the fn name has parens in it, \boldbrax will not be in effect yet, -% so TeX would otherwise complain about undefined control sequence. -{ - \activeparens - \global\let(=\lparen \global\let)=\rparen - \global\let[=\lbrack \global\let]=\rbrack - \global\let& = \& - - \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} - \gdef\magicamp{\let&=\amprm} -} - -\newcount\parencount - -% If we encounter &foo, then turn on ()-hacking afterwards -\newif\ifampseen -\def\amprm#1 {\ampseentrue{\bf\ }} - -\def\parenfont{% - \ifampseen - % At the first level, print parens in roman, - % otherwise use the default font. - \ifnum \parencount=1 \rm \fi - \else - % The \sf parens (in \boldbrax) actually are a little bolder than - % the contained text. This is especially needed for [ and ] . - \sf - \fi -} -\def\infirstlevel#1{% - \ifampseen - \ifnum\parencount=1 - #1% - \fi - \fi -} -\def\bfafterword#1 {#1 \bf} - -\def\opnr{% - \global\advance\parencount by 1 - {\parenfont(}% - \infirstlevel \bfafterword -} -\def\clnr{% - {\parenfont)}% - \infirstlevel \sl - \global\advance\parencount by -1 -} - -\newcount\brackcount -\def\lbrb{% - \global\advance\brackcount by 1 - {\bf[}% -} -\def\rbrb{% - {\bf]}% - \global\advance\brackcount by -1 -} - -\def\checkparencounts{% - \ifnum\parencount=0 \else \badparencount \fi - \ifnum\brackcount=0 \else \badbrackcount \fi -} -\def\badparencount{% - \errmessage{Unbalanced parentheses in @def}% - \global\parencount=0 -} -\def\badbrackcount{% - \errmessage{Unbalanced square braces in @def}% - \global\brackcount=0 -} - - -\message{macros,} -% @macro. - -% To do this right we need a feature of e-TeX, \scantokens, -% which we arrange to emulate with a temporary file in ordinary TeX. -\ifx\eTeXversion\undefined - \newwrite\macscribble - \def\scantokens#1{% - \toks0={#1}% - \immediate\openout\macscribble=\jobname.tmp - \immediate\write\macscribble{\the\toks0}% - \immediate\closeout\macscribble - \input \jobname.tmp - } -\fi - -\def\scanmacro#1{% - \begingroup - \newlinechar`\^^M - \let\xeatspaces\eatspaces - % Undo catcode changes of \startcontents and \doprintindex - % When called from @insertcopying or (short)caption, we need active - % backslash to get it printed correctly. Previously, we had - % \catcode`\\=\other instead. We'll see whether a problem appears - % with macro expansion. --kasal, 19aug04 - \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ - % ... and \example - \spaceisspace - % - % Append \endinput to make sure that TeX does not see the ending newline. - % I've verified that it is necessary both for e-TeX and for ordinary TeX - % --kasal, 29nov03 - \scantokens{#1\endinput}% - \endgroup -} - -\def\scanexp#1{% - \edef\temp{\noexpand\scanmacro{#1}}% - \temp -} - -\newcount\paramno % Count of parameters -\newtoks\macname % Macro name -\newif\ifrecursive % Is it recursive? - -% List of all defined macros in the form -% \definedummyword\macro1\definedummyword\macro2... -% Currently is also contains all @aliases; the list can be split -% if there is a need. -\def\macrolist{} - -% Add the macro to \macrolist -\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname} -\def\addtomacrolistxxx#1{% - \toks0 = \expandafter{\macrolist\definedummyword#1}% - \xdef\macrolist{\the\toks0}% -} - -% Utility routines. -% This does \let #1 = #2, with \csnames; that is, -% \let \csname#1\endcsname = \csname#2\endcsname -% (except of course we have to play expansion games). -% -\def\cslet#1#2{% - \expandafter\let - \csname#1\expandafter\endcsname - \csname#2\endcsname -} - -% Trim leading and trailing spaces off a string. -% Concepts from aro-bend problem 15 (see CTAN). -{\catcode`\@=11 -\gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }} -\gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@} -\gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @} -\def\unbrace#1{#1} -\unbrace{\gdef\trim@@@ #1 } #2@{#1} -} - -% Trim a single trailing ^^M off a string. -{\catcode`\^^M=\other \catcode`\Q=3% -\gdef\eatcr #1{\eatcra #1Q^^MQ}% -\gdef\eatcra#1^^MQ{\eatcrb#1Q}% -\gdef\eatcrb#1Q#2Q{#1}% -} - -% Macro bodies are absorbed as an argument in a context where -% all characters are catcode 10, 11 or 12, except \ which is active -% (as in normal texinfo). It is necessary to change the definition of \. - -% It's necessary to have hard CRs when the macro is executed. This is -% done by making ^^M (\endlinechar) catcode 12 when reading the macro -% body, and then making it the \newlinechar in \scanmacro. - -\def\scanctxt{% - \catcode`\"=\other - \catcode`\+=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\@=\other - \catcode`\^=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\~=\other -} - -\def\scanargctxt{% - \scanctxt - \catcode`\\=\other - \catcode`\^^M=\other -} - -\def\macrobodyctxt{% - \scanctxt - \catcode`\{=\other - \catcode`\}=\other - \catcode`\^^M=\other - \usembodybackslash -} - -\def\macroargctxt{% - \scanctxt - \catcode`\\=\other -} - -% \mbodybackslash is the definition of \ in @macro bodies. -% It maps \foo\ => \csname macarg.foo\endcsname => #N -% where N is the macro parameter number. -% We define \csname macarg.\endcsname to be \realbackslash, so -% \\ in macro replacement text gets you a backslash. - -{\catcode`@=0 @catcode`@\=@active - @gdef@usembodybackslash{@let\=@mbodybackslash} - @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname} -} -\expandafter\def\csname macarg.\endcsname{\realbackslash} - -\def\macro{\recursivefalse\parsearg\macroxxx} -\def\rmacro{\recursivetrue\parsearg\macroxxx} - -\def\macroxxx#1{% - \getargs{#1}% now \macname is the macname and \argl the arglist - \ifx\argl\empty % no arguments - \paramno=0% - \else - \expandafter\parsemargdef \argl;% - \fi - \if1\csname ismacro.\the\macname\endcsname - \message{Warning: redefining \the\macname}% - \else - \expandafter\ifx\csname \the\macname\endcsname \relax - \else \errmessage{Macro name \the\macname\space already defined}\fi - \global\cslet{macsave.\the\macname}{\the\macname}% - \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% - \addtomacrolist{\the\macname}% - \fi - \begingroup \macrobodyctxt - \ifrecursive \expandafter\parsermacbody - \else \expandafter\parsemacbody - \fi} - -\parseargdef\unmacro{% - \if1\csname ismacro.#1\endcsname - \global\cslet{#1}{macsave.#1}% - \global\expandafter\let \csname ismacro.#1\endcsname=0% - % Remove the macro name from \macrolist: - \begingroup - \expandafter\let\csname#1\endcsname \relax - \let\definedummyword\unmacrodo - \xdef\macrolist{\macrolist}% - \endgroup - \else - \errmessage{Macro #1 not defined}% - \fi -} - -% Called by \do from \dounmacro on each macro. The idea is to omit any -% macro definitions that have been changed to \relax. -% -\def\unmacrodo#1{% - \ifx #1\relax - % remove this - \else - \noexpand\definedummyword \noexpand#1% - \fi -} - -% This makes use of the obscure feature that if the last token of a -% is #, then the preceding argument is delimited by -% an opening brace, and that opening brace is not consumed. -\def\getargs#1{\getargsxxx#1{}} -\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} -\def\getmacname #1 #2\relax{\macname={#1}} -\def\getmacargs#1{\def\argl{#1}} - -% Parse the optional {params} list. Set up \paramno and \paramlist -% so \defmacro knows what to do. Define \macarg.blah for each blah -% in the params list, to be ##N where N is the position in that list. -% That gets used by \mbodybackslash (above). - -% We need to get `macro parameter char #' into several definitions. -% The technique used is stolen from LaTeX: let \hash be something -% unexpandable, insert that wherever you need a #, and then redefine -% it to # just before using the token list produced. -% -% The same technique is used to protect \eatspaces till just before -% the macro is used. - -\def\parsemargdef#1;{\paramno=0\def\paramlist{}% - \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,} -\def\parsemargdefxxx#1,{% - \if#1;\let\next=\relax - \else \let\next=\parsemargdefxxx - \advance\paramno by 1% - \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname - {\xeatspaces{\hash\the\paramno}}% - \edef\paramlist{\paramlist\hash\the\paramno,}% - \fi\next} - -% These two commands read recursive and nonrecursive macro bodies. -% (They're different since rec and nonrec macros end differently.) - -\long\def\parsemacbody#1@end macro% -{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% -\long\def\parsermacbody#1@end rmacro% -{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% - -% This defines the macro itself. There are six cases: recursive and -% nonrecursive macros of zero, one, and many arguments. -% Much magic with \expandafter here. -% \xdef is used so that macro definitions will survive the file -% they're defined in; @include reads the file inside a group. -\def\defmacro{% - \let\hash=##% convert placeholders to macro parameter chars - \ifrecursive - \ifcase\paramno - % 0 - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\scanmacro{\temp}}% - \or % 1 - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \noexpand\braceorline - \expandafter\noexpand\csname\the\macname xxx\endcsname}% - \expandafter\xdef\csname\the\macname xxx\endcsname##1{% - \egroup\noexpand\scanmacro{\temp}}% - \else % many - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \noexpand\csname\the\macname xx\endcsname}% - \expandafter\xdef\csname\the\macname xx\endcsname##1{% - \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter - \csname\the\macname xxx\endcsname - \paramlist{\egroup\noexpand\scanmacro{\temp}}% - \fi - \else - \ifcase\paramno - % 0 - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\norecurse{\the\macname}% - \noexpand\scanmacro{\temp}\egroup}% - \or % 1 - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \noexpand\braceorline - \expandafter\noexpand\csname\the\macname xxx\endcsname}% - \expandafter\xdef\csname\the\macname xxx\endcsname##1{% - \egroup - \noexpand\norecurse{\the\macname}% - \noexpand\scanmacro{\temp}\egroup}% - \else % many - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \expandafter\noexpand\csname\the\macname xx\endcsname}% - \expandafter\xdef\csname\the\macname xx\endcsname##1{% - \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter - \csname\the\macname xxx\endcsname - \paramlist{% - \egroup - \noexpand\norecurse{\the\macname}% - \noexpand\scanmacro{\temp}\egroup}% - \fi - \fi} - -\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}} - -% \braceorline decides whether the next nonwhitespace character is a -% {. If so it reads up to the closing }, if not, it reads the whole -% line. Whatever was read is then fed to the next control sequence -% as an argument (by \parsebrace or \parsearg) -\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} -\def\braceorlinexxx{% - \ifx\nchar\bgroup\else - \expandafter\parsearg - \fi \macnamexxx} - - -% @alias. -% We need some trickery to remove the optional spaces around the equal -% sign. Just make them active and then expand them all to nothing. -\def\alias{\parseargusing\obeyspaces\aliasxxx} -\def\aliasxxx #1{\aliasyyy#1\relax} -\def\aliasyyy #1=#2\relax{% - {% - \expandafter\let\obeyedspace=\empty - \addtomacrolist{#1}% - \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}% - }% - \next -} - - -\message{cross references,} - -\newwrite\auxfile -\newif\ifhavexrefs % True if xref values are known. -\newif\ifwarnedxrefs % True if we warned once that they aren't known. - -% @inforef is relatively simple. -\def\inforef #1{\inforefzzz #1,,,,**} -\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, - node \samp{\ignorespaces#1{}}} - -% @node's only job in TeX is to define \lastnode, which is used in -% cross-references. The @node line might or might not have commas, and -% might or might not have spaces before the first comma, like: -% @node foo , bar , ... -% We don't want such trailing spaces in the node name. -% -\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse} -% -% also remove a trailing comma, in case of something like this: -% @node Help-Cross, , , Cross-refs -\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse} -\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}} - -\let\nwnode=\node -\let\lastnode=\empty - -% Write a cross-reference definition for the current node. #1 is the -% type (Ynumbered, Yappendix, Ynothing). -% -\def\donoderef#1{% - \ifx\lastnode\empty\else - \setref{\lastnode}{#1}% - \global\let\lastnode=\empty - \fi -} - -% @anchor{NAME} -- define xref target at arbitrary point. -% -\newcount\savesfregister -% -\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} -\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} -\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} - -% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an -% anchor), which consists of three parts: -% 1) NAME-title - the current sectioning name taken from \thissection, -% or the anchor name. -% 2) NAME-snt - section number and type, passed as the SNT arg, or -% empty for anchors. -% 3) NAME-pg - the page number. -% -% This is called from \donoderef, \anchor, and \dofloat. In the case of -% floats, there is an additional part, which is not written here: -% 4) NAME-lof - the text as it should appear in a @listoffloats. -% -\def\setref#1#2{% - \pdfmkdest{#1}% - \iflinks - {% - \atdummies % preserve commands, but don't expand them - \edef\writexrdef##1##2{% - \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef - ##1}{##2}}% these are parameters of \writexrdef - }% - \toks0 = \expandafter{\thissection}% - \immediate \writexrdef{title}{\the\toks0 }% - \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. - \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout - }% - \fi -} - -% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is -% the node name, #2 the name of the Info cross-reference, #3 the printed -% node name, #4 the name of the Info file, #5 the name of the printed -% manual. All but the node name can be omitted. -% -\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]} -\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]} -\def\ref#1{\xrefX[#1,,,,,,,]} -\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup - \unsepspaces - \def\printedmanual{\ignorespaces #5}% - \def\printedrefname{\ignorespaces #3}% - \setbox1=\hbox{\printedmanual\unskip}% - \setbox0=\hbox{\printedrefname\unskip}% - \ifdim \wd0 = 0pt - % No printed node name was explicitly given. - \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax - % Use the node name inside the square brackets. - \def\printedrefname{\ignorespaces #1}% - \else - % Use the actual chapter/section title appear inside - % the square brackets. Use the real section title if we have it. - \ifdim \wd1 > 0pt - % It is in another manual, so we don't have it. - \def\printedrefname{\ignorespaces #1}% - \else - \ifhavexrefs - % We know the real title if we have the xref values. - \def\printedrefname{\refx{#1-title}{}}% - \else - % Otherwise just copy the Info node name. - \def\printedrefname{\ignorespaces #1}% - \fi% - \fi - \fi - \fi - % - % Make link in pdf output. - \ifpdf - \leavevmode - \getfilename{#4}% - {\indexnofonts - \turnoffactive - % See comments at \activebackslashdouble. - {\activebackslashdouble \xdef\pdfxrefdest{#1}% - \backslashparens\pdfxrefdest}% - % - \ifnum\filenamelength>0 - \startlink attr{/Border [0 0 0]}% - goto file{\the\filename.pdf} name{\pdfxrefdest}% - \else - \startlink attr{/Border [0 0 0]}% - goto name{\pdfmkpgn{\pdfxrefdest}}% - \fi - }% - \linkcolor - \fi - % - % Float references are printed completely differently: "Figure 1.2" - % instead of "[somenode], p.3". We distinguish them by the - % LABEL-title being set to a magic string. - {% - % Have to otherify everything special to allow the \csname to - % include an _ in the xref name, etc. - \indexnofonts - \turnoffactive - \expandafter\global\expandafter\let\expandafter\Xthisreftitle - \csname XR#1-title\endcsname - }% - \iffloat\Xthisreftitle - % If the user specified the print name (third arg) to the ref, - % print it instead of our usual "Figure 1.2". - \ifdim\wd0 = 0pt - \refx{#1-snt}{}% - \else - \printedrefname - \fi - % - % if the user also gave the printed manual name (fifth arg), append - % "in MANUALNAME". - \ifdim \wd1 > 0pt - \space \putwordin{} \cite{\printedmanual}% - \fi - \else - % node/anchor (non-float) references. - % - % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not - % insert empty discretionaries after hyphens, which means that it will - % not find a line break at a hyphen in a node names. Since some manuals - % are best written with fairly long node names, containing hyphens, this - % is a loss. Therefore, we give the text of the node name again, so it - % is as if TeX is seeing it for the first time. - \ifdim \wd1 > 0pt - \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}% - \else - % _ (for example) has to be the character _ for the purposes of the - % control sequence corresponding to the node, but it has to expand - % into the usual \leavevmode...\vrule stuff for purposes of - % printing. So we \turnoffactive for the \refx-snt, back on for the - % printing, back off for the \refx-pg. - {\turnoffactive - % Only output a following space if the -snt ref is nonempty; for - % @unnumbered and @anchor, it won't be. - \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% - \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi - }% - % output the `[mynode]' via a macro so it can be overridden. - \xrefprintnodename\printedrefname - % - % But we always want a comma and a space: - ,\space - % - % output the `page 3'. - \turnoffactive \putwordpage\tie\refx{#1-pg}{}% - \fi - \fi - \endlink -\endgroup} - -% This macro is called from \xrefX for the `[nodename]' part of xref -% output. It's a separate macro only so it can be changed more easily, -% since square brackets don't work well in some documents. Particularly -% one that Bob is working on :). -% -\def\xrefprintnodename#1{[#1]} - -% Things referred to by \setref. -% -\def\Ynothing{} -\def\Yomitfromtoc{} -\def\Ynumbered{% - \ifnum\secno=0 - \putwordChapter@tie \the\chapno - \else \ifnum\subsecno=0 - \putwordSection@tie \the\chapno.\the\secno - \else \ifnum\subsubsecno=0 - \putwordSection@tie \the\chapno.\the\secno.\the\subsecno - \else - \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno - \fi\fi\fi -} -\def\Yappendix{% - \ifnum\secno=0 - \putwordAppendix@tie @char\the\appendixno{}% - \else \ifnum\subsecno=0 - \putwordSection@tie @char\the\appendixno.\the\secno - \else \ifnum\subsubsecno=0 - \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno - \else - \putwordSection@tie - @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno - \fi\fi\fi -} - -% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME. -% If its value is nonempty, SUFFIX is output afterward. -% -\def\refx#1#2{% - {% - \indexnofonts - \otherbackslash - \expandafter\global\expandafter\let\expandafter\thisrefX - \csname XR#1\endcsname - }% - \ifx\thisrefX\relax - % If not defined, say something at least. - \angleleft un\-de\-fined\angleright - \iflinks - \ifhavexrefs - \message{\linenumber Undefined cross reference `#1'.}% - \else - \ifwarnedxrefs\else - \global\warnedxrefstrue - \message{Cross reference values unknown; you must run TeX again.}% - \fi - \fi - \fi - \else - % It's defined, so just use it. - \thisrefX - \fi - #2% Output the suffix in any case. -} - -% This is the macro invoked by entries in the aux file. Usually it's -% just a \def (we prepend XR to the control sequence name to avoid -% collisions). But if this is a float type, we have more work to do. -% -\def\xrdef#1#2{% - {% The node name might contain 8-bit characters, which in our current - % implementation are changed to commands like @'e. Don't let these - % mess up the control sequence name. - \indexnofonts - \turnoffactive - \xdef\safexrefname{#1}% - }% - % - \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref - % - % Was that xref control sequence that we just defined for a float? - \expandafter\iffloat\csname XR\safexrefname\endcsname - % it was a float, and we have the (safe) float type in \iffloattype. - \expandafter\let\expandafter\floatlist - \csname floatlist\iffloattype\endcsname - % - % Is this the first time we've seen this float type? - \expandafter\ifx\floatlist\relax - \toks0 = {\do}% yes, so just \do - \else - % had it before, so preserve previous elements in list. - \toks0 = \expandafter{\floatlist\do}% - \fi - % - % Remember this xref in the control sequence \floatlistFLOATTYPE, - % for later use in \listoffloats. - \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0 - {\safexrefname}}% - \fi -} - -% Read the last existing aux file, if any. No error if none exists. -% -\def\tryauxfile{% - \openin 1 \jobname.aux - \ifeof 1 \else - \readdatafile{aux}% - \global\havexrefstrue - \fi - \closein 1 -} - -\def\setupdatafile{% - \catcode`\^^@=\other - \catcode`\^^A=\other - \catcode`\^^B=\other - \catcode`\^^C=\other - \catcode`\^^D=\other - \catcode`\^^E=\other - \catcode`\^^F=\other - \catcode`\^^G=\other - \catcode`\^^H=\other - \catcode`\^^K=\other - \catcode`\^^L=\other - \catcode`\^^N=\other - \catcode`\^^P=\other - \catcode`\^^Q=\other - \catcode`\^^R=\other - \catcode`\^^S=\other - \catcode`\^^T=\other - \catcode`\^^U=\other - \catcode`\^^V=\other - \catcode`\^^W=\other - \catcode`\^^X=\other - \catcode`\^^Z=\other - \catcode`\^^[=\other - \catcode`\^^\=\other - \catcode`\^^]=\other - \catcode`\^^^=\other - \catcode`\^^_=\other - % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc. - % in xref tags, i.e., node names. But since ^^e4 notation isn't - % supported in the main text, it doesn't seem desirable. Furthermore, - % that is not enough: for node names that actually contain a ^ - % character, we would end up writing a line like this: 'xrdef {'hat - % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first - % argument, and \hat is not an expandable control sequence. It could - % all be worked out, but why? Either we support ^^ or we don't. - % - % The other change necessary for this was to define \auxhat: - % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter - % and then to call \auxhat in \setq. - % - \catcode`\^=\other - % - % Special characters. Should be turned off anyway, but... - \catcode`\~=\other - \catcode`\[=\other - \catcode`\]=\other - \catcode`\"=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\$=\other - \catcode`\#=\other - \catcode`\&=\other - \catcode`\%=\other - \catcode`+=\other % avoid \+ for paranoia even though we've turned it off - % - % This is to support \ in node names and titles, since the \ - % characters end up in a \csname. It's easier than - % leaving it active and making its active definition an actual \ - % character. What I don't understand is why it works in the *value* - % of the xrdef. Seems like it should be a catcode12 \, and that - % should not typeset properly. But it works, so I'm moving on for - % now. --karl, 15jan04. - \catcode`\\=\other - % - % Make the characters 128-255 be printing characters. - {% - \count1=128 - \def\loop{% - \catcode\count1=\other - \advance\count1 by 1 - \ifnum \count1<256 \loop \fi - }% - }% - % - % @ is our escape character in .aux files, and we need braces. - \catcode`\{=1 - \catcode`\}=2 - \catcode`\@=0 -} - -\def\readdatafile#1{% -\begingroup - \setupdatafile - \input\jobname.#1 -\endgroup} - - -\message{insertions,} -% including footnotes. - -\newcount \footnoteno - -% The trailing space in the following definition for supereject is -% vital for proper filling; pages come out unaligned when you do a -% pagealignmacro call if that space before the closing brace is -% removed. (Generally, numeric constants should always be followed by a -% space to prevent strange expansion errors.) -\def\supereject{\par\penalty -20000\footnoteno =0 } - -% @footnotestyle is meaningful for info output only. -\let\footnotestyle=\comment - -{\catcode `\@=11 -% -% Auto-number footnotes. Otherwise like plain. -\gdef\footnote{% - \let\indent=\ptexindent - \let\noindent=\ptexnoindent - \global\advance\footnoteno by \@ne - \edef\thisfootno{$^{\the\footnoteno}$}% - % - % In case the footnote comes at the end of a sentence, preserve the - % extra spacing after we do the footnote number. - \let\@sf\empty - \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi - % - % Remove inadvertent blank space before typesetting the footnote number. - \unskip - \thisfootno\@sf - \dofootnote -}% - -% Don't bother with the trickery in plain.tex to not require the -% footnote text as a parameter. Our footnotes don't need to be so general. -% -% Oh yes, they do; otherwise, @ifset (and anything else that uses -% \parseargline) fails inside footnotes because the tokens are fixed when -% the footnote is read. --karl, 16nov96. -% -\gdef\dofootnote{% - \insert\footins\bgroup - % We want to typeset this text as a normal paragraph, even if the - % footnote reference occurs in (for example) a display environment. - % So reset some parameters. - \hsize=\pagewidth - \interlinepenalty\interfootnotelinepenalty - \splittopskip\ht\strutbox % top baseline for broken footnotes - \splitmaxdepth\dp\strutbox - \floatingpenalty\@MM - \leftskip\z@skip - \rightskip\z@skip - \spaceskip\z@skip - \xspaceskip\z@skip - \parindent\defaultparindent - % - \smallfonts \rm - % - % Because we use hanging indentation in footnotes, a @noindent appears - % to exdent this text, so make it be a no-op. makeinfo does not use - % hanging indentation so @noindent can still be needed within footnote - % text after an @example or the like (not that this is good style). - \let\noindent = \relax - % - % Hang the footnote text off the number. Use \everypar in case the - % footnote extends for more than one paragraph. - \everypar = {\hang}% - \textindent{\thisfootno}% - % - % Don't crash into the line above the footnote text. Since this - % expands into a box, it must come within the paragraph, lest it - % provide a place where TeX can split the footnote. - \footstrut - \futurelet\next\fo@t -} -}%end \catcode `\@=11 - -% In case a @footnote appears in a vbox, save the footnote text and create -% the real \insert just after the vbox finished. Otherwise, the insertion -% would be lost. -% Similarily, if a @footnote appears inside an alignment, save the footnote -% text to a box and make the \insert when a row of the table is finished. -% And the same can be done for other insert classes. --kasal, 16nov03. - -% Replace the \insert primitive by a cheating macro. -% Deeper inside, just make sure that the saved insertions are not spilled -% out prematurely. -% -\def\startsavinginserts{% - \ifx \insert\ptexinsert - \let\insert\saveinsert - \else - \let\checkinserts\relax - \fi -} - -% This \insert replacement works for both \insert\footins{foo} and -% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}. -% -\def\saveinsert#1{% - \edef\next{\noexpand\savetobox \makeSAVEname#1}% - \afterassignment\next - % swallow the left brace - \let\temp = -} -\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}} -\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1} - -\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi} - -\def\placesaveins#1{% - \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname - {\box#1}% -} - -% eat @SAVE -- beware, all of them have catcode \other: -{ - \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials % ;-) - \gdef\gobblesave @SAVE{} -} - -% initialization: -\def\newsaveins #1{% - \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}% - \next -} -\def\newsaveinsX #1{% - \csname newbox\endcsname #1% - \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts - \checksaveins #1}% -} - -% initialize: -\let\checkinserts\empty -\newsaveins\footins -\newsaveins\margin - - -% @image. We use the macros from epsf.tex to support this. -% If epsf.tex is not installed and @image is used, we complain. -% -% Check for and read epsf.tex up front. If we read it only at @image -% time, we might be inside a group, and then its definitions would get -% undone and the next image would fail. -\openin 1 = epsf.tex -\ifeof 1 \else - % Do not bother showing banner with epsf.tex v2.7k (available in - % doc/epsf.tex and on ctan). - \def\epsfannounce{\toks0 = }% - \input epsf.tex -\fi -\closein 1 -% -% We will only complain once about lack of epsf.tex. -\newif\ifwarnednoepsf -\newhelp\noepsfhelp{epsf.tex must be installed for images to - work. It is also included in the Texinfo distribution, or you can get - it from ftp://tug.org/tex/epsf.tex.} -% -\def\image#1{% - \ifx\epsfbox\undefined - \ifwarnednoepsf \else - \errhelp = \noepsfhelp - \errmessage{epsf.tex not found, images will be ignored}% - \global\warnednoepsftrue - \fi - \else - \imagexxx #1,,,,,\finish - \fi -} -% -% Arguments to @image: -% #1 is (mandatory) image filename; we tack on .eps extension. -% #2 is (optional) width, #3 is (optional) height. -% #4 is (ignored optional) html alt text. -% #5 is (ignored optional) extension. -% #6 is just the usual extra ignored arg for parsing this stuff. -\newif\ifimagevmode -\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup - \catcode`\^^M = 5 % in case we're inside an example - \normalturnoffactive % allow _ et al. in names - % If the image is by itself, center it. - \ifvmode - \imagevmodetrue - \nobreak\bigskip - % Usually we'll have text after the image which will insert - % \parskip glue, so insert it here too to equalize the space - % above and below. - \nobreak\vskip\parskip - \nobreak - \line\bgroup - \fi - % - % Output the image. - \ifpdf - \dopdfimage{#1}{#2}{#3}% - \else - % \epsfbox itself resets \epsf?size at each figure. - \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi - \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi - \epsfbox{#1.eps}% - \fi - % - \ifimagevmode \egroup \bigbreak \fi % space after the image -\endgroup} - - -% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables, -% etc. We don't actually implement floating yet, we always include the -% float "here". But it seemed the best name for the future. -% -\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish} - -% There may be a space before second and/or third parameter; delete it. -\def\eatcommaspace#1, {#1,} - -% #1 is the optional FLOATTYPE, the text label for this float, typically -% "Figure", "Table", "Example", etc. Can't contain commas. If omitted, -% this float will not be numbered and cannot be referred to. -% -% #2 is the optional xref label. Also must be present for the float to -% be referable. -% -% #3 is the optional positioning argument; for now, it is ignored. It -% will somehow specify the positions allowed to float to (here, top, bottom). -% -% We keep a separate counter for each FLOATTYPE, which we reset at each -% chapter-level command. -\let\resetallfloatnos=\empty -% -\def\dofloat#1,#2,#3,#4\finish{% - \let\thiscaption=\empty - \let\thisshortcaption=\empty - % - % don't lose footnotes inside @float. - % - % BEWARE: when the floats start float, we have to issue warning whenever an - % insert appears inside a float which could possibly float. --kasal, 26may04 - % - \startsavinginserts - % - % We can't be used inside a paragraph. - \par - % - \vtop\bgroup - \def\floattype{#1}% - \def\floatlabel{#2}% - \def\floatloc{#3}% we do nothing with this yet. - % - \ifx\floattype\empty - \let\safefloattype=\empty - \else - {% - % the floattype might have accents or other special characters, - % but we need to use it in a control sequence name. - \indexnofonts - \turnoffactive - \xdef\safefloattype{\floattype}% - }% - \fi - % - % If label is given but no type, we handle that as the empty type. - \ifx\floatlabel\empty \else - % We want each FLOATTYPE to be numbered separately (Figure 1, - % Table 1, Figure 2, ...). (And if no label, no number.) - % - \expandafter\getfloatno\csname\safefloattype floatno\endcsname - \global\advance\floatno by 1 - % - {% - % This magic value for \thissection is output by \setref as the - % XREFLABEL-title value. \xrefX uses it to distinguish float - % labels (which have a completely different output format) from - % node and anchor labels. And \xrdef uses it to construct the - % lists of floats. - % - \edef\thissection{\floatmagic=\safefloattype}% - \setref{\floatlabel}{Yfloat}% - }% - \fi - % - % start with \parskip glue, I guess. - \vskip\parskip - % - % Don't suppress indentation if a float happens to start a section. - \restorefirstparagraphindent -} - -% we have these possibilities: -% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap -% @float Foo,lbl & no caption: Foo 1.1 -% @float Foo & @caption{Cap}: Foo: Cap -% @float Foo & no caption: Foo -% @float ,lbl & Caption{Cap}: 1.1: Cap -% @float ,lbl & no caption: 1.1 -% @float & @caption{Cap}: Cap -% @float & no caption: -% -\def\Efloat{% - \let\floatident = \empty - % - % In all cases, if we have a float type, it comes first. - \ifx\floattype\empty \else \def\floatident{\floattype}\fi - % - % If we have an xref label, the number comes next. - \ifx\floatlabel\empty \else - \ifx\floattype\empty \else % if also had float type, need tie first. - \appendtomacro\floatident{\tie}% - \fi - % the number. - \appendtomacro\floatident{\chaplevelprefix\the\floatno}% - \fi - % - % Start the printed caption with what we've constructed in - % \floatident, but keep it separate; we need \floatident again. - \let\captionline = \floatident - % - \ifx\thiscaption\empty \else - \ifx\floatident\empty \else - \appendtomacro\captionline{: }% had ident, so need a colon between - \fi - % - % caption text. - \appendtomacro\captionline{\scanexp\thiscaption}% - \fi - % - % If we have anything to print, print it, with space before. - % Eventually this needs to become an \insert. - \ifx\captionline\empty \else - \vskip.5\parskip - \captionline - % - % Space below caption. - \vskip\parskip - \fi - % - % If have an xref label, write the list of floats info. Do this - % after the caption, to avoid chance of it being a breakpoint. - \ifx\floatlabel\empty \else - % Write the text that goes in the lof to the aux file as - % \floatlabel-lof. Besides \floatident, we include the short - % caption if specified, else the full caption if specified, else nothing. - {% - \atdummies - % - % since we read the caption text in the macro world, where ^^M - % is turned into a normal character, we have to scan it back, so - % we don't write the literal three characters "^^M" into the aux file. - \scanexp{% - \xdef\noexpand\gtemp{% - \ifx\thisshortcaption\empty - \thiscaption - \else - \thisshortcaption - \fi - }% - }% - \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident - \ifx\gtemp\empty \else : \gtemp \fi}}% - }% - \fi - \egroup % end of \vtop - % - % place the captured inserts - % - % BEWARE: when the floats start floating, we have to issue warning - % whenever an insert appears inside a float which could possibly - % float. --kasal, 26may04 - % - \checkinserts -} - -% Append the tokens #2 to the definition of macro #1, not expanding either. -% -\def\appendtomacro#1#2{% - \expandafter\def\expandafter#1\expandafter{#1#2}% -} - -% @caption, @shortcaption -% -\def\caption{\docaption\thiscaption} -\def\shortcaption{\docaption\thisshortcaption} -\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption} -\def\defcaption#1#2{\egroup \def#1{#2}} - -% The parameter is the control sequence identifying the counter we are -% going to use. Create it if it doesn't exist and assign it to \floatno. -\def\getfloatno#1{% - \ifx#1\relax - % Haven't seen this figure type before. - \csname newcount\endcsname #1% - % - % Remember to reset this floatno at the next chap. - \expandafter\gdef\expandafter\resetallfloatnos - \expandafter{\resetallfloatnos #1=0 }% - \fi - \let\floatno#1% -} - -% \setref calls this to get the XREFLABEL-snt value. We want an @xref -% to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we -% first read the @float command. -% -\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}% - -% Magic string used for the XREFLABEL-title value, so \xrefX can -% distinguish floats from other xref types. -\def\floatmagic{!!float!!} - -% #1 is the control sequence we are passed; we expand into a conditional -% which is true if #1 represents a float ref. That is, the magic -% \thissection value which we \setref above. -% -\def\iffloat#1{\expandafter\doiffloat#1==\finish} -% -% #1 is (maybe) the \floatmagic string. If so, #2 will be the -% (safe) float type for this float. We set \iffloattype to #2. -% -\def\doiffloat#1=#2=#3\finish{% - \def\temp{#1}% - \def\iffloattype{#2}% - \ifx\temp\floatmagic -} - -% @listoffloats FLOATTYPE - print a list of floats like a table of contents. -% -\parseargdef\listoffloats{% - \def\floattype{#1}% floattype - {% - % the floattype might have accents or other special characters, - % but we need to use it in a control sequence name. - \indexnofonts - \turnoffactive - \xdef\safefloattype{\floattype}% - }% - % - % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE. - \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax - \ifhavexrefs - % if the user said @listoffloats foo but never @float foo. - \message{\linenumber No `\safefloattype' floats to list.}% - \fi - \else - \begingroup - \leftskip=\tocindent % indent these entries like a toc - \let\do=\listoffloatsdo - \csname floatlist\safefloattype\endcsname - \endgroup - \fi -} - -% This is called on each entry in a list of floats. We're passed the -% xref label, in the form LABEL-title, which is how we save it in the -% aux file. We strip off the -title and look up \XRLABEL-lof, which -% has the text we're supposed to typeset here. -% -% Figures without xref labels will not be included in the list (since -% they won't appear in the aux file). -% -\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish} -\def\listoffloatsdoentry#1-title\finish{{% - % Can't fully expand XR#1-lof because it can contain anything. Just - % pass the control sequence. On the other hand, XR#1-pg is just the - % page number, and we want to fully expand that so we can get a link - % in pdf output. - \toksA = \expandafter{\csname XR#1-lof\endcsname}% - % - % use the same \entry macro we use to generate the TOC and index. - \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}% - \writeentry -}} - - -\message{localization,} - -% @documentlanguage is usually given very early, just after -% @setfilename. If done too late, it may not override everything -% properly. Single argument is the language abbreviation. -% It would be nice if we could set up a hyphenation file here. -% -\parseargdef\documentlanguage{% - \tex % read txi-??.tex file in plain TeX. - % Read the file if it exists. - \openin 1 txi-#1.tex - \ifeof 1 - \errhelp = \nolanghelp - \errmessage{Cannot read language file txi-#1.tex}% - \else - \input txi-#1.tex - \fi - \closein 1 - \endgroup -} -\newhelp\nolanghelp{The given language definition file cannot be found or -is empty. Maybe you need to install it? In the current directory -should work if nowhere else does.} - -% Set the catcode of characters 128 through 255 to the specified number. -% -\def\setnonasciicharscatcode#1{% - \count255=128 - \loop\ifnum\count255<256 - \global\catcode\count255=#1 - \advance\count255 by 1 - \repeat -} - -% @documentencoding sets the definition of non-ASCII characters -% according to the specified encoding. -% -\parseargdef\documentencoding{% - % Encoding being declared for the document. - \def\declaredencoding{\csname #1.enc\endcsname}% - % - % Supported encodings: names converted to tokens in order to be able - % to compare them with \ifx. - \def\ascii{\csname US-ASCII.enc\endcsname}% - \def\latnine{\csname ISO-8859-15.enc\endcsname}% - \def\latone{\csname ISO-8859-1.enc\endcsname}% - \def\lattwo{\csname ISO-8859-2.enc\endcsname}% - \def\utfeight{\csname UTF-8.enc\endcsname}% - % - \ifx \declaredencoding \ascii - \asciichardefs - % - \else \ifx \declaredencoding \lattwo - \setnonasciicharscatcode\active - \lattwochardefs - % - \else \ifx \declaredencoding \latone - \setnonasciicharscatcode\active - \latonechardefs - % - \else \ifx \declaredencoding \latnine - \setnonasciicharscatcode\active - \latninechardefs - % - \else \ifx \declaredencoding \utfeight - \setnonasciicharscatcode\active - \utfeightchardefs - % - \else - \message{Unknown document encoding #1, ignoring.}% - % - \fi % utfeight - \fi % latnine - \fi % latone - \fi % lattwo - \fi % ascii -} - -% A message to be logged when using a character that isn't available -% the default font encoding (OT1). -% -\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} - -% Take account of \c (plain) vs. \, (Texinfo) difference. -\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} - -% First, make active non-ASCII characters in order for them to be -% correctly categorized when TeX reads the replacement text of -% macros containing the character definitions. -\setnonasciicharscatcode\active -% -% Latin1 (ISO-8859-1) character definitions. -\def\latonechardefs{% - \gdef^^a0{~} - \gdef^^a1{\exclamdown} - \gdef^^a2{\missingcharmsg{CENT SIGN}} - \gdef^^a3{{\pounds}} - \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} - \gdef^^a5{\missingcharmsg{YEN SIGN}} - \gdef^^a6{\missingcharmsg{BROKEN BAR}} - \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\copyright} - \gdef^^aa{\ordf} - \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} - \gdef^^ac{$\lnot$} - \gdef^^ad{\-} - \gdef^^ae{\registeredsymbol} - \gdef^^af{\={}} - % - \gdef^^b0{\textdegree} - \gdef^^b1{$\pm$} - \gdef^^b2{$^2$} - \gdef^^b3{$^3$} - \gdef^^b4{\'{}} - \gdef^^b5{$\mu$} - \gdef^^b6{\P} - % - \gdef^^b7{$^.$} - \gdef^^b8{\cedilla\ } - \gdef^^b9{$^1$} - \gdef^^ba{\ordm} - % - \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}} - \gdef^^bc{$1\over4$} - \gdef^^bd{$1\over2$} - \gdef^^be{$3\over4$} - \gdef^^bf{\questiondown} - % - \gdef^^c0{\`A} - \gdef^^c1{\'A} - \gdef^^c2{\^A} - \gdef^^c3{\~A} - \gdef^^c4{\"A} - \gdef^^c5{\ringaccent A} - \gdef^^c6{\AE} - \gdef^^c7{\cedilla C} - \gdef^^c8{\`E} - \gdef^^c9{\'E} - \gdef^^ca{\^E} - \gdef^^cb{\"E} - \gdef^^cc{\`I} - \gdef^^cd{\'I} - \gdef^^ce{\^I} - \gdef^^cf{\"I} - % - \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}} - \gdef^^d1{\~N} - \gdef^^d2{\`O} - \gdef^^d3{\'O} - \gdef^^d4{\^O} - \gdef^^d5{\~O} - \gdef^^d6{\"O} - \gdef^^d7{$\times$} - \gdef^^d8{\O} - \gdef^^d9{\`U} - \gdef^^da{\'U} - \gdef^^db{\^U} - \gdef^^dc{\"U} - \gdef^^dd{\'Y} - \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}} - \gdef^^df{\ss} - % - \gdef^^e0{\`a} - \gdef^^e1{\'a} - \gdef^^e2{\^a} - \gdef^^e3{\~a} - \gdef^^e4{\"a} - \gdef^^e5{\ringaccent a} - \gdef^^e6{\ae} - \gdef^^e7{\cedilla c} - \gdef^^e8{\`e} - \gdef^^e9{\'e} - \gdef^^ea{\^e} - \gdef^^eb{\"e} - \gdef^^ec{\`{\dotless i}} - \gdef^^ed{\'{\dotless i}} - \gdef^^ee{\^{\dotless i}} - \gdef^^ef{\"{\dotless i}} - % - \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}} - \gdef^^f1{\~n} - \gdef^^f2{\`o} - \gdef^^f3{\'o} - \gdef^^f4{\^o} - \gdef^^f5{\~o} - \gdef^^f6{\"o} - \gdef^^f7{$\div$} - \gdef^^f8{\o} - \gdef^^f9{\`u} - \gdef^^fa{\'u} - \gdef^^fb{\^u} - \gdef^^fc{\"u} - \gdef^^fd{\'y} - \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}} - \gdef^^ff{\"y} -} - -% Latin9 (ISO-8859-15) encoding character definitions. -\def\latninechardefs{% - % Encoding is almost identical to Latin1. - \latonechardefs - % - \gdef^^a4{\euro} - \gdef^^a6{\v S} - \gdef^^a8{\v s} - \gdef^^b4{\v Z} - \gdef^^b8{\v z} - \gdef^^bc{\OE} - \gdef^^bd{\oe} - \gdef^^be{\"Y} -} - -% Latin2 (ISO-8859-2) character definitions. -\def\lattwochardefs{% - \gdef^^a0{~} - \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}} - \gdef^^a2{\u{}} - \gdef^^a3{\L} - \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} - \gdef^^a5{\v L} - \gdef^^a6{\'S} - \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\v S} - \gdef^^aa{\cedilla S} - \gdef^^ab{\v T} - \gdef^^ac{\'Z} - \gdef^^ad{\-} - \gdef^^ae{\v Z} - \gdef^^af{\dotaccent Z} - % - \gdef^^b0{\textdegree} - \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}} - \gdef^^b2{\missingcharmsg{OGONEK}} - \gdef^^b3{\l} - \gdef^^b4{\'{}} - \gdef^^b5{\v l} - \gdef^^b6{\'s} - \gdef^^b7{\v{}} - \gdef^^b8{\cedilla\ } - \gdef^^b9{\v s} - \gdef^^ba{\cedilla s} - \gdef^^bb{\v t} - \gdef^^bc{\'z} - \gdef^^bd{\H{}} - \gdef^^be{\v z} - \gdef^^bf{\dotaccent z} - % - \gdef^^c0{\'R} - \gdef^^c1{\'A} - \gdef^^c2{\^A} - \gdef^^c3{\u A} - \gdef^^c4{\"A} - \gdef^^c5{\'L} - \gdef^^c6{\'C} - \gdef^^c7{\cedilla C} - \gdef^^c8{\v C} - \gdef^^c9{\'E} - \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}} - \gdef^^cb{\"E} - \gdef^^cc{\v E} - \gdef^^cd{\'I} - \gdef^^ce{\^I} - \gdef^^cf{\v D} - % - \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}} - \gdef^^d1{\'N} - \gdef^^d2{\v N} - \gdef^^d3{\'O} - \gdef^^d4{\^O} - \gdef^^d5{\H O} - \gdef^^d6{\"O} - \gdef^^d7{$\times$} - \gdef^^d8{\v R} - \gdef^^d9{\ringaccent U} - \gdef^^da{\'U} - \gdef^^db{\H U} - \gdef^^dc{\"U} - \gdef^^dd{\'Y} - \gdef^^de{\cedilla T} - \gdef^^df{\ss} - % - \gdef^^e0{\'r} - \gdef^^e1{\'a} - \gdef^^e2{\^a} - \gdef^^e3{\u a} - \gdef^^e4{\"a} - \gdef^^e5{\'l} - \gdef^^e6{\'c} - \gdef^^e7{\cedilla c} - \gdef^^e8{\v c} - \gdef^^e9{\'e} - \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}} - \gdef^^eb{\"e} - \gdef^^ec{\v e} - \gdef^^ed{\'\i} - \gdef^^ee{\^\i} - \gdef^^ef{\v d} - % - \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}} - \gdef^^f1{\'n} - \gdef^^f2{\v n} - \gdef^^f3{\'o} - \gdef^^f4{\^o} - \gdef^^f5{\H o} - \gdef^^f6{\"o} - \gdef^^f7{$\div$} - \gdef^^f8{\v r} - \gdef^^f9{\ringaccent u} - \gdef^^fa{\'u} - \gdef^^fb{\H u} - \gdef^^fc{\"u} - \gdef^^fd{\'y} - \gdef^^fe{\cedilla t} - \gdef^^ff{\dotaccent{}} -} - -% UTF-8 character definitions. -% -% This code to support UTF-8 is based on LaTeX's utf8.def, with some -% changes for Texinfo conventions. It is included here under the GPL by -% permission from Frank Mittelbach and the LaTeX team. -% -\newcount\countUTFx -\newcount\countUTFy -\newcount\countUTFz - -\gdef\UTFviiiTwoOctets#1#2{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\endcsname} -% -\gdef\UTFviiiThreeOctets#1#2#3{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname} -% -\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname} - -\gdef\UTFviiiDefined#1{% - \ifx #1\relax - \message{\linenumber Unicode char \string #1 not defined for Texinfo}% - \else - \expandafter #1% - \fi -} - -\begingroup - \catcode`\~13 - \catcode`\"12 - - \def\UTFviiiLoop{% - \global\catcode\countUTFx\active - \uccode`\~\countUTFx - \uppercase\expandafter{\UTFviiiTmp}% - \advance\countUTFx by 1 - \ifnum\countUTFx < \countUTFy - \expandafter\UTFviiiLoop - \fi} - - \countUTFx = "C2 - \countUTFy = "E0 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiTwoOctets\string~}} - \UTFviiiLoop - - \countUTFx = "E0 - \countUTFy = "F0 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiThreeOctets\string~}} - \UTFviiiLoop - - \countUTFx = "F0 - \countUTFy = "F4 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiFourOctets\string~}} - \UTFviiiLoop -\endgroup - -\begingroup - \catcode`\"=12 - \catcode`\<=12 - \catcode`\.=12 - \catcode`\,=12 - \catcode`\;=12 - \catcode`\!=12 - \catcode`\~=13 - - \gdef\DeclareUnicodeCharacter#1#2{% - \countUTFz = "#1\relax - \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% - \begingroup - \parseXMLCharref - \def\UTFviiiTwoOctets##1##2{% - \csname u8:##1\string ##2\endcsname}% - \def\UTFviiiThreeOctets##1##2##3{% - \csname u8:##1\string ##2\string ##3\endcsname}% - \def\UTFviiiFourOctets##1##2##3##4{% - \csname u8:##1\string ##2\string ##3\string ##4\endcsname}% - \expandafter\expandafter\expandafter\expandafter - \expandafter\expandafter\expandafter - \gdef\UTFviiiTmp{#2}% - \endgroup} - - \gdef\parseXMLCharref{% - \ifnum\countUTFz < "A0\relax - \errhelp = \EMsimple - \errmessage{Cannot define Unicode char value < 00A0}% - \else\ifnum\countUTFz < "800\relax - \parseUTFviiiA,% - \parseUTFviiiB C\UTFviiiTwoOctets.,% - \else\ifnum\countUTFz < "10000\relax - \parseUTFviiiA;% - \parseUTFviiiA,% - \parseUTFviiiB E\UTFviiiThreeOctets.{,;}% - \else - \parseUTFviiiA;% - \parseUTFviiiA,% - \parseUTFviiiA!% - \parseUTFviiiB F\UTFviiiFourOctets.{!,;}% - \fi\fi\fi - } - - \gdef\parseUTFviiiA#1{% - \countUTFx = \countUTFz - \divide\countUTFz by 64 - \countUTFy = \countUTFz - \multiply\countUTFz by 64 - \advance\countUTFx by -\countUTFz - \advance\countUTFx by 128 - \uccode `#1\countUTFx - \countUTFz = \countUTFy} - - \gdef\parseUTFviiiB#1#2#3#4{% - \advance\countUTFz by "#10\relax - \uccode `#3\countUTFz - \uppercase{\gdef\UTFviiiTmp{#2#3#4}}} -\endgroup - -\def\utfeightchardefs{% - \DeclareUnicodeCharacter{00A0}{\tie} - \DeclareUnicodeCharacter{00A1}{\exclamdown} - \DeclareUnicodeCharacter{00A3}{\pounds} - \DeclareUnicodeCharacter{00A8}{\"{ }} - \DeclareUnicodeCharacter{00A9}{\copyright} - \DeclareUnicodeCharacter{00AA}{\ordf} - \DeclareUnicodeCharacter{00AD}{\-} - \DeclareUnicodeCharacter{00AE}{\registeredsymbol} - \DeclareUnicodeCharacter{00AF}{\={ }} - - \DeclareUnicodeCharacter{00B0}{\ringaccent{ }} - \DeclareUnicodeCharacter{00B4}{\'{ }} - \DeclareUnicodeCharacter{00B8}{\cedilla{ }} - \DeclareUnicodeCharacter{00BA}{\ordm} - \DeclareUnicodeCharacter{00BF}{\questiondown} - - \DeclareUnicodeCharacter{00C0}{\`A} - \DeclareUnicodeCharacter{00C1}{\'A} - \DeclareUnicodeCharacter{00C2}{\^A} - \DeclareUnicodeCharacter{00C3}{\~A} - \DeclareUnicodeCharacter{00C4}{\"A} - \DeclareUnicodeCharacter{00C5}{\AA} - \DeclareUnicodeCharacter{00C6}{\AE} - \DeclareUnicodeCharacter{00C7}{\cedilla{C}} - \DeclareUnicodeCharacter{00C8}{\`E} - \DeclareUnicodeCharacter{00C9}{\'E} - \DeclareUnicodeCharacter{00CA}{\^E} - \DeclareUnicodeCharacter{00CB}{\"E} - \DeclareUnicodeCharacter{00CC}{\`I} - \DeclareUnicodeCharacter{00CD}{\'I} - \DeclareUnicodeCharacter{00CE}{\^I} - \DeclareUnicodeCharacter{00CF}{\"I} - - \DeclareUnicodeCharacter{00D1}{\~N} - \DeclareUnicodeCharacter{00D2}{\`O} - \DeclareUnicodeCharacter{00D3}{\'O} - \DeclareUnicodeCharacter{00D4}{\^O} - \DeclareUnicodeCharacter{00D5}{\~O} - \DeclareUnicodeCharacter{00D6}{\"O} - \DeclareUnicodeCharacter{00D8}{\O} - \DeclareUnicodeCharacter{00D9}{\`U} - \DeclareUnicodeCharacter{00DA}{\'U} - \DeclareUnicodeCharacter{00DB}{\^U} - \DeclareUnicodeCharacter{00DC}{\"U} - \DeclareUnicodeCharacter{00DD}{\'Y} - \DeclareUnicodeCharacter{00DF}{\ss} - - \DeclareUnicodeCharacter{00E0}{\`a} - \DeclareUnicodeCharacter{00E1}{\'a} - \DeclareUnicodeCharacter{00E2}{\^a} - \DeclareUnicodeCharacter{00E3}{\~a} - \DeclareUnicodeCharacter{00E4}{\"a} - \DeclareUnicodeCharacter{00E5}{\aa} - \DeclareUnicodeCharacter{00E6}{\ae} - \DeclareUnicodeCharacter{00E7}{\cedilla{c}} - \DeclareUnicodeCharacter{00E8}{\`e} - \DeclareUnicodeCharacter{00E9}{\'e} - \DeclareUnicodeCharacter{00EA}{\^e} - \DeclareUnicodeCharacter{00EB}{\"e} - \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}} - \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}} - \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} - \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} - - \DeclareUnicodeCharacter{00F1}{\~n} - \DeclareUnicodeCharacter{00F2}{\`o} - \DeclareUnicodeCharacter{00F3}{\'o} - \DeclareUnicodeCharacter{00F4}{\^o} - \DeclareUnicodeCharacter{00F5}{\~o} - \DeclareUnicodeCharacter{00F6}{\"o} - \DeclareUnicodeCharacter{00F8}{\o} - \DeclareUnicodeCharacter{00F9}{\`u} - \DeclareUnicodeCharacter{00FA}{\'u} - \DeclareUnicodeCharacter{00FB}{\^u} - \DeclareUnicodeCharacter{00FC}{\"u} - \DeclareUnicodeCharacter{00FD}{\'y} - \DeclareUnicodeCharacter{00FF}{\"y} - - \DeclareUnicodeCharacter{0100}{\=A} - \DeclareUnicodeCharacter{0101}{\=a} - \DeclareUnicodeCharacter{0102}{\u{A}} - \DeclareUnicodeCharacter{0103}{\u{a}} - \DeclareUnicodeCharacter{0106}{\'C} - \DeclareUnicodeCharacter{0107}{\'c} - \DeclareUnicodeCharacter{0108}{\^C} - \DeclareUnicodeCharacter{0109}{\^c} - \DeclareUnicodeCharacter{010A}{\dotaccent{C}} - \DeclareUnicodeCharacter{010B}{\dotaccent{c}} - \DeclareUnicodeCharacter{010C}{\v{C}} - \DeclareUnicodeCharacter{010D}{\v{c}} - \DeclareUnicodeCharacter{010E}{\v{D}} - - \DeclareUnicodeCharacter{0112}{\=E} - \DeclareUnicodeCharacter{0113}{\=e} - \DeclareUnicodeCharacter{0114}{\u{E}} - \DeclareUnicodeCharacter{0115}{\u{e}} - \DeclareUnicodeCharacter{0116}{\dotaccent{E}} - \DeclareUnicodeCharacter{0117}{\dotaccent{e}} - \DeclareUnicodeCharacter{011A}{\v{E}} - \DeclareUnicodeCharacter{011B}{\v{e}} - \DeclareUnicodeCharacter{011C}{\^G} - \DeclareUnicodeCharacter{011D}{\^g} - \DeclareUnicodeCharacter{011E}{\u{G}} - \DeclareUnicodeCharacter{011F}{\u{g}} - - \DeclareUnicodeCharacter{0120}{\dotaccent{G}} - \DeclareUnicodeCharacter{0121}{\dotaccent{g}} - \DeclareUnicodeCharacter{0124}{\^H} - \DeclareUnicodeCharacter{0125}{\^h} - \DeclareUnicodeCharacter{0128}{\~I} - \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}} - \DeclareUnicodeCharacter{012A}{\=I} - \DeclareUnicodeCharacter{012B}{\={\dotless{i}}} - \DeclareUnicodeCharacter{012C}{\u{I}} - \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}} - - \DeclareUnicodeCharacter{0130}{\dotaccent{I}} - \DeclareUnicodeCharacter{0131}{\dotless{i}} - \DeclareUnicodeCharacter{0132}{IJ} - \DeclareUnicodeCharacter{0133}{ij} - \DeclareUnicodeCharacter{0134}{\^J} - \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}} - \DeclareUnicodeCharacter{0139}{\'L} - \DeclareUnicodeCharacter{013A}{\'l} - - \DeclareUnicodeCharacter{0141}{\L} - \DeclareUnicodeCharacter{0142}{\l} - \DeclareUnicodeCharacter{0143}{\'N} - \DeclareUnicodeCharacter{0144}{\'n} - \DeclareUnicodeCharacter{0147}{\v{N}} - \DeclareUnicodeCharacter{0148}{\v{n}} - \DeclareUnicodeCharacter{014C}{\=O} - \DeclareUnicodeCharacter{014D}{\=o} - \DeclareUnicodeCharacter{014E}{\u{O}} - \DeclareUnicodeCharacter{014F}{\u{o}} - - \DeclareUnicodeCharacter{0150}{\H{O}} - \DeclareUnicodeCharacter{0151}{\H{o}} - \DeclareUnicodeCharacter{0152}{\OE} - \DeclareUnicodeCharacter{0153}{\oe} - \DeclareUnicodeCharacter{0154}{\'R} - \DeclareUnicodeCharacter{0155}{\'r} - \DeclareUnicodeCharacter{0158}{\v{R}} - \DeclareUnicodeCharacter{0159}{\v{r}} - \DeclareUnicodeCharacter{015A}{\'S} - \DeclareUnicodeCharacter{015B}{\'s} - \DeclareUnicodeCharacter{015C}{\^S} - \DeclareUnicodeCharacter{015D}{\^s} - \DeclareUnicodeCharacter{015E}{\cedilla{S}} - \DeclareUnicodeCharacter{015F}{\cedilla{s}} - - \DeclareUnicodeCharacter{0160}{\v{S}} - \DeclareUnicodeCharacter{0161}{\v{s}} - \DeclareUnicodeCharacter{0162}{\cedilla{t}} - \DeclareUnicodeCharacter{0163}{\cedilla{T}} - \DeclareUnicodeCharacter{0164}{\v{T}} - - \DeclareUnicodeCharacter{0168}{\~U} - \DeclareUnicodeCharacter{0169}{\~u} - \DeclareUnicodeCharacter{016A}{\=U} - \DeclareUnicodeCharacter{016B}{\=u} - \DeclareUnicodeCharacter{016C}{\u{U}} - \DeclareUnicodeCharacter{016D}{\u{u}} - \DeclareUnicodeCharacter{016E}{\ringaccent{U}} - \DeclareUnicodeCharacter{016F}{\ringaccent{u}} - - \DeclareUnicodeCharacter{0170}{\H{U}} - \DeclareUnicodeCharacter{0171}{\H{u}} - \DeclareUnicodeCharacter{0174}{\^W} - \DeclareUnicodeCharacter{0175}{\^w} - \DeclareUnicodeCharacter{0176}{\^Y} - \DeclareUnicodeCharacter{0177}{\^y} - \DeclareUnicodeCharacter{0178}{\"Y} - \DeclareUnicodeCharacter{0179}{\'Z} - \DeclareUnicodeCharacter{017A}{\'z} - \DeclareUnicodeCharacter{017B}{\dotaccent{Z}} - \DeclareUnicodeCharacter{017C}{\dotaccent{z}} - \DeclareUnicodeCharacter{017D}{\v{Z}} - \DeclareUnicodeCharacter{017E}{\v{z}} - - \DeclareUnicodeCharacter{01C4}{D\v{Z}} - \DeclareUnicodeCharacter{01C5}{D\v{z}} - \DeclareUnicodeCharacter{01C6}{d\v{z}} - \DeclareUnicodeCharacter{01C7}{LJ} - \DeclareUnicodeCharacter{01C8}{Lj} - \DeclareUnicodeCharacter{01C9}{lj} - \DeclareUnicodeCharacter{01CA}{NJ} - \DeclareUnicodeCharacter{01CB}{Nj} - \DeclareUnicodeCharacter{01CC}{nj} - \DeclareUnicodeCharacter{01CD}{\v{A}} - \DeclareUnicodeCharacter{01CE}{\v{a}} - \DeclareUnicodeCharacter{01CF}{\v{I}} - - \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}} - \DeclareUnicodeCharacter{01D1}{\v{O}} - \DeclareUnicodeCharacter{01D2}{\v{o}} - \DeclareUnicodeCharacter{01D3}{\v{U}} - \DeclareUnicodeCharacter{01D4}{\v{u}} - - \DeclareUnicodeCharacter{01E2}{\={\AE}} - \DeclareUnicodeCharacter{01E3}{\={\ae}} - \DeclareUnicodeCharacter{01E6}{\v{G}} - \DeclareUnicodeCharacter{01E7}{\v{g}} - \DeclareUnicodeCharacter{01E8}{\v{K}} - \DeclareUnicodeCharacter{01E9}{\v{k}} - - \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}} - \DeclareUnicodeCharacter{01F1}{DZ} - \DeclareUnicodeCharacter{01F2}{Dz} - \DeclareUnicodeCharacter{01F3}{dz} - \DeclareUnicodeCharacter{01F4}{\'G} - \DeclareUnicodeCharacter{01F5}{\'g} - \DeclareUnicodeCharacter{01F8}{\`N} - \DeclareUnicodeCharacter{01F9}{\`n} - \DeclareUnicodeCharacter{01FC}{\'{\AE}} - \DeclareUnicodeCharacter{01FD}{\'{\ae}} - \DeclareUnicodeCharacter{01FE}{\'{\O}} - \DeclareUnicodeCharacter{01FF}{\'{\o}} - - \DeclareUnicodeCharacter{021E}{\v{H}} - \DeclareUnicodeCharacter{021F}{\v{h}} - - \DeclareUnicodeCharacter{0226}{\dotaccent{A}} - \DeclareUnicodeCharacter{0227}{\dotaccent{a}} - \DeclareUnicodeCharacter{0228}{\cedilla{E}} - \DeclareUnicodeCharacter{0229}{\cedilla{e}} - \DeclareUnicodeCharacter{022E}{\dotaccent{O}} - \DeclareUnicodeCharacter{022F}{\dotaccent{o}} - - \DeclareUnicodeCharacter{0232}{\=Y} - \DeclareUnicodeCharacter{0233}{\=y} - \DeclareUnicodeCharacter{0237}{\dotless{j}} - - \DeclareUnicodeCharacter{1E02}{\dotaccent{B}} - \DeclareUnicodeCharacter{1E03}{\dotaccent{b}} - \DeclareUnicodeCharacter{1E04}{\udotaccent{B}} - \DeclareUnicodeCharacter{1E05}{\udotaccent{b}} - \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}} - \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}} - \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}} - \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}} - \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}} - \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}} - \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}} - \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}} - - \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}} - \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}} - - \DeclareUnicodeCharacter{1E20}{\=G} - \DeclareUnicodeCharacter{1E21}{\=g} - \DeclareUnicodeCharacter{1E22}{\dotaccent{H}} - \DeclareUnicodeCharacter{1E23}{\dotaccent{h}} - \DeclareUnicodeCharacter{1E24}{\udotaccent{H}} - \DeclareUnicodeCharacter{1E25}{\udotaccent{h}} - \DeclareUnicodeCharacter{1E26}{\"H} - \DeclareUnicodeCharacter{1E27}{\"h} - - \DeclareUnicodeCharacter{1E30}{\'K} - \DeclareUnicodeCharacter{1E31}{\'k} - \DeclareUnicodeCharacter{1E32}{\udotaccent{K}} - \DeclareUnicodeCharacter{1E33}{\udotaccent{k}} - \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}} - \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}} - \DeclareUnicodeCharacter{1E36}{\udotaccent{L}} - \DeclareUnicodeCharacter{1E37}{\udotaccent{l}} - \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}} - \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}} - \DeclareUnicodeCharacter{1E3E}{\'M} - \DeclareUnicodeCharacter{1E3F}{\'m} - - \DeclareUnicodeCharacter{1E40}{\dotaccent{M}} - \DeclareUnicodeCharacter{1E41}{\dotaccent{m}} - \DeclareUnicodeCharacter{1E42}{\udotaccent{M}} - \DeclareUnicodeCharacter{1E43}{\udotaccent{m}} - \DeclareUnicodeCharacter{1E44}{\dotaccent{N}} - \DeclareUnicodeCharacter{1E45}{\dotaccent{n}} - \DeclareUnicodeCharacter{1E46}{\udotaccent{N}} - \DeclareUnicodeCharacter{1E47}{\udotaccent{n}} - \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}} - \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}} - - \DeclareUnicodeCharacter{1E54}{\'P} - \DeclareUnicodeCharacter{1E55}{\'p} - \DeclareUnicodeCharacter{1E56}{\dotaccent{P}} - \DeclareUnicodeCharacter{1E57}{\dotaccent{p}} - \DeclareUnicodeCharacter{1E58}{\dotaccent{R}} - \DeclareUnicodeCharacter{1E59}{\dotaccent{r}} - \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}} - \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}} - \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}} - \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}} - - \DeclareUnicodeCharacter{1E60}{\dotaccent{S}} - \DeclareUnicodeCharacter{1E61}{\dotaccent{s}} - \DeclareUnicodeCharacter{1E62}{\udotaccent{S}} - \DeclareUnicodeCharacter{1E63}{\udotaccent{s}} - \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}} - \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}} - \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}} - \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}} - \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}} - \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}} - - \DeclareUnicodeCharacter{1E7C}{\~V} - \DeclareUnicodeCharacter{1E7D}{\~v} - \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}} - \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}} - - \DeclareUnicodeCharacter{1E80}{\`W} - \DeclareUnicodeCharacter{1E81}{\`w} - \DeclareUnicodeCharacter{1E82}{\'W} - \DeclareUnicodeCharacter{1E83}{\'w} - \DeclareUnicodeCharacter{1E84}{\"W} - \DeclareUnicodeCharacter{1E85}{\"w} - \DeclareUnicodeCharacter{1E86}{\dotaccent{W}} - \DeclareUnicodeCharacter{1E87}{\dotaccent{w}} - \DeclareUnicodeCharacter{1E88}{\udotaccent{W}} - \DeclareUnicodeCharacter{1E89}{\udotaccent{w}} - \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}} - \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}} - \DeclareUnicodeCharacter{1E8C}{\"X} - \DeclareUnicodeCharacter{1E8D}{\"x} - \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}} - \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}} - - \DeclareUnicodeCharacter{1E90}{\^Z} - \DeclareUnicodeCharacter{1E91}{\^z} - \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}} - \DeclareUnicodeCharacter{1E93}{\udotaccent{z}} - \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}} - \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}} - \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}} - \DeclareUnicodeCharacter{1E97}{\"t} - \DeclareUnicodeCharacter{1E98}{\ringaccent{w}} - \DeclareUnicodeCharacter{1E99}{\ringaccent{y}} - - \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}} - \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}} - - \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}} - \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}} - \DeclareUnicodeCharacter{1EBC}{\~E} - \DeclareUnicodeCharacter{1EBD}{\~e} - - \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}} - \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}} - \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}} - \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}} - - \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}} - \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}} - - \DeclareUnicodeCharacter{1EF2}{\`Y} - \DeclareUnicodeCharacter{1EF3}{\`y} - \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}} - - \DeclareUnicodeCharacter{1EF8}{\~Y} - \DeclareUnicodeCharacter{1EF9}{\~y} - - \DeclareUnicodeCharacter{2013}{--} - \DeclareUnicodeCharacter{2014}{---} - \DeclareUnicodeCharacter{2022}{\bullet} - \DeclareUnicodeCharacter{2026}{\dots} - \DeclareUnicodeCharacter{20AC}{\euro} - - \DeclareUnicodeCharacter{2192}{\expansion} - \DeclareUnicodeCharacter{21D2}{\result} - - \DeclareUnicodeCharacter{2212}{\minus} - \DeclareUnicodeCharacter{2217}{\point} - \DeclareUnicodeCharacter{2261}{\equiv} -}% end of \utfeightchardefs - - -% US-ASCII character definitions. -\def\asciichardefs{% nothing need be done - \relax -} - -% Make non-ASCII characters printable again for compatibility with -% existing Texinfo documents that may use them, even without declaring a -% document encoding. -% -\setnonasciicharscatcode \other - - -\message{formatting,} - -\newdimen\defaultparindent \defaultparindent = 15pt - -\chapheadingskip = 15pt plus 4pt minus 2pt -\secheadingskip = 12pt plus 3pt minus 2pt -\subsecheadingskip = 9pt plus 2pt minus 2pt - -% Prevent underfull vbox error messages. -\vbadness = 10000 - -% Don't be so finicky about underfull hboxes, either. -\hbadness = 2000 - -% Following George Bush, just get rid of widows and orphans. -\widowpenalty=10000 -\clubpenalty=10000 - -% Use TeX 3.0's \emergencystretch to help line breaking, but if we're -% using an old version of TeX, don't do anything. We want the amount of -% stretch added to depend on the line length, hence the dependence on -% \hsize. We call this whenever the paper size is set. -% -\def\setemergencystretch{% - \ifx\emergencystretch\thisisundefined - % Allow us to assign to \emergencystretch anyway. - \def\emergencystretch{\dimen0}% - \else - \emergencystretch = .15\hsize - \fi -} - -% Parameters in order: 1) textheight; 2) textwidth; -% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip; -% 7) physical page height; 8) physical page width. -% -% We also call \setleading{\textleading}, so the caller should define -% \textleading. The caller should also set \parskip. -% -\def\internalpagesizes#1#2#3#4#5#6#7#8{% - \voffset = #3\relax - \topskip = #6\relax - \splittopskip = \topskip - % - \vsize = #1\relax - \advance\vsize by \topskip - \outervsize = \vsize - \advance\outervsize by 2\topandbottommargin - \pageheight = \vsize - % - \hsize = #2\relax - \outerhsize = \hsize - \advance\outerhsize by 0.5in - \pagewidth = \hsize - % - \normaloffset = #4\relax - \bindingoffset = #5\relax - % - \ifpdf - \pdfpageheight #7\relax - \pdfpagewidth #8\relax - \fi - % - \setleading{\textleading} - % - \parindent = \defaultparindent - \setemergencystretch -} - -% @letterpaper (the default). -\def\letterpaper{{\globaldefs = 1 - \parskip = 3pt plus 2pt minus 1pt - \textleading = 13.2pt - % - % If page is nothing but text, make it come out even. - \internalpagesizes{46\baselineskip}{6in}% - {\voffset}{.25in}% - {\bindingoffset}{36pt}% - {11in}{8.5in}% -}} - -% Use @smallbook to reset parameters for 7x9.25 trim size. -\def\smallbook{{\globaldefs = 1 - \parskip = 2pt plus 1pt - \textleading = 12pt - % - \internalpagesizes{7.5in}{5in}% - {\voffset}{.25in}% - {\bindingoffset}{16pt}% - {9.25in}{7in}% - % - \lispnarrowing = 0.3in - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = .5cm -}} - -% Use @smallerbook to reset parameters for 6x9 trim size. -% (Just testing, parameters still in flux.) -\def\smallerbook{{\globaldefs = 1 - \parskip = 1.5pt plus 1pt - \textleading = 12pt - % - \internalpagesizes{7.4in}{4.8in}% - {-.2in}{-.4in}% - {0pt}{14pt}% - {9in}{6in}% - % - \lispnarrowing = 0.25in - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = .4cm -}} - -% Use @afourpaper to print on European A4 paper. -\def\afourpaper{{\globaldefs = 1 - \parskip = 3pt plus 2pt minus 1pt - \textleading = 13.2pt - % - % Double-side printing via postscript on Laserjet 4050 - % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm. - % To change the settings for a different printer or situation, adjust - % \normaloffset until the front-side and back-side texts align. Then - % do the same for \bindingoffset. You can set these for testing in - % your texinfo source file like this: - % @tex - % \global\normaloffset = -6mm - % \global\bindingoffset = 10mm - % @end tex - \internalpagesizes{51\baselineskip}{160mm} - {\voffset}{\hoffset}% - {\bindingoffset}{44pt}% - {297mm}{210mm}% - % - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = 5mm -}} - -% Use @afivepaper to print on European A5 paper. -% From romildo@urano.iceb.ufop.br, 2 July 2000. -% He also recommends making @example and @lisp be small. -\def\afivepaper{{\globaldefs = 1 - \parskip = 2pt plus 1pt minus 0.1pt - \textleading = 12.5pt - % - \internalpagesizes{160mm}{120mm}% - {\voffset}{\hoffset}% - {\bindingoffset}{8pt}% - {210mm}{148mm}% - % - \lispnarrowing = 0.2in - \tolerance = 800 - \hfuzz = 1.2pt - \contentsrightmargin = 0pt - \defbodyindent = 2mm - \tableindent = 12mm -}} - -% A specific text layout, 24x15cm overall, intended for A4 paper. -\def\afourlatex{{\globaldefs = 1 - \afourpaper - \internalpagesizes{237mm}{150mm}% - {\voffset}{4.6mm}% - {\bindingoffset}{7mm}% - {297mm}{210mm}% - % - % Must explicitly reset to 0 because we call \afourpaper. - \globaldefs = 0 -}} - -% Use @afourwide to print on A4 paper in landscape format. -\def\afourwide{{\globaldefs = 1 - \afourpaper - \internalpagesizes{241mm}{165mm}% - {\voffset}{-2.95mm}% - {\bindingoffset}{7mm}% - {297mm}{210mm}% - \globaldefs = 0 -}} - -% @pagesizes TEXTHEIGHT[,TEXTWIDTH] -% Perhaps we should allow setting the margins, \topskip, \parskip, -% and/or leading, also. Or perhaps we should compute them somehow. -% -\parseargdef\pagesizes{\pagesizesyyy #1,,\finish} -\def\pagesizesyyy#1,#2,#3\finish{{% - \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi - \globaldefs = 1 - % - \parskip = 3pt plus 2pt minus 1pt - \setleading{\textleading}% - % - \dimen0 = #1 - \advance\dimen0 by \voffset - % - \dimen2 = \hsize - \advance\dimen2 by \normaloffset - % - \internalpagesizes{#1}{\hsize}% - {\voffset}{\normaloffset}% - {\bindingoffset}{44pt}% - {\dimen0}{\dimen2}% -}} - -% Set default to letter. -% -\letterpaper - - -\message{and turning on texinfo input format.} - -% Define macros to output various characters with catcode for normal text. -\catcode`\"=\other -\catcode`\~=\other -\catcode`\^=\other -\catcode`\_=\other -\catcode`\|=\other -\catcode`\<=\other -\catcode`\>=\other -\catcode`\+=\other -\catcode`\$=\other -\def\normaldoublequote{"} -\def\normaltilde{~} -\def\normalcaret{^} -\def\normalunderscore{_} -\def\normalverticalbar{|} -\def\normalless{<} -\def\normalgreater{>} -\def\normalplus{+} -\def\normaldollar{$}%$ font-lock fix - -% This macro is used to make a character print one way in \tt -% (where it can probably be output as-is), and another way in other fonts, -% where something hairier probably needs to be done. -% -% #1 is what to print if we are indeed using \tt; #2 is what to print -% otherwise. Since all the Computer Modern typewriter fonts have zero -% interword stretch (and shrink), and it is reasonable to expect all -% typewriter fonts to have this, we can check that font parameter. -% -\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} - -% Same as above, but check for italic font. Actually this also catches -% non-italic slanted fonts since it is impossible to distinguish them from -% italic fonts. But since this is only used by $ and it uses \sl anyway -% this is not a problem. -\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} - -% Turn off all special characters except @ -% (and those which the user can use as if they were ordinary). -% Most of these we simply print from the \tt font, but for some, we can -% use math or other variants that look better in normal text. - -\catcode`\"=\active -\def\activedoublequote{{\tt\char34}} -\let"=\activedoublequote -\catcode`\~=\active -\def~{{\tt\char126}} -\chardef\hat=`\^ -\catcode`\^=\active -\def^{{\tt \hat}} - -\catcode`\_=\active -\def_{\ifusingtt\normalunderscore\_} -\let\realunder=_ -% Subroutine for the previous macro. -\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em } - -\catcode`\|=\active -\def|{{\tt\char124}} -\chardef \less=`\< -\catcode`\<=\active -\def<{{\tt \less}} -\chardef \gtr=`\> -\catcode`\>=\active -\def>{{\tt \gtr}} -\catcode`\+=\active -\def+{{\tt \char 43}} -\catcode`\$=\active -\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix - -% If a .fmt file is being used, characters that might appear in a file -% name cannot be active until we have parsed the command line. -% So turn them off again, and have \everyjob (or @setfilename) turn them on. -% \otherifyactive is called near the end of this file. -\def\otherifyactive{\catcode`+=\other \catcode`\_=\other} - -% Used sometimes to turn off (effectively) the active characters even after -% parsing them. -\def\turnoffactive{% - \normalturnoffactive - \otherbackslash -} - -\catcode`\@=0 - -% \backslashcurfont outputs one backslash character in current font, -% as in \char`\\. -\global\chardef\backslashcurfont=`\\ -\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work - -% \realbackslash is an actual character `\' with catcode other, and -% \doublebackslash is two of them (for the pdf outlines). -{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}} - -% In texinfo, backslash is an active character; it prints the backslash -% in fixed width font. -\catcode`\\=\active -@def@normalbackslash{{@tt@backslashcurfont}} -% On startup, @fixbackslash assigns: -% @let \ = @normalbackslash - -% \rawbackslash defines an active \ to do \backslashcurfont. -% \otherbackslash defines an active \ to be a literal `\' character with -% catcode other. -@gdef@rawbackslash{@let\=@backslashcurfont} -@gdef@otherbackslash{@let\=@realbackslash} - -% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of -% the literal character `\'. -% -@def@normalturnoffactive{% - @let\=@normalbackslash - @let"=@normaldoublequote - @let~=@normaltilde - @let^=@normalcaret - @let_=@normalunderscore - @let|=@normalverticalbar - @let<=@normalless - @let>=@normalgreater - @let+=@normalplus - @let$=@normaldollar %$ font-lock fix - @unsepspaces -} - -% Make _ and + \other characters, temporarily. -% This is canceled by @fixbackslash. -@otherifyactive - -% If a .fmt file is being used, we don't want the `\input texinfo' to show up. -% That is what \eatinput is for; after that, the `\' should revert to printing -% a backslash. -% -@gdef@eatinput input texinfo{@fixbackslash} -@global@let\ = @eatinput - -% On the other hand, perhaps the file did not have a `\input texinfo'. Then -% the first `\' in the file would cause an error. This macro tries to fix -% that, assuming it is called before the first `\' could plausibly occur. -% Also turn back on active characters that might appear in the input -% file name, in case not using a pre-dumped format. -% -@gdef@fixbackslash{% - @ifx\@eatinput @let\ = @normalbackslash @fi - @catcode`+=@active - @catcode`@_=@active -} - -% Say @foo, not \foo, in error messages. -@escapechar = `@@ - -% These look ok in all fonts, so just make them not special. -@catcode`@& = @other -@catcode`@# = @other -@catcode`@% = @other - - -@c Local variables: -@c eval: (add-hook 'write-file-hooks 'time-stamp) -@c page-delimiter: "^\\\\message" -@c time-stamp-start: "def\\\\texinfoversion{" -@c time-stamp-format: "%:y-%02m-%02d.%02H" -@c time-stamp-end: "}" -@c End: - -@c vim:sw=2: - -@ignore - arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115 -@end ignore diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/ChangeLog-2011 b/src/hos_libhttpserver/src/libgcrypt/cipher/ChangeLog-2011 deleted file mode 100644 index 1ce6bd1e..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/ChangeLog-2011 +++ /dev/null @@ -1,4279 +0,0 @@ -2011-12-01 Werner Koch - - NB: ChangeLog files are no longer manually maintained. Starting - on December 1st, 2011 we put change information only in the GIT - commit log, and generate a top-level ChangeLog file from logs at - "make dist". See doc/HACKING for details. - -2011-09-16 Werner Koch - - * primegen.c (_gcry_primegen_init): New. - -2011-09-15 Werner Koch - - * cipher-cbc.c, cipher-cfb.c, cipher-ofb.c, cipher-ctr.c: New. - * cipher-aeswrap.c: New. - * cipher-internal.h: New. - * cipher.c (cipher_context_alignment_t, struct gcry_cipher_handle) - (CTX_MAGIC_NORMAL, CTX_MAGIC_SECURE, NEED_16BYTE_ALIGNED_CONTEXT) - (MAX_BLOCKSIZE): Move to cipher-internal.h. - (do_aeswrap_encrypt, do_aeswrap_encrypt) - (do_cbc_encrypt, do_cbc_decrypt, do_ctr_encrypt, do_ctr_decrypt) - (do_ofb_encrypt, do_ofb_decrypt, do_ctr_encrypt): Move to the - respective new cipher-foo.c files. - (do_ctr_decrypt): Remove. - -2011-09-15 Werner Koch - - * pubkey.c (gcry_pk_list): Remove. - (gcry_pk_unregister): Remove. - * md.c (gcry_md_list): Remove. - (gcry_md_unregister): Remove. - * cipher.c (gcry_cipher_list): Remove. - (gcry_cipher_unregister): Remove. - * ac.c: Remove. - -2011-06-29 Werner Koch - - * cipher.c (cipher_get_keylen): Return zero for an invalid algorithm. - (cipher_get_blocksize): Ditto. - -2011-06-13 Werner Koch - - * dsa.c (selftest_sign_1024): Use the raw and not the pkcs1 flag. - - * pubkey.c (gcry_pk_sign): Special case output generation for PKCS1. - (sexp_data_to_mpi): Parse "random-override" for pkcs1 encryption. - (pkcs1_encode_for_encryption): Add args RANDOM_OVERRIDE and - RANDOM_OVERRIDE_LEN. - (gcry_pk_encrypt): Special case output generation for PKCS1. - (sexp_data_to_mpi): Use GCRYMPI_FMT_USG for raw encoding. - -2011-06-10 Werner Koch - - * pubkey.c (gcry_pk_sign): Use format specifier '%M' to avoid - leading zeroes. Special case output generation for PSS. - (gcry_pk_encrypt): Special case output generation for OAEP. - (sexp_data_to_mpi): Use GCRYMPI_FMT_USG for PSS verify. - -2011-06-09 Werner Koch - - * pubkey.c (oaep_decode): Make use of octet_string_from_mpi. - (sexp_to_enc): Skip "random-override". - - * pubkey.c (oaep_encode, pss_encode): Add args RANDOM_OVERRIDE and - RANDOM_OVERRIDE_LEN. - (sexp_data_to_mpi): Extract new random-override parameter. - - * pubkey.c (pss_encode, pss_verify): Use VALUE verbatim for MHASH. - (octet_string_from_mpi): Add arg SPACE. - -2011-06-08 Werner Koch - - * pubkey.c (pss_encode, pss_verify): Restructure and comment code - to match rfc-3447. Replace secure allocs by plain allocs and - wipememory. Use gcry_md_hash_buffer. - (octet_string_from_mpi): New. - -2011-06-03 Werner Koch - - * pubkey.c (oaep_decode): Add more comments and restructure to - match the description in RFC-3447. - (oaep_encode): Check for mgf1 error. s/dlen/hlen/. - -2011-05-31 Werner Koch - - * pubkey.c (mgf1): Optimize by using gcry_md_reset. Re-implement - for easier readability. - (oaep_encode): Add more comments and restructure to match the - description in RFC-3447. - - * pubkey.c (pkcs1_encode_for_signature, oaep_decode): Change - return value from one MPI to a buffer. - (gcry_pk_decrypt): Adjust for this change. - -2011-05-30 Werner Koch - - * pubkey.c (pkcs1_decode_for_encryption): Change handling of - leading zero byte. - -2011-05-27 Daiki Ueno - - * pubkey.c (gcry_pk_decrypt): Fix double-free when un-padding - invalid data. Thanks to Tom Ritter. - -2011-05-24 Daiki Ueno - - * rsa.c (rsa_verify): Use CMP if given, to check the decrypted - sig. - - * pubkey.c (sexp_to_enc, sexp_data_to_mpi): Factor out - CTX initialization to ... - (init_encoding_ctx): .. new. - (gcry_pk_verify): Pass verify func and the arg to pubkey_verify. - (pss_encode, pss_verify, pss_verify_cmp): New. - -2011-05-23 Daiki Ueno - - * pubkey.c (pkcs1_decode_for_encryption, oaep_decode): Fix memleak - when gcry_mpi_print fails. - -2011-05-18 Daiki Ueno - - * pubkey.c (sexp_data_to_mpi): Factor some code out to ... - (pkcs1_encode_for_encryption): .. new, - (pkcs1_encode_for_signature): .. new. - (pkcs1_decode_for_encryption): New. - (gcry_pk_decrypt): Do un-padding for PKCS#1 as well as OAEP. - (sexp_to_enc): Abolish "unpad" flag, which is not necessary since - we can do un-padding implicitly when "pkcs1" or "oaep" is given. - -2011-05-11 Werner Koch - - * pubkey.c (sexp_to_enc, sexp_data_to_mpi): Set LABEL to NULL - after free. - (sexp_to_enc, sexp_data_to_mpi): Do not allow multiple encoding - flags. - (oaep_encode, oaep_decode, sexp_to_key, sexp_to_sig) - (sexp_to_enc, sexp_data_to_mpi, gcry_pk_encrypt, gcry_pk_sign) - (gcry_pk_genkey, _gcry_pk_get_elements): Replace access to ERRNO - by gpg_err_code_from_syserror. - -2011-05-11 Daiki Ueno - - * pubkey.c (sexp_data_to_mpi): Factor some code out to ... - (get_hash_algo): .. new. - (mgf1, oaep_encode, oaep_decode): New. - (sexp_to_enc): Add arg CTX. Remove arg RET_WANT_PKCS1. Support - OAEP. - (sexp_data_to_mpi): Add arg CTX. Support OAEP. - (gcry_pk_encrypt): Pass a CTX to sexp_data_to_mpi. - (gcry_pk_decrypt): Pass a CTX tp sexp_to_enc and replace - WANT_PKCS1. Implement unpadding for OAEP. - (gcry_pk_sign): Pass NULL for CTX arg of sexp_data_to_mpi. - (gcry_pk_verify): Ditto. - -2011-04-19 Werner Koch - - * cipher.c (gcry_cipher_open): Replace gpg_err_code_from_errno by - gpg_err_code_from_syserror. - -2011-04-11 Werner Koch - - * pubkey.c (gcry_pk_get_keygrip): Avoid double free of L2. - - * cipher.c (_gcry_cipher_setctr): Clear unused lastiv info. - (gcry_cipher_ctl) : Implement by calling - _gcry_cipher_setctr. - (do_ctr_encrypt): Save last counter and reuse it. - - * cipher.c (do_ctr_encrypt): Allow arbitrary length inputs to - match the 1.4 behaviour. - -2011-04-04 Werner Koch - - * ecc.c (compute_keygrip): Release L1 while parsing "curve". - - * pubkey.c (gcry_pk_get_keygrip): Always release NAME and L2. - Reported by Ben Kibbey. - -2011-03-28 Werner Koch - - * primegen.c (_gcry_generate_elg_prime): Make sure that PRIME is - NULL if the called func ever returns an error. - - * pubkey.c (gcry_pk_decrypt): Remove unused var PUBKEY. - -2011-03-09 Werner Koch - - * kdf.c: New. - -2011-02-22 Werner Koch - - * rijndael.c (aesni_cleanup_2_4): New. - (aesenc_xmm1_xmm0, do_aesni_ctr_4): New. - (_gcry_aes_ctr_enc): New. - * cipher.c (struct gcry_cipher_handle): Add CTR_ENC. Move field - CTR into an u_ctr union and adjust all users. - (gcry_cipher_open): Use _gcry_aes_ctr_enc. - (do_ctr_encrypt): Use bulk mode. - -2011-02-18 Werner Koch - - * rijndael.c (u32_a_t): New. - (do_encrypt_aligned, do_encrypt_aligned): Use the new type to - avoid problems with strict aliasing rules. - -2011-02-16 Werner Koch - - * rijndael.c (do_aesni_cfb) [USE_AESNI]: New. - (_gcry_aes_cfb_enc, _gcry_aes_cfb_dec) [USE_AESNI]: Use new fucntion. - -2011-02-15 Werner Koch - - * rijndael.c (do_aesni_enc_aligned, do_aesni_dec_aligned): Use - movdqa for the key but keep using movdqu for the data. - (do_aesni): Remove alignment detection. Don't burn the stack. - (aesni_prepare, aesni_cleanup): New macros. - (rijndael_encrypt, _gcry_aes_cfb_enc, _gcry_aes_cbc_enc) - (rijndael_decrypt, _gcry_aes_cfb_dec, _gcry_aes_cbc_dec): Use - these macros. Don't burn the stack in the USE_AESNI case. - (do_setkey): Add disabled code to use aeskeygenassist. - -2011-02-14 Werner Koch - - * rijndael.c (ATTR_ALIGNED_16): New - (do_aesni): Do not copy if already aligned. - (do_encrypt, do_decrypt): Ditto. - (rijndael_decrypt, rijndael_encrypt): Increase stack burning amount. - - * rijndael.c (RIJNDAEL_context): Reorder fields. Change fieldname - ROUNDS to rounds. Move padlock_key into u1. - (keySched, keySched2): Rename macros to keyscherr and keyschdec - and change all users. - (padlockkey): New macro. Change all users of padlock_key. - * cipher.c (NEED_16BYTE_ALIGNED_CONTEXT): Always define if using gcc. - (struct gcry_cipher_handle): Align U_IV to at least 16 byte. - -2011-02-13 Werner Koch - - * rijndael.c (USE_AESNI): New. Define for ia32 and gcc >= 4. - (m128i_t) [USE_AESNI]: New. - (RIJNDAEL_context) [USE_AESNI]: Add field use_aesni. - (do_setkey): Set USE_AESNI for all key lengths. - (prepare_decryption) [USE_AESNI]: Use aesimc instn if requested. - (do_aesni_enc_aligned, do_aesni_dec_aligned) - (do_aesni) [USE_AESNI]: New. - (rijndael_encrypt, _gcry_aes_cfb_enc, _gcry_aes_cbc_enc) - (rijndael_decrypt, _gcry_aes_cfb_dec) - (_gcry_aes_cbc_dec) [USE_AESNI]: Use do_aesni. - -2011-02-01 Werner Koch - - * pubkey.c (gcry_pk_get_curve): New. - (sexp_to_key): Add arg OVERRIDE_ELEMS. - (sexp_elements_extract_ecc): Allow for params only. - (gcry_pk_get_param): New. - * ecc.c (ecc_get_curve): New. - (ecc_get_param_sexp): New. - -2011-01-28 Werner Koch - - * pubkey.c (gcry_pk_genkey): Hack to insert the used curve name. - -2011-01-27 Werner Koch - - * ecc.c (fill_in_curve): Remove. - (generate_curve): Rename to .. - (fill_in_curve): this. Remove setting of NAME_OID. - (ecc_encrypt_raw): Change name of arg DATA to K for better - readability. Use ECC_public_key instead of ECC_secret_key. - Require a caller to pass a complete pkey array. - (ecc_decrypt_raw): Require a caller to pass a complete skey array. - (elliptic_curve_t): Add field NAME. - (fill_in_curve): Set field. - (generate_key): Add arg R_USED_CURVE. - (ecc_generate_ext): Return used curve name. - -2011-01-13 Andrey Jivsov (wk) - - * ecc.c (ec2os): Do not free passed parameters X and Y. Adjust - callers. - (ecc_encrypt_raw, ecc_decrypt_raw): New. - (ecdh_names, _gcry_pubkey_spec_ecdh): New. - * pubkey.c (pubkey_table): Support ECDH. - -2010-08-19 Werner Koch - - * cipher.c (gcry_cipher_open): Remove double release of the module. - Fixes bug#1263. - -2010-06-10 Jeff Johnson (wk) - - * ecc.c (ecc_generate_ext): Parse transient-key flag. - (generate_key): Add arg TRANSIENT_KEY and use it to set the random - level. - -2010-04-12 Brad Hards (wk) - - Spelling fixes. - -2010-03-26 Werner Koch - - * tiger.c (asn): Unfetter the old TIGER from an OID. - (TIGER_CONTEXT): Add field VARIANT. - (tiger_init): Factor code out to ... - (do_init): New. - (tiger1_init, tiger2_init): New. - (_gcry_digest_spec_tiger1, _gcry_digest_spec_tiger2): New. - * md.c (digest_table): Add TIGER1 and TIGER2 variants. - -2009-12-11 Werner Koch - - * sha256.c (Cho, Maj, Sum0, Sum1): Turn macros into inline - functions. - (transform): Partly unroll to interweave the chain variables - - * sha512.c (ROTR, Ch, Maj, Sum0, Sum1): Turn macros into inline - functions. - (transform): Partly unroll to interweave the chain variables. - Suggested by Christian Grothoff. - -2009-12-10 Werner Koch - - * Makefile.am (o_flag_munging): New. - (tiger.o, tiger.lo): Use it. - - * cipher.c (do_ctr_encrypt): Add arg OUTBUFLEN. Check for - suitable value. Add check for valid inputlen. Wipe temporary - memory. - (do_ctr_decrypt): Likewise. - (do_cbc_encrypt, do_cbc_decrypt): Add arg OUTBUFLEN. Check for - suitable value. Move check for valid inputlen to here; change - returned error from INV_ARG to INV_LENGTH. - (do_ecb_encrypt, do_ecb_decrypt): Ditto. - (do_cfb_encrypt, do_cfb_decrypt): Ditto. - (do_ofb_encrypt, do_ofb_decrypt): Ditto. - (cipher_encrypt, cipher_encrypt): Adjust for above changes. - (gcry_cipher_encrypt, gcry_cipher_decrypt): Simplify. - -2009-12-09 Werner Koch - - * cipher.c (gcry_cipher_open): Allow for GCRY_CIPHER_MODE_AESWRAP. - (cipher_encrypt, cipher_decrypt): Ditto. - (do_aeswrap_encrypt, do_aeswrap_decrypt): New. - (struct gcry_cipher_handle): Add field marks. - (cipher_setkey, cipher_setiv): Update marks flags. - (cipher_reset): Reset marks. - (cipher_encrypt, cipher_decrypt): Add new arg OUTBUFLEN. - (gcry_cipher_encrypt, gcry_cipher_decrypt): Pass outbuflen to - cipher_encrypt. Replace GPG_ERR_TOO_SHORT by - GPG_ERR_BUFFER_TOO_SHORT. - -2009-08-21 Werner Koch - - * dsa.c (dsa_generate_ext): Release retfactors array before - setting it to NULL. Reported by Daiko Ueno. - -2009-07-02 Werner Koch - - * md.c (md_read): Fix incomplete check for NULL. - Reported by Fabian Kail. - -2009-03-31 Werner Koch - - * rsa.c (rsa_check_secret_key): Return GPG_ERR_BAD_SECKEY and not - GPG_ERR_PUBKEY_ALGO. - -2009-02-16 Werner Koch - - * rsa.c (generate_x931): Do not initialize TBL with automatic - variables. - * whirlpool.c, tiger.c, sha256.c, sha1.c, rmd160.c, md5.c - * md4.c, crc.c: Remove memory.h. This is garbage from gnupg. - Reported by Dan Fandrich. - -2009-01-22 Werner Koch - - * ecc.c (compute_keygrip): Remove superfluous const. - -2009-01-06 Werner Koch - - * rmd160.c (oid_spec_rmd160): Add TeleTrust identifier. - -2008-12-10 Werner Koch - - * dsa.c (generate): Add arg DOMAIN and use it if specified. - (generate_fips186): Ditto. - (dsa_generate_ext): Parse and check the optional "domain" - parameter and pass them to the generate functions. - - * rijndael.c (rijndael_names): Add "AES128" and "AES-128". - (rijndael192_names): Add "AES-192". - (rijndael256_names): Add "AES-256". - -2008-12-05 Werner Koch - - * dsa.c (generate): Add arg TRANSIENT_KEY and use it to detrmine - the RNG quality needed. - (dsa_generate_ext): Parse the transient-key flag und pass it to - generate. - -2008-11-28 Werner Koch - - * dsa.c (generate_fips186): Add arg DERIVEPARMS and use the seed - value if available. - - * primegen.c (_gcry_generate_fips186_2_prime): Fix inner p loop. - -2008-11-26 Werner Koch - - * primegen.c (_gcry_generate_fips186_3_prime): New. - * dsa.c (generate_fips186): Add arg USE_FIPS186_2. - (dsa_generate_ext): Parse new flag use-fips183-2. - -2008-11-25 Werner Koch - - * dsa.c (generate_fips186): New. - (dsa_generate_ext): Use new function if derive-parms are given or - if in FIPS mode. - * primegen.c (_gcry_generate_fips186_2_prime): New. - -2008-11-24 Werner Koch - - * pubkey.c (gcry_pk_genkey): Insert code to output extrainfo. - (pubkey_generate): Add arg R_EXTRAINFO and pass it to the extended - key generation function. - * rsa.c (gen_x931_parm_xp, gen_x931_parm_xi): New. - (generate_x931): Generate params if not given. - (rsa_generate_ext): Parse use-x931 flag. Return p-q-swapped - indicator. - * dsa.c (dsa_generate_ext): Put RETFACTORS into R_EXTRAINFO if - possible. - - * pubkey.c (gcry_pk_genkey): Remove parsing of almost all - parameters and pass the parameter S-expression to pubkey_generate. - (pubkey_generate): Simplify by requitring modules to parse the - parameters. Remove the special cases for Elgamal and ECC. - (sexp_elements_extract_ecc): Add arg EXTRASPEC and use it. Fix - small memory leak. - (sexp_to_key): Pass EXTRASPEC to sexp_elements_extract_ecc. - (pubkey_table) [USE_ELGAMAL]: Add real extraspec. - * rsa.c (rsa_generate_ext): Adjust for new calling convention. - * dsa.c (dsa_generate_ext): Ditto. - * elgamal.c (_gcry_elg_generate): Ditto. Rename to elg_generate_ext. - (elg_generate): New. - (_gcry_elg_generate_using_x): Remove after merging code with - elg_generate_ext. - (_gcry_pubkey_extraspec_elg): New. - (_gcry_elg_check_secret_key, _gcry_elg_encrypt, _gcry_elg_sign) - (_gcry_elg_verify, _gcry_elg_get_nbits): Make static and remove - _gcry_ prefix. - * ecc.c (_gcry_ecc_generate): Rename to ecc_generate_ext and - adjust for new calling convention. - (_gcry_ecc_get_param): Rename to ecc_get_param and make static. - (_gcry_pubkey_extraspec_ecdsa): Add ecc_generate_ext and - ecc_get_param. - -2008-11-20 Werner Koch - - * pubkey.c (pubkey_generate): Add arg DERIVEPARMS. - (gcry_pk_genkey): Parse derive-parms and pass it to above. - * rsa.c (generate_x931): New. - (rsa_generate_ext): Add arg DERIVEPARMS and call new function in - fips mode or if DERIVEPARMS is given. - * primegen.c (_gcry_derive_x931_prime, find_x931_prime): New. - -2008-11-19 Werner Koch - - * rsa.c (rsa_decrypt): Use gcry_create_nonce for blinding. - (generate): Rename to generate_std. - -2008-11-05 Werner Koch - - * md.c (md_open): Use a switch to set the Bsize. - (prepare_macpads): Fix long key case for SHA384 and SHA512. - - * cipher.c (gcry_cipher_handle): Add field EXTRASPEC. - (gcry_cipher_open): Set it. - (gcry_cipher_ctl): Add private control code to disable weak key - detection and to return the current input block. - * des.c (_tripledes_ctx): Add field FLAGS. - (do_tripledes_set_extra_info): New. - (_gcry_cipher_extraspec_tripledes): Add new function. - (do_tripledes_setkey): Disable weak key detection. - -2008-10-24 Werner Koch - - * md.c (digest_table): Allow MD5 in fips mode. - (md_register_default): Take special action for MD5. - (md_enable, gcry_md_hash_buffer): Ditto. - -2008-09-30 Werner Koch - - * rijndael.c (do_setkey): Properly align "t" and "tk". - (prepare_decryption): Properly align "w". Fixes bug #936. - -2008-09-18 Werner Koch - - * pubkey.c (gcry_pk_genkey): Parse domain parameter. - (pubkey_generate): Add new arg DOMAIN and remove special case for - DSA with qbits. - * rsa.c (rsa_generate): Add dummy args QBITS, NAME and DOMAIN and - rename to rsa_generate_ext. Change caller. - (_gcry_rsa_generate, _gcry_rsa_check_secret_key) - (_gcry_rsa_encrypt, _gcry_rsa_decrypt, _gcry_rsa_sign) - (_gcry_rsa_verify, _gcry_rsa_get_nbits): Make static and remove - _gcry_ prefix. - (_gcry_pubkey_spec_rsa, _gcry_pubkey_extraspec_rsa): Adjust names. - * dsa.c (dsa_generate_ext): New. - (_gcry_dsa_generate): Replace code by a call to dsa_generate. - (_gcry_dsa_check_secret_key, _gcry_dsa_sign, _gcry_dsa_verify) - (_gcry_dsa_get_nbits): Make static and remove _gcry prefix. - (_gcry_dsa_generate2): Remove. - (_gcry_pubkey_spec_dsa): Adjust to name changes. - (_gcry_pubkey_extraspec_rsa): Add dsa_generate_ext. - -2008-09-16 Werner Koch - - * ecc.c (run_selftests): Add arg EXTENDED. - -2008-09-12 Werner Koch - - * rsa.c (test_keys): Do a bad case signature check. - * dsa.c (test_keys): Do a bad case check. - - * cipher.c (_gcry_cipher_selftest): Add arg EXTENDED and pass it - to the called tests. - * md.c (_gcry_md_selftest): Ditto. - * pubkey.c (_gcry_pk_selftest): Ditto. - * rijndael.c (run_selftests): Add arg EXTENDED and pass it to the - called tests. - (selftest_fips_128): Add arg EXTENDED and run only one test - non-extended mode. - (selftest_fips_192): Add dummy arg EXTENDED. - (selftest_fips_256): Ditto. - * hmac-tests.c (_gcry_hmac_selftest): Ditto. - (run_selftests): Ditto. - (selftests_sha1): Add arg EXTENDED and run only one test - non-extended mode. - (selftests_sha224, selftests_sha256): Ditto. - (selftests_sha384, selftests_sha512): Ditto. - * sha1.c (run_selftests): Add arg EXTENDED and pass it to the - called test. - (selftests_sha1): Add arg EXTENDED and run only one test - non-extended mode. - * sha256.c (run_selftests): Add arg EXTENDED and pass it to the - called tests. - (selftests_sha224): Add arg EXTENDED and run only one test - non-extended mode. - (selftests_sha256): Ditto. - * sha512.c (run_selftests): Add arg EXTENDED and pass it to the - called tests. - (selftests_sha384): Add arg EXTENDED and run only one test - non-extended mode. - (selftests_sha512): Ditto. - * des.c (run_selftests): Add arg EXTENDED and pass it to the - called test. - (selftest_fips): Add dummy arg EXTENDED. - * rsa.c (run_selftests): Add dummy arg EXTENDED. - - * dsa.c (run_selftests): Add dummy arg EXTENDED. - - * rsa.c (extract_a_from_sexp): New. - (selftest_encr_1024): Check that the ciphertext does not match the - plaintext. - (test_keys): Improve tests and return an error status. - (generate): Return an error if test_keys fails. - * dsa.c (test_keys): Add comments and return an error status. - (generate): Return an error if test_keys failed. - -2008-09-11 Werner Koch - - * rsa.c (_gcry_rsa_decrypt): Return an error instead of calling - BUG in case of a practically impossible condition. - (sample_secret_key, sample_public_key): New. - (selftest_sign_1024, selftest_encr_1024): New. - (selftests_rsa): Implement tests. - * dsa.c (sample_secret_key, sample_public_key): New. - (selftest_sign_1024): New. - (selftests_dsa): Implement tests. - -2008-09-09 Werner Koch - - * hmac-tests.c (selftests_sha1): Add tests. - (selftests_sha224, selftests_sha384, selftests_sha512): Make up tests. - - * hash-common.c, hash-common.h: New. - * sha1.c (selftests_sha1): Add 3 tests. - * sha256.c (selftests_sha256, selftests_sha224): Ditto. - * sha512.c (selftests_sha512, selftests_sha384): Ditto. - -2008-08-29 Werner Koch - - * pubkey.c (gcry_pk_get_keygrip): Remove the special case for RSA - and check whether a custom computation function has been setup. - * rsa.c (compute_keygrip): New. - (_gcry_pubkey_extraspec_rsa): Setup this function. - * ecc.c (compute_keygrip): New. - (_gcry_pubkey_extraspec_ecdsa): Setup this function. - -2008-08-28 Werner Koch - - * cipher.c (cipher_decrypt, cipher_encrypt): Return an error if - mode NONE is used. - (gcry_cipher_open): Allow mode NONE only with a debug flag set and - if not in FIPS mode. - -2008-08-26 Werner Koch - - * pubkey.c (pubkey_generate): Add arg KEYGEN_FLAGS. - (gcry_pk_genkey): Implement new parameter "transient-key" and - pass it as flags to pubkey_generate. - (pubkey_generate): Make use of an ext_generate function. - * rsa.c (generate): Add new arg transient_key and pass appropriate - args to the prime generator. - (_gcry_rsa_generate): Factor all code out to ... - (rsa_generate): .. new func with extra arg KEYGEN_FLAGS. - (_gcry_pubkey_extraspec_ecdsa): Setup rsa_generate. - * primegen.c (_gcry_generate_secret_prime) - (_gcry_generate_public_prime): Add new arg RANDOM_LEVEL. - -2008-08-21 Werner Koch - - * primegen.c (_gcry_generate_secret_prime) - (_gcry_generate_public_prime): Use a constant macro for the random - level. - -2008-08-19 Werner Koch - - * pubkey.c (sexp_elements_extract_ecc) [!USE_ECC]: Do not allow - allow "curve" parameter. - -2008-08-15 Werner Koch - - * pubkey.c (_gcry_pk_selftest): New. - * dsa.c (selftests_dsa, run_selftests): New. - * rsa.c (selftests_rsa, run_selftests): New. - * ecc.c (selftests_ecdsa, run_selftests): New. - - * md.c (_gcry_md_selftest): New. - * sha1.c (run_selftests, selftests_sha1): New. - * sha256.c (selftests_sha224, selftests_sha256, run_selftests): New. - * sha512.c (selftests_sha384, selftests_sha512, run_selftests): New. - - * des.c (selftest): Remove static variable form selftest. - (des_setkey): No on-the-fly self test in fips mode. - (tripledes_set3keys): Ditto. - - * cipher.c (_gcry_cipher_setkey, _gcry_cipher_setiv): - - * dsa.c (generate): Bail out in fips mode if NBITS is less than 1024. - * rsa.c (generate): Return an error code if the the requested size - is less than 1024 and we are in fpis mode. - (_gcry_rsa_generate): Take care of that error code. - - * ecc.c (generate_curve): In fips mode enable only NIST curves. - - * cipher.c (_gcry_cipher_selftest): New. - - * sha512.c (_gcry_digest_extraspec_sha384) - (_gcry_digest_extraspec_sha512): New. - * sha256.c (_gcry_digest_extraspec_sha224) - (_gcry_digest_extraspec_sha256): New. - * sha1.c (_gcry_digest_extraspec_sha1): New. - * ecc.c (_gcry_pubkey_extraspec_ecdsa): New. - * dsa.c (_gcry_pubkey_extraspec_dsa): New. - * rsa.c (_gcry_pubkey_extraspec_rsa): New. - * rijndael.c (_gcry_cipher_extraspec_aes) - (_gcry_cipher_extraspec_aes192, _gcry_cipher_extraspec_aes256): New. - * des.c (_gcry_cipher_extraspec_tripledes): New. - - * cipher.c (gcry_cipher_register): Rename to _gcry_cipher_register. - Add arg EXTRASPEC. - (dummy_extra_spec): New. - (cipher_table_entry): Add extraspec field. - * md.c (_gcry_md_register): Rename to _gcry_md_register. Add - arg EXTRASPEC. - (dummy_extra_spec): New. - (digest_table_entry): Add extraspec field. - * pubkey.c (gcry_pk_register): Rename to _gcry_pk_register. Add - arg EXTRASPEC. - (dummy_extra_spec): New. - (pubkey_table_entry): Add extraspec field. - - * ac.c: Let most public functions return GPG_ERR_UNSUPPORTED in - fips mode. - - * pubkey.c (pubkey_table_entry): Add field FIPS_ALLOWED and mark - appropriate algorithms. - (dummy_generate, dummy_check_secret_key, dummy_encrypt) - (dummy_decrypt, dummy_sign, dummy_verify, dummy_get_nbits): Signal - a fips error when used. - (gcry_pk_register): In fips mode do not allow to register new - algorithms. - - * md.c (digest_table): Add field FIPS_ALLOWED and mark appropriate - algorithms. - (md_register_default): In fips mode register only fips algorithms. - (gcry_md_register): In fips mode do not allow to register new - algorithms. - (gcry_md_get): Signal a fips error if called. - (gcry_md_hash_buffer): Do not allow rmd160 when not in fips mode. - (md_start_debug): Disable in fips_mode. - - * md.c (gcry_md_register_default): Rename to .. - (md_register_default): .. this. - (md_digest): Remove this commented fucntion. - * pubkey.c (gcry_pk_register_default): Rename to .. - (pk_register_default): .. this. - - * cipher.c (cipher_table_entry): Add field FIPS_ALLOWED. - (gcry_cipher_register_default): Register only fips approved - algorithms. - (gcry_cipher_register): Do not allow to register new ciphers. - (cipher_setiv): Signal fips error. - - * cipher (gcry_cipher_register_default): Rename to .. - (cipher_register_default): .. this. - (REGISTER_DEFAULT_CIPHERS): Adjust for that change. - -2008-07-05 Werner Koch - - * random-daemon.c, random.h, rndhw.c, rndunix.c, rand-internal.h - * random.c, rndegd.c, rndlinux.c, rndw32.c: Move to ../cipher. - * Makefile.am: Remove random stuff. - -2008-06-24 Szakats Istvan (wk) - - * ac.c (_gcry_ac_key_destroy, _gcry_ac_key_pair_generate): Relase - some more memory. - -2008-04-22 Werner Koch - - * rijndael.c (_gcry_aes_cfb_enc, _gcry_aes_cbc_enc) - (_gcry_aes_cfb_dec, _gcry_aes_cbc_dec): Use Padlock if possible. - -2008-04-18 Werner Koch - - * sha1.c (transform_aligned): Remove. That is will obviosuly not - work because we need a scratch working area and our internal API - does not allow to modify the buffers. - - * rijndael.c: Factor tables out to .. - * rijndael-tables.h: .. new. - - * ac.c (ac_data_extract): Make static. - - * camellia.h [HAVE_CONFIG_H]: Include config.h. - - * rndw32.c (registry_poll): Only print the performance data - problem warning once. Suggested by Simon Josefsson. - -2008-03-19 Werner Koch - - * cipher.c (gcry_cipher_open) [USE_AES]: Init bulk encryption only - if requested. Suggested by Dirk Stoecker. - -2008-03-18 Werner Koch - - * sha1.c: Include stdint.h. - (transform): Add arg NBLOCKS so that we can work on more than one - block and avoid updates of the chaining variables. Changed all - callers to use 1. - (sha1_write): Replace loop around transform. - (transform_aligned) [WORDS_BIGENDIAN]: New. - (TRANSFORM): New macro to replace all direct calls of transform. - -2008-03-17 Werner Koch - - * rijndael.c (_gcry_aes_cfb_dec): New. - (do_encrypt): Factor code out to .. - (do_encrypt_aligned): .. New. - (_gcry_aes_cfb_enc, _gcry_aes_cfb_dec): Use new function. - (do_decrypt): Factor code out to .. - (do_decrypt_aligned): .. new. - (_gcry_aes_cbc_enc, _gcry_aes_cbc_dec): New. - * cipher.c (struct gcry_cipher_handle): Put field IV into new - union U_IV to enforce proper alignment. Change all users. - (do_cfb_decrypt): Optimize. - (do_cbc_encrypt, do_cbc_decrypt): Optimize. - -2008-03-15 Werner Koch - - * rijndael.c (_gcry_aes_cfb_enc): New. - * cipher.c (struct gcry_cipher_handle): Add field ALGO and BULK. - (gcry_cipher_open): Set ALGO and BULK. - (do_cfb_encrypt): Optimize. - -2008-02-18 Werner Koch - - * rsa.c (_gcry_rsa_verify) [IS_DEVELOPMENT_VERSION]: Print - intermediate results. - -2008-01-08 Werner Koch - - * random.c (add_randomness): Do not just increment - POOL_FILLED_COUNTER but update it by the actual amount of data. - -2007-12-13 Werner Koch - - * pubkey.c (sexp_data_to_mpi): Support SHA-224. - -2007-12-05 Werner Koch - - * rijndael.c (USE_PADLOCK): Depend on ENABLE_PADLOCK_SUPPORT. - * rndhw.c (USE_PADLOCK): Ditto - - * rsa.c (secret): Fixed condition test for using CRT. Reported by - Dean Scarff. Fixes bug#864. - (_gcry_rsa_check_secret_key): Return an erro if the optional - parameters are missing. - * pubkey.c (sexp_elements_extract): Add arg ALGO_NAME. Changed all - callers to pass NULL. Add hack to allow for optional RSA - parameters. - (sexp_to_key): Pass algo name to sexp_elements_extract. - -2007-12-03 Werner Koch - - * random.c (gcry_random_add_bytes): Implement it. - * rand-internal.h (RANDOM_ORIGIN_EXTERNAL): New. - -2007-11-30 Werner Koch - - * rndhw.c: New. - * rndlinux.c (_gcry_rndlinux_gather_random): Try to read 50% - directly from the hwrng. - * random.c (do_fast_random_poll): Also run the hw rng fast poll. - (_gcry_random_dump_stats): Tell whether the hw rng failed. - -2007-11-29 Werner Koch - - * rijndael.c (USE_PADLOCK): Define new macro used for ia32. - (RIJNDAEL_context) [USE_PADLOCK]: Add fields USE_PADLOCK and - PADLOCK_KEY. - (do_setkey) [USE_PADLOCK]: Enable padlock if available for 128 bit - AES. - (do_padlock) [USE_PADLOCK]: New. - (rijndael_encrypt, rijndael_decrypt) [USE_PADLOCK]: Divert to - do_padlock. - * cipher.c (cipher_context_alignment_t): New. Use it in this - module in place of PROPERLY_ALIGNED_TYPE. - (NEED_16BYTE_ALIGNED_CONTEXT): Define macro for ia32. - (struct gcry_cipher_handle): Add field HANDLE_OFFSET. - (gcry_cipher_open): Take care of increased alignment requirements. - (gcry_cipher_close): Ditto. - -2007-11-28 Werner Koch - - * sha256.c (asn224): Fixed wrong template. It happened due to a - bug in RFC4880. SHA-224 is not in the stable version of libgcrypt - so the consequences are limited to users of this devel version. - -2007-10-31 Werner Koch - - * ac.c (gcry_ac_data_new): Remove due to the visibility wrapper. - (gcry_ac_data_destroy, gcry_ac_data_copy, gcry_ac_data_length) - (gcry_ac_data_set, gcry_ac_data_get_name, gcry_ac_data_get_index) - (gcry_ac_data_to_sexp, gcry_ac_data_from_sexp) - (gcry_ac_data_clear, gcry_ac_io_init, gcry_ac_open) - (gcry_ac_close, gcry_ac_key_init, gcry_ac_key_pair_generate) - (gcry_ac_key_pair_extract, gcry_ac_key_destroy) - (gcry_ac_key_pair_destroy, gcry_ac_key_data_get) - (gcry_ac_key_test, gcry_ac_key_get_nbits, gcry_ac_key_get_grip) - (gcry_ac_data_encrypt, gcry_ac_data_decrypt, gcry_ac_data_sign) - (gcry_ac_data_verify, gcry_ac_data_encode, gcry_ac_data_decode) - (gcry_ac_mpi_to_os, gcry_ac_mpi_to_os_alloc, gcry_ac_os_to_mpi) - (gcry_ac_data_encrypt_scheme, gcry_ac_data_decrypt_scheme) - (gcry_ac_data_sign_scheme, gcry_ac_data_verify_scheme) - (gcry_ac_io_init_va): Ditto. - (gcry_ac_id_to_name, gcry_ac_name_to_id): Remove as these - deprecated functions are now implemented by visibility.c. - -2007-10-26 Werner Koch - - * rndw32.c: Disable debug flag. - -2007-10-25 Werner Koch - - * rndw32.c: Updated from current cryptlib snapshot and modified - for our use. Removed support from pre NT systems. - (slow_gatherer_windows95): Remove. - (_gcry_rndw32_gather_random): Require an NT platform. - (init_system_rng, read_system_rng, read_mbm_data): New. - (slow_gatherer_windowsNT): Rename to ... - (slow_gatherer): .. this. Read system RNG and MBM. - (registry_poll): New with code factored out from slow_gatherer. - -2007-08-23 Werner Koch - - * random.c (pool_filled_counter): New. - (add_randomness): Use it. - -2007-08-22 Werner Koch - - * rndw32.c, rndunix.c: Switched to LGPL. - -2007-05-30 Werner Koch - - * camellia.h, camellia.c: Replace by new LGPL version and adjusted - camellia.h. - -2007-05-09 Marcus Brinkmann - - * ac.c (_gcry_ac_io_init_va, _gcry_ac_io_write, _gcry_ac_io_read): - Adjust users of gcry_ac_io_t because union is not anonymous - anymore. - -2007-05-02 Werner Koch - - * camellia-glue.c (camellia_setkey, camellia_encrypt) - (camellia_decrypt): Recalculated used stack size in called - functions. - * camellia.h: Redefine external symbols. - -2007-05-02 David Shaw - - * Makefile.am, cipher.c: Add Camellia. - - * camellia-glue.c: New. The necessary glue to interface libgcrypt - to the stock NTT Camellia distribution. - - * camellia.h, camellia.c: The stock NTT Camellia distribution - (GPL). - -2007-04-30 David Shaw - - * cipher.c: Use #if instead of #ifdef as configure defines the - USE_cipher defines as 0 for disabled. - -2007-04-30 Werner Koch - - * rndegd.c (_gcry_rndegd_set_socket_name): New. - -2007-04-30 Marcus Brinkmann - - * ecc.c (ec2os): Fix relocation of short numbers. - - * ecc.c (generate_key): Do not allocate D, which will be allocated - by GEN_K. Remove G. Fix test if g_x, g_y resp. q_x, q_y are - requested. - (_gcry_ecc_generate): Release unneeded members of SK. - * pubkey.c (sexp_to_key): Release NAME. - -2007-04-28 Marcus Brinkmann - - * ac.c (gcry_ac_mpi): Remove member NAME_PROVIDED. - (ac_data_mpi_copy, _gcry_ac_data_set, _gcry_ac_data_get_name) - (_gcry_ac_data_get_index, ac_data_construct): Adjust handling of - NAME accordingly. - -2007-04-20 Werner Koch - - * ecc.c (domain_parms): Add standard brainpool curves. - -2007-04-18 Werner Koch - - * ecc.c (generate_curve): Implement alias mechanism. - - * pubkey.c (sexp_elements_extract_ecc): New. - (sexp_to_key): Add special case for ecc. - (sexp_to_key, sexp_to_sig, sexp_to_enc, gcry_pk_genkey): Replace - name_terminated stuff by a call to _gcry_sexp_nth_string. - (gcry_pk_get_keygrip): Ditto. - -2007-04-16 Werner Koch - - * ecc.c (_gcry_ecc_generate): Renamed DUMMY to CURVE and use it. - -2007-04-13 Marcus Brinkmann - - * ac.c (ac_data_construct): Cast const away to suppress compiler - warning. - - * ecc.c (ecc_generate): Avoid compiler warning for unused argument - DUMMY. - (ecc_verify): Avoid compiler warning for unused arguments CMP and - OPAQUEV. - -2007-04-06 Werner Koch - - * sha1.c (oid_spec_sha1): Add another oid from X9.62. - -2007-03-28 Werner Koch - - * pubkey.c (gcry_pk_genkey): Do not issue misc-key-info if it is - empty. - (gcry_pk_genkey): New parameter "curve". - - * ecc.c: Entirely rewritten with only a few traces of the old - code left. - (_gcry_ecc_generate): New. - (generate_key) New arg NAME. - (generate_curve): Ditto. Return actual number of NBITS. - -2007-03-26 Werner Koch - - * pubkey.c (gcry_pk_genkey): Increase size of SKEY array and add a - runtime bounds check. - -2007-03-23 Werner Koch - - * ecc.c (ecc_ctx_init, ecc_ctx_free, ecc_mod, ecc_mulm): New. - (duplicate_point, sum_points, escalar_mult): Don't use a - copy of base->p. Replaced all mpi_mulm by ecc_mulm so that we can - experiment with different algorithms. - (generate_key, check_secret_key, sign, verify): Initialize a - computation context for use by ecc_mulm. - -2007-03-22 Werner Koch - - * pubkey.c (pubkey_table): Initialize ECC. - * Makefile.am (EXTRA_libcipher_la_SOURCES): Add ecc.c. - * ecc.c: New. Heavily reformatted and changed for use in libgcrypt. - (point_init): New. - (escalar_mult): Make arg R the first arg to be similar to the mpi - functions. - (duplicate_point): Ditto - (sum_points): Ditto - (sign, verify): Remove unneeded copy operations. - (sum_points): Removed memory leaks and optimized some compares. - (verify): Simplified input check. - -2007-03-14 Werner Koch - - * random.c (MASK_LEVEL): Removed macro as it was used only at one - place. Open coded it there. - (gcry_randomize, _gcry_update_random_seed_file) - (_gcry_fast_random_poll): Factor lock code out to .. - (lock_pool, unlock_pool): .. new. - (initialize): Look the pool while allocating. - (read_random_source, do_fast_random_poll): Moved intialization to ... - (initialize): .. here. - (_gcry_enable_quick_random_gen): No more need for initialization. - (is_initialized): Moved this global flag to .. - (initialize): .. here and changed all users to unconditionally call - initialize. - (add_randomness): Remove initalization here. It simply can't - happen. - - * random.c (enum random_origins): Moved to .. - * rand-internal.h: .. here. - * rndunix.c (_gcry_rndunix_gather_random): Use enum in prototype - for ORIGIN and renamed REQUESTOR to ORIGIN. - * rndegd.c (_gcry_rndegd_gather_random): Ditto. - * rndlinux.c (_gcry_rndlinux_gather_random): Ditto. - * rndw32.c (_gcry_rndw32_gather_random): Ditto. - (_gcry_rndw32_gather_random_fast): Ditto. - -2007-03-13 Werner Koch - - * random.c (enum random_origins): New. - (add_randomness): Renamed arg SOURCE to ORIGIN. - (read_random_source): Renamed arg REQUESTOR to ORIGIN. - (getfnc_gather_random): Removed static variable because this - function is only called one and thus we don't need this - optimization. - (_gcry_quick_random_gen): Removed and replaced by.. - (_gcry_enable_quick_random_gen): .. this. It is onlyu used to - enable it and it does not make sense to disable it later. Changed - the only one caller too. - (get_random_bytes): Removed. - (gcry_random_bytes, gcry_random_bytes_secure): Implement in terms - of gcry_randomize. - * random-daemon.c (_gcry_daemon_get_random_bytes): Removed. - -2007-02-23 Werner Koch - - * elgamal.c (generate): Removed unused variable TEMP. - (test_keys): New arg NODIE. - (generate_using_x, _gcry_elg_generate_using_x): New. - * pubkey.c (pubkey_generate): New arg XVALUE and direct call to - the new elgamal generate fucntion. - (gcry_pk_genkey): Parse the new "xvalue" tag. - -2007-02-22 Werner Koch - - * pubkey.c (sexp_data_to_mpi): Handle dynamically allocated - algorithms. Suggested by Neil Dunbar. Fixes bug#596. - - * rndw32.c (_gcry_rndw32_gather_random_fast): Make it return void. - - * cipher.c (gcry_cipher_algo_name): Simplified. - - * random.c: Use the daemon only if compiled with USE_RANDOM_DAEMON. - - * Makefile.am (libcipher_la_SOURCES): Build random-daemon support - only if requested. - -2007-02-21 Werner Koch - - * random.c (rndpool, keypool): Make unsigned. - (mix_pool): Change char* variables to unsigned char*. - (gcry_randomize): Make arg BUFFER a void*. - (gcry_create_nonce): Ditto. - - * rmd160.c (gcry_rmd160_mixblock): Make BUFFER a void*. - (_gcry_rmd160_hash_buffer): Make OUTBUF and BUFFER void*. - * sha1.c (_gcry_sha1_hash_buffer): Ditto. - - * cipher.c (gcry_cipher_encrypt, cry_cipher_decrypt): Change - buffer args to void*. - (gcry_cipher_register): Make ALGORITHM_ID a int *. - - * md.c (md_start_debug): Make SUFFIX a const char*. Use snprintf. - (gcry_md_debug): New. - (gcry_md_ctl): Changed arg BUFFER from unsigned char*. - - * md.c (md_write): Make INBUF a const void*. - (gcry_md_write): Remove needless cast. - * crc.c (crc32_write): Make INBUF a const void* - (update_crc32, crc24rfc2440_write): Ditto. - * sha512.c (sha512_write, transform): Ditto. - * sha256.c (sha256_write, transform): Ditto. - * rmd160.c (rmd160_write, transform): Ditto. - * md5.c (md5_write, transform): Ditto. - * md4.c (md4_write, transform): Ditto. - * sha1.c (sha1_write, transform): Ditto. - - * tiger.c (tiger_write, transform): Ditto. - * whirlpool.c (whirlpool_write, whirlpool_add, transform): Ditto. - - * elgamal.c (elg_names): Change to a const*. - * dsa.c (dsa_names): Ditto. - * rsa.c (rsa_names): Ditto. - * pubkey.c (gcry_pk_lookup_func_name): Make ALIASES a const. - -2007-02-20 Werner Koch - - * rndlinux.c (open_device): Remove unsused arg MINOR. - -2007-01-30 Werner Koch - - * sha256.c (oid_spec_sha256): Add alias from pkcs#1. - * sha512.c (oid_spec_sha512): Ditto. - (oid_spec_sha384): Ditto. - -2006-12-18 Werner Koch - - * rndlinux.c (set_cloexec_flag): New. - (open_device): Set close-on-exit flags. Suggested by Max - Kellermann. Fixes Debian#403613. - - * Makefile.am (AM_CPPFLAGS, AM_CFLAGS): Splitted and merged - Moritz' changes. - (INCLUDES): Removed. - -2006-11-30 Werner Koch - - * serpent.c (byte_swap_32): Remove trailing semicolon. - -2006-11-15 Werner Koch - - * Makefile.am (INCLUDES): Include ../src/ - -2006-11-03 Werner Koch - - * random.c [HAVE_GETTIMEOFDAY]: Included sys/time.h and not - sys/times.h. Reported by Rafaël Carré. - -2006-11-05 Moritz Schulte - - * Makefile.am (AM_CFLAGS): Added -I$(top_builddir)/src so that the - new gcrypt.h is used, not the one installed in the system. - -2006-10-25 Werner Koch - - * primegen.c (prime_generate_internal): Tweaked use of secure - memory and entropy use. Safe unused primes from the pool. Allocate - at least a pool of 30. - (save_pool_prime, get_pool_prime): New. - -2006-10-23 Werner Koch - - * ac.c (_gcry_ac_data_from_sexp): Reset sexp_tmp for failsafe - means. Release sexp_cur if needed. Reported by Dirk Stoecker. - - * pubkey.c (pubkeys_registered_lock): Intialized it. It is not - realy needed because this is a mere initialization to 0 anyway. - Noted by Victor Stinner. - -2006-10-17 Werner Koch - - * dsa.c (_gcry_dsa_generate2): New. - (generate): New arg QBITS. Add sanity checks for reasonable qbits - and nbits. - * pubkey.c (gcry_pk_genkey): Parse an qbits element. - (pubkey_generate): New arg QBITS. Pass it to the DSA generation. - -2006-10-05 Werner Koch - - * md.c (gcry_md_algo_info) : Check that the algo is - available. - -2006-10-04 David Shaw (wk) - - * tiger.c (round): Rename to tiger_round as gcc 4 has a built-in - round function that this conflicts with. - -2006-09-11 Werner Koch - - * rndw32.c (slow_gatherer_windowsNT): While adding data use the - size of the diskPerformance and not its address. Has been fixed in - GnuPG more than a year ago. Noted by Lee Fisher. - -2006-08-30 Werner Koch - - * pubkey.c (sexp_data_to_mpi): Need to allow "ripemd160" here as - this is the canonical name. - -2006-08-29 Hye-Shik Chang (wk) - - * seed.c: New. - -2006-08-03 Werner Koch - - * random-daemon.c (_gcry_daemon_initialize_basics): Don't - initialize the socket. Remove arg SOCKETNAME. - (connect_to_socket): Make sure that daemon is set to -1 on error. - (call_daemon): Initialize the socket on the first call. - (_gcry_daemon_randomize, _gcry_daemon_get_random_bytes) - (_gcry_daemon_create_nonce): New arg SOCKETNAME. - * random.c (initialize): Call new daemon initializator. - (get_random_bytes, gcry_randomize, gcry_create_nonce): Pass socket - name to daemon call and reset allow_daemon on failure. - -2006-07-26 Werner Koch - - * rmd160.c (_gcry_rmd160_mixblock): Add cast to transform call. - - * blowfish.c (selftest): Cast string to usnigned char*. - - * primegen.c (prime_generate_internal): Cast unsigned/char* - mismatch in calling m_out_of_n. - (is_prime): Changed COUNT to unsigned int *. - - * ac.c (_gcry_ac_data_copy): Initialize DATA_MPIS. - - * random.c (gcry_create_nonce): Update the pid after a fork. - Reported by Uoti Urpala. - -2006-07-04 Marcus Brinkmann - - * sha512.c: Fix typo in copyright notice. - -2006-06-21 Werner Koch - - * rsa.c (_gcry_rsa_generate): Replace xcalloc by calloc. - * pubkey.c (gcry_pk_encrypt, gcry_pk_sign): Ditto. - (sexp_to_key, sexp_to_sig, sexp_to_enc, gcry_pk_encrypt) - (gcry_pk_sign, gcry_pk_genkey, gcry_pk_get_keygrip): Ditto. - * md.c (md_copy): Ditto. - -2006-04-22 Moritz Schulte - - * random-daemon.c (_gcry_daemon_initialize_basics): New argument: - SOCKETNAME. Passing on to connect_to_socket() if non-NULL. - (connect_to_socket, writen, readn, call_daemon): New functions. - (_gcry_daemon_randomize, _gcry_daemon_get_random_bytes) - (_gcry_daemon_create_nonce): Call call_daemon(). - (RANDOM_DAEMON_SOCKET): New symbol. - (daemon_socket): New static variable. - - * random.h (_gcry_daemon_initialize_basics): New parameter: - SOCKETNAME. - (_gcry_set_random_daemon_socket): New declaration. - - * random.c (initialize_basics): Pass DAEMON_SOCKET_NAME to - _gcry_daemon_initialize_basics. - (_gcry_set_random_daemon_socket): New function, setting - DAEMON_SOCKET_NAME. - -2006-04-01 Moritz Schulte - - * ac.c (eme_pkcs_v1_5_encode): Use KEY_SIZE directly, no need to - call gcry_ac_key_get_nbits. - (eme_pkcs_v1_5_decode): Likewise. - (ac_es_dencode_prepare_pkcs_v1_5): Fill options_em structure with - key_size. - (_gcry_ac_data_dump, gcry_ac_data_dump): New functions. - (_gcry_ac_data_to_sexp, _gcry_ac_data_from_sexp): More or less - rewritten; changed S-Expression format so that it matches the one - used in pubkey.c. - -2006-03-15 Werner Koch - - * random-daemon.c: New. - * random.c (_gcry_use_random_daemon): New. - (get_random_bytes, gcry_randomize, gcry_create_nonce): Try - diverting to the daemon functions. - -2006-03-14 Werner Koch - - * random.c (lock_seed_file): New. - (read_seed_file, _gcry_update_random_seed_file): Use it. - - * random.c (gcry_create_nonce): Detect a fork and re-seed. - (read_pool): Fixed the fork detection; it used to work only for - multi-threaded processes. - -2006-03-12 Brad Hards (wk) - - * md.c (md_open): Use new variable macpads_Bsize instead of - hardwiring the block size. Changed at all places. - -2006-03-10 Brad Hards (wk, patch 2005-04-22) - - * md.c, sha256.c: Add support for SHA-224. - (sha224_init): New. - -2006-01-18 Brad Hards (wk 2006-03-07) - - * cipher.c (cipher_encrypt, cipher_decrypt, do_ofb_encrypt) - (do_ofb_decrypt, gcry_cipher_open): Implement Output Feedback Mode. - -2005-11-02 Moritz Schulte - - * pubkey.c (gcry_pk_algo_name): Return "?" instead of NULL for - unknown algorithm IDs. - * cipher.c (cipher_algo_to_string): Likewise. - -2005-11-01 Moritz Schulte - - * pubkey.c (gcry_pk_algo_info): Don't forget to break after switch - case. - -2005-09-19 Werner Koch - - * dsa.c (generate): Add preliminary support for 2 and 4 keys. - Return an error code if the key size is not supported. - (_gcry_dsa_generate): Return an error. - -2005-08-22 Werner Koch - - * primegen.c (check_prime): New arg RM_ROUNDS. - (prime_generate_internal): Call it here with 5 rounds as used - before. - (gcry_prime_check): But here with 64 rounds. - (is_prime): Make sure never to use less than 5 rounds. - -2005-04-16 Moritz Schulte - - * ac.c (_gcry_ac_init): New function. - -2005-04-12 Moritz Schulte - - * ac.c (_gcry_ac_io_write, _gcry_ac_io_read): Initialize err to - make the compiler happy. - Always use errno, now that gcry_malloc() is guaranteed to set - errno on failure. - (_gcry_ac_data_to_sexp): Don't forget to goto out after error in - loop. - (_gcry_ac_data_to_sexp): Remove unused variable: mpi_list; - (_gcry_ac_data_to_sexp): Always deallocate sexp_buffer. - (_gcry_ac_data_from_sexp): Don't forget to initialize data_set_new. - (_gcry_ac_data_from_sexp): Handle special case, which is - necessary, since gcry_sexp_nth() does not distinguish between - "element does not exist" and "element is the empty list". - (_gcry_ac_io_init_va): Use assert to make sure that mode and type - are correct. - Use gcry_error_t types where gcry_err_code_t types have been used - before. - -2005-04-11 Moritz Schulte - - * ac.c (_gcry_ac_data_sign_scheme): Don't forget to initialize - buffer. - - * whirlpool.c: New file. - * md.c (digest_table): Add whirlpool. - * Makefile.am (EXTRA_libcipher_la_SOURCES): Added: whirlpool.c. - -2005-03-30 Moritz Schulte - - * ac.c (_gcry_ac_data_from_sexp): Use length of SEXP_CUR, not - length of SEXP; do not forget to set SEXP_TMP to NULL after it has - been released. - - (struct gcry_ac_mpi): New member: name_provided. - (_gcry_ac_data_set): Rename variable `name_final' to `name_cp'; - remove const qualifier; change code to not cast away const - qualifiers; use name_provided member as well. - (_gcry_ac_data_set, _gcry_ac_data_get_name): Use name_provided - member of named mpi structure. - - (gcry_ac_name_to_id): Do not forget to initialize err. - (_gcry_ac_data_get_index): Do not forget to initialize mpi_return; - use gcry_free() instead of free(); remove unnecessary cast; rename - mpi_return and name_return to mpi_cp and name_cp; adjust code. - (ac_data_mpi_copy): Do not cast away const qualifier. - (ac_data_values_destroy): Likewise. - (ac_data_construct): Likewise. - - (ac_data_mpi_copy): Initialize flags to GCRY_AC_FLAG_DEALLOC. - (ac_data_extract): Use GCRY_AC_FLAG_DEALLOC instead of - GCRY_AC_FLAG_COPY. - - (_gcry_ac_io_init_va, _gcry_ac_io_init, gcry_ac_io_init) - (gcry_ac_io_init_va, _gcry_ac_io_write, _gcry_ac_io_read) - (_gcry_ac_io_read_all, _gcry_ac_io_process): New functions. - (gry_ac_em_dencode_t): Use gcry_ac_io_t in prototype instead of - memroy strings directly; adjust encode/decode functions to use io - objects. - (emsa_pkcs_v1_5_encode_data_cb): New function ... - (emsa_pkcs_v1_5_encode): ... use it here. - (ac_data_dencode): Use io objects. - (_gcry_ac_data_encode, _gcry_ac_data_decode, gcry_ac_data_encode) - (gcry_ac_data_decode): Likewise. - (_gcry_ac_data_encrypt_scheme, gcry_ac_data_encrypt_scheme) - (_gcry_ac_data_decrypt_scheme, gcry_ac_data_decrypt_scheme) - (_gcry_ac_data_sign_scheme, gcry_ac_data_sign_scheme) - (_gcry_ac_data_verify_scheme, gcry_ac_data_verify_scheme): - Likewise. - -2005-03-23 Werner Koch - - * rndw32.c (_gcry_rndw32_gather_random_fast): While adding data - use the size of the object and not the one of its address. Bug - reported by Sascha Kiefer. - -2005-03-19 Moritz Schulte - - * cipher.c (do_cbc_encrypt): Be careful to not overwrite data, - which is to be used later on. This happend, in case CTS is - enabled and OUTBUF is equal to INBUF. - -2005-02-25 Werner Koch - - * pubkey.c (gcry_pk_get_keygrip): Allow for shadowed-private-key. - -2005-02-13 Moritz Schulte - - * serpent.c: Updated from 1.2 branch: - - s/u32_t/u32/ and s/byte_t/byte/. Too match what we have always - used and are using in all other files too - (serpent_test): Moved prototype out of a fucntion. - -2005-02-07 Moritz Schulte - - * ac.c: Major parts rewritten. - * pubkey.c (_gcry_pk_get_elements): New function. - -2004-12-09 Werner Koch - - * serpent.c (serpent_setkey): Moved prototype of serpent_test to - outer scope. - -2004-09-11 Moritz Schulte - - * pubkey.c (pubkey_table): Added an alias entry for GCRY_PK_ELG_E. - -2004-08-23 Moritz Schulte - - * ac.c: Do not include . - * rndegd.c: Likewise. - * sha1.c: Likewise. - * rndunix.c: Likewise. - * rndlinux.c: Likewise. - * rmd160.c: Likewise. - * md5.c: Likewise. - * md4.c: Likewise. - * cipher.c: Likewise. - * crc.c: Likewise. - * blowfish.c: Likewise. - - * pubkey.c (dummy_generate, dummy_check_secret_key) - (dummy_encrypt, dummy_decrypt, dummy_sign, dummy_verify): Return - err code GPG_ERR_NOT_IMPLEMENTED instead of aborting through - log_bug(). - (dummy_get_nbits): Return 0 instead of aborting though log_bug(). - -2004-08-19 Werner Koch - - * pubkey.c (sexp_data_to_mpi): Changed the zero random byte - substituting code to actually do clever things. Thanks to - Matthias Urlichs for noting the implementation problem. - -2004-08-09 Moritz Schulte - - * pubkey.c (gcry_pk_sign): Fixed memory leak; fix provided by - Modestas Vainius. - -2004-07-16 Werner Koch - - * rijndael.c (do_encrypt): Fix alignment problem. Bugs found by - Matthias Urlichs. - (do_decrypt): Ditto. - (keySched, keySched2): Use 2 macros along with unions in the key - schedule context. - -2004-07-14 Moritz Schulte - - * rsa.c (_gcry_rsa_decrypt): Don't forget to free "a". Thanks to - Nikos Mavroyanopoulos. - -2004-05-09 Werner Koch - - * random.c (read_pool): Mix the PID in to better protect after a - fork. - -2004-07-04 Moritz Schulte - - * serpent.c: Use "u32_t" instead of "unsigned long", do not - declare S-Box variables as "register". Fixes failure on - OpenBSD/sparc64, reported by Nikolay Sturm. - -2004-05-07 Werner Koch - - * random.c (initialize): Factored out some code to .. - (initialize_basics): .. new function. - (_gcry_random_initialize): Just call initialize_basics unless the - new arg FULL is set to TRUE. - (_gcry_fast_random_poll): Don't do anything unless the random - system has been really initialized. - -2004-05-07 Moritz Schulte - - * ac.c (gcry_ac_open): Do not dereference NULL pointer. Reported - by Umberto Salsi. - -2004-02-20 Werner Koch - - * primegen.c (check_prime): New args CB_FUNC and CB_ARG; call them - at different stages. Pass these arguments through all callers. - -2004-02-06 Werner Koch - - * des.c: Add a new OID as used by pkcs#12. - - * rfc2268.c: New. Taken from libgcrypt. - * cipher.c: Setup the rfc2268 algorithm. - -2004-01-25 Moritz Schulte - - * primegen.c (prime_generate_internal): Do not forget to free - `q_factor'; fixed by Brieuc Jeunhomme. - (prime_generate_internal): Do not forget to free `prime'. - -2004-01-14 Moritz Schulte - - * ac.c (gcry_ac_data_set): New argument: flags; slightly - rewritten. - (gcry_ac_data_get_name, gcry_ac_data_get_index): Likewise. - (gcry_ac_key_pair_generate): New argument: misc_data; modified - order of arguments. - (gcry_ac_key_test): New argument: handle. - (gcry_ac_key_get_nbits, gcry_ac_key_get_grip): Likewise. - Use GCRY_AC_FLAG_NO_BLINDING instead of - GCRY_AC_DATA_FLAG_NO_BLINDING. - (gcry_ac_mpi): New member: flags. - (gcry_ac_data_search, gcry_ac_data_add): Removed functions. - -2003-12-22 Werner Koch - - * primegen.c (is_prime): Release A2. - -2003-12-19 Werner Koch - - * md.c: Moved a couple of functions down below the data structure - definitions. - (struct gcry_md_context): New field ACTUAL_HANDLE_SIZE. - (md_open): Set it here. - (strcut gcry_md_list): New field ACTUAL_STRUCT_SIZE. - (md_enable): Set it here. - (md_close): Wipe the context memory. - secure memory. - * cipher.c (struct gcry_cipher_handle): New field ACTUAL_HANDLE_SIZE. - (gcry_cipher_open): Set it here. - (gcry_cipher_close): Use it to always wipe out the handle data. - - * ac.c (gcry_ac_open): Make sure HANDLE gets initialized even when - the function is not successful. - (gcry_ac_close): Allow a NULL handle. - (gcry_ac_key_destroy, gcry_ac_key_pair_destroy): Ditto. - (gcry_ac_key_get_grip): Return INV_OBJ on error. - - * primegen.c (prime_generate_internal): Fixed error code for - failed malloc. Replaced the !err if chain by gotos. - (gcry_prime_group_generator): Remove the extra sanity check. - - * md.c: Minor code and comment cleanups. - -2003-12-16 Werner Koch - - * primegen.c (gen_prime): Doc fix. Thanks to Newton Hammet. - -2003-12-11 Werner Koch - - * rndunix.c (slow_poll): Don't use #warning but #error. - - * rndegd.c: Changed indentation. - (my_make_filename): Removd the var_arg cruft becuase we - don't need it here. Changed caller. - - * rndlinux.c: Changed indentation. - (open_device): Remove the superfluous stat call and clarify - comment. - - * rsa.c: Changed indentation. - (secret): Use the standard algorithm if p, q and u are not - available. - (rsa_blind, rsa_unblind): Renamed from _gcry_rsa_blind, - _gcry_rsa_unblind and moved more to the top. - - * md4.c: Changed indentation. Removed unnecessary casts. - * md5.c, rmd160.c, sha1.c, tiger.c: Ditto. - * rijndael.c, twofish.c: Ditto. - * serpent.c: Removed unnecessary casts. - * sha256.c, sha512.c: Ditto. - -2003-12-09 Werner Koch - - * dsa.c: Unified indentation style. - * elgamal.c: Ditto. - * des.c (des_key_schedule): Code beautifications. - * blowfish.c: Changed indentation style. - * cast5.c (do_cast_setkey): Ditto. - - * pubkey.c (gcry_pk_encrypt): Replaced the chain of if(!err) tests - by straightforward gotos. Other cleanups. - (gcry_pk_decrypt): Ditto. - (gcry_pk_sign): Ditto. - (gcry_pk_verify): Ditto. - (gcry_pk_genkey): Ditto. Use strtoul instead of strtol. - (gcry_pk_ctl): Use GPG_ERR_INV_ARG to indicate bad arguments. - -2003-12-07 Werner Koch - - * pubkey.c (gcry_pk_register_default): Undef the helper macro. - (gcry_pk_map_name): Allow NULL for string. - (sexp_to_key): Use memcpy and not strncpy. Use gcry_free and not - free. - (sexp_to_sig): Ditto. - (sexp_to_enc): Ditto. Replaced the chain of if(!err) tests by - straightforward gotos. - -2003-12-05 Werner Koch - - * cipher.c: Documentation cleanups. - (gcry_cipher_mode_from_oid): Allow NULL for STRING. - -2003-12-03 Werner Koch - - * elgamal.c (sign, do_encrypt, gen_k): Make sure that a small K is - only used for encryption. - -2003-11-18 Werner Koch - - * random.h (rndw32_set_dll_name): Removed unused prototype. - - * Makefile.am (EXTRA_DIST): Added Manifest. - -2003-11-11 Werner Koch - - * Manifest: New. - -2003-11-04 Werner Koch - - * md.c (gcry_md_hash_buffer): Use shortcut for SHA1 - * sha1.c (_gcry_sha1_hash_buffer): New. - - * random.c: Reformatted most functions. - (mix_pool): Moved the failsafe_digest from global - scope to here. - (do_fast_random_poll): Use the generic fucntions even if a fast - gathering function has been used. - (read_pool): Detect a fork and retry. - (gcry_randomize, get_random_bytes): Don't distinguish anymore - between weak and strong random. - (gcry_create_nonce): New. - -2003-10-31 Werner Koch - - * rndw32.c (slow_gatherer_windowsNT): Use a plain buffer for the - disk performance values and not the W32 API structure. - - * dsa.c (verify): s/exp/ex/ due to shadowing of a builtin. - * elgamal.c (verify): Ditto. - - * ac.c (gcry_ac_data_get_index): s/index/idx/ - (gcry_ac_data_copy_internal): Remove the cast in _gcry_malloc. - (gcry_ac_data_add): Must use gcry_realloc instead of realloc. - * pubkey.c (sexp_elements_extract): s/index/idx/ as tribute to the - forehackers. - (gcry_pk_encrypt): Removed shadowed definition of I. Reordered - arguments to malloc for clarity. - (gcry_pk_sign, gcry_pk_genkey): Ditto. - * primegen.c (prime_generate_internal): s/random/randomlevel/. - -2003-10-27 Moritz Schulte - - * pubkey.c (gcry_pk_encrypt): Don't forget to deallocate pkey. - -2003-10-27 Werner Koch - - * random.c (gcry_random_add_bytes): Return if buflen is zero to - avoid gcc warning about unsed parameter. - (MASK_LEVEL): Simplified; does now work for signed and unsigned - w/o warnings. - - * md.c (md_start_debug): Removed the const from SUFFIX, because - this function is called from the control fucntion which does not - require const. - - Prefixed all (pubkey,digest,cipher}_spec_* globale variables with - _gcry_. - - * ac.c (ac_key_identifiers): Made static. - - * random.c (getfnc_gather_random,getfnc_fast_random_poll): Move - prototypes to .. - * rand-internal.h: .. here - * random.c (getfnc_gather_random): Include rndw32 gatherer. - * rndunix.c, rndw32.c, rndegd.c: Include them here. - * rndlinux.c (_gcry_rndlinux_gather_random): Prepend the _gcry_ - prefix. Changed all callers. - * rndegd.c (_gcry_rndegd_gather_random): Likewise. - (_gcry_rndegd_connect_socket): Likewise. - * rndunix.c (_gcry_rndunix_gather_random): Likewise. - (waitpid): Made static. - * rndw32.c: Removed the old and unused winseed.dll cruft. - (_gcry_rndw32_gather_random_fast): Renamed from - gather_random_fast. - (_gcry_rndw32_gather_random): Renamed from gather_random. Note, - that the changes 2003-04-08 somehow got lost. - - * sha512.c (sha512_init, sha384_init): Made static. - - * cipher.c (do_ctr_decrypt): Removed "return" from this void - function. - -2003-10-24 Moritz Schulte - - * serpent.c: Fix an issue on big-endian systems. - - * rndw32.c: Removed IS_MODULE -cruft. - * rndlinux.c (rndlinux_gather_random): Likewise. - -2003-10-10 Werner Koch - - * primegen.c (gen_prime): Bail out if NBITS is less than 16. - (prime_generate_internal): Initialize prime variable to suppress - compiler warning. Check pbits, initialize qbits when passed as - zero. - - * primegen.c (prime_generate_internal): New arg - ALL_FACTORS. Changed all callers. - (gcry_prime_generate): Make the factors arg optional. Request - all_factors. Make sure PRIME is set to NULL even on error. - (gcry_prime_group_generator): New. - (gcry_prime_release_factors): New. - -2003-10-06 Werner Koch - - * primegen.c (gen_prime): Assert that NBITS is never zero, it - would cause a segv. - -2003-09-28 Moritz Schulte - - * ac.c: Include "cipher.h". - -2003-09-27 Moritz Schulte - - * rndegd.c (do_read): Return nread instead of nbytes; thanks to - Michael Caerwyn. - -2003-09-04 Werner Koch - - * pubkey.c (_gcry_pk_aliased_algo_name): New. - * ac.c (gcry_ac_open): Use it here. - - * Makefile.am (EXTRA_libcipher_la_SOURCES): Add serpent.c - -2003-09-02 Moritz Schulte - - * primegen.c (gcry_prime_check, gcry_prime_generate): New - functions. - (prime_generate_internal): New function, based on - _gcry_generate_elg_prime. - (_gcry_generate_elg_prime): Rewritten as a wrapper for - prime_generate_internal. - -2003-08-28 Werner Koch - - * pubkey.c (gcry_pk_encrypt): Don't include the flags list in the - return value. This does not make sense and breaks any programs - parsing the output strictly (e.g. current gpgsm). - (gcry_pk_encrypt): If aliases for the algorithm name exists, take - the first one instead of the regular name to adhere to SPKI - conventions. - (gcry_pk_genkey): Ditto. - (gcry_pk_sign): Ditto. Removed unused KEY_ALGO_NAME. - -2003-08-19 Moritz Schulte - - * cipher.c: Add support for Serpent - * serpent.c: New file. - -2003-08-10 Moritz Schulte - - * rsa.c (_gcry_rsa_blind, _gcry_rsa_unblind): Declare static. - -2003-08-09 Timo Schulz - - * random.c (getfnc_gather_random): Don't check NAME_OF_DEV_RANDOM - two times, but also the NAME_OF_DEV_URANDOM device. - -2003-08-08 Moritz Schulte - - * pubkey.c (sexp_to_enc): Fixed extraction of S-Expression: do not - fail if no `flags' sub S-Expression is found. - -2003-07-27 Werner Koch - - * md.c (gcry_md_lookup_func_oid): Allow for empty OID lists. - -2003-07-23 Moritz Schulte - - * ac.c (gcry_ac_data_construct): New argument: include_flags, only - include `flags' S-expression, if include_flags is true. Adjust - callers. Thanks for triggering a bug caused by `flags' - sub-S-expression where they are not expected to Ralf Schneider. - -2003-07-21 Moritz Schulte - - * pubkey.c (gcry_pk_lookup_func_name): Use new member name - `aliases' instead of `sexp_names'. - - * ac.c (gcry_ac_key_data_get): New function. - - * cipher.c (gcry_cipher_lookup_func_name): Fix return value. - -2003-07-20 Moritz Schulte - - * blowfish.c: Adjusted for new gcry_cipher_spec_t structure. - * cast5.c: Likewise. - * twofish.c: Likewise. - * arcfour.c: Likewise. - * rijndael.c (rijndael_oids, rijndael192_oids, rijndael256_oids): - New variables, adjust for new gcry_cipher_spec_t structure. - * des.c (oids_tripledes): New variable, adjust for new - gcry_cipher_spec_t structure. - - * md.c (oid_table): Removed. - - * tiger.c (oid_spec_tiger): New variable. - (digest_spec_tiger): Adjusted for new gry_md_spec_t structure. - - * sha512.c (oid_spec_sha512): New variable. - (digest_spec_sha512): Adjusted for new gry_md_spec_t structure. - - * sha512.c (oid_spec_sha384): New variable. - (digest_spec_sha384): Adjusted for new gry_md_spec_t structure. - - * sha256.c (oid_spec_sha256): New variable. - (digest_spec_sha256): Adjusted for new gry_md_spec_t structure. - - * sha1.c (oid_spec_sha1): New variable. - (digest_spec_sha1): Adjusted for new gry_md_spec_t structure. - - * rmd160.c (oid_spec_rmd160): New variable. - (digest_spec_rnd160): Adjusted for new gry_md_spec_t structure. - - * md5.c (oid_spec_md5): New variable. - (digest_spec_md5): Adjusted for new gry_md_spec_t structure. - - * md4.c (oid_spec_md4): New variable. - (digest_spec_md4): Adjusted for new gry_md_spec_t structure. - - * crc.c (digest_spec_crc32, digest_spec_crc32_rfc1510, - digest_spec_crc32_rfc2440): Adjusted for new gry_md_spec_t - structure. - -2003-07-19 Moritz Schulte - - * md.c (gcry_md_lookup_func_oid): New function. - (search_oid): New function, copied from cipher.c. - (gcry_md_map_name): Adjust for new search_oid_interface. - - * cipher.c (oid_table): Removed table. - (gcry_cipher_lookup_func_oid): New function. - (search_oid): Rewritten to use the module functions. - (gcry_cipher_map_name): Adjust for new search_oid interface. - (gcry_cipher_mode_from_oid): Likewise. - -2003-07-18 Werner Koch - - * md.c (gcry_md_hash_buffer): Convert ERR to gpg_error_t in - gpg_strerror. - -2003-07-14 Moritz Schulte - - * cipher.c (gcry_cipher_lookup_func_name): Also check the cipher - name aliases, not just the primary name. - (gcry_cipher_map_name): Remove kludge for aliasing Rijndael to - AES. - - * arcfour.c, blowfish.c, cast5.c, des.c, twofish.c: Adjust cipher - specification structures. - - * rijndael.c (rijndael_names, rijndael192_names, - rijndael256_names): New variables, use them in the cipher - specifications. - - * rmd160test.c: Removed file. - - * ac.c, arcfour.c, blowfish.c, cast5.c, cipher.c, des.c, dsa.c, - elgamal.c, md.c, pubkey.c, random.c, rijndael.c, rsa.c, twofish.c: - Used gcry_err* wrappers for libgpg symbols. - - * primegen.c (gen_prime): Correct the order arguments to - extra_check. - -2003-07-12 Moritz Schulte - - * ac.c: Replaced all public occurences of gpg_error_t with - gcry_error_t. - * cipher.c: Likewise. - * md.c: Likewise. - * pubkey.c: Likewise. - * random.c: Likewise. - - * cipher.c: Added support for TWOFISH128. - -2003-07-08 Moritz Schulte - - * ac.c (gcry_ac_data_copy_internal): New function, based on - gcry_ac_data_copy. - (gcry_ac_data_copy): Made public, use gcry_ac_data_copy_internal. - (gcry_ac_key_init): Use gcry_ac_data_copy_internal. - -2003-07-07 Moritz Schulte - - * ac.c (gcry_ac_data_set): Only release old MPI value if it is - different from the new value. Bug reported by Simon Josefsson - . - - * pubkey.c (gcry_pk_list): New function. - * md.c (gcry_md_list): New function. - - * ac.c (gcry_ac_key_pair_generate): Fix calculation of format - string size. - -2003-07-05 Moritz Schulte - - * md.c: Named struct of digest_table `digest_table_entry'. - (digest_table_entry): New member: algorithm; filled in. - (digest_table_entry): Removed unused member: flags. - (gcry_md_register): New argument: algorithm_id, filled in. - (gcry_md_register_default): Used algorithm ID from module - structure. - (gcry_md_map_name): Likewise. - (md_enable): Likewise. - (md_read): Likewise. - (gcry_md_info): Likewise. - - * pubkey.c: Named truct for pubkey_table `pubkey_table_entry'. - (pubkey_table_entry): New member: algorithm; filled in. - (gcry_pk_register_default): Used algorithm ID from pubkey_table. - (gcry_pk_register): New argument: algorithm_id, filled in. - (gcry_pk_map_name): Used algorithm ID from module structure. - (gcry_pk_decrypt): Likewise. - (gcry_pk_encrypt): Likewise. - (gcry_pk_verify): Likewise. - (gcry_pk_sign): Likewise. - (gcry_pk_testkey): Likewise. - (gcry_pk_genkey): Likewise. - (gcry_pk_get_nbits): Likewise. - (sexp_to_key): Removed unused variable: algo. - (sexp_to_sig): Likewise. - - * cipher.c: Named struct for cipher_table `cipher_table_entry'. - (cipher_table_entry): New member: algorithm; filled in. - (gcry_cipher_register_default): Used algorithm ID from - cipher_table. - (gcry_cipher_register): New argument: algorithm_id, filled in. - (gcry_cipher_map_name): Used algorithm ID from module structure. - - * arcfour.c (cipher_spec_arcfour): Removed algorithm ID. - * blowfish.c (cipher_spec_blowfish): Likewise. - * cast5.c (cipher_spec_cast5): Likewise. - * crc.c (digest_spec_crc32): Likewise. - * crc.c (digest_spec_crc32_rfc1510): Likewise. - * crc.c (digest_spec_crc32_rfc2440): Likewise. - * des.c (cipher_spec_des): Likewise. - * des.c (cipher_spec_tripledes): Likewise. - * dsa.c (pubkey_spec_dsa): Likewise. - * elgamal.c (pubkey_spec_elg): Likewise. - * md4.c (digest_spec_md4): Likewise. - * md5.c (digest_spec_md5): Likewise. - * aes.c (cipher_spec_aes): Likewise. - * aes.c (cipher_spec_aes192): Likewise. - * aes.c (cipher_spec_aes256): Likewise. - * rsa.c (pubkey_spec_rsa): Likewise. - * sha1.c (digest_spec_sha1): Likewise. - * sha256.c (digest_spec_sha256): Likewise. - * sha512.c (digest_spec_sha512): Likewise. - * tiger.c (digest_spec_tiger): Likewise. - * twofish.c (cipher_spec_twofish): Likewise. - * twofish.c (cipher_spec_twofish128): Likewise. - - * Makefile.am (EXTRA_libcipher_la_SOURCES): Fix list of source - files; reported by Simon Josefsson . - - * pubkey.c: Replaced all occurences of `id' with `algorithm', - since `id' is a keyword in obj-c. - * md.c: Likewise. - * cipher.c: Likewise. - - * crc.c, md4.c, md5.c, rmd160.c, sha1.c, sha256.c, tiger.c: - Replaced all occurences of gcry_digest_spec_t with gcry_md_spec_t. - - * dsa.c, rsa.c, elgamal.c: Replaced all occurencens of - gcry_pubkey_spec_t with gcry_pk_spec_t. - - * md.c: Replaced all occurences of gcry_digest_spec_t with - gcry_md_spec_t. - (gcry_digest_register_default): Renamed to ... - (gcry_md_register_default): ... this; adjusted callers. - (gcry_digest_lookup_func_name): Renamed to ... - (gcry_md_lookup_func_name): ... this; adjusted callers. - (gcry_digest_lookup_name): Renamed to ... - (gcry_md_lookup_name): ... this; adjusted callers. - (gcry_digest_register): Renamed to ... - (gcry_md_register): ... this. - (gcry_digest_unregister): Renamed to ... - (gcry_md_unregister): ... this. - - * pubkey.c (gcry_pubkey_register): Renamed to ... - (gcry_pk_register): ... this. - (gcry_pubkey_unregister): Renamed to ... - (gcry_pk_unregister): ... this. - Replaced all occurences of gcry_pubkey_spec_t with gcry_pk_spec_t. - (gcry_pubkey_register_default): Renamed to ... - (gcry_pk_register_default): ... this; adjusted callers. - (gcry_pubkey_lookup_func_name): Renamed to ... - (gcry_pk_lookup_func_name): ... this; adjusted callers. - (gcry_pubkey_lookup_name): Renamed to ... - (gcry_pk_lookup_name): ... this; adjusted callers. - - * md.c (gcry_md_hash_buffer): Fix error checking. Thanks to Simon - Josefsson . - -2003-07-04 Moritz Schulte - - * cipher.c (gcry_cipher_list): New function. - -2003-07-01 Moritz Schulte - - * pubkey.c (sexp_to_sig): Accept a `flags' S-expression to be more - consistent with sexp_to_enc. - -2003-06-30 Moritz Schulte - - * Makefile.am (libcipher_la_SOURCES): Added: ac.c. - - * pubkey.c (_gcry_pk_module_lookup): New function. - (_gcry_pk_module_release): New function. - -2003-06-29 Moritz Schulte - - * ac.c: New file. - -2003-06-26 Werner Koch - - * md.c (gcry_md_hash_buffer): Trigger BUG correcly with new API. - -2003-06-19 Werner Koch - - * md.c (gcry_md_is_enabled): Fixed. - -2003-06-18 Werner Koch - - * cipher.c (gcry_cipher_get_algo_keylen): New. - (gcry_cipher_get_algo_blklen): New. - -2003-06-18 Moritz Schulte - - * arcfour.c, cipher.c, blowfish.c, md.c, cast5.c, pubkey.c, crc.c, - des.c, dsa.c, elgamal.c, md4.c, md5.c, random.c, rijndael.c, - rmd160.c, rsa.c, sha1.c, sha256.c, sha512.c, tiger.c, twofish.c: - Replaced older types GcryDigestSpec, GcryCipherSpec and - GcryPubkeySpec with newer types: gcry_digest_spec_t, - gcry_cipher_spec_t and gcry_pubkey_spec_t. - - * md.c (gcry_digest_id_new): Removed function. - (gcry_digest_register): Removed code for generating a new module - ID. - - * pubkey.c (gcry_pubkey_id_new): Removed function. - (gcry_pubkey_register): Removed code for generating a new module - ID. - - * cipher.c, md.c, pubkey.c: Replace old type GcryModule with newer - one: gcry_module_t. - (gcry_cipher_id_new): Removed function. - (gcry_cipher_register): Removed code for generating a new module - ID. - - * cipher.c (gcry_cipher_register): Adjust call to - _gcry_module_add. - (gcry_cipher_register_default): Likewise. - * pubkey.c (gcry_pubkey_register_default): Likewise. - (gcry_pubkey_register): Likewise. - * md.c (gcry_digest_register_default): Likewise. - (gcry_digest_register): Likewise. - - * md.c (gcry_digest_lookup_func_id): Removed function. - (gcry_digest_lookup_id): Likewise. - (gcry_digest_id_new): Use _gcry_module_lookup_id instead of - gcry_digest_lookup_id. - (digest_algo_to_string): Likewise. - (check_digest_algo): Likewise. - (md_enable): Likewise. - (md_digest_length): Likewise. - (md_asn_oid): Likewise. - - * pubkey.c (gcry_pubkey_lookup_id): Removed function. - (gcry_pubkey_lookup_func_id): Likewise. - (gcry_pubkey_id_new): Use _gcry_module_lookup_id instead of - gcry_pubkey_id_new. - (gcry_pk_algo_name): Likewise. - (disable_pubkey_algo): Likewise. - (check_pubkey_algo): Likewise. - (pubkey_get_npkey): Likewise. - (pubkey_get_nskey): Likewise. - (pubkey_get_nsig): Likewise. - (pubkey_get_nenc): Likewise. - (pubkey_generate): Likewise. - (pubkey_check_secret_key): Likewise. - (pubkey_encrypt): Likewise. - (pubkey_decrypt): Likewise. - (pubkey_sign): Likewise. - (pubkey_verify): Likewise. - (gcry_pk_algo_info): Likewise. - - * cipher.c (gcry_cipher_lookup_func_id): Removed function. - (gcry_cipher_lookup_id): Likewise. - (cipher_algo_to_string): use _gcry_module_lookup_id instead of - gcry_cipher_lookup_id. - (disable_cipher_algo): Likewise. - (check_cipher_algo): Likewise. - (cipher_get_blocksize): Likewise. - (gcry_cipher_open): Likewise. - (gcry_cipher_id_new): Likewise. - -2003-06-17 Moritz Schulte - - * Makefile.am (GCRYPT_MODULES): Set to @GCRYPT_CIPHERS@, - @GCRYPT_PUBKEY_CIPHERS@, @GCRYPT_DIGESTS@ and @GCRYPT_RANDOM@. - (libcipher_la_DEPENDENCIES): Set to $(GCRYPT_MODULES). - (libcipher_la_LIBADD): Likewise. - (AM_CFLAGS): Added: @GPG_ERROR_CFLAGS@. - (EXTRA_libcipher_la_SOURCES): Added all conditional sources. - - * md.c (md_open): Use _gcry_fast_random_poll instead of - fast_random_poll. - * cipher.c (gcry_cipher_open): Likewise. - - * random.h (fast_random_poll): Removed macro. - - * blowfish.c, md4.c, md5.c, rmd160.c, sha1.c, sha256.c, sha512.c, - tiger.c: Use Autoconf's WORDS_BIGENDIAN instead of our own - BIG_ENDIAN_HOST. - -2003-06-16 Moritz Schulte - - * random.c (getfnc_gather_random): Do not special-case - USE_ALL_RANDOM_MODULES, make it the default. - - * dsa.c: Replace last occurences of old type names with newer - names (i.e. replace MPI with gcry_mpi_t). - * elgamal.c: Likewise. - * primegen.c: Likewise. - * pubkey.c: Likewise. - * rsa.c: Likewise. - -2003-06-14 Moritz Schulte - - * des.c (des_setkey): Add selftest check. - (tripledes_set3keys): Likewise. - (do_tripledes_setkey): Remove selftest check. - (do_des_setkey): Likewise. - -2003-06-11 Moritz Schulte - - * md.c (_gcry_md_init): New function. - * cipher.c (_gcry_cipher_init): New function. - * pubkey.c (_gcry_pk_init): New function. - -2003-06-13 Werner Koch - - * md.c (gcry_md_get_algo): Reverted to old API. This is a - convenience function anyway and error checking is not approriate. - (gcry_md_is_secure): New. - (gcry_md_is_enabled): New. - -2003-06-12 Werner Koch - - * cipher.c (gcry_cipher_open): Make sure HANDLE is set to NULL on - error. - -2003-06-11 Werner Koch - - * md.c (gcry_md_open): Make sure H receives either NULL or an - valid handle. - (gcry_md_copy): Swapped arguments so that it is more in lione with - md_open and most other API fucntions like memcpy (destination - comes first). Make sure HANDLE is set to NULL on error. - - * rijndael.c (do_encrypt): Hack to force correct alignment. It - seems not to be not sufficient, though. We should rework this - fucntions and remove all these ugly casts. Let the compiler - optimize or have an assembler implementation. - -2003-06-09 Moritz Schulte - - * Makefile.am: Removed rules serpent, since that is not commited - yet. - -2003-06-08 Moritz Schulte - - * pubkey.c (gcry_pk_encrypt): Improve calculation for size of the - format string. - -2003-06-07 Moritz Schulte - - * arcfour.c, bithelp.h, blowfish.c, cast5.c, cipher.c, crc.c, - des.c, dsa.c, elgamal.c, md4.c, md5.c, md.c, primegen.c, pubkey.c, - rand-internal.h, random.c, random.h, rijndael.c, rmd160.c, - rmd160test.c, rmd.h, rndeged.c, rndlinux.c, rndunix.c, rndw32.c, - rsa.c, sha1.c, sha256.c, sha512.c, tiger.c, twofish.c: Edited all - preprocessor instructions to remove whitespace before the '#'. - This is not required by C89, but there are some compilers out - there that don't like it. Replaced any occurence of the now - deprecated type names with the new ones. - -2003-06-04 Moritz Schulte - - * pubkey.c (gcry_pk_encrypt): Construct an arg_list and use - gcry_sexp_build_array instead of gcry_sexp_build. - (gcry_pk_sign): Likewise. - (gcry_pk_genkey): Likewise. - -2003-06-01 Moritz Schulte - - * dsa.c (_gcry_dsa_generate): Do not check wether the algorithm ID - does indeed belong to DSA. - (_gcry_dsa_sign): Likewise. - (_gcry_dsa_verify): Likewise. - (_gcry_dsa_get_nbits): Likewise. - - * elgamal.c (_gcry_elg_check_secret_key): Do not check wether the - algorithm ID does indeed belong to ElGamal. - (_gcry_elg_encrypt): Likewise. - (_gcry_elg_decrypt): Likewise. - (_gcry_elg_sign): Likewise. - (_gcry_elg_verify): Likewise. - (_gcry_elg_get_nbits): Likewise. - (_gcry_elg_generate): Likewise. - - * rsa.c (_gcry_rsa_generate): Do not check wether the algorithm ID - does indeed belong to RSA. - (_gcry_rsa_encrypt): Likewise. - (_gcry_rsa_decrypt): Likewise. - (_gcry_rsa_sign): Likewise. - (_gcry_rsa_verify): Likewise. - (_gcry_rsa_get_nbits): Likewise. - -2003-05-30 Moritz Schulte - - * md.c (md_get_algo): Return zero in case to algorithm is enabled. - - * md.c (gcry_md_info): Adjusted for new no-errno-API. - (md_final): Likewise. - (gcry_md_get_algo): Likewise. - * pubkey.c (gcry_pk_get_keygrip): Likewise. - (gcry_pk_ctl): Likewise. - (gcry_pk_algo_info): Likewise. - * des.c (selftest): Likewise. - -2003-05-29 Moritz Schulte - - * md.c (md_enable): Do not forget to release module on error. - (gcry_md_open): Adjusted for new no-errno-API. - (md_open): Likewise. - (md_copy): Likewise. - (gcry_md_copy): Likewise. - (gcry_md_setkey): Likewise. - (gcry_md_algo_info): Likewise. - - * cipher.c (gcry_cipher_open): Adjusted for new no-errno-API and - also fixed a locking bug. - (gcry_cipher_encrypt): Adjusted for new no-errno-API. - (gcry_cipher_decrypt): Likewise. - (gcry_cipher_ctl): Likewise. - (gcry_cipher_info): Likewise. - (gcry_cipher_algo_info): Likewise. - -2003-05-28 Moritz Schulte - - * md.c (md_enable): Adjusted for libgpg-error. - (gcry_md_enable): Likewise. - (gcry_digest_register_default): Likewise. - (gcry_digest_register): Likewise. - (check_digest_algo): Likewise. - (prepare_macpads): Likewise. - (gcry_md_setkey): Likewise. - (gcry_md_ctl): Likewise. - (gcry_md_get): Likewise. - (gcry_md_algo_info): Likewise. - (gcry_md_info): Likewise. - * dsa.c (_gcry_dsa_generate): Likewise. - (_gcry_dsa_check_secret_key): Likewise. - (_gcry_dsa_sign): Likewie. - (_gcry_dsa_verify): Likewise. - * twofish.c (do_twofish_setkey): Likewise. - (twofish_setkey): Likewise. - * cipher.c (gcry_cipher_register): Likewise. - -2003-05-25 Moritz Schulte - - * rijndael.c (do_setkey): Adjusted for libgpg-error. - (rijndael_setkey): Likewise. - * random.c (gcry_random_add_bytes): Likewise. - * elgamal.c (_gcry_elg_generate): Likewise. - (_gcry_elg_check_secret_key): Likewise. - (_gcry_elg_encrypt): Likewise. - (_gcry_elg_decrypt): Likewise. - (_gcry_elg_sign): Likewise. - (_gcry_elg_verify): Likewise. - * rsa.c (_gcry_rsa_generate): Likewise. - (_gcry_rsa_check_secret_key): Likewise. - (_gcry_rsa_encrypt): Likewise. - (_gcry_rsa_decrypt): Likewise. - (_gcry_rsa_sign): Likewise. - (_gcry_rsa_verify): Likewise. - * pubkey.c (dummy_generate, dummy_check_secret_key, dummy_encrypt, - dummy_decrypt, dummy_sign, dummy_verify): Likewise. - (gcry_pubkey_register): Likewise. - (check_pubkey_algo): Likewise. - (pubkey_generate): Likewise. - (pubkey_check_secret_key): Likewise. - (pubkey_encrypt): Likewise. - (pubkey_decrypt): Likewise. - (pubkey_sign): Likewise. - (pubkey_verify): Likewise. - (sexp_elements_extract): Likewise. - (sexp_to_key): Likewise. - (sexp_to_sig): Likewise. - (sexp_to_enc): Likewise. - (sexp_data_to_mpi): Likewise. - (gcry_pk_encrypt): Likewise. - (gcry_pk_decrypt): Likewise. - (gcry_pk_sign): Likewise. - (gcry_pk_verify): Likewise. - (gcry_pk_testkey): Likewise. - (gcry_pk_genkey): Likewise. - (gcry_pk_ctl): Likewise. - * cipher.c (dummy_setkey): Likewise. - (check_cipher_algo): Likewise. - (gcry_cipher_open): Likewise. - (cipher_setkey): Likewise. - (gcry_cipher_ctl): Likewise. - (cipher_encrypt): Likewise. - (gcry_cipher_encrypt): Likewise. - (cipher_decrypt): Likewise. - (gcry_cipher_decrypt): Likewise. - (gcry_cipher_info): Likewise. - (gcry_cipher_algo_info): Likewise. - * cast5.c (cast_setkey): Likewise. - (do_cast_setkey): Likewise. - * arcfour.c (arcfour_setkey): Likewise. - (do_arcfour_setkey): Likewise. - * blowfish.c (do_bf_setkey): Likewise. - (bf_setkey): Likewise. - * des.c (do_des_setkey): Likewise. - (do_tripledes_setkey): Likewise. - -2003-05-22 Moritz Schulte - - * tiger.c: Merged code ussing the U64_C macro from GnuPG. - - * sha512.c: Likewise. - -2003-05-17 Moritz Schulte - - * pubkey.c (gcry_pk_genkey): Fix type: acquire a lock, instead of - releasing it. - -2003-05-11 Moritz Schulte - - * pubkey.c (gcry_pk_testkey): Call REGISTER_DEFAULT_CIPHERS. - (gcry_pk_ctl): Likewise. - -2003-04-27 Moritz Schulte - - * pubkey.c (gcry_pk_genkey): Release sexp after extracted data has - been used. - - * md.c (gcry_md_get_algo_dlen): Simplified, simply call - md_digest_length to do the job. - - * des.c (do_des_setkey): Check for selftest failure not only - during initialization. - (do_tripledes_setkey): Include check for selftest failure. - - * pubkey.c (gcry_pubkey_register_default): New macro - `pubkey_use_dummy', use it. - - * elgamal.c (elg_names): New variable. - (pubkey_spec_elg): Include elg_names. - - * dsa.c (dsa_names): New variable. - (pubkey_spec_dsa): Include dsa_names. - - * rsa.c (rsa_names): New variable. - (pubkey_spec_rsa): Include rsa_names. - - * pubkey.c (gcry_pubkey_lookup_func_name): Compare name also with - the names listed in `sexp_names'. - -2003-04-24 Moritz Schulte - - * pubkey.c (sexp_to_key): New variables: module, pubkey. Adjusted - to new module interface. - (sexp_to_key): Changend type of argument `retalgo' from `int *' to - `GcryModule **'. Adjusted all callers. Removed argument: - r_algotblidx. - (sexp_to_sig): Changend type of argument `retalgo' from `int *' to - `GcryModule **'. Adjusted all callers. - (sexp_to_enc): Likewise. - - (pubkey_get_npkey, pubkey_get_nskey, pubkey_get_nsig, - pubkey_get_nenc): Use strlen to find out the number. - - * rsa.c: Adjust pubkey_spec_rsa to new internal interface. - * dsa.c: Likewise. - * elgamal.c: Likewise. - -2003-04-17 Moritz Schulte - - * pubkey.c (sexp_elements_extract): New function. - * pubkey.c (sexp_to_key): Removed variable `idx', added `err', use - sexp_elements_extract. - (sexp_to_sig): Likewise. - (sexp_to_enc): Likewise. - - * pubkey.c: Terminate list correctly. - * md.c: Include sha512/sha384 in digest_table. - -2003-04-16 Moritz Schulte - - * Makefile.am: Include support for sha512.c. - - * sha512.c: New file, merged from GnuPG, with few modifications - for libgcrypt. - - * rand-internal.h: Removed declarations for constructor functions. - - * md.c (md_copy): Call _gcry_module_use for incrementing the usage - counter of the digest modules. - - * rsa.c: Do not include "rsa.h". - * dsa.c: Do not include "dsa.h". - * elgamal.c: Do not include "elgamal.h". - * des.c: Do not include "des.h". - * cast5.c: Do not include "cast5.h". - * blowfish.c: Do not include "blowfish.h". - * arcfour.c: Do not include "arcfour.h". - - * Makefile.am (libcipher_la_DEPENDENCIES): Removed. - (libcipher_la_LIBADD): Removed. - Use Automake conditionals for conditional compilation. - -2003-04-13 Moritz Schulte - - * cipher.c (gcry_cipher_open): Call REGISTER_DEFAULT_CIPHERS. - - * md.c (gcry_md_list): New member: module. - (md_enable): New variable: module, changed use of module and - digest. - (md_enable): Initialize member: module. - (md_close): Call _gcry_module_release. - - * cipher.c (gcry_cipher_open): New variable: module, changed use of - module and cipher. - (struct gcry_cipher_handle): New member: module. - (gcry_cipher_open): Initialize member: module. - (gcry_cipher_close): Call _gcry_module_release. - -2003-04-09 Moritz Schulte - - * cipher.c: Include "ath.h". - * md.c: Likewise. - * pubkey.c: Likewise. - - * cipher.c (ciphers_registered_lock): New variable. - * md.c (digests_registered_lock): New variable. - * pubkey.c (pubkeys_registered_lock): New variable. - - * rndlinux.c (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func): Removed function. - (_gcry_rndlinux_constructor): Removed function. - - * rndegd.c (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func): Removed function. - (_gcry_rndegd_constructor): Removed function. - - * rndunix.c (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func): Removed function. - (_gcry_rndunix_constructor): Removed function. - - * rndw32.c (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func): Removed function. - (_gcry_rndw32_constructor): Removed function. - - * rndegd.c (rndegd_connect_socket): Simplify code for creating the - egd socket address. - (rndegd_connect_socket): Call log_fatal use instead of - g10_log_fatal. - (egd_gather_random): Renamed to ... - (rndegd_gather_random): ... here. - -2003-04-08 Moritz Schulte - - * rndlinux.c: Do not include "dynload.h". - * rndunix.c: Likewise. - * rndw32.c: Likewise. - - * rndegd.c (rndegd_connect_socket): Factored out from ... - (egd_gather_random): here; call it. - (egd_socket): New variable. - (egd_gather_random): Initialize fd with egd_socket, do not declare - fd static. - (do_read): Merged few changes from GnuPG. FIXME - not finished? - Do not include "dynload.h". - - * rndw32.c (gather_random): Renamed to rndw32_gather_random, do - not declare static. - (gather_random_fast): Renamed to rndw32_gather_random_fast, do not - declare static. - - * rndunix.c (gather_random): Renamed to rndunix_gather_random, do - not declare static. - * rndegd.c (gather_random): Renamed to rndegd_gather_random, do - not declare static. - * rndlinux.c (gather_random): Renamed to rndlinux_gather_random, - do not declare static. - -2003-04-07 Moritz Schulte - - * Makefile.am (libcipher_la_SOURCES): Removed construct.c. - (libcipher_la_SOURCES): Added sha1.c, sha256.c, rmd160.c, md4.c, - md5.c, tiger.c and crc.c - (EXTRA_PROGRAMS): Removed sha1, sha256, rmd160, md4, md5, tiger - and crc. Removed definitions: EXTRA_md4_SOURCES, - EXTRA_md5_SOURCES, EXTRA_rmd160_SOURCES, EXTRA_sha1_SOURCES, - EXTRA_sha256_SOURCES, EXTRA_tiger_SOURCES and EXTRA_crc_SOURCES, - BUILT_SOURCES, DISTCLEANFILES. - - * pubkey.c: Do not include "elgamal.h", "dsa.h" and "rsa.h". - - * Makefile.am (libcipher_la_SOURCES): Removed rsa.h, elgamal.h, - dsa.h, des.h, cast5.h, arcfour.h and blowfish.h. - - * rsa.h: Removed file. - * elgamal.h: Removed file. - * dsa.h: Removed file. - * des.h: Removed file. - * cast5.h: Removed file. - * arcfour.h: Removed file. - * blowfish.h: Removed file. - - * Makefile.am (libcipher_la_SOURCES): Removed dynload.c and - dynload.h. - - * rsa.c (pubkey_spec_rsa): New variable. - * dsa.c (pubkey_spec_rsa): New variable. - * elgamal.c (pubkey_spec_elg): New variable. - - * rsa.c (_gcry_rsa_get_info): Removed function. - * elgamal.c (_gcry_elg_get_info): Removed function. - * dsa.c (_gcry_dsa_get_info): Removed function. - - * tiger.c (tiger_get_info): Removed function. - (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func): Removed function. - (_gcry_tiger_constructor): Removed function. - - * sha1.c (sha1_get_info): Removed function. - (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func): Removed function. - (_gcry_sha1_constructor): Removed function. - - * sha256.c (sha256_get_info): Removed function. - (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func): Removed function. - (_gcry_sha256_constructor): Removed function. - - * rmd160.c (rmd160_get_info): Removed function. - (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func): Removed function. - (_gcry_rmd160_constructor): Removed function. - - * md5.c (md5_get_info): Removed function. - (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func): Removed function. - (_gcry_md5_constructor): Removed function. - - * md4.c (md4_get_info): Removed function. - (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func): Removed function. - (_gcry_md4_constructor): Removed function. - - * crc.c (crc_get_info): Removed function. - - * arcfour.c (do_arcfour_setkey): Changed type of context argument - to `void *', added local variable for cast, adjusted callers. - (arcfour_setkey): Likewise. - (encrypt_stream): Likewise. - * cast5.c (cast_setkey): Likewise. - (encrypt_block): Likewise. - * rijndael.c (rijndael_setkey): Likewise. - (rijndael_encrypt): Likewise. - (rijndael_decrypt): Likewise. - * twofish.c (twofish_setkey): Likewise. - (twofish_encrypt): Likewise. - (twofish_decrypt): Likewise. - * des.c (do_des_setkey): Likewise. - (do_des_encrypt): Likewise. - (do_des_encrypt): Likewise. - (do_tripledes_encrypt): Likewise. - (do_tripledes_encrypt): Likewise. - * blowfish.c (bf_setkey: Likewise. - (encrypt_block): Likewise. - (decrypt_block): Likewise. - - * arcfour.c (encrypt_stream): Likewise. - - * rijndael.c (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func) Removed function. - - * twofish.c (gnupgext_version, func_table): Removed definitions. - (gnupgext_enum_func) Removed function. - - * cast5.c (CIPHER_ALGO_CAST5): Removed. - - * blowfish.c (FNCCAST_SETKEY, FNCCAST_CRYPT): Removed macros. - (CIPHER_ALGO_BLOWFISH): Removed symbol. - * cast5.c (FNCCAST_SETKEY, FNCCAST_CRYPT): Likewise. - * des.c (selftest_failed): Removed. - (initialized): New variable. - (do_des_setkey): Run selftest, if not yet done. - (FNCCAST_SETKEY, FNCCAST_CRYPT): Removed macros. - - * arcfour.c (_gcry_arcfour_get_info): Removed function. - * blowfish.c (_gcry_blowfish_get_info): Removed function. - * cast5.c (_gcry_cast5_get_info): Removed function. - * des.c (_gcry_des_get_info): Removed function. - * rijndael.c (_gcry_rijndael_get_info): Removed function. - * twofish.c (_gcry_twofish_get_info): Removed function. - - * arcfour.c (cipher_spec_arcfour): New variable. - * twofish.c (cipher_spec_twofish, cipher_spec_twofish128): New - variables. - * rijndael.c (cipher_spec_aes, cipher_spec_aes192, - cipher_spec256): New variables. - * des.c (cipher_spec_des, cipher_spec_tripledes): New variables. - * cast5.c (cipher_spec_cast5): New variable. - * blowfish.c (cipher_spec_blowfish): Likewise. - - * twofish.c: Do not include "dynload.h". - * rijndael.c: Likewise. - * des.c: Likewise. - * cast5.c: Likewise. - * blowfish.c: Likewise. - * cipher.c: Likewise. - * crc.c: Likewise. - * md4.c: Likewise. - * md5.c: Likewise. - * md.c: Likewise. - * pubkey.c: Likewise. - * rijndael.c: Likewise. - * sha1.c: Likewise. - * sha256.c: Likewise. - - * arcfour.c: Include "cipher.h". - * twofish.c: Likewise. - * rijndael.c: Likewise. - * des.c: Likewise. - * cast5.c: Likewise. - * blowfish.c: Likewise. - - * twofish.c (twofish_setkey): Declared argument `key' const. - (twofish_encrypt): Declared argument `inbuf' const. - (twofish_decrypt): Likewise. - - * rijndael.c (rijndael_setkey): Declared argument `key' const. - (rijndael_encrypt): Declared argument `inbuf' const. - (rijndael_decrypt): Likewise. - - * des.c (do_des_setkey): Declared argument `key' const. - (do_tripledes_setkey): Likewise. - (do_des_encrypt): Declared argument `inbuf' const. - (do_des_decrypt): Likewise. - (do_tripledes_encrypt): Likewise. - (do_tripledes_decrypt): Likewise. - - * cast5.c (encrypt_block): Declared argument `inbuf' const. - (decrypt_block): Likewise. - (cast_setkey): Declared argument `key' const. - - * blowfish.c (do_bf_setkey): Declared argument `key' const. - (encrypt_block): Declared argument `inbuf' const. - (encrypt_block): Likewise. - - - - * cipher.c: Remove CIPHER_ALGO_DUMMY related code. - Removed struct cipher_table_s. - Changed definition of cipher_table. - Removed definition of disabled_algos. - (ciphers_registered, default_ciphers_registered): New variables. - (REGISTER_DEFAULT_CIPHERS): New macro. - (dummy_setkey): Declared argument `key' const. - (dummy_encrypt_block): Declared argument `inbuf' const. - (dummy_encrypt_block): Likewise. - (dummy_encrypt_stream): Likewise. - (dummy_encrypt_stream): Likewise. - (dummy_setkey): Use `unsigned char' instead of `byte'. - (dummy_encrypt_block): Likewise. - (dummy_decrypt_block): Likewise. - (dummy_encrypt_stream): Likewise. - (dummy_decrypt_stream): Likewise. - (gcry_cipher_register_default): New function. - (gcry_cipher_lookup_func_id): New function. - (gcry_cipher_lookup_func_name): New function. - (gcry_cipher_lookup_id): New function. - (gcry_cipher_lookup_name): New function. - (gcry_cipher_id_new): New function. - (gcry_cipher_register): New function. - (gcry_cipher_unregister): New function. - (setup_cipher_table): Removed function. - (load_cipher_modules): Removed function. - (gcry_cipher_map_name): Adjusted to use new module management. - (cipher_algo_to_string): Likewise. - (disable_cipher_algo): Likewise. - (check_cipher_algo): Likewise. - (cipher_get_keylen): Likewise. - (cipher_get_blocksize): Likewise. - (gcry_cipher_open): Likewise. - (struct gcry_cipher_handle): Replaced members algo, algo_index, - blocksize, setkey, encrypt, decrypt, stencrypt, stdecrypt with one - member: cipher. - (gcry_cipher_open): Adjusted code for new handle structure. - (cipher_setkey): Likewise. - (cipher_setiv): Likewise. - (cipher_reset): Likewise. - (do_ecb_encrypt): Likewise. - (do_ecb_decrypt): Likewise. - (do_cbc_encrypt): Likewise. - (do_cbc_decrypt): Likewise. - (do_cfb_encrypt): Likewise. - (do_cfb_decrypt): Likewise. - (do_ctr_encrypt): Likewise. - (cipher_encrypt): Likewise. - (gcry_cipher_encrypt): Likewise. - (cipher_decrypt): Likewise. - (gcry_cipher_decrypt): Likewise. - (cipher_sync): Likewise. - (gcry_cipher_ctl): Likewise. - - * pubkey.c: Removed struct pubkey_table_s. - Changed definition of pubkey_table. - Removed definition of disabled_algos. - (pubkeys_registered, default_pubkeys_registered): New variables. - (REGISTER_DEFAULT_PUBKEYS): New macro. - (setup_pubkey_table): Removed function. - (load_pubkey_modules): Removed function. - (gcry_pubkey_register_default): New function. - (gcry_pubkey_lookup_func_id): New function. - (gcry_pubkey_lookup_func_name): New function. - (gcry_pubkey_lookup_id): New function. - (gcry_pubkey_lookup_name): New function. - (gcry_pubkey_id_new): New function. - (gcry_pubkey_register): New function. - (gcry_pubkey_unregister): New function. - (gcry_pk_map_name): Adjusted to use new module management. - (gcry_pk_algo_name): Likewise. - (disable_pubkey_algo): Likewise. - (check_pubkey_algo): Likewise. - (pubkey_get_npkey): Likewise. - (pubkey_get_nskey): Likewise. - (pubkey_get_nsig): Likewise. - (pubkey_get_nenc): Likewise. - (pubkey_generate): Likewise. - (pubkey_check_secret_key): Likewise. - (pubkey_encrypt): Likewise. - (pubkey_decrypt): Likewise. - (pubkey_sign): Likewise. - (pubkey_verify): Likewise. - (gcry_pk_get_nbits): Likewise. - (gcry_pk_algo_info): Likewise. - - * md.c: Removed struct md_digest_list_s. - (digest_list): Changed definition. - (digests_registered, default_digests_registered): New variables. - (REGISTER_DEFAULT_DIGESTS): New macro. - (new_list_item): Removed function. - (setup_md_table): Removed function. - (load_digest_module): Removed function. - (gcry_digest_register_default): New function. - (gcry_digest_lookup_func_id): New function. - (gcry_digest_lookup_func_name): New function. - (gcry_digest_lookup_id): New function. - (gcry_digest_lookup_name): New function. - (gcry_digest_id_new): New function. - (gcry_digest_register): New function. - (gcry_digest_unregister): New function. - (GcryDigestEntry): New type. - (struct gcry_md_context): Adjusted type of `list'. - (gcry_md_map_name): Adjusted to use new module management. - (digest_algo_to_string): Likewise. - (check_digest_algo): Likewise. - (md_enable): Likewise. - (md_digest_length): Likewise. - (md_asn_oid): Likewise. - -2003-04-07 Moritz Schulte - - * pubkey.c: Replaced PUBKEY_ALGO_DSA with GCRY_PK_DSA, - PUBKEY_ALGO_RSA with GCRY_PK_RSA and PUBKEY_ALGO_ELGAMAL with - GCRY_PK_ELG. - - * dsa.c: Replaced PUBKEY_ALGO_DSA with GCRY_PK_DSA. - -2003-04-01 Moritz Schulte - - * des.c: Removed checks for GCRY_CIPHER_3DES and GCRY_CIPHER_DES. - -2003-03-31 Moritz Schulte - - * tiger.c (tiger_get_info): Do not declare static. - * sha256.c (sha256_get_info): Likewise. - * sha1.c (sha1_get_info): Likewise. - * rmd160.c (rmd160_get_info): Likewise. - * md5.c (md5_get_info): Likewise. - * md4.c (md4_get_info): Likewise. - * crc.c (crc_get_info): Likewise. - - * md.c (load_digest_module): Call setup_md_table during - initialization. - (new_list_item): Link new element into digest_list. - - * cipher.c (do_ctr_decrypt): Made do_ctr_encrypt act as a wrapper - for do_ctr_encrypt, since these functions are identical. - -2003-03-30 Simon Josefsson - - * cipher.c (struct gcry_cipher_handle): Add counter field. - (gcry_cipher_open): Add CTR. - (cipher_reset): Clear counter field. - (do_ctr_encrypt, do_ctr_decrypt): New functions. - (cipher_encrypt, cipher_decrypt): Call CTR functions. - (gcry_cipher_ctl): Add SET_CTR to set counter. - -2003-03-30 Moritz Schulte - - * rsa.c (_gcry_rsa_blind): New function. - (_gcry_rsa_unblind): New function. - (_gcry_rsa_decrypt): Use _gcry_rsa_blind and _gcry_rsa_decrypt. - -2003-03-26 Moritz Schulte - - * dynload.c (_gcry_enum_gnupgext_pubkeys): Adjust `encrypt' and - `decrypt' function arguments. - (_gcry_enum_gnupgext_pubkeys): Likewise. - * dynload.h: Likewise. - - * pubkey.c (dummy_decrypt): Add argument: int flags. - (dummy_encrypt): Likewise. - - * elgamal.c (_gcry_elg_encrypt): Add argument: int flags. - (_gcry_elg_decrypt): Likewise. - - * rsa.c (_gcry_rsa_encrypt): Add argument: int flags. - (_gcry_rsa_decrypt): Likewise. - - * pubkey.c: Add `flags' argument to members `encrypt' and - `decrypt' of struct `pubkey_table_s'. - - * rsa.h: Add `flags' argument to function declarations. - * elgamal.h: Likewise. - - * pubkey.c (sexp_data_to_mpi): New variable: int parsed_flags. - (sexp_data_to_mpi): Set `parsed_flags'. - (sexp_data_to_mpi): New argument: int *flags. - (gcry_pk_encrypt): New variable: int flags. - (gcry_pk_encrypt): Pass `flags' to pubkey_encrypt. - (pubkey_encrypt): New variable: int flags. - (pubkey_encrypt): Pass `flags' to pubkey encrypt function. - (pubkey_decrypt): Likewise. - (pubkey_decrypt): Pass `flags' to pubkey encrypt function. - (gcry_pk_encrypt): Include `flags' s-exp in return list. - (sexp_to_enc): New argument: int *flags. - (gcry_pk_decrypt): New variable: int flags. - (gcry_pk_decrypt): Pass `flags' to pubkey_decrypt. - (sexp_to_enc): New variable: int parsed_flags. - (sexp_to_enc): Set `parsed_flags'. - -2003-03-22 Simon Josefsson - - * cipher.c (gcry_cipher_open, do_cbc_encrypt) - (gcry_cipher_encrypt): Support GCRY_CIPHER_CBC_MAC. - (gcry_cipher_ctl): Support GCRYCTL_SET_CBC_MAC. - -2003-03-19 Werner Koch - - * primegen.c (gen_prime): New args EXTRA_CHECK and EXTRA_CHECK_ARG - to allow for a user callback. Changed all callers. - (_gcry_generate_secret_prime) - (_gcry_generate_public_prime): Ditto, pass them to gen_prime. - * rsa.c (check_exponent): New. - (generate): Use a callback to ensure that a given exponent is - actually generated. - -2003-03-12 Moritz Schulte - - * primegen.c: Initialize `no_of_small_prime_numbers' statically. - (gen_prime): Remove calculation of `no_of_small_prime_numbers'. - -2003-03-03 Moritz Schulte - - * md.c (gcry_md_ctl): Rewritten to use same style like the other - functions dispatchers. - -2003-03-02 Moritz Schulte - - * cipher.c (struct gcry_cipher_handle): New member: algo_index. - (gcry_cipher_open): Allocate memory for two cipher contexts. - Initialize algo_index. - (cipher_setkey): Duplicate context into reserved memory. - (cipher_reset): New function, which resets the context and clear - the IV. - (gcry_cipher_ctl): Call cipher_reset. - -2003-02-23 Moritz Schulte - - * cipher.c: Remove (bogus) `digitp' macro definition. - * md.c: Likewise. - - * blowfish.c (burn_stack): Removed. - * arcfour.c (burn_stack): Likewise. - * cast5.c (burn_stack): Likewise. - * des.c (burn_stack): Likewise. - * md4.c (burn_stack): Likewise. - * md5.c (burn_stack): Likewise. - * random.c (burn_stack): Likewise. - * rijndael.c (burn_stack): Likewise. - * rmd160.c (burn_stack): Likewise. - * sha1.c (burn_stack): Likewise. - * sha256.c (burn_stack): Likewise. - * tiger.c (burn_stack): Likewise. - * twofish.c (burn_stack): Likewise. - - * blowfish.c: Changed all occurences of burn_stack to - _gcry_burn_stack. - * arcfour.c: Likewise. - * cast5.c: Likewise. - * des.c: Likewise. - * md4.c: Likewise. - * md5.c: Likewise. - * random.c: Likewise. - * rijndael.c: Likewise. - * rmd160.c: Likewise. - * sha1.c: Likewise. - * sha256.c: Likewise. - * tiger.c: Likewise. - * twofish.c: Likewise. - - * arcfour.c (_gcry_arcfour_get_info): Use GCRY_CIPHER_ARCFOUR - instead of hard-coded value `301'. - -2003-01-24 Werner Koch - - * random.c (_gcry_register_random_progress): New. - (_gcry_random_progress): New. - - * rndlinux.c (gather_random): Call the random progress function. - -2003-01-23 Werner Koch - - * rsa.c (generate): New arg USE_E to request a specific public - exponent. - (_gcry_rsa_generate): Ditto. - * elgamal.c (_gcry_elg_generate): Must add an dummy argument - instead of USE_E. - * dsa.c (_gcry_dsa_generate): Ditto. - * pubkey.c (dummy_generate): Ditto. - (pubkey_generate): Add USE_E arg and pass it down. - (gcry_pk_genkey): Detect "rsa-use-e" parameter and pass it to generate. - - * pubkey.c (sexp_to_enc): New arg RET_MODERN. - (gcry_pk_decrypt): Make use of it to return a real S-expression. - Return better error codes. - (gcry_pk_verify): Return better error codes. - -2003-01-21 Werner Koch - - * random.c (gcry_random_add_bytes): Add QUALITY argument, let - function return an error code and disable its core for now. - -2003-01-21 Timo Schulz - - * random.c (gcry_random_add_bytes): New. Function to add external - random to the pool. - -2003-01-20 Simon Josefsson - - * crc.c: New. - * Makefile.am (EXTRA_PROGRAMS, EXTRA_crc_SOURCES): Add crc.c. - * md.c (gcry_md_get_algo_dlen): Add values for CRC. - -2003-01-20 Werner Koch - - * sha256.c: New. - * bithelp.h (ror): New. - * Makfile.am: Add sha256.c. - * md.c (oid_table): Add values for SHA256 et al. - (gcry_md_get_algo_dlen): Likewise - -2003-01-20 Werner Koch - - * pubkey.c (gcry_pk_get_keygrip): Implemented keygrips for DSA - and ElGamal. - -2003-01-17 Werner Koch - - * cipher.c (gcry_cipher_encrypt): Reworked so that the output will - never contain the plaintext even if the caller did not checked the - return value. - - * md.c (gcry_md_get_algo): Changed error code to GCRYERR_GENERAL - because we don't have an invalid md algo but no algorithm enabled. - - * pubkey.c (gcry_pk_genkey): Changed error code for bounds check - of table parameters to GCRYERR_INTERNAL. - - * md.c (gcry_md_open): Partly reverted Timo's change from - 2002-10-10 by removing the check for the algorithm. An algorithm - of 0 is allowed and anyway we should not double check it or check - it using a different function. Also fixed the flags check. - - * pubkey.c (gcry_pk_encrypt): Make sure that R_CIPH points to NULL - on error. - (gcry_pk_decrypt): Ditto for R_PLAIN. - (gcry_pk_sign): Ditto for R_SIG. - (gcry_pk_genkey): Ditto for R_KEY. - -2003-01-16 Werner Koch - - * md.c (gcry_md_write): Changed 2nd argument type to void*. - (gcry_md_hash_buffer): Changed type of boths buffers to void*. - (gcry_md_setkey): Changed 2nd argument type to void*. - -2003-01-15 Werner Koch - - * pubkey.c (sexp_data_to_mpi): New. This handles pkcs1 padding. - (gcry_pk_sign, gcry_pk_verify): Use it here. - (gcry_pk_encrypt): And here. - (pubkey_verify): Add debug code. - (sexp_to_enc): Handle flags in the input and return the pkcs1 flag - in a new parameter. - (gcry_pk_decrypt): Prepare for future pkcs1 handling. - -2002-12-19 Werner Koch - - * random.c (_gcry_random_initialize): New. - -2002-12-16 Werner Koch - - * cipher.c: Added a Teletrust specific OID for 3DES. - -2002-12-12 Werner Koch - - * md.c: Added another oddball OIW OID (sha-1WithRSAEncryption). - -2002-11-23 Werner Koch - - * md.c (load_digest_module): Enlarged checked_algos bitmap. - * md4.c (func_table): Fixed entry for md4. - Both by Simon Josephson. - (transform): Copy data to get the alignment straight. Tested only - on i386. - -2002-11-10 Simon Josefsson - - * cipher.c (gcry_cipher_open): Don't reject CTS flag. - (do_cbc_encrypt, do_cbc_decrypt, cipher_encrypt) - (gcry_cipher_encrypt, cipher_decrypt) - (gcry_cipher_decrypt): Support CTS flag. - (gcry_cipher_ctl): Toggle CTS flag. - -2002-11-10 Werner Koch - - * md4.c: New. By Simon Josefsson. - * Makefile.am (EXTRA_PROGRAMS): Add md4.c. - * md.c (oid_table,gcry_md_get_algo_dlen): MD4 support. - -2002-10-14 Werner Koch - - * arcfour.c (do_encrypt_stream): Don't use increment op when - assigning to the same variable. - -2002-10-10 Timo Schulz - - * pubkey.c (gcry_pk_genkey): Check boundaries. - - * md.c (gcry_md_open): Check that algo is available and only - valid flag values are used. - (gcry_md_get_algo): Add error handling. - -2002-09-26 Werner Koch - - * md.c: Include an OID for TIGER. - * tiger.c (tiger_get_info): Use a regular OID. - -2002-09-17 Werner Koch - - * random.c: Replaced mutex.h by the new ath.h. Changed all calls. - -2002-09-16 Werner Koch - - * arcfour.c (do_encrypt_stream): Use register modifier and modulo. - According to Nikos Mavroyanopoulos this increases perfromace on - i386 system noticable. And I always tought gcc is clever enough. - * md5.c (transform): Use register modifier. - * rmd160.c (transform): Ditto. - * sha1.c (transform): Ditto. We hope that there are 6 free registers. - * random.c (gcry_randomize): Rewrote to avoid malloc calls. - - * rndlinux.c (gather_random): Replaced remaining fprintfs by log_*. - * arcfour.c (do_arcfour_setkey): Ditto. - * twofish.c (do_twofish_setkey): Ditto. - * rndegd.c (gather_random): Ditto. - * rijndael.c (do_setkey): Ditto. - * random.c (_gcry_random_dump_stats): Ditto. - * primegen.c (_gcry_generate_elg_prime): Ditto. - * des.c (_gcry_des_get_info): Ditto. - * cast5.c (do_cast_setkey): Ditto. - * blowfish.c (do_bf_setkey): Ditto. - -2002-08-26 Werner Koch - - * des.c (weak_keys): Fixed one entry in the table and compared - all entries against the literature. - (selftest): Checksum the weak key table. - -2002-08-21 Werner Koch - - * pubkey.c: Enable keygrip calculation for "openpgp-rsa". - -2002-08-17 Werner Koch - - * cipher.c (setup_cipher_table): Don't overwrite the DES entry - with the entry for DUMMY. - -2002-08-14 Werner Koch - - * des.c (do_des_setkey,do_des_encrypt, do_des_decrypt): New. - (_gcry_des_get_info): Support plain old DES. - * cipher.c (setup_cipher_table): Put DES into the table. - -2002-07-25 Werner Koch - - * rndunix.c (_gcry_rndunix_constructor): Prefixed with _gcry_. - Noted by Stephan Austermuehle. - -2002-07-08 Timo Schulz - - * rndw32.c: Replaced the m_ memory functions with the real - gcry_ functions. Renamed all g10_ prefixed functions to log_. - -2002-06-12 Werner Koch - - * rsa.c (generate): Use e = 65537 for now. - -2002-06-11 Werner Koch - - * pubkey.c (gcry_pk_get_keygrip): Allow a "protected-private-key". - -2002-06-05 Timo Schulz - - * cipher.c (gcry_cipher_encrypt, gcry_cipher_decrypt): - Check that the input size is a multiple of the blocksize. - -2002-05-23 Werner Koch - - * md.c (oid_table): Add an rsadsi OID for MD5. - -2002-05-21 Werner Koch - - * primegen.c, elgamal.c, dsa.c (progress): Do not print anything - by default. Pass an extra identifying string to the callback and - reserved 2 argumenst for current and total counters. Changed the - register function prototype. - -2002-05-17 Werner Koch - - * rndegd.c (rndegd_constructor): Fixed name of register function - and prefixed the function name with _gcry_. - * rndw32.c (rndw32_constructor): Ditto. - * tiger.c (tiger_constructor): Ditto. - - * Makefile.am: Removed all dynamic loading stuff. - * dynload.c: Ditto. Now only used for the constructor system. - -2002-05-15 Werner Koch - - * random.c (gcry_random_bytes,gcry_random_bytes_secure) - (gcry_randomize): Make sure we are initialized. - -2002-05-14 Werner Koch - - Changed license of most files to the LGPL. - -2002-05-02 Werner Koch - - * random.c (_gcry_fast_random_poll): Initialize the module so the - mutex can be used. - - * primegen.c (small_prime_numbers): Moved table from smallprime.c - * smallprime.c: File removed. - - * des.c (leftkey_swap, rightkey_swap, working_memcmp): Made static. - - * cipher.c (gcry_cipher_map_name): Map "RIJNDAEL" to "AES". - * rijndael.c (rijndael_get_info): We do only support a 128 bit - blocksize so it makes sense to change the algorithm strings to - AES. - - * tiger.c (tiger_final): Removed superfluous token pasting operators. - * md5.c (md5_final): Ditto. - -2002-04-30 Werner Koch - - * cipher.c: Fixed list of copyright years. - -2002-03-18 Werner Koch - - * random.c (initialize): Initialize the new pool lock mutex. - (_gcry_fast_random_poll): Add locking and moved main - code out to... - (do_fast_random_poll): new function. - (read_pool): Use the new function here. - (get_random_bytes): Add locking. - (_gcry_update_random_seed_file): Ditto. - -2002-03-11 Werner Koch - - * md.c: Add rsaSignatureWithripemd160 to OID table. - -2002-02-20 Werner Koch - - * sha1.c: Removed a left over comment note. The code has been - rewritten from scratch in 1998. Thanks to Niels Möller for - reporting this misleading comment. - -2002-02-18 Werner Koch - - * rndunix.c (rndunix_constructor): Use the the new prefixed - function name. Reported by Jordi Mallach. - -2002-02-10 Werner Koch - - * random.c (mix_pool): Carry an extra failsafe_digest buffer - around to make the function more robust. - -2002-02-08 Werner Koch - - * random.c (add_randomness): Xor new data into the pool and not - just copy it. This avoids any choosen input attacks which are not - serious in our setting because an outsider won't be able to mix - data in and even then we keep going with a PRNG. Thanks to Stefan - Keller for pointing this out. - -2002-01-04 Werner Koch - - * pubkey.c (gcry_pk_genkey): Do not release skey - it is static. - - * primegen.c (gen_prime): Of course we should use set_bit - and not set_highbit to set the second high bit. - -2001-12-18 Werner Koch - - * rsa.c (generate): Loop until we find the exact modulus size. - Changed the exponent to 41. - (rsa_get_info): s/usage/r_usage/ to avoid shadow warnings. - * primegen.c (gen_prime): Set 2 high order bits for secret primes. - - * Makefile.am (DISTCLEANFILES): Include construct.c. - -2001-12-17 Werner Koch - - * pubkey.c (gcry_pk_get_keygrip): New - experimental. - -2001-12-11 Werner Koch - - * cipher.c: Added OIDs for AES. - (gcry_cipher_mode_from_oid): New. - (gcry_cipher_map_name): Moved OID search code to .. - (search_oid): .. new function. - -2001-12-10 Werner Koch - - * pubkey.c (gcry_pk_encrypt): Find the signature algorithm by name - and not by number. - - * pubkey.c (gcry_pk_encrypt,gcry_pk_decrypt,gcry_pk_sign) - (gcry_pk_verify,gcry_pk_testkey, gcry_pk_genkey) - (gcry_pk_get_nbits): Release the arrays. Noted by Nikos - Mavroyanopoulos. - -2001-12-06 Werner Koch - - * cipher.c (gcry_cipher_map_name): Look also for OIDs prefixed - with "oid." or "OID.". - -2001-12-05 Werner Koch - - * pubkey.c (algo_info_table): Fixed entry for openpgp-rsa. - -2001-11-24 Werner Koch - - * pubkey.c: Added the rsaEncryption OID to the tables. - (sexp_to_key): Add an arg to return the index of the algorithm, - changed all callers. - (gcry_pk_sign): Find the signature algorithm by name and not by - number. - (gcry_pk_get_nbits): Fixed so that we can now really pass a secret - key to get the result. - - * md.c (gcry_md_map_name): Look also for OIDs prefixed with "oid." - or "OID." so that an OID string can be used as an S-Exp token. - -2001-11-20 Werner Koch - - * md.c (gcry_md_map_name): Lookup by OID if the the name begins - with a digit. - (oid_table): New. - -2001-11-16 Werner Koch - - * md.c (gcry_md_info): New operator GCRYCTL_IS_ALGO_ENABLED. - -2001-11-07 Werner Koch - - * md.c (gcry_md_hash_buffer): Close the handle which was left open - for algorithms other than rmd160. - -2001-08-08 Werner Koch - - * rndw32.c (gather_random): Use toolhelp in addition to the NT - gatherer for Windows2000. Suggested by Sami Tolvanen. - - * random.c (read_pool): Fixed length check, this used to be one - byte to strict. Made an assert out of it because the caller has - already made sure that only poolsize bytes are requested. - Reported by Marcus Brinkmann. - -2001-08-03 Werner Koch - - * cipher.c (cipher_encrypt, cipher_decrypt): Prepare to return - errors. We have to change the interface to all ciphers to make - this really work but we should do so to prepare for hardware - encryption modules. - (gcry_cipher_encrypt, gcry_cipher_decrypt): Return the error and - set lasterr. - (gcry_cipher_ctl): Make sure that errors from setkey are returned. - -2001-08-02 Werner Koch - - * rndlinux.c (gather_random): casted a size_t arg to int so that - the format string is correct. Casting is okay here and avoids - translation changes. - - * random.c (fast_random_poll): Do not check the return code of - getrusage. - - * rndunix.c: Add a signal.h header to avoid warnings on Solaris 7 - and 8. - - * tiger.c (print_abc,print_data): Removed. - - * rijndael.c, des.c, blowfish.c, twofish.c, cast5.c, arcfour.c - (burn_stack): New. Add wrappers for most functions to be able to - call burn_stack after the function invocation. This methods seems - to be the most portable way to zeroise the stack used. It does - only work on stack frame based machines but it is highly portable - and has no side effects. Just setting the automatic variables at - the end of a function to zero does not work well because the - compiler will optimize them away - marking them as volatile would - be bad for performance. - * md5.c, sha1.c, rmd160.c, tiger.c (burn_stack): Likewise. - * random.c (burn_stack): New. - (mix_pool): Use it here to burn the stack of the mixblock function. - - * primegen.c (_gcry_generate_elg_prime): Freed q at 3 places. - Thanks to Tommi Komulainen. - - * arcfour.c (arcfour_setkey): Check the minimim keylength against - bytes and not bits. - (selftest): Must reset the key before decryption. - -2001-05-31 Werner Koch - - * sha1.c (sha1_init): Made static. - - Changed all g10_ prefixed function names as well as some mpi_ - function names to cope with the introduced naming changes. - - * md.c (prepare_macpads): Made key const. - -2001-05-28 Werner Koch - - * rndegd.c (gather_random): Removed the use of tty_printf. - -2001-03-29 Werner Koch - - * md5.c (md5_final): Fixed calculation of hashed length. Thanks - to disastry@saiknes.lv for pointing out that it was horrible wrong - for more than 512MB of input. - * sha1.c (sha1_final): Ditto. - * rmd160.c (rmd160_final): Ditto. - * tiger.c (tiger_final): Ditto. - - * blowfish.c (encrypt,do_encrypt): Changed name to do_encrypt to - avoid name clashes with an encrypt function in stdlib.h of - Dynix/PIX. Thanks to Gene Carter. - * elgamal.c (encrypt,do_encrypt): Ditto. - - * twofish.c (gnupgext_enum_func): Use only when when compiled as a - module. - * rijndael.c (gnupgext_enum_func): Ditto. - - * tiger.c (tiger_get_info): Return "TIGER192" and not just - "TIGER". By Edwin Woudt. - - * random.c: Always include time.h - standard requirement. Thanks - to James Troup. - - * rndw32.c: Fixes to the macros. - -2001-01-11 Werner Koch - - * cipher.c (cipher_encrypt,gcry_cipher_encrypt): Use blocksize and - not 8. - -2000-12-19 Werner Koch - - Major change: - Removed all GnuPG stuff and renamed this piece of software - to gcrypt. - -2000-11-14 Werner Koch - - * dsa.c (test_keys): Replaced mpi_alloc by gcry_mpi_new and - mpi_free by gcry_mpi_release. - * elgamal.c (test_keys,generate): Ditto, also for mpi_alloc_secure. - * rsa.c (test_keys,generate,rsa_verify): Ditto. - * primegen.c (generate_elg_prime): Ditto. - (gen_prime): Ditto and removed nlimbs. - - * rsa.c (generate): Allocate 2 more vars in secure memory. - - * Makefile.am (OMIT_DEPENDENCIES): Hack to work around dependency - problems. - -2000-10-09 Werner Koch - - * arcfour.c, arcfour.h: New. - * cipher.c (cipher_encrypt, cipher_decrypt): Add stream mode. - (setup_cipher_table): Add Arcfour. - (gcry_cipher_open): Kludge to allow stream mode. - -Wed Oct 4 13:16:18 CEST 2000 Werner Koch - - * sha1.c (transform): Use rol() macro. Actually this is not needed - for a newer gcc but there are still aoter compilers. - - * rsa.c (test_keys): Use new random function. - - * md.c (gcry_md_setkey): New function to overcome problems with - const conflics. - (gcry_md_ctl): Pass set key to the new functions. - - * rijndael.c: New. - * cipher.c: Add Rijndael support. - -Mon Sep 18 16:35:45 CEST 2000 Werner Koch - - * rndlinux.c (open_device): Loose random device checking. - By Nils Ellmenreich. - - * random.c (fast_random_poll): Check ENOSYS for getrusage. - * rndunix.c: Add 2 sources for QNX. By Sam Roberts. - - * pubkey.c (gcry_pk_algo_info): Add GCRYCTL_GET_ALGO_USAGE. - - * rsa.c: Changed the comment about the patent. - (secret): Speed up by using the CRT. For a 2k keys this - is about 3 times faster. - (stronger_key_check): New but unused code to check the secret key. - * Makefile.am: Included rsa.[ch]. - * pubkey.c: Enabled RSA support. - (pubkey_get_npkey): Removed RSA workaround. - -Mon Jul 31 10:04:47 CEST 2000 Werner Koch - - * pubkey.c: Replaced all gcry_sexp_{car,cdr}_{data,mpi} by the new - gcry_sexp_nth_{data,mpi} functions. - -Tue Jul 25 17:44:15 CEST 2000 Werner Koch - - * pubkey.c (exp_to_key,sexp_to_sig,sexp_to_enc,gcry_pk_encrypt, - gcry_pk_decrypt,gcry_pk_sign,gcry_pk_genkey): Changed to work with - the new S-Exp interface. - -Mon Jul 17 16:35:47 CEST 2000 Werner Koch - - * random.c (gather_faked): Replaced make_timestamp by time(2) again. - -Fri Jul 14 19:38:23 CEST 2000 Werner Koch - - * md.c (gcry_md_ctl): Support GCRYCTL_{START,STOP}_DUMP. - - * Makefile.am: Never compile mingw32 as module. - - * Makefile.am: Tweaked module build and removed libtool - - * Makefile.am: Replaced -O1 by -O. Suggested by Alec Habig. - - * elgamal.c (sign): Removed inactive code. - - * rsa.c, rsa.h: New based on the old module version (only in CVS for now). - * pubkey.c (setup_pubkey_table): Added commented support for RSA. - - * rndunix.c (waitpid): New. For UTS 2.1. All by Dave Dykstra. - (my_popen): Do the FD_CLOEXEC only if it is available - (start_gatherer): Cope with missing _SC_OPEN_MAX - - * rndunix.c: Add some more headers for QNX. By Sam Roberts. - - * rndegd.c (gather_random): Shortcut level 0. - * rndunix.c (gather_random): Ditto. - * rndw32.c (gather_random): Ditto. - - * rndw32.c: Replaced with code from Cryptlib and commented the old stuff. - * rndw32.c: Add some debuging code enabled by an environment variable. - - * random.c (read_seed_file): Binary open for DOSish system - (update_random_seed_file): Ditto. - * random.c [MINGW32]: Include process.h for getpid. - * random.c (fast_random_poll): Add clock_gettime() as fallback for - system which support this POSIX.4 fucntion. By Sam Roberts. - - * random.c (read_seed_file): Removed the S_ISLNK test becuase it - is already covered by !S_ISREG and is not defined in Unixware. - Reported by Dave Dykstra. - (update_random_seed_file): Silently ignore update request when pool - is not filled. - - * random.c (read_seed_file): New. - (set_random_seed_file): New. - (read_pool): Try to read the seeding file. - (update_random_seed_file): New. - - (read_pool): Do an initial extra seeding when level 2 quality random - is requested the first time. This requestes at least POOLSIZE/2 bytes - of entropy. Compined with the seeding file this should make normal - random bytes cheaper and increase the quality of the random bytes - used for key generation. - - * random.c (read_pool): Print a more friendly error message in - cases when too much random is requested in one call. - - * random.c (fast_random_poll): Check whether RUSAGE_SELF is defined; - this is not the case for some ESIX and Unixware, although they have - getrusage(). - - * primegen.c (generate_elg_prime): All primes are now generated with - the lowest random quality level. Because they are public anyway we - don't need stronger random and by this we do not drain the systems - entropy so much. - - * primegen.c (register_primegen_progress): New. - * dsa.c (register_pk_dsa_progress): New. - * elgamal.c (register_pk_elg_progress): New. - - * elgamal.c (wiener_map): New. - (gen_k): Use a much smaller k. - (generate): Calculate the qbits using the wiener map and - choose an x at a size comparable to the one choosen in gen_k - - * rmd160.c (rmd160_get_info): Moved casting to the left side due to a - problem with UTS4.3. Suggested by Dave Dykstra. - * sha1.c (sha1_get_info): Ditto. - * tiger.c (tiger_get_info): Ditto. - * md5.c (md5_get_info): Ditto - * des.c (des_get_info): Ditto. - * blowfish.c (blowfish_get_info): Ditto. - * cast5.c (cast5_get_info): Ditto. - * twofish.c (twofish_get_info): Ditto. - -Fri Mar 24 11:25:45 CET 2000 Werner Koch - - * md.c (md_open): Add hmac arg and allocate space for the pads. - (md_finalize): Add HMAC support. - (md_copy): Ditto. - (md_close): Ditto. - (gcry_md_reset): Ditto. - (gcry_md_ctl): Ditto. - (prepare_macpdas): New. - -Mon Mar 13 19:22:46 CET 2000 Werner Koch - - * md.c (gcry_md_hash_buffer): Add support for the other algorithms. - -Mon Jan 31 16:37:34 CET 2000 Werner Koch - - * genprime.c (generate_elg_prime): Fixed returned factors which never - worked for non-DSA keys. - -Thu Jan 27 18:00:44 CET 2000 Werner Koch - - * pubkey.c (sexp_to_key): Fixed mem leaks in case of errors. - -Mon Jan 24 22:24:38 CET 2000 Werner Koch - - * pubkey.c (gcry_pk_decrypt): Implemented. - (gcry_pk_encrypt): Implemented. - (gcry_pk_testkey): New. - (gcry_pk_genkey): New. - (pubkey_decrypt): Made static. - (pubkey_encrypt): Ditto. - (pubkey_check_secret_key): Ditto. - (pubkey_generate): Ditto. - -Mon Jan 24 13:04:28 CET 2000 Werner Koch - - * pubkey.c (pubkey_nbits): Removed and replaced by ... - (gcry_pk_get_nbits): this new one. - -Wed Dec 8 21:58:32 CET 1999 Werner Koch - - * dsa.c: s/mpi_powm/gcry_mpi_powm/g - * elgamal.c: Ditto. - * primegen.c: Ditto. - - * : Replaced g10_opt_verbose by g10_log_verbosity(). - - * Makefile.am (INCLUDES): removed intl, add ../gcrypt - -Fri Nov 19 17:15:20 CET 1999 Werner Koch - - * dynload.c (cmp_filenames): New to replaced compare_filename() in - module. - (register_cipher_extension): Removed the tilde expansion stuff. - * rndeg.c (my_make_filename): New. - - * : Replaced header util.h by g10lib.h - - * random.c (gather_faked): Replaced make_timestamp by time(2). - Disabled wrning printed with tty_printf. - * rndlinux.c (gather_random): Always use fprintf instead of tty_xxx; - this should be replaced by a callback function. - - * primegen.c (gen_prime): Use gcry_mpi_randomize. - (is_prime): Ditto. - * elgamal.c (test_keys): Ditto. - * dsa.c (test_keys): Ditto. - - * cipher.c (gcry_cipher_close): Die on invalid handle. - -Mon Nov 15 21:36:02 CET 1999 Werner Koch - - * elgamal.c (gen_k): Use the new random API. - (generate): Ditto. - * dsa.c (gen_k): Ditto. - (generate): Ditto. - -Sat Nov 13 17:44:23 CET 1999 Werner Koch - - * pubkey.c (disable_pubkey_algo): Made static. - (gcry_pk_ctl): New. - - * random.c (get_random_bits): Renamed to ... - (get_random_bytes): ... this and made static. - (gcry_random_bytes): New. - (gcry_random_bytes_secure): New. - (randomize_buffer): Renamed to ... - (gcry_randomize): ...this. - - * md.c (gcry_md_hash_buffer): New. - - * pubkey.c (gcry_pk_algo_info): 4 new commands. - (pubkey_get_npkey): Made static. - (pubkey_get_nskey): Made static. - (pubkey_get_nsig): Made static. - (pubkey_get_nenc): Made static. - - * pubkey.c: Removed all G10ERR_xxx. - * cipher.c: Changed all GCRYERR_INV_ALGO to GCRYERR_INV_CIPHER_ALGO. - * md.c: Changed all GCRYERR_INV_ALGO to GCRYERR_INV_MD_ALGO. - * cast5.c (cast_setkey): Changed errocodes to GCRYERR_xxx. - * blowfish.c: Ditto. - * des.c: Ditto. - * twofish.c: Ditto. - * dsa.c: Ditto. - * elgamal.c: Ditto. - - * g10c.c: Removed - - * cipher.c (gcry_cipher_open): Replaced alloc functions and return NULL - if we are out of core. - * dynload.c: Replaced all memory allocation functions. - * md.c: Ditto. - * primegen.c: Ditto. - * pubkey.c: Ditto. - * random.c: Ditto. - * rndw32.c: Ditto. - * elgamal.c: Ditto. - * dsa.c: Ditto. - -Tue Oct 26 14:10:21 CEST 1999 Werner Koch - - * elgamal.c (sign): Hugh found strange code here. Replaced by BUG(). - - * cipher.c: Merged with gcrypt/symapi.c. - - * pubkey.c (string_to_pubkey_algo): Renamed function to ... - (gcry_pk_map_name): ... this. - (pubkey_algo_to_string): Renamed function to ... - (gcry_pk_algo_name): ... this. - (gcry_pk_algo_info): New. - * pubkey.c: Merged with gcrypt/pkapi.c. - - * md.c (md_reset): Clear finalized; thanks to Ulf Moeller for - fixing this bug. - - * md.c: Merged with gcrypt/mdapi.c - -Wed Sep 15 14:39:59 CEST 1999 Michael Roth - - * des.c: Various speed improvements: One bit pre rotation - trick after initial permutation (Richard Outerbridge). - Finished test of SSLeay Tripple-DES patterns. - -Wed Sep 15 16:22:17 CEST 1999 Werner Koch - - * rndw32.c: New. - -Mon Sep 13 10:51:29 CEST 1999 Werner Koch - - * bithelp.h: New. - * rmd160.h, sha1.h, md5.h: Use the rol macro from bithelp.h - -Tue Sep 7 16:23:36 CEST 1999 Werner Koch - - * Makefile.am: Fixed seds for latest egcc. By Ollivier Robert. - -Mon Sep 6 19:59:08 CEST 1999 Werner Koch - - * des.c (selftest): Add some testpattern - -Mon Aug 30 20:38:33 CEST 1999 Werner Koch - - * cipher.c (do_cbc_encrypt): Fixed serious bug occuring when not using - in place encryption. Pointed out by Frank Stajano. - -Mon Jul 26 09:34:46 CEST 1999 Werner Koch - - * md5.c (md5_final): Fix for a SCO cpp bug. - -Thu Jul 15 10:15:35 CEST 1999 Werner Koch - - * elgamal.c (elg_check_secret_key,elg_encrypt - elg_decrypt,elg_sign,elg_verify): Sanity check on the args. - * dsa.c (dsa_check_secret_key,dsa_sign,dsa_verify): Ditto. - - * pubkey.c (disable_pubkey_algo): New. - (check_pubkey_algo2): Look at disabled algo table. - * cipher.c (disable_cipher_algo): New. - (check_cipher_algo): Look at disabled algo table. - -Wed Jul 7 13:08:40 CEST 1999 Werner Koch - - * Makefile.am: Support for libtool. - -Fri Jul 2 11:45:54 CEST 1999 Werner Koch - - * dsa.c (gen_k): Changed algorithm to consume less random bytes - * elgamal.c (gen_k): Ditto. - - * random.c (random_dump_stats): New. - -Thu Jul 1 12:47:31 CEST 1999 Werner Koch - - * primegen.c, elgamal.c, dsa.c (progess): New and replaced all - fputc with a call to this function. - -Sat Jun 26 12:15:59 CEST 1999 Werner Koch - - * rndegd.c (do_write): s/ssize_t/int/ due to SunOS 4.1 probs. - - * cipher.c (do_cbc_encrypt, do_cbc_decrypt): New. - - * dynload.c (HAVE_DL_SHL_LOAD): Map hpux API to dlopen (Dave Dykstra). - * Makefile.am (install-exec-hook): Removed. - -Sun May 23 14:20:22 CEST 1999 Werner Koch - - * cipher.c (setup_cipher_table): Enable Twofish - - * random.c (fast_random_poll): Disable use of times() for mingw32. - -Mon May 17 21:54:43 CEST 1999 Werner Koch - - * dynload.c (register_internal_cipher_extension): Minor init fix. - -Tue May 4 15:47:53 CEST 1999 Werner Koch - - * primegen.c (gen_prime): Readded the Fermat test. Fixed the bug - that we didn't correct for step when passing the prime to the - Rabin-Miller test which led to bad performance (Stefan Keller). - (check_prime): Add a first Fermat test. - -Sun Apr 18 10:11:28 CEST 1999 Werner Koch - - * cipher.c (cipher_setiv): Add ivlen arg, changed all callers. - - * random.c (randomize_buffer): alway use secure memory because - we can't use m_is_secure() on a statically allocated buffer. - - * twofish.c: Replaced some macros by a loop to reduce text size. - * Makefile.am (twofish): No more need for sed editing. - -Fri Apr 9 12:26:25 CEST 1999 Werner Koch - - * cipher.c (cipher_open): Reversed the changes for AUTO_CFB. - - * blowfish.c: Dropped the Blowfish 160 mode. - * cipher.c (cipher_open): Ditto. - (setup_cipher_table): Ditto. And removed support of twofish128 - -Wed Apr 7 20:51:39 CEST 1999 Werner Koch - - * random.c (get_random_bits): Can now handle requests > POOLSIZE - - * cipher.c (cipher_open): Now uses standard CFB for automode if - the blocksize is gt 8 (according to rfc2440). - - * twofish.c: Applied Matthew Skala's patches for 256 bit key. - -Tue Apr 6 19:58:12 CEST 1999 Werner Koch - - * random.c (get_random_bits): Can now handle requests > POOLSIZE - - * cipher.c (cipher_open): Now uses standard CFB for automode if - the blocksize is gt 8 (according to rfc2440). - -Sat Mar 20 11:44:21 CET 1999 Werner Koch - - * rndlinux.c (tty_printf) [IS_MODULE]: Removed. - - * rndegd.c (gather_random): Some fixes. - -Wed Mar 17 13:09:03 CET 1999 Werner Koch - - * rndegd.c (do_read): New. - (gather_random): Changed the implementation. - -Mon Mar 8 20:47:17 CET 1999 Werner Koch - - * dynload.c (DLSYM_NEEDS_UNDERSCORE): Renamed. - -Fri Feb 26 17:55:41 CET 1999 Werner Koch - - * md.c: Nearly a total rewrote. - -Wed Feb 24 11:07:27 CET 1999 Werner Koch - - * cipher.c (context): Fixed alignment - * md.c: Ditto. - - * rndegd.c: New - -Mon Feb 22 20:04:00 CET 1999 Werner Koch - - * rndegd.c: New. - -Wed Feb 10 17:15:39 CET 1999 Werner Koch - - * Makefile.am: Modules are now figured out by configure - * construct.c: New. Generated by configure. Changed all modules - to work with that. - * sha1.h: Removed. - * md5.h: Removed. - - * twofish.c: Changed interface to allow Twofish/256 - - * rndunix.c (start_gatherer): Die on SIGPIPE. - -Wed Jan 20 18:59:49 CET 1999 Werner Koch - - * rndunix.c (gather_random): Fix to avoid infinite loop. - -Sun Jan 17 11:04:33 CET 1999 Werner Koch - - * des.c (is_weak_key): Replace system memcmp due to bugs - in SunOS's memcmp. - (des_get_info): Return error on failed selftest. - * twofish.c (twofish_setkey): Return error on failed selftest or - invalid keylength. - * cast5.c (cast_setkey): Ditto. - * blowfish.c (bf_setkey): Return error on failed selftest. - -Tue Jan 12 11:17:18 CET 1999 Werner Koch - - * random.c (random_is_faked): New. - - * tiger.c: Only compile if we have the u64 type - -Sat Jan 9 16:02:23 CET 1999 Werner Koch - - * rndunix.c (gather_random): check for setuid. - - * Makefile.am: Add a way to staically link random modules - -Thu Jan 7 18:00:58 CET 1999 Werner Koch - - * md.c (md_stop_debug): Do a flush first. - (md_open): size of buffer now depends on the secure parameter - -Sun Jan 3 15:28:44 CET 1999 Werner Koch - - * rndunix.c (start_gatherer): Fixed stupid ==/= bug - -1998-12-31 Geoff Keating - - * des.c (is_weak_key): Rewrite loop end condition. - -Tue Dec 29 14:41:47 CET 1998 Werner Koch - - * random.c: add unistd.h for getpid(). - (RAND_MAX): Fallback value for Sun. - -Wed Dec 23 17:12:24 CET 1998 Werner Koch - - * md.c (md_copy): Reset debug. - -Mon Dec 14 21:18:49 CET 1998 Werner Koch - - * random.c (read_random_source): Changed the interface to the - random gathering function. - (gather_faked): Use new interface. - * dynload.c (dynload_getfnc_fast_random_poll): Ditto. - (dynload_getfnc_gather_random): Ditto. - * rndlinux.c (gather_random): Ditto. - * rndunix.c (gather_random): Ditto. - -Sat Dec 12 18:40:32 CET 1998 Werner Koch - - * dynload.c (SYMBOL_VERSION): New to cope with system which needs - underscores. - - * rndunix.c: Rewrote large parts - -Thu Dec 10 20:15:36 CET 1998 Werner Koch - - * dynload.c (load_extension): increased needed verbosity level. - - * random.c (fast_random_poll): Fallback to a default fast random - poll function. - (read_random_source): Always use the faked entroy gatherer if no - gather module is available. - * rndlinux.c (fast_poll): Removed. - * rndunix.c (fast_poll): Removed. - - -Wed Nov 25 12:33:41 1998 Werner Koch (wk@isil.d.shuttle.de) - - * rand-*.c: Removed. - * rndlinux.c : New. - * rndunix.c : New. - * random.c : Restructured the interface to the gather modules. - (intialize): Call constructor functions - (read_radnom_source): Moved to here. - * dynload.c (dynload_getfnc_gather_random): New. - (dynload_getfnc_fast_random_poll): New. - (register_internal_cipher_extension): New. - (register_cipher_extension): Support of internal modules. - -Sun Nov 8 17:44:36 1998 Werner Koch (wk@isil.d.shuttle.de) - - * rand-unix.c (read_random_source): Removed the assert. - -Mon Oct 19 18:34:30 1998 me,,, (wk@tobold) - - * pubkey.c: Hack to allow us to give some info about RSA keys back. - -Thu Oct 15 11:47:57 1998 Werner Koch (wk@isil.d.shuttle.de) - - * dynload.c: Support for DLD - -Wed Oct 14 12:13:07 1998 Werner Koch (wk@isil.d.shuttle.de) - - * rand-unix.c: Now uses names from configure for /dev/random. - -1998-10-10 SL Baur - - * Makefile.am: fix sed -O substitutions to catch -O6, etc. - -Tue Oct 6 10:06:32 1998 Werner Koch (wk@isil.d.shuttle.de) - - * rand-unix.c (HAVE_GETTIMEOFDAY): Fixed (was ..GETTIMEOFTIME :-) - * rand-dummy.c (HAVE_GETTIMEOFDAY): Ditto. - -Mon Sep 28 13:23:09 1998 Werner Koch (wk@isil.d.shuttle.de) - - * md.c (md_digest): New. - (md_reset): New. - -Wed Sep 23 12:27:02 1998 Werner Koch (wk@isil.d.shuttle.de) - - * tiger.c (TIGER_CONTEXT): moved "buf", so that it is 64 bit aligned. - -Mon Sep 21 06:22:53 1998 Werner Koch (wk@(none)) - - * des.c: Some patches from Michael. - -Thu Sep 17 19:00:06 1998 Werner Koch (wk@(none)) - - * des.c : New file from Michael Roth - -Mon Sep 14 11:10:55 1998 Werner Koch (wk@(none)) - - * blowfish.c (bf_setkey): Niklas Hernaeus patch to detect weak keys. - -Mon Sep 14 09:19:25 1998 Werner Koch (wk@(none)) - - * dynload.c (RTLD_NOW): Now defined to 1 if it is undefined. - -Mon Sep 7 17:04:33 1998 Werner Koch (wk@(none)) - - * Makefile.am: Fixes to allow a different build directory - -Thu Aug 6 17:25:38 1998 Werner Koch,mobil,,, (wk@tobold) - - * random.c (get_random_byte): Removed and changed all callers - to use get_random_bits() - -Mon Jul 27 10:30:22 1998 Werner Koch (wk@(none)) - - * cipher.c : Support for other blocksizes - (cipher_get_blocksize): New. - * twofish.c: New. - * Makefile.am: Add twofish module. - -Mon Jul 13 21:30:52 1998 Werner Koch (wk@isil.d.shuttle.de) - - * random.c (read_pool): Simple alloc if secure_alloc is not set. - (get_random_bits): Ditto. - -Thu Jul 9 13:01:14 1998 Werner Koch (wk@isil.d.shuttle.de) - - * dynload.c (load_extension): Function now nbails out if - the program is run setuid. - -Wed Jul 8 18:58:23 1998 Werner Koch (wk@isil.d.shuttle.de) - - * rmd160.c (rmd160_hash_buffer): New. - -Thu Jul 2 10:50:30 1998 Werner Koch (wk@isil.d.shuttle.de) - - * cipher.c (cipher_open): algos >=100 use standard CFB - -Thu Jun 25 11:18:25 1998 Werner Koch (wk@isil.d.shuttle.de) - - * Makefile.am: Support for extensions - -Thu Jun 18 12:09:38 1998 Werner Koch (wk@isil.d.shuttle.de) - - * random.c (mix_pool): simpler handling for level 0 - -Mon Jun 15 14:40:48 1998 Werner Koch (wk@isil.d.shuttle.de) - - * tiger.c: Removed from dist, will reappear as dynload module - -Sat Jun 13 14:16:57 1998 Werner Koch (wk@isil.d.shuttle.de) - - * pubkey.c: Major changes to allow extensions. Changed the inteface - of all public key ciphers and added the ability to load extensions - on demand. - - * misc.c: Removed. - -Wed Jun 10 07:52:08 1998 Werner Koch,mobil,,, (wk@tobold) - - * dynload.c: New. - * cipher.c: Major changes to allow extensions. - -Mon Jun 8 22:43:00 1998 Werner Koch (wk@isil.d.shuttle.de) - - * cipher.c: Major internal chnages to support extensions. - * blowfish.c (blowfish_get_info): New and made all internal - functions static, changed heder. - * cast5.c (cast5_get_info): Likewise. - -Mon Jun 8 12:27:52 1998 Werner Koch (wk@isil.d.shuttle.de) - - * tiger.c (transform): Fix for big endian - - * cipher.c (do_cfb_decrypt): Big endian fix. - -Fri May 22 07:30:39 1998 Werner Koch (wk@isil.d.shuttle.de) - - * md.c (md_get_oid): Add a new one for TIGER. - -Thu May 21 13:24:52 1998 Werner Koch (wk@isil.d.shuttle.de) - - * cipher.c: Add support for a dummy cipher - -Thu May 14 15:40:36 1998 Werner Koch (wk@isil.d.shuttle.de) - - * rmd160.c (transform): fixed sigbus - I should better - add Christian von Roques's new implemenation of rmd160_write. - -Fri May 8 18:07:44 1998 Werner Koch (wk@isil.d.shuttle.de) - - * rand-internal.h, rand-unix.c, rand-w32.c, rand_dummy.c: New - * random.c: Moved system specific functions to rand-****.c - -Fri May 8 14:01:17 1998 Werner Koch (wk@isil.d.shuttle.de) - - * random.c (fast_random_poll): add call to gethrtime. - -Tue May 5 21:28:55 1998 Werner Koch (wk@isil.d.shuttle.de) - - * elgamal.c (elg_generate): choosing x was not correct, could - yield 6 bytes which are not from the random pool, tsss, tsss.. - -Tue May 5 14:09:06 1998 Werner Koch (wk@isil.d.shuttle.de) - - * primegen.c (generate_elg_prime): Add arg mode, changed all - callers and implemented mode 1. - -Mon Apr 27 14:41:58 1998 Werner Koch (wk@isil.d.shuttle.de) - - * cipher.c (cipher_get_keylen): New. - -Sun Apr 26 14:44:52 1998 Werner Koch (wk@isil.d.shuttle.de) - - * tiger.c, tiger.h: New. - -Wed Apr 8 14:57:11 1998 Werner Koch (wk@isil.d.shuttle.de) - - * misc.c (check_pubkey_algo2): New. - -Tue Apr 7 18:46:49 1998 Werner Koch (wk@isil.d.shuttle.de) - - * cipher.c: New - * misc.c (check_cipher_algo): Moved to cipher.c - * cast5.c: Moved many functions to cipher.c - * blowfish.c: Likewise. - -Sat Apr 4 19:52:08 1998 Werner Koch (wk@isil.d.shuttle.de) - - * cast5.c: Implemented and tested. - -Wed Apr 1 16:38:27 1998 Werner Koch (wk@isil.d.shuttle.de) - - * elgamal.c (elg_generate): Faster generation of x in some cases. - -Thu Mar 19 13:54:48 1998 Werner Koch (wk@isil.d.shuttle.de) - - * blowfish.c (blowfish_decode_cfb): changed XOR operation - (blowfish_encode_cfb): Ditto. - -Thu Mar 12 14:04:05 1998 Werner Koch (wk@isil.d.shuttle.de) - - * sha1.c (transform): Rewrote - - * blowfish.c (encrypt): Unrolled for rounds == 16 - (decrypt): Ditto. - -Tue Mar 10 16:32:08 1998 Werner Koch (wk@isil.d.shuttle.de) - - * rmd160.c (transform): Unrolled the loop. - -Tue Mar 10 13:05:14 1998 Werner Koch (wk@isil.d.shuttle.de) - - * random.c (read_pool): Add pool_balance stuff. - (get_random_bits): New. - - * elgamal.c (elg_generate): Now uses get_random_bits to generate x. - - -Tue Mar 10 11:33:51 1998 Werner Koch (wk@isil.d.shuttle.de) - - * md.c (md_digest_length): New. - -Tue Mar 10 11:27:41 1998 Werner Koch (wk@isil.d.shuttle.de) - - * dsa.c (dsa_verify): Works. - -Mon Mar 9 12:59:08 1998 Werner Koch (wk@isil.d.shuttle.de) - - * dsa.c, dsa.h: Removed some unused code. - -Wed Mar 4 10:39:22 1998 Werner Koch (wk@isil.d.shuttle.de) - - * md.c (md_open): Add call to fast_random_poll. - blowfish.c (blowfish_setkey): Ditto. - -Tue Mar 3 13:32:54 1998 Werner Koch (wk@isil.d.shuttle.de) - - * rmd160.c (rmd160_mixblock): New. - * random.c: Restructured to start with a new RNG implementation. - * random.h: New. - -Mon Mar 2 19:21:46 1998 Werner Koch (wk@isil.d.shuttle.de) - - * gost.c, gost.h: Removed because they did only contain trash. - -Sun Mar 1 16:42:29 1998 Werner Koch (wk@isil.d.shuttle.de) - - * random.c (fill_buffer): removed error message if n == -1. - -Fri Feb 27 16:39:34 1998 Werner Koch (wk@isil.d.shuttle.de) - - * md.c (md_enable): No init if called twice. - -Thu Feb 26 07:57:02 1998 Werner Koch (wk@isil.d.shuttle.de) - - * primegen.c (generate_elg_prime): Changed the progress printing. - (gen_prime): Ditto. - -Tue Feb 24 12:28:42 1998 Werner Koch (wk@isil.d.shuttle.de) - - * md5.c, md.5 : Replaced by a modified version of md5.c from - GNU textutils 1.22. - -Wed Feb 18 14:08:30 1998 Werner Koch (wk@isil.d.shuttle.de) - - * md.c, md.h : New debugging support - -Mon Feb 16 10:08:47 1998 Werner Koch (wk@isil.d.shuttle.de) - - * misc.c (cipher_algo_to_string): New - (pubkey_algo_to_string): New. - (digest_algo_to_string): New. - - - Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - - This file is free software; as a special exception the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. - - This file is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -Local Variables: -buffer-read-only: t -End: diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/Makefile.am b/src/hos_libhttpserver/src/libgcrypt/cipher/Makefile.am deleted file mode 100644 index 0a62d3c5..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/Makefile.am +++ /dev/null @@ -1,104 +0,0 @@ -# Makefile for cipher modules -# Copyright (C) 1998, 1999, 2000, 2001, 2002, -# 2003, 2009 Free Software Foundation, Inc. -# -# This file is part of Libgcrypt. -# -# Libgcrypt is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# Libgcrypt 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, see . - -# Process this file with automake to produce Makefile.in - -EXTRA_DIST = Manifest - -# Need to include ../src in addition to top_srcdir because gcrypt.h is -# a built header. -AM_CPPFLAGS = -I../src -I$(top_srcdir)/src -AM_CFLAGS = $(GPG_ERROR_CFLAGS) - -AM_CCASFLAGS = $(NOEXECSTACK_FLAGS) - - -noinst_LTLIBRARIES = libcipher.la - -GCRYPT_MODULES = @GCRYPT_CIPHERS@ @GCRYPT_PUBKEY_CIPHERS@ \ - @GCRYPT_DIGESTS@ @GCRYPT_KDFS@ - -libcipher_la_DEPENDENCIES = $(GCRYPT_MODULES) -libcipher_la_LIBADD = $(GCRYPT_MODULES) - -libcipher_la_SOURCES = \ -cipher.c cipher-internal.h \ -cipher-cbc.c cipher-cfb.c cipher-ofb.c cipher-ctr.c cipher-aeswrap.c \ -cipher-ccm.c cipher-cmac.c cipher-gcm.c \ -cipher-selftest.c cipher-selftest.h \ -pubkey.c pubkey-internal.h pubkey-util.c \ -md.c \ -mac.c mac-internal.h \ -mac-hmac.c mac-cmac.c mac-gmac.c \ -kdf.c kdf-internal.h \ -hmac-tests.c \ -bithelp.h \ -bufhelp.h \ -primegen.c \ -hash-common.c hash-common.h \ -dsa-common.c rsa-common.c \ -rmd.h - -EXTRA_libcipher_la_SOURCES = \ -arcfour.c \ -blowfish.c blowfish-amd64.S blowfish-arm.S \ -cast5.c cast5-amd64.S cast5-arm.S \ -crc.c \ -des.c \ -dsa.c \ -elgamal.c \ -ecc.c ecc-curves.c ecc-misc.c ecc-common.h \ -ecc-ecdsa.c ecc-eddsa.c ecc-gost.c \ -idea.c \ -gost28147.c gost.h \ -gostr3411-94.c \ -md4.c \ -md5.c \ -rijndael.c rijndael-tables.h rijndael-amd64.S rijndael-arm.S \ -rmd160.c \ -rsa.c \ -salsa20.c salsa20-amd64.S salsa20-armv7-neon.S \ -scrypt.c \ -seed.c \ -serpent.c serpent-sse2-amd64.S serpent-avx2-amd64.S serpent-armv7-neon.S \ -sha1.c sha1-ssse3-amd64.S \ -sha256.c sha256-ssse3-amd64.S \ -sha512.c sha512-ssse3-amd64.S sha512-avx-amd64.S sha512-avx2-bmi2-amd64.S \ - sha512-armv7-neon.S \ -stribog.c \ -tiger.c \ -whirlpool.c \ -twofish.c twofish-amd64.S twofish-arm.S \ -rfc2268.c \ -camellia.c camellia.h camellia-glue.c camellia-aesni-avx-amd64.S \ - camellia-aesni-avx2-amd64.S camellia-arm.S - -if ENABLE_O_FLAG_MUNGING -o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' -else -o_flag_munging = cat -endif - - -# We need to lower the optimization for this module. -tiger.o: $(srcdir)/tiger.c - `echo $(COMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) ` - -tiger.lo: $(srcdir)/tiger.c - `echo $(LTCOMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) ` diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/Makefile.in b/src/hos_libhttpserver/src/libgcrypt/cipher/Makefile.in deleted file mode 100644 index e9eb25da..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/Makefile.in +++ /dev/null @@ -1,830 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Makefile for cipher modules -# Copyright (C) 1998, 1999, 2000, 2001, 2002, -# 2003, 2009 Free Software Foundation, Inc. -# -# This file is part of Libgcrypt. -# -# Libgcrypt is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# Libgcrypt 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, see . - -# Process this file with automake to produce Makefile.in - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = cipher -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gpg-error.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/noexecstack.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -am_libcipher_la_OBJECTS = cipher.lo cipher-cbc.lo cipher-cfb.lo \ - cipher-ofb.lo cipher-ctr.lo cipher-aeswrap.lo cipher-ccm.lo \ - cipher-cmac.lo cipher-gcm.lo cipher-selftest.lo pubkey.lo \ - pubkey-util.lo md.lo mac.lo mac-hmac.lo mac-cmac.lo \ - mac-gmac.lo kdf.lo hmac-tests.lo primegen.lo hash-common.lo \ - dsa-common.lo rsa-common.lo -libcipher_la_OBJECTS = $(am_libcipher_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CCASFLAGS) $(CCASFLAGS) -AM_V_CPPAS = $(am__v_CPPAS_@AM_V@) -am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@) -am__v_CPPAS_0 = @echo " CPPAS " $@; -am__v_CPPAS_1 = -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libcipher_la_SOURCES) $(EXTRA_libcipher_la_SOURCES) -DIST_SOURCES = $(libcipher_la_SOURCES) $(EXTRA_libcipher_la_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_FILEVERSION = @BUILD_FILEVERSION@ -BUILD_REVISION = @BUILD_REVISION@ -BUILD_TIMESTAMP = @BUILD_TIMESTAMP@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DL_LIBS = @DL_LIBS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ -FGREP = @FGREP@ -GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ -GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ -GCRYPT_HWF_MODULES = @GCRYPT_HWF_MODULES@ -GCRYPT_KDFS = @GCRYPT_KDFS@ -GCRYPT_PUBKEY_CIPHERS = @GCRYPT_PUBKEY_CIPHERS@ -GCRYPT_RANDOM = @GCRYPT_RANDOM@ -GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@ -GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@ -GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ -GREP = @GREP@ -INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBGCRYPT_CIPHERS = @LIBGCRYPT_CIPHERS@ -LIBGCRYPT_CONFIG_API_VERSION = @LIBGCRYPT_CONFIG_API_VERSION@ -LIBGCRYPT_CONFIG_CFLAGS = @LIBGCRYPT_CONFIG_CFLAGS@ -LIBGCRYPT_CONFIG_HOST = @LIBGCRYPT_CONFIG_HOST@ -LIBGCRYPT_CONFIG_LIBS = @LIBGCRYPT_CONFIG_LIBS@ -LIBGCRYPT_DIGESTS = @LIBGCRYPT_DIGESTS@ -LIBGCRYPT_LT_AGE = @LIBGCRYPT_LT_AGE@ -LIBGCRYPT_LT_CURRENT = @LIBGCRYPT_LT_CURRENT@ -LIBGCRYPT_LT_REVISION = @LIBGCRYPT_LT_REVISION@ -LIBGCRYPT_PUBKEY_CIPHERS = @LIBGCRYPT_PUBKEY_CIPHERS@ -LIBGCRYPT_THREAD_MODULES = @LIBGCRYPT_THREAD_MODULES@ -LIBMULTITHREAD = @LIBMULTITHREAD@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTHREAD = @LIBTHREAD@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ -LTLIBOBJS = @LTLIBOBJS@ -LTLIBTHREAD = @LTLIBTHREAD@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MPI_SFLAGS = @MPI_SFLAGS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -NOEXECSTACK_FLAGS = @NOEXECSTACK_FLAGS@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PTH_CFLAGS = @PTH_CFLAGS@ -PTH_CONFIG = @PTH_CONFIG@ -PTH_LIBS = @PTH_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -RUN_LARGE_DATA_TESTS = @RUN_LARGE_DATA_TESTS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SYS_SOCKET_H = @SYS_SOCKET_H@ -VERSION = @VERSION@ -VERSION_NUMBER = @VERSION_NUMBER@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -emacs_local_vars_begin = @emacs_local_vars_begin@ -emacs_local_vars_end = @emacs_local_vars_end@ -emacs_local_vars_read_only = @emacs_local_vars_read_only@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = Manifest - -# Need to include ../src in addition to top_srcdir because gcrypt.h is -# a built header. -AM_CPPFLAGS = -I../src -I$(top_srcdir)/src -AM_CFLAGS = $(GPG_ERROR_CFLAGS) -AM_CCASFLAGS = $(NOEXECSTACK_FLAGS) -noinst_LTLIBRARIES = libcipher.la -GCRYPT_MODULES = @GCRYPT_CIPHERS@ @GCRYPT_PUBKEY_CIPHERS@ \ - @GCRYPT_DIGESTS@ @GCRYPT_KDFS@ - -libcipher_la_DEPENDENCIES = $(GCRYPT_MODULES) -libcipher_la_LIBADD = $(GCRYPT_MODULES) -libcipher_la_SOURCES = \ -cipher.c cipher-internal.h \ -cipher-cbc.c cipher-cfb.c cipher-ofb.c cipher-ctr.c cipher-aeswrap.c \ -cipher-ccm.c cipher-cmac.c cipher-gcm.c \ -cipher-selftest.c cipher-selftest.h \ -pubkey.c pubkey-internal.h pubkey-util.c \ -md.c \ -mac.c mac-internal.h \ -mac-hmac.c mac-cmac.c mac-gmac.c \ -kdf.c kdf-internal.h \ -hmac-tests.c \ -bithelp.h \ -bufhelp.h \ -primegen.c \ -hash-common.c hash-common.h \ -dsa-common.c rsa-common.c \ -rmd.h - -EXTRA_libcipher_la_SOURCES = \ -arcfour.c \ -blowfish.c blowfish-amd64.S blowfish-arm.S \ -cast5.c cast5-amd64.S cast5-arm.S \ -crc.c \ -des.c \ -dsa.c \ -elgamal.c \ -ecc.c ecc-curves.c ecc-misc.c ecc-common.h \ -ecc-ecdsa.c ecc-eddsa.c ecc-gost.c \ -idea.c \ -gost28147.c gost.h \ -gostr3411-94.c \ -md4.c \ -md5.c \ -rijndael.c rijndael-tables.h rijndael-amd64.S rijndael-arm.S \ -rmd160.c \ -rsa.c \ -salsa20.c salsa20-amd64.S salsa20-armv7-neon.S \ -scrypt.c \ -seed.c \ -serpent.c serpent-sse2-amd64.S serpent-avx2-amd64.S serpent-armv7-neon.S \ -sha1.c sha1-ssse3-amd64.S \ -sha256.c sha256-ssse3-amd64.S \ -sha512.c sha512-ssse3-amd64.S sha512-avx-amd64.S sha512-avx2-bmi2-amd64.S \ - sha512-armv7-neon.S \ -stribog.c \ -tiger.c \ -whirlpool.c \ -twofish.c twofish-amd64.S twofish-arm.S \ -rfc2268.c \ -camellia.c camellia.h camellia-glue.c camellia-aesni-avx-amd64.S \ - camellia-aesni-avx2-amd64.S camellia-arm.S - -@ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat -@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' -all: all-am - -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cipher/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu cipher/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libcipher.la: $(libcipher_la_OBJECTS) $(libcipher_la_DEPENDENCIES) $(EXTRA_libcipher_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libcipher_la_OBJECTS) $(libcipher_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arcfour.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blowfish-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blowfish-arm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blowfish.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camellia-aesni-avx-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camellia-aesni-avx2-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camellia-arm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camellia-glue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camellia.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cast5-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cast5-arm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cast5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher-aeswrap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher-cbc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher-ccm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher-cfb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher-cmac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher-ctr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher-gcm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher-ofb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher-selftest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/des.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsa-common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc-curves.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc-ecdsa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc-eddsa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc-gost.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc-misc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elgamal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gost28147.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gostr3411-94.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash-common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hmac-tests.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idea.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mac-cmac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mac-gmac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mac-hmac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md4.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primegen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pubkey-util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pubkey.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc2268.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rijndael-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rijndael-arm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rijndael.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmd160.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rsa-common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rsa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/salsa20-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/salsa20-armv7-neon.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/salsa20.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrypt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seed.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serpent-armv7-neon.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serpent-avx2-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serpent-sse2-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serpent.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1-ssse3-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha256-ssse3-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha256.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512-armv7-neon.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512-avx-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512-avx2-bmi2-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512-ssse3-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stribog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tiger.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twofish-amd64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twofish-arm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twofish.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/whirlpool.Plo@am__quote@ - -.S.o: -@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $< - -.S.obj: -@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.S.lo: -@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $< - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - - -# We need to lower the optimization for this module. -tiger.o: $(srcdir)/tiger.c - `echo $(COMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) ` - -tiger.lo: $(srcdir)/tiger.c - `echo $(LTCOMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) ` - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/Manifest b/src/hos_libhttpserver/src/libgcrypt/cipher/Manifest deleted file mode 100644 index 0cd64f71..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/Manifest +++ /dev/null @@ -1,73 +0,0 @@ -# Manifest - checksums of the cipher directory -# Copyright 2003 Free Software Foundation, Inc. -# -# This file is part of Libgcrypt. -# -# Libgcrypt is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser general Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# Libgcrypt 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - -# Checksums for all source files in this directory. Format is -# filename, blanks, base-64 part of an OpenPGP detached signature -# without the header lines. Blank lines and lines beginning with a -# hash mark are ignored. A tool to process this file is available by -# cvs -d :pserver:anoncvs@cvs.gnupg.org:/cvs/wk co misc-scripts/manifest-tool -# -# The special entry "$names$" holds a signature over all sorted -# filenames excluding itself. - - -# Algorithm API -cipher.c iQCVAwUAQDzrVjEAnp832S/7AQIPDgP+OVJ/YNWY5m7c09EBbPAzL/WsGoj6wrBNMmkRlMOqTHeh+OOtjuFHt1f9uhfM2Nzl7sJ5+h4ryZKLEZmQPRMTZTnAqkvGdsrJWJnigUA9QwYdV0ONqC9C63gpuG465gO9TZVOqlQu/FTxSRuTQYUulkaBNG71n8nZEOusBVwV2YA==58xH -pubkey.c iQCVAwUAP9XQ3jEAnp832S/7AQJ5UgQAyHfEBvPVJ8wTRg8c7ixS2GiVmIgwIo5tvQaiQJTPWASevvYrB+2Z2qa9cATyu50ACjLzbaquGBgPzjJV3dU/qttT1gCqRuN/LCNvXFe5qnIZezejc3RAadFNTw/pOTHq0wxD1Keg66ruei9R36Nba59pEQIWIBXTfubRft2hMYk==E09t -ac.c iQCVAwUAQDzsOzEAnp832S/7AQJCBQP/WI6EV/dsR4rmha6RVhvkjZo17kQ8z6pIl5J3cXOvqEkIFeD2HYu3HHrWST5l7yXlffhpDkVHkfMih4ruK76q6Fm0dxZ98pO4C/dVtgimlvvcy/wOQjpzsE0fYAe1BYdg81LJ09X33vW5x6C29lunfKROO2tPlV5i8ffeoFvmMF8==j26g -md.c iQCVAwUAP+NFGjEAnp832S/7AQJs8wP/Qdk0EAKsyr3O1/pmOSN8AG4rPKbd6KDTzvoBPAN4upFwKYY4hWwvy12Q3YU9DmECrzZkRCXHR7mljVQKs6B7CRZJKjFKmOELpcJDtKvu40vTs1bOH4k9iJYZpGgRA83nkQ+ELAcphAbCA+KIpVr2K4mCJAB0FhpC2uOQ50JHAko==BeF6 -primegen.c iQCVAwUAQDzsoDEAnp832S/7AQKYRwP/TqAQBm1rHTnF0HYE05PqXfWlOqa6EosqVpaOcs/OIW6PaqX0xH1UlrukK7jNOjK3xC4o1qNQ1UKzz2dvQaq1bMvNNizeavxAh10SJZc0hIc/ofc83IbjLh8SZVWQ67JxjsUd3DOXmSmhPZ+Pqd7cUIiw8fDoF+I9EZqy3COu1wY==1ebT - -# Algorithm implementations -arcfour.c iQCVAwUAP9XR/TEAnp832S/7AQJcRwP6AlvYEx++fpT4mIYo0xRDqKEQeqMQvbaRhIg2eV74JxItpHa3q5YsYIl+n1yUz5g35JRWWXSWmAZBwO5wLKsHii4kRUhgrKWnSoQZoPpl49L5+N3R58ON3S0ru5lsBiEJEze3xplf2vqwrH9v1QHVD+gU7UTlfNqrIJoOUXN+1O4==Tq+x -blowfish.c iQCVAwUAP9XTETEAnp832S/7AQJaEgQAgiqqfuO+zQtscgTB0rvOzVymIKjRKjYhFuLjVuc79G4z1RCAffvIn/YM2d7kt+Z/QF7zjcTAOgETCQL1XokpX2zz9HPAMi2tlDY5zsDufTNqj0n4WBL9nM7w6XAvsiwP1B3bqCTv9SjJV4KbxJ58vw1yQE+sqW74R/QIHFvC7mU==wZnX -cast5.c iQCVAwUAP9XT6DEAnp832S/7AQJ3xgP/ehLjEN3GELGudbqeo91Xd+PqitHrkuBbtRIYX7Udd/fyXLN+h8rMJVyIQX2m+mpxbBxudVU3x8/DNT8B0ZHAwK6qqJmEBLLhEYPgIuF76i9LMrP1KqUPhAwRZ2OppjIIugBQ+rP74aD4eLyd/aKQHNuXML8QGWR6KwQShohXM5I==/BRh -crc.c iQCVAwUAP7ouejEAnp832S/7AQIgwQQApg5Nm63tH5DQkbN+zPzMO9Ygoj3ukxfFTyTBPYSXYKMiTjEbESegaU40uN8jnz2vprcIQWcgZfzO4+opEJMcI35aPwzEk0vKOp0S/PrBLUY2rJfnDVkX5XgJFZa2Q7LLe826UEBzTVYW924utiCCe8oOaOEWVNpg1mqdknu3M9o==kz5D -des.c iQCVAwUAQCN2oDEAnp832S/7AQL/jwP6Auoq6nZCDBjpgc9tDzuIRwa9DqyuM3gX94uvgEpUwdHszb2bG43dz03kVmcYxtj1MzXbyCeCZOwox0b2SKmLgxIbrNP6yGbzVdTj6592gDYuf/ZXmc1ZNJ1DDldcPQ0n9fXUipUPwyPaNWo3mSZaNcMKSWWzdK0J6ciG6nk7SWI==9k/t -dsa.c iQCVAwUAP9XZHDEAnp832S/7AQLBRgP/XrBzTEYx5ccMj1MMb6sg37liEHdIyyy49zjvt6jUqxj4RuwVEN8S6v3u4q/QyJkHAi1E0EkREgENlyHW6PKWhYbcrd0vPIAN15yjnl2yqtrCrJImexUCoqJJewK0E4JOicGbabTil8MZjk+mbhEPnjJBqOkyP1w0i31pEDgE/8M==pC8s -elgamal.c iQCVAwUAP9XbYzEAnp832S/7AQLXagQA3HrvspZfbTGgmUH0IqLQTJ0exUPxJv5DET2TvoIy62trDmMN6lTAj5P+a7jQ8udcu0w+mR2vXUHcxUpNA2PxLaMwGzNSY4zRDNe9r3SFTDrFm6m4y9Ko2e8XtEA+WF6P/XLpck4Jn7vMEDmVGPwkNd22kXFFE8dBGwG6i5Hk1Mk==oBUs -md4.c iQCVAwUAP9h50DEAnp832S/7AQJhHgQAzNA/B6MWFDlCtPkIVaW8RpP1Eg0ZNMsy0s7SJkopOCBlu6CwXUOKe+8ppcSxhjYKh4i4uQr/QtfipYlBjzKJGnrafoF/NugXNCOHSTGT11TvK7mCiBuUMVgvZGAlOJImk6eTTfUjRrMfaXM/SWl8bdJ4ZpzdjEyVh89r7I5JrGk==x2UD -md5.c iQCVAwUAP9h7LzEAnp832S/7AQJUGQP/c0cbf6WZXCzmjufHxiE9FAQBzTsA0WtaNqdFcHl7fhmikGtknlaED8n5a7eYd/C481UQW6Wgq/oZdsvgoPWPhG3fOCy2CFP9cZVXITuMSf0ucyZTFUJNO15fnZ+nDfsUv+JPdv1aSeRinAUtfAcSKfkSyR9BCPZvkx+tgU6cphU==Zv+h -rijndael.c iQCVAwUAP9h9cTEAnp832S/7AQKF1AP+P2L/tPqDJRDg+/fwbOk8Ts0MNxnvvYEm3gE73TKuLt1S+B2+jkrZcKNvM5VGPnVMJbnS0lmIK04nmedHCOftGTOwhGulZAHHIaKGystT3Jql4iPws/JMgAjE7Fyxh5WZMtB9yEljKBpJ5XNqhrMvvxcHpnyP3+YzIXNwzk34V+c==dJ5k -rmd160.c iQCVAwUAP9h+bTEAnp832S/7AQK1OgP+PNKF6Nzi6X93easVlksdLqKEsArCAw2QjGWDGyxTnbiJM55qAl9JxR1mn3V+oOL7izLLwTt6EYK9evhzfcxY5N5Mni85RAcsLPsuAfQDEzjI6GUWHtQUKPbM+BaorzfhQjYFSZyvum/dZYJ/WfiwwwhqqIKyVU2ZFSqA38YGC/c==9jdA -rsa.c iQCVAwUAP9iHIzEAnp832S/7AQKAYwQAuWtnMte54QHN+Hij9t4sGuypXogajOb1vQQwGgS0fKsaBZsuSP2amze4o5diIvsQTsFQ4CzjvqoCVuBDoHM3xkSD8wGDizgvtCamAxkdbF7wmzldKFn8SpJqlVwWQMP6kk1IjXHEuYb4IDWGTbVMhfEu+eOlU8+PSK4IhZqNvt4==/3hp -serpent.c iQCVAwUAP9h/VzEAnp832S/7AQLyCwP/d1zbmb7l/PriZNa9/Z7mo01XFe5MnAqCfIwhl9GjeaMszcoS37jECNq5nLvrTTFIIJpm3rvBePwiCG4Wwx1I18HCxaP198pcSaR+BLOJ3Aj52EZPrxtqlDKuFr38ZOP5giyUqUYVYGVdrz4kRMNWAZQK53GeJnGhXCnhxojLEgA==ck46 -sha1.c iQCVAwUAP9iATTEAnp832S/7AQKcSwQAwAs/HnNqho3lU1ZUgCPNt5P2/Brm6W21+wWWGKJkSrra/c4NYVKJGDDwlsFE0b9ln1uZt7bHReFkKXK3JnrKTmNVcx/Cy64iCMRNMhaM72Mqy7wWx5yHBAmMBxzFGnNQKbmeY52zeGih5HsNLSibc2pPuOViWo2JPJ5Ci/wIwl8==/wtO -sha256.c iQCVAwUAP9iAtzEAnp832S/7AQJD2QP/UqvL0hhjG1wEFbGrdkV9tba1sMDXdnnK6X7HdLuRpVAgNiQiFf8JDmntd/dZ2Q71p4Uae2ctqve4WoEijPUZPjACnpuZfx0SEQL0lQBkwxzJp7lz9ujVtwQ2cM/aYexJkXcWgGcloJNLM3JbWPGIJnuYbr/IwJ6RQF9vgj0357o==UWO1 -sha512.c iQCVAwUAP9iBTDEAnp832S/7AQIPBAQA28CJSUQLiW0s2x9u8/OH2eKnxPjA4sZmb50WP7920Lem66P31C3BrOqwfBot4RLhjL+zh/+Uc4s3HPwApZuj9E4BxNMlqLv+Tqk++DAbdaOeYT4jeUt+mlhQQ6mH/RDsy32rZsNsGQ2bUGxazZmfG++PL3JyhawqCy00SUDr/o0==H+0X -tiger.c iQCVAwUAP9iCfjEAnp832S/7AQKufwP/fryv3MqSOYY+90325DH7X3/CtekxeooN0scGsHX0fxBakWSMecTNrj33KPddLS46gU/S89zIc2N/Bw/7EVIAXVFA3/3Ip+OrFOuIMO4Py1sCdB8o2Y+5ygv8iXLcsXIq1O0av79i9g774V3uaXa2qN9ZnXe0AEhcy8FHJ2i/wro==5XVB -twofish.c iQCVAwUAP9iD6TEAnp832S/7AQKUnQP/Rq8FaYeHTG7HbZuqAs9pbPitzjDbkdZddmInWR7NmevBkKvhsJALjVooc0KGQfo2lAAmy3Xi/4QQN8VPn51DVjDIgf7x+DQh/9TFJHMccxI9asUgi4+TNnmMqLU1k3N8S2PjyZ1sjeC8B79fKPpwCzj72WkqPkzZw3l2jArr+dU==NdJT -rfc2268.c iQCVAwUAQCN+3jEAnp832S/7AQLv1gQA1hJh29hAjKi4uLSGxXvJ6cyYmPdmevdKrbLnuHZWtHe4xvCgy/nTdEojEpxgLp/hL/ogasuWRC1W16Wiz9ryxf7YR0uhZWayO/bQNagpfU5MIkJTLuKqqgpwYumCSQfOugXVAqcgEzj+13eeyJaFVrzwrNa67sh84nmbjOjNjvE==0zBq - -# Random number related -random.c iQCVAwUAP7nsITEAnp832S/7AQK4SAQAtvfUgrtGOQ2PlxGMla0qJLPHjJacMwgq0ecusiI79elPdDsFfCCk6dK1Ug2kFbNm22nCGHNcUquqbX7noi7ZVQnmPBQXzyLNZd7GmrawRZfdlRerTUDBpSnR8V8ui/5+YYp627E7kKGC0hPSgqXFql6oBMIfno0LZwFJTjIevRY==L419 -random.h iQCVAwUAP7ovKDEAnp832S/7AQJ3bQQAjnPebnyTC7sphAv2I7uIz+yPgw1ZfbVhLv+OiWDlO9ish+fRyyMpy+HELBOgZjJdgRegqhlZC6qyns5arM/VglYi+PzvdLO3hIqHE/YFfpIFPz8wBrcmlqrYyd3CsGqcYsfjocXNttCBLeSWmoJ09ltKQH8yzJf3oAgN6X1yuc4==eNoU -rand-internal.h iQCVAwUAP7ouvDEAnp832S/7AQLYnAQAhdI7ERoJVCkV8GiV7MjaUxv1WIL7iZ+jIOvVhv4fNyhCGCGoEtTjkyput/lj7Nsh3FXEqRhypGGrCLf47x/gua5n+BwffogxVyUDqiOyyGhNTPpe3fQcNBvbPCtco8yMK4GJO5G3BqzlPyN+BMeogLymyV6Sm1mvh5LZDyAFbfQ==tZSE -rndlinux.c iQCVAwUAP9iPYTEAnp832S/7AQL6/AP/ZDrbOkVuB9qJ7sKeX1MImZEsz3mi0xPovJzaBtBU7a0idcUKrWYOvQFWRlLUeq0iCT6+h2l5bniP7q7hepzlKa+VPY9VWaQthqeJm2l5LN6QQ5PyMfBq04QuBncw9BJnCGmEyTLt3RxIXBAPdxmiVxtcRIFUqCBtQvoUXGLvemw==t37k -rndegd.c iQCVAwUAP9iPRDEAnp832S/7AQImBQP/WHKg+hKXcm1pQvilzML0jZpwK5PAMM4uBnnPJNIXWOYBO6I/Xg9d/tPLg8NlmmtyQCo2Eu0ybDSt+8mu+dWveAys+0LTi0MIqeP9BMzCKz8dnWH6+S8huLXwTF3m0IrqM0JLb6b71GK9SOq6sWQ22yW5vf61hXP8kH9dhIaoMZs==FaHV -rndunix.c iQCVAwUAP9iQlzEAnp832S/7AQL/KgQA29GnvcD4Xb5qjDMBgW9THEE4+4lfex/6k+Fh0IT61OLJsWVLJ7bJpRntburw4uQm4Tf7CO8vaiDFDYhKKrzXeOF1fmdpcL8hA+fNp9I/MUOc4e9kN9+YJ9wikVa0SZj1OBfhzgcFLd1xOtulkr3ii52HLF9vhrxzkgVwvD10Bi8==2cML -rndw32.c iQCVAwUAP9iRKDEAnp832S/7AQIuaAQA3AJr3WqnxNDsWCIdvehf8Suotthj+laX8nJsvDfFhXPKcXDpsg0wTTXSnnKgyED53+uYiMDnVRsxeWAyhKwvx1MjjlaSMMjzbH6isWTH8FaWpLgrxEkXoPeNqYf5FXpdUkcUxGX2RkQeuX/cIfiHLNE9CV0usaF2jysjBX2iERY==EEnO - -# Helper -bithelp.h iQCVAwUAP7ouPTEAnp832S/7AQKXggQAqjcgvihIF3WclOgw1JV2rbARw4ISIDRMFqdaNCqBRx6BwEz3UGsEIlz6+iR1sS/reqN61WvtjLb+D0+tujAkGrgQJhFLG85WtG2tB5UVoI3am1fpkwiRm+bR4rv0rGk0BYk81bC7+l4KrK9o5lVp4lCsrorlUKsd48lNmBHyAXM==mDDN -rmd.h iQCVAwUAP7oumjEAnp832S/7AQJiJQP/V4bJwjZaYndJzV+KRnIDbl1koHuw+ZK5heMYVu8Qk4ylqv//BGyeRa3jZCcfPHI35q6HilCs2VBm8hiBMjHSqY/VPn2ZQ0yg/lt6qEvl7YjsLmyMICvjG+ncszHoq9pRvnF3vTnM18sPIioXLk8fskuM0XOCNBs0ARBAQjY9UGI==olUN - -# Configuration -Makefile.am iQCVAwUAQCN33TEAnp832S/7AQKFJAQAz7BDkC814q+QiuE/jnutJHR5qlgbrm3ikGbQwdRzYUscst4bCCWy3uKL/sIPGLg+JQXtF5FnsQy3s4D9BOYhp72cA9ktYK65hhi4pNm/JQ0lXkZMNfk8Go5lNzKezlWwHvkMwRXR0Fep0wPdyeaKW5BfaW2ABvgep6Bp+hHEbyg==zSyi -$names$ iQCVAwUAQCN3EDEAnp832S/7AQJXLAP8DvHTpm5DkTF35EmzeKpi9ie59AZcZanD19ir/e/7+PaQxr2riuLHDGwFKTju+dcvvBsqrygXOC378GXVWzIF2OZwS4EdDcJ+pgojo9UpsqpKsJHouY4Ugx5cQialxba462kUn8hcihSBnMyc4LzbJ5WQ4puQuqy544d2x94+2ms==G4Ls diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/arcfour.c b/src/hos_libhttpserver/src/libgcrypt/cipher/arcfour.c deleted file mode 100644 index d692c84a..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/arcfour.c +++ /dev/null @@ -1,185 +0,0 @@ -/* arcfour.c - The arcfour stream cipher - * Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * For a description of the algorithm, see: - * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. - * ISBN 0-471-11709-9. Pages 397 ff. - */ - - -#include -#include -#include -#include -#include "types.h" -#include "g10lib.h" -#include "cipher.h" - -static const char *selftest(void); - -typedef struct { - byte sbox[256]; - int idx_i, idx_j; -} ARCFOUR_context; - -static void -do_encrypt_stream( ARCFOUR_context *ctx, - byte *outbuf, const byte *inbuf, size_t length ) -{ -#ifndef __i386__ - register unsigned int i = ctx->idx_i; - register byte j = ctx->idx_j; - register byte *sbox = ctx->sbox; - register byte t, u; - - while ( length-- ) - { - i++; - t = sbox[(byte)i]; - j += t; - u = sbox[j]; - sbox[(byte)i] = u; - u += t; - sbox[j] = t; - *outbuf++ = sbox[u] ^ *inbuf++; - } - - ctx->idx_i = (byte)i; - ctx->idx_j = (byte)j; -#else /*__i386__*/ - /* Old implementation of arcfour is faster on i386 than the version above. - * This is because version above increases register pressure which on i386 - * would push some of the variables to memory/stack. Therefore keep this - * version for i386 to avoid regressing performance. */ - register int i = ctx->idx_i; - register int j = ctx->idx_j; - register byte *sbox = ctx->sbox; - register int t; - - while ( length-- ) - { - i++; - i = i & 255; /* The and-op seems to be faster than the mod-op. */ - j += sbox[i]; - j &= 255; - t = sbox[i]; sbox[i] = sbox[j]; sbox[j] = t; - *outbuf++ = *inbuf++ ^ sbox[(sbox[i] + sbox[j]) & 255]; - } - - ctx->idx_i = i; - ctx->idx_j = j; -#endif -} - -static void -encrypt_stream (void *context, - byte *outbuf, const byte *inbuf, size_t length) -{ - ARCFOUR_context *ctx = (ARCFOUR_context *) context; - do_encrypt_stream (ctx, outbuf, inbuf, length ); - _gcry_burn_stack (64); -} - - -static gcry_err_code_t -do_arcfour_setkey (void *context, const byte *key, unsigned int keylen) -{ - static int initialized; - static const char* selftest_failed; - int i, j; - byte karr[256]; - ARCFOUR_context *ctx = (ARCFOUR_context *) context; - - if (!initialized ) - { - initialized = 1; - selftest_failed = selftest(); - if( selftest_failed ) - log_error ("ARCFOUR selftest failed (%s)\n", selftest_failed ); - } - if( selftest_failed ) - return GPG_ERR_SELFTEST_FAILED; - - if( keylen < 40/8 ) /* we want at least 40 bits */ - return GPG_ERR_INV_KEYLEN; - - ctx->idx_i = ctx->idx_j = 0; - for (i=0; i < 256; i++ ) - ctx->sbox[i] = i; - for (i=j=0; i < 256; i++,j++ ) - { - if (j >= keylen) - j = 0; - karr[i] = key[j]; - } - for (i=j=0; i < 256; i++ ) - { - int t; - j = (j + ctx->sbox[i] + karr[i]) & 255; - t = ctx->sbox[i]; - ctx->sbox[i] = ctx->sbox[j]; - ctx->sbox[j] = t; - } - wipememory( karr, sizeof(karr) ); - - return GPG_ERR_NO_ERROR; -} - -static gcry_err_code_t -arcfour_setkey ( void *context, const byte *key, unsigned int keylen ) -{ - ARCFOUR_context *ctx = (ARCFOUR_context *) context; - gcry_err_code_t rc = do_arcfour_setkey (ctx, key, keylen ); - return rc; -} - - -static const char* -selftest(void) -{ - ARCFOUR_context ctx; - byte scratch[16]; - - /* Test vector from Cryptlib labeled there: "from the - State/Commerce Department". */ - static const byte key_1[] = - { 0x61, 0x8A, 0x63, 0xD2, 0xFB }; - static const byte plaintext_1[] = - { 0xDC, 0xEE, 0x4C, 0xF9, 0x2C }; - static const byte ciphertext_1[] = - { 0xF1, 0x38, 0x29, 0xC9, 0xDE }; - - arcfour_setkey( &ctx, key_1, sizeof(key_1)); - encrypt_stream( &ctx, scratch, plaintext_1, sizeof(plaintext_1)); - if ( memcmp (scratch, ciphertext_1, sizeof (ciphertext_1))) - return "Arcfour encryption test 1 failed."; - arcfour_setkey( &ctx, key_1, sizeof(key_1)); - encrypt_stream(&ctx, scratch, scratch, sizeof(plaintext_1)); /* decrypt */ - if ( memcmp (scratch, plaintext_1, sizeof (plaintext_1))) - return "Arcfour decryption test 1 failed."; - return NULL; -} - - -gcry_cipher_spec_t _gcry_cipher_spec_arcfour = - { - GCRY_CIPHER_ARCFOUR, {0, 0}, - "ARCFOUR", NULL, NULL, 1, 128, sizeof (ARCFOUR_context), - arcfour_setkey, NULL, NULL, encrypt_stream, encrypt_stream, - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/bithelp.h b/src/hos_libhttpserver/src/libgcrypt/cipher/bithelp.h deleted file mode 100644 index 6e59c53f..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/bithelp.h +++ /dev/null @@ -1,80 +0,0 @@ -/* bithelp.h - Some bit manipulation helpers - * Copyright (C) 1999, 2002 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ -#ifndef G10_BITHELP_H -#define G10_BITHELP_H - -#include "types.h" - - -/**************** - * Rotate the 32 bit unsigned integer X by N bits left/right - */ -static inline u32 rol(u32 x, int n) -{ - return ( (x << (n&(32-1))) | (x >> ((32-n)&(32-1))) ); -} - -static inline u32 ror(u32 x, int n) -{ - return ( (x >> (n&(32-1))) | (x << ((32-n)&(32-1))) ); -} - -/* Byte swap for 32-bit and 64-bit integers. If available, use compiler - provided helpers. */ -#ifdef HAVE_BUILTIN_BSWAP32 -# define _gcry_bswap32 __builtin_bswap32 -#else -static inline u32 -_gcry_bswap32(u32 x) -{ - return ((rol(x, 8) & 0x00ff00ffL) | (ror(x, 8) & 0xff00ff00L)); -} -#endif - -#ifdef HAVE_U64_TYPEDEF -# ifdef HAVE_BUILTIN_BSWAP64 -# define _gcry_bswap64 __builtin_bswap64 -# else -static inline u64 -_gcry_bswap64(u64 x) -{ - return ((u64)_gcry_bswap32(x) << 32) | (_gcry_bswap32(x >> 32)); -} -# endif -#endif - -/* Endian dependent byte swap operations. */ -#ifdef WORDS_BIGENDIAN -# define le_bswap32(x) _gcry_bswap32(x) -# define be_bswap32(x) ((u32)(x)) -# ifdef HAVE_U64_TYPEDEF -# define le_bswap64(x) _gcry_bswap64(x) -# define be_bswap64(x) ((u64)(x)) -# endif -#else -# define le_bswap32(x) ((u32)(x)) -# define be_bswap32(x) _gcry_bswap32(x) -# ifdef HAVE_U64_TYPEDEF -# define le_bswap64(x) ((u64)(x)) -# define be_bswap64(x) _gcry_bswap64(x) -# endif -#endif - -#endif /*G10_BITHELP_H*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/blowfish-amd64.S b/src/hos_libhttpserver/src/libgcrypt/cipher/blowfish-amd64.S deleted file mode 100644 index 6975e559..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/blowfish-amd64.S +++ /dev/null @@ -1,533 +0,0 @@ -/* blowfish-amd64.S - AMD64 assembly implementation of Blowfish cipher - * - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifdef __x86_64 -#include -#if defined(USE_BLOWFISH) && defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) - -.text - -/* structure of BLOWFISH_context: */ -#define s0 0 -#define s1 ((s0) + 256 * 4) -#define s2 ((s1) + 256 * 4) -#define s3 ((s2) + 256 * 4) -#define p ((s3) + 256 * 4) - -/* register macros */ -#define CTX %rdi -#define RIO %rsi - -#define RX0 %rax -#define RX1 %rbx -#define RX2 %rcx -#define RX3 %rdx - -#define RX0d %eax -#define RX1d %ebx -#define RX2d %ecx -#define RX3d %edx - -#define RX0bl %al -#define RX1bl %bl -#define RX2bl %cl -#define RX3bl %dl - -#define RX0bh %ah -#define RX1bh %bh -#define RX2bh %ch -#define RX3bh %dh - -#define RT0 %rbp -#define RT1 %rsi -#define RT2 %r8 -#define RT3 %r9 - -#define RT0d %ebp -#define RT1d %esi -#define RT2d %r8d -#define RT3d %r9d - -#define RKEY %r10 - -/*********************************************************************** - * 1-way blowfish - ***********************************************************************/ -#define F() \ - movzbl RX0bh, RT1d; \ - movzbl RX0bl, RT3d; \ - rorq $16, RX0; \ - movzbl RX0bh, RT0d; \ - movzbl RX0bl, RT2d; \ - rorq $16, RX0; \ - movl s0(CTX,RT0,4), RT0d; \ - addl s1(CTX,RT2,4), RT0d; \ - xorl s2(CTX,RT1,4), RT0d; \ - addl s3(CTX,RT3,4), RT0d; \ - xorq RT0, RX0; - -#define load_roundkey_enc(n) \ - movq p+4*(n)(CTX), RX3; - -#define add_roundkey_enc() \ - xorq RX3, RX0; - -#define round_enc(n) \ - add_roundkey_enc(); \ - load_roundkey_enc(n); \ - \ - F(); \ - F(); - -#define load_roundkey_dec(n) \ - movq p+4*(n-1)(CTX), RX3; \ - rorq $32, RX3; - -#define add_roundkey_dec() \ - xorq RX3, RX0; - -#define round_dec(n) \ - add_roundkey_dec(); \ - load_roundkey_dec(n); \ - \ - F(); \ - F(); - -#define read_block() \ - movq (RIO), RX0; \ - rorq $32, RX0; \ - bswapq RX0; - -#define write_block() \ - bswapq RX0; \ - movq RX0, (RIO); - -.align 8 -.type __blowfish_enc_blk1,@function; - -__blowfish_enc_blk1: - /* input: - * %rdi: ctx, CTX - * RX0: input plaintext block - * output: - * RX0: output plaintext block - */ - movq %rbp, %r11; - - load_roundkey_enc(0); - round_enc(2); - round_enc(4); - round_enc(6); - round_enc(8); - round_enc(10); - round_enc(12); - round_enc(14); - round_enc(16); - add_roundkey_enc(); - - movq %r11, %rbp; - - ret; -.size __blowfish_enc_blk1,.-__blowfish_enc_blk1; - -.align 8 -.globl _gcry_blowfish_amd64_do_encrypt -.type _gcry_blowfish_amd64_do_encrypt,@function; - -_gcry_blowfish_amd64_do_encrypt: - /* input: - * %rdi: ctx, CTX - * %rsi: u32 *ret_xl - * %rdx: u32 *ret_xr - */ - movl (%rdx), RX0d; - shlq $32, RX0; - movl (%rsi), RT3d; - movq %rdx, %r10; - orq RT3, RX0; - movq %rsi, RX2; - - call __blowfish_enc_blk1; - - movl RX0d, (%r10); - shrq $32, RX0; - movl RX0d, (RX2); - - ret; -.size _gcry_blowfish_amd64_do_encrypt,.-_gcry_blowfish_amd64_do_encrypt; - -.align 8 -.globl _gcry_blowfish_amd64_encrypt_block -.type _gcry_blowfish_amd64_encrypt_block,@function; - -_gcry_blowfish_amd64_encrypt_block: - /* input: - * %rdi: ctx, CTX - * %rsi: dst - * %rdx: src - */ - - movq %rsi, %r10; - - movq %rdx, RIO; - read_block(); - - call __blowfish_enc_blk1; - - movq %r10, RIO; - write_block(); - - ret; -.size _gcry_blowfish_amd64_encrypt_block,.-_gcry_blowfish_amd64_encrypt_block; - -.align 8 -.globl _gcry_blowfish_amd64_decrypt_block -.type _gcry_blowfish_amd64_decrypt_block,@function; - -_gcry_blowfish_amd64_decrypt_block: - /* input: - * %rdi: ctx, CTX - * %rsi: dst - * %rdx: src - */ - movq %rbp, %r11; - - movq %rsi, %r10; - movq %rdx, RIO; - - read_block(); - - load_roundkey_dec(17); - round_dec(15); - round_dec(13); - round_dec(11); - round_dec(9); - round_dec(7); - round_dec(5); - round_dec(3); - round_dec(1); - add_roundkey_dec(); - - movq %r10, RIO; - write_block(); - - movq %r11, %rbp; - - ret; -.size _gcry_blowfish_amd64_decrypt_block,.-_gcry_blowfish_amd64_decrypt_block; - -/********************************************************************** - 4-way blowfish, four blocks parallel - **********************************************************************/ -#define F4(x) \ - movzbl x ## bh, RT1d; \ - movzbl x ## bl, RT3d; \ - rorq $16, x; \ - movzbl x ## bh, RT0d; \ - movzbl x ## bl, RT2d; \ - rorq $16, x; \ - movl s0(CTX,RT0,4), RT0d; \ - addl s1(CTX,RT2,4), RT0d; \ - xorl s2(CTX,RT1,4), RT0d; \ - addl s3(CTX,RT3,4), RT0d; \ - xorq RT0, x; - -#define add_preloaded_roundkey4() \ - xorq RKEY, RX0; \ - xorq RKEY, RX1; \ - xorq RKEY, RX2; \ - xorq RKEY, RX3; - -#define preload_roundkey_enc(n) \ - movq p+4*(n)(CTX), RKEY; - -#define add_roundkey_enc4(n) \ - add_preloaded_roundkey4(); \ - preload_roundkey_enc(n + 2); - -#define round_enc4(n) \ - add_roundkey_enc4(n); \ - \ - F4(RX0); \ - F4(RX1); \ - F4(RX2); \ - F4(RX3); \ - \ - F4(RX0); \ - F4(RX1); \ - F4(RX2); \ - F4(RX3); - -#define preload_roundkey_dec(n) \ - movq p+4*((n)-1)(CTX), RKEY; \ - rorq $32, RKEY; - -#define add_roundkey_dec4(n) \ - add_preloaded_roundkey4(); \ - preload_roundkey_dec(n - 2); - -#define round_dec4(n) \ - add_roundkey_dec4(n); \ - \ - F4(RX0); \ - F4(RX1); \ - F4(RX2); \ - F4(RX3); \ - \ - F4(RX0); \ - F4(RX1); \ - F4(RX2); \ - F4(RX3); - -#define inbswap_block4() \ - rorq $32, RX0; \ - bswapq RX0; \ - rorq $32, RX1; \ - bswapq RX1; \ - rorq $32, RX2; \ - bswapq RX2; \ - rorq $32, RX3; \ - bswapq RX3; - -#define inctrswap_block4() \ - rorq $32, RX0; \ - rorq $32, RX1; \ - rorq $32, RX2; \ - rorq $32, RX3; - -#define outbswap_block4() \ - bswapq RX0; \ - bswapq RX1; \ - bswapq RX2; \ - bswapq RX3; - -.align 8 -.type __blowfish_enc_blk4,@function; - -__blowfish_enc_blk4: - /* input: - * %rdi: ctx, CTX - * RX0,RX1,RX2,RX3: four input inbswapped plaintext blocks - * output: - * RX0,RX1,RX2,RX3: four output ciphertext blocks - */ - preload_roundkey_enc(0); - - round_enc4(0); - round_enc4(2); - round_enc4(4); - round_enc4(6); - round_enc4(8); - round_enc4(10); - round_enc4(12); - round_enc4(14); - add_preloaded_roundkey4(); - - outbswap_block4(); - - ret; -.size __blowfish_enc_blk4,.-__blowfish_enc_blk4; - -.align 8 -.type __blowfish_dec_blk4,@function; - -__blowfish_dec_blk4: - /* input: - * %rdi: ctx, CTX - * RX0,RX1,RX2,RX3: four input ciphertext blocks - * output: - * RX0,RX1,RX2,RX3: four output plaintext blocks - */ - preload_roundkey_dec(17); - - inbswap_block4(); - - round_dec4(17); - round_dec4(15); - round_dec4(13); - round_dec4(11); - round_dec4(9); - round_dec4(7); - round_dec4(5); - round_dec4(3); - add_preloaded_roundkey4(); - - outbswap_block4(); - - ret; -.size __blowfish_dec_blk4,.-__blowfish_dec_blk4; - -.align 8 -.globl _gcry_blowfish_amd64_ctr_enc -.type _gcry_blowfish_amd64_ctr_enc,@function; -_gcry_blowfish_amd64_ctr_enc: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (4 blocks) - * %rdx: src (4 blocks) - * %rcx: iv (big endian, 64bit) - */ - pushq %rbp; - pushq %rbx; - pushq %r12; - pushq %r13; - - /* %r11-%r13 are not used by __blowfish_enc_blk4 */ - movq %rcx, %r13; /*iv*/ - movq %rdx, %r12; /*src*/ - movq %rsi, %r11; /*dst*/ - - /* load IV and byteswap */ - movq (%r13), RT0; - bswapq RT0; - movq RT0, RX0; - - /* construct IVs */ - leaq 1(RT0), RX1; - leaq 2(RT0), RX2; - leaq 3(RT0), RX3; - leaq 4(RT0), RT0; - bswapq RT0; - - inctrswap_block4(); - - /* store new IV */ - movq RT0, (%r13); - - call __blowfish_enc_blk4; - - /* XOR key-stream with plaintext */ - xorq 0 * 8(%r12), RX0; - xorq 1 * 8(%r12), RX1; - xorq 2 * 8(%r12), RX2; - xorq 3 * 8(%r12), RX3; - movq RX0, 0 * 8(%r11); - movq RX1, 1 * 8(%r11); - movq RX2, 2 * 8(%r11); - movq RX3, 3 * 8(%r11); - - popq %r13; - popq %r12; - popq %rbx; - popq %rbp; - - ret; -.size _gcry_blowfish_amd64_ctr_enc,.-_gcry_blowfish_amd64_ctr_enc; - -.align 8 -.globl _gcry_blowfish_amd64_cbc_dec -.type _gcry_blowfish_amd64_cbc_dec,@function; -_gcry_blowfish_amd64_cbc_dec: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (4 blocks) - * %rdx: src (4 blocks) - * %rcx: iv (64bit) - */ - pushq %rbp; - pushq %rbx; - pushq %r12; - pushq %r13; - - /* %r11-%r13 are not used by __blowfish_dec_blk4 */ - movq %rsi, %r11; /*dst*/ - movq %rdx, %r12; /*src*/ - movq %rcx, %r13; /*iv*/ - - /* load input */ - movq 0 * 8(%r12), RX0; - movq 1 * 8(%r12), RX1; - movq 2 * 8(%r12), RX2; - movq 3 * 8(%r12), RX3; - - call __blowfish_dec_blk4; - - movq 3 * 8(%r12), RT0; - xorq (%r13), RX0; - xorq 0 * 8(%r12), RX1; - xorq 1 * 8(%r12), RX2; - xorq 2 * 8(%r12), RX3; - movq RT0, (%r13); /* store new IV */ - - movq RX0, 0 * 8(%r11); - movq RX1, 1 * 8(%r11); - movq RX2, 2 * 8(%r11); - movq RX3, 3 * 8(%r11); - - popq %r13; - popq %r12; - popq %rbx; - popq %rbp; - - ret; -.size _gcry_blowfish_amd64_cbc_dec,.-_gcry_blowfish_amd64_cbc_dec; - -.align 8 -.globl _gcry_blowfish_amd64_cfb_dec -.type _gcry_blowfish_amd64_cfb_dec,@function; -_gcry_blowfish_amd64_cfb_dec: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (4 blocks) - * %rdx: src (4 blocks) - * %rcx: iv (64bit) - */ - pushq %rbp; - pushq %rbx; - pushq %r12; - pushq %r13; - - /* %r11-%r13 are not used by __blowfish_enc_blk4 */ - movq %rcx, %r13; /*iv*/ - movq %rdx, %r12; /*src*/ - movq %rsi, %r11; /*dst*/ - - /* Load input */ - movq (%r13), RX0; - movq 0 * 8(%r12), RX1; - movq 1 * 8(%r12), RX2; - movq 2 * 8(%r12), RX3; - - inbswap_block4(); - - /* Update IV */ - movq 3 * 8(%r12), RT0; - movq RT0, (%r13); - - call __blowfish_enc_blk4; - - xorq 0 * 8(%r12), RX0; - xorq 1 * 8(%r12), RX1; - xorq 2 * 8(%r12), RX2; - xorq 3 * 8(%r12), RX3; - movq RX0, 0 * 8(%r11); - movq RX1, 1 * 8(%r11); - movq RX2, 2 * 8(%r11); - movq RX3, 3 * 8(%r11); - - popq %r13; - popq %r12; - popq %rbx; - popq %rbp; - ret; -.size _gcry_blowfish_amd64_cfb_dec,.-_gcry_blowfish_amd64_cfb_dec; - -#endif /*defined(USE_BLOWFISH)*/ -#endif /*__x86_64*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/blowfish-arm.S b/src/hos_libhttpserver/src/libgcrypt/cipher/blowfish-arm.S deleted file mode 100644 index 901d0c3d..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/blowfish-arm.S +++ /dev/null @@ -1,743 +0,0 @@ -/* blowfish-arm.S - ARM assembly implementation of Blowfish cipher - * - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include - -#if defined(__ARMEL__) -#ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS - -.text - -.syntax unified -.arm - -/* structure of crypto context */ -#define s0 0 -#define s1 (s0 + (1 * 256) * 4) -#define s2 (s0 + (2 * 256) * 4) -#define s3 (s0 + (3 * 256) * 4) -#define p (s3 + (1 * 256) * 4) - -/* register macros */ -#define CTXs0 %r0 -#define CTXs1 %r9 -#define CTXs2 %r8 -#define CTXs3 %r10 -#define RMASK %lr -#define RKEYL %r2 -#define RKEYR %ip - -#define RL0 %r3 -#define RR0 %r4 - -#define RL1 %r9 -#define RR1 %r10 - -#define RT0 %r11 -#define RT1 %r7 -#define RT2 %r5 -#define RT3 %r6 - -/* helper macros */ -#define ldr_unaligned_le(rout, rsrc, offs, rtmp) \ - ldrb rout, [rsrc, #((offs) + 0)]; \ - ldrb rtmp, [rsrc, #((offs) + 1)]; \ - orr rout, rout, rtmp, lsl #8; \ - ldrb rtmp, [rsrc, #((offs) + 2)]; \ - orr rout, rout, rtmp, lsl #16; \ - ldrb rtmp, [rsrc, #((offs) + 3)]; \ - orr rout, rout, rtmp, lsl #24; - -#define str_unaligned_le(rin, rdst, offs, rtmp0, rtmp1) \ - mov rtmp0, rin, lsr #8; \ - strb rin, [rdst, #((offs) + 0)]; \ - mov rtmp1, rin, lsr #16; \ - strb rtmp0, [rdst, #((offs) + 1)]; \ - mov rtmp0, rin, lsr #24; \ - strb rtmp1, [rdst, #((offs) + 2)]; \ - strb rtmp0, [rdst, #((offs) + 3)]; - -#define ldr_unaligned_be(rout, rsrc, offs, rtmp) \ - ldrb rout, [rsrc, #((offs) + 3)]; \ - ldrb rtmp, [rsrc, #((offs) + 2)]; \ - orr rout, rout, rtmp, lsl #8; \ - ldrb rtmp, [rsrc, #((offs) + 1)]; \ - orr rout, rout, rtmp, lsl #16; \ - ldrb rtmp, [rsrc, #((offs) + 0)]; \ - orr rout, rout, rtmp, lsl #24; - -#define str_unaligned_be(rin, rdst, offs, rtmp0, rtmp1) \ - mov rtmp0, rin, lsr #8; \ - strb rin, [rdst, #((offs) + 3)]; \ - mov rtmp1, rin, lsr #16; \ - strb rtmp0, [rdst, #((offs) + 2)]; \ - mov rtmp0, rin, lsr #24; \ - strb rtmp1, [rdst, #((offs) + 1)]; \ - strb rtmp0, [rdst, #((offs) + 0)]; - -#ifdef __ARMEL__ - #define ldr_unaligned_host ldr_unaligned_le - #define str_unaligned_host str_unaligned_le - - /* bswap on little-endian */ -#ifdef HAVE_ARM_ARCH_V6 - #define host_to_be(reg, rtmp) \ - rev reg, reg; - #define be_to_host(reg, rtmp) \ - rev reg, reg; -#else - #define host_to_be(reg, rtmp) \ - eor rtmp, reg, reg, ror #16; \ - mov rtmp, rtmp, lsr #8; \ - bic rtmp, rtmp, #65280; \ - eor reg, rtmp, reg, ror #8; - #define be_to_host(reg, rtmp) \ - eor rtmp, reg, reg, ror #16; \ - mov rtmp, rtmp, lsr #8; \ - bic rtmp, rtmp, #65280; \ - eor reg, rtmp, reg, ror #8; -#endif -#else - #define ldr_unaligned_host ldr_unaligned_be - #define str_unaligned_host str_unaligned_be - - /* nop on big-endian */ - #define host_to_be(reg, rtmp) /*_*/ - #define be_to_host(reg, rtmp) /*_*/ -#endif - -#define host_to_host(x, y) /*_*/ - -/*********************************************************************** - * 1-way blowfish - ***********************************************************************/ -#define F(l, r) \ - and RT0, RMASK, l, lsr#(24 - 2); \ - and RT1, RMASK, l, lsr#(16 - 2); \ - ldr RT0, [CTXs0, RT0]; \ - and RT2, RMASK, l, lsr#(8 - 2); \ - ldr RT1, [CTXs1, RT1]; \ - and RT3, RMASK, l, lsl#2; \ - ldr RT2, [CTXs2, RT2]; \ - add RT0, RT1; \ - ldr RT3, [CTXs3, RT3]; \ - eor RT0, RT2; \ - add RT0, RT3; \ - eor r, RT0; - -#define load_roundkey_enc(n) \ - ldr RKEYL, [CTXs2, #((p - s2) + (4 * (n) + 0))]; \ - ldr RKEYR, [CTXs2, #((p - s2) + (4 * (n) + 4))]; - -#define add_roundkey_enc() \ - eor RL0, RKEYL; \ - eor RR0, RKEYR; - -#define round_enc(n) \ - add_roundkey_enc(); \ - load_roundkey_enc(n); \ - \ - F(RL0, RR0); \ - F(RR0, RL0); - -#define load_roundkey_dec(n) \ - ldr RKEYL, [CTXs2, #((p - s2) + (4 * ((n) - 1) + 4))]; \ - ldr RKEYR, [CTXs2, #((p - s2) + (4 * ((n) - 1) + 0))]; - -#define add_roundkey_dec() \ - eor RL0, RKEYL; \ - eor RR0, RKEYR; - -#define round_dec(n) \ - add_roundkey_dec(); \ - load_roundkey_dec(n); \ - \ - F(RL0, RR0); \ - F(RR0, RL0); - -#define read_block_aligned(rin, offs, l0, r0, convert, rtmp) \ - ldr l0, [rin, #((offs) + 0)]; \ - ldr r0, [rin, #((offs) + 4)]; \ - convert(l0, rtmp); \ - convert(r0, rtmp); - -#define write_block_aligned(rout, offs, l0, r0, convert, rtmp) \ - convert(l0, rtmp); \ - convert(r0, rtmp); \ - str l0, [rout, #((offs) + 0)]; \ - str r0, [rout, #((offs) + 4)]; - -#ifdef __ARM_FEATURE_UNALIGNED - /* unaligned word reads allowed */ - #define read_block(rin, offs, l0, r0, rtmp0) \ - read_block_aligned(rin, offs, l0, r0, host_to_be, rtmp0) - - #define write_block(rout, offs, r0, l0, rtmp0, rtmp1) \ - write_block_aligned(rout, offs, r0, l0, be_to_host, rtmp0) - - #define read_block_host(rin, offs, l0, r0, rtmp0) \ - read_block_aligned(rin, offs, l0, r0, host_to_host, rtmp0) - - #define write_block_host(rout, offs, r0, l0, rtmp0, rtmp1) \ - write_block_aligned(rout, offs, r0, l0, host_to_host, rtmp0) -#else - /* need to handle unaligned reads by byte reads */ - #define read_block(rin, offs, l0, r0, rtmp0) \ - tst rin, #3; \ - beq 1f; \ - ldr_unaligned_be(l0, rin, (offs) + 0, rtmp0); \ - ldr_unaligned_be(r0, rin, (offs) + 4, rtmp0); \ - b 2f; \ - 1:;\ - read_block_aligned(rin, offs, l0, r0, host_to_be, rtmp0); \ - 2:; - - #define write_block(rout, offs, l0, r0, rtmp0, rtmp1) \ - tst rout, #3; \ - beq 1f; \ - str_unaligned_be(l0, rout, (offs) + 0, rtmp0, rtmp1); \ - str_unaligned_be(r0, rout, (offs) + 4, rtmp0, rtmp1); \ - b 2f; \ - 1:;\ - write_block_aligned(rout, offs, l0, r0, be_to_host, rtmp0); \ - 2:; - - #define read_block_host(rin, offs, l0, r0, rtmp0) \ - tst rin, #3; \ - beq 1f; \ - ldr_unaligned_host(l0, rin, (offs) + 0, rtmp0); \ - ldr_unaligned_host(r0, rin, (offs) + 4, rtmp0); \ - b 2f; \ - 1:;\ - read_block_aligned(rin, offs, l0, r0, host_to_host, rtmp0); \ - 2:; - - #define write_block_host(rout, offs, l0, r0, rtmp0, rtmp1) \ - tst rout, #3; \ - beq 1f; \ - str_unaligned_host(l0, rout, (offs) + 0, rtmp0, rtmp1); \ - str_unaligned_host(r0, rout, (offs) + 4, rtmp0, rtmp1); \ - b 2f; \ - 1:;\ - write_block_aligned(rout, offs, l0, r0, host_to_host); \ - 2:; -#endif - -.align 3 -.type __blowfish_enc_blk1,%function; - -__blowfish_enc_blk1: - /* input: - * preloaded: CTX - * [RL0, RR0]: src - * output: - * [RR0, RL0]: dst - */ - push {%lr}; - - add CTXs1, CTXs0, #(s1 - s0); - add CTXs2, CTXs0, #(s2 - s0); - mov RMASK, #(0xff << 2); /* byte mask */ - add CTXs3, CTXs1, #(s3 - s1); - - load_roundkey_enc(0); - round_enc(2); - round_enc(4); - round_enc(6); - round_enc(8); - round_enc(10); - round_enc(12); - round_enc(14); - round_enc(16); - add_roundkey_enc(); - - pop {%pc}; -.size __blowfish_enc_blk1,.-__blowfish_enc_blk1; - -.align 8 -.globl _gcry_blowfish_arm_do_encrypt -.type _gcry_blowfish_arm_do_encrypt,%function; - -_gcry_blowfish_arm_do_encrypt: - /* input: - * %r0: ctx, CTX - * %r1: u32 *ret_xl - * %r2: u32 *ret_xr - */ - push {%r2, %r4-%r11, %ip, %lr}; - - ldr RL0, [%r1]; - ldr RR0, [%r2]; - - bl __blowfish_enc_blk1; - - pop {%r2}; - str RR0, [%r1]; - str RL0, [%r2]; - - pop {%r4-%r11, %ip, %pc}; -.size _gcry_blowfish_arm_do_encrypt,.-_gcry_blowfish_arm_do_encrypt; - -.align 3 -.globl _gcry_blowfish_arm_encrypt_block -.type _gcry_blowfish_arm_encrypt_block,%function; - -_gcry_blowfish_arm_encrypt_block: - /* input: - * %r0: ctx, CTX - * %r1: dst - * %r2: src - */ - push {%r4-%r11, %ip, %lr}; - - read_block(%r2, 0, RL0, RR0, RT0); - - bl __blowfish_enc_blk1; - - write_block(%r1, 0, RR0, RL0, RT0, RT1); - - pop {%r4-%r11, %ip, %pc}; -.size _gcry_blowfish_arm_encrypt_block,.-_gcry_blowfish_arm_encrypt_block; - -.align 3 -.globl _gcry_blowfish_arm_decrypt_block -.type _gcry_blowfish_arm_decrypt_block,%function; - -_gcry_blowfish_arm_decrypt_block: - /* input: - * %r0: ctx, CTX - * %r1: dst - * %r2: src - */ - push {%r4-%r11, %ip, %lr}; - - add CTXs1, CTXs0, #(s1 - s0); - add CTXs2, CTXs0, #(s2 - s0); - mov RMASK, #(0xff << 2); /* byte mask */ - add CTXs3, CTXs1, #(s3 - s1); - - read_block(%r2, 0, RL0, RR0, RT0); - - load_roundkey_dec(17); - round_dec(15); - round_dec(13); - round_dec(11); - round_dec(9); - round_dec(7); - round_dec(5); - round_dec(3); - round_dec(1); - add_roundkey_dec(); - - write_block(%r1, 0, RR0, RL0, RT0, RT1); - - pop {%r4-%r11, %ip, %pc}; -.size _gcry_blowfish_arm_decrypt_block,.-_gcry_blowfish_arm_decrypt_block; - -/*********************************************************************** - * 2-way blowfish - ***********************************************************************/ -#define F2(n, l0, r0, l1, r1, set_nextk, dec) \ - \ - and RT0, RMASK, l0, lsr#(24 - 2); \ - and RT1, RMASK, l0, lsr#(16 - 2); \ - and RT2, RMASK, l0, lsr#(8 - 2); \ - add RT1, #(s1 - s0); \ - \ - ldr RT0, [CTXs0, RT0]; \ - and RT3, RMASK, l0, lsl#2; \ - ldr RT1, [CTXs0, RT1]; \ - add RT3, #(s3 - s2); \ - ldr RT2, [CTXs2, RT2]; \ - add RT0, RT1; \ - ldr RT3, [CTXs2, RT3]; \ - \ - and RT1, RMASK, l1, lsr#(24 - 2); \ - eor RT0, RT2; \ - and RT2, RMASK, l1, lsr#(16 - 2); \ - add RT0, RT3; \ - add RT2, #(s1 - s0); \ - and RT3, RMASK, l1, lsr#(8 - 2); \ - eor r0, RT0; \ - \ - ldr RT1, [CTXs0, RT1]; \ - and RT0, RMASK, l1, lsl#2; \ - ldr RT2, [CTXs0, RT2]; \ - add RT0, #(s3 - s2); \ - ldr RT3, [CTXs2, RT3]; \ - add RT1, RT2; \ - ldr RT0, [CTXs2, RT0]; \ - \ - and RT2, RMASK, r0, lsr#(24 - 2); \ - eor RT1, RT3; \ - and RT3, RMASK, r0, lsr#(16 - 2); \ - add RT1, RT0; \ - add RT3, #(s1 - s0); \ - and RT0, RMASK, r0, lsr#(8 - 2); \ - eor r1, RT1; \ - \ - ldr RT2, [CTXs0, RT2]; \ - and RT1, RMASK, r0, lsl#2; \ - ldr RT3, [CTXs0, RT3]; \ - add RT1, #(s3 - s2); \ - ldr RT0, [CTXs2, RT0]; \ - add RT2, RT3; \ - ldr RT1, [CTXs2, RT1]; \ - \ - and RT3, RMASK, r1, lsr#(24 - 2); \ - eor RT2, RT0; \ - and RT0, RMASK, r1, lsr#(16 - 2); \ - add RT2, RT1; \ - add RT0, #(s1 - s0); \ - and RT1, RMASK, r1, lsr#(8 - 2); \ - eor l0, RT2; \ - \ - ldr RT3, [CTXs0, RT3]; \ - and RT2, RMASK, r1, lsl#2; \ - ldr RT0, [CTXs0, RT0]; \ - add RT2, #(s3 - s2); \ - ldr RT1, [CTXs2, RT1]; \ - eor l1, RKEYL; \ - ldr RT2, [CTXs2, RT2]; \ - \ - eor r0, RKEYR; \ - add RT3, RT0; \ - eor r1, RKEYR; \ - eor RT3, RT1; \ - eor l0, RKEYL; \ - add RT3, RT2; \ - set_nextk(RKEYL, (p - s2) + (4 * (n) + ((dec) * 4))); \ - eor l1, RT3; \ - set_nextk(RKEYR, (p - s2) + (4 * (n) + (!(dec) * 4))); - -#define load_n_add_roundkey_enc2(n) \ - load_roundkey_enc(n); \ - eor RL0, RKEYL; \ - eor RR0, RKEYR; \ - eor RL1, RKEYL; \ - eor RR1, RKEYR; \ - load_roundkey_enc((n) + 2); - -#define next_key(reg, offs) \ - ldr reg, [CTXs2, #(offs)]; - -#define dummy(x, y) /* do nothing */ - -#define round_enc2(n, load_next_key) \ - F2((n) + 2, RL0, RR0, RL1, RR1, load_next_key, 0); - -#define load_n_add_roundkey_dec2(n) \ - load_roundkey_dec(n); \ - eor RL0, RKEYL; \ - eor RR0, RKEYR; \ - eor RL1, RKEYL; \ - eor RR1, RKEYR; \ - load_roundkey_dec((n) - 2); - -#define round_dec2(n, load_next_key) \ - F2((n) - 3, RL0, RR0, RL1, RR1, load_next_key, 1); - -#define read_block2_aligned(rin, l0, r0, l1, r1, convert, rtmp) \ - ldr l0, [rin, #(0)]; \ - ldr r0, [rin, #(4)]; \ - convert(l0, rtmp); \ - ldr l1, [rin, #(8)]; \ - convert(r0, rtmp); \ - ldr r1, [rin, #(12)]; \ - convert(l1, rtmp); \ - convert(r1, rtmp); - -#define write_block2_aligned(rout, l0, r0, l1, r1, convert, rtmp) \ - convert(l0, rtmp); \ - convert(r0, rtmp); \ - convert(l1, rtmp); \ - str l0, [rout, #(0)]; \ - convert(r1, rtmp); \ - str r0, [rout, #(4)]; \ - str l1, [rout, #(8)]; \ - str r1, [rout, #(12)]; - -#ifdef __ARM_FEATURE_UNALIGNED - /* unaligned word reads allowed */ - #define read_block2(rin, l0, r0, l1, r1, rtmp0) \ - read_block2_aligned(rin, l0, r0, l1, r1, host_to_be, rtmp0) - - #define write_block2(rout, l0, r0, l1, r1, rtmp0, rtmp1) \ - write_block2_aligned(rout, l0, r0, l1, r1, be_to_host, rtmp0) - - #define read_block2_host(rin, l0, r0, l1, r1, rtmp0) \ - read_block2_aligned(rin, l0, r0, l1, r1, host_to_host, rtmp0) - - #define write_block2_host(rout, l0, r0, l1, r1, rtmp0, rtmp1) \ - write_block2_aligned(rout, l0, r0, l1, r1, host_to_host, rtmp0) -#else - /* need to handle unaligned reads by byte reads */ - #define read_block2(rin, l0, r0, l1, r1, rtmp0) \ - tst rin, #3; \ - beq 1f; \ - ldr_unaligned_be(l0, rin, 0, rtmp0); \ - ldr_unaligned_be(r0, rin, 4, rtmp0); \ - ldr_unaligned_be(l1, rin, 8, rtmp0); \ - ldr_unaligned_be(r1, rin, 12, rtmp0); \ - b 2f; \ - 1:;\ - read_block2_aligned(rin, l0, r0, l1, r1, host_to_be, rtmp0); \ - 2:; - - #define write_block2(rout, l0, r0, l1, r1, rtmp0, rtmp1) \ - tst rout, #3; \ - beq 1f; \ - str_unaligned_be(l0, rout, 0, rtmp0, rtmp1); \ - str_unaligned_be(r0, rout, 4, rtmp0, rtmp1); \ - str_unaligned_be(l1, rout, 8, rtmp0, rtmp1); \ - str_unaligned_be(r1, rout, 12, rtmp0, rtmp1); \ - b 2f; \ - 1:;\ - write_block2_aligned(rout, l0, r0, l1, r1, be_to_host, rtmp0); \ - 2:; - - #define read_block2_host(rin, l0, r0, l1, r1, rtmp0) \ - tst rin, #3; \ - beq 1f; \ - ldr_unaligned_host(l0, rin, 0, rtmp0); \ - ldr_unaligned_host(r0, rin, 4, rtmp0); \ - ldr_unaligned_host(l1, rin, 8, rtmp0); \ - ldr_unaligned_host(r1, rin, 12, rtmp0); \ - b 2f; \ - 1:;\ - read_block2_aligned(rin, l0, r0, l1, r1, host_to_host, rtmp0); \ - 2:; - - #define write_block2_host(rout, l0, r0, l1, r1, rtmp0, rtmp1) \ - tst rout, #3; \ - beq 1f; \ - str_unaligned_host(l0, rout, 0, rtmp0, rtmp1); \ - str_unaligned_host(r0, rout, 4, rtmp0, rtmp1); \ - str_unaligned_host(l1, rout, 8, rtmp0, rtmp1); \ - str_unaligned_host(r1, rout, 12, rtmp0, rtmp1); \ - b 2f; \ - 1:;\ - write_block2_aligned(rout, l0, r0, l1, r1, host_to_host, rtmp0); \ - 2:; -#endif - -.align 3 -.type _gcry_blowfish_arm_enc_blk2,%function; - -_gcry_blowfish_arm_enc_blk2: - /* input: - * preloaded: CTX - * [RL0, RR0], [RL1, RR1]: src - * output: - * [RR0, RL0], [RR1, RL1]: dst - */ - push {RT0,%lr}; - - add CTXs2, CTXs0, #(s2 - s0); - mov RMASK, #(0xff << 2); /* byte mask */ - - load_n_add_roundkey_enc2(0); - round_enc2(2, next_key); - round_enc2(4, next_key); - round_enc2(6, next_key); - round_enc2(8, next_key); - round_enc2(10, next_key); - round_enc2(12, next_key); - round_enc2(14, next_key); - round_enc2(16, dummy); - - host_to_be(RR0, RT0); - host_to_be(RL0, RT0); - host_to_be(RR1, RT0); - host_to_be(RL1, RT0); - - pop {RT0,%pc}; -.size _gcry_blowfish_arm_enc_blk2,.-_gcry_blowfish_arm_enc_blk2; - -.align 3 -.globl _gcry_blowfish_arm_cfb_dec; -.type _gcry_blowfish_arm_cfb_dec,%function; - -_gcry_blowfish_arm_cfb_dec: - /* input: - * %r0: CTX - * %r1: dst (2 blocks) - * %r2: src (2 blocks) - * %r3: iv (64bit) - */ - push {%r2, %r4-%r11, %ip, %lr}; - - mov %lr, %r3; - - /* Load input (iv/%r3 is aligned, src/%r2 might not be) */ - ldm %r3, {RL0, RR0}; - host_to_be(RL0, RT0); - host_to_be(RR0, RT0); - read_block(%r2, 0, RL1, RR1, RT0); - - /* Update IV, load src[1] and save to iv[0] */ - read_block_host(%r2, 8, %r5, %r6, RT0); - stm %lr, {%r5, %r6}; - - bl _gcry_blowfish_arm_enc_blk2; - /* result in RR0:RL0, RR1:RL1 = %r4:%r3, %r10:%r9 */ - - /* %r1: dst, %r0: %src */ - pop {%r0}; - - /* dst = src ^ result */ - read_block2_host(%r0, %r5, %r6, %r7, %r8, %lr); - eor %r5, %r4; - eor %r6, %r3; - eor %r7, %r10; - eor %r8, %r9; - write_block2_host(%r1, %r5, %r6, %r7, %r8, %r9, %r10); - - pop {%r4-%r11, %ip, %pc}; -.ltorg -.size _gcry_blowfish_arm_cfb_dec,.-_gcry_blowfish_arm_cfb_dec; - -.align 3 -.globl _gcry_blowfish_arm_ctr_enc; -.type _gcry_blowfish_arm_ctr_enc,%function; - -_gcry_blowfish_arm_ctr_enc: - /* input: - * %r0: CTX - * %r1: dst (2 blocks) - * %r2: src (2 blocks) - * %r3: iv (64bit, big-endian) - */ - push {%r2, %r4-%r11, %ip, %lr}; - - mov %lr, %r3; - - /* Load IV (big => host endian) */ - read_block_aligned(%lr, 0, RL0, RR0, be_to_host, RT0); - - /* Construct IVs */ - adds RR1, RR0, #1; /* +1 */ - adc RL1, RL0, #0; - adds %r6, RR1, #1; /* +2 */ - adc %r5, RL1, #0; - - /* Store new IV (host => big-endian) */ - write_block_aligned(%lr, 0, %r5, %r6, host_to_be, RT0); - - bl _gcry_blowfish_arm_enc_blk2; - /* result in RR0:RL0, RR1:RL1 = %r4:%r3, %r10:%r9 */ - - /* %r1: dst, %r0: %src */ - pop {%r0}; - - /* XOR key-stream with plaintext */ - read_block2_host(%r0, %r5, %r6, %r7, %r8, %lr); - eor %r5, %r4; - eor %r6, %r3; - eor %r7, %r10; - eor %r8, %r9; - write_block2_host(%r1, %r5, %r6, %r7, %r8, %r9, %r10); - - pop {%r4-%r11, %ip, %pc}; -.ltorg -.size _gcry_blowfish_arm_ctr_enc,.-_gcry_blowfish_arm_ctr_enc; - -.align 3 -.type _gcry_blowfish_arm_dec_blk2,%function; - -_gcry_blowfish_arm_dec_blk2: - /* input: - * preloaded: CTX - * [RL0, RR0], [RL1, RR1]: src - * output: - * [RR0, RL0], [RR1, RL1]: dst - */ - add CTXs2, CTXs0, #(s2 - s0); - mov RMASK, #(0xff << 2); /* byte mask */ - - load_n_add_roundkey_dec2(17); - round_dec2(15, next_key); - round_dec2(13, next_key); - round_dec2(11, next_key); - round_dec2(9, next_key); - round_dec2(7, next_key); - round_dec2(5, next_key); - round_dec2(3, next_key); - round_dec2(1, dummy); - - host_to_be(RR0, RT0); - host_to_be(RL0, RT0); - host_to_be(RR1, RT0); - host_to_be(RL1, RT0); - - b .Ldec_cbc_tail; -.ltorg -.size _gcry_blowfish_arm_dec_blk2,.-_gcry_blowfish_arm_dec_blk2; - -.align 3 -.globl _gcry_blowfish_arm_cbc_dec; -.type _gcry_blowfish_arm_cbc_dec,%function; - -_gcry_blowfish_arm_cbc_dec: - /* input: - * %r0: CTX - * %r1: dst (2 blocks) - * %r2: src (2 blocks) - * %r3: iv (64bit) - */ - push {%r2-%r11, %ip, %lr}; - - read_block2(%r2, RL0, RR0, RL1, RR1, RT0); - - /* dec_blk2 is only used by cbc_dec, jump directly in/out instead - * of function call. */ - b _gcry_blowfish_arm_dec_blk2; -.Ldec_cbc_tail: - /* result in RR0:RL0, RR1:RL1 = %r4:%r3, %r10:%r9 */ - - /* %r0: %src, %r1: dst, %r2: iv */ - pop {%r0, %r2}; - - /* load IV+1 (src[0]) to %r7:%r8. Might be unaligned. */ - read_block_host(%r0, 0, %r7, %r8, %r5); - /* load IV (iv[0]) to %r5:%r6. 'iv' is aligned. */ - ldm %r2, {%r5, %r6}; - - /* out[1] ^= IV+1 */ - eor %r10, %r7; - eor %r9, %r8; - /* out[0] ^= IV */ - eor %r4, %r5; - eor %r3, %r6; - - /* load IV+2 (src[1]) to %r7:%r8. Might be unaligned. */ - read_block_host(%r0, 8, %r7, %r8, %r5); - /* store IV+2 to iv[0] (aligned). */ - stm %r2, {%r7, %r8}; - - /* store result to dst[0-3]. Might be unaligned. */ - write_block2_host(%r1, %r4, %r3, %r10, %r9, %r5, %r6); - - pop {%r4-%r11, %ip, %pc}; -.ltorg -.size _gcry_blowfish_arm_cbc_dec,.-_gcry_blowfish_arm_cbc_dec; - -#endif /*HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS*/ -#endif /*__ARM_ARCH >= 6*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/blowfish.c b/src/hos_libhttpserver/src/libgcrypt/cipher/blowfish.c deleted file mode 100644 index ae470d8b..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/blowfish.c +++ /dev/null @@ -1,1046 +0,0 @@ -/* blowfish.c - Blowfish encryption - * Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * For a description of the algorithm, see: - * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. - * ISBN 0-471-11709-9. Pages 336 ff. - */ - -/* Test values: - * key "abcdefghijklmnopqrstuvwxyz"; - * plain "BLOWFISH" - * cipher 32 4E D0 FE F4 13 A2 03 - * - */ - -#include -#include -#include -#include -#include "types.h" -#include "g10lib.h" -#include "cipher.h" -#include "bufhelp.h" -#include "cipher-selftest.h" - -#define BLOWFISH_BLOCKSIZE 8 -#define BLOWFISH_ROUNDS 16 - - -/* USE_AMD64_ASM indicates whether to use AMD64 assembly code. */ -#undef USE_AMD64_ASM -#if defined(__x86_64__) && defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) && \ - (BLOWFISH_ROUNDS == 16) -# define USE_AMD64_ASM 1 -#endif - -/* USE_ARM_ASM indicates whether to use ARM assembly code. */ -#undef USE_ARM_ASM -#if defined(__ARMEL__) -# if (BLOWFISH_ROUNDS == 16) && defined(HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS) -# define USE_ARM_ASM 1 -# endif -#endif - -typedef struct { - u32 s0[256]; - u32 s1[256]; - u32 s2[256]; - u32 s3[256]; - u32 p[BLOWFISH_ROUNDS+2]; -} BLOWFISH_context; - -static gcry_err_code_t bf_setkey (void *c, const byte *key, unsigned keylen); -static unsigned int encrypt_block (void *bc, byte *outbuf, const byte *inbuf); -static unsigned int decrypt_block (void *bc, byte *outbuf, const byte *inbuf); - - -/* precomputed S boxes */ -static const u32 ks0[256] = { - 0xD1310BA6,0x98DFB5AC,0x2FFD72DB,0xD01ADFB7,0xB8E1AFED,0x6A267E96, - 0xBA7C9045,0xF12C7F99,0x24A19947,0xB3916CF7,0x0801F2E2,0x858EFC16, - 0x636920D8,0x71574E69,0xA458FEA3,0xF4933D7E,0x0D95748F,0x728EB658, - 0x718BCD58,0x82154AEE,0x7B54A41D,0xC25A59B5,0x9C30D539,0x2AF26013, - 0xC5D1B023,0x286085F0,0xCA417918,0xB8DB38EF,0x8E79DCB0,0x603A180E, - 0x6C9E0E8B,0xB01E8A3E,0xD71577C1,0xBD314B27,0x78AF2FDA,0x55605C60, - 0xE65525F3,0xAA55AB94,0x57489862,0x63E81440,0x55CA396A,0x2AAB10B6, - 0xB4CC5C34,0x1141E8CE,0xA15486AF,0x7C72E993,0xB3EE1411,0x636FBC2A, - 0x2BA9C55D,0x741831F6,0xCE5C3E16,0x9B87931E,0xAFD6BA33,0x6C24CF5C, - 0x7A325381,0x28958677,0x3B8F4898,0x6B4BB9AF,0xC4BFE81B,0x66282193, - 0x61D809CC,0xFB21A991,0x487CAC60,0x5DEC8032,0xEF845D5D,0xE98575B1, - 0xDC262302,0xEB651B88,0x23893E81,0xD396ACC5,0x0F6D6FF3,0x83F44239, - 0x2E0B4482,0xA4842004,0x69C8F04A,0x9E1F9B5E,0x21C66842,0xF6E96C9A, - 0x670C9C61,0xABD388F0,0x6A51A0D2,0xD8542F68,0x960FA728,0xAB5133A3, - 0x6EEF0B6C,0x137A3BE4,0xBA3BF050,0x7EFB2A98,0xA1F1651D,0x39AF0176, - 0x66CA593E,0x82430E88,0x8CEE8619,0x456F9FB4,0x7D84A5C3,0x3B8B5EBE, - 0xE06F75D8,0x85C12073,0x401A449F,0x56C16AA6,0x4ED3AA62,0x363F7706, - 0x1BFEDF72,0x429B023D,0x37D0D724,0xD00A1248,0xDB0FEAD3,0x49F1C09B, - 0x075372C9,0x80991B7B,0x25D479D8,0xF6E8DEF7,0xE3FE501A,0xB6794C3B, - 0x976CE0BD,0x04C006BA,0xC1A94FB6,0x409F60C4,0x5E5C9EC2,0x196A2463, - 0x68FB6FAF,0x3E6C53B5,0x1339B2EB,0x3B52EC6F,0x6DFC511F,0x9B30952C, - 0xCC814544,0xAF5EBD09,0xBEE3D004,0xDE334AFD,0x660F2807,0x192E4BB3, - 0xC0CBA857,0x45C8740F,0xD20B5F39,0xB9D3FBDB,0x5579C0BD,0x1A60320A, - 0xD6A100C6,0x402C7279,0x679F25FE,0xFB1FA3CC,0x8EA5E9F8,0xDB3222F8, - 0x3C7516DF,0xFD616B15,0x2F501EC8,0xAD0552AB,0x323DB5FA,0xFD238760, - 0x53317B48,0x3E00DF82,0x9E5C57BB,0xCA6F8CA0,0x1A87562E,0xDF1769DB, - 0xD542A8F6,0x287EFFC3,0xAC6732C6,0x8C4F5573,0x695B27B0,0xBBCA58C8, - 0xE1FFA35D,0xB8F011A0,0x10FA3D98,0xFD2183B8,0x4AFCB56C,0x2DD1D35B, - 0x9A53E479,0xB6F84565,0xD28E49BC,0x4BFB9790,0xE1DDF2DA,0xA4CB7E33, - 0x62FB1341,0xCEE4C6E8,0xEF20CADA,0x36774C01,0xD07E9EFE,0x2BF11FB4, - 0x95DBDA4D,0xAE909198,0xEAAD8E71,0x6B93D5A0,0xD08ED1D0,0xAFC725E0, - 0x8E3C5B2F,0x8E7594B7,0x8FF6E2FB,0xF2122B64,0x8888B812,0x900DF01C, - 0x4FAD5EA0,0x688FC31C,0xD1CFF191,0xB3A8C1AD,0x2F2F2218,0xBE0E1777, - 0xEA752DFE,0x8B021FA1,0xE5A0CC0F,0xB56F74E8,0x18ACF3D6,0xCE89E299, - 0xB4A84FE0,0xFD13E0B7,0x7CC43B81,0xD2ADA8D9,0x165FA266,0x80957705, - 0x93CC7314,0x211A1477,0xE6AD2065,0x77B5FA86,0xC75442F5,0xFB9D35CF, - 0xEBCDAF0C,0x7B3E89A0,0xD6411BD3,0xAE1E7E49,0x00250E2D,0x2071B35E, - 0x226800BB,0x57B8E0AF,0x2464369B,0xF009B91E,0x5563911D,0x59DFA6AA, - 0x78C14389,0xD95A537F,0x207D5BA2,0x02E5B9C5,0x83260376,0x6295CFA9, - 0x11C81968,0x4E734A41,0xB3472DCA,0x7B14A94A,0x1B510052,0x9A532915, - 0xD60F573F,0xBC9BC6E4,0x2B60A476,0x81E67400,0x08BA6FB5,0x571BE91F, - 0xF296EC6B,0x2A0DD915,0xB6636521,0xE7B9F9B6,0xFF34052E,0xC5855664, - 0x53B02D5D,0xA99F8FA1,0x08BA4799,0x6E85076A }; - -static const u32 ks1[256] = { - 0x4B7A70E9,0xB5B32944,0xDB75092E,0xC4192623,0xAD6EA6B0,0x49A7DF7D, - 0x9CEE60B8,0x8FEDB266,0xECAA8C71,0x699A17FF,0x5664526C,0xC2B19EE1, - 0x193602A5,0x75094C29,0xA0591340,0xE4183A3E,0x3F54989A,0x5B429D65, - 0x6B8FE4D6,0x99F73FD6,0xA1D29C07,0xEFE830F5,0x4D2D38E6,0xF0255DC1, - 0x4CDD2086,0x8470EB26,0x6382E9C6,0x021ECC5E,0x09686B3F,0x3EBAEFC9, - 0x3C971814,0x6B6A70A1,0x687F3584,0x52A0E286,0xB79C5305,0xAA500737, - 0x3E07841C,0x7FDEAE5C,0x8E7D44EC,0x5716F2B8,0xB03ADA37,0xF0500C0D, - 0xF01C1F04,0x0200B3FF,0xAE0CF51A,0x3CB574B2,0x25837A58,0xDC0921BD, - 0xD19113F9,0x7CA92FF6,0x94324773,0x22F54701,0x3AE5E581,0x37C2DADC, - 0xC8B57634,0x9AF3DDA7,0xA9446146,0x0FD0030E,0xECC8C73E,0xA4751E41, - 0xE238CD99,0x3BEA0E2F,0x3280BBA1,0x183EB331,0x4E548B38,0x4F6DB908, - 0x6F420D03,0xF60A04BF,0x2CB81290,0x24977C79,0x5679B072,0xBCAF89AF, - 0xDE9A771F,0xD9930810,0xB38BAE12,0xDCCF3F2E,0x5512721F,0x2E6B7124, - 0x501ADDE6,0x9F84CD87,0x7A584718,0x7408DA17,0xBC9F9ABC,0xE94B7D8C, - 0xEC7AEC3A,0xDB851DFA,0x63094366,0xC464C3D2,0xEF1C1847,0x3215D908, - 0xDD433B37,0x24C2BA16,0x12A14D43,0x2A65C451,0x50940002,0x133AE4DD, - 0x71DFF89E,0x10314E55,0x81AC77D6,0x5F11199B,0x043556F1,0xD7A3C76B, - 0x3C11183B,0x5924A509,0xF28FE6ED,0x97F1FBFA,0x9EBABF2C,0x1E153C6E, - 0x86E34570,0xEAE96FB1,0x860E5E0A,0x5A3E2AB3,0x771FE71C,0x4E3D06FA, - 0x2965DCB9,0x99E71D0F,0x803E89D6,0x5266C825,0x2E4CC978,0x9C10B36A, - 0xC6150EBA,0x94E2EA78,0xA5FC3C53,0x1E0A2DF4,0xF2F74EA7,0x361D2B3D, - 0x1939260F,0x19C27960,0x5223A708,0xF71312B6,0xEBADFE6E,0xEAC31F66, - 0xE3BC4595,0xA67BC883,0xB17F37D1,0x018CFF28,0xC332DDEF,0xBE6C5AA5, - 0x65582185,0x68AB9802,0xEECEA50F,0xDB2F953B,0x2AEF7DAD,0x5B6E2F84, - 0x1521B628,0x29076170,0xECDD4775,0x619F1510,0x13CCA830,0xEB61BD96, - 0x0334FE1E,0xAA0363CF,0xB5735C90,0x4C70A239,0xD59E9E0B,0xCBAADE14, - 0xEECC86BC,0x60622CA7,0x9CAB5CAB,0xB2F3846E,0x648B1EAF,0x19BDF0CA, - 0xA02369B9,0x655ABB50,0x40685A32,0x3C2AB4B3,0x319EE9D5,0xC021B8F7, - 0x9B540B19,0x875FA099,0x95F7997E,0x623D7DA8,0xF837889A,0x97E32D77, - 0x11ED935F,0x16681281,0x0E358829,0xC7E61FD6,0x96DEDFA1,0x7858BA99, - 0x57F584A5,0x1B227263,0x9B83C3FF,0x1AC24696,0xCDB30AEB,0x532E3054, - 0x8FD948E4,0x6DBC3128,0x58EBF2EF,0x34C6FFEA,0xFE28ED61,0xEE7C3C73, - 0x5D4A14D9,0xE864B7E3,0x42105D14,0x203E13E0,0x45EEE2B6,0xA3AAABEA, - 0xDB6C4F15,0xFACB4FD0,0xC742F442,0xEF6ABBB5,0x654F3B1D,0x41CD2105, - 0xD81E799E,0x86854DC7,0xE44B476A,0x3D816250,0xCF62A1F2,0x5B8D2646, - 0xFC8883A0,0xC1C7B6A3,0x7F1524C3,0x69CB7492,0x47848A0B,0x5692B285, - 0x095BBF00,0xAD19489D,0x1462B174,0x23820E00,0x58428D2A,0x0C55F5EA, - 0x1DADF43E,0x233F7061,0x3372F092,0x8D937E41,0xD65FECF1,0x6C223BDB, - 0x7CDE3759,0xCBEE7460,0x4085F2A7,0xCE77326E,0xA6078084,0x19F8509E, - 0xE8EFD855,0x61D99735,0xA969A7AA,0xC50C06C2,0x5A04ABFC,0x800BCADC, - 0x9E447A2E,0xC3453484,0xFDD56705,0x0E1E9EC9,0xDB73DBD3,0x105588CD, - 0x675FDA79,0xE3674340,0xC5C43465,0x713E38D8,0x3D28F89E,0xF16DFF20, - 0x153E21E7,0x8FB03D4A,0xE6E39F2B,0xDB83ADF7 }; - -static const u32 ks2[256] = { - 0xE93D5A68,0x948140F7,0xF64C261C,0x94692934,0x411520F7,0x7602D4F7, - 0xBCF46B2E,0xD4A20068,0xD4082471,0x3320F46A,0x43B7D4B7,0x500061AF, - 0x1E39F62E,0x97244546,0x14214F74,0xBF8B8840,0x4D95FC1D,0x96B591AF, - 0x70F4DDD3,0x66A02F45,0xBFBC09EC,0x03BD9785,0x7FAC6DD0,0x31CB8504, - 0x96EB27B3,0x55FD3941,0xDA2547E6,0xABCA0A9A,0x28507825,0x530429F4, - 0x0A2C86DA,0xE9B66DFB,0x68DC1462,0xD7486900,0x680EC0A4,0x27A18DEE, - 0x4F3FFEA2,0xE887AD8C,0xB58CE006,0x7AF4D6B6,0xAACE1E7C,0xD3375FEC, - 0xCE78A399,0x406B2A42,0x20FE9E35,0xD9F385B9,0xEE39D7AB,0x3B124E8B, - 0x1DC9FAF7,0x4B6D1856,0x26A36631,0xEAE397B2,0x3A6EFA74,0xDD5B4332, - 0x6841E7F7,0xCA7820FB,0xFB0AF54E,0xD8FEB397,0x454056AC,0xBA489527, - 0x55533A3A,0x20838D87,0xFE6BA9B7,0xD096954B,0x55A867BC,0xA1159A58, - 0xCCA92963,0x99E1DB33,0xA62A4A56,0x3F3125F9,0x5EF47E1C,0x9029317C, - 0xFDF8E802,0x04272F70,0x80BB155C,0x05282CE3,0x95C11548,0xE4C66D22, - 0x48C1133F,0xC70F86DC,0x07F9C9EE,0x41041F0F,0x404779A4,0x5D886E17, - 0x325F51EB,0xD59BC0D1,0xF2BCC18F,0x41113564,0x257B7834,0x602A9C60, - 0xDFF8E8A3,0x1F636C1B,0x0E12B4C2,0x02E1329E,0xAF664FD1,0xCAD18115, - 0x6B2395E0,0x333E92E1,0x3B240B62,0xEEBEB922,0x85B2A20E,0xE6BA0D99, - 0xDE720C8C,0x2DA2F728,0xD0127845,0x95B794FD,0x647D0862,0xE7CCF5F0, - 0x5449A36F,0x877D48FA,0xC39DFD27,0xF33E8D1E,0x0A476341,0x992EFF74, - 0x3A6F6EAB,0xF4F8FD37,0xA812DC60,0xA1EBDDF8,0x991BE14C,0xDB6E6B0D, - 0xC67B5510,0x6D672C37,0x2765D43B,0xDCD0E804,0xF1290DC7,0xCC00FFA3, - 0xB5390F92,0x690FED0B,0x667B9FFB,0xCEDB7D9C,0xA091CF0B,0xD9155EA3, - 0xBB132F88,0x515BAD24,0x7B9479BF,0x763BD6EB,0x37392EB3,0xCC115979, - 0x8026E297,0xF42E312D,0x6842ADA7,0xC66A2B3B,0x12754CCC,0x782EF11C, - 0x6A124237,0xB79251E7,0x06A1BBE6,0x4BFB6350,0x1A6B1018,0x11CAEDFA, - 0x3D25BDD8,0xE2E1C3C9,0x44421659,0x0A121386,0xD90CEC6E,0xD5ABEA2A, - 0x64AF674E,0xDA86A85F,0xBEBFE988,0x64E4C3FE,0x9DBC8057,0xF0F7C086, - 0x60787BF8,0x6003604D,0xD1FD8346,0xF6381FB0,0x7745AE04,0xD736FCCC, - 0x83426B33,0xF01EAB71,0xB0804187,0x3C005E5F,0x77A057BE,0xBDE8AE24, - 0x55464299,0xBF582E61,0x4E58F48F,0xF2DDFDA2,0xF474EF38,0x8789BDC2, - 0x5366F9C3,0xC8B38E74,0xB475F255,0x46FCD9B9,0x7AEB2661,0x8B1DDF84, - 0x846A0E79,0x915F95E2,0x466E598E,0x20B45770,0x8CD55591,0xC902DE4C, - 0xB90BACE1,0xBB8205D0,0x11A86248,0x7574A99E,0xB77F19B6,0xE0A9DC09, - 0x662D09A1,0xC4324633,0xE85A1F02,0x09F0BE8C,0x4A99A025,0x1D6EFE10, - 0x1AB93D1D,0x0BA5A4DF,0xA186F20F,0x2868F169,0xDCB7DA83,0x573906FE, - 0xA1E2CE9B,0x4FCD7F52,0x50115E01,0xA70683FA,0xA002B5C4,0x0DE6D027, - 0x9AF88C27,0x773F8641,0xC3604C06,0x61A806B5,0xF0177A28,0xC0F586E0, - 0x006058AA,0x30DC7D62,0x11E69ED7,0x2338EA63,0x53C2DD94,0xC2C21634, - 0xBBCBEE56,0x90BCB6DE,0xEBFC7DA1,0xCE591D76,0x6F05E409,0x4B7C0188, - 0x39720A3D,0x7C927C24,0x86E3725F,0x724D9DB9,0x1AC15BB4,0xD39EB8FC, - 0xED545578,0x08FCA5B5,0xD83D7CD3,0x4DAD0FC4,0x1E50EF5E,0xB161E6F8, - 0xA28514D9,0x6C51133C,0x6FD5C7E7,0x56E14EC4,0x362ABFCE,0xDDC6C837, - 0xD79A3234,0x92638212,0x670EFA8E,0x406000E0 }; - -static const u32 ks3[256] = { - 0x3A39CE37,0xD3FAF5CF,0xABC27737,0x5AC52D1B,0x5CB0679E,0x4FA33742, - 0xD3822740,0x99BC9BBE,0xD5118E9D,0xBF0F7315,0xD62D1C7E,0xC700C47B, - 0xB78C1B6B,0x21A19045,0xB26EB1BE,0x6A366EB4,0x5748AB2F,0xBC946E79, - 0xC6A376D2,0x6549C2C8,0x530FF8EE,0x468DDE7D,0xD5730A1D,0x4CD04DC6, - 0x2939BBDB,0xA9BA4650,0xAC9526E8,0xBE5EE304,0xA1FAD5F0,0x6A2D519A, - 0x63EF8CE2,0x9A86EE22,0xC089C2B8,0x43242EF6,0xA51E03AA,0x9CF2D0A4, - 0x83C061BA,0x9BE96A4D,0x8FE51550,0xBA645BD6,0x2826A2F9,0xA73A3AE1, - 0x4BA99586,0xEF5562E9,0xC72FEFD3,0xF752F7DA,0x3F046F69,0x77FA0A59, - 0x80E4A915,0x87B08601,0x9B09E6AD,0x3B3EE593,0xE990FD5A,0x9E34D797, - 0x2CF0B7D9,0x022B8B51,0x96D5AC3A,0x017DA67D,0xD1CF3ED6,0x7C7D2D28, - 0x1F9F25CF,0xADF2B89B,0x5AD6B472,0x5A88F54C,0xE029AC71,0xE019A5E6, - 0x47B0ACFD,0xED93FA9B,0xE8D3C48D,0x283B57CC,0xF8D56629,0x79132E28, - 0x785F0191,0xED756055,0xF7960E44,0xE3D35E8C,0x15056DD4,0x88F46DBA, - 0x03A16125,0x0564F0BD,0xC3EB9E15,0x3C9057A2,0x97271AEC,0xA93A072A, - 0x1B3F6D9B,0x1E6321F5,0xF59C66FB,0x26DCF319,0x7533D928,0xB155FDF5, - 0x03563482,0x8ABA3CBB,0x28517711,0xC20AD9F8,0xABCC5167,0xCCAD925F, - 0x4DE81751,0x3830DC8E,0x379D5862,0x9320F991,0xEA7A90C2,0xFB3E7BCE, - 0x5121CE64,0x774FBE32,0xA8B6E37E,0xC3293D46,0x48DE5369,0x6413E680, - 0xA2AE0810,0xDD6DB224,0x69852DFD,0x09072166,0xB39A460A,0x6445C0DD, - 0x586CDECF,0x1C20C8AE,0x5BBEF7DD,0x1B588D40,0xCCD2017F,0x6BB4E3BB, - 0xDDA26A7E,0x3A59FF45,0x3E350A44,0xBCB4CDD5,0x72EACEA8,0xFA6484BB, - 0x8D6612AE,0xBF3C6F47,0xD29BE463,0x542F5D9E,0xAEC2771B,0xF64E6370, - 0x740E0D8D,0xE75B1357,0xF8721671,0xAF537D5D,0x4040CB08,0x4EB4E2CC, - 0x34D2466A,0x0115AF84,0xE1B00428,0x95983A1D,0x06B89FB4,0xCE6EA048, - 0x6F3F3B82,0x3520AB82,0x011A1D4B,0x277227F8,0x611560B1,0xE7933FDC, - 0xBB3A792B,0x344525BD,0xA08839E1,0x51CE794B,0x2F32C9B7,0xA01FBAC9, - 0xE01CC87E,0xBCC7D1F6,0xCF0111C3,0xA1E8AAC7,0x1A908749,0xD44FBD9A, - 0xD0DADECB,0xD50ADA38,0x0339C32A,0xC6913667,0x8DF9317C,0xE0B12B4F, - 0xF79E59B7,0x43F5BB3A,0xF2D519FF,0x27D9459C,0xBF97222C,0x15E6FC2A, - 0x0F91FC71,0x9B941525,0xFAE59361,0xCEB69CEB,0xC2A86459,0x12BAA8D1, - 0xB6C1075E,0xE3056A0C,0x10D25065,0xCB03A442,0xE0EC6E0E,0x1698DB3B, - 0x4C98A0BE,0x3278E964,0x9F1F9532,0xE0D392DF,0xD3A0342B,0x8971F21E, - 0x1B0A7441,0x4BA3348C,0xC5BE7120,0xC37632D8,0xDF359F8D,0x9B992F2E, - 0xE60B6F47,0x0FE3F11D,0xE54CDA54,0x1EDAD891,0xCE6279CF,0xCD3E7E6F, - 0x1618B166,0xFD2C1D05,0x848FD2C5,0xF6FB2299,0xF523F357,0xA6327623, - 0x93A83531,0x56CCCD02,0xACF08162,0x5A75EBB5,0x6E163697,0x88D273CC, - 0xDE966292,0x81B949D0,0x4C50901B,0x71C65614,0xE6C6C7BD,0x327A140A, - 0x45E1D006,0xC3F27B9A,0xC9AA53FD,0x62A80F00,0xBB25BFE2,0x35BDD2F6, - 0x71126905,0xB2040222,0xB6CBCF7C,0xCD769C2B,0x53113EC0,0x1640E3D3, - 0x38ABBD60,0x2547ADF0,0xBA38209C,0xF746CE76,0x77AFA1C5,0x20756060, - 0x85CBFE4E,0x8AE88DD8,0x7AAAF9B0,0x4CF9AA7E,0x1948C25C,0x02FB8A8C, - 0x01C36AE4,0xD6EBE1F9,0x90D4F869,0xA65CDEA0,0x3F09252D,0xC208E69F, - 0xB74E6132,0xCE77E25B,0x578FDFE3,0x3AC372E6 }; - -static const u32 ps[BLOWFISH_ROUNDS+2] = { - 0x243F6A88,0x85A308D3,0x13198A2E,0x03707344,0xA4093822,0x299F31D0, - 0x082EFA98,0xEC4E6C89,0x452821E6,0x38D01377,0xBE5466CF,0x34E90C6C, - 0xC0AC29B7,0xC97C50DD,0x3F84D5B5,0xB5470917,0x9216D5D9,0x8979FB1B }; - - -#ifdef USE_AMD64_ASM - -/* Assembly implementations of Blowfish. */ -extern void _gcry_blowfish_amd64_do_encrypt(BLOWFISH_context *c, u32 *ret_xl, - u32 *ret_xr); - -extern void _gcry_blowfish_amd64_encrypt_block(BLOWFISH_context *c, byte *out, - const byte *in); - -extern void _gcry_blowfish_amd64_decrypt_block(BLOWFISH_context *c, byte *out, - const byte *in); - -/* These assembly implementations process four blocks in parallel. */ -extern void _gcry_blowfish_amd64_ctr_enc(BLOWFISH_context *ctx, byte *out, - const byte *in, byte *ctr); - -extern void _gcry_blowfish_amd64_cbc_dec(BLOWFISH_context *ctx, byte *out, - const byte *in, byte *iv); - -extern void _gcry_blowfish_amd64_cfb_dec(BLOWFISH_context *ctx, byte *out, - const byte *in, byte *iv); - -static void -do_encrypt ( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) -{ - _gcry_blowfish_amd64_do_encrypt (bc, ret_xl, ret_xr); -} - -static void -do_encrypt_block (BLOWFISH_context *context, byte *outbuf, const byte *inbuf) -{ - _gcry_blowfish_amd64_encrypt_block (context, outbuf, inbuf); -} - -static void -do_decrypt_block (BLOWFISH_context *context, byte *outbuf, const byte *inbuf) -{ - _gcry_blowfish_amd64_decrypt_block (context, outbuf, inbuf); -} - -static unsigned int -encrypt_block (void *context , byte *outbuf, const byte *inbuf) -{ - BLOWFISH_context *c = (BLOWFISH_context *) context; - do_encrypt_block (c, outbuf, inbuf); - return /*burn_stack*/ (2*8); -} - -static unsigned int -decrypt_block (void *context, byte *outbuf, const byte *inbuf) -{ - BLOWFISH_context *c = (BLOWFISH_context *) context; - do_decrypt_block (c, outbuf, inbuf); - return /*burn_stack*/ (2*8); -} - -#elif defined(USE_ARM_ASM) - -/* Assembly implementations of Blowfish. */ -extern void _gcry_blowfish_arm_do_encrypt(BLOWFISH_context *c, u32 *ret_xl, - u32 *ret_xr); - -extern void _gcry_blowfish_arm_encrypt_block(BLOWFISH_context *c, byte *out, - const byte *in); - -extern void _gcry_blowfish_arm_decrypt_block(BLOWFISH_context *c, byte *out, - const byte *in); - -/* These assembly implementations process two blocks in parallel. */ -extern void _gcry_blowfish_arm_ctr_enc(BLOWFISH_context *ctx, byte *out, - const byte *in, byte *ctr); - -extern void _gcry_blowfish_arm_cbc_dec(BLOWFISH_context *ctx, byte *out, - const byte *in, byte *iv); - -extern void _gcry_blowfish_arm_cfb_dec(BLOWFISH_context *ctx, byte *out, - const byte *in, byte *iv); - -static void -do_encrypt ( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) -{ - _gcry_blowfish_arm_do_encrypt (bc, ret_xl, ret_xr); -} - -static void -do_encrypt_block (BLOWFISH_context *context, byte *outbuf, const byte *inbuf) -{ - _gcry_blowfish_arm_encrypt_block (context, outbuf, inbuf); -} - -static void -do_decrypt_block (BLOWFISH_context *context, byte *outbuf, const byte *inbuf) -{ - _gcry_blowfish_arm_decrypt_block (context, outbuf, inbuf); -} - -static unsigned int -encrypt_block (void *context , byte *outbuf, const byte *inbuf) -{ - BLOWFISH_context *c = (BLOWFISH_context *) context; - do_encrypt_block (c, outbuf, inbuf); - return /*burn_stack*/ (10*4); -} - -static unsigned int -decrypt_block (void *context, byte *outbuf, const byte *inbuf) -{ - BLOWFISH_context *c = (BLOWFISH_context *) context; - do_decrypt_block (c, outbuf, inbuf); - return /*burn_stack*/ (10*4); -} - -#else /*USE_ARM_ASM*/ - -#if BLOWFISH_ROUNDS != 16 -static inline u32 -function_F( BLOWFISH_context *bc, u32 x ) -{ - u16 a, b, c, d; - -#ifdef WORDS_BIGENDIAN - a = ((byte*)&x)[0]; - b = ((byte*)&x)[1]; - c = ((byte*)&x)[2]; - d = ((byte*)&x)[3]; -#else - a = ((byte*)&x)[3]; - b = ((byte*)&x)[2]; - c = ((byte*)&x)[1]; - d = ((byte*)&x)[0]; -#endif - - return ((bc->s0[a] + bc->s1[b]) ^ bc->s2[c] ) + bc->s3[d]; -} -#endif - -#ifdef WORDS_BIGENDIAN -#define F(x) ((( s0[((byte*)&x)[0]] + s1[((byte*)&x)[1]]) \ - ^ s2[((byte*)&x)[2]]) + s3[((byte*)&x)[3]] ) -#else -#define F(x) ((( s0[((byte*)&x)[3]] + s1[((byte*)&x)[2]]) \ - ^ s2[((byte*)&x)[1]]) + s3[((byte*)&x)[0]] ) -#endif -#define R(l,r,i) do { l ^= p[i]; r ^= F(l); } while(0) - - -static void -do_encrypt ( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) -{ -#if BLOWFISH_ROUNDS == 16 - u32 xl, xr, *s0, *s1, *s2, *s3, *p; - - xl = *ret_xl; - xr = *ret_xr; - p = bc->p; - s0 = bc->s0; - s1 = bc->s1; - s2 = bc->s2; - s3 = bc->s3; - - R( xl, xr, 0); - R( xr, xl, 1); - R( xl, xr, 2); - R( xr, xl, 3); - R( xl, xr, 4); - R( xr, xl, 5); - R( xl, xr, 6); - R( xr, xl, 7); - R( xl, xr, 8); - R( xr, xl, 9); - R( xl, xr, 10); - R( xr, xl, 11); - R( xl, xr, 12); - R( xr, xl, 13); - R( xl, xr, 14); - R( xr, xl, 15); - - xl ^= p[BLOWFISH_ROUNDS]; - xr ^= p[BLOWFISH_ROUNDS+1]; - - *ret_xl = xr; - *ret_xr = xl; - -#else - u32 xl, xr, temp, *p; - int i; - - xl = *ret_xl; - xr = *ret_xr; - p = bc->p; - - for(i=0; i < BLOWFISH_ROUNDS; i++ ) - { - xl ^= p[i]; - xr ^= function_F(bc, xl); - temp = xl; - xl = xr; - xr = temp; - } - temp = xl; - xl = xr; - xr = temp; - - xr ^= p[BLOWFISH_ROUNDS]; - xl ^= p[BLOWFISH_ROUNDS+1]; - - *ret_xl = xl; - *ret_xr = xr; -#endif -} - - -static void -decrypt ( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) -{ -#if BLOWFISH_ROUNDS == 16 - u32 xl, xr, *s0, *s1, *s2, *s3, *p; - - xl = *ret_xl; - xr = *ret_xr; - p = bc->p; - s0 = bc->s0; - s1 = bc->s1; - s2 = bc->s2; - s3 = bc->s3; - - R( xl, xr, 17); - R( xr, xl, 16); - R( xl, xr, 15); - R( xr, xl, 14); - R( xl, xr, 13); - R( xr, xl, 12); - R( xl, xr, 11); - R( xr, xl, 10); - R( xl, xr, 9); - R( xr, xl, 8); - R( xl, xr, 7); - R( xr, xl, 6); - R( xl, xr, 5); - R( xr, xl, 4); - R( xl, xr, 3); - R( xr, xl, 2); - - xl ^= p[1]; - xr ^= p[0]; - - *ret_xl = xr; - *ret_xr = xl; - -#else - u32 xl, xr, temp, *p; - int i; - - xl = *ret_xl; - xr = *ret_xr; - p = bc->p; - - for (i=BLOWFISH_ROUNDS+1; i > 1; i-- ) - { - xl ^= p[i]; - xr ^= function_F(bc, xl); - temp = xl; - xl = xr; - xr = temp; - } - - temp = xl; - xl = xr; - xr = temp; - - xr ^= p[1]; - xl ^= p[0]; - - *ret_xl = xl; - *ret_xr = xr; -#endif -} - -#undef F -#undef R - -static void -do_encrypt_block ( BLOWFISH_context *bc, byte *outbuf, const byte *inbuf ) -{ - u32 d1, d2; - - d1 = buf_get_be32(inbuf); - d2 = buf_get_be32(inbuf + 4); - do_encrypt( bc, &d1, &d2 ); - buf_put_be32(outbuf, d1); - buf_put_be32(outbuf + 4, d2); -} - -static unsigned int -encrypt_block (void *context, byte *outbuf, const byte *inbuf) -{ - BLOWFISH_context *bc = (BLOWFISH_context *) context; - do_encrypt_block (bc, outbuf, inbuf); - return /*burn_stack*/ (64); -} - - -static void -do_decrypt_block (BLOWFISH_context *bc, byte *outbuf, const byte *inbuf) -{ - u32 d1, d2; - - d1 = buf_get_be32(inbuf); - d2 = buf_get_be32(inbuf + 4); - decrypt( bc, &d1, &d2 ); - buf_put_be32(outbuf, d1); - buf_put_be32(outbuf + 4, d2); -} - -static unsigned int -decrypt_block (void *context, byte *outbuf, const byte *inbuf) -{ - BLOWFISH_context *bc = (BLOWFISH_context *) context; - do_decrypt_block (bc, outbuf, inbuf); - return /*burn_stack*/ (64); -} - -#endif /*!USE_AMD64_ASM&&!USE_ARM_ASM*/ - - -/* Bulk encryption of complete blocks in CTR mode. This function is only - intended for the bulk encryption feature of cipher.c. CTR is expected to be - of size BLOWFISH_BLOCKSIZE. */ -void -_gcry_blowfish_ctr_enc(void *context, unsigned char *ctr, void *outbuf_arg, - const void *inbuf_arg, size_t nblocks) -{ - BLOWFISH_context *ctx = context; - unsigned char *outbuf = outbuf_arg; - const unsigned char *inbuf = inbuf_arg; - unsigned char tmpbuf[BLOWFISH_BLOCKSIZE]; - int burn_stack_depth = (64) + 2 * BLOWFISH_BLOCKSIZE; - int i; - -#ifdef USE_AMD64_ASM - { - if (nblocks >= 4) - burn_stack_depth += 5 * sizeof(void*); - - /* Process data in 4 block chunks. */ - while (nblocks >= 4) - { - _gcry_blowfish_amd64_ctr_enc(ctx, outbuf, inbuf, ctr); - - nblocks -= 4; - outbuf += 4 * BLOWFISH_BLOCKSIZE; - inbuf += 4 * BLOWFISH_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - /* TODO: use caching instead? */ - } -#elif defined(USE_ARM_ASM) - { - /* Process data in 2 block chunks. */ - while (nblocks >= 2) - { - _gcry_blowfish_arm_ctr_enc(ctx, outbuf, inbuf, ctr); - - nblocks -= 2; - outbuf += 2 * BLOWFISH_BLOCKSIZE; - inbuf += 2 * BLOWFISH_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - /* TODO: use caching instead? */ - } -#endif - - for ( ;nblocks; nblocks-- ) - { - /* Encrypt the counter. */ - do_encrypt_block(ctx, tmpbuf, ctr); - /* XOR the input with the encrypted counter and store in output. */ - buf_xor(outbuf, tmpbuf, inbuf, BLOWFISH_BLOCKSIZE); - outbuf += BLOWFISH_BLOCKSIZE; - inbuf += BLOWFISH_BLOCKSIZE; - /* Increment the counter. */ - for (i = BLOWFISH_BLOCKSIZE; i > 0; i--) - { - ctr[i-1]++; - if (ctr[i-1]) - break; - } - } - - wipememory(tmpbuf, sizeof(tmpbuf)); - _gcry_burn_stack(burn_stack_depth); -} - - -/* Bulk decryption of complete blocks in CBC mode. This function is only - intended for the bulk encryption feature of cipher.c. */ -void -_gcry_blowfish_cbc_dec(void *context, unsigned char *iv, void *outbuf_arg, - const void *inbuf_arg, size_t nblocks) -{ - BLOWFISH_context *ctx = context; - unsigned char *outbuf = outbuf_arg; - const unsigned char *inbuf = inbuf_arg; - unsigned char savebuf[BLOWFISH_BLOCKSIZE]; - int burn_stack_depth = (64) + 2 * BLOWFISH_BLOCKSIZE; - -#ifdef USE_AMD64_ASM - { - if (nblocks >= 4) - burn_stack_depth += 5 * sizeof(void*); - - /* Process data in 4 block chunks. */ - while (nblocks >= 4) - { - _gcry_blowfish_amd64_cbc_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 4; - outbuf += 4 * BLOWFISH_BLOCKSIZE; - inbuf += 4 * BLOWFISH_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - } -#elif defined(USE_ARM_ASM) - { - /* Process data in 2 block chunks. */ - while (nblocks >= 2) - { - _gcry_blowfish_arm_cbc_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 2; - outbuf += 2 * BLOWFISH_BLOCKSIZE; - inbuf += 2 * BLOWFISH_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - } -#endif - - for ( ;nblocks; nblocks-- ) - { - /* INBUF is needed later and it may be identical to OUTBUF, so store - the intermediate result to SAVEBUF. */ - do_decrypt_block (ctx, savebuf, inbuf); - - buf_xor_n_copy_2(outbuf, savebuf, iv, inbuf, BLOWFISH_BLOCKSIZE); - inbuf += BLOWFISH_BLOCKSIZE; - outbuf += BLOWFISH_BLOCKSIZE; - } - - wipememory(savebuf, sizeof(savebuf)); - _gcry_burn_stack(burn_stack_depth); -} - - -/* Bulk decryption of complete blocks in CFB mode. This function is only - intended for the bulk encryption feature of cipher.c. */ -void -_gcry_blowfish_cfb_dec(void *context, unsigned char *iv, void *outbuf_arg, - const void *inbuf_arg, size_t nblocks) -{ - BLOWFISH_context *ctx = context; - unsigned char *outbuf = outbuf_arg; - const unsigned char *inbuf = inbuf_arg; - int burn_stack_depth = (64) + 2 * BLOWFISH_BLOCKSIZE; - -#ifdef USE_AMD64_ASM - { - if (nblocks >= 4) - burn_stack_depth += 5 * sizeof(void*); - - /* Process data in 4 block chunks. */ - while (nblocks >= 4) - { - _gcry_blowfish_amd64_cfb_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 4; - outbuf += 4 * BLOWFISH_BLOCKSIZE; - inbuf += 4 * BLOWFISH_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - } -#elif defined(USE_ARM_ASM) - { - /* Process data in 2 block chunks. */ - while (nblocks >= 2) - { - _gcry_blowfish_arm_cfb_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 2; - outbuf += 2 * BLOWFISH_BLOCKSIZE; - inbuf += 2 * BLOWFISH_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - } -#endif - - for ( ;nblocks; nblocks-- ) - { - do_encrypt_block(ctx, iv, iv); - buf_xor_n_copy(outbuf, iv, inbuf, BLOWFISH_BLOCKSIZE); - outbuf += BLOWFISH_BLOCKSIZE; - inbuf += BLOWFISH_BLOCKSIZE; - } - - _gcry_burn_stack(burn_stack_depth); -} - - -/* Run the self-tests for BLOWFISH-CTR, tests IV increment of bulk CTR - encryption. Returns NULL on success. */ -static const char * -selftest_ctr (void) -{ - const int nblocks = 4+1; - const int blocksize = BLOWFISH_BLOCKSIZE; - const int context_size = sizeof(BLOWFISH_context); - - return _gcry_selftest_helper_ctr("BLOWFISH", &bf_setkey, - &encrypt_block, &_gcry_blowfish_ctr_enc, nblocks, blocksize, - context_size); -} - - -/* Run the self-tests for BLOWFISH-CBC, tests bulk CBC decryption. - Returns NULL on success. */ -static const char * -selftest_cbc (void) -{ - const int nblocks = 4+2; - const int blocksize = BLOWFISH_BLOCKSIZE; - const int context_size = sizeof(BLOWFISH_context); - - return _gcry_selftest_helper_cbc("BLOWFISH", &bf_setkey, - &encrypt_block, &_gcry_blowfish_cbc_dec, nblocks, blocksize, - context_size); -} - - -/* Run the self-tests for BLOWFISH-CFB, tests bulk CBC decryption. - Returns NULL on success. */ -static const char * -selftest_cfb (void) -{ - const int nblocks = 4+2; - const int blocksize = BLOWFISH_BLOCKSIZE; - const int context_size = sizeof(BLOWFISH_context); - - return _gcry_selftest_helper_cfb("BLOWFISH", &bf_setkey, - &encrypt_block, &_gcry_blowfish_cfb_dec, nblocks, blocksize, - context_size); -} - - -static const char* -selftest(void) -{ - BLOWFISH_context c; - byte plain[] = "BLOWFISH"; - byte buffer[8]; - static const byte plain3[] = - { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 }; - static const byte key3[] = - { 0x41, 0x79, 0x6E, 0xA0, 0x52, 0x61, 0x6E, 0xE4 }; - static const byte cipher3[] = - { 0xE1, 0x13, 0xF4, 0x10, 0x2C, 0xFC, 0xCE, 0x43 }; - const char *r; - - bf_setkey( (void *) &c, - (const unsigned char*)"abcdefghijklmnopqrstuvwxyz", 26 ); - encrypt_block( (void *) &c, buffer, plain ); - if( memcmp( buffer, "\x32\x4E\xD0\xFE\xF4\x13\xA2\x03", 8 ) ) - return "Blowfish selftest failed (1)."; - decrypt_block( (void *) &c, buffer, buffer ); - if( memcmp( buffer, plain, 8 ) ) - return "Blowfish selftest failed (2)."; - - bf_setkey( (void *) &c, key3, 8 ); - encrypt_block( (void *) &c, buffer, plain3 ); - if( memcmp( buffer, cipher3, 8 ) ) - return "Blowfish selftest failed (3)."; - decrypt_block( (void *) &c, buffer, buffer ); - if( memcmp( buffer, plain3, 8 ) ) - return "Blowfish selftest failed (4)."; - - if ( (r = selftest_cbc ()) ) - return r; - - if ( (r = selftest_cfb ()) ) - return r; - - if ( (r = selftest_ctr ()) ) - return r; - - return NULL; -} - - -struct hashset_elem { - u32 val; - short nidx; - char used; -}; - -static inline byte -val_to_hidx(u32 val) -{ - /* bf sboxes are quite random already. */ - return (val >> 24) ^ (val >> 16) ^ (val >> 8) ^ val; -} - -static inline int -add_val(struct hashset_elem hset[256], u32 val, int *midx, - struct hashset_elem *mpool) -{ - struct hashset_elem *elem; - byte hidx; - - hidx = val_to_hidx(val); - elem = &hset[hidx]; - - /* Check if first is in use. */ - if (elem->used == 0) - { - elem->val = val; - elem->nidx = -1; - elem->used = 1; - return 0; - } - - /* Check if first matches. */ - if (elem->val == val) - return 1; - - for (; elem->nidx >= 0; elem = &mpool[elem->nidx]) - { - /* Check if elem matches. */ - if (elem->val == val) - return 1; - } - - elem->nidx = (*midx)++; - elem = &mpool[elem->nidx]; - - elem->val = val; - elem->nidx = -1; - elem->used = 1; - - return 0; -} - -static gcry_err_code_t -do_bf_setkey (BLOWFISH_context *c, const byte *key, unsigned keylen) -{ - struct hashset_elem mempool[4 * 255]; /* Enough entries for the worst case. */ - struct hashset_elem hset[4][256]; - int memidx = 0; - int weak = 0; - int i, j, ret; - u32 data, datal, datar; - static int initialized; - static const char *selftest_failed; - - if( !initialized ) - { - initialized = 1; - selftest_failed = selftest(); - if( selftest_failed ) - log_error ("%s\n", selftest_failed ); - } - if( selftest_failed ) - return GPG_ERR_SELFTEST_FAILED; - - memset(hset, 0, sizeof(hset)); - - for(i=0; i < BLOWFISH_ROUNDS+2; i++ ) - c->p[i] = ps[i]; - for(i=0; i < 256; i++ ) - { - c->s0[i] = ks0[i]; - c->s1[i] = ks1[i]; - c->s2[i] = ks2[i]; - c->s3[i] = ks3[i]; - } - - for(i=j=0; i < BLOWFISH_ROUNDS+2; i++ ) - { - data = ((u32)key[j] << 24) | - ((u32)key[(j+1)%keylen] << 16) | - ((u32)key[(j+2)%keylen] << 8) | - ((u32)key[(j+3)%keylen]); - c->p[i] ^= data; - j = (j+4) % keylen; - } - - datal = datar = 0; - for(i=0; i < BLOWFISH_ROUNDS+2; i += 2 ) - { - do_encrypt( c, &datal, &datar ); - c->p[i] = datal; - c->p[i+1] = datar; - } - for(i=0; i < 256; i += 2 ) - { - do_encrypt( c, &datal, &datar ); - c->s0[i] = datal; - c->s0[i+1] = datar; - - /* Add values to hashset, detect duplicates (weak keys). */ - ret = add_val (hset[0], datal, &memidx, mempool); - weak = ret ? 1 : weak; - ret = add_val (hset[0], datar, &memidx, mempool); - weak = ret ? 1 : weak; - } - for(i=0; i < 256; i += 2 ) - { - do_encrypt( c, &datal, &datar ); - c->s1[i] = datal; - c->s1[i+1] = datar; - - /* Add values to hashset, detect duplicates (weak keys). */ - ret = add_val (hset[1], datal, &memidx, mempool); - weak = ret ? 1 : weak; - ret = add_val (hset[1], datar, &memidx, mempool); - weak = ret ? 1 : weak; - } - for(i=0; i < 256; i += 2 ) - { - do_encrypt( c, &datal, &datar ); - c->s2[i] = datal; - c->s2[i+1] = datar; - - /* Add values to hashset, detect duplicates (weak keys). */ - ret = add_val (hset[2], datal, &memidx, mempool); - weak = ret ? 1 : weak; - ret = add_val (hset[2], datar, &memidx, mempool); - weak = ret ? 1 : weak; - } - for(i=0; i < 256; i += 2 ) - { - do_encrypt( c, &datal, &datar ); - c->s3[i] = datal; - c->s3[i+1] = datar; - - /* Add values to hashset, detect duplicates (weak keys). */ - ret = add_val (hset[3], datal, &memidx, mempool); - weak = ret ? 1 : weak; - ret = add_val (hset[3], datar, &memidx, mempool); - weak = ret ? 1 : weak; - } - - /* Clear stack. */ - wipememory(hset, sizeof(hset)); - wipememory(mempool, sizeof(mempool[0]) * memidx); - - _gcry_burn_stack (64); - - /* Check for weak key. A weak key is a key in which a value in - the P-array (here c) occurs more than once per table. */ - if (weak) - return GPG_ERR_WEAK_KEY; - - return GPG_ERR_NO_ERROR; -} - - -static gcry_err_code_t -bf_setkey (void *context, const byte *key, unsigned keylen) -{ - BLOWFISH_context *c = (BLOWFISH_context *) context; - gcry_err_code_t rc = do_bf_setkey (c, key, keylen); - return rc; -} - - -gcry_cipher_spec_t _gcry_cipher_spec_blowfish = - { - GCRY_CIPHER_BLOWFISH, {0, 0}, - "BLOWFISH", NULL, NULL, BLOWFISH_BLOCKSIZE, 128, - sizeof (BLOWFISH_context), - bf_setkey, encrypt_block, decrypt_block - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/bufhelp.h b/src/hos_libhttpserver/src/libgcrypt/cipher/bufhelp.h deleted file mode 100644 index 45a72094..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/bufhelp.h +++ /dev/null @@ -1,378 +0,0 @@ -/* bufhelp.h - Some buffer manipulation helpers - * Copyright © 2012 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ -#ifndef G10_BUFHELP_H -#define G10_BUFHELP_H - -#include - -#ifdef HAVE_STDINT_H -# include /* uintptr_t */ -#elif defined(HAVE_INTTYPES_H) -# include -#else -/* In this case, uintptr_t is provided by config.h. */ -#endif - -#include "bithelp.h" - - -#if defined(__i386__) || defined(__x86_64__) || \ - defined(__powerpc__) || defined(__powerpc64__) || \ - (defined(__arm__) && defined(__ARM_FEATURE_UNALIGNED)) || \ - defined(__aarch64__) -/* These architectures are able of unaligned memory accesses and can - handle those fast. - */ -# define BUFHELP_FAST_UNALIGNED_ACCESS 1 -#endif - - -/* Optimized function for small buffer copying */ -static inline void -buf_cpy(void *_dst, const void *_src, size_t len) -{ -#if __GNUC__ >= 4 && (defined(__x86_64__) || defined(__i386__)) - /* For AMD64 and i386, memcpy is faster. */ - memcpy(_dst, _src, len); -#else - byte *dst = _dst; - const byte *src = _src; - uintptr_t *ldst; - const uintptr_t *lsrc; -#ifndef BUFHELP_FAST_UNALIGNED_ACCESS - const unsigned int longmask = sizeof(uintptr_t) - 1; - - /* Skip fast processing if buffers are unaligned. */ - if (((uintptr_t)dst | (uintptr_t)src) & longmask) - goto do_bytes; -#endif - - ldst = (uintptr_t *)(void *)dst; - lsrc = (const uintptr_t *)(const void *)src; - - for (; len >= sizeof(uintptr_t); len -= sizeof(uintptr_t)) - *ldst++ = *lsrc++; - - dst = (byte *)ldst; - src = (const byte *)lsrc; - -#ifndef BUFHELP_FAST_UNALIGNED_ACCESS -do_bytes: -#endif - /* Handle tail. */ - for (; len; len--) - *dst++ = *src++; -#endif /*__GNUC__ >= 4 && (__x86_64__ || __i386__)*/ -} - - -/* Optimized function for buffer xoring */ -static inline void -buf_xor(void *_dst, const void *_src1, const void *_src2, size_t len) -{ - byte *dst = _dst; - const byte *src1 = _src1; - const byte *src2 = _src2; - uintptr_t *ldst; - const uintptr_t *lsrc1, *lsrc2; -#ifndef BUFHELP_FAST_UNALIGNED_ACCESS - const unsigned int longmask = sizeof(uintptr_t) - 1; - - /* Skip fast processing if buffers are unaligned. */ - if (((uintptr_t)dst | (uintptr_t)src1 | (uintptr_t)src2) & longmask) - goto do_bytes; -#endif - - ldst = (uintptr_t *)(void *)dst; - lsrc1 = (const uintptr_t *)(const void *)src1; - lsrc2 = (const uintptr_t *)(const void *)src2; - - for (; len >= sizeof(uintptr_t); len -= sizeof(uintptr_t)) - *ldst++ = *lsrc1++ ^ *lsrc2++; - - dst = (byte *)ldst; - src1 = (const byte *)lsrc1; - src2 = (const byte *)lsrc2; - -#ifndef BUFHELP_FAST_UNALIGNED_ACCESS -do_bytes: -#endif - /* Handle tail. */ - for (; len; len--) - *dst++ = *src1++ ^ *src2++; -} - - -/* Optimized function for buffer xoring with two destination buffers. Used - mainly by CFB mode encryption. */ -static inline void -buf_xor_2dst(void *_dst1, void *_dst2, const void *_src, size_t len) -{ - byte *dst1 = _dst1; - byte *dst2 = _dst2; - const byte *src = _src; - uintptr_t *ldst1, *ldst2; - const uintptr_t *lsrc; -#ifndef BUFHELP_FAST_UNALIGNED_ACCESS - const unsigned int longmask = sizeof(uintptr_t) - 1; - - /* Skip fast processing if buffers are unaligned. */ - if (((uintptr_t)src | (uintptr_t)dst1 | (uintptr_t)dst2) & longmask) - goto do_bytes; -#endif - - ldst1 = (uintptr_t *)(void *)dst1; - ldst2 = (uintptr_t *)(void *)dst2; - lsrc = (const uintptr_t *)(const void *)src; - - for (; len >= sizeof(uintptr_t); len -= sizeof(uintptr_t)) - *ldst1++ = (*ldst2++ ^= *lsrc++); - - dst1 = (byte *)ldst1; - dst2 = (byte *)ldst2; - src = (const byte *)lsrc; - -#ifndef BUFHELP_FAST_UNALIGNED_ACCESS -do_bytes: -#endif - /* Handle tail. */ - for (; len; len--) - *dst1++ = (*dst2++ ^= *src++); -} - - -/* Optimized function for combined buffer xoring and copying. Used by mainly - CBC mode decryption. */ -static inline void -buf_xor_n_copy_2(void *_dst_xor, const void *_src_xor, void *_srcdst_cpy, - const void *_src_cpy, size_t len) -{ - byte *dst_xor = _dst_xor; - byte *srcdst_cpy = _srcdst_cpy; - const byte *src_xor = _src_xor; - const byte *src_cpy = _src_cpy; - byte temp; - uintptr_t *ldst_xor, *lsrcdst_cpy; - const uintptr_t *lsrc_cpy, *lsrc_xor; - uintptr_t ltemp; -#ifndef BUFHELP_FAST_UNALIGNED_ACCESS - const unsigned int longmask = sizeof(uintptr_t) - 1; - - /* Skip fast processing if buffers are unaligned. */ - if (((uintptr_t)src_cpy | (uintptr_t)src_xor | (uintptr_t)dst_xor | - (uintptr_t)srcdst_cpy) & longmask) - goto do_bytes; -#endif - - ldst_xor = (uintptr_t *)(void *)dst_xor; - lsrc_xor = (const uintptr_t *)(void *)src_xor; - lsrcdst_cpy = (uintptr_t *)(void *)srcdst_cpy; - lsrc_cpy = (const uintptr_t *)(const void *)src_cpy; - - for (; len >= sizeof(uintptr_t); len -= sizeof(uintptr_t)) - { - ltemp = *lsrc_cpy++; - *ldst_xor++ = *lsrcdst_cpy ^ *lsrc_xor++; - *lsrcdst_cpy++ = ltemp; - } - - dst_xor = (byte *)ldst_xor; - src_xor = (const byte *)lsrc_xor; - srcdst_cpy = (byte *)lsrcdst_cpy; - src_cpy = (const byte *)lsrc_cpy; - -#ifndef BUFHELP_FAST_UNALIGNED_ACCESS -do_bytes: -#endif - /* Handle tail. */ - for (; len; len--) - { - temp = *src_cpy++; - *dst_xor++ = *srcdst_cpy ^ *src_xor++; - *srcdst_cpy++ = temp; - } -} - - -/* Optimized function for combined buffer xoring and copying. Used by mainly - CFB mode decryption. */ -static inline void -buf_xor_n_copy(void *_dst_xor, void *_srcdst_cpy, const void *_src, size_t len) -{ - buf_xor_n_copy_2(_dst_xor, _src, _srcdst_cpy, _src, len); -} - - -/* Constant-time compare of two buffers. Returns 1 if buffers are equal, - and 0 if buffers differ. */ -static inline int -buf_eq_const(const void *_a, const void *_b, size_t len) -{ - const byte *a = _a; - const byte *b = _b; - size_t diff, i; - - /* Constant-time compare. */ - for (i = 0, diff = 0; i < len; i++) - diff -= !!(a[i] - b[i]); - - return !diff; -} - - -#ifndef BUFHELP_FAST_UNALIGNED_ACCESS - -/* Functions for loading and storing unaligned u32 values of different - endianness. */ -static inline u32 buf_get_be32(const void *_buf) -{ - const byte *in = _buf; - return ((u32)in[0] << 24) | ((u32)in[1] << 16) | \ - ((u32)in[2] << 8) | (u32)in[3]; -} - -static inline u32 buf_get_le32(const void *_buf) -{ - const byte *in = _buf; - return ((u32)in[3] << 24) | ((u32)in[2] << 16) | \ - ((u32)in[1] << 8) | (u32)in[0]; -} - -static inline void buf_put_be32(void *_buf, u32 val) -{ - byte *out = _buf; - out[0] = val >> 24; - out[1] = val >> 16; - out[2] = val >> 8; - out[3] = val; -} - -static inline void buf_put_le32(void *_buf, u32 val) -{ - byte *out = _buf; - out[3] = val >> 24; - out[2] = val >> 16; - out[1] = val >> 8; - out[0] = val; -} - -#ifdef HAVE_U64_TYPEDEF -/* Functions for loading and storing unaligned u64 values of different - endianness. */ -static inline u64 buf_get_be64(const void *_buf) -{ - const byte *in = _buf; - return ((u64)in[0] << 56) | ((u64)in[1] << 48) | \ - ((u64)in[2] << 40) | ((u64)in[3] << 32) | \ - ((u64)in[4] << 24) | ((u64)in[5] << 16) | \ - ((u64)in[6] << 8) | (u64)in[7]; -} - -static inline u64 buf_get_le64(const void *_buf) -{ - const byte *in = _buf; - return ((u64)in[7] << 56) | ((u64)in[6] << 48) | \ - ((u64)in[5] << 40) | ((u64)in[4] << 32) | \ - ((u64)in[3] << 24) | ((u64)in[2] << 16) | \ - ((u64)in[1] << 8) | (u64)in[0]; -} - -static inline void buf_put_be64(void *_buf, u64 val) -{ - byte *out = _buf; - out[0] = val >> 56; - out[1] = val >> 48; - out[2] = val >> 40; - out[3] = val >> 32; - out[4] = val >> 24; - out[5] = val >> 16; - out[6] = val >> 8; - out[7] = val; -} - -static inline void buf_put_le64(void *_buf, u64 val) -{ - byte *out = _buf; - out[7] = val >> 56; - out[6] = val >> 48; - out[5] = val >> 40; - out[4] = val >> 32; - out[3] = val >> 24; - out[2] = val >> 16; - out[1] = val >> 8; - out[0] = val; -} -#endif /*HAVE_U64_TYPEDEF*/ - -#else /*BUFHELP_FAST_UNALIGNED_ACCESS*/ - -/* Functions for loading and storing unaligned u32 values of different - endianness. */ -static inline u32 buf_get_be32(const void *_buf) -{ - return be_bswap32(*(const u32 *)_buf); -} - -static inline u32 buf_get_le32(const void *_buf) -{ - return le_bswap32(*(const u32 *)_buf); -} - -static inline void buf_put_be32(void *_buf, u32 val) -{ - u32 *out = _buf; - *out = be_bswap32(val); -} - -static inline void buf_put_le32(void *_buf, u32 val) -{ - u32 *out = _buf; - *out = le_bswap32(val); -} - -#ifdef HAVE_U64_TYPEDEF -/* Functions for loading and storing unaligned u64 values of different - endianness. */ -static inline u64 buf_get_be64(const void *_buf) -{ - return be_bswap64(*(const u64 *)_buf); -} - -static inline u64 buf_get_le64(const void *_buf) -{ - return le_bswap64(*(const u64 *)_buf); -} - -static inline void buf_put_be64(void *_buf, u64 val) -{ - u64 *out = _buf; - *out = be_bswap64(val); -} - -static inline void buf_put_le64(void *_buf, u64 val) -{ - u64 *out = _buf; - *out = le_bswap64(val); -} -#endif /*HAVE_U64_TYPEDEF*/ - -#endif /*BUFHELP_FAST_UNALIGNED_ACCESS*/ - -#endif /*G10_BITHELP_H*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-aesni-avx-amd64.S b/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-aesni-avx-amd64.S deleted file mode 100644 index 38ec7a39..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-aesni-avx-amd64.S +++ /dev/null @@ -1,2165 +0,0 @@ -/* camellia-avx-aesni-amd64.S - AES-NI/AVX implementation of Camellia cipher - * - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifdef __x86_64 -#include -#if defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) && \ - defined(ENABLE_AESNI_SUPPORT) && defined(ENABLE_AVX_SUPPORT) - -#ifdef __PIC__ -# define RIP (%rip) -#else -# define RIP -#endif - -#define CAMELLIA_TABLE_BYTE_LEN 272 - -/* struct CAMELLIA_context: */ -#define key_table 0 -#define key_bitlength CAMELLIA_TABLE_BYTE_LEN - -/* register macros */ -#define CTX %rdi -#define RIO %r8 - -/********************************************************************** - helper macros - **********************************************************************/ -#define filter_8bit(x, lo_t, hi_t, mask4bit, tmp0) \ - vpand x, mask4bit, tmp0; \ - vpandn x, mask4bit, x; \ - vpsrld $4, x, x; \ - \ - vpshufb tmp0, lo_t, tmp0; \ - vpshufb x, hi_t, x; \ - vpxor tmp0, x, x; - -/********************************************************************** - 16-way camellia - **********************************************************************/ - -/* - * IN: - * x0..x7: byte-sliced AB state - * mem_cd: register pointer storing CD state - * key: index for key material - * OUT: - * x0..x7: new byte-sliced CD state - */ -#define roundsm16(x0, x1, x2, x3, x4, x5, x6, x7, t0, t1, t2, t3, t4, t5, t6, \ - t7, mem_cd, key) \ - /* \ - * S-function with AES subbytes \ - */ \ - vmovdqa .Linv_shift_row RIP, t4; \ - vbroadcastss .L0f0f0f0f RIP, t7; \ - vmovdqa .Lpre_tf_lo_s1 RIP, t0; \ - vmovdqa .Lpre_tf_hi_s1 RIP, t1; \ - \ - /* AES inverse shift rows */ \ - vpshufb t4, x0, x0; \ - vpshufb t4, x7, x7; \ - vpshufb t4, x1, x1; \ - vpshufb t4, x4, x4; \ - vpshufb t4, x2, x2; \ - vpshufb t4, x5, x5; \ - vpshufb t4, x3, x3; \ - vpshufb t4, x6, x6; \ - \ - /* prefilter sboxes 1, 2 and 3 */ \ - vmovdqa .Lpre_tf_lo_s4 RIP, t2; \ - vmovdqa .Lpre_tf_hi_s4 RIP, t3; \ - filter_8bit(x0, t0, t1, t7, t6); \ - filter_8bit(x7, t0, t1, t7, t6); \ - filter_8bit(x1, t0, t1, t7, t6); \ - filter_8bit(x4, t0, t1, t7, t6); \ - filter_8bit(x2, t0, t1, t7, t6); \ - filter_8bit(x5, t0, t1, t7, t6); \ - \ - /* prefilter sbox 4 */ \ - vpxor t4, t4, t4; \ - filter_8bit(x3, t2, t3, t7, t6); \ - filter_8bit(x6, t2, t3, t7, t6); \ - \ - /* AES subbytes + AES shift rows */ \ - vmovdqa .Lpost_tf_lo_s1 RIP, t0; \ - vmovdqa .Lpost_tf_hi_s1 RIP, t1; \ - vaesenclast t4, x0, x0; \ - vaesenclast t4, x7, x7; \ - vaesenclast t4, x1, x1; \ - vaesenclast t4, x4, x4; \ - vaesenclast t4, x2, x2; \ - vaesenclast t4, x5, x5; \ - vaesenclast t4, x3, x3; \ - vaesenclast t4, x6, x6; \ - \ - /* postfilter sboxes 1 and 4 */ \ - vmovdqa .Lpost_tf_lo_s3 RIP, t2; \ - vmovdqa .Lpost_tf_hi_s3 RIP, t3; \ - filter_8bit(x0, t0, t1, t7, t6); \ - filter_8bit(x7, t0, t1, t7, t6); \ - filter_8bit(x3, t0, t1, t7, t6); \ - filter_8bit(x6, t0, t1, t7, t6); \ - \ - /* postfilter sbox 3 */ \ - vmovdqa .Lpost_tf_lo_s2 RIP, t4; \ - vmovdqa .Lpost_tf_hi_s2 RIP, t5; \ - filter_8bit(x2, t2, t3, t7, t6); \ - filter_8bit(x5, t2, t3, t7, t6); \ - \ - vpxor t6, t6, t6; \ - vmovq key, t0; \ - \ - /* postfilter sbox 2 */ \ - filter_8bit(x1, t4, t5, t7, t2); \ - filter_8bit(x4, t4, t5, t7, t2); \ - \ - vpsrldq $5, t0, t5; \ - vpsrldq $1, t0, t1; \ - vpsrldq $2, t0, t2; \ - vpsrldq $3, t0, t3; \ - vpsrldq $4, t0, t4; \ - vpshufb t6, t0, t0; \ - vpshufb t6, t1, t1; \ - vpshufb t6, t2, t2; \ - vpshufb t6, t3, t3; \ - vpshufb t6, t4, t4; \ - vpsrldq $2, t5, t7; \ - vpshufb t6, t7, t7; \ - \ - /* P-function */ \ - vpxor x5, x0, x0; \ - vpxor x6, x1, x1; \ - vpxor x7, x2, x2; \ - vpxor x4, x3, x3; \ - \ - vpxor x2, x4, x4; \ - vpxor x3, x5, x5; \ - vpxor x0, x6, x6; \ - vpxor x1, x7, x7; \ - \ - vpxor x7, x0, x0; \ - vpxor x4, x1, x1; \ - vpxor x5, x2, x2; \ - vpxor x6, x3, x3; \ - \ - vpxor x3, x4, x4; \ - vpxor x0, x5, x5; \ - vpxor x1, x6, x6; \ - vpxor x2, x7, x7; /* note: high and low parts swapped */ \ - \ - /* Add key material and result to CD (x becomes new CD) */ \ - \ - vpxor t3, x4, x4; \ - vpxor 0 * 16(mem_cd), x4, x4; \ - \ - vpxor t2, x5, x5; \ - vpxor 1 * 16(mem_cd), x5, x5; \ - \ - vpsrldq $1, t5, t3; \ - vpshufb t6, t5, t5; \ - vpshufb t6, t3, t6; \ - \ - vpxor t1, x6, x6; \ - vpxor 2 * 16(mem_cd), x6, x6; \ - \ - vpxor t0, x7, x7; \ - vpxor 3 * 16(mem_cd), x7, x7; \ - \ - vpxor t7, x0, x0; \ - vpxor 4 * 16(mem_cd), x0, x0; \ - \ - vpxor t6, x1, x1; \ - vpxor 5 * 16(mem_cd), x1, x1; \ - \ - vpxor t5, x2, x2; \ - vpxor 6 * 16(mem_cd), x2, x2; \ - \ - vpxor t4, x3, x3; \ - vpxor 7 * 16(mem_cd), x3, x3; - -/* - * IN/OUT: - * x0..x7: byte-sliced AB state preloaded - * mem_ab: byte-sliced AB state in memory - * mem_cb: byte-sliced CD state in memory - */ -#define two_roundsm16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, i, dir, store_ab) \ - roundsm16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_cd, (key_table + (i) * 8)(CTX)); \ - \ - vmovdqu x4, 0 * 16(mem_cd); \ - vmovdqu x5, 1 * 16(mem_cd); \ - vmovdqu x6, 2 * 16(mem_cd); \ - vmovdqu x7, 3 * 16(mem_cd); \ - vmovdqu x0, 4 * 16(mem_cd); \ - vmovdqu x1, 5 * 16(mem_cd); \ - vmovdqu x2, 6 * 16(mem_cd); \ - vmovdqu x3, 7 * 16(mem_cd); \ - \ - roundsm16(x4, x5, x6, x7, x0, x1, x2, x3, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, (key_table + ((i) + (dir)) * 8)(CTX)); \ - \ - store_ab(x0, x1, x2, x3, x4, x5, x6, x7, mem_ab); - -#define dummy_store(x0, x1, x2, x3, x4, x5, x6, x7, mem_ab) /* do nothing */ - -#define store_ab_state(x0, x1, x2, x3, x4, x5, x6, x7, mem_ab) \ - /* Store new AB state */ \ - vmovdqu x0, 0 * 16(mem_ab); \ - vmovdqu x1, 1 * 16(mem_ab); \ - vmovdqu x2, 2 * 16(mem_ab); \ - vmovdqu x3, 3 * 16(mem_ab); \ - vmovdqu x4, 4 * 16(mem_ab); \ - vmovdqu x5, 5 * 16(mem_ab); \ - vmovdqu x6, 6 * 16(mem_ab); \ - vmovdqu x7, 7 * 16(mem_ab); - -#define enc_rounds16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, i) \ - two_roundsm16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 2, 1, store_ab_state); \ - two_roundsm16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 4, 1, store_ab_state); \ - two_roundsm16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 6, 1, dummy_store); - -#define dec_rounds16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, i) \ - two_roundsm16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 7, -1, store_ab_state); \ - two_roundsm16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 5, -1, store_ab_state); \ - two_roundsm16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 3, -1, dummy_store); - -/* - * IN: - * v0..3: byte-sliced 32-bit integers - * OUT: - * v0..3: (IN <<< 1) - */ -#define rol32_1_16(v0, v1, v2, v3, t0, t1, t2, zero) \ - vpcmpgtb v0, zero, t0; \ - vpaddb v0, v0, v0; \ - vpabsb t0, t0; \ - \ - vpcmpgtb v1, zero, t1; \ - vpaddb v1, v1, v1; \ - vpabsb t1, t1; \ - \ - vpcmpgtb v2, zero, t2; \ - vpaddb v2, v2, v2; \ - vpabsb t2, t2; \ - \ - vpor t0, v1, v1; \ - \ - vpcmpgtb v3, zero, t0; \ - vpaddb v3, v3, v3; \ - vpabsb t0, t0; \ - \ - vpor t1, v2, v2; \ - vpor t2, v3, v3; \ - vpor t0, v0, v0; - -/* - * IN: - * r: byte-sliced AB state in memory - * l: byte-sliced CD state in memory - * OUT: - * x0..x7: new byte-sliced CD state - */ -#define fls16(l, l0, l1, l2, l3, l4, l5, l6, l7, r, t0, t1, t2, t3, tt0, \ - tt1, tt2, tt3, kll, klr, krl, krr) \ - /* \ - * t0 = kll; \ - * t0 &= ll; \ - * lr ^= rol32(t0, 1); \ - */ \ - vpxor tt0, tt0, tt0; \ - vmovd kll, t0; \ - vpshufb tt0, t0, t3; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t2; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t1; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t0; \ - \ - vpand l0, t0, t0; \ - vpand l1, t1, t1; \ - vpand l2, t2, t2; \ - vpand l3, t3, t3; \ - \ - rol32_1_16(t3, t2, t1, t0, tt1, tt2, tt3, tt0); \ - \ - vpxor l4, t0, l4; \ - vmovdqu l4, 4 * 16(l); \ - vpxor l5, t1, l5; \ - vmovdqu l5, 5 * 16(l); \ - vpxor l6, t2, l6; \ - vmovdqu l6, 6 * 16(l); \ - vpxor l7, t3, l7; \ - vmovdqu l7, 7 * 16(l); \ - \ - /* \ - * t2 = krr; \ - * t2 |= rr; \ - * rl ^= t2; \ - */ \ - \ - vmovd krr, t0; \ - vpshufb tt0, t0, t3; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t2; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t1; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t0; \ - \ - vpor 4 * 16(r), t0, t0; \ - vpor 5 * 16(r), t1, t1; \ - vpor 6 * 16(r), t2, t2; \ - vpor 7 * 16(r), t3, t3; \ - \ - vpxor 0 * 16(r), t0, t0; \ - vpxor 1 * 16(r), t1, t1; \ - vpxor 2 * 16(r), t2, t2; \ - vpxor 3 * 16(r), t3, t3; \ - vmovdqu t0, 0 * 16(r); \ - vmovdqu t1, 1 * 16(r); \ - vmovdqu t2, 2 * 16(r); \ - vmovdqu t3, 3 * 16(r); \ - \ - /* \ - * t2 = krl; \ - * t2 &= rl; \ - * rr ^= rol32(t2, 1); \ - */ \ - vmovd krl, t0; \ - vpshufb tt0, t0, t3; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t2; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t1; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t0; \ - \ - vpand 0 * 16(r), t0, t0; \ - vpand 1 * 16(r), t1, t1; \ - vpand 2 * 16(r), t2, t2; \ - vpand 3 * 16(r), t3, t3; \ - \ - rol32_1_16(t3, t2, t1, t0, tt1, tt2, tt3, tt0); \ - \ - vpxor 4 * 16(r), t0, t0; \ - vpxor 5 * 16(r), t1, t1; \ - vpxor 6 * 16(r), t2, t2; \ - vpxor 7 * 16(r), t3, t3; \ - vmovdqu t0, 4 * 16(r); \ - vmovdqu t1, 5 * 16(r); \ - vmovdqu t2, 6 * 16(r); \ - vmovdqu t3, 7 * 16(r); \ - \ - /* \ - * t0 = klr; \ - * t0 |= lr; \ - * ll ^= t0; \ - */ \ - \ - vmovd klr, t0; \ - vpshufb tt0, t0, t3; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t2; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t1; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t0; \ - \ - vpor l4, t0, t0; \ - vpor l5, t1, t1; \ - vpor l6, t2, t2; \ - vpor l7, t3, t3; \ - \ - vpxor l0, t0, l0; \ - vmovdqu l0, 0 * 16(l); \ - vpxor l1, t1, l1; \ - vmovdqu l1, 1 * 16(l); \ - vpxor l2, t2, l2; \ - vmovdqu l2, 2 * 16(l); \ - vpxor l3, t3, l3; \ - vmovdqu l3, 3 * 16(l); - -#define transpose_4x4(x0, x1, x2, x3, t1, t2) \ - vpunpckhdq x1, x0, t2; \ - vpunpckldq x1, x0, x0; \ - \ - vpunpckldq x3, x2, t1; \ - vpunpckhdq x3, x2, x2; \ - \ - vpunpckhqdq t1, x0, x1; \ - vpunpcklqdq t1, x0, x0; \ - \ - vpunpckhqdq x2, t2, x3; \ - vpunpcklqdq x2, t2, x2; - -#define byteslice_16x16b_fast(a0, b0, c0, d0, a1, b1, c1, d1, a2, b2, c2, d2, \ - a3, b3, c3, d3, st0, st1) \ - vmovdqu d2, st0; \ - vmovdqu d3, st1; \ - transpose_4x4(a0, a1, a2, a3, d2, d3); \ - transpose_4x4(b0, b1, b2, b3, d2, d3); \ - vmovdqu st0, d2; \ - vmovdqu st1, d3; \ - \ - vmovdqu a0, st0; \ - vmovdqu a1, st1; \ - transpose_4x4(c0, c1, c2, c3, a0, a1); \ - transpose_4x4(d0, d1, d2, d3, a0, a1); \ - \ - vmovdqu .Lshufb_16x16b RIP, a0; \ - vmovdqu st1, a1; \ - vpshufb a0, a2, a2; \ - vpshufb a0, a3, a3; \ - vpshufb a0, b0, b0; \ - vpshufb a0, b1, b1; \ - vpshufb a0, b2, b2; \ - vpshufb a0, b3, b3; \ - vpshufb a0, a1, a1; \ - vpshufb a0, c0, c0; \ - vpshufb a0, c1, c1; \ - vpshufb a0, c2, c2; \ - vpshufb a0, c3, c3; \ - vpshufb a0, d0, d0; \ - vpshufb a0, d1, d1; \ - vpshufb a0, d2, d2; \ - vpshufb a0, d3, d3; \ - vmovdqu d3, st1; \ - vmovdqu st0, d3; \ - vpshufb a0, d3, a0; \ - vmovdqu d2, st0; \ - \ - transpose_4x4(a0, b0, c0, d0, d2, d3); \ - transpose_4x4(a1, b1, c1, d1, d2, d3); \ - vmovdqu st0, d2; \ - vmovdqu st1, d3; \ - \ - vmovdqu b0, st0; \ - vmovdqu b1, st1; \ - transpose_4x4(a2, b2, c2, d2, b0, b1); \ - transpose_4x4(a3, b3, c3, d3, b0, b1); \ - vmovdqu st0, b0; \ - vmovdqu st1, b1; \ - /* does not adjust output bytes inside vectors */ - -#define transpose_8x8b(a, b, c, d, e, f, g, h, t0, t1, t2, t3, t4) \ - vpunpcklbw a, b, t0; \ - vpunpckhbw a, b, b; \ - \ - vpunpcklbw c, d, t1; \ - vpunpckhbw c, d, d; \ - \ - vpunpcklbw e, f, t2; \ - vpunpckhbw e, f, f; \ - \ - vpunpcklbw g, h, t3; \ - vpunpckhbw g, h, h; \ - \ - vpunpcklwd t0, t1, g; \ - vpunpckhwd t0, t1, t0; \ - \ - vpunpcklwd b, d, t1; \ - vpunpckhwd b, d, e; \ - \ - vpunpcklwd t2, t3, c; \ - vpunpckhwd t2, t3, t2; \ - \ - vpunpcklwd f, h, t3; \ - vpunpckhwd f, h, b; \ - \ - vpunpcklwd e, b, t4; \ - vpunpckhwd e, b, b; \ - \ - vpunpcklwd t1, t3, e; \ - vpunpckhwd t1, t3, f; \ - \ - vmovdqa .Ltranspose_8x8_shuf RIP, t3; \ - \ - vpunpcklwd g, c, d; \ - vpunpckhwd g, c, c; \ - \ - vpunpcklwd t0, t2, t1; \ - vpunpckhwd t0, t2, h; \ - \ - vpunpckhqdq b, h, a; \ - vpshufb t3, a, a; \ - vpunpcklqdq b, h, b; \ - vpshufb t3, b, b; \ - \ - vpunpckhqdq e, d, g; \ - vpshufb t3, g, g; \ - vpunpcklqdq e, d, h; \ - vpshufb t3, h, h; \ - \ - vpunpckhqdq f, c, e; \ - vpshufb t3, e, e; \ - vpunpcklqdq f, c, f; \ - vpshufb t3, f, f; \ - \ - vpunpckhqdq t4, t1, c; \ - vpshufb t3, c, c; \ - vpunpcklqdq t4, t1, d; \ - vpshufb t3, d, d; - -/* load blocks to registers and apply pre-whitening */ -#define inpack16_pre(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, rio, key) \ - vmovq key, x0; \ - vpshufb .Lpack_bswap RIP, x0, x0; \ - \ - vpxor 0 * 16(rio), x0, y7; \ - vpxor 1 * 16(rio), x0, y6; \ - vpxor 2 * 16(rio), x0, y5; \ - vpxor 3 * 16(rio), x0, y4; \ - vpxor 4 * 16(rio), x0, y3; \ - vpxor 5 * 16(rio), x0, y2; \ - vpxor 6 * 16(rio), x0, y1; \ - vpxor 7 * 16(rio), x0, y0; \ - vpxor 8 * 16(rio), x0, x7; \ - vpxor 9 * 16(rio), x0, x6; \ - vpxor 10 * 16(rio), x0, x5; \ - vpxor 11 * 16(rio), x0, x4; \ - vpxor 12 * 16(rio), x0, x3; \ - vpxor 13 * 16(rio), x0, x2; \ - vpxor 14 * 16(rio), x0, x1; \ - vpxor 15 * 16(rio), x0, x0; - -/* byteslice pre-whitened blocks and store to temporary memory */ -#define inpack16_post(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd) \ - byteslice_16x16b_fast(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, \ - y4, y5, y6, y7, (mem_ab), (mem_cd)); \ - \ - vmovdqu x0, 0 * 16(mem_ab); \ - vmovdqu x1, 1 * 16(mem_ab); \ - vmovdqu x2, 2 * 16(mem_ab); \ - vmovdqu x3, 3 * 16(mem_ab); \ - vmovdqu x4, 4 * 16(mem_ab); \ - vmovdqu x5, 5 * 16(mem_ab); \ - vmovdqu x6, 6 * 16(mem_ab); \ - vmovdqu x7, 7 * 16(mem_ab); \ - vmovdqu y0, 0 * 16(mem_cd); \ - vmovdqu y1, 1 * 16(mem_cd); \ - vmovdqu y2, 2 * 16(mem_cd); \ - vmovdqu y3, 3 * 16(mem_cd); \ - vmovdqu y4, 4 * 16(mem_cd); \ - vmovdqu y5, 5 * 16(mem_cd); \ - vmovdqu y6, 6 * 16(mem_cd); \ - vmovdqu y7, 7 * 16(mem_cd); - -/* de-byteslice, apply post-whitening and store blocks */ -#define outunpack16(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, \ - y5, y6, y7, key, stack_tmp0, stack_tmp1) \ - byteslice_16x16b_fast(y0, y4, x0, x4, y1, y5, x1, x5, y2, y6, x2, x6, \ - y3, y7, x3, x7, stack_tmp0, stack_tmp1); \ - \ - vmovdqu x0, stack_tmp0; \ - \ - vmovq key, x0; \ - vpshufb .Lpack_bswap RIP, x0, x0; \ - \ - vpxor x0, y7, y7; \ - vpxor x0, y6, y6; \ - vpxor x0, y5, y5; \ - vpxor x0, y4, y4; \ - vpxor x0, y3, y3; \ - vpxor x0, y2, y2; \ - vpxor x0, y1, y1; \ - vpxor x0, y0, y0; \ - vpxor x0, x7, x7; \ - vpxor x0, x6, x6; \ - vpxor x0, x5, x5; \ - vpxor x0, x4, x4; \ - vpxor x0, x3, x3; \ - vpxor x0, x2, x2; \ - vpxor x0, x1, x1; \ - vpxor stack_tmp0, x0, x0; - -#define write_output(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, rio) \ - vmovdqu x0, 0 * 16(rio); \ - vmovdqu x1, 1 * 16(rio); \ - vmovdqu x2, 2 * 16(rio); \ - vmovdqu x3, 3 * 16(rio); \ - vmovdqu x4, 4 * 16(rio); \ - vmovdqu x5, 5 * 16(rio); \ - vmovdqu x6, 6 * 16(rio); \ - vmovdqu x7, 7 * 16(rio); \ - vmovdqu y0, 8 * 16(rio); \ - vmovdqu y1, 9 * 16(rio); \ - vmovdqu y2, 10 * 16(rio); \ - vmovdqu y3, 11 * 16(rio); \ - vmovdqu y4, 12 * 16(rio); \ - vmovdqu y5, 13 * 16(rio); \ - vmovdqu y6, 14 * 16(rio); \ - vmovdqu y7, 15 * 16(rio); - -.data -.align 16 - -#define SHUFB_BYTES(idx) \ - 0 + (idx), 4 + (idx), 8 + (idx), 12 + (idx) - -.Lshufb_16x16b: - .byte SHUFB_BYTES(0), SHUFB_BYTES(1), SHUFB_BYTES(2), SHUFB_BYTES(3); - -.Lpack_bswap: - .long 0x00010203 - .long 0x04050607 - .long 0x80808080 - .long 0x80808080 - -/* For CTR-mode IV byteswap */ -.Lbswap128_mask: - .byte 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 - -/* - * pre-SubByte transform - * - * pre-lookup for sbox1, sbox2, sbox3: - * swap_bitendianness( - * isom_map_camellia_to_aes( - * camellia_f( - * swap_bitendianess(in) - * ) - * ) - * ) - * - * (note: '⊕ 0xc5' inside camellia_f()) - */ -.Lpre_tf_lo_s1: - .byte 0x45, 0xe8, 0x40, 0xed, 0x2e, 0x83, 0x2b, 0x86 - .byte 0x4b, 0xe6, 0x4e, 0xe3, 0x20, 0x8d, 0x25, 0x88 -.Lpre_tf_hi_s1: - .byte 0x00, 0x51, 0xf1, 0xa0, 0x8a, 0xdb, 0x7b, 0x2a - .byte 0x09, 0x58, 0xf8, 0xa9, 0x83, 0xd2, 0x72, 0x23 - -/* - * pre-SubByte transform - * - * pre-lookup for sbox4: - * swap_bitendianness( - * isom_map_camellia_to_aes( - * camellia_f( - * swap_bitendianess(in <<< 1) - * ) - * ) - * ) - * - * (note: '⊕ 0xc5' inside camellia_f()) - */ -.Lpre_tf_lo_s4: - .byte 0x45, 0x40, 0x2e, 0x2b, 0x4b, 0x4e, 0x20, 0x25 - .byte 0x14, 0x11, 0x7f, 0x7a, 0x1a, 0x1f, 0x71, 0x74 -.Lpre_tf_hi_s4: - .byte 0x00, 0xf1, 0x8a, 0x7b, 0x09, 0xf8, 0x83, 0x72 - .byte 0xad, 0x5c, 0x27, 0xd6, 0xa4, 0x55, 0x2e, 0xdf - -/* - * post-SubByte transform - * - * post-lookup for sbox1, sbox4: - * swap_bitendianness( - * camellia_h( - * isom_map_aes_to_camellia( - * swap_bitendianness( - * aes_inverse_affine_transform(in) - * ) - * ) - * ) - * ) - * - * (note: '⊕ 0x6e' inside camellia_h()) - */ -.Lpost_tf_lo_s1: - .byte 0x3c, 0xcc, 0xcf, 0x3f, 0x32, 0xc2, 0xc1, 0x31 - .byte 0xdc, 0x2c, 0x2f, 0xdf, 0xd2, 0x22, 0x21, 0xd1 -.Lpost_tf_hi_s1: - .byte 0x00, 0xf9, 0x86, 0x7f, 0xd7, 0x2e, 0x51, 0xa8 - .byte 0xa4, 0x5d, 0x22, 0xdb, 0x73, 0x8a, 0xf5, 0x0c - -/* - * post-SubByte transform - * - * post-lookup for sbox2: - * swap_bitendianness( - * camellia_h( - * isom_map_aes_to_camellia( - * swap_bitendianness( - * aes_inverse_affine_transform(in) - * ) - * ) - * ) - * ) <<< 1 - * - * (note: '⊕ 0x6e' inside camellia_h()) - */ -.Lpost_tf_lo_s2: - .byte 0x78, 0x99, 0x9f, 0x7e, 0x64, 0x85, 0x83, 0x62 - .byte 0xb9, 0x58, 0x5e, 0xbf, 0xa5, 0x44, 0x42, 0xa3 -.Lpost_tf_hi_s2: - .byte 0x00, 0xf3, 0x0d, 0xfe, 0xaf, 0x5c, 0xa2, 0x51 - .byte 0x49, 0xba, 0x44, 0xb7, 0xe6, 0x15, 0xeb, 0x18 - -/* - * post-SubByte transform - * - * post-lookup for sbox3: - * swap_bitendianness( - * camellia_h( - * isom_map_aes_to_camellia( - * swap_bitendianness( - * aes_inverse_affine_transform(in) - * ) - * ) - * ) - * ) >>> 1 - * - * (note: '⊕ 0x6e' inside camellia_h()) - */ -.Lpost_tf_lo_s3: - .byte 0x1e, 0x66, 0xe7, 0x9f, 0x19, 0x61, 0xe0, 0x98 - .byte 0x6e, 0x16, 0x97, 0xef, 0x69, 0x11, 0x90, 0xe8 -.Lpost_tf_hi_s3: - .byte 0x00, 0xfc, 0x43, 0xbf, 0xeb, 0x17, 0xa8, 0x54 - .byte 0x52, 0xae, 0x11, 0xed, 0xb9, 0x45, 0xfa, 0x06 - -/* For isolating SubBytes from AESENCLAST, inverse shift row */ -.Linv_shift_row: - .byte 0x00, 0x0d, 0x0a, 0x07, 0x04, 0x01, 0x0e, 0x0b - .byte 0x08, 0x05, 0x02, 0x0f, 0x0c, 0x09, 0x06, 0x03 - -/* shuffle mask for 8x8 byte transpose */ -.Ltranspose_8x8_shuf: - .byte 0, 1, 4, 5, 2, 3, 6, 7, 8+0, 8+1, 8+4, 8+5, 8+2, 8+3, 8+6, 8+7 - -.align 4 -/* 4-bit mask */ -.L0f0f0f0f: - .long 0x0f0f0f0f - -.text - -.align 8 -.type __camellia_enc_blk16,@function; - -__camellia_enc_blk16: - /* input: - * %rdi: ctx, CTX - * %rax: temporary storage, 256 bytes - * %xmm0..%xmm15: 16 plaintext blocks - * output: - * %xmm0..%xmm15: 16 encrypted blocks, order swapped: - * 7, 8, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8 - */ - - leaq 8 * 16(%rax), %rcx; - - inpack16_post(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rax, %rcx); - - enc_rounds16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rax, %rcx, 0); - - fls16(%rax, %xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %rcx, %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, - ((key_table + (8) * 8) + 0)(CTX), - ((key_table + (8) * 8) + 4)(CTX), - ((key_table + (8) * 8) + 8)(CTX), - ((key_table + (8) * 8) + 12)(CTX)); - - enc_rounds16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rax, %rcx, 8); - - fls16(%rax, %xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %rcx, %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, - ((key_table + (16) * 8) + 0)(CTX), - ((key_table + (16) * 8) + 4)(CTX), - ((key_table + (16) * 8) + 8)(CTX), - ((key_table + (16) * 8) + 12)(CTX)); - - enc_rounds16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rax, %rcx, 16); - - movl $24, %r8d; - cmpl $128, key_bitlength(CTX); - jne .Lenc_max32; - -.Lenc_done: - /* load CD for output */ - vmovdqu 0 * 16(%rcx), %xmm8; - vmovdqu 1 * 16(%rcx), %xmm9; - vmovdqu 2 * 16(%rcx), %xmm10; - vmovdqu 3 * 16(%rcx), %xmm11; - vmovdqu 4 * 16(%rcx), %xmm12; - vmovdqu 5 * 16(%rcx), %xmm13; - vmovdqu 6 * 16(%rcx), %xmm14; - vmovdqu 7 * 16(%rcx), %xmm15; - - outunpack16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax)); - - ret; - -.align 8 -.Lenc_max32: - movl $32, %r8d; - - fls16(%rax, %xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %rcx, %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, - ((key_table + (24) * 8) + 0)(CTX), - ((key_table + (24) * 8) + 4)(CTX), - ((key_table + (24) * 8) + 8)(CTX), - ((key_table + (24) * 8) + 12)(CTX)); - - enc_rounds16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rax, %rcx, 24); - - jmp .Lenc_done; -.size __camellia_enc_blk16,.-__camellia_enc_blk16; - -.align 8 -.type __camellia_dec_blk16,@function; - -__camellia_dec_blk16: - /* input: - * %rdi: ctx, CTX - * %rax: temporary storage, 256 bytes - * %r8d: 24 for 16 byte key, 32 for larger - * %xmm0..%xmm15: 16 encrypted blocks - * output: - * %xmm0..%xmm15: 16 plaintext blocks, order swapped: - * 7, 8, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8 - */ - - leaq 8 * 16(%rax), %rcx; - - inpack16_post(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rax, %rcx); - - cmpl $32, %r8d; - je .Ldec_max32; - -.Ldec_max24: - dec_rounds16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rax, %rcx, 16); - - fls16(%rax, %xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %rcx, %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, - ((key_table + (16) * 8) + 8)(CTX), - ((key_table + (16) * 8) + 12)(CTX), - ((key_table + (16) * 8) + 0)(CTX), - ((key_table + (16) * 8) + 4)(CTX)); - - dec_rounds16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rax, %rcx, 8); - - fls16(%rax, %xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %rcx, %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, - ((key_table + (8) * 8) + 8)(CTX), - ((key_table + (8) * 8) + 12)(CTX), - ((key_table + (8) * 8) + 0)(CTX), - ((key_table + (8) * 8) + 4)(CTX)); - - dec_rounds16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rax, %rcx, 0); - - /* load CD for output */ - vmovdqu 0 * 16(%rcx), %xmm8; - vmovdqu 1 * 16(%rcx), %xmm9; - vmovdqu 2 * 16(%rcx), %xmm10; - vmovdqu 3 * 16(%rcx), %xmm11; - vmovdqu 4 * 16(%rcx), %xmm12; - vmovdqu 5 * 16(%rcx), %xmm13; - vmovdqu 6 * 16(%rcx), %xmm14; - vmovdqu 7 * 16(%rcx), %xmm15; - - outunpack16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax)); - - ret; - -.align 8 -.Ldec_max32: - dec_rounds16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rax, %rcx, 24); - - fls16(%rax, %xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %rcx, %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, - ((key_table + (24) * 8) + 8)(CTX), - ((key_table + (24) * 8) + 12)(CTX), - ((key_table + (24) * 8) + 0)(CTX), - ((key_table + (24) * 8) + 4)(CTX)); - - jmp .Ldec_max24; -.size __camellia_dec_blk16,.-__camellia_dec_blk16; - -#define inc_le128(x, minus_one, tmp) \ - vpcmpeqq minus_one, x, tmp; \ - vpsubq minus_one, x, x; \ - vpslldq $8, tmp, tmp; \ - vpsubq tmp, x, x; - -.align 8 -.globl _gcry_camellia_aesni_avx_ctr_enc -.type _gcry_camellia_aesni_avx_ctr_enc,@function; - -_gcry_camellia_aesni_avx_ctr_enc: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (16 blocks) - * %rdx: src (16 blocks) - * %rcx: iv (big endian, 128bit) - */ - - pushq %rbp; - movq %rsp, %rbp; - - vzeroupper; - - subq $(16 * 16), %rsp; - andq $~31, %rsp; - movq %rsp, %rax; - - vmovdqa .Lbswap128_mask RIP, %xmm14; - - /* load IV and byteswap */ - vmovdqu (%rcx), %xmm15; - vmovdqu %xmm15, 15 * 16(%rax); - vpshufb %xmm14, %xmm15, %xmm0; /* be => le */ - - vpcmpeqd %xmm15, %xmm15, %xmm15; - vpsrldq $8, %xmm15, %xmm15; /* low: -1, high: 0 */ - - /* construct IVs */ - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm13; - vmovdqu %xmm13, 14 * 16(%rax); - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm13; - vmovdqu %xmm13, 13 * 16(%rax); - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm12; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm11; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm10; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm9; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm8; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm7; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm6; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm5; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm4; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm3; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm2; - inc_le128(%xmm0, %xmm15, %xmm13); - vpshufb %xmm14, %xmm0, %xmm1; - inc_le128(%xmm0, %xmm15, %xmm13); - vmovdqa %xmm0, %xmm13; - vpshufb %xmm14, %xmm0, %xmm0; - inc_le128(%xmm13, %xmm15, %xmm14); - vpshufb .Lbswap128_mask RIP, %xmm13, %xmm13; /* le => be */ - vmovdqu %xmm13, (%rcx); - - /* inpack16_pre: */ - vmovq (key_table)(CTX), %xmm15; - vpshufb .Lpack_bswap RIP, %xmm15, %xmm15; - vpxor %xmm0, %xmm15, %xmm0; - vpxor %xmm1, %xmm15, %xmm1; - vpxor %xmm2, %xmm15, %xmm2; - vpxor %xmm3, %xmm15, %xmm3; - vpxor %xmm4, %xmm15, %xmm4; - vpxor %xmm5, %xmm15, %xmm5; - vpxor %xmm6, %xmm15, %xmm6; - vpxor %xmm7, %xmm15, %xmm7; - vpxor %xmm8, %xmm15, %xmm8; - vpxor %xmm9, %xmm15, %xmm9; - vpxor %xmm10, %xmm15, %xmm10; - vpxor %xmm11, %xmm15, %xmm11; - vpxor %xmm12, %xmm15, %xmm12; - vpxor 13 * 16(%rax), %xmm15, %xmm13; - vpxor 14 * 16(%rax), %xmm15, %xmm14; - vpxor 15 * 16(%rax), %xmm15, %xmm15; - - call __camellia_enc_blk16; - - vpxor 0 * 16(%rdx), %xmm7, %xmm7; - vpxor 1 * 16(%rdx), %xmm6, %xmm6; - vpxor 2 * 16(%rdx), %xmm5, %xmm5; - vpxor 3 * 16(%rdx), %xmm4, %xmm4; - vpxor 4 * 16(%rdx), %xmm3, %xmm3; - vpxor 5 * 16(%rdx), %xmm2, %xmm2; - vpxor 6 * 16(%rdx), %xmm1, %xmm1; - vpxor 7 * 16(%rdx), %xmm0, %xmm0; - vpxor 8 * 16(%rdx), %xmm15, %xmm15; - vpxor 9 * 16(%rdx), %xmm14, %xmm14; - vpxor 10 * 16(%rdx), %xmm13, %xmm13; - vpxor 11 * 16(%rdx), %xmm12, %xmm12; - vpxor 12 * 16(%rdx), %xmm11, %xmm11; - vpxor 13 * 16(%rdx), %xmm10, %xmm10; - vpxor 14 * 16(%rdx), %xmm9, %xmm9; - vpxor 15 * 16(%rdx), %xmm8, %xmm8; - - write_output(%xmm7, %xmm6, %xmm5, %xmm4, %xmm3, %xmm2, %xmm1, %xmm0, - %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9, - %xmm8, %rsi); - - vzeroall; - - leave; - ret; -.size _gcry_camellia_aesni_avx_ctr_enc,.-_gcry_camellia_aesni_avx_ctr_enc; - -.align 8 -.globl _gcry_camellia_aesni_avx_cbc_dec -.type _gcry_camellia_aesni_avx_cbc_dec,@function; - -_gcry_camellia_aesni_avx_cbc_dec: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (16 blocks) - * %rdx: src (16 blocks) - * %rcx: iv - */ - - pushq %rbp; - movq %rsp, %rbp; - - vzeroupper; - - movq %rcx, %r9; - - cmpl $128, key_bitlength(CTX); - movl $32, %r8d; - movl $24, %eax; - cmovel %eax, %r8d; /* max */ - - inpack16_pre(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, - %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, - %xmm15, %rdx, (key_table)(CTX, %r8, 8)); - - subq $(16 * 16), %rsp; - andq $~31, %rsp; - movq %rsp, %rax; - - call __camellia_dec_blk16; - - /* XOR output with IV */ - vpxor (%r9), %xmm7, %xmm7; - vpxor (0 * 16)(%rdx), %xmm6, %xmm6; - vpxor (1 * 16)(%rdx), %xmm5, %xmm5; - vpxor (2 * 16)(%rdx), %xmm4, %xmm4; - vpxor (3 * 16)(%rdx), %xmm3, %xmm3; - vpxor (4 * 16)(%rdx), %xmm2, %xmm2; - vpxor (5 * 16)(%rdx), %xmm1, %xmm1; - vpxor (6 * 16)(%rdx), %xmm0, %xmm0; - vpxor (7 * 16)(%rdx), %xmm15, %xmm15; - vpxor (8 * 16)(%rdx), %xmm14, %xmm14; - vpxor (9 * 16)(%rdx), %xmm13, %xmm13; - vpxor (10 * 16)(%rdx), %xmm12, %xmm12; - vpxor (11 * 16)(%rdx), %xmm11, %xmm11; - vpxor (12 * 16)(%rdx), %xmm10, %xmm10; - vpxor (13 * 16)(%rdx), %xmm9, %xmm9; - vpxor (14 * 16)(%rdx), %xmm8, %xmm8; - movq (15 * 16 + 0)(%rdx), %r10; - movq (15 * 16 + 8)(%rdx), %r11; - - write_output(%xmm7, %xmm6, %xmm5, %xmm4, %xmm3, %xmm2, %xmm1, %xmm0, - %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9, - %xmm8, %rsi); - - /* store new IV */ - movq %r10, (0)(%r9); - movq %r11, (8)(%r9); - - vzeroall; - - leave; - ret; -.size _gcry_camellia_aesni_avx_cbc_dec,.-_gcry_camellia_aesni_avx_cbc_dec; - -.align 8 -.globl _gcry_camellia_aesni_avx_cfb_dec -.type _gcry_camellia_aesni_avx_cfb_dec,@function; - -_gcry_camellia_aesni_avx_cfb_dec: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (16 blocks) - * %rdx: src (16 blocks) - * %rcx: iv - */ - - pushq %rbp; - movq %rsp, %rbp; - - vzeroupper; - - subq $(16 * 16), %rsp; - andq $~31, %rsp; - movq %rsp, %rax; - - /* inpack16_pre: */ - vmovq (key_table)(CTX), %xmm0; - vpshufb .Lpack_bswap RIP, %xmm0, %xmm0; - vpxor (%rcx), %xmm0, %xmm15; - vmovdqu 15 * 16(%rdx), %xmm1; - vmovdqu %xmm1, (%rcx); /* store new IV */ - vpxor 0 * 16(%rdx), %xmm0, %xmm14; - vpxor 1 * 16(%rdx), %xmm0, %xmm13; - vpxor 2 * 16(%rdx), %xmm0, %xmm12; - vpxor 3 * 16(%rdx), %xmm0, %xmm11; - vpxor 4 * 16(%rdx), %xmm0, %xmm10; - vpxor 5 * 16(%rdx), %xmm0, %xmm9; - vpxor 6 * 16(%rdx), %xmm0, %xmm8; - vpxor 7 * 16(%rdx), %xmm0, %xmm7; - vpxor 8 * 16(%rdx), %xmm0, %xmm6; - vpxor 9 * 16(%rdx), %xmm0, %xmm5; - vpxor 10 * 16(%rdx), %xmm0, %xmm4; - vpxor 11 * 16(%rdx), %xmm0, %xmm3; - vpxor 12 * 16(%rdx), %xmm0, %xmm2; - vpxor 13 * 16(%rdx), %xmm0, %xmm1; - vpxor 14 * 16(%rdx), %xmm0, %xmm0; - - call __camellia_enc_blk16; - - vpxor 0 * 16(%rdx), %xmm7, %xmm7; - vpxor 1 * 16(%rdx), %xmm6, %xmm6; - vpxor 2 * 16(%rdx), %xmm5, %xmm5; - vpxor 3 * 16(%rdx), %xmm4, %xmm4; - vpxor 4 * 16(%rdx), %xmm3, %xmm3; - vpxor 5 * 16(%rdx), %xmm2, %xmm2; - vpxor 6 * 16(%rdx), %xmm1, %xmm1; - vpxor 7 * 16(%rdx), %xmm0, %xmm0; - vpxor 8 * 16(%rdx), %xmm15, %xmm15; - vpxor 9 * 16(%rdx), %xmm14, %xmm14; - vpxor 10 * 16(%rdx), %xmm13, %xmm13; - vpxor 11 * 16(%rdx), %xmm12, %xmm12; - vpxor 12 * 16(%rdx), %xmm11, %xmm11; - vpxor 13 * 16(%rdx), %xmm10, %xmm10; - vpxor 14 * 16(%rdx), %xmm9, %xmm9; - vpxor 15 * 16(%rdx), %xmm8, %xmm8; - - write_output(%xmm7, %xmm6, %xmm5, %xmm4, %xmm3, %xmm2, %xmm1, %xmm0, - %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9, - %xmm8, %rsi); - - vzeroall; - - leave; - ret; -.size _gcry_camellia_aesni_avx_cfb_dec,.-_gcry_camellia_aesni_avx_cfb_dec; - -/* - * IN: - * ab: 64-bit AB state - * cd: 64-bit CD state - */ -#define camellia_f(ab, x, t0, t1, t2, t3, t4, inv_shift_row, sbox4mask, \ - _0f0f0f0fmask, pre_s1lo_mask, pre_s1hi_mask, key) \ - vmovq key, t0; \ - vpxor x, x, t3; \ - \ - vpxor ab, t0, x; \ - \ - /* \ - * S-function with AES subbytes \ - */ \ - \ - /* input rotation for sbox4 (<<< 1) */ \ - vpand x, sbox4mask, t0; \ - vpandn x, sbox4mask, x; \ - vpaddw t0, t0, t1; \ - vpsrlw $7, t0, t0; \ - vpor t0, t1, t0; \ - vpand sbox4mask, t0, t0; \ - vpor t0, x, x; \ - \ - vmovdqa .Lpost_tf_lo_s1 RIP, t0; \ - vmovdqa .Lpost_tf_hi_s1 RIP, t1; \ - \ - /* prefilter sboxes */ \ - filter_8bit(x, pre_s1lo_mask, pre_s1hi_mask, _0f0f0f0fmask, t2); \ - \ - /* AES subbytes + AES shift rows + AES inv shift rows */ \ - vaesenclast t3, x, x; \ - \ - /* postfilter sboxes */ \ - filter_8bit(x, t0, t1, _0f0f0f0fmask, t2); \ - \ - /* output rotation for sbox2 (<<< 1) */ \ - /* output rotation for sbox3 (>>> 1) */ \ - vpshufb inv_shift_row, x, t1; \ - vpshufb .Lsp0044440444044404mask RIP, x, t4; \ - vpshufb .Lsp1110111010011110mask RIP, x, x; \ - vpaddb t1, t1, t2; \ - vpsrlw $7, t1, t0; \ - vpsllw $7, t1, t3; \ - vpor t0, t2, t0; \ - vpsrlw $1, t1, t1; \ - vpshufb .Lsp0222022222000222mask RIP, t0, t0; \ - vpor t1, t3, t1; \ - \ - vpxor x, t4, t4; \ - vpshufb .Lsp3033303303303033mask RIP, t1, t1; \ - vpxor t4, t0, t0; \ - vpxor t1, t0, t0; \ - vpsrldq $8, t0, x; \ - vpxor t0, x, x; - -#define vec_rol128(in, out, nrol, t0) \ - vpshufd $0x4e, in, out; \ - vpsllq $(nrol), in, t0; \ - vpsrlq $(64-(nrol)), out, out; \ - vpaddd t0, out, out; - -#define vec_ror128(in, out, nror, t0) \ - vpshufd $0x4e, in, out; \ - vpsrlq $(nror), in, t0; \ - vpsllq $(64-(nror)), out, out; \ - vpaddd t0, out, out; - -.data - -.align 16 -.Linv_shift_row_and_unpcklbw: - .byte 0x00, 0xff, 0x0d, 0xff, 0x0a, 0xff, 0x07, 0xff - .byte 0x04, 0xff, 0x01, 0xff, 0x0e, 0xff, 0x0b, 0xff -.Lsp0044440444044404mask: - .long 0xffff0404, 0x0404ff04; - .long 0x0d0dff0d, 0x0d0dff0d; -.Lsp1110111010011110mask: - .long 0x000000ff, 0x000000ff; - .long 0x0bffff0b, 0x0b0b0bff; -.Lsp0222022222000222mask: - .long 0xff060606, 0xff060606; - .long 0x0c0cffff, 0xff0c0c0c; -.Lsp3033303303303033mask: - .long 0x04ff0404, 0x04ff0404; - .long 0xff0a0aff, 0x0aff0a0a; -.Lsbox4_input_mask: - .byte 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00; -.Lsigma1: - .long 0x3BCC908B, 0xA09E667F; -.Lsigma2: - .long 0x4CAA73B2, 0xB67AE858; -.Lsigma3: - .long 0xE94F82BE, 0xC6EF372F; -.Lsigma4: - .long 0xF1D36F1C, 0x54FF53A5; -.Lsigma5: - .long 0xDE682D1D, 0x10E527FA; -.Lsigma6: - .long 0xB3E6C1FD, 0xB05688C2; - -.text - -.align 8 -.type __camellia_avx_setup128,@function; -__camellia_avx_setup128: - /* input: - * %rdi: ctx, CTX; subkey storage at key_table(CTX) - * %xmm0: key - */ -#define cmll_sub(n, ctx) (key_table+((n)*8))(ctx) -#define KL128 %xmm0 -#define KA128 %xmm2 - - vpshufb .Lbswap128_mask RIP, KL128, KL128; - - vmovdqa .Linv_shift_row_and_unpcklbw RIP, %xmm11; - vmovq .Lsbox4_input_mask RIP, %xmm12; - vbroadcastss .L0f0f0f0f RIP, %xmm13; - vmovdqa .Lpre_tf_lo_s1 RIP, %xmm14; - vmovdqa .Lpre_tf_hi_s1 RIP, %xmm15; - - /* - * Generate KA - */ - vpsrldq $8, KL128, %xmm2; - vmovdqa KL128, %xmm3; - vpslldq $8, %xmm3, %xmm3; - vpsrldq $8, %xmm3, %xmm3; - - camellia_f(%xmm2, %xmm4, %xmm1, - %xmm5, %xmm6, %xmm7, %xmm8, - %xmm11, %xmm12, %xmm13, %xmm14, %xmm15, .Lsigma1 RIP); - vpxor %xmm4, %xmm3, %xmm3; - camellia_f(%xmm3, %xmm2, %xmm1, - %xmm5, %xmm6, %xmm7, %xmm8, - %xmm11, %xmm12, %xmm13, %xmm14, %xmm15, .Lsigma2 RIP); - camellia_f(%xmm2, %xmm3, %xmm1, - %xmm5, %xmm6, %xmm7, %xmm8, - %xmm11, %xmm12, %xmm13, %xmm14, %xmm15, .Lsigma3 RIP); - vpxor %xmm4, %xmm3, %xmm3; - camellia_f(%xmm3, %xmm4, %xmm1, - %xmm5, %xmm6, %xmm7, %xmm8, - %xmm11, %xmm12, %xmm13, %xmm14, %xmm15, .Lsigma4 RIP); - - vpslldq $8, %xmm3, %xmm3; - vpxor %xmm4, %xmm2, %xmm2; - vpsrldq $8, %xmm3, %xmm3; - vpslldq $8, %xmm2, KA128; - vpor %xmm3, KA128, KA128; - - /* - * Generate subkeys - */ - vmovdqu KA128, cmll_sub(24, CTX); - vec_rol128(KL128, %xmm3, 15, %xmm15); - vec_rol128(KA128, %xmm4, 15, %xmm15); - vec_rol128(KA128, %xmm5, 30, %xmm15); - vec_rol128(KL128, %xmm6, 45, %xmm15); - vec_rol128(KA128, %xmm7, 45, %xmm15); - vec_rol128(KL128, %xmm8, 60, %xmm15); - vec_rol128(KA128, %xmm9, 60, %xmm15); - vec_ror128(KL128, %xmm10, 128-77, %xmm15); - - /* absorb kw2 to other subkeys */ - vpslldq $8, KL128, %xmm15; - vpsrldq $8, %xmm15, %xmm15; - vpxor %xmm15, KA128, KA128; - vpxor %xmm15, %xmm3, %xmm3; - vpxor %xmm15, %xmm4, %xmm4; - - /* subl(1) ^= subr(1) & ~subr(9); */ - vpandn %xmm15, %xmm5, %xmm13; - vpslldq $12, %xmm13, %xmm13; - vpsrldq $8, %xmm13, %xmm13; - vpxor %xmm13, %xmm15, %xmm15; - /* dw = subl(1) & subl(9), subr(1) ^= CAMELLIA_RL1(dw); */ - vpand %xmm15, %xmm5, %xmm14; - vpslld $1, %xmm14, %xmm11; - vpsrld $31, %xmm14, %xmm14; - vpaddd %xmm11, %xmm14, %xmm14; - vpslldq $8, %xmm14, %xmm14; - vpsrldq $12, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - - vpxor %xmm15, %xmm6, %xmm6; - vpxor %xmm15, %xmm8, %xmm8; - vpxor %xmm15, %xmm9, %xmm9; - - /* subl(1) ^= subr(1) & ~subr(17); */ - vpandn %xmm15, %xmm10, %xmm13; - vpslldq $12, %xmm13, %xmm13; - vpsrldq $8, %xmm13, %xmm13; - vpxor %xmm13, %xmm15, %xmm15; - /* dw = subl(1) & subl(17), subr(1) ^= CAMELLIA_RL1(dw); */ - vpand %xmm15, %xmm10, %xmm14; - vpslld $1, %xmm14, %xmm11; - vpsrld $31, %xmm14, %xmm14; - vpaddd %xmm11, %xmm14, %xmm14; - vpslldq $8, %xmm14, %xmm14; - vpsrldq $12, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - - vpshufd $0x1b, KL128, KL128; - vpshufd $0x1b, KA128, KA128; - vpshufd $0x1b, %xmm3, %xmm3; - vpshufd $0x1b, %xmm4, %xmm4; - vpshufd $0x1b, %xmm5, %xmm5; - vpshufd $0x1b, %xmm6, %xmm6; - vpshufd $0x1b, %xmm7, %xmm7; - vpshufd $0x1b, %xmm8, %xmm8; - vpshufd $0x1b, %xmm9, %xmm9; - vpshufd $0x1b, %xmm10, %xmm10; - - vmovdqu KL128, cmll_sub(0, CTX); - vpshufd $0x1b, KL128, KL128; - vmovdqu KA128, cmll_sub(2, CTX); - vmovdqu %xmm3, cmll_sub(4, CTX); - vmovdqu %xmm4, cmll_sub(6, CTX); - vmovdqu %xmm5, cmll_sub(8, CTX); - vmovdqu %xmm6, cmll_sub(10, CTX); - vpsrldq $8, %xmm8, %xmm8; - vmovq %xmm7, cmll_sub(12, CTX); - vmovq %xmm8, cmll_sub(13, CTX); - vmovdqu %xmm9, cmll_sub(14, CTX); - vmovdqu %xmm10, cmll_sub(16, CTX); - - vmovdqu cmll_sub(24, CTX), KA128; - - vec_ror128(KL128, %xmm3, 128 - 94, %xmm7); - vec_ror128(KA128, %xmm4, 128 - 94, %xmm7); - vec_ror128(KL128, %xmm5, 128 - 111, %xmm7); - vec_ror128(KA128, %xmm6, 128 - 111, %xmm7); - - vpxor %xmm15, %xmm3, %xmm3; - vpxor %xmm15, %xmm4, %xmm4; - vpxor %xmm15, %xmm5, %xmm5; - vpslldq $8, %xmm15, %xmm15; - vpxor %xmm15, %xmm6, %xmm6; - - /* absorb kw4 to other subkeys */ - vpslldq $8, %xmm6, %xmm15; - vpxor %xmm15, %xmm5, %xmm5; - vpxor %xmm15, %xmm4, %xmm4; - vpxor %xmm15, %xmm3, %xmm3; - - /* subl(25) ^= subr(25) & ~subr(16); */ - vpshufd $0x1b, cmll_sub(16, CTX), %xmm10; - vpandn %xmm15, %xmm10, %xmm13; - vpslldq $4, %xmm13, %xmm13; - vpxor %xmm13, %xmm15, %xmm15; - /* dw = subl(25) & subl(16), subr(25) ^= CAMELLIA_RL1(dw); */ - vpand %xmm15, %xmm10, %xmm14; - vpslld $1, %xmm14, %xmm11; - vpsrld $31, %xmm14, %xmm14; - vpaddd %xmm11, %xmm14, %xmm14; - vpsrldq $12, %xmm14, %xmm14; - vpslldq $8, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - - vpshufd $0x1b, %xmm3, %xmm3; - vpshufd $0x1b, %xmm4, %xmm4; - vpshufd $0x1b, %xmm5, %xmm5; - vpshufd $0x1b, %xmm6, %xmm6; - - vmovdqu %xmm3, cmll_sub(18, CTX); - vmovdqu %xmm4, cmll_sub(20, CTX); - vmovdqu %xmm5, cmll_sub(22, CTX); - vmovdqu %xmm6, cmll_sub(24, CTX); - - vpshufd $0x1b, cmll_sub(14, CTX), %xmm3; - vpshufd $0x1b, cmll_sub(12, CTX), %xmm4; - vpshufd $0x1b, cmll_sub(10, CTX), %xmm5; - vpshufd $0x1b, cmll_sub(8, CTX), %xmm6; - - vpxor %xmm15, %xmm3, %xmm3; - vpxor %xmm15, %xmm4, %xmm4; - vpxor %xmm15, %xmm5, %xmm5; - - /* subl(25) ^= subr(25) & ~subr(8); */ - vpandn %xmm15, %xmm6, %xmm13; - vpslldq $4, %xmm13, %xmm13; - vpxor %xmm13, %xmm15, %xmm15; - /* dw = subl(25) & subl(8), subr(25) ^= CAMELLIA_RL1(dw); */ - vpand %xmm15, %xmm6, %xmm14; - vpslld $1, %xmm14, %xmm11; - vpsrld $31, %xmm14, %xmm14; - vpaddd %xmm11, %xmm14, %xmm14; - vpsrldq $12, %xmm14, %xmm14; - vpslldq $8, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - - vpshufd $0x1b, %xmm3, %xmm3; - vpshufd $0x1b, %xmm4, %xmm4; - vpshufd $0x1b, %xmm5, %xmm5; - - vmovdqu %xmm3, cmll_sub(14, CTX); - vmovdqu %xmm4, cmll_sub(12, CTX); - vmovdqu %xmm5, cmll_sub(10, CTX); - - vpshufd $0x1b, cmll_sub(6, CTX), %xmm6; - vpshufd $0x1b, cmll_sub(4, CTX), %xmm4; - vpshufd $0x1b, cmll_sub(2, CTX), %xmm2; - vpshufd $0x1b, cmll_sub(0, CTX), %xmm0; - - vpxor %xmm15, %xmm6, %xmm6; - vpxor %xmm15, %xmm4, %xmm4; - vpxor %xmm15, %xmm2, %xmm2; - vpxor %xmm15, %xmm0, %xmm0; - - vpshufd $0x1b, %xmm6, %xmm6; - vpshufd $0x1b, %xmm4, %xmm4; - vpshufd $0x1b, %xmm2, %xmm2; - vpshufd $0x1b, %xmm0, %xmm0; - - vpsrldq $8, %xmm2, %xmm3; - vpsrldq $8, %xmm4, %xmm5; - vpsrldq $8, %xmm6, %xmm7; - - /* - * key XOR is end of F-function. - */ - vpxor %xmm2, %xmm0, %xmm0; - vpxor %xmm4, %xmm2, %xmm2; - - vmovq %xmm0, cmll_sub(0, CTX); - vmovq %xmm3, cmll_sub(2, CTX); - vpxor %xmm5, %xmm3, %xmm3; - vpxor %xmm6, %xmm4, %xmm4; - vpxor %xmm7, %xmm5, %xmm5; - vmovq %xmm2, cmll_sub(3, CTX); - vmovq %xmm3, cmll_sub(4, CTX); - vmovq %xmm4, cmll_sub(5, CTX); - vmovq %xmm5, cmll_sub(6, CTX); - - vmovq cmll_sub(7, CTX), %xmm7; - vmovq cmll_sub(8, CTX), %xmm8; - vmovq cmll_sub(9, CTX), %xmm9; - vmovq cmll_sub(10, CTX), %xmm10; - /* tl = subl(10) ^ (subr(10) & ~subr(8)); */ - vpandn %xmm10, %xmm8, %xmm15; - vpsrldq $4, %xmm15, %xmm15; - vpxor %xmm15, %xmm10, %xmm0; - /* dw = tl & subl(8), tr = subr(10) ^ CAMELLIA_RL1(dw); */ - vpand %xmm8, %xmm0, %xmm15; - vpslld $1, %xmm15, %xmm14; - vpsrld $31, %xmm15, %xmm15; - vpaddd %xmm14, %xmm15, %xmm15; - vpslldq $12, %xmm15, %xmm15; - vpsrldq $8, %xmm15, %xmm15; - vpxor %xmm15, %xmm0, %xmm0; - - vpxor %xmm0, %xmm6, %xmm6; - vmovq %xmm6, cmll_sub(7, CTX); - - vmovq cmll_sub(11, CTX), %xmm11; - vmovq cmll_sub(12, CTX), %xmm12; - vmovq cmll_sub(13, CTX), %xmm13; - vmovq cmll_sub(14, CTX), %xmm14; - vmovq cmll_sub(15, CTX), %xmm15; - /* tl = subl(7) ^ (subr(7) & ~subr(9)); */ - vpandn %xmm7, %xmm9, %xmm1; - vpsrldq $4, %xmm1, %xmm1; - vpxor %xmm1, %xmm7, %xmm0; - /* dw = tl & subl(9), tr = subr(7) ^ CAMELLIA_RL1(dw); */ - vpand %xmm9, %xmm0, %xmm1; - vpslld $1, %xmm1, %xmm2; - vpsrld $31, %xmm1, %xmm1; - vpaddd %xmm2, %xmm1, %xmm1; - vpslldq $12, %xmm1, %xmm1; - vpsrldq $8, %xmm1, %xmm1; - vpxor %xmm1, %xmm0, %xmm0; - - vpxor %xmm11, %xmm0, %xmm0; - vpxor %xmm12, %xmm10, %xmm10; - vpxor %xmm13, %xmm11, %xmm11; - vpxor %xmm14, %xmm12, %xmm12; - vpxor %xmm15, %xmm13, %xmm13; - vmovq %xmm0, cmll_sub(10, CTX); - vmovq %xmm10, cmll_sub(11, CTX); - vmovq %xmm11, cmll_sub(12, CTX); - vmovq %xmm12, cmll_sub(13, CTX); - vmovq %xmm13, cmll_sub(14, CTX); - - vmovq cmll_sub(16, CTX), %xmm6; - vmovq cmll_sub(17, CTX), %xmm7; - vmovq cmll_sub(18, CTX), %xmm8; - vmovq cmll_sub(19, CTX), %xmm9; - vmovq cmll_sub(20, CTX), %xmm10; - /* tl = subl(18) ^ (subr(18) & ~subr(16)); */ - vpandn %xmm8, %xmm6, %xmm1; - vpsrldq $4, %xmm1, %xmm1; - vpxor %xmm1, %xmm8, %xmm0; - /* dw = tl & subl(16), tr = subr(18) ^ CAMELLIA_RL1(dw); */ - vpand %xmm6, %xmm0, %xmm1; - vpslld $1, %xmm1, %xmm2; - vpsrld $31, %xmm1, %xmm1; - vpaddd %xmm2, %xmm1, %xmm1; - vpslldq $12, %xmm1, %xmm1; - vpsrldq $8, %xmm1, %xmm1; - vpxor %xmm1, %xmm0, %xmm0; - - vpxor %xmm14, %xmm0, %xmm0; - vmovq %xmm0, cmll_sub(15, CTX); - - /* tl = subl(15) ^ (subr(15) & ~subr(17)); */ - vpandn %xmm15, %xmm7, %xmm1; - vpsrldq $4, %xmm1, %xmm1; - vpxor %xmm1, %xmm15, %xmm0; - /* dw = tl & subl(17), tr = subr(15) ^ CAMELLIA_RL1(dw); */ - vpand %xmm7, %xmm0, %xmm1; - vpslld $1, %xmm1, %xmm2; - vpsrld $31, %xmm1, %xmm1; - vpaddd %xmm2, %xmm1, %xmm1; - vpslldq $12, %xmm1, %xmm1; - vpsrldq $8, %xmm1, %xmm1; - vpxor %xmm1, %xmm0, %xmm0; - - vmovq cmll_sub(21, CTX), %xmm1; - vmovq cmll_sub(22, CTX), %xmm2; - vmovq cmll_sub(23, CTX), %xmm3; - vmovq cmll_sub(24, CTX), %xmm4; - - vpxor %xmm9, %xmm0, %xmm0; - vpxor %xmm10, %xmm8, %xmm8; - vpxor %xmm1, %xmm9, %xmm9; - vpxor %xmm2, %xmm10, %xmm10; - vpxor %xmm3, %xmm1, %xmm1; - vpxor %xmm4, %xmm3, %xmm3; - - vmovq %xmm0, cmll_sub(18, CTX); - vmovq %xmm8, cmll_sub(19, CTX); - vmovq %xmm9, cmll_sub(20, CTX); - vmovq %xmm10, cmll_sub(21, CTX); - vmovq %xmm1, cmll_sub(22, CTX); - vmovq %xmm2, cmll_sub(23, CTX); - vmovq %xmm3, cmll_sub(24, CTX); - - /* kw2 and kw4 are unused now. */ - movq $0, cmll_sub(1, CTX); - movq $0, cmll_sub(25, CTX); - - vzeroall; - - ret; -.size __camellia_avx_setup128,.-__camellia_avx_setup128; - -.align 8 -.type __camellia_avx_setup256,@function; - -__camellia_avx_setup256: - /* input: - * %rdi: ctx, CTX; subkey storage at key_table(CTX) - * %xmm0 & %xmm1: key - */ -#define KL128 %xmm0 -#define KR128 %xmm1 -#define KA128 %xmm2 -#define KB128 %xmm3 - - vpshufb .Lbswap128_mask RIP, KL128, KL128; - vpshufb .Lbswap128_mask RIP, KR128, KR128; - - vmovdqa .Linv_shift_row_and_unpcklbw RIP, %xmm11; - vmovq .Lsbox4_input_mask RIP, %xmm12; - vbroadcastss .L0f0f0f0f RIP, %xmm13; - vmovdqa .Lpre_tf_lo_s1 RIP, %xmm14; - vmovdqa .Lpre_tf_hi_s1 RIP, %xmm15; - - /* - * Generate KA - */ - vpxor KL128, KR128, %xmm3; - vpsrldq $8, KR128, %xmm6; - vpsrldq $8, %xmm3, %xmm2; - vpslldq $8, %xmm3, %xmm3; - vpsrldq $8, %xmm3, %xmm3; - - camellia_f(%xmm2, %xmm4, %xmm5, - %xmm7, %xmm8, %xmm9, %xmm10, - %xmm11, %xmm12, %xmm13, %xmm14, %xmm15, .Lsigma1 RIP); - vpxor %xmm4, %xmm3, %xmm3; - camellia_f(%xmm3, %xmm2, %xmm5, - %xmm7, %xmm8, %xmm9, %xmm10, - %xmm11, %xmm12, %xmm13, %xmm14, %xmm15, .Lsigma2 RIP); - vpxor %xmm6, %xmm2, %xmm2; - camellia_f(%xmm2, %xmm3, %xmm5, - %xmm7, %xmm8, %xmm9, %xmm10, - %xmm11, %xmm12, %xmm13, %xmm14, %xmm15, .Lsigma3 RIP); - vpxor %xmm4, %xmm3, %xmm3; - vpxor KR128, %xmm3, %xmm3; - camellia_f(%xmm3, %xmm4, %xmm5, - %xmm7, %xmm8, %xmm9, %xmm10, - %xmm11, %xmm12, %xmm13, %xmm14, %xmm15, .Lsigma4 RIP); - - vpslldq $8, %xmm3, %xmm3; - vpxor %xmm4, %xmm2, %xmm2; - vpsrldq $8, %xmm3, %xmm3; - vpslldq $8, %xmm2, KA128; - vpor %xmm3, KA128, KA128; - - /* - * Generate KB - */ - vpxor KA128, KR128, %xmm3; - vpsrldq $8, %xmm3, %xmm4; - vpslldq $8, %xmm3, %xmm3; - vpsrldq $8, %xmm3, %xmm3; - - camellia_f(%xmm4, %xmm5, %xmm6, - %xmm7, %xmm8, %xmm9, %xmm10, - %xmm11, %xmm12, %xmm13, %xmm14, %xmm15, .Lsigma5 RIP); - vpxor %xmm5, %xmm3, %xmm3; - - camellia_f(%xmm3, %xmm5, %xmm6, - %xmm7, %xmm8, %xmm9, %xmm10, - %xmm11, %xmm12, %xmm13, %xmm14, %xmm15, .Lsigma6 RIP); - vpslldq $8, %xmm3, %xmm3; - vpxor %xmm5, %xmm4, %xmm4; - vpsrldq $8, %xmm3, %xmm3; - vpslldq $8, %xmm4, %xmm4; - vpor %xmm3, %xmm4, KB128; - - /* - * Generate subkeys - */ - vmovdqu KB128, cmll_sub(32, CTX); - vec_rol128(KR128, %xmm4, 15, %xmm15); - vec_rol128(KA128, %xmm5, 15, %xmm15); - vec_rol128(KR128, %xmm6, 30, %xmm15); - vec_rol128(KB128, %xmm7, 30, %xmm15); - vec_rol128(KL128, %xmm8, 45, %xmm15); - vec_rol128(KA128, %xmm9, 45, %xmm15); - vec_rol128(KL128, %xmm10, 60, %xmm15); - vec_rol128(KR128, %xmm11, 60, %xmm15); - vec_rol128(KB128, %xmm12, 60, %xmm15); - - /* absorb kw2 to other subkeys */ - vpslldq $8, KL128, %xmm15; - vpsrldq $8, %xmm15, %xmm15; - vpxor %xmm15, KB128, KB128; - vpxor %xmm15, %xmm4, %xmm4; - vpxor %xmm15, %xmm5, %xmm5; - - /* subl(1) ^= subr(1) & ~subr(9); */ - vpandn %xmm15, %xmm6, %xmm13; - vpslldq $12, %xmm13, %xmm13; - vpsrldq $8, %xmm13, %xmm13; - vpxor %xmm13, %xmm15, %xmm15; - /* dw = subl(1) & subl(9), subr(1) ^= CAMELLIA_RL1(dw); */ - vpand %xmm15, %xmm6, %xmm14; - vpslld $1, %xmm14, %xmm13; - vpsrld $31, %xmm14, %xmm14; - vpaddd %xmm13, %xmm14, %xmm14; - vpslldq $8, %xmm14, %xmm14; - vpsrldq $12, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - - vpxor %xmm15, %xmm7, %xmm7; - vpxor %xmm15, %xmm8, %xmm8; - vpxor %xmm15, %xmm9, %xmm9; - - vpshufd $0x1b, KL128, KL128; - vpshufd $0x1b, KB128, KB128; - vpshufd $0x1b, %xmm4, %xmm4; - vpshufd $0x1b, %xmm5, %xmm5; - vpshufd $0x1b, %xmm6, %xmm6; - vpshufd $0x1b, %xmm7, %xmm7; - vpshufd $0x1b, %xmm8, %xmm8; - vpshufd $0x1b, %xmm9, %xmm9; - - vmovdqu KL128, cmll_sub(0, CTX); - vpshufd $0x1b, KL128, KL128; - vmovdqu KB128, cmll_sub(2, CTX); - vmovdqu %xmm4, cmll_sub(4, CTX); - vmovdqu %xmm5, cmll_sub(6, CTX); - vmovdqu %xmm6, cmll_sub(8, CTX); - vmovdqu %xmm7, cmll_sub(10, CTX); - vmovdqu %xmm8, cmll_sub(12, CTX); - vmovdqu %xmm9, cmll_sub(14, CTX); - - vmovdqu cmll_sub(32, CTX), KB128; - - /* subl(1) ^= subr(1) & ~subr(17); */ - vpandn %xmm15, %xmm10, %xmm13; - vpslldq $12, %xmm13, %xmm13; - vpsrldq $8, %xmm13, %xmm13; - vpxor %xmm13, %xmm15, %xmm15; - /* dw = subl(1) & subl(17), subr(1) ^= CAMELLIA_RL1(dw); */ - vpand %xmm15, %xmm10, %xmm14; - vpslld $1, %xmm14, %xmm13; - vpsrld $31, %xmm14, %xmm14; - vpaddd %xmm13, %xmm14, %xmm14; - vpslldq $8, %xmm14, %xmm14; - vpsrldq $12, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - - vpxor %xmm15, %xmm11, %xmm11; - vpxor %xmm15, %xmm12, %xmm12; - - vec_ror128(KL128, %xmm4, 128-77, %xmm14); - vec_ror128(KA128, %xmm5, 128-77, %xmm14); - vec_ror128(KR128, %xmm6, 128-94, %xmm14); - vec_ror128(KA128, %xmm7, 128-94, %xmm14); - vec_ror128(KL128, %xmm8, 128-111, %xmm14); - vec_ror128(KB128, %xmm9, 128-111, %xmm14); - - vpxor %xmm15, %xmm4, %xmm4; - - vpshufd $0x1b, %xmm10, %xmm10; - vpshufd $0x1b, %xmm11, %xmm11; - vpshufd $0x1b, %xmm12, %xmm12; - vpshufd $0x1b, %xmm4, %xmm4; - - vmovdqu %xmm10, cmll_sub(16, CTX); - vmovdqu %xmm11, cmll_sub(18, CTX); - vmovdqu %xmm12, cmll_sub(20, CTX); - vmovdqu %xmm4, cmll_sub(22, CTX); - - /* subl(1) ^= subr(1) & ~subr(25); */ - vpandn %xmm15, %xmm5, %xmm13; - vpslldq $12, %xmm13, %xmm13; - vpsrldq $8, %xmm13, %xmm13; - vpxor %xmm13, %xmm15, %xmm15; - /* dw = subl(1) & subl(25), subr(1) ^= CAMELLIA_RL1(dw); */ - vpand %xmm15, %xmm5, %xmm14; - vpslld $1, %xmm14, %xmm13; - vpsrld $31, %xmm14, %xmm14; - vpaddd %xmm13, %xmm14, %xmm14; - vpslldq $8, %xmm14, %xmm14; - vpsrldq $12, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - - vpxor %xmm15, %xmm6, %xmm6; - vpxor %xmm15, %xmm7, %xmm7; - vpxor %xmm15, %xmm8, %xmm8; - vpslldq $8, %xmm15, %xmm15; - vpxor %xmm15, %xmm9, %xmm9; - - /* absorb kw4 to other subkeys */ - vpslldq $8, %xmm9, %xmm15; - vpxor %xmm15, %xmm8, %xmm8; - vpxor %xmm15, %xmm7, %xmm7; - vpxor %xmm15, %xmm6, %xmm6; - - /* subl(33) ^= subr(33) & ~subr(24); */ - vpandn %xmm15, %xmm5, %xmm14; - vpslldq $4, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - /* dw = subl(33) & subl(24), subr(33) ^= CAMELLIA_RL1(dw); */ - vpand %xmm15, %xmm5, %xmm14; - vpslld $1, %xmm14, %xmm13; - vpsrld $31, %xmm14, %xmm14; - vpaddd %xmm13, %xmm14, %xmm14; - vpsrldq $12, %xmm14, %xmm14; - vpslldq $8, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - - vpshufd $0x1b, %xmm5, %xmm5; - vpshufd $0x1b, %xmm6, %xmm6; - vpshufd $0x1b, %xmm7, %xmm7; - vpshufd $0x1b, %xmm8, %xmm8; - vpshufd $0x1b, %xmm9, %xmm9; - - vmovdqu %xmm5, cmll_sub(24, CTX); - vmovdqu %xmm6, cmll_sub(26, CTX); - vmovdqu %xmm7, cmll_sub(28, CTX); - vmovdqu %xmm8, cmll_sub(30, CTX); - vmovdqu %xmm9, cmll_sub(32, CTX); - - vpshufd $0x1b, cmll_sub(22, CTX), %xmm0; - vpshufd $0x1b, cmll_sub(20, CTX), %xmm1; - vpshufd $0x1b, cmll_sub(18, CTX), %xmm2; - vpshufd $0x1b, cmll_sub(16, CTX), %xmm3; - vpshufd $0x1b, cmll_sub(14, CTX), %xmm4; - vpshufd $0x1b, cmll_sub(12, CTX), %xmm5; - vpshufd $0x1b, cmll_sub(10, CTX), %xmm6; - vpshufd $0x1b, cmll_sub(8, CTX), %xmm7; - - vpxor %xmm15, %xmm0, %xmm0; - vpxor %xmm15, %xmm1, %xmm1; - vpxor %xmm15, %xmm2, %xmm2; - - /* subl(33) ^= subr(33) & ~subr(24); */ - vpandn %xmm15, %xmm3, %xmm14; - vpslldq $4, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - /* dw = subl(33) & subl(24), subr(33) ^= CAMELLIA_RL1(dw); */ - vpand %xmm15, %xmm3, %xmm14; - vpslld $1, %xmm14, %xmm13; - vpsrld $31, %xmm14, %xmm14; - vpaddd %xmm13, %xmm14, %xmm14; - vpsrldq $12, %xmm14, %xmm14; - vpslldq $8, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - - vpxor %xmm15, %xmm4, %xmm4; - vpxor %xmm15, %xmm5, %xmm5; - vpxor %xmm15, %xmm6, %xmm6; - - vpshufd $0x1b, %xmm0, %xmm0; - vpshufd $0x1b, %xmm1, %xmm1; - vpshufd $0x1b, %xmm2, %xmm2; - vpshufd $0x1b, %xmm4, %xmm4; - vpshufd $0x1b, %xmm5, %xmm5; - vpshufd $0x1b, %xmm6, %xmm6; - - vmovdqu %xmm0, cmll_sub(22, CTX); - vmovdqu %xmm1, cmll_sub(20, CTX); - vmovdqu %xmm2, cmll_sub(18, CTX); - vmovdqu %xmm4, cmll_sub(14, CTX); - vmovdqu %xmm5, cmll_sub(12, CTX); - vmovdqu %xmm6, cmll_sub(10, CTX); - - vpshufd $0x1b, cmll_sub(6, CTX), %xmm6; - vpshufd $0x1b, cmll_sub(4, CTX), %xmm4; - vpshufd $0x1b, cmll_sub(2, CTX), %xmm2; - vpshufd $0x1b, cmll_sub(0, CTX), %xmm0; - - /* subl(33) ^= subr(33) & ~subr(24); */ - vpandn %xmm15, %xmm7, %xmm14; - vpslldq $4, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - /* dw = subl(33) & subl(24), subr(33) ^= CAMELLIA_RL1(dw); */ - vpand %xmm15, %xmm7, %xmm14; - vpslld $1, %xmm14, %xmm13; - vpsrld $31, %xmm14, %xmm14; - vpaddd %xmm13, %xmm14, %xmm14; - vpsrldq $12, %xmm14, %xmm14; - vpslldq $8, %xmm14, %xmm14; - vpxor %xmm14, %xmm15, %xmm15; - - vpxor %xmm15, %xmm6, %xmm6; - vpxor %xmm15, %xmm4, %xmm4; - vpxor %xmm15, %xmm2, %xmm2; - vpxor %xmm15, %xmm0, %xmm0; - - vpshufd $0x1b, %xmm6, %xmm6; - vpshufd $0x1b, %xmm4, %xmm4; - vpshufd $0x1b, %xmm2, %xmm2; - vpshufd $0x1b, %xmm0, %xmm0; - - vpsrldq $8, %xmm2, %xmm3; - vpsrldq $8, %xmm4, %xmm5; - vpsrldq $8, %xmm6, %xmm7; - - /* - * key XOR is end of F-function. - */ - vpxor %xmm2, %xmm0, %xmm0; - vpxor %xmm4, %xmm2, %xmm2; - - vmovq %xmm0, cmll_sub(0, CTX); - vmovq %xmm3, cmll_sub(2, CTX); - vpxor %xmm5, %xmm3, %xmm3; - vpxor %xmm6, %xmm4, %xmm4; - vpxor %xmm7, %xmm5, %xmm5; - vmovq %xmm2, cmll_sub(3, CTX); - vmovq %xmm3, cmll_sub(4, CTX); - vmovq %xmm4, cmll_sub(5, CTX); - vmovq %xmm5, cmll_sub(6, CTX); - - vmovq cmll_sub(7, CTX), %xmm7; - vmovq cmll_sub(8, CTX), %xmm8; - vmovq cmll_sub(9, CTX), %xmm9; - vmovq cmll_sub(10, CTX), %xmm10; - /* tl = subl(10) ^ (subr(10) & ~subr(8)); */ - vpandn %xmm10, %xmm8, %xmm15; - vpsrldq $4, %xmm15, %xmm15; - vpxor %xmm15, %xmm10, %xmm0; - /* dw = tl & subl(8), tr = subr(10) ^ CAMELLIA_RL1(dw); */ - vpand %xmm8, %xmm0, %xmm15; - vpslld $1, %xmm15, %xmm14; - vpsrld $31, %xmm15, %xmm15; - vpaddd %xmm14, %xmm15, %xmm15; - vpslldq $12, %xmm15, %xmm15; - vpsrldq $8, %xmm15, %xmm15; - vpxor %xmm15, %xmm0, %xmm0; - - vpxor %xmm0, %xmm6, %xmm6; - vmovq %xmm6, cmll_sub(7, CTX); - - vmovq cmll_sub(11, CTX), %xmm11; - vmovq cmll_sub(12, CTX), %xmm12; - vmovq cmll_sub(13, CTX), %xmm13; - vmovq cmll_sub(14, CTX), %xmm14; - vmovq cmll_sub(15, CTX), %xmm15; - /* tl = subl(7) ^ (subr(7) & ~subr(9)); */ - vpandn %xmm7, %xmm9, %xmm1; - vpsrldq $4, %xmm1, %xmm1; - vpxor %xmm1, %xmm7, %xmm0; - /* dw = tl & subl(9), tr = subr(7) ^ CAMELLIA_RL1(dw); */ - vpand %xmm9, %xmm0, %xmm1; - vpslld $1, %xmm1, %xmm2; - vpsrld $31, %xmm1, %xmm1; - vpaddd %xmm2, %xmm1, %xmm1; - vpslldq $12, %xmm1, %xmm1; - vpsrldq $8, %xmm1, %xmm1; - vpxor %xmm1, %xmm0, %xmm0; - - vpxor %xmm11, %xmm0, %xmm0; - vpxor %xmm12, %xmm10, %xmm10; - vpxor %xmm13, %xmm11, %xmm11; - vpxor %xmm14, %xmm12, %xmm12; - vpxor %xmm15, %xmm13, %xmm13; - vmovq %xmm0, cmll_sub(10, CTX); - vmovq %xmm10, cmll_sub(11, CTX); - vmovq %xmm11, cmll_sub(12, CTX); - vmovq %xmm12, cmll_sub(13, CTX); - vmovq %xmm13, cmll_sub(14, CTX); - - vmovq cmll_sub(16, CTX), %xmm6; - vmovq cmll_sub(17, CTX), %xmm7; - vmovq cmll_sub(18, CTX), %xmm8; - vmovq cmll_sub(19, CTX), %xmm9; - vmovq cmll_sub(20, CTX), %xmm10; - /* tl = subl(18) ^ (subr(18) & ~subr(16)); */ - vpandn %xmm8, %xmm6, %xmm1; - vpsrldq $4, %xmm1, %xmm1; - vpxor %xmm1, %xmm8, %xmm0; - /* dw = tl & subl(16), tr = subr(18) ^ CAMELLIA_RL1(dw); */ - vpand %xmm6, %xmm0, %xmm1; - vpslld $1, %xmm1, %xmm2; - vpsrld $31, %xmm1, %xmm1; - vpaddd %xmm2, %xmm1, %xmm1; - vpslldq $12, %xmm1, %xmm1; - vpsrldq $8, %xmm1, %xmm1; - vpxor %xmm1, %xmm0, %xmm0; - - vpxor %xmm14, %xmm0, %xmm0; - vmovq %xmm0, cmll_sub(15, CTX); - - /* tl = subl(15) ^ (subr(15) & ~subr(17)); */ - vpandn %xmm15, %xmm7, %xmm1; - vpsrldq $4, %xmm1, %xmm1; - vpxor %xmm1, %xmm15, %xmm0; - /* dw = tl & subl(17), tr = subr(15) ^ CAMELLIA_RL1(dw); */ - vpand %xmm7, %xmm0, %xmm1; - vpslld $1, %xmm1, %xmm2; - vpsrld $31, %xmm1, %xmm1; - vpaddd %xmm2, %xmm1, %xmm1; - vpslldq $12, %xmm1, %xmm1; - vpsrldq $8, %xmm1, %xmm1; - vpxor %xmm1, %xmm0, %xmm0; - - vmovq cmll_sub(21, CTX), %xmm1; - vmovq cmll_sub(22, CTX), %xmm2; - vmovq cmll_sub(23, CTX), %xmm3; - vmovq cmll_sub(24, CTX), %xmm4; - - vpxor %xmm9, %xmm0, %xmm0; - vpxor %xmm10, %xmm8, %xmm8; - vpxor %xmm1, %xmm9, %xmm9; - vpxor %xmm2, %xmm10, %xmm10; - vpxor %xmm3, %xmm1, %xmm1; - - vmovq %xmm0, cmll_sub(18, CTX); - vmovq %xmm8, cmll_sub(19, CTX); - vmovq %xmm9, cmll_sub(20, CTX); - vmovq %xmm10, cmll_sub(21, CTX); - vmovq %xmm1, cmll_sub(22, CTX); - - vmovq cmll_sub(25, CTX), %xmm5; - vmovq cmll_sub(26, CTX), %xmm6; - vmovq cmll_sub(27, CTX), %xmm7; - vmovq cmll_sub(28, CTX), %xmm8; - vmovq cmll_sub(29, CTX), %xmm9; - vmovq cmll_sub(30, CTX), %xmm10; - vmovq cmll_sub(31, CTX), %xmm11; - vmovq cmll_sub(32, CTX), %xmm12; - - /* tl = subl(26) ^ (subr(26) & ~subr(24)); */ - vpandn %xmm6, %xmm4, %xmm15; - vpsrldq $4, %xmm15, %xmm15; - vpxor %xmm15, %xmm6, %xmm0; - /* dw = tl & subl(26), tr = subr(24) ^ CAMELLIA_RL1(dw); */ - vpand %xmm4, %xmm0, %xmm15; - vpslld $1, %xmm15, %xmm14; - vpsrld $31, %xmm15, %xmm15; - vpaddd %xmm14, %xmm15, %xmm15; - vpslldq $12, %xmm15, %xmm15; - vpsrldq $8, %xmm15, %xmm15; - vpxor %xmm15, %xmm0, %xmm0; - - vpxor %xmm0, %xmm2, %xmm2; - vmovq %xmm2, cmll_sub(23, CTX); - - /* tl = subl(23) ^ (subr(23) & ~subr(25)); */ - vpandn %xmm3, %xmm5, %xmm15; - vpsrldq $4, %xmm15, %xmm15; - vpxor %xmm15, %xmm3, %xmm0; - /* dw = tl & subl(26), tr = subr(24) ^ CAMELLIA_RL1(dw); */ - vpand %xmm5, %xmm0, %xmm15; - vpslld $1, %xmm15, %xmm14; - vpsrld $31, %xmm15, %xmm15; - vpaddd %xmm14, %xmm15, %xmm15; - vpslldq $12, %xmm15, %xmm15; - vpsrldq $8, %xmm15, %xmm15; - vpxor %xmm15, %xmm0, %xmm0; - - vpxor %xmm7, %xmm0, %xmm0; - vpxor %xmm8, %xmm6, %xmm6; - vpxor %xmm9, %xmm7, %xmm7; - vpxor %xmm10, %xmm8, %xmm8; - vpxor %xmm11, %xmm9, %xmm9; - vpxor %xmm12, %xmm11, %xmm11; - - vmovq %xmm0, cmll_sub(26, CTX); - vmovq %xmm6, cmll_sub(27, CTX); - vmovq %xmm7, cmll_sub(28, CTX); - vmovq %xmm8, cmll_sub(29, CTX); - vmovq %xmm9, cmll_sub(30, CTX); - vmovq %xmm10, cmll_sub(31, CTX); - vmovq %xmm11, cmll_sub(32, CTX); - - /* kw2 and kw4 are unused now. */ - movq $0, cmll_sub(1, CTX); - movq $0, cmll_sub(33, CTX); - - vzeroall; - - ret; -.size __camellia_avx_setup256,.-__camellia_avx_setup256; - -.align 8 -.globl _gcry_camellia_aesni_avx_keygen -.type _gcry_camellia_aesni_avx_keygen,@function; - -_gcry_camellia_aesni_avx_keygen: - /* input: - * %rdi: ctx, CTX - * %rsi: key - * %rdx: keylen - */ - - vzeroupper; - - vmovdqu (%rsi), %xmm0; - cmpl $24, %edx; - jb __camellia_avx_setup128; - je .Lprepare_key192; - - vmovdqu 16(%rsi), %xmm1; - jmp __camellia_avx_setup256; - -.Lprepare_key192: - vpcmpeqd %xmm2, %xmm2, %xmm2; - vmovq 16(%rsi), %xmm1; - - vpxor %xmm1, %xmm2, %xmm2; - vpslldq $8, %xmm2, %xmm2; - vpor %xmm2, %xmm1, %xmm1; - - jmp __camellia_avx_setup256; -.size _gcry_camellia_aesni_avx_keygen,.-_gcry_camellia_aesni_avx_keygen; - -#endif /*defined(ENABLE_AESNI_SUPPORT) && defined(ENABLE_AVX_SUPPORT)*/ -#endif /*__x86_64*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-aesni-avx2-amd64.S b/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-aesni-avx2-amd64.S deleted file mode 100644 index 1a89ff47..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-aesni-avx2-amd64.S +++ /dev/null @@ -1,1263 +0,0 @@ -/* camellia-avx2-aesni-amd64.S - AES-NI/AVX2 implementation of Camellia cipher - * - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifdef __x86_64 -#include -#if defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) && \ - defined(ENABLE_AESNI_SUPPORT) && defined(ENABLE_AVX2_SUPPORT) - -#ifdef __PIC__ -# define RIP (%rip) -#else -# define RIP -#endif - -#define CAMELLIA_TABLE_BYTE_LEN 272 - -/* struct CAMELLIA_context: */ -#define key_table 0 -#define key_bitlength CAMELLIA_TABLE_BYTE_LEN - -/* register macros */ -#define CTX %rdi -#define RIO %r8 - -/********************************************************************** - helper macros - **********************************************************************/ -#define filter_8bit(x, lo_t, hi_t, mask4bit, tmp0) \ - vpand x, mask4bit, tmp0; \ - vpandn x, mask4bit, x; \ - vpsrld $4, x, x; \ - \ - vpshufb tmp0, lo_t, tmp0; \ - vpshufb x, hi_t, x; \ - vpxor tmp0, x, x; - -#define ymm0_x xmm0 -#define ymm1_x xmm1 -#define ymm2_x xmm2 -#define ymm3_x xmm3 -#define ymm4_x xmm4 -#define ymm5_x xmm5 -#define ymm6_x xmm6 -#define ymm7_x xmm7 -#define ymm8_x xmm8 -#define ymm9_x xmm9 -#define ymm10_x xmm10 -#define ymm11_x xmm11 -#define ymm12_x xmm12 -#define ymm13_x xmm13 -#define ymm14_x xmm14 -#define ymm15_x xmm15 - -/********************************************************************** - 32-way camellia - **********************************************************************/ - -/* - * IN: - * x0..x7: byte-sliced AB state - * mem_cd: register pointer storing CD state - * key: index for key material - * OUT: - * x0..x7: new byte-sliced CD state - */ -#define roundsm32(x0, x1, x2, x3, x4, x5, x6, x7, t0, t1, t2, t3, t4, t5, t6, \ - t7, mem_cd, key) \ - /* \ - * S-function with AES subbytes \ - */ \ - vbroadcasti128 .Linv_shift_row RIP, t4; \ - vpbroadcastd .L0f0f0f0f RIP, t7; \ - vbroadcasti128 .Lpre_tf_lo_s1 RIP, t5; \ - vbroadcasti128 .Lpre_tf_hi_s1 RIP, t6; \ - vbroadcasti128 .Lpre_tf_lo_s4 RIP, t2; \ - vbroadcasti128 .Lpre_tf_hi_s4 RIP, t3; \ - \ - /* AES inverse shift rows */ \ - vpshufb t4, x0, x0; \ - vpshufb t4, x7, x7; \ - vpshufb t4, x3, x3; \ - vpshufb t4, x6, x6; \ - vpshufb t4, x2, x2; \ - vpshufb t4, x5, x5; \ - vpshufb t4, x1, x1; \ - vpshufb t4, x4, x4; \ - \ - /* prefilter sboxes 1, 2 and 3 */ \ - /* prefilter sbox 4 */ \ - filter_8bit(x0, t5, t6, t7, t4); \ - filter_8bit(x7, t5, t6, t7, t4); \ - vextracti128 $1, x0, t0##_x; \ - vextracti128 $1, x7, t1##_x; \ - filter_8bit(x3, t2, t3, t7, t4); \ - filter_8bit(x6, t2, t3, t7, t4); \ - vextracti128 $1, x3, t3##_x; \ - vextracti128 $1, x6, t2##_x; \ - filter_8bit(x2, t5, t6, t7, t4); \ - filter_8bit(x5, t5, t6, t7, t4); \ - filter_8bit(x1, t5, t6, t7, t4); \ - filter_8bit(x4, t5, t6, t7, t4); \ - \ - vpxor t4##_x, t4##_x, t4##_x; \ - \ - /* AES subbytes + AES shift rows */ \ - vextracti128 $1, x2, t6##_x; \ - vextracti128 $1, x5, t5##_x; \ - vaesenclast t4##_x, x0##_x, x0##_x; \ - vaesenclast t4##_x, t0##_x, t0##_x; \ - vaesenclast t4##_x, x7##_x, x7##_x; \ - vaesenclast t4##_x, t1##_x, t1##_x; \ - vaesenclast t4##_x, x3##_x, x3##_x; \ - vaesenclast t4##_x, t3##_x, t3##_x; \ - vaesenclast t4##_x, x6##_x, x6##_x; \ - vaesenclast t4##_x, t2##_x, t2##_x; \ - vinserti128 $1, t0##_x, x0, x0; \ - vinserti128 $1, t1##_x, x7, x7; \ - vinserti128 $1, t3##_x, x3, x3; \ - vinserti128 $1, t2##_x, x6, x6; \ - vextracti128 $1, x1, t3##_x; \ - vextracti128 $1, x4, t2##_x; \ - vbroadcasti128 .Lpost_tf_lo_s1 RIP, t0; \ - vbroadcasti128 .Lpost_tf_hi_s1 RIP, t1; \ - vaesenclast t4##_x, x2##_x, x2##_x; \ - vaesenclast t4##_x, t6##_x, t6##_x; \ - vaesenclast t4##_x, x5##_x, x5##_x; \ - vaesenclast t4##_x, t5##_x, t5##_x; \ - vaesenclast t4##_x, x1##_x, x1##_x; \ - vaesenclast t4##_x, t3##_x, t3##_x; \ - vaesenclast t4##_x, x4##_x, x4##_x; \ - vaesenclast t4##_x, t2##_x, t2##_x; \ - vinserti128 $1, t6##_x, x2, x2; \ - vinserti128 $1, t5##_x, x5, x5; \ - vinserti128 $1, t3##_x, x1, x1; \ - vinserti128 $1, t2##_x, x4, x4; \ - \ - /* postfilter sboxes 1 and 4 */ \ - vbroadcasti128 .Lpost_tf_lo_s3 RIP, t2; \ - vbroadcasti128 .Lpost_tf_hi_s3 RIP, t3; \ - filter_8bit(x0, t0, t1, t7, t4); \ - filter_8bit(x7, t0, t1, t7, t4); \ - filter_8bit(x3, t0, t1, t7, t6); \ - filter_8bit(x6, t0, t1, t7, t6); \ - \ - /* postfilter sbox 3 */ \ - vbroadcasti128 .Lpost_tf_lo_s2 RIP, t4; \ - vbroadcasti128 .Lpost_tf_hi_s2 RIP, t5; \ - filter_8bit(x2, t2, t3, t7, t6); \ - filter_8bit(x5, t2, t3, t7, t6); \ - \ - vpbroadcastq key, t0; /* higher 64-bit duplicate ignored */ \ - \ - /* postfilter sbox 2 */ \ - filter_8bit(x1, t4, t5, t7, t2); \ - filter_8bit(x4, t4, t5, t7, t2); \ - vpxor t7, t7, t7; \ - \ - vpsrldq $1, t0, t1; \ - vpsrldq $2, t0, t2; \ - vpshufb t7, t1, t1; \ - vpsrldq $3, t0, t3; \ - \ - /* P-function */ \ - vpxor x5, x0, x0; \ - vpxor x6, x1, x1; \ - vpxor x7, x2, x2; \ - vpxor x4, x3, x3; \ - \ - vpshufb t7, t2, t2; \ - vpsrldq $4, t0, t4; \ - vpshufb t7, t3, t3; \ - vpsrldq $5, t0, t5; \ - vpshufb t7, t4, t4; \ - \ - vpxor x2, x4, x4; \ - vpxor x3, x5, x5; \ - vpxor x0, x6, x6; \ - vpxor x1, x7, x7; \ - \ - vpsrldq $6, t0, t6; \ - vpshufb t7, t5, t5; \ - vpshufb t7, t6, t6; \ - \ - vpxor x7, x0, x0; \ - vpxor x4, x1, x1; \ - vpxor x5, x2, x2; \ - vpxor x6, x3, x3; \ - \ - vpxor x3, x4, x4; \ - vpxor x0, x5, x5; \ - vpxor x1, x6, x6; \ - vpxor x2, x7, x7; /* note: high and low parts swapped */ \ - \ - /* Add key material and result to CD (x becomes new CD) */ \ - \ - vpxor t6, x1, x1; \ - vpxor 5 * 32(mem_cd), x1, x1; \ - \ - vpsrldq $7, t0, t6; \ - vpshufb t7, t0, t0; \ - vpshufb t7, t6, t7; \ - \ - vpxor t7, x0, x0; \ - vpxor 4 * 32(mem_cd), x0, x0; \ - \ - vpxor t5, x2, x2; \ - vpxor 6 * 32(mem_cd), x2, x2; \ - \ - vpxor t4, x3, x3; \ - vpxor 7 * 32(mem_cd), x3, x3; \ - \ - vpxor t3, x4, x4; \ - vpxor 0 * 32(mem_cd), x4, x4; \ - \ - vpxor t2, x5, x5; \ - vpxor 1 * 32(mem_cd), x5, x5; \ - \ - vpxor t1, x6, x6; \ - vpxor 2 * 32(mem_cd), x6, x6; \ - \ - vpxor t0, x7, x7; \ - vpxor 3 * 32(mem_cd), x7, x7; - -/* - * IN/OUT: - * x0..x7: byte-sliced AB state preloaded - * mem_ab: byte-sliced AB state in memory - * mem_cb: byte-sliced CD state in memory - */ -#define two_roundsm32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, i, dir, store_ab) \ - roundsm32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_cd, (key_table + (i) * 8)(CTX)); \ - \ - vmovdqu x0, 4 * 32(mem_cd); \ - vmovdqu x1, 5 * 32(mem_cd); \ - vmovdqu x2, 6 * 32(mem_cd); \ - vmovdqu x3, 7 * 32(mem_cd); \ - vmovdqu x4, 0 * 32(mem_cd); \ - vmovdqu x5, 1 * 32(mem_cd); \ - vmovdqu x6, 2 * 32(mem_cd); \ - vmovdqu x7, 3 * 32(mem_cd); \ - \ - roundsm32(x4, x5, x6, x7, x0, x1, x2, x3, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, (key_table + ((i) + (dir)) * 8)(CTX)); \ - \ - store_ab(x0, x1, x2, x3, x4, x5, x6, x7, mem_ab); - -#define dummy_store(x0, x1, x2, x3, x4, x5, x6, x7, mem_ab) /* do nothing */ - -#define store_ab_state(x0, x1, x2, x3, x4, x5, x6, x7, mem_ab) \ - /* Store new AB state */ \ - vmovdqu x4, 4 * 32(mem_ab); \ - vmovdqu x5, 5 * 32(mem_ab); \ - vmovdqu x6, 6 * 32(mem_ab); \ - vmovdqu x7, 7 * 32(mem_ab); \ - vmovdqu x0, 0 * 32(mem_ab); \ - vmovdqu x1, 1 * 32(mem_ab); \ - vmovdqu x2, 2 * 32(mem_ab); \ - vmovdqu x3, 3 * 32(mem_ab); - -#define enc_rounds32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, i) \ - two_roundsm32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 2, 1, store_ab_state); \ - two_roundsm32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 4, 1, store_ab_state); \ - two_roundsm32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 6, 1, dummy_store); - -#define dec_rounds32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, i) \ - two_roundsm32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 7, -1, store_ab_state); \ - two_roundsm32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 5, -1, store_ab_state); \ - two_roundsm32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd, (i) + 3, -1, dummy_store); - -/* - * IN: - * v0..3: byte-sliced 32-bit integers - * OUT: - * v0..3: (IN <<< 1) - */ -#define rol32_1_32(v0, v1, v2, v3, t0, t1, t2, zero) \ - vpcmpgtb v0, zero, t0; \ - vpaddb v0, v0, v0; \ - vpabsb t0, t0; \ - \ - vpcmpgtb v1, zero, t1; \ - vpaddb v1, v1, v1; \ - vpabsb t1, t1; \ - \ - vpcmpgtb v2, zero, t2; \ - vpaddb v2, v2, v2; \ - vpabsb t2, t2; \ - \ - vpor t0, v1, v1; \ - \ - vpcmpgtb v3, zero, t0; \ - vpaddb v3, v3, v3; \ - vpabsb t0, t0; \ - \ - vpor t1, v2, v2; \ - vpor t2, v3, v3; \ - vpor t0, v0, v0; - -/* - * IN: - * r: byte-sliced AB state in memory - * l: byte-sliced CD state in memory - * OUT: - * x0..x7: new byte-sliced CD state - */ -#define fls32(l, l0, l1, l2, l3, l4, l5, l6, l7, r, t0, t1, t2, t3, tt0, \ - tt1, tt2, tt3, kll, klr, krl, krr) \ - /* \ - * t0 = kll; \ - * t0 &= ll; \ - * lr ^= rol32(t0, 1); \ - */ \ - vpbroadcastd kll, t0; /* only lowest 32-bit used */ \ - vpxor tt0, tt0, tt0; \ - vpshufb tt0, t0, t3; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t2; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t1; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t0; \ - \ - vpand l0, t0, t0; \ - vpand l1, t1, t1; \ - vpand l2, t2, t2; \ - vpand l3, t3, t3; \ - \ - rol32_1_32(t3, t2, t1, t0, tt1, tt2, tt3, tt0); \ - \ - vpxor l4, t0, l4; \ - vpbroadcastd krr, t0; /* only lowest 32-bit used */ \ - vmovdqu l4, 4 * 32(l); \ - vpxor l5, t1, l5; \ - vmovdqu l5, 5 * 32(l); \ - vpxor l6, t2, l6; \ - vmovdqu l6, 6 * 32(l); \ - vpxor l7, t3, l7; \ - vmovdqu l7, 7 * 32(l); \ - \ - /* \ - * t2 = krr; \ - * t2 |= rr; \ - * rl ^= t2; \ - */ \ - \ - vpshufb tt0, t0, t3; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t2; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t1; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t0; \ - \ - vpor 4 * 32(r), t0, t0; \ - vpor 5 * 32(r), t1, t1; \ - vpor 6 * 32(r), t2, t2; \ - vpor 7 * 32(r), t3, t3; \ - \ - vpxor 0 * 32(r), t0, t0; \ - vpxor 1 * 32(r), t1, t1; \ - vpxor 2 * 32(r), t2, t2; \ - vpxor 3 * 32(r), t3, t3; \ - vmovdqu t0, 0 * 32(r); \ - vpbroadcastd krl, t0; /* only lowest 32-bit used */ \ - vmovdqu t1, 1 * 32(r); \ - vmovdqu t2, 2 * 32(r); \ - vmovdqu t3, 3 * 32(r); \ - \ - /* \ - * t2 = krl; \ - * t2 &= rl; \ - * rr ^= rol32(t2, 1); \ - */ \ - vpshufb tt0, t0, t3; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t2; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t1; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t0; \ - \ - vpand 0 * 32(r), t0, t0; \ - vpand 1 * 32(r), t1, t1; \ - vpand 2 * 32(r), t2, t2; \ - vpand 3 * 32(r), t3, t3; \ - \ - rol32_1_32(t3, t2, t1, t0, tt1, tt2, tt3, tt0); \ - \ - vpxor 4 * 32(r), t0, t0; \ - vpxor 5 * 32(r), t1, t1; \ - vpxor 6 * 32(r), t2, t2; \ - vpxor 7 * 32(r), t3, t3; \ - vmovdqu t0, 4 * 32(r); \ - vpbroadcastd klr, t0; /* only lowest 32-bit used */ \ - vmovdqu t1, 5 * 32(r); \ - vmovdqu t2, 6 * 32(r); \ - vmovdqu t3, 7 * 32(r); \ - \ - /* \ - * t0 = klr; \ - * t0 |= lr; \ - * ll ^= t0; \ - */ \ - \ - vpshufb tt0, t0, t3; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t2; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t1; \ - vpsrldq $1, t0, t0; \ - vpshufb tt0, t0, t0; \ - \ - vpor l4, t0, t0; \ - vpor l5, t1, t1; \ - vpor l6, t2, t2; \ - vpor l7, t3, t3; \ - \ - vpxor l0, t0, l0; \ - vmovdqu l0, 0 * 32(l); \ - vpxor l1, t1, l1; \ - vmovdqu l1, 1 * 32(l); \ - vpxor l2, t2, l2; \ - vmovdqu l2, 2 * 32(l); \ - vpxor l3, t3, l3; \ - vmovdqu l3, 3 * 32(l); - -#define transpose_4x4(x0, x1, x2, x3, t1, t2) \ - vpunpckhdq x1, x0, t2; \ - vpunpckldq x1, x0, x0; \ - \ - vpunpckldq x3, x2, t1; \ - vpunpckhdq x3, x2, x2; \ - \ - vpunpckhqdq t1, x0, x1; \ - vpunpcklqdq t1, x0, x0; \ - \ - vpunpckhqdq x2, t2, x3; \ - vpunpcklqdq x2, t2, x2; - -#define byteslice_16x16b_fast(a0, b0, c0, d0, a1, b1, c1, d1, a2, b2, c2, d2, \ - a3, b3, c3, d3, st0, st1) \ - vmovdqu d2, st0; \ - vmovdqu d3, st1; \ - transpose_4x4(a0, a1, a2, a3, d2, d3); \ - transpose_4x4(b0, b1, b2, b3, d2, d3); \ - vmovdqu st0, d2; \ - vmovdqu st1, d3; \ - \ - vmovdqu a0, st0; \ - vmovdqu a1, st1; \ - transpose_4x4(c0, c1, c2, c3, a0, a1); \ - transpose_4x4(d0, d1, d2, d3, a0, a1); \ - \ - vbroadcasti128 .Lshufb_16x16b RIP, a0; \ - vmovdqu st1, a1; \ - vpshufb a0, a2, a2; \ - vpshufb a0, a3, a3; \ - vpshufb a0, b0, b0; \ - vpshufb a0, b1, b1; \ - vpshufb a0, b2, b2; \ - vpshufb a0, b3, b3; \ - vpshufb a0, a1, a1; \ - vpshufb a0, c0, c0; \ - vpshufb a0, c1, c1; \ - vpshufb a0, c2, c2; \ - vpshufb a0, c3, c3; \ - vpshufb a0, d0, d0; \ - vpshufb a0, d1, d1; \ - vpshufb a0, d2, d2; \ - vpshufb a0, d3, d3; \ - vmovdqu d3, st1; \ - vmovdqu st0, d3; \ - vpshufb a0, d3, a0; \ - vmovdqu d2, st0; \ - \ - transpose_4x4(a0, b0, c0, d0, d2, d3); \ - transpose_4x4(a1, b1, c1, d1, d2, d3); \ - vmovdqu st0, d2; \ - vmovdqu st1, d3; \ - \ - vmovdqu b0, st0; \ - vmovdqu b1, st1; \ - transpose_4x4(a2, b2, c2, d2, b0, b1); \ - transpose_4x4(a3, b3, c3, d3, b0, b1); \ - vmovdqu st0, b0; \ - vmovdqu st1, b1; \ - /* does not adjust output bytes inside vectors */ - -/* load blocks to registers and apply pre-whitening */ -#define inpack32_pre(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, rio, key) \ - vpbroadcastq key, x0; \ - vpshufb .Lpack_bswap RIP, x0, x0; \ - \ - vpxor 0 * 32(rio), x0, y7; \ - vpxor 1 * 32(rio), x0, y6; \ - vpxor 2 * 32(rio), x0, y5; \ - vpxor 3 * 32(rio), x0, y4; \ - vpxor 4 * 32(rio), x0, y3; \ - vpxor 5 * 32(rio), x0, y2; \ - vpxor 6 * 32(rio), x0, y1; \ - vpxor 7 * 32(rio), x0, y0; \ - vpxor 8 * 32(rio), x0, x7; \ - vpxor 9 * 32(rio), x0, x6; \ - vpxor 10 * 32(rio), x0, x5; \ - vpxor 11 * 32(rio), x0, x4; \ - vpxor 12 * 32(rio), x0, x3; \ - vpxor 13 * 32(rio), x0, x2; \ - vpxor 14 * 32(rio), x0, x1; \ - vpxor 15 * 32(rio), x0, x0; - -/* byteslice pre-whitened blocks and store to temporary memory */ -#define inpack32_post(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, mem_ab, mem_cd) \ - byteslice_16x16b_fast(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, \ - y4, y5, y6, y7, (mem_ab), (mem_cd)); \ - \ - vmovdqu x0, 0 * 32(mem_ab); \ - vmovdqu x1, 1 * 32(mem_ab); \ - vmovdqu x2, 2 * 32(mem_ab); \ - vmovdqu x3, 3 * 32(mem_ab); \ - vmovdqu x4, 4 * 32(mem_ab); \ - vmovdqu x5, 5 * 32(mem_ab); \ - vmovdqu x6, 6 * 32(mem_ab); \ - vmovdqu x7, 7 * 32(mem_ab); \ - vmovdqu y0, 0 * 32(mem_cd); \ - vmovdqu y1, 1 * 32(mem_cd); \ - vmovdqu y2, 2 * 32(mem_cd); \ - vmovdqu y3, 3 * 32(mem_cd); \ - vmovdqu y4, 4 * 32(mem_cd); \ - vmovdqu y5, 5 * 32(mem_cd); \ - vmovdqu y6, 6 * 32(mem_cd); \ - vmovdqu y7, 7 * 32(mem_cd); - -/* de-byteslice, apply post-whitening and store blocks */ -#define outunpack32(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, \ - y5, y6, y7, key, stack_tmp0, stack_tmp1) \ - byteslice_16x16b_fast(y0, y4, x0, x4, y1, y5, x1, x5, y2, y6, x2, x6, \ - y3, y7, x3, x7, stack_tmp0, stack_tmp1); \ - \ - vmovdqu x0, stack_tmp0; \ - \ - vpbroadcastq key, x0; \ - vpshufb .Lpack_bswap RIP, x0, x0; \ - \ - vpxor x0, y7, y7; \ - vpxor x0, y6, y6; \ - vpxor x0, y5, y5; \ - vpxor x0, y4, y4; \ - vpxor x0, y3, y3; \ - vpxor x0, y2, y2; \ - vpxor x0, y1, y1; \ - vpxor x0, y0, y0; \ - vpxor x0, x7, x7; \ - vpxor x0, x6, x6; \ - vpxor x0, x5, x5; \ - vpxor x0, x4, x4; \ - vpxor x0, x3, x3; \ - vpxor x0, x2, x2; \ - vpxor x0, x1, x1; \ - vpxor stack_tmp0, x0, x0; - -#define write_output(x0, x1, x2, x3, x4, x5, x6, x7, y0, y1, y2, y3, y4, y5, \ - y6, y7, rio) \ - vmovdqu x0, 0 * 32(rio); \ - vmovdqu x1, 1 * 32(rio); \ - vmovdqu x2, 2 * 32(rio); \ - vmovdqu x3, 3 * 32(rio); \ - vmovdqu x4, 4 * 32(rio); \ - vmovdqu x5, 5 * 32(rio); \ - vmovdqu x6, 6 * 32(rio); \ - vmovdqu x7, 7 * 32(rio); \ - vmovdqu y0, 8 * 32(rio); \ - vmovdqu y1, 9 * 32(rio); \ - vmovdqu y2, 10 * 32(rio); \ - vmovdqu y3, 11 * 32(rio); \ - vmovdqu y4, 12 * 32(rio); \ - vmovdqu y5, 13 * 32(rio); \ - vmovdqu y6, 14 * 32(rio); \ - vmovdqu y7, 15 * 32(rio); - -.data -.align 32 - -#define SHUFB_BYTES(idx) \ - 0 + (idx), 4 + (idx), 8 + (idx), 12 + (idx) - -.Lshufb_16x16b: - .byte SHUFB_BYTES(0), SHUFB_BYTES(1), SHUFB_BYTES(2), SHUFB_BYTES(3) - .byte SHUFB_BYTES(0), SHUFB_BYTES(1), SHUFB_BYTES(2), SHUFB_BYTES(3) - -.Lpack_bswap: - .long 0x00010203, 0x04050607, 0x80808080, 0x80808080 - .long 0x00010203, 0x04050607, 0x80808080, 0x80808080 - -/* For CTR-mode IV byteswap */ -.Lbswap128_mask: - .byte 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 - -/* - * pre-SubByte transform - * - * pre-lookup for sbox1, sbox2, sbox3: - * swap_bitendianness( - * isom_map_camellia_to_aes( - * camellia_f( - * swap_bitendianess(in) - * ) - * ) - * ) - * - * (note: '⊕ 0xc5' inside camellia_f()) - */ -.Lpre_tf_lo_s1: - .byte 0x45, 0xe8, 0x40, 0xed, 0x2e, 0x83, 0x2b, 0x86 - .byte 0x4b, 0xe6, 0x4e, 0xe3, 0x20, 0x8d, 0x25, 0x88 -.Lpre_tf_hi_s1: - .byte 0x00, 0x51, 0xf1, 0xa0, 0x8a, 0xdb, 0x7b, 0x2a - .byte 0x09, 0x58, 0xf8, 0xa9, 0x83, 0xd2, 0x72, 0x23 - -/* - * pre-SubByte transform - * - * pre-lookup for sbox4: - * swap_bitendianness( - * isom_map_camellia_to_aes( - * camellia_f( - * swap_bitendianess(in <<< 1) - * ) - * ) - * ) - * - * (note: '⊕ 0xc5' inside camellia_f()) - */ -.Lpre_tf_lo_s4: - .byte 0x45, 0x40, 0x2e, 0x2b, 0x4b, 0x4e, 0x20, 0x25 - .byte 0x14, 0x11, 0x7f, 0x7a, 0x1a, 0x1f, 0x71, 0x74 -.Lpre_tf_hi_s4: - .byte 0x00, 0xf1, 0x8a, 0x7b, 0x09, 0xf8, 0x83, 0x72 - .byte 0xad, 0x5c, 0x27, 0xd6, 0xa4, 0x55, 0x2e, 0xdf - -/* - * post-SubByte transform - * - * post-lookup for sbox1, sbox4: - * swap_bitendianness( - * camellia_h( - * isom_map_aes_to_camellia( - * swap_bitendianness( - * aes_inverse_affine_transform(in) - * ) - * ) - * ) - * ) - * - * (note: '⊕ 0x6e' inside camellia_h()) - */ -.Lpost_tf_lo_s1: - .byte 0x3c, 0xcc, 0xcf, 0x3f, 0x32, 0xc2, 0xc1, 0x31 - .byte 0xdc, 0x2c, 0x2f, 0xdf, 0xd2, 0x22, 0x21, 0xd1 -.Lpost_tf_hi_s1: - .byte 0x00, 0xf9, 0x86, 0x7f, 0xd7, 0x2e, 0x51, 0xa8 - .byte 0xa4, 0x5d, 0x22, 0xdb, 0x73, 0x8a, 0xf5, 0x0c - -/* - * post-SubByte transform - * - * post-lookup for sbox2: - * swap_bitendianness( - * camellia_h( - * isom_map_aes_to_camellia( - * swap_bitendianness( - * aes_inverse_affine_transform(in) - * ) - * ) - * ) - * ) <<< 1 - * - * (note: '⊕ 0x6e' inside camellia_h()) - */ -.Lpost_tf_lo_s2: - .byte 0x78, 0x99, 0x9f, 0x7e, 0x64, 0x85, 0x83, 0x62 - .byte 0xb9, 0x58, 0x5e, 0xbf, 0xa5, 0x44, 0x42, 0xa3 -.Lpost_tf_hi_s2: - .byte 0x00, 0xf3, 0x0d, 0xfe, 0xaf, 0x5c, 0xa2, 0x51 - .byte 0x49, 0xba, 0x44, 0xb7, 0xe6, 0x15, 0xeb, 0x18 - -/* - * post-SubByte transform - * - * post-lookup for sbox3: - * swap_bitendianness( - * camellia_h( - * isom_map_aes_to_camellia( - * swap_bitendianness( - * aes_inverse_affine_transform(in) - * ) - * ) - * ) - * ) >>> 1 - * - * (note: '⊕ 0x6e' inside camellia_h()) - */ -.Lpost_tf_lo_s3: - .byte 0x1e, 0x66, 0xe7, 0x9f, 0x19, 0x61, 0xe0, 0x98 - .byte 0x6e, 0x16, 0x97, 0xef, 0x69, 0x11, 0x90, 0xe8 -.Lpost_tf_hi_s3: - .byte 0x00, 0xfc, 0x43, 0xbf, 0xeb, 0x17, 0xa8, 0x54 - .byte 0x52, 0xae, 0x11, 0xed, 0xb9, 0x45, 0xfa, 0x06 - -/* For isolating SubBytes from AESENCLAST, inverse shift row */ -.Linv_shift_row: - .byte 0x00, 0x0d, 0x0a, 0x07, 0x04, 0x01, 0x0e, 0x0b - .byte 0x08, 0x05, 0x02, 0x0f, 0x0c, 0x09, 0x06, 0x03 - -.align 4 -/* 4-bit mask */ -.L0f0f0f0f: - .long 0x0f0f0f0f - -.text - -.align 8 -.type __camellia_enc_blk32,@function; - -__camellia_enc_blk32: - /* input: - * %rdi: ctx, CTX - * %rax: temporary storage, 512 bytes - * %ymm0..%ymm15: 32 plaintext blocks - * output: - * %ymm0..%ymm15: 32 encrypted blocks, order swapped: - * 7, 8, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8 - */ - - leaq 8 * 32(%rax), %rcx; - - inpack32_post(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rax, %rcx); - - enc_rounds32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rax, %rcx, 0); - - fls32(%rax, %ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %rcx, %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, - ((key_table + (8) * 8) + 0)(CTX), - ((key_table + (8) * 8) + 4)(CTX), - ((key_table + (8) * 8) + 8)(CTX), - ((key_table + (8) * 8) + 12)(CTX)); - - enc_rounds32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rax, %rcx, 8); - - fls32(%rax, %ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %rcx, %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, - ((key_table + (16) * 8) + 0)(CTX), - ((key_table + (16) * 8) + 4)(CTX), - ((key_table + (16) * 8) + 8)(CTX), - ((key_table + (16) * 8) + 12)(CTX)); - - enc_rounds32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rax, %rcx, 16); - - movl $24, %r8d; - cmpl $128, key_bitlength(CTX); - jne .Lenc_max32; - -.Lenc_done: - /* load CD for output */ - vmovdqu 0 * 32(%rcx), %ymm8; - vmovdqu 1 * 32(%rcx), %ymm9; - vmovdqu 2 * 32(%rcx), %ymm10; - vmovdqu 3 * 32(%rcx), %ymm11; - vmovdqu 4 * 32(%rcx), %ymm12; - vmovdqu 5 * 32(%rcx), %ymm13; - vmovdqu 6 * 32(%rcx), %ymm14; - vmovdqu 7 * 32(%rcx), %ymm15; - - outunpack32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax)); - - ret; - -.align 8 -.Lenc_max32: - movl $32, %r8d; - - fls32(%rax, %ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %rcx, %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, - ((key_table + (24) * 8) + 0)(CTX), - ((key_table + (24) * 8) + 4)(CTX), - ((key_table + (24) * 8) + 8)(CTX), - ((key_table + (24) * 8) + 12)(CTX)); - - enc_rounds32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rax, %rcx, 24); - - jmp .Lenc_done; -.size __camellia_enc_blk32,.-__camellia_enc_blk32; - -.align 8 -.type __camellia_dec_blk32,@function; - -__camellia_dec_blk32: - /* input: - * %rdi: ctx, CTX - * %rax: temporary storage, 512 bytes - * %r8d: 24 for 16 byte key, 32 for larger - * %ymm0..%ymm15: 16 encrypted blocks - * output: - * %ymm0..%ymm15: 16 plaintext blocks, order swapped: - * 7, 8, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8 - */ - - leaq 8 * 32(%rax), %rcx; - - inpack32_post(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rax, %rcx); - - cmpl $32, %r8d; - je .Ldec_max32; - -.Ldec_max24: - dec_rounds32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rax, %rcx, 16); - - fls32(%rax, %ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %rcx, %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, - ((key_table + (16) * 8) + 8)(CTX), - ((key_table + (16) * 8) + 12)(CTX), - ((key_table + (16) * 8) + 0)(CTX), - ((key_table + (16) * 8) + 4)(CTX)); - - dec_rounds32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rax, %rcx, 8); - - fls32(%rax, %ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %rcx, %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, - ((key_table + (8) * 8) + 8)(CTX), - ((key_table + (8) * 8) + 12)(CTX), - ((key_table + (8) * 8) + 0)(CTX), - ((key_table + (8) * 8) + 4)(CTX)); - - dec_rounds32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rax, %rcx, 0); - - /* load CD for output */ - vmovdqu 0 * 32(%rcx), %ymm8; - vmovdqu 1 * 32(%rcx), %ymm9; - vmovdqu 2 * 32(%rcx), %ymm10; - vmovdqu 3 * 32(%rcx), %ymm11; - vmovdqu 4 * 32(%rcx), %ymm12; - vmovdqu 5 * 32(%rcx), %ymm13; - vmovdqu 6 * 32(%rcx), %ymm14; - vmovdqu 7 * 32(%rcx), %ymm15; - - outunpack32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax)); - - ret; - -.align 8 -.Ldec_max32: - dec_rounds32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rax, %rcx, 24); - - fls32(%rax, %ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %rcx, %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, - ((key_table + (24) * 8) + 8)(CTX), - ((key_table + (24) * 8) + 12)(CTX), - ((key_table + (24) * 8) + 0)(CTX), - ((key_table + (24) * 8) + 4)(CTX)); - - jmp .Ldec_max24; -.size __camellia_dec_blk32,.-__camellia_dec_blk32; - -#define inc_le128(x, minus_one, tmp) \ - vpcmpeqq minus_one, x, tmp; \ - vpsubq minus_one, x, x; \ - vpslldq $8, tmp, tmp; \ - vpsubq tmp, x, x; - -.align 8 -.globl _gcry_camellia_aesni_avx2_ctr_enc -.type _gcry_camellia_aesni_avx2_ctr_enc,@function; - -_gcry_camellia_aesni_avx2_ctr_enc: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (32 blocks) - * %rdx: src (32 blocks) - * %rcx: iv (big endian, 128bit) - */ - - pushq %rbp; - movq %rsp, %rbp; - - movq 8(%rcx), %r11; - bswapq %r11; - - vzeroupper; - - subq $(16 * 32), %rsp; - andq $~63, %rsp; - movq %rsp, %rax; - - vpcmpeqd %ymm15, %ymm15, %ymm15; - vpsrldq $8, %ymm15, %ymm15; /* ab: -1:0 ; cd: -1:0 */ - - /* load IV and byteswap */ - vmovdqu (%rcx), %xmm0; - vpshufb .Lbswap128_mask RIP, %xmm0, %xmm0; - vmovdqa %xmm0, %xmm1; - inc_le128(%xmm0, %xmm15, %xmm14); - vbroadcasti128 .Lbswap128_mask RIP, %ymm14; - vinserti128 $1, %xmm0, %ymm1, %ymm0; - vpshufb %ymm14, %ymm0, %ymm13; - vmovdqu %ymm13, 15 * 32(%rax); - - /* check need for handling 64-bit overflow and carry */ - cmpq $(0xffffffffffffffff - 32), %r11; - ja .Lload_ctr_carry; - - /* construct IVs */ - vpaddq %ymm15, %ymm15, %ymm15; /* ab: -2:0 ; cd: -2:0 */ - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm13; - vmovdqu %ymm13, 14 * 32(%rax); - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm13; - vmovdqu %ymm13, 13 * 32(%rax); - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm12; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm11; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm10; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm9; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm8; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm7; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm6; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm5; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm4; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm3; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm2; - vpsubq %ymm15, %ymm0, %ymm0; - vpshufb %ymm14, %ymm0, %ymm1; - vpsubq %ymm15, %ymm0, %ymm0; /* +30 ; +31 */ - vpsubq %xmm15, %xmm0, %xmm13; /* +32 */ - vpshufb %ymm14, %ymm0, %ymm0; - vpshufb %xmm14, %xmm13, %xmm13; - vmovdqu %xmm13, (%rcx); - - jmp .Lload_ctr_done; - -.align 4 -.Lload_ctr_carry: - /* construct IVs */ - inc_le128(%ymm0, %ymm15, %ymm13); /* ab: le1 ; cd: le2 */ - inc_le128(%ymm0, %ymm15, %ymm13); /* ab: le2 ; cd: le3 */ - vpshufb %ymm14, %ymm0, %ymm13; - vmovdqu %ymm13, 14 * 32(%rax); - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm13; - vmovdqu %ymm13, 13 * 32(%rax); - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm12; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm11; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm10; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm9; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm8; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm7; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm6; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm5; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm4; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm3; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm2; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vpshufb %ymm14, %ymm0, %ymm1; - inc_le128(%ymm0, %ymm15, %ymm13); - inc_le128(%ymm0, %ymm15, %ymm13); - vextracti128 $1, %ymm0, %xmm13; - vpshufb %ymm14, %ymm0, %ymm0; - inc_le128(%xmm13, %xmm15, %xmm14); - vpshufb .Lbswap128_mask RIP, %xmm13, %xmm13; - vmovdqu %xmm13, (%rcx); - -.align 4 -.Lload_ctr_done: - /* inpack16_pre: */ - vpbroadcastq (key_table)(CTX), %ymm15; - vpshufb .Lpack_bswap RIP, %ymm15, %ymm15; - vpxor %ymm0, %ymm15, %ymm0; - vpxor %ymm1, %ymm15, %ymm1; - vpxor %ymm2, %ymm15, %ymm2; - vpxor %ymm3, %ymm15, %ymm3; - vpxor %ymm4, %ymm15, %ymm4; - vpxor %ymm5, %ymm15, %ymm5; - vpxor %ymm6, %ymm15, %ymm6; - vpxor %ymm7, %ymm15, %ymm7; - vpxor %ymm8, %ymm15, %ymm8; - vpxor %ymm9, %ymm15, %ymm9; - vpxor %ymm10, %ymm15, %ymm10; - vpxor %ymm11, %ymm15, %ymm11; - vpxor %ymm12, %ymm15, %ymm12; - vpxor 13 * 32(%rax), %ymm15, %ymm13; - vpxor 14 * 32(%rax), %ymm15, %ymm14; - vpxor 15 * 32(%rax), %ymm15, %ymm15; - - call __camellia_enc_blk32; - - vpxor 0 * 32(%rdx), %ymm7, %ymm7; - vpxor 1 * 32(%rdx), %ymm6, %ymm6; - vpxor 2 * 32(%rdx), %ymm5, %ymm5; - vpxor 3 * 32(%rdx), %ymm4, %ymm4; - vpxor 4 * 32(%rdx), %ymm3, %ymm3; - vpxor 5 * 32(%rdx), %ymm2, %ymm2; - vpxor 6 * 32(%rdx), %ymm1, %ymm1; - vpxor 7 * 32(%rdx), %ymm0, %ymm0; - vpxor 8 * 32(%rdx), %ymm15, %ymm15; - vpxor 9 * 32(%rdx), %ymm14, %ymm14; - vpxor 10 * 32(%rdx), %ymm13, %ymm13; - vpxor 11 * 32(%rdx), %ymm12, %ymm12; - vpxor 12 * 32(%rdx), %ymm11, %ymm11; - vpxor 13 * 32(%rdx), %ymm10, %ymm10; - vpxor 14 * 32(%rdx), %ymm9, %ymm9; - vpxor 15 * 32(%rdx), %ymm8, %ymm8; - leaq 32 * 16(%rdx), %rdx; - - write_output(%ymm7, %ymm6, %ymm5, %ymm4, %ymm3, %ymm2, %ymm1, %ymm0, - %ymm15, %ymm14, %ymm13, %ymm12, %ymm11, %ymm10, %ymm9, - %ymm8, %rsi); - - vzeroall; - - leave; - ret; -.size _gcry_camellia_aesni_avx2_ctr_enc,.-_gcry_camellia_aesni_avx2_ctr_enc; - -.align 8 -.globl _gcry_camellia_aesni_avx2_cbc_dec -.type _gcry_camellia_aesni_avx2_cbc_dec,@function; - -_gcry_camellia_aesni_avx2_cbc_dec: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (16 blocks) - * %rdx: src (16 blocks) - * %rcx: iv - */ - - pushq %rbp; - movq %rsp, %rbp; - - vzeroupper; - - movq %rcx, %r9; - - cmpl $128, key_bitlength(CTX); - movl $32, %r8d; - movl $24, %eax; - cmovel %eax, %r8d; /* max */ - - subq $(16 * 32), %rsp; - andq $~63, %rsp; - movq %rsp, %rax; - - inpack32_pre(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7, - %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, - %ymm15, %rdx, (key_table)(CTX, %r8, 8)); - - call __camellia_dec_blk32; - - /* XOR output with IV */ - vmovdqu %ymm8, (%rax); - vmovdqu (%r9), %xmm8; - vinserti128 $1, (%rdx), %ymm8, %ymm8; - vpxor %ymm8, %ymm7, %ymm7; - vmovdqu (%rax), %ymm8; - vpxor (0 * 32 + 16)(%rdx), %ymm6, %ymm6; - vpxor (1 * 32 + 16)(%rdx), %ymm5, %ymm5; - vpxor (2 * 32 + 16)(%rdx), %ymm4, %ymm4; - vpxor (3 * 32 + 16)(%rdx), %ymm3, %ymm3; - vpxor (4 * 32 + 16)(%rdx), %ymm2, %ymm2; - vpxor (5 * 32 + 16)(%rdx), %ymm1, %ymm1; - vpxor (6 * 32 + 16)(%rdx), %ymm0, %ymm0; - vpxor (7 * 32 + 16)(%rdx), %ymm15, %ymm15; - vpxor (8 * 32 + 16)(%rdx), %ymm14, %ymm14; - vpxor (9 * 32 + 16)(%rdx), %ymm13, %ymm13; - vpxor (10 * 32 + 16)(%rdx), %ymm12, %ymm12; - vpxor (11 * 32 + 16)(%rdx), %ymm11, %ymm11; - vpxor (12 * 32 + 16)(%rdx), %ymm10, %ymm10; - vpxor (13 * 32 + 16)(%rdx), %ymm9, %ymm9; - vpxor (14 * 32 + 16)(%rdx), %ymm8, %ymm8; - movq (15 * 32 + 16 + 0)(%rdx), %rax; - movq (15 * 32 + 16 + 8)(%rdx), %rcx; - - write_output(%ymm7, %ymm6, %ymm5, %ymm4, %ymm3, %ymm2, %ymm1, %ymm0, - %ymm15, %ymm14, %ymm13, %ymm12, %ymm11, %ymm10, %ymm9, - %ymm8, %rsi); - - /* store new IV */ - movq %rax, (0)(%r9); - movq %rcx, (8)(%r9); - - vzeroall; - - leave; - ret; -.size _gcry_camellia_aesni_avx2_cbc_dec,.-_gcry_camellia_aesni_avx2_cbc_dec; - -.align 8 -.globl _gcry_camellia_aesni_avx2_cfb_dec -.type _gcry_camellia_aesni_avx2_cfb_dec,@function; - -_gcry_camellia_aesni_avx2_cfb_dec: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (16 blocks) - * %rdx: src (16 blocks) - * %rcx: iv - */ - - pushq %rbp; - movq %rsp, %rbp; - - vzeroupper; - - subq $(16 * 32), %rsp; - andq $~63, %rsp; - movq %rsp, %rax; - - /* inpack16_pre: */ - vpbroadcastq (key_table)(CTX), %ymm0; - vpshufb .Lpack_bswap RIP, %ymm0, %ymm0; - vmovdqu (%rcx), %xmm15; - vinserti128 $1, (%rdx), %ymm15, %ymm15; - vpxor %ymm15, %ymm0, %ymm15; - vmovdqu (15 * 32 + 16)(%rdx), %xmm1; - vmovdqu %xmm1, (%rcx); /* store new IV */ - vpxor (0 * 32 + 16)(%rdx), %ymm0, %ymm14; - vpxor (1 * 32 + 16)(%rdx), %ymm0, %ymm13; - vpxor (2 * 32 + 16)(%rdx), %ymm0, %ymm12; - vpxor (3 * 32 + 16)(%rdx), %ymm0, %ymm11; - vpxor (4 * 32 + 16)(%rdx), %ymm0, %ymm10; - vpxor (5 * 32 + 16)(%rdx), %ymm0, %ymm9; - vpxor (6 * 32 + 16)(%rdx), %ymm0, %ymm8; - vpxor (7 * 32 + 16)(%rdx), %ymm0, %ymm7; - vpxor (8 * 32 + 16)(%rdx), %ymm0, %ymm6; - vpxor (9 * 32 + 16)(%rdx), %ymm0, %ymm5; - vpxor (10 * 32 + 16)(%rdx), %ymm0, %ymm4; - vpxor (11 * 32 + 16)(%rdx), %ymm0, %ymm3; - vpxor (12 * 32 + 16)(%rdx), %ymm0, %ymm2; - vpxor (13 * 32 + 16)(%rdx), %ymm0, %ymm1; - vpxor (14 * 32 + 16)(%rdx), %ymm0, %ymm0; - - call __camellia_enc_blk32; - - vpxor 0 * 32(%rdx), %ymm7, %ymm7; - vpxor 1 * 32(%rdx), %ymm6, %ymm6; - vpxor 2 * 32(%rdx), %ymm5, %ymm5; - vpxor 3 * 32(%rdx), %ymm4, %ymm4; - vpxor 4 * 32(%rdx), %ymm3, %ymm3; - vpxor 5 * 32(%rdx), %ymm2, %ymm2; - vpxor 6 * 32(%rdx), %ymm1, %ymm1; - vpxor 7 * 32(%rdx), %ymm0, %ymm0; - vpxor 8 * 32(%rdx), %ymm15, %ymm15; - vpxor 9 * 32(%rdx), %ymm14, %ymm14; - vpxor 10 * 32(%rdx), %ymm13, %ymm13; - vpxor 11 * 32(%rdx), %ymm12, %ymm12; - vpxor 12 * 32(%rdx), %ymm11, %ymm11; - vpxor 13 * 32(%rdx), %ymm10, %ymm10; - vpxor 14 * 32(%rdx), %ymm9, %ymm9; - vpxor 15 * 32(%rdx), %ymm8, %ymm8; - - write_output(%ymm7, %ymm6, %ymm5, %ymm4, %ymm3, %ymm2, %ymm1, %ymm0, - %ymm15, %ymm14, %ymm13, %ymm12, %ymm11, %ymm10, %ymm9, - %ymm8, %rsi); - - vzeroall; - - leave; - ret; -.size _gcry_camellia_aesni_avx2_cfb_dec,.-_gcry_camellia_aesni_avx2_cfb_dec; - -#endif /*defined(ENABLE_AESNI_SUPPORT) && defined(ENABLE_AVX2_SUPPORT)*/ -#endif /*__x86_64*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-arm.S b/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-arm.S deleted file mode 100644 index cdeaf8b5..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-arm.S +++ /dev/null @@ -1,626 +0,0 @@ -/* camellia-arm.S - ARM assembly implementation of Camellia cipher - * - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include - -#if defined(__ARMEL__) -#ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS - -.text - -.syntax unified -.arm - -#ifdef __PIC__ -# define GET_DATA_POINTER(reg, name, rtmp) \ - ldr reg, 1f; \ - ldr rtmp, 2f; \ - b 3f; \ - 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \ - 2: .word name(GOT); \ - 3: add reg, pc, reg; \ - ldr reg, [reg, rtmp]; -#else -# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name -#endif - -/* struct camellia_ctx: */ -#define key_table 0 - -/* register macros */ -#define CTX %r0 -#define RTAB1 %ip -#define RTAB3 %r1 -#define RMASK %lr - -#define IL %r2 -#define IR %r3 - -#define XL %r4 -#define XR %r5 -#define YL %r6 -#define YR %r7 - -#define RT0 %r8 -#define RT1 %r9 -#define RT2 %r10 -#define RT3 %r11 - -/* helper macros */ -#define ldr_unaligned_be(rout, rsrc, offs, rtmp) \ - ldrb rout, [rsrc, #((offs) + 3)]; \ - ldrb rtmp, [rsrc, #((offs) + 2)]; \ - orr rout, rout, rtmp, lsl #8; \ - ldrb rtmp, [rsrc, #((offs) + 1)]; \ - orr rout, rout, rtmp, lsl #16; \ - ldrb rtmp, [rsrc, #((offs) + 0)]; \ - orr rout, rout, rtmp, lsl #24; - -#define str_unaligned_be(rin, rdst, offs, rtmp0, rtmp1) \ - mov rtmp0, rin, lsr #8; \ - strb rin, [rdst, #((offs) + 3)]; \ - mov rtmp1, rin, lsr #16; \ - strb rtmp0, [rdst, #((offs) + 2)]; \ - mov rtmp0, rin, lsr #24; \ - strb rtmp1, [rdst, #((offs) + 1)]; \ - strb rtmp0, [rdst, #((offs) + 0)]; - -#ifdef __ARMEL__ -#ifdef HAVE_ARM_ARCH_V6 - #define host_to_be(reg, rtmp) \ - rev reg, reg; - #define be_to_host(reg, rtmp) \ - rev reg, reg; -#else - #define host_to_be(reg, rtmp) \ - eor rtmp, reg, reg, ror #16; \ - mov rtmp, rtmp, lsr #8; \ - bic rtmp, rtmp, #65280; \ - eor reg, rtmp, reg, ror #8; - #define be_to_host(reg, rtmp) \ - eor rtmp, reg, reg, ror #16; \ - mov rtmp, rtmp, lsr #8; \ - bic rtmp, rtmp, #65280; \ - eor reg, rtmp, reg, ror #8; -#endif -#else - /* nop on big-endian */ - #define host_to_be(reg, rtmp) /*_*/ - #define be_to_host(reg, rtmp) /*_*/ -#endif - -#define ldr_input_aligned_be(rin, a, b, c, d, rtmp) \ - ldr a, [rin, #0]; \ - ldr b, [rin, #4]; \ - be_to_host(a, rtmp); \ - ldr c, [rin, #8]; \ - be_to_host(b, rtmp); \ - ldr d, [rin, #12]; \ - be_to_host(c, rtmp); \ - be_to_host(d, rtmp); - -#define str_output_aligned_be(rout, a, b, c, d, rtmp) \ - be_to_host(a, rtmp); \ - be_to_host(b, rtmp); \ - str a, [rout, #0]; \ - be_to_host(c, rtmp); \ - str b, [rout, #4]; \ - be_to_host(d, rtmp); \ - str c, [rout, #8]; \ - str d, [rout, #12]; - -#ifdef __ARM_FEATURE_UNALIGNED - /* unaligned word reads/writes allowed */ - #define ldr_input_be(rin, ra, rb, rc, rd, rtmp) \ - ldr_input_aligned_be(rin, ra, rb, rc, rd, rtmp) - - #define str_output_be(rout, ra, rb, rc, rd, rtmp0, rtmp1) \ - str_output_aligned_be(rout, ra, rb, rc, rd, rtmp0) -#else - /* need to handle unaligned reads/writes by byte reads */ - #define ldr_input_be(rin, ra, rb, rc, rd, rtmp0) \ - tst rin, #3; \ - beq 1f; \ - ldr_unaligned_be(ra, rin, 0, rtmp0); \ - ldr_unaligned_be(rb, rin, 4, rtmp0); \ - ldr_unaligned_be(rc, rin, 8, rtmp0); \ - ldr_unaligned_be(rd, rin, 12, rtmp0); \ - b 2f; \ - 1:;\ - ldr_input_aligned_be(rin, ra, rb, rc, rd, rtmp0); \ - 2:; - - #define str_output_be(rout, ra, rb, rc, rd, rtmp0, rtmp1) \ - tst rout, #3; \ - beq 1f; \ - str_unaligned_be(ra, rout, 0, rtmp0, rtmp1); \ - str_unaligned_be(rb, rout, 4, rtmp0, rtmp1); \ - str_unaligned_be(rc, rout, 8, rtmp0, rtmp1); \ - str_unaligned_be(rd, rout, 12, rtmp0, rtmp1); \ - b 2f; \ - 1:;\ - str_output_aligned_be(rout, ra, rb, rc, rd, rtmp0); \ - 2:; -#endif - -/********************************************************************** - 1-way camellia - **********************************************************************/ -#define roundsm(xl, xr, kl, kr, yl, yr) \ - ldr RT2, [CTX, #(key_table + ((kl) * 4))]; \ - and IR, RMASK, xr, lsl#(4); /*sp1110*/ \ - ldr RT3, [CTX, #(key_table + ((kr) * 4))]; \ - and IL, RMASK, xl, lsr#(24 - 4); /*sp1110*/ \ - and RT0, RMASK, xr, lsr#(16 - 4); /*sp3033*/ \ - ldr IR, [RTAB1, IR]; \ - and RT1, RMASK, xl, lsr#(8 - 4); /*sp3033*/ \ - eor yl, RT2; \ - ldr IL, [RTAB1, IL]; \ - eor yr, RT3; \ - \ - ldr RT0, [RTAB3, RT0]; \ - add RTAB1, #4; \ - ldr RT1, [RTAB3, RT1]; \ - add RTAB3, #4; \ - \ - and RT2, RMASK, xr, lsr#(24 - 4); /*sp0222*/ \ - and RT3, RMASK, xl, lsr#(16 - 4); /*sp0222*/ \ - \ - eor IR, RT0; \ - eor IL, RT1; \ - \ - ldr RT2, [RTAB1, RT2]; \ - and RT0, RMASK, xr, lsr#(8 - 4); /*sp4404*/ \ - ldr RT3, [RTAB1, RT3]; \ - and RT1, RMASK, xl, lsl#(4); /*sp4404*/ \ - \ - ldr RT0, [RTAB3, RT0]; \ - sub RTAB1, #4; \ - ldr RT1, [RTAB3, RT1]; \ - sub RTAB3, #4; \ - \ - eor IR, RT2; \ - eor IL, RT3; \ - eor IR, RT0; \ - eor IL, RT1; \ - \ - eor IR, IL; \ - eor yr, yr, IL, ror#8; \ - eor yl, IR; \ - eor yr, IR; - -#define enc_rounds(n) \ - roundsm(XL, XR, ((n) + 2) * 2 + 0, ((n) + 2) * 2 + 1, YL, YR); \ - roundsm(YL, YR, ((n) + 3) * 2 + 0, ((n) + 3) * 2 + 1, XL, XR); \ - roundsm(XL, XR, ((n) + 4) * 2 + 0, ((n) + 4) * 2 + 1, YL, YR); \ - roundsm(YL, YR, ((n) + 5) * 2 + 0, ((n) + 5) * 2 + 1, XL, XR); \ - roundsm(XL, XR, ((n) + 6) * 2 + 0, ((n) + 6) * 2 + 1, YL, YR); \ - roundsm(YL, YR, ((n) + 7) * 2 + 0, ((n) + 7) * 2 + 1, XL, XR); - -#define dec_rounds(n) \ - roundsm(XL, XR, ((n) + 7) * 2 + 0, ((n) + 7) * 2 + 1, YL, YR); \ - roundsm(YL, YR, ((n) + 6) * 2 + 0, ((n) + 6) * 2 + 1, XL, XR); \ - roundsm(XL, XR, ((n) + 5) * 2 + 0, ((n) + 5) * 2 + 1, YL, YR); \ - roundsm(YL, YR, ((n) + 4) * 2 + 0, ((n) + 4) * 2 + 1, XL, XR); \ - roundsm(XL, XR, ((n) + 3) * 2 + 0, ((n) + 3) * 2 + 1, YL, YR); \ - roundsm(YL, YR, ((n) + 2) * 2 + 0, ((n) + 2) * 2 + 1, XL, XR); - -/* perform FL and FLâ»Â¹ */ -#define fls(ll, lr, rl, rr, kll, klr, krl, krr) \ - ldr RT0, [CTX, #(key_table + ((kll) * 4))]; \ - ldr RT2, [CTX, #(key_table + ((krr) * 4))]; \ - and RT0, ll; \ - ldr RT3, [CTX, #(key_table + ((krl) * 4))]; \ - orr RT2, rr; \ - ldr RT1, [CTX, #(key_table + ((klr) * 4))]; \ - eor rl, RT2; \ - eor lr, lr, RT0, ror#31; \ - and RT3, rl; \ - orr RT1, lr; \ - eor ll, RT1; \ - eor rr, rr, RT3, ror#31; - -#define enc_fls(n) \ - fls(XL, XR, YL, YR, \ - (n) * 2 + 0, (n) * 2 + 1, \ - (n) * 2 + 2, (n) * 2 + 3); - -#define dec_fls(n) \ - fls(XL, XR, YL, YR, \ - (n) * 2 + 2, (n) * 2 + 3, \ - (n) * 2 + 0, (n) * 2 + 1); - -#define inpack(n) \ - ldr_input_be(%r2, XL, XR, YL, YR, RT0); \ - ldr RT0, [CTX, #(key_table + ((n) * 8) + 0)]; \ - ldr RT1, [CTX, #(key_table + ((n) * 8) + 4)]; \ - eor XL, RT0; \ - eor XR, RT1; - -#define outunpack(n) \ - ldr RT0, [CTX, #(key_table + ((n) * 8) + 0)]; \ - ldr RT1, [CTX, #(key_table + ((n) * 8) + 4)]; \ - eor YL, RT0; \ - eor YR, RT1; \ - str_output_be(%r1, YL, YR, XL, XR, RT0, RT1); - -.align 3 -.globl _gcry_camellia_arm_encrypt_block -.type _gcry_camellia_arm_encrypt_block,%function; - -_gcry_camellia_arm_encrypt_block: - /* input: - * %r0: keytable - * %r1: dst - * %r2: src - * %r3: keybitlen - */ - push {%r1, %r4-%r11, %ip, %lr}; - - GET_DATA_POINTER(RTAB1, .Lcamellia_sp1110, RTAB3); - mov RMASK, #0xff; - add RTAB3, RTAB1, #(2 * 4); - push {%r3}; - mov RMASK, RMASK, lsl#4 /* byte mask */ - - inpack(0); - - enc_rounds(0); - enc_fls(8); - enc_rounds(8); - enc_fls(16); - enc_rounds(16); - - pop {RT0}; - cmp RT0, #(16 * 8); - bne .Lenc_256; - - pop {%r1}; - outunpack(24); - - pop {%r4-%r11, %ip, %pc}; -.ltorg - -.Lenc_256: - enc_fls(24); - enc_rounds(24); - - pop {%r1}; - outunpack(32); - - pop {%r4-%r11, %ip, %pc}; -.ltorg -.size _gcry_camellia_arm_encrypt_block,.-_gcry_camellia_arm_encrypt_block; - -.align 3 -.globl _gcry_camellia_arm_decrypt_block -.type _gcry_camellia_arm_decrypt_block,%function; - -_gcry_camellia_arm_decrypt_block: - /* input: - * %r0: keytable - * %r1: dst - * %r2: src - * %r3: keybitlen - */ - push {%r1, %r4-%r11, %ip, %lr}; - - GET_DATA_POINTER(RTAB1, .Lcamellia_sp1110, RTAB3); - mov RMASK, #0xff; - add RTAB3, RTAB1, #(2 * 4); - mov RMASK, RMASK, lsl#4 /* byte mask */ - - cmp %r3, #(16 * 8); - bne .Ldec_256; - - inpack(24); - -.Ldec_128: - dec_rounds(16); - dec_fls(16); - dec_rounds(8); - dec_fls(8); - dec_rounds(0); - - pop {%r1}; - outunpack(0); - - pop {%r4-%r11, %ip, %pc}; -.ltorg - -.Ldec_256: - inpack(32); - dec_rounds(24); - dec_fls(24); - - b .Ldec_128; -.ltorg -.size _gcry_camellia_arm_decrypt_block,.-_gcry_camellia_arm_decrypt_block; - -.data - -/* Encryption/Decryption tables */ -.align 5 -.Lcamellia_sp1110: -.long 0x70707000 -.Lcamellia_sp0222: - .long 0x00e0e0e0 -.Lcamellia_sp3033: - .long 0x38003838 -.Lcamellia_sp4404: - .long 0x70700070 -.long 0x82828200, 0x00050505, 0x41004141, 0x2c2c002c -.long 0x2c2c2c00, 0x00585858, 0x16001616, 0xb3b300b3 -.long 0xececec00, 0x00d9d9d9, 0x76007676, 0xc0c000c0 -.long 0xb3b3b300, 0x00676767, 0xd900d9d9, 0xe4e400e4 -.long 0x27272700, 0x004e4e4e, 0x93009393, 0x57570057 -.long 0xc0c0c000, 0x00818181, 0x60006060, 0xeaea00ea -.long 0xe5e5e500, 0x00cbcbcb, 0xf200f2f2, 0xaeae00ae -.long 0xe4e4e400, 0x00c9c9c9, 0x72007272, 0x23230023 -.long 0x85858500, 0x000b0b0b, 0xc200c2c2, 0x6b6b006b -.long 0x57575700, 0x00aeaeae, 0xab00abab, 0x45450045 -.long 0x35353500, 0x006a6a6a, 0x9a009a9a, 0xa5a500a5 -.long 0xeaeaea00, 0x00d5d5d5, 0x75007575, 0xeded00ed -.long 0x0c0c0c00, 0x00181818, 0x06000606, 0x4f4f004f -.long 0xaeaeae00, 0x005d5d5d, 0x57005757, 0x1d1d001d -.long 0x41414100, 0x00828282, 0xa000a0a0, 0x92920092 -.long 0x23232300, 0x00464646, 0x91009191, 0x86860086 -.long 0xefefef00, 0x00dfdfdf, 0xf700f7f7, 0xafaf00af -.long 0x6b6b6b00, 0x00d6d6d6, 0xb500b5b5, 0x7c7c007c -.long 0x93939300, 0x00272727, 0xc900c9c9, 0x1f1f001f -.long 0x45454500, 0x008a8a8a, 0xa200a2a2, 0x3e3e003e -.long 0x19191900, 0x00323232, 0x8c008c8c, 0xdcdc00dc -.long 0xa5a5a500, 0x004b4b4b, 0xd200d2d2, 0x5e5e005e -.long 0x21212100, 0x00424242, 0x90009090, 0x0b0b000b -.long 0xededed00, 0x00dbdbdb, 0xf600f6f6, 0xa6a600a6 -.long 0x0e0e0e00, 0x001c1c1c, 0x07000707, 0x39390039 -.long 0x4f4f4f00, 0x009e9e9e, 0xa700a7a7, 0xd5d500d5 -.long 0x4e4e4e00, 0x009c9c9c, 0x27002727, 0x5d5d005d -.long 0x1d1d1d00, 0x003a3a3a, 0x8e008e8e, 0xd9d900d9 -.long 0x65656500, 0x00cacaca, 0xb200b2b2, 0x5a5a005a -.long 0x92929200, 0x00252525, 0x49004949, 0x51510051 -.long 0xbdbdbd00, 0x007b7b7b, 0xde00dede, 0x6c6c006c -.long 0x86868600, 0x000d0d0d, 0x43004343, 0x8b8b008b -.long 0xb8b8b800, 0x00717171, 0x5c005c5c, 0x9a9a009a -.long 0xafafaf00, 0x005f5f5f, 0xd700d7d7, 0xfbfb00fb -.long 0x8f8f8f00, 0x001f1f1f, 0xc700c7c7, 0xb0b000b0 -.long 0x7c7c7c00, 0x00f8f8f8, 0x3e003e3e, 0x74740074 -.long 0xebebeb00, 0x00d7d7d7, 0xf500f5f5, 0x2b2b002b -.long 0x1f1f1f00, 0x003e3e3e, 0x8f008f8f, 0xf0f000f0 -.long 0xcecece00, 0x009d9d9d, 0x67006767, 0x84840084 -.long 0x3e3e3e00, 0x007c7c7c, 0x1f001f1f, 0xdfdf00df -.long 0x30303000, 0x00606060, 0x18001818, 0xcbcb00cb -.long 0xdcdcdc00, 0x00b9b9b9, 0x6e006e6e, 0x34340034 -.long 0x5f5f5f00, 0x00bebebe, 0xaf00afaf, 0x76760076 -.long 0x5e5e5e00, 0x00bcbcbc, 0x2f002f2f, 0x6d6d006d -.long 0xc5c5c500, 0x008b8b8b, 0xe200e2e2, 0xa9a900a9 -.long 0x0b0b0b00, 0x00161616, 0x85008585, 0xd1d100d1 -.long 0x1a1a1a00, 0x00343434, 0x0d000d0d, 0x04040004 -.long 0xa6a6a600, 0x004d4d4d, 0x53005353, 0x14140014 -.long 0xe1e1e100, 0x00c3c3c3, 0xf000f0f0, 0x3a3a003a -.long 0x39393900, 0x00727272, 0x9c009c9c, 0xdede00de -.long 0xcacaca00, 0x00959595, 0x65006565, 0x11110011 -.long 0xd5d5d500, 0x00ababab, 0xea00eaea, 0x32320032 -.long 0x47474700, 0x008e8e8e, 0xa300a3a3, 0x9c9c009c -.long 0x5d5d5d00, 0x00bababa, 0xae00aeae, 0x53530053 -.long 0x3d3d3d00, 0x007a7a7a, 0x9e009e9e, 0xf2f200f2 -.long 0xd9d9d900, 0x00b3b3b3, 0xec00ecec, 0xfefe00fe -.long 0x01010100, 0x00020202, 0x80008080, 0xcfcf00cf -.long 0x5a5a5a00, 0x00b4b4b4, 0x2d002d2d, 0xc3c300c3 -.long 0xd6d6d600, 0x00adadad, 0x6b006b6b, 0x7a7a007a -.long 0x51515100, 0x00a2a2a2, 0xa800a8a8, 0x24240024 -.long 0x56565600, 0x00acacac, 0x2b002b2b, 0xe8e800e8 -.long 0x6c6c6c00, 0x00d8d8d8, 0x36003636, 0x60600060 -.long 0x4d4d4d00, 0x009a9a9a, 0xa600a6a6, 0x69690069 -.long 0x8b8b8b00, 0x00171717, 0xc500c5c5, 0xaaaa00aa -.long 0x0d0d0d00, 0x001a1a1a, 0x86008686, 0xa0a000a0 -.long 0x9a9a9a00, 0x00353535, 0x4d004d4d, 0xa1a100a1 -.long 0x66666600, 0x00cccccc, 0x33003333, 0x62620062 -.long 0xfbfbfb00, 0x00f7f7f7, 0xfd00fdfd, 0x54540054 -.long 0xcccccc00, 0x00999999, 0x66006666, 0x1e1e001e -.long 0xb0b0b000, 0x00616161, 0x58005858, 0xe0e000e0 -.long 0x2d2d2d00, 0x005a5a5a, 0x96009696, 0x64640064 -.long 0x74747400, 0x00e8e8e8, 0x3a003a3a, 0x10100010 -.long 0x12121200, 0x00242424, 0x09000909, 0x00000000 -.long 0x2b2b2b00, 0x00565656, 0x95009595, 0xa3a300a3 -.long 0x20202000, 0x00404040, 0x10001010, 0x75750075 -.long 0xf0f0f000, 0x00e1e1e1, 0x78007878, 0x8a8a008a -.long 0xb1b1b100, 0x00636363, 0xd800d8d8, 0xe6e600e6 -.long 0x84848400, 0x00090909, 0x42004242, 0x09090009 -.long 0x99999900, 0x00333333, 0xcc00cccc, 0xdddd00dd -.long 0xdfdfdf00, 0x00bfbfbf, 0xef00efef, 0x87870087 -.long 0x4c4c4c00, 0x00989898, 0x26002626, 0x83830083 -.long 0xcbcbcb00, 0x00979797, 0xe500e5e5, 0xcdcd00cd -.long 0xc2c2c200, 0x00858585, 0x61006161, 0x90900090 -.long 0x34343400, 0x00686868, 0x1a001a1a, 0x73730073 -.long 0x7e7e7e00, 0x00fcfcfc, 0x3f003f3f, 0xf6f600f6 -.long 0x76767600, 0x00ececec, 0x3b003b3b, 0x9d9d009d -.long 0x05050500, 0x000a0a0a, 0x82008282, 0xbfbf00bf -.long 0x6d6d6d00, 0x00dadada, 0xb600b6b6, 0x52520052 -.long 0xb7b7b700, 0x006f6f6f, 0xdb00dbdb, 0xd8d800d8 -.long 0xa9a9a900, 0x00535353, 0xd400d4d4, 0xc8c800c8 -.long 0x31313100, 0x00626262, 0x98009898, 0xc6c600c6 -.long 0xd1d1d100, 0x00a3a3a3, 0xe800e8e8, 0x81810081 -.long 0x17171700, 0x002e2e2e, 0x8b008b8b, 0x6f6f006f -.long 0x04040400, 0x00080808, 0x02000202, 0x13130013 -.long 0xd7d7d700, 0x00afafaf, 0xeb00ebeb, 0x63630063 -.long 0x14141400, 0x00282828, 0x0a000a0a, 0xe9e900e9 -.long 0x58585800, 0x00b0b0b0, 0x2c002c2c, 0xa7a700a7 -.long 0x3a3a3a00, 0x00747474, 0x1d001d1d, 0x9f9f009f -.long 0x61616100, 0x00c2c2c2, 0xb000b0b0, 0xbcbc00bc -.long 0xdedede00, 0x00bdbdbd, 0x6f006f6f, 0x29290029 -.long 0x1b1b1b00, 0x00363636, 0x8d008d8d, 0xf9f900f9 -.long 0x11111100, 0x00222222, 0x88008888, 0x2f2f002f -.long 0x1c1c1c00, 0x00383838, 0x0e000e0e, 0xb4b400b4 -.long 0x32323200, 0x00646464, 0x19001919, 0x78780078 -.long 0x0f0f0f00, 0x001e1e1e, 0x87008787, 0x06060006 -.long 0x9c9c9c00, 0x00393939, 0x4e004e4e, 0xe7e700e7 -.long 0x16161600, 0x002c2c2c, 0x0b000b0b, 0x71710071 -.long 0x53535300, 0x00a6a6a6, 0xa900a9a9, 0xd4d400d4 -.long 0x18181800, 0x00303030, 0x0c000c0c, 0xabab00ab -.long 0xf2f2f200, 0x00e5e5e5, 0x79007979, 0x88880088 -.long 0x22222200, 0x00444444, 0x11001111, 0x8d8d008d -.long 0xfefefe00, 0x00fdfdfd, 0x7f007f7f, 0x72720072 -.long 0x44444400, 0x00888888, 0x22002222, 0xb9b900b9 -.long 0xcfcfcf00, 0x009f9f9f, 0xe700e7e7, 0xf8f800f8 -.long 0xb2b2b200, 0x00656565, 0x59005959, 0xacac00ac -.long 0xc3c3c300, 0x00878787, 0xe100e1e1, 0x36360036 -.long 0xb5b5b500, 0x006b6b6b, 0xda00dada, 0x2a2a002a -.long 0x7a7a7a00, 0x00f4f4f4, 0x3d003d3d, 0x3c3c003c -.long 0x91919100, 0x00232323, 0xc800c8c8, 0xf1f100f1 -.long 0x24242400, 0x00484848, 0x12001212, 0x40400040 -.long 0x08080800, 0x00101010, 0x04000404, 0xd3d300d3 -.long 0xe8e8e800, 0x00d1d1d1, 0x74007474, 0xbbbb00bb -.long 0xa8a8a800, 0x00515151, 0x54005454, 0x43430043 -.long 0x60606000, 0x00c0c0c0, 0x30003030, 0x15150015 -.long 0xfcfcfc00, 0x00f9f9f9, 0x7e007e7e, 0xadad00ad -.long 0x69696900, 0x00d2d2d2, 0xb400b4b4, 0x77770077 -.long 0x50505000, 0x00a0a0a0, 0x28002828, 0x80800080 -.long 0xaaaaaa00, 0x00555555, 0x55005555, 0x82820082 -.long 0xd0d0d000, 0x00a1a1a1, 0x68006868, 0xecec00ec -.long 0xa0a0a000, 0x00414141, 0x50005050, 0x27270027 -.long 0x7d7d7d00, 0x00fafafa, 0xbe00bebe, 0xe5e500e5 -.long 0xa1a1a100, 0x00434343, 0xd000d0d0, 0x85850085 -.long 0x89898900, 0x00131313, 0xc400c4c4, 0x35350035 -.long 0x62626200, 0x00c4c4c4, 0x31003131, 0x0c0c000c -.long 0x97979700, 0x002f2f2f, 0xcb00cbcb, 0x41410041 -.long 0x54545400, 0x00a8a8a8, 0x2a002a2a, 0xefef00ef -.long 0x5b5b5b00, 0x00b6b6b6, 0xad00adad, 0x93930093 -.long 0x1e1e1e00, 0x003c3c3c, 0x0f000f0f, 0x19190019 -.long 0x95959500, 0x002b2b2b, 0xca00caca, 0x21210021 -.long 0xe0e0e000, 0x00c1c1c1, 0x70007070, 0x0e0e000e -.long 0xffffff00, 0x00ffffff, 0xff00ffff, 0x4e4e004e -.long 0x64646400, 0x00c8c8c8, 0x32003232, 0x65650065 -.long 0xd2d2d200, 0x00a5a5a5, 0x69006969, 0xbdbd00bd -.long 0x10101000, 0x00202020, 0x08000808, 0xb8b800b8 -.long 0xc4c4c400, 0x00898989, 0x62006262, 0x8f8f008f -.long 0x00000000, 0x00000000, 0x00000000, 0xebeb00eb -.long 0x48484800, 0x00909090, 0x24002424, 0xcece00ce -.long 0xa3a3a300, 0x00474747, 0xd100d1d1, 0x30300030 -.long 0xf7f7f700, 0x00efefef, 0xfb00fbfb, 0x5f5f005f -.long 0x75757500, 0x00eaeaea, 0xba00baba, 0xc5c500c5 -.long 0xdbdbdb00, 0x00b7b7b7, 0xed00eded, 0x1a1a001a -.long 0x8a8a8a00, 0x00151515, 0x45004545, 0xe1e100e1 -.long 0x03030300, 0x00060606, 0x81008181, 0xcaca00ca -.long 0xe6e6e600, 0x00cdcdcd, 0x73007373, 0x47470047 -.long 0xdadada00, 0x00b5b5b5, 0x6d006d6d, 0x3d3d003d -.long 0x09090900, 0x00121212, 0x84008484, 0x01010001 -.long 0x3f3f3f00, 0x007e7e7e, 0x9f009f9f, 0xd6d600d6 -.long 0xdddddd00, 0x00bbbbbb, 0xee00eeee, 0x56560056 -.long 0x94949400, 0x00292929, 0x4a004a4a, 0x4d4d004d -.long 0x87878700, 0x000f0f0f, 0xc300c3c3, 0x0d0d000d -.long 0x5c5c5c00, 0x00b8b8b8, 0x2e002e2e, 0x66660066 -.long 0x83838300, 0x00070707, 0xc100c1c1, 0xcccc00cc -.long 0x02020200, 0x00040404, 0x01000101, 0x2d2d002d -.long 0xcdcdcd00, 0x009b9b9b, 0xe600e6e6, 0x12120012 -.long 0x4a4a4a00, 0x00949494, 0x25002525, 0x20200020 -.long 0x90909000, 0x00212121, 0x48004848, 0xb1b100b1 -.long 0x33333300, 0x00666666, 0x99009999, 0x99990099 -.long 0x73737300, 0x00e6e6e6, 0xb900b9b9, 0x4c4c004c -.long 0x67676700, 0x00cecece, 0xb300b3b3, 0xc2c200c2 -.long 0xf6f6f600, 0x00ededed, 0x7b007b7b, 0x7e7e007e -.long 0xf3f3f300, 0x00e7e7e7, 0xf900f9f9, 0x05050005 -.long 0x9d9d9d00, 0x003b3b3b, 0xce00cece, 0xb7b700b7 -.long 0x7f7f7f00, 0x00fefefe, 0xbf00bfbf, 0x31310031 -.long 0xbfbfbf00, 0x007f7f7f, 0xdf00dfdf, 0x17170017 -.long 0xe2e2e200, 0x00c5c5c5, 0x71007171, 0xd7d700d7 -.long 0x52525200, 0x00a4a4a4, 0x29002929, 0x58580058 -.long 0x9b9b9b00, 0x00373737, 0xcd00cdcd, 0x61610061 -.long 0xd8d8d800, 0x00b1b1b1, 0x6c006c6c, 0x1b1b001b -.long 0x26262600, 0x004c4c4c, 0x13001313, 0x1c1c001c -.long 0xc8c8c800, 0x00919191, 0x64006464, 0x0f0f000f -.long 0x37373700, 0x006e6e6e, 0x9b009b9b, 0x16160016 -.long 0xc6c6c600, 0x008d8d8d, 0x63006363, 0x18180018 -.long 0x3b3b3b00, 0x00767676, 0x9d009d9d, 0x22220022 -.long 0x81818100, 0x00030303, 0xc000c0c0, 0x44440044 -.long 0x96969600, 0x002d2d2d, 0x4b004b4b, 0xb2b200b2 -.long 0x6f6f6f00, 0x00dedede, 0xb700b7b7, 0xb5b500b5 -.long 0x4b4b4b00, 0x00969696, 0xa500a5a5, 0x91910091 -.long 0x13131300, 0x00262626, 0x89008989, 0x08080008 -.long 0xbebebe00, 0x007d7d7d, 0x5f005f5f, 0xa8a800a8 -.long 0x63636300, 0x00c6c6c6, 0xb100b1b1, 0xfcfc00fc -.long 0x2e2e2e00, 0x005c5c5c, 0x17001717, 0x50500050 -.long 0xe9e9e900, 0x00d3d3d3, 0xf400f4f4, 0xd0d000d0 -.long 0x79797900, 0x00f2f2f2, 0xbc00bcbc, 0x7d7d007d -.long 0xa7a7a700, 0x004f4f4f, 0xd300d3d3, 0x89890089 -.long 0x8c8c8c00, 0x00191919, 0x46004646, 0x97970097 -.long 0x9f9f9f00, 0x003f3f3f, 0xcf00cfcf, 0x5b5b005b -.long 0x6e6e6e00, 0x00dcdcdc, 0x37003737, 0x95950095 -.long 0xbcbcbc00, 0x00797979, 0x5e005e5e, 0xffff00ff -.long 0x8e8e8e00, 0x001d1d1d, 0x47004747, 0xd2d200d2 -.long 0x29292900, 0x00525252, 0x94009494, 0xc4c400c4 -.long 0xf5f5f500, 0x00ebebeb, 0xfa00fafa, 0x48480048 -.long 0xf9f9f900, 0x00f3f3f3, 0xfc00fcfc, 0xf7f700f7 -.long 0xb6b6b600, 0x006d6d6d, 0x5b005b5b, 0xdbdb00db -.long 0x2f2f2f00, 0x005e5e5e, 0x97009797, 0x03030003 -.long 0xfdfdfd00, 0x00fbfbfb, 0xfe00fefe, 0xdada00da -.long 0xb4b4b400, 0x00696969, 0x5a005a5a, 0x3f3f003f -.long 0x59595900, 0x00b2b2b2, 0xac00acac, 0x94940094 -.long 0x78787800, 0x00f0f0f0, 0x3c003c3c, 0x5c5c005c -.long 0x98989800, 0x00313131, 0x4c004c4c, 0x02020002 -.long 0x06060600, 0x000c0c0c, 0x03000303, 0x4a4a004a -.long 0x6a6a6a00, 0x00d4d4d4, 0x35003535, 0x33330033 -.long 0xe7e7e700, 0x00cfcfcf, 0xf300f3f3, 0x67670067 -.long 0x46464600, 0x008c8c8c, 0x23002323, 0xf3f300f3 -.long 0x71717100, 0x00e2e2e2, 0xb800b8b8, 0x7f7f007f -.long 0xbababa00, 0x00757575, 0x5d005d5d, 0xe2e200e2 -.long 0xd4d4d400, 0x00a9a9a9, 0x6a006a6a, 0x9b9b009b -.long 0x25252500, 0x004a4a4a, 0x92009292, 0x26260026 -.long 0xababab00, 0x00575757, 0xd500d5d5, 0x37370037 -.long 0x42424200, 0x00848484, 0x21002121, 0x3b3b003b -.long 0x88888800, 0x00111111, 0x44004444, 0x96960096 -.long 0xa2a2a200, 0x00454545, 0x51005151, 0x4b4b004b -.long 0x8d8d8d00, 0x001b1b1b, 0xc600c6c6, 0xbebe00be -.long 0xfafafa00, 0x00f5f5f5, 0x7d007d7d, 0x2e2e002e -.long 0x72727200, 0x00e4e4e4, 0x39003939, 0x79790079 -.long 0x07070700, 0x000e0e0e, 0x83008383, 0x8c8c008c -.long 0xb9b9b900, 0x00737373, 0xdc00dcdc, 0x6e6e006e -.long 0x55555500, 0x00aaaaaa, 0xaa00aaaa, 0x8e8e008e -.long 0xf8f8f800, 0x00f1f1f1, 0x7c007c7c, 0xf5f500f5 -.long 0xeeeeee00, 0x00dddddd, 0x77007777, 0xb6b600b6 -.long 0xacacac00, 0x00595959, 0x56005656, 0xfdfd00fd -.long 0x0a0a0a00, 0x00141414, 0x05000505, 0x59590059 -.long 0x36363600, 0x006c6c6c, 0x1b001b1b, 0x98980098 -.long 0x49494900, 0x00929292, 0xa400a4a4, 0x6a6a006a -.long 0x2a2a2a00, 0x00545454, 0x15001515, 0x46460046 -.long 0x68686800, 0x00d0d0d0, 0x34003434, 0xbaba00ba -.long 0x3c3c3c00, 0x00787878, 0x1e001e1e, 0x25250025 -.long 0x38383800, 0x00707070, 0x1c001c1c, 0x42420042 -.long 0xf1f1f100, 0x00e3e3e3, 0xf800f8f8, 0xa2a200a2 -.long 0xa4a4a400, 0x00494949, 0x52005252, 0xfafa00fa -.long 0x40404000, 0x00808080, 0x20002020, 0x07070007 -.long 0x28282800, 0x00505050, 0x14001414, 0x55550055 -.long 0xd3d3d300, 0x00a7a7a7, 0xe900e9e9, 0xeeee00ee -.long 0x7b7b7b00, 0x00f6f6f6, 0xbd00bdbd, 0x0a0a000a -.long 0xbbbbbb00, 0x00777777, 0xdd00dddd, 0x49490049 -.long 0xc9c9c900, 0x00939393, 0xe400e4e4, 0x68680068 -.long 0x43434300, 0x00868686, 0xa100a1a1, 0x38380038 -.long 0xc1c1c100, 0x00838383, 0xe000e0e0, 0xa4a400a4 -.long 0x15151500, 0x002a2a2a, 0x8a008a8a, 0x28280028 -.long 0xe3e3e300, 0x00c7c7c7, 0xf100f1f1, 0x7b7b007b -.long 0xadadad00, 0x005b5b5b, 0xd600d6d6, 0xc9c900c9 -.long 0xf4f4f400, 0x00e9e9e9, 0x7a007a7a, 0xc1c100c1 -.long 0x77777700, 0x00eeeeee, 0xbb00bbbb, 0xe3e300e3 -.long 0xc7c7c700, 0x008f8f8f, 0xe300e3e3, 0xf4f400f4 -.long 0x80808000, 0x00010101, 0x40004040, 0xc7c700c7 -.long 0x9e9e9e00, 0x003d3d3d, 0x4f004f4f, 0x9e9e009e - -#endif /*HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS*/ -#endif /*__ARM_ARCH >= 6*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-glue.c b/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-glue.c deleted file mode 100644 index f18d1358..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia-glue.c +++ /dev/null @@ -1,714 +0,0 @@ -/* camellia-glue.c - Glue for the Camellia cipher - * Copyright (C) 2007 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/* I put all the libgcrypt-specific stuff in this file to keep the - camellia.c/camellia.h files exactly as provided by NTT. If they - update their code, this should make it easier to bring the changes - in. - dshaw - - There is one small change which needs to be done: Include the - following code at the top of camellia.h: */ -#if 0 - -/* To use Camellia with libraries it is often useful to keep the name - * space of the library clean. The following macro is thus useful: - * - * #define CAMELLIA_EXT_SYM_PREFIX foo_ - * - * This prefixes all external symbols with "foo_". - */ -#ifdef HAVE_CONFIG_H -#include -#endif -#ifdef CAMELLIA_EXT_SYM_PREFIX -#define CAMELLIA_PREFIX1(x,y) x ## y -#define CAMELLIA_PREFIX2(x,y) CAMELLIA_PREFIX1(x,y) -#define CAMELLIA_PREFIX(x) CAMELLIA_PREFIX2(CAMELLIA_EXT_SYM_PREFIX,x) -#define Camellia_Ekeygen CAMELLIA_PREFIX(Camellia_Ekeygen) -#define Camellia_EncryptBlock CAMELLIA_PREFIX(Camellia_EncryptBlock) -#define Camellia_DecryptBlock CAMELLIA_PREFIX(Camellia_DecryptBlock) -#define camellia_decrypt128 CAMELLIA_PREFIX(camellia_decrypt128) -#define camellia_decrypt256 CAMELLIA_PREFIX(camellia_decrypt256) -#define camellia_encrypt128 CAMELLIA_PREFIX(camellia_encrypt128) -#define camellia_encrypt256 CAMELLIA_PREFIX(camellia_encrypt256) -#define camellia_setup128 CAMELLIA_PREFIX(camellia_setup128) -#define camellia_setup192 CAMELLIA_PREFIX(camellia_setup192) -#define camellia_setup256 CAMELLIA_PREFIX(camellia_setup256) -#endif /*CAMELLIA_EXT_SYM_PREFIX*/ - -#endif /* Code sample. */ - - -#include -#include "types.h" -#include "g10lib.h" -#include "cipher.h" -#include "camellia.h" -#include "bufhelp.h" -#include "cipher-selftest.h" - -/* Helper macro to force alignment to 16 bytes. */ -#ifdef HAVE_GCC_ATTRIBUTE_ALIGNED -# define ATTR_ALIGNED_16 __attribute__ ((aligned (16))) -#else -# define ATTR_ALIGNED_16 -#endif - -/* USE_AESNI inidicates whether to compile with Intel AES-NI/AVX code. */ -#undef USE_AESNI_AVX -#if defined(ENABLE_AESNI_SUPPORT) && defined(ENABLE_AVX_SUPPORT) -# if defined(__x86_64__) && defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) -# define USE_AESNI_AVX 1 -# endif -#endif - -/* USE_AESNI_AVX2 inidicates whether to compile with Intel AES-NI/AVX2 code. */ -#undef USE_AESNI_AVX2 -#if defined(ENABLE_AESNI_SUPPORT) && defined(ENABLE_AVX2_SUPPORT) -# if defined(__x86_64__) && defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) -# define USE_AESNI_AVX2 1 -# endif -#endif - -typedef struct -{ - KEY_TABLE_TYPE keytable; - int keybitlength; -#ifdef USE_AESNI_AVX - unsigned int use_aesni_avx:1; /* AES-NI/AVX implementation shall be used. */ -#endif /*USE_AESNI_AVX*/ -#ifdef USE_AESNI_AVX2 - unsigned int use_aesni_avx2:1;/* AES-NI/AVX2 implementation shall be used. */ -#endif /*USE_AESNI_AVX2*/ -} CAMELLIA_context; - -#ifdef USE_AESNI_AVX -/* Assembler implementations of Camellia using AES-NI and AVX. Process data - in 16 block same time. - */ -extern void _gcry_camellia_aesni_avx_ctr_enc(CAMELLIA_context *ctx, - unsigned char *out, - const unsigned char *in, - unsigned char *ctr); - -extern void _gcry_camellia_aesni_avx_cbc_dec(CAMELLIA_context *ctx, - unsigned char *out, - const unsigned char *in, - unsigned char *iv); - -extern void _gcry_camellia_aesni_avx_cfb_dec(CAMELLIA_context *ctx, - unsigned char *out, - const unsigned char *in, - unsigned char *iv); - -extern void _gcry_camellia_aesni_avx_keygen(CAMELLIA_context *ctx, - const unsigned char *key, - unsigned int keylen); -#endif - -#ifdef USE_AESNI_AVX2 -/* Assembler implementations of Camellia using AES-NI and AVX2. Process data - in 32 block same time. - */ -extern void _gcry_camellia_aesni_avx2_ctr_enc(CAMELLIA_context *ctx, - unsigned char *out, - const unsigned char *in, - unsigned char *ctr); - -extern void _gcry_camellia_aesni_avx2_cbc_dec(CAMELLIA_context *ctx, - unsigned char *out, - const unsigned char *in, - unsigned char *iv); - -extern void _gcry_camellia_aesni_avx2_cfb_dec(CAMELLIA_context *ctx, - unsigned char *out, - const unsigned char *in, - unsigned char *iv); -#endif - -static const char *selftest(void); - -static gcry_err_code_t -camellia_setkey(void *c, const byte *key, unsigned keylen) -{ - CAMELLIA_context *ctx=c; - static int initialized=0; - static const char *selftest_failed=NULL; -#if defined(USE_AESNI_AVX) || defined(USE_AESNI_AVX2) - unsigned int hwf = _gcry_get_hw_features (); -#endif - - if(keylen!=16 && keylen!=24 && keylen!=32) - return GPG_ERR_INV_KEYLEN; - - if(!initialized) - { - initialized=1; - selftest_failed=selftest(); - if(selftest_failed) - log_error("%s\n",selftest_failed); - } - - if(selftest_failed) - return GPG_ERR_SELFTEST_FAILED; - -#ifdef USE_AESNI_AVX - ctx->use_aesni_avx = (hwf & HWF_INTEL_AESNI) && (hwf & HWF_INTEL_AVX); -#endif -#ifdef USE_AESNI_AVX2 - ctx->use_aesni_avx2 = (hwf & HWF_INTEL_AESNI) && (hwf & HWF_INTEL_AVX2); -#endif - - ctx->keybitlength=keylen*8; - - if (0) - { } -#ifdef USE_AESNI_AVX - else if (ctx->use_aesni_avx) - _gcry_camellia_aesni_avx_keygen(ctx, key, keylen); - else -#endif - { - Camellia_Ekeygen(ctx->keybitlength,key,ctx->keytable); - _gcry_burn_stack - ((19+34+34)*sizeof(u32)+2*sizeof(void*) /* camellia_setup256 */ - +(4+32)*sizeof(u32)+2*sizeof(void*) /* camellia_setup192 */ - +0+sizeof(int)+2*sizeof(void*) /* Camellia_Ekeygen */ - +3*2*sizeof(void*) /* Function calls. */ - ); - } - - return 0; -} - -#ifdef USE_ARM_ASM - -/* Assembly implementations of Camellia. */ -extern void _gcry_camellia_arm_encrypt_block(const KEY_TABLE_TYPE keyTable, - byte *outbuf, const byte *inbuf, - const int keybits); - -extern void _gcry_camellia_arm_decrypt_block(const KEY_TABLE_TYPE keyTable, - byte *outbuf, const byte *inbuf, - const int keybits); - -static void Camellia_EncryptBlock(const int keyBitLength, - const unsigned char *plaintext, - const KEY_TABLE_TYPE keyTable, - unsigned char *cipherText) -{ - _gcry_camellia_arm_encrypt_block(keyTable, cipherText, plaintext, - keyBitLength); -} - -static void Camellia_DecryptBlock(const int keyBitLength, - const unsigned char *cipherText, - const KEY_TABLE_TYPE keyTable, - unsigned char *plaintext) -{ - _gcry_camellia_arm_decrypt_block(keyTable, plaintext, cipherText, - keyBitLength); -} - -static unsigned int -camellia_encrypt(void *c, byte *outbuf, const byte *inbuf) -{ - CAMELLIA_context *ctx = c; - Camellia_EncryptBlock(ctx->keybitlength,inbuf,ctx->keytable,outbuf); -#define CAMELLIA_encrypt_stack_burn_size (15*4) - return /*burn_stack*/ (CAMELLIA_encrypt_stack_burn_size); -} - -static unsigned int -camellia_decrypt(void *c, byte *outbuf, const byte *inbuf) -{ - CAMELLIA_context *ctx=c; - Camellia_DecryptBlock(ctx->keybitlength,inbuf,ctx->keytable,outbuf); -#define CAMELLIA_decrypt_stack_burn_size (15*4) - return /*burn_stack*/ (CAMELLIA_decrypt_stack_burn_size); -} - -#else /*USE_ARM_ASM*/ - -static unsigned int -camellia_encrypt(void *c, byte *outbuf, const byte *inbuf) -{ - CAMELLIA_context *ctx=c; - - Camellia_EncryptBlock(ctx->keybitlength,inbuf,ctx->keytable,outbuf); - -#define CAMELLIA_encrypt_stack_burn_size \ - (sizeof(int)+2*sizeof(unsigned char *)+sizeof(void*/*KEY_TABLE_TYPE*/) \ - +4*sizeof(u32)+4*sizeof(u32) \ - +2*sizeof(u32*)+4*sizeof(u32) \ - +2*2*sizeof(void*) /* Function calls. */ \ - ) - - return /*burn_stack*/ (CAMELLIA_encrypt_stack_burn_size); -} - -static unsigned int -camellia_decrypt(void *c, byte *outbuf, const byte *inbuf) -{ - CAMELLIA_context *ctx=c; - - Camellia_DecryptBlock(ctx->keybitlength,inbuf,ctx->keytable,outbuf); - -#define CAMELLIA_decrypt_stack_burn_size \ - (sizeof(int)+2*sizeof(unsigned char *)+sizeof(void*/*KEY_TABLE_TYPE*/) \ - +4*sizeof(u32)+4*sizeof(u32) \ - +2*sizeof(u32*)+4*sizeof(u32) \ - +2*2*sizeof(void*) /* Function calls. */ \ - ) - - return /*burn_stack*/ (CAMELLIA_decrypt_stack_burn_size); -} - -#endif /*!USE_ARM_ASM*/ - -/* Bulk encryption of complete blocks in CTR mode. This function is only - intended for the bulk encryption feature of cipher.c. CTR is expected to be - of size CAMELLIA_BLOCK_SIZE. */ -void -_gcry_camellia_ctr_enc(void *context, unsigned char *ctr, - void *outbuf_arg, const void *inbuf_arg, - size_t nblocks) -{ - CAMELLIA_context *ctx = context; - unsigned char *outbuf = outbuf_arg; - const unsigned char *inbuf = inbuf_arg; - unsigned char tmpbuf[CAMELLIA_BLOCK_SIZE]; - int burn_stack_depth = CAMELLIA_encrypt_stack_burn_size; - int i; - -#ifdef USE_AESNI_AVX2 - if (ctx->use_aesni_avx2) - { - int did_use_aesni_avx2 = 0; - - /* Process data in 32 block chunks. */ - while (nblocks >= 32) - { - _gcry_camellia_aesni_avx2_ctr_enc(ctx, outbuf, inbuf, ctr); - - nblocks -= 32; - outbuf += 32 * CAMELLIA_BLOCK_SIZE; - inbuf += 32 * CAMELLIA_BLOCK_SIZE; - did_use_aesni_avx2 = 1; - } - - if (did_use_aesni_avx2) - { - int avx2_burn_stack_depth = 32 * CAMELLIA_BLOCK_SIZE + 16 + - 2 * sizeof(void *); - - if (burn_stack_depth < avx2_burn_stack_depth) - burn_stack_depth = avx2_burn_stack_depth; - } - - /* Use generic code to handle smaller chunks... */ - /* TODO: use caching instead? */ - } -#endif - -#ifdef USE_AESNI_AVX - if (ctx->use_aesni_avx) - { - int did_use_aesni_avx = 0; - - /* Process data in 16 block chunks. */ - while (nblocks >= 16) - { - _gcry_camellia_aesni_avx_ctr_enc(ctx, outbuf, inbuf, ctr); - - nblocks -= 16; - outbuf += 16 * CAMELLIA_BLOCK_SIZE; - inbuf += 16 * CAMELLIA_BLOCK_SIZE; - did_use_aesni_avx = 1; - } - - if (did_use_aesni_avx) - { - if (burn_stack_depth < 16 * CAMELLIA_BLOCK_SIZE + 2 * sizeof(void *)) - burn_stack_depth = 16 * CAMELLIA_BLOCK_SIZE + 2 * sizeof(void *); - } - - /* Use generic code to handle smaller chunks... */ - /* TODO: use caching instead? */ - } -#endif - - for ( ;nblocks; nblocks-- ) - { - /* Encrypt the counter. */ - Camellia_EncryptBlock(ctx->keybitlength, ctr, ctx->keytable, tmpbuf); - /* XOR the input with the encrypted counter and store in output. */ - buf_xor(outbuf, tmpbuf, inbuf, CAMELLIA_BLOCK_SIZE); - outbuf += CAMELLIA_BLOCK_SIZE; - inbuf += CAMELLIA_BLOCK_SIZE; - /* Increment the counter. */ - for (i = CAMELLIA_BLOCK_SIZE; i > 0; i--) - { - ctr[i-1]++; - if (ctr[i-1]) - break; - } - } - - wipememory(tmpbuf, sizeof(tmpbuf)); - _gcry_burn_stack(burn_stack_depth); -} - -/* Bulk decryption of complete blocks in CBC mode. This function is only - intended for the bulk encryption feature of cipher.c. */ -void -_gcry_camellia_cbc_dec(void *context, unsigned char *iv, - void *outbuf_arg, const void *inbuf_arg, - size_t nblocks) -{ - CAMELLIA_context *ctx = context; - unsigned char *outbuf = outbuf_arg; - const unsigned char *inbuf = inbuf_arg; - unsigned char savebuf[CAMELLIA_BLOCK_SIZE]; - int burn_stack_depth = CAMELLIA_decrypt_stack_burn_size; - -#ifdef USE_AESNI_AVX2 - if (ctx->use_aesni_avx2) - { - int did_use_aesni_avx2 = 0; - - /* Process data in 32 block chunks. */ - while (nblocks >= 32) - { - _gcry_camellia_aesni_avx2_cbc_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 32; - outbuf += 32 * CAMELLIA_BLOCK_SIZE; - inbuf += 32 * CAMELLIA_BLOCK_SIZE; - did_use_aesni_avx2 = 1; - } - - if (did_use_aesni_avx2) - { - int avx2_burn_stack_depth = 32 * CAMELLIA_BLOCK_SIZE + 16 + - 2 * sizeof(void *); - - if (burn_stack_depth < avx2_burn_stack_depth) - burn_stack_depth = avx2_burn_stack_depth; - } - - /* Use generic code to handle smaller chunks... */ - } -#endif - -#ifdef USE_AESNI_AVX - if (ctx->use_aesni_avx) - { - int did_use_aesni_avx = 0; - - /* Process data in 16 block chunks. */ - while (nblocks >= 16) - { - _gcry_camellia_aesni_avx_cbc_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 16; - outbuf += 16 * CAMELLIA_BLOCK_SIZE; - inbuf += 16 * CAMELLIA_BLOCK_SIZE; - did_use_aesni_avx = 1; - } - - if (did_use_aesni_avx) - { - if (burn_stack_depth < 16 * CAMELLIA_BLOCK_SIZE + 2 * sizeof(void *)) - burn_stack_depth = 16 * CAMELLIA_BLOCK_SIZE + 2 * sizeof(void *); - } - - /* Use generic code to handle smaller chunks... */ - } -#endif - - for ( ;nblocks; nblocks-- ) - { - /* INBUF is needed later and it may be identical to OUTBUF, so store - the intermediate result to SAVEBUF. */ - Camellia_DecryptBlock(ctx->keybitlength, inbuf, ctx->keytable, savebuf); - - buf_xor_n_copy_2(outbuf, savebuf, iv, inbuf, CAMELLIA_BLOCK_SIZE); - inbuf += CAMELLIA_BLOCK_SIZE; - outbuf += CAMELLIA_BLOCK_SIZE; - } - - wipememory(savebuf, sizeof(savebuf)); - _gcry_burn_stack(burn_stack_depth); -} - -/* Bulk decryption of complete blocks in CFB mode. This function is only - intended for the bulk encryption feature of cipher.c. */ -void -_gcry_camellia_cfb_dec(void *context, unsigned char *iv, - void *outbuf_arg, const void *inbuf_arg, - size_t nblocks) -{ - CAMELLIA_context *ctx = context; - unsigned char *outbuf = outbuf_arg; - const unsigned char *inbuf = inbuf_arg; - int burn_stack_depth = CAMELLIA_decrypt_stack_burn_size; - -#ifdef USE_AESNI_AVX2 - if (ctx->use_aesni_avx2) - { - int did_use_aesni_avx2 = 0; - - /* Process data in 32 block chunks. */ - while (nblocks >= 32) - { - _gcry_camellia_aesni_avx2_cfb_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 32; - outbuf += 32 * CAMELLIA_BLOCK_SIZE; - inbuf += 32 * CAMELLIA_BLOCK_SIZE; - did_use_aesni_avx2 = 1; - } - - if (did_use_aesni_avx2) - { - int avx2_burn_stack_depth = 32 * CAMELLIA_BLOCK_SIZE + 16 + - 2 * sizeof(void *); - - if (burn_stack_depth < avx2_burn_stack_depth) - burn_stack_depth = avx2_burn_stack_depth; - } - - /* Use generic code to handle smaller chunks... */ - } -#endif - -#ifdef USE_AESNI_AVX - if (ctx->use_aesni_avx) - { - int did_use_aesni_avx = 0; - - /* Process data in 16 block chunks. */ - while (nblocks >= 16) - { - _gcry_camellia_aesni_avx_cfb_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 16; - outbuf += 16 * CAMELLIA_BLOCK_SIZE; - inbuf += 16 * CAMELLIA_BLOCK_SIZE; - did_use_aesni_avx = 1; - } - - if (did_use_aesni_avx) - { - if (burn_stack_depth < 16 * CAMELLIA_BLOCK_SIZE + 2 * sizeof(void *)) - burn_stack_depth = 16 * CAMELLIA_BLOCK_SIZE + 2 * sizeof(void *); - } - - /* Use generic code to handle smaller chunks... */ - } -#endif - - for ( ;nblocks; nblocks-- ) - { - Camellia_EncryptBlock(ctx->keybitlength, iv, ctx->keytable, iv); - buf_xor_n_copy(outbuf, iv, inbuf, CAMELLIA_BLOCK_SIZE); - outbuf += CAMELLIA_BLOCK_SIZE; - inbuf += CAMELLIA_BLOCK_SIZE; - } - - _gcry_burn_stack(burn_stack_depth); -} - -/* Run the self-tests for CAMELLIA-CTR-128, tests IV increment of bulk CTR - encryption. Returns NULL on success. */ -static const char* -selftest_ctr_128 (void) -{ - const int nblocks = 32+16+1; - const int blocksize = CAMELLIA_BLOCK_SIZE; - const int context_size = sizeof(CAMELLIA_context); - - return _gcry_selftest_helper_ctr("CAMELLIA", &camellia_setkey, - &camellia_encrypt, &_gcry_camellia_ctr_enc, nblocks, blocksize, - context_size); -} - -/* Run the self-tests for CAMELLIA-CBC-128, tests bulk CBC decryption. - Returns NULL on success. */ -static const char* -selftest_cbc_128 (void) -{ - const int nblocks = 32+16+2; - const int blocksize = CAMELLIA_BLOCK_SIZE; - const int context_size = sizeof(CAMELLIA_context); - - return _gcry_selftest_helper_cbc("CAMELLIA", &camellia_setkey, - &camellia_encrypt, &_gcry_camellia_cbc_dec, nblocks, blocksize, - context_size); -} - -/* Run the self-tests for CAMELLIA-CFB-128, tests bulk CFB decryption. - Returns NULL on success. */ -static const char* -selftest_cfb_128 (void) -{ - const int nblocks = 32+16+2; - const int blocksize = CAMELLIA_BLOCK_SIZE; - const int context_size = sizeof(CAMELLIA_context); - - return _gcry_selftest_helper_cfb("CAMELLIA", &camellia_setkey, - &camellia_encrypt, &_gcry_camellia_cfb_dec, nblocks, blocksize, - context_size); -} - -static const char * -selftest(void) -{ - CAMELLIA_context ctx; - byte scratch[16]; - const char *r; - - /* These test vectors are from RFC-3713 */ - static const byte plaintext[]= - { - 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef, - 0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10 - }; - static const byte key_128[]= - { - 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef, - 0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10 - }; - static const byte ciphertext_128[]= - { - 0x67,0x67,0x31,0x38,0x54,0x96,0x69,0x73, - 0x08,0x57,0x06,0x56,0x48,0xea,0xbe,0x43 - }; - static const byte key_192[]= - { - 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xfe,0xdc,0xba,0x98, - 0x76,0x54,0x32,0x10,0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77 - }; - static const byte ciphertext_192[]= - { - 0xb4,0x99,0x34,0x01,0xb3,0xe9,0x96,0xf8, - 0x4e,0xe5,0xce,0xe7,0xd7,0x9b,0x09,0xb9 - }; - static const byte key_256[]= - { - 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xfe,0xdc,0xba, - 0x98,0x76,0x54,0x32,0x10,0x00,0x11,0x22,0x33,0x44,0x55, - 0x66,0x77,0x88,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff - }; - static const byte ciphertext_256[]= - { - 0x9a,0xcc,0x23,0x7d,0xff,0x16,0xd7,0x6c, - 0x20,0xef,0x7c,0x91,0x9e,0x3a,0x75,0x09 - }; - - camellia_setkey(&ctx,key_128,sizeof(key_128)); - camellia_encrypt(&ctx,scratch,plaintext); - if(memcmp(scratch,ciphertext_128,sizeof(ciphertext_128))!=0) - return "CAMELLIA-128 test encryption failed."; - camellia_decrypt(&ctx,scratch,scratch); - if(memcmp(scratch,plaintext,sizeof(plaintext))!=0) - return "CAMELLIA-128 test decryption failed."; - - camellia_setkey(&ctx,key_192,sizeof(key_192)); - camellia_encrypt(&ctx,scratch,plaintext); - if(memcmp(scratch,ciphertext_192,sizeof(ciphertext_192))!=0) - return "CAMELLIA-192 test encryption failed."; - camellia_decrypt(&ctx,scratch,scratch); - if(memcmp(scratch,plaintext,sizeof(plaintext))!=0) - return "CAMELLIA-192 test decryption failed."; - - camellia_setkey(&ctx,key_256,sizeof(key_256)); - camellia_encrypt(&ctx,scratch,plaintext); - if(memcmp(scratch,ciphertext_256,sizeof(ciphertext_256))!=0) - return "CAMELLIA-256 test encryption failed."; - camellia_decrypt(&ctx,scratch,scratch); - if(memcmp(scratch,plaintext,sizeof(plaintext))!=0) - return "CAMELLIA-256 test decryption failed."; - - if ( (r = selftest_ctr_128 ()) ) - return r; - - if ( (r = selftest_cbc_128 ()) ) - return r; - - if ( (r = selftest_cfb_128 ()) ) - return r; - - return NULL; -} - -/* These oids are from - , - retrieved May 1, 2007. */ - -static gcry_cipher_oid_spec_t camellia128_oids[] = - { - {"1.2.392.200011.61.1.1.1.2", GCRY_CIPHER_MODE_CBC}, - {"0.3.4401.5.3.1.9.1", GCRY_CIPHER_MODE_ECB}, - {"0.3.4401.5.3.1.9.3", GCRY_CIPHER_MODE_OFB}, - {"0.3.4401.5.3.1.9.4", GCRY_CIPHER_MODE_CFB}, - { NULL } - }; - -static gcry_cipher_oid_spec_t camellia192_oids[] = - { - {"1.2.392.200011.61.1.1.1.3", GCRY_CIPHER_MODE_CBC}, - {"0.3.4401.5.3.1.9.21", GCRY_CIPHER_MODE_ECB}, - {"0.3.4401.5.3.1.9.23", GCRY_CIPHER_MODE_OFB}, - {"0.3.4401.5.3.1.9.24", GCRY_CIPHER_MODE_CFB}, - { NULL } - }; - -static gcry_cipher_oid_spec_t camellia256_oids[] = - { - {"1.2.392.200011.61.1.1.1.4", GCRY_CIPHER_MODE_CBC}, - {"0.3.4401.5.3.1.9.41", GCRY_CIPHER_MODE_ECB}, - {"0.3.4401.5.3.1.9.43", GCRY_CIPHER_MODE_OFB}, - {"0.3.4401.5.3.1.9.44", GCRY_CIPHER_MODE_CFB}, - { NULL } - }; - -gcry_cipher_spec_t _gcry_cipher_spec_camellia128 = - { - GCRY_CIPHER_CAMELLIA128, {0, 0}, - "CAMELLIA128",NULL,camellia128_oids,CAMELLIA_BLOCK_SIZE,128, - sizeof(CAMELLIA_context),camellia_setkey,camellia_encrypt,camellia_decrypt - }; - -gcry_cipher_spec_t _gcry_cipher_spec_camellia192 = - { - GCRY_CIPHER_CAMELLIA192, {0, 0}, - "CAMELLIA192",NULL,camellia192_oids,CAMELLIA_BLOCK_SIZE,192, - sizeof(CAMELLIA_context),camellia_setkey,camellia_encrypt,camellia_decrypt - }; - -gcry_cipher_spec_t _gcry_cipher_spec_camellia256 = - { - GCRY_CIPHER_CAMELLIA256, {0, 0}, - "CAMELLIA256",NULL,camellia256_oids,CAMELLIA_BLOCK_SIZE,256, - sizeof(CAMELLIA_context),camellia_setkey,camellia_encrypt,camellia_decrypt - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia.c b/src/hos_libhttpserver/src/libgcrypt/cipher/camellia.c deleted file mode 100644 index e7085a7e..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia.c +++ /dev/null @@ -1,1413 +0,0 @@ -/* camellia.h ver 1.2.0 - * - * Copyright (C) 2006,2007 - * NTT (Nippon Telegraph and Telephone Corporation). - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -/* - * Algorithm Specification - * http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html - */ - -#include -#include -#include - -#include "types.h" -#include "bufhelp.h" -#include "camellia.h" - -typedef byte u8; - -/* key constants */ - -#define CAMELLIA_SIGMA1L (0xA09E667FL) -#define CAMELLIA_SIGMA1R (0x3BCC908BL) -#define CAMELLIA_SIGMA2L (0xB67AE858L) -#define CAMELLIA_SIGMA2R (0x4CAA73B2L) -#define CAMELLIA_SIGMA3L (0xC6EF372FL) -#define CAMELLIA_SIGMA3R (0xE94F82BEL) -#define CAMELLIA_SIGMA4L (0x54FF53A5L) -#define CAMELLIA_SIGMA4R (0xF1D36F1CL) -#define CAMELLIA_SIGMA5L (0x10E527FAL) -#define CAMELLIA_SIGMA5R (0xDE682D1DL) -#define CAMELLIA_SIGMA6L (0xB05688C2L) -#define CAMELLIA_SIGMA6R (0xB3E6C1FDL) - -/* - * macros - */ - - -#if defined(_MSC_VER) - -# define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00) -# define GETU32(p) SWAP(*((u32 *)(p))) -# define PUTU32(ct, st) {*((u32 *)(ct)) = SWAP((st));} - -#else /* not MS-VC */ - -# define GETU32(pt) buf_get_be32(pt) -# define PUTU32(ct, st) buf_put_be32(ct, st) - -#endif - -#define CamelliaSubkeyL(INDEX) (subkey[(INDEX)*2]) -#define CamelliaSubkeyR(INDEX) (subkey[(INDEX)*2 + 1]) - -/* rotation right shift 1byte */ -#define CAMELLIA_RR8(x) (((x) >> 8) + ((x) << 24)) -/* rotation left shift 1bit */ -#define CAMELLIA_RL1(x) (((x) << 1) + ((x) >> 31)) -/* rotation left shift 1byte */ -#define CAMELLIA_RL8(x) (((x) << 8) + ((x) >> 24)) - -#define CAMELLIA_ROLDQ(ll, lr, rl, rr, w0, w1, bits) \ - do { \ - w0 = ll; \ - ll = (ll << bits) + (lr >> (32 - bits)); \ - lr = (lr << bits) + (rl >> (32 - bits)); \ - rl = (rl << bits) + (rr >> (32 - bits)); \ - rr = (rr << bits) + (w0 >> (32 - bits)); \ - } while(0) - -#define CAMELLIA_ROLDQo32(ll, lr, rl, rr, w0, w1, bits) \ - do { \ - w0 = ll; \ - w1 = lr; \ - ll = (lr << (bits - 32)) + (rl >> (64 - bits)); \ - lr = (rl << (bits - 32)) + (rr >> (64 - bits)); \ - rl = (rr << (bits - 32)) + (w0 >> (64 - bits)); \ - rr = (w0 << (bits - 32)) + (w1 >> (64 - bits)); \ - } while(0) - -#define CAMELLIA_SP1110(INDEX) (camellia_sp1110[(INDEX)]) -#define CAMELLIA_SP0222(INDEX) (camellia_sp0222[(INDEX)]) -#define CAMELLIA_SP3033(INDEX) (camellia_sp3033[(INDEX)]) -#define CAMELLIA_SP4404(INDEX) (camellia_sp4404[(INDEX)]) - -#define CAMELLIA_F(xl, xr, kl, kr, yl, yr, il, ir, t0, t1) \ - do { \ - il = xl ^ kl; \ - ir = xr ^ kr; \ - t0 = il >> 16; \ - t1 = ir >> 16; \ - yl = CAMELLIA_SP1110(ir & 0xff) \ - ^ CAMELLIA_SP0222((t1 >> 8) & 0xff) \ - ^ CAMELLIA_SP3033(t1 & 0xff) \ - ^ CAMELLIA_SP4404((ir >> 8) & 0xff); \ - yr = CAMELLIA_SP1110((t0 >> 8) & 0xff) \ - ^ CAMELLIA_SP0222(t0 & 0xff) \ - ^ CAMELLIA_SP3033((il >> 8) & 0xff) \ - ^ CAMELLIA_SP4404(il & 0xff); \ - yl ^= yr; \ - yr = CAMELLIA_RR8(yr); \ - yr ^= yl; \ - } while(0) - - -/* - * for speed up - * - */ -#define CAMELLIA_FLS(ll, lr, rl, rr, kll, klr, krl, krr, t0, t1, t2, t3) \ - do { \ - t0 = kll; \ - t0 &= ll; \ - lr ^= CAMELLIA_RL1(t0); \ - t1 = klr; \ - t1 |= lr; \ - ll ^= t1; \ - \ - t2 = krr; \ - t2 |= rr; \ - rl ^= t2; \ - t3 = krl; \ - t3 &= rl; \ - rr ^= CAMELLIA_RL1(t3); \ - } while(0) - -#define CAMELLIA_ROUNDSM(xl, xr, kl, kr, yl, yr, il, ir, t0, t1) \ - do { \ - yl ^= kl; \ - yr ^= kr; \ - ir = CAMELLIA_SP1110(xr & 0xff) \ - ^ CAMELLIA_SP0222((xr >> 24) & 0xff) \ - ^ CAMELLIA_SP3033((xr >> 16) & 0xff) \ - ^ CAMELLIA_SP4404((xr >> 8) & 0xff); \ - il = CAMELLIA_SP1110((xl >> 24) & 0xff) \ - ^ CAMELLIA_SP0222((xl >> 16) & 0xff) \ - ^ CAMELLIA_SP3033((xl >> 8) & 0xff) \ - ^ CAMELLIA_SP4404(xl & 0xff); \ - ir ^= il; \ - il = CAMELLIA_RR8(il); \ - il ^= ir; \ - yl ^= ir; \ - yr ^= il; \ - } while(0) - - -static const u32 camellia_sp1110[256] = { - 0x70707000,0x82828200,0x2c2c2c00,0xececec00, - 0xb3b3b300,0x27272700,0xc0c0c000,0xe5e5e500, - 0xe4e4e400,0x85858500,0x57575700,0x35353500, - 0xeaeaea00,0x0c0c0c00,0xaeaeae00,0x41414100, - 0x23232300,0xefefef00,0x6b6b6b00,0x93939300, - 0x45454500,0x19191900,0xa5a5a500,0x21212100, - 0xededed00,0x0e0e0e00,0x4f4f4f00,0x4e4e4e00, - 0x1d1d1d00,0x65656500,0x92929200,0xbdbdbd00, - 0x86868600,0xb8b8b800,0xafafaf00,0x8f8f8f00, - 0x7c7c7c00,0xebebeb00,0x1f1f1f00,0xcecece00, - 0x3e3e3e00,0x30303000,0xdcdcdc00,0x5f5f5f00, - 0x5e5e5e00,0xc5c5c500,0x0b0b0b00,0x1a1a1a00, - 0xa6a6a600,0xe1e1e100,0x39393900,0xcacaca00, - 0xd5d5d500,0x47474700,0x5d5d5d00,0x3d3d3d00, - 0xd9d9d900,0x01010100,0x5a5a5a00,0xd6d6d600, - 0x51515100,0x56565600,0x6c6c6c00,0x4d4d4d00, - 0x8b8b8b00,0x0d0d0d00,0x9a9a9a00,0x66666600, - 0xfbfbfb00,0xcccccc00,0xb0b0b000,0x2d2d2d00, - 0x74747400,0x12121200,0x2b2b2b00,0x20202000, - 0xf0f0f000,0xb1b1b100,0x84848400,0x99999900, - 0xdfdfdf00,0x4c4c4c00,0xcbcbcb00,0xc2c2c200, - 0x34343400,0x7e7e7e00,0x76767600,0x05050500, - 0x6d6d6d00,0xb7b7b700,0xa9a9a900,0x31313100, - 0xd1d1d100,0x17171700,0x04040400,0xd7d7d700, - 0x14141400,0x58585800,0x3a3a3a00,0x61616100, - 0xdedede00,0x1b1b1b00,0x11111100,0x1c1c1c00, - 0x32323200,0x0f0f0f00,0x9c9c9c00,0x16161600, - 0x53535300,0x18181800,0xf2f2f200,0x22222200, - 0xfefefe00,0x44444400,0xcfcfcf00,0xb2b2b200, - 0xc3c3c300,0xb5b5b500,0x7a7a7a00,0x91919100, - 0x24242400,0x08080800,0xe8e8e800,0xa8a8a800, - 0x60606000,0xfcfcfc00,0x69696900,0x50505000, - 0xaaaaaa00,0xd0d0d000,0xa0a0a000,0x7d7d7d00, - 0xa1a1a100,0x89898900,0x62626200,0x97979700, - 0x54545400,0x5b5b5b00,0x1e1e1e00,0x95959500, - 0xe0e0e000,0xffffff00,0x64646400,0xd2d2d200, - 0x10101000,0xc4c4c400,0x00000000,0x48484800, - 0xa3a3a300,0xf7f7f700,0x75757500,0xdbdbdb00, - 0x8a8a8a00,0x03030300,0xe6e6e600,0xdadada00, - 0x09090900,0x3f3f3f00,0xdddddd00,0x94949400, - 0x87878700,0x5c5c5c00,0x83838300,0x02020200, - 0xcdcdcd00,0x4a4a4a00,0x90909000,0x33333300, - 0x73737300,0x67676700,0xf6f6f600,0xf3f3f300, - 0x9d9d9d00,0x7f7f7f00,0xbfbfbf00,0xe2e2e200, - 0x52525200,0x9b9b9b00,0xd8d8d800,0x26262600, - 0xc8c8c800,0x37373700,0xc6c6c600,0x3b3b3b00, - 0x81818100,0x96969600,0x6f6f6f00,0x4b4b4b00, - 0x13131300,0xbebebe00,0x63636300,0x2e2e2e00, - 0xe9e9e900,0x79797900,0xa7a7a700,0x8c8c8c00, - 0x9f9f9f00,0x6e6e6e00,0xbcbcbc00,0x8e8e8e00, - 0x29292900,0xf5f5f500,0xf9f9f900,0xb6b6b600, - 0x2f2f2f00,0xfdfdfd00,0xb4b4b400,0x59595900, - 0x78787800,0x98989800,0x06060600,0x6a6a6a00, - 0xe7e7e700,0x46464600,0x71717100,0xbababa00, - 0xd4d4d400,0x25252500,0xababab00,0x42424200, - 0x88888800,0xa2a2a200,0x8d8d8d00,0xfafafa00, - 0x72727200,0x07070700,0xb9b9b900,0x55555500, - 0xf8f8f800,0xeeeeee00,0xacacac00,0x0a0a0a00, - 0x36363600,0x49494900,0x2a2a2a00,0x68686800, - 0x3c3c3c00,0x38383800,0xf1f1f100,0xa4a4a400, - 0x40404000,0x28282800,0xd3d3d300,0x7b7b7b00, - 0xbbbbbb00,0xc9c9c900,0x43434300,0xc1c1c100, - 0x15151500,0xe3e3e300,0xadadad00,0xf4f4f400, - 0x77777700,0xc7c7c700,0x80808000,0x9e9e9e00, -}; - -static const u32 camellia_sp0222[256] = { - 0x00e0e0e0,0x00050505,0x00585858,0x00d9d9d9, - 0x00676767,0x004e4e4e,0x00818181,0x00cbcbcb, - 0x00c9c9c9,0x000b0b0b,0x00aeaeae,0x006a6a6a, - 0x00d5d5d5,0x00181818,0x005d5d5d,0x00828282, - 0x00464646,0x00dfdfdf,0x00d6d6d6,0x00272727, - 0x008a8a8a,0x00323232,0x004b4b4b,0x00424242, - 0x00dbdbdb,0x001c1c1c,0x009e9e9e,0x009c9c9c, - 0x003a3a3a,0x00cacaca,0x00252525,0x007b7b7b, - 0x000d0d0d,0x00717171,0x005f5f5f,0x001f1f1f, - 0x00f8f8f8,0x00d7d7d7,0x003e3e3e,0x009d9d9d, - 0x007c7c7c,0x00606060,0x00b9b9b9,0x00bebebe, - 0x00bcbcbc,0x008b8b8b,0x00161616,0x00343434, - 0x004d4d4d,0x00c3c3c3,0x00727272,0x00959595, - 0x00ababab,0x008e8e8e,0x00bababa,0x007a7a7a, - 0x00b3b3b3,0x00020202,0x00b4b4b4,0x00adadad, - 0x00a2a2a2,0x00acacac,0x00d8d8d8,0x009a9a9a, - 0x00171717,0x001a1a1a,0x00353535,0x00cccccc, - 0x00f7f7f7,0x00999999,0x00616161,0x005a5a5a, - 0x00e8e8e8,0x00242424,0x00565656,0x00404040, - 0x00e1e1e1,0x00636363,0x00090909,0x00333333, - 0x00bfbfbf,0x00989898,0x00979797,0x00858585, - 0x00686868,0x00fcfcfc,0x00ececec,0x000a0a0a, - 0x00dadada,0x006f6f6f,0x00535353,0x00626262, - 0x00a3a3a3,0x002e2e2e,0x00080808,0x00afafaf, - 0x00282828,0x00b0b0b0,0x00747474,0x00c2c2c2, - 0x00bdbdbd,0x00363636,0x00222222,0x00383838, - 0x00646464,0x001e1e1e,0x00393939,0x002c2c2c, - 0x00a6a6a6,0x00303030,0x00e5e5e5,0x00444444, - 0x00fdfdfd,0x00888888,0x009f9f9f,0x00656565, - 0x00878787,0x006b6b6b,0x00f4f4f4,0x00232323, - 0x00484848,0x00101010,0x00d1d1d1,0x00515151, - 0x00c0c0c0,0x00f9f9f9,0x00d2d2d2,0x00a0a0a0, - 0x00555555,0x00a1a1a1,0x00414141,0x00fafafa, - 0x00434343,0x00131313,0x00c4c4c4,0x002f2f2f, - 0x00a8a8a8,0x00b6b6b6,0x003c3c3c,0x002b2b2b, - 0x00c1c1c1,0x00ffffff,0x00c8c8c8,0x00a5a5a5, - 0x00202020,0x00898989,0x00000000,0x00909090, - 0x00474747,0x00efefef,0x00eaeaea,0x00b7b7b7, - 0x00151515,0x00060606,0x00cdcdcd,0x00b5b5b5, - 0x00121212,0x007e7e7e,0x00bbbbbb,0x00292929, - 0x000f0f0f,0x00b8b8b8,0x00070707,0x00040404, - 0x009b9b9b,0x00949494,0x00212121,0x00666666, - 0x00e6e6e6,0x00cecece,0x00ededed,0x00e7e7e7, - 0x003b3b3b,0x00fefefe,0x007f7f7f,0x00c5c5c5, - 0x00a4a4a4,0x00373737,0x00b1b1b1,0x004c4c4c, - 0x00919191,0x006e6e6e,0x008d8d8d,0x00767676, - 0x00030303,0x002d2d2d,0x00dedede,0x00969696, - 0x00262626,0x007d7d7d,0x00c6c6c6,0x005c5c5c, - 0x00d3d3d3,0x00f2f2f2,0x004f4f4f,0x00191919, - 0x003f3f3f,0x00dcdcdc,0x00797979,0x001d1d1d, - 0x00525252,0x00ebebeb,0x00f3f3f3,0x006d6d6d, - 0x005e5e5e,0x00fbfbfb,0x00696969,0x00b2b2b2, - 0x00f0f0f0,0x00313131,0x000c0c0c,0x00d4d4d4, - 0x00cfcfcf,0x008c8c8c,0x00e2e2e2,0x00757575, - 0x00a9a9a9,0x004a4a4a,0x00575757,0x00848484, - 0x00111111,0x00454545,0x001b1b1b,0x00f5f5f5, - 0x00e4e4e4,0x000e0e0e,0x00737373,0x00aaaaaa, - 0x00f1f1f1,0x00dddddd,0x00595959,0x00141414, - 0x006c6c6c,0x00929292,0x00545454,0x00d0d0d0, - 0x00787878,0x00707070,0x00e3e3e3,0x00494949, - 0x00808080,0x00505050,0x00a7a7a7,0x00f6f6f6, - 0x00777777,0x00939393,0x00868686,0x00838383, - 0x002a2a2a,0x00c7c7c7,0x005b5b5b,0x00e9e9e9, - 0x00eeeeee,0x008f8f8f,0x00010101,0x003d3d3d, -}; - -static const u32 camellia_sp3033[256] = { - 0x38003838,0x41004141,0x16001616,0x76007676, - 0xd900d9d9,0x93009393,0x60006060,0xf200f2f2, - 0x72007272,0xc200c2c2,0xab00abab,0x9a009a9a, - 0x75007575,0x06000606,0x57005757,0xa000a0a0, - 0x91009191,0xf700f7f7,0xb500b5b5,0xc900c9c9, - 0xa200a2a2,0x8c008c8c,0xd200d2d2,0x90009090, - 0xf600f6f6,0x07000707,0xa700a7a7,0x27002727, - 0x8e008e8e,0xb200b2b2,0x49004949,0xde00dede, - 0x43004343,0x5c005c5c,0xd700d7d7,0xc700c7c7, - 0x3e003e3e,0xf500f5f5,0x8f008f8f,0x67006767, - 0x1f001f1f,0x18001818,0x6e006e6e,0xaf00afaf, - 0x2f002f2f,0xe200e2e2,0x85008585,0x0d000d0d, - 0x53005353,0xf000f0f0,0x9c009c9c,0x65006565, - 0xea00eaea,0xa300a3a3,0xae00aeae,0x9e009e9e, - 0xec00ecec,0x80008080,0x2d002d2d,0x6b006b6b, - 0xa800a8a8,0x2b002b2b,0x36003636,0xa600a6a6, - 0xc500c5c5,0x86008686,0x4d004d4d,0x33003333, - 0xfd00fdfd,0x66006666,0x58005858,0x96009696, - 0x3a003a3a,0x09000909,0x95009595,0x10001010, - 0x78007878,0xd800d8d8,0x42004242,0xcc00cccc, - 0xef00efef,0x26002626,0xe500e5e5,0x61006161, - 0x1a001a1a,0x3f003f3f,0x3b003b3b,0x82008282, - 0xb600b6b6,0xdb00dbdb,0xd400d4d4,0x98009898, - 0xe800e8e8,0x8b008b8b,0x02000202,0xeb00ebeb, - 0x0a000a0a,0x2c002c2c,0x1d001d1d,0xb000b0b0, - 0x6f006f6f,0x8d008d8d,0x88008888,0x0e000e0e, - 0x19001919,0x87008787,0x4e004e4e,0x0b000b0b, - 0xa900a9a9,0x0c000c0c,0x79007979,0x11001111, - 0x7f007f7f,0x22002222,0xe700e7e7,0x59005959, - 0xe100e1e1,0xda00dada,0x3d003d3d,0xc800c8c8, - 0x12001212,0x04000404,0x74007474,0x54005454, - 0x30003030,0x7e007e7e,0xb400b4b4,0x28002828, - 0x55005555,0x68006868,0x50005050,0xbe00bebe, - 0xd000d0d0,0xc400c4c4,0x31003131,0xcb00cbcb, - 0x2a002a2a,0xad00adad,0x0f000f0f,0xca00caca, - 0x70007070,0xff00ffff,0x32003232,0x69006969, - 0x08000808,0x62006262,0x00000000,0x24002424, - 0xd100d1d1,0xfb00fbfb,0xba00baba,0xed00eded, - 0x45004545,0x81008181,0x73007373,0x6d006d6d, - 0x84008484,0x9f009f9f,0xee00eeee,0x4a004a4a, - 0xc300c3c3,0x2e002e2e,0xc100c1c1,0x01000101, - 0xe600e6e6,0x25002525,0x48004848,0x99009999, - 0xb900b9b9,0xb300b3b3,0x7b007b7b,0xf900f9f9, - 0xce00cece,0xbf00bfbf,0xdf00dfdf,0x71007171, - 0x29002929,0xcd00cdcd,0x6c006c6c,0x13001313, - 0x64006464,0x9b009b9b,0x63006363,0x9d009d9d, - 0xc000c0c0,0x4b004b4b,0xb700b7b7,0xa500a5a5, - 0x89008989,0x5f005f5f,0xb100b1b1,0x17001717, - 0xf400f4f4,0xbc00bcbc,0xd300d3d3,0x46004646, - 0xcf00cfcf,0x37003737,0x5e005e5e,0x47004747, - 0x94009494,0xfa00fafa,0xfc00fcfc,0x5b005b5b, - 0x97009797,0xfe00fefe,0x5a005a5a,0xac00acac, - 0x3c003c3c,0x4c004c4c,0x03000303,0x35003535, - 0xf300f3f3,0x23002323,0xb800b8b8,0x5d005d5d, - 0x6a006a6a,0x92009292,0xd500d5d5,0x21002121, - 0x44004444,0x51005151,0xc600c6c6,0x7d007d7d, - 0x39003939,0x83008383,0xdc00dcdc,0xaa00aaaa, - 0x7c007c7c,0x77007777,0x56005656,0x05000505, - 0x1b001b1b,0xa400a4a4,0x15001515,0x34003434, - 0x1e001e1e,0x1c001c1c,0xf800f8f8,0x52005252, - 0x20002020,0x14001414,0xe900e9e9,0xbd00bdbd, - 0xdd00dddd,0xe400e4e4,0xa100a1a1,0xe000e0e0, - 0x8a008a8a,0xf100f1f1,0xd600d6d6,0x7a007a7a, - 0xbb00bbbb,0xe300e3e3,0x40004040,0x4f004f4f, -}; - -static const u32 camellia_sp4404[256] = { - 0x70700070,0x2c2c002c,0xb3b300b3,0xc0c000c0, - 0xe4e400e4,0x57570057,0xeaea00ea,0xaeae00ae, - 0x23230023,0x6b6b006b,0x45450045,0xa5a500a5, - 0xeded00ed,0x4f4f004f,0x1d1d001d,0x92920092, - 0x86860086,0xafaf00af,0x7c7c007c,0x1f1f001f, - 0x3e3e003e,0xdcdc00dc,0x5e5e005e,0x0b0b000b, - 0xa6a600a6,0x39390039,0xd5d500d5,0x5d5d005d, - 0xd9d900d9,0x5a5a005a,0x51510051,0x6c6c006c, - 0x8b8b008b,0x9a9a009a,0xfbfb00fb,0xb0b000b0, - 0x74740074,0x2b2b002b,0xf0f000f0,0x84840084, - 0xdfdf00df,0xcbcb00cb,0x34340034,0x76760076, - 0x6d6d006d,0xa9a900a9,0xd1d100d1,0x04040004, - 0x14140014,0x3a3a003a,0xdede00de,0x11110011, - 0x32320032,0x9c9c009c,0x53530053,0xf2f200f2, - 0xfefe00fe,0xcfcf00cf,0xc3c300c3,0x7a7a007a, - 0x24240024,0xe8e800e8,0x60600060,0x69690069, - 0xaaaa00aa,0xa0a000a0,0xa1a100a1,0x62620062, - 0x54540054,0x1e1e001e,0xe0e000e0,0x64640064, - 0x10100010,0x00000000,0xa3a300a3,0x75750075, - 0x8a8a008a,0xe6e600e6,0x09090009,0xdddd00dd, - 0x87870087,0x83830083,0xcdcd00cd,0x90900090, - 0x73730073,0xf6f600f6,0x9d9d009d,0xbfbf00bf, - 0x52520052,0xd8d800d8,0xc8c800c8,0xc6c600c6, - 0x81810081,0x6f6f006f,0x13130013,0x63630063, - 0xe9e900e9,0xa7a700a7,0x9f9f009f,0xbcbc00bc, - 0x29290029,0xf9f900f9,0x2f2f002f,0xb4b400b4, - 0x78780078,0x06060006,0xe7e700e7,0x71710071, - 0xd4d400d4,0xabab00ab,0x88880088,0x8d8d008d, - 0x72720072,0xb9b900b9,0xf8f800f8,0xacac00ac, - 0x36360036,0x2a2a002a,0x3c3c003c,0xf1f100f1, - 0x40400040,0xd3d300d3,0xbbbb00bb,0x43430043, - 0x15150015,0xadad00ad,0x77770077,0x80800080, - 0x82820082,0xecec00ec,0x27270027,0xe5e500e5, - 0x85850085,0x35350035,0x0c0c000c,0x41410041, - 0xefef00ef,0x93930093,0x19190019,0x21210021, - 0x0e0e000e,0x4e4e004e,0x65650065,0xbdbd00bd, - 0xb8b800b8,0x8f8f008f,0xebeb00eb,0xcece00ce, - 0x30300030,0x5f5f005f,0xc5c500c5,0x1a1a001a, - 0xe1e100e1,0xcaca00ca,0x47470047,0x3d3d003d, - 0x01010001,0xd6d600d6,0x56560056,0x4d4d004d, - 0x0d0d000d,0x66660066,0xcccc00cc,0x2d2d002d, - 0x12120012,0x20200020,0xb1b100b1,0x99990099, - 0x4c4c004c,0xc2c200c2,0x7e7e007e,0x05050005, - 0xb7b700b7,0x31310031,0x17170017,0xd7d700d7, - 0x58580058,0x61610061,0x1b1b001b,0x1c1c001c, - 0x0f0f000f,0x16160016,0x18180018,0x22220022, - 0x44440044,0xb2b200b2,0xb5b500b5,0x91910091, - 0x08080008,0xa8a800a8,0xfcfc00fc,0x50500050, - 0xd0d000d0,0x7d7d007d,0x89890089,0x97970097, - 0x5b5b005b,0x95950095,0xffff00ff,0xd2d200d2, - 0xc4c400c4,0x48480048,0xf7f700f7,0xdbdb00db, - 0x03030003,0xdada00da,0x3f3f003f,0x94940094, - 0x5c5c005c,0x02020002,0x4a4a004a,0x33330033, - 0x67670067,0xf3f300f3,0x7f7f007f,0xe2e200e2, - 0x9b9b009b,0x26260026,0x37370037,0x3b3b003b, - 0x96960096,0x4b4b004b,0xbebe00be,0x2e2e002e, - 0x79790079,0x8c8c008c,0x6e6e006e,0x8e8e008e, - 0xf5f500f5,0xb6b600b6,0xfdfd00fd,0x59590059, - 0x98980098,0x6a6a006a,0x46460046,0xbaba00ba, - 0x25250025,0x42420042,0xa2a200a2,0xfafa00fa, - 0x07070007,0x55550055,0xeeee00ee,0x0a0a000a, - 0x49490049,0x68680068,0x38380038,0xa4a400a4, - 0x28280028,0x7b7b007b,0xc9c900c9,0xc1c100c1, - 0xe3e300e3,0xf4f400f4,0xc7c700c7,0x9e9e009e, -}; - - -/** - * Stuff related to the Camellia key schedule - */ -#define subl(x) subL[(x)] -#define subr(x) subR[(x)] - -void camellia_setup128(const unsigned char *key, u32 *subkey) -{ - u32 kll, klr, krl, krr; - u32 il, ir, t0, t1, w0, w1; - u32 kw4l, kw4r, dw, tl, tr; - u32 subL[26]; - u32 subR[26]; - - /** - * k == kll || klr || krl || krr (|| is concatination) - */ - kll = GETU32(key ); - klr = GETU32(key + 4); - krl = GETU32(key + 8); - krr = GETU32(key + 12); - /** - * generate KL dependent subkeys - */ - subl(0) = kll; subr(0) = klr; - subl(1) = krl; subr(1) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15); - subl(4) = kll; subr(4) = klr; - subl(5) = krl; subr(5) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 30); - subl(10) = kll; subr(10) = klr; - subl(11) = krl; subr(11) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15); - subl(13) = krl; subr(13) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 17); - subl(16) = kll; subr(16) = klr; - subl(17) = krl; subr(17) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 17); - subl(18) = kll; subr(18) = klr; - subl(19) = krl; subr(19) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 17); - subl(22) = kll; subr(22) = klr; - subl(23) = krl; subr(23) = krr; - - /* generate KA */ - kll = subl(0); klr = subr(0); - krl = subl(1); krr = subr(1); - CAMELLIA_F(kll, klr, - CAMELLIA_SIGMA1L, CAMELLIA_SIGMA1R, - w0, w1, il, ir, t0, t1); - krl ^= w0; krr ^= w1; - CAMELLIA_F(krl, krr, - CAMELLIA_SIGMA2L, CAMELLIA_SIGMA2R, - kll, klr, il, ir, t0, t1); - CAMELLIA_F(kll, klr, - CAMELLIA_SIGMA3L, CAMELLIA_SIGMA3R, - krl, krr, il, ir, t0, t1); - krl ^= w0; krr ^= w1; - CAMELLIA_F(krl, krr, - CAMELLIA_SIGMA4L, CAMELLIA_SIGMA4R, - w0, w1, il, ir, t0, t1); - kll ^= w0; klr ^= w1; - - /* generate KA dependent subkeys */ - subl(2) = kll; subr(2) = klr; - subl(3) = krl; subr(3) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15); - subl(6) = kll; subr(6) = klr; - subl(7) = krl; subr(7) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15); - subl(8) = kll; subr(8) = klr; - subl(9) = krl; subr(9) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15); - subl(12) = kll; subr(12) = klr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15); - subl(14) = kll; subr(14) = klr; - subl(15) = krl; subr(15) = krr; - CAMELLIA_ROLDQo32(kll, klr, krl, krr, w0, w1, 34); - subl(20) = kll; subr(20) = klr; - subl(21) = krl; subr(21) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 17); - subl(24) = kll; subr(24) = klr; - subl(25) = krl; subr(25) = krr; - - - /* absorb kw2 to other subkeys */ - subl(3) ^= subl(1); subr(3) ^= subr(1); - subl(5) ^= subl(1); subr(5) ^= subr(1); - subl(7) ^= subl(1); subr(7) ^= subr(1); - subl(1) ^= subr(1) & ~subr(9); - dw = subl(1) & subl(9), subr(1) ^= CAMELLIA_RL1(dw); - subl(11) ^= subl(1); subr(11) ^= subr(1); - subl(13) ^= subl(1); subr(13) ^= subr(1); - subl(15) ^= subl(1); subr(15) ^= subr(1); - subl(1) ^= subr(1) & ~subr(17); - dw = subl(1) & subl(17), subr(1) ^= CAMELLIA_RL1(dw); - subl(19) ^= subl(1); subr(19) ^= subr(1); - subl(21) ^= subl(1); subr(21) ^= subr(1); - subl(23) ^= subl(1); subr(23) ^= subr(1); - subl(24) ^= subl(1); subr(24) ^= subr(1); - - /* absorb kw4 to other subkeys */ - kw4l = subl(25); kw4r = subr(25); - subl(22) ^= kw4l; subr(22) ^= kw4r; - subl(20) ^= kw4l; subr(20) ^= kw4r; - subl(18) ^= kw4l; subr(18) ^= kw4r; - kw4l ^= kw4r & ~subr(16); - dw = kw4l & subl(16), kw4r ^= CAMELLIA_RL1(dw); - subl(14) ^= kw4l; subr(14) ^= kw4r; - subl(12) ^= kw4l; subr(12) ^= kw4r; - subl(10) ^= kw4l; subr(10) ^= kw4r; - kw4l ^= kw4r & ~subr(8); - dw = kw4l & subl(8), kw4r ^= CAMELLIA_RL1(dw); - subl(6) ^= kw4l; subr(6) ^= kw4r; - subl(4) ^= kw4l; subr(4) ^= kw4r; - subl(2) ^= kw4l; subr(2) ^= kw4r; - subl(0) ^= kw4l; subr(0) ^= kw4r; - - /* key XOR is end of F-function */ - CamelliaSubkeyL(0) = subl(0) ^ subl(2); - CamelliaSubkeyR(0) = subr(0) ^ subr(2); - CamelliaSubkeyL(2) = subl(3); - CamelliaSubkeyR(2) = subr(3); - CamelliaSubkeyL(3) = subl(2) ^ subl(4); - CamelliaSubkeyR(3) = subr(2) ^ subr(4); - CamelliaSubkeyL(4) = subl(3) ^ subl(5); - CamelliaSubkeyR(4) = subr(3) ^ subr(5); - CamelliaSubkeyL(5) = subl(4) ^ subl(6); - CamelliaSubkeyR(5) = subr(4) ^ subr(6); - CamelliaSubkeyL(6) = subl(5) ^ subl(7); - CamelliaSubkeyR(6) = subr(5) ^ subr(7); - tl = subl(10) ^ (subr(10) & ~subr(8)); - dw = tl & subl(8), tr = subr(10) ^ CAMELLIA_RL1(dw); - CamelliaSubkeyL(7) = subl(6) ^ tl; - CamelliaSubkeyR(7) = subr(6) ^ tr; - CamelliaSubkeyL(8) = subl(8); - CamelliaSubkeyR(8) = subr(8); - CamelliaSubkeyL(9) = subl(9); - CamelliaSubkeyR(9) = subr(9); - tl = subl(7) ^ (subr(7) & ~subr(9)); - dw = tl & subl(9), tr = subr(7) ^ CAMELLIA_RL1(dw); - CamelliaSubkeyL(10) = tl ^ subl(11); - CamelliaSubkeyR(10) = tr ^ subr(11); - CamelliaSubkeyL(11) = subl(10) ^ subl(12); - CamelliaSubkeyR(11) = subr(10) ^ subr(12); - CamelliaSubkeyL(12) = subl(11) ^ subl(13); - CamelliaSubkeyR(12) = subr(11) ^ subr(13); - CamelliaSubkeyL(13) = subl(12) ^ subl(14); - CamelliaSubkeyR(13) = subr(12) ^ subr(14); - CamelliaSubkeyL(14) = subl(13) ^ subl(15); - CamelliaSubkeyR(14) = subr(13) ^ subr(15); - tl = subl(18) ^ (subr(18) & ~subr(16)); - dw = tl & subl(16), tr = subr(18) ^ CAMELLIA_RL1(dw); - CamelliaSubkeyL(15) = subl(14) ^ tl; - CamelliaSubkeyR(15) = subr(14) ^ tr; - CamelliaSubkeyL(16) = subl(16); - CamelliaSubkeyR(16) = subr(16); - CamelliaSubkeyL(17) = subl(17); - CamelliaSubkeyR(17) = subr(17); - tl = subl(15) ^ (subr(15) & ~subr(17)); - dw = tl & subl(17), tr = subr(15) ^ CAMELLIA_RL1(dw); - CamelliaSubkeyL(18) = tl ^ subl(19); - CamelliaSubkeyR(18) = tr ^ subr(19); - CamelliaSubkeyL(19) = subl(18) ^ subl(20); - CamelliaSubkeyR(19) = subr(18) ^ subr(20); - CamelliaSubkeyL(20) = subl(19) ^ subl(21); - CamelliaSubkeyR(20) = subr(19) ^ subr(21); - CamelliaSubkeyL(21) = subl(20) ^ subl(22); - CamelliaSubkeyR(21) = subr(20) ^ subr(22); - CamelliaSubkeyL(22) = subl(21) ^ subl(23); - CamelliaSubkeyR(22) = subr(21) ^ subr(23); - CamelliaSubkeyL(23) = subl(22); - CamelliaSubkeyR(23) = subr(22); - CamelliaSubkeyL(24) = subl(24) ^ subl(23); - CamelliaSubkeyR(24) = subr(24) ^ subr(23); - - return; -} - -void camellia_setup256(const unsigned char *key, u32 *subkey) -{ - u32 kll,klr,krl,krr; /* left half of key */ - u32 krll,krlr,krrl,krrr; /* right half of key */ - u32 il, ir, t0, t1, w0, w1; /* temporary variables */ - u32 kw4l, kw4r, dw, tl, tr; - u32 subL[34]; - u32 subR[34]; - - /** - * key = (kll || klr || krl || krr || krll || krlr || krrl || krrr) - * (|| is concatination) - */ - - kll = GETU32(key ); - klr = GETU32(key + 4); - krl = GETU32(key + 8); - krr = GETU32(key + 12); - krll = GETU32(key + 16); - krlr = GETU32(key + 20); - krrl = GETU32(key + 24); - krrr = GETU32(key + 28); - - /* generate KL dependent subkeys */ - subl(0) = kll; subr(0) = klr; - subl(1) = krl; subr(1) = krr; - CAMELLIA_ROLDQo32(kll, klr, krl, krr, w0, w1, 45); - subl(12) = kll; subr(12) = klr; - subl(13) = krl; subr(13) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15); - subl(16) = kll; subr(16) = klr; - subl(17) = krl; subr(17) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 17); - subl(22) = kll; subr(22) = klr; - subl(23) = krl; subr(23) = krr; - CAMELLIA_ROLDQo32(kll, klr, krl, krr, w0, w1, 34); - subl(30) = kll; subr(30) = klr; - subl(31) = krl; subr(31) = krr; - - /* generate KR dependent subkeys */ - CAMELLIA_ROLDQ(krll, krlr, krrl, krrr, w0, w1, 15); - subl(4) = krll; subr(4) = krlr; - subl(5) = krrl; subr(5) = krrr; - CAMELLIA_ROLDQ(krll, krlr, krrl, krrr, w0, w1, 15); - subl(8) = krll; subr(8) = krlr; - subl(9) = krrl; subr(9) = krrr; - CAMELLIA_ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30); - subl(18) = krll; subr(18) = krlr; - subl(19) = krrl; subr(19) = krrr; - CAMELLIA_ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 34); - subl(26) = krll; subr(26) = krlr; - subl(27) = krrl; subr(27) = krrr; - CAMELLIA_ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 34); - - /* generate KA */ - kll = subl(0) ^ krll; klr = subr(0) ^ krlr; - krl = subl(1) ^ krrl; krr = subr(1) ^ krrr; - CAMELLIA_F(kll, klr, - CAMELLIA_SIGMA1L, CAMELLIA_SIGMA1R, - w0, w1, il, ir, t0, t1); - krl ^= w0; krr ^= w1; - CAMELLIA_F(krl, krr, - CAMELLIA_SIGMA2L, CAMELLIA_SIGMA2R, - kll, klr, il, ir, t0, t1); - kll ^= krll; klr ^= krlr; - CAMELLIA_F(kll, klr, - CAMELLIA_SIGMA3L, CAMELLIA_SIGMA3R, - krl, krr, il, ir, t0, t1); - krl ^= w0 ^ krrl; krr ^= w1 ^ krrr; - CAMELLIA_F(krl, krr, - CAMELLIA_SIGMA4L, CAMELLIA_SIGMA4R, - w0, w1, il, ir, t0, t1); - kll ^= w0; klr ^= w1; - - /* generate KB */ - krll ^= kll; krlr ^= klr; - krrl ^= krl; krrr ^= krr; - CAMELLIA_F(krll, krlr, - CAMELLIA_SIGMA5L, CAMELLIA_SIGMA5R, - w0, w1, il, ir, t0, t1); - krrl ^= w0; krrr ^= w1; - CAMELLIA_F(krrl, krrr, - CAMELLIA_SIGMA6L, CAMELLIA_SIGMA6R, - w0, w1, il, ir, t0, t1); - krll ^= w0; krlr ^= w1; - - /* generate KA dependent subkeys */ - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15); - subl(6) = kll; subr(6) = klr; - subl(7) = krl; subr(7) = krr; - CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 30); - subl(14) = kll; subr(14) = klr; - subl(15) = krl; subr(15) = krr; - subl(24) = klr; subr(24) = krl; - subl(25) = krr; subr(25) = kll; - CAMELLIA_ROLDQo32(kll, klr, krl, krr, w0, w1, 49); - subl(28) = kll; subr(28) = klr; - subl(29) = krl; subr(29) = krr; - - /* generate KB dependent subkeys */ - subl(2) = krll; subr(2) = krlr; - subl(3) = krrl; subr(3) = krrr; - CAMELLIA_ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30); - subl(10) = krll; subr(10) = krlr; - subl(11) = krrl; subr(11) = krrr; - CAMELLIA_ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30); - subl(20) = krll; subr(20) = krlr; - subl(21) = krrl; subr(21) = krrr; - CAMELLIA_ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 51); - subl(32) = krll; subr(32) = krlr; - subl(33) = krrl; subr(33) = krrr; - - /* absorb kw2 to other subkeys */ - subl(3) ^= subl(1); subr(3) ^= subr(1); - subl(5) ^= subl(1); subr(5) ^= subr(1); - subl(7) ^= subl(1); subr(7) ^= subr(1); - subl(1) ^= subr(1) & ~subr(9); - dw = subl(1) & subl(9), subr(1) ^= CAMELLIA_RL1(dw); - subl(11) ^= subl(1); subr(11) ^= subr(1); - subl(13) ^= subl(1); subr(13) ^= subr(1); - subl(15) ^= subl(1); subr(15) ^= subr(1); - subl(1) ^= subr(1) & ~subr(17); - dw = subl(1) & subl(17), subr(1) ^= CAMELLIA_RL1(dw); - subl(19) ^= subl(1); subr(19) ^= subr(1); - subl(21) ^= subl(1); subr(21) ^= subr(1); - subl(23) ^= subl(1); subr(23) ^= subr(1); - subl(1) ^= subr(1) & ~subr(25); - dw = subl(1) & subl(25), subr(1) ^= CAMELLIA_RL1(dw); - subl(27) ^= subl(1); subr(27) ^= subr(1); - subl(29) ^= subl(1); subr(29) ^= subr(1); - subl(31) ^= subl(1); subr(31) ^= subr(1); - subl(32) ^= subl(1); subr(32) ^= subr(1); - - /* absorb kw4 to other subkeys */ - kw4l = subl(33); kw4r = subr(33); - subl(30) ^= kw4l; subr(30) ^= kw4r; - subl(28) ^= kw4l; subr(28) ^= kw4r; - subl(26) ^= kw4l; subr(26) ^= kw4r; - kw4l ^= kw4r & ~subr(24); - dw = kw4l & subl(24), kw4r ^= CAMELLIA_RL1(dw); - subl(22) ^= kw4l; subr(22) ^= kw4r; - subl(20) ^= kw4l; subr(20) ^= kw4r; - subl(18) ^= kw4l; subr(18) ^= kw4r; - kw4l ^= kw4r & ~subr(16); - dw = kw4l & subl(16), kw4r ^= CAMELLIA_RL1(dw); - subl(14) ^= kw4l; subr(14) ^= kw4r; - subl(12) ^= kw4l; subr(12) ^= kw4r; - subl(10) ^= kw4l; subr(10) ^= kw4r; - kw4l ^= kw4r & ~subr(8); - dw = kw4l & subl(8), kw4r ^= CAMELLIA_RL1(dw); - subl(6) ^= kw4l; subr(6) ^= kw4r; - subl(4) ^= kw4l; subr(4) ^= kw4r; - subl(2) ^= kw4l; subr(2) ^= kw4r; - subl(0) ^= kw4l; subr(0) ^= kw4r; - - /* key XOR is end of F-function */ - CamelliaSubkeyL(0) = subl(0) ^ subl(2); - CamelliaSubkeyR(0) = subr(0) ^ subr(2); - CamelliaSubkeyL(2) = subl(3); - CamelliaSubkeyR(2) = subr(3); - CamelliaSubkeyL(3) = subl(2) ^ subl(4); - CamelliaSubkeyR(3) = subr(2) ^ subr(4); - CamelliaSubkeyL(4) = subl(3) ^ subl(5); - CamelliaSubkeyR(4) = subr(3) ^ subr(5); - CamelliaSubkeyL(5) = subl(4) ^ subl(6); - CamelliaSubkeyR(5) = subr(4) ^ subr(6); - CamelliaSubkeyL(6) = subl(5) ^ subl(7); - CamelliaSubkeyR(6) = subr(5) ^ subr(7); - tl = subl(10) ^ (subr(10) & ~subr(8)); - dw = tl & subl(8), tr = subr(10) ^ CAMELLIA_RL1(dw); - CamelliaSubkeyL(7) = subl(6) ^ tl; - CamelliaSubkeyR(7) = subr(6) ^ tr; - CamelliaSubkeyL(8) = subl(8); - CamelliaSubkeyR(8) = subr(8); - CamelliaSubkeyL(9) = subl(9); - CamelliaSubkeyR(9) = subr(9); - tl = subl(7) ^ (subr(7) & ~subr(9)); - dw = tl & subl(9), tr = subr(7) ^ CAMELLIA_RL1(dw); - CamelliaSubkeyL(10) = tl ^ subl(11); - CamelliaSubkeyR(10) = tr ^ subr(11); - CamelliaSubkeyL(11) = subl(10) ^ subl(12); - CamelliaSubkeyR(11) = subr(10) ^ subr(12); - CamelliaSubkeyL(12) = subl(11) ^ subl(13); - CamelliaSubkeyR(12) = subr(11) ^ subr(13); - CamelliaSubkeyL(13) = subl(12) ^ subl(14); - CamelliaSubkeyR(13) = subr(12) ^ subr(14); - CamelliaSubkeyL(14) = subl(13) ^ subl(15); - CamelliaSubkeyR(14) = subr(13) ^ subr(15); - tl = subl(18) ^ (subr(18) & ~subr(16)); - dw = tl & subl(16), tr = subr(18) ^ CAMELLIA_RL1(dw); - CamelliaSubkeyL(15) = subl(14) ^ tl; - CamelliaSubkeyR(15) = subr(14) ^ tr; - CamelliaSubkeyL(16) = subl(16); - CamelliaSubkeyR(16) = subr(16); - CamelliaSubkeyL(17) = subl(17); - CamelliaSubkeyR(17) = subr(17); - tl = subl(15) ^ (subr(15) & ~subr(17)); - dw = tl & subl(17), tr = subr(15) ^ CAMELLIA_RL1(dw); - CamelliaSubkeyL(18) = tl ^ subl(19); - CamelliaSubkeyR(18) = tr ^ subr(19); - CamelliaSubkeyL(19) = subl(18) ^ subl(20); - CamelliaSubkeyR(19) = subr(18) ^ subr(20); - CamelliaSubkeyL(20) = subl(19) ^ subl(21); - CamelliaSubkeyR(20) = subr(19) ^ subr(21); - CamelliaSubkeyL(21) = subl(20) ^ subl(22); - CamelliaSubkeyR(21) = subr(20) ^ subr(22); - CamelliaSubkeyL(22) = subl(21) ^ subl(23); - CamelliaSubkeyR(22) = subr(21) ^ subr(23); - tl = subl(26) ^ (subr(26) & ~subr(24)); - dw = tl & subl(24), tr = subr(26) ^ CAMELLIA_RL1(dw); - CamelliaSubkeyL(23) = subl(22) ^ tl; - CamelliaSubkeyR(23) = subr(22) ^ tr; - CamelliaSubkeyL(24) = subl(24); - CamelliaSubkeyR(24) = subr(24); - CamelliaSubkeyL(25) = subl(25); - CamelliaSubkeyR(25) = subr(25); - tl = subl(23) ^ (subr(23) & ~subr(25)); - dw = tl & subl(25), tr = subr(23) ^ CAMELLIA_RL1(dw); - CamelliaSubkeyL(26) = tl ^ subl(27); - CamelliaSubkeyR(26) = tr ^ subr(27); - CamelliaSubkeyL(27) = subl(26) ^ subl(28); - CamelliaSubkeyR(27) = subr(26) ^ subr(28); - CamelliaSubkeyL(28) = subl(27) ^ subl(29); - CamelliaSubkeyR(28) = subr(27) ^ subr(29); - CamelliaSubkeyL(29) = subl(28) ^ subl(30); - CamelliaSubkeyR(29) = subr(28) ^ subr(30); - CamelliaSubkeyL(30) = subl(29) ^ subl(31); - CamelliaSubkeyR(30) = subr(29) ^ subr(31); - CamelliaSubkeyL(31) = subl(30); - CamelliaSubkeyR(31) = subr(30); - CamelliaSubkeyL(32) = subl(32) ^ subl(31); - CamelliaSubkeyR(32) = subr(32) ^ subr(31); - - return; -} - -void camellia_setup192(const unsigned char *key, u32 *subkey) -{ - unsigned char kk[32]; - u32 krll, krlr, krrl,krrr; - - memcpy(kk, key, 24); - memcpy((unsigned char *)&krll, key+16,4); - memcpy((unsigned char *)&krlr, key+20,4); - krrl = ~krll; - krrr = ~krlr; - memcpy(kk+24, (unsigned char *)&krrl, 4); - memcpy(kk+28, (unsigned char *)&krrr, 4); - camellia_setup256(kk, subkey); - return; -} - - -#ifndef USE_ARM_ASM -/** - * Stuff related to camellia encryption/decryption - * - * "io" must be 4byte aligned and big-endian data. - */ -void camellia_encrypt128(const u32 *subkey, u32 *blocks) -{ - u32 il, ir, t0, t1; - u32 io[4]; - - io[0] = blocks[0]; - io[1] = blocks[1]; - io[2] = blocks[2]; - io[3] = blocks[3]; - - /* pre whitening but absorb kw2*/ - io[0] ^= CamelliaSubkeyL(0); - io[1] ^= CamelliaSubkeyR(0); - /* main iteration */ - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(2),CamelliaSubkeyR(2), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(3),CamelliaSubkeyR(3), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(4),CamelliaSubkeyR(4), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(5),CamelliaSubkeyR(5), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(6),CamelliaSubkeyR(6), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(7),CamelliaSubkeyR(7), - io[0],io[1],il,ir,t0,t1); - - CAMELLIA_FLS(io[0],io[1],io[2],io[3], - CamelliaSubkeyL(8),CamelliaSubkeyR(8), - CamelliaSubkeyL(9),CamelliaSubkeyR(9), - t0,t1,il,ir); - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(10),CamelliaSubkeyR(10), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(11),CamelliaSubkeyR(11), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(12),CamelliaSubkeyR(12), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(13),CamelliaSubkeyR(13), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(14),CamelliaSubkeyR(14), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(15),CamelliaSubkeyR(15), - io[0],io[1],il,ir,t0,t1); - - CAMELLIA_FLS(io[0],io[1],io[2],io[3], - CamelliaSubkeyL(16),CamelliaSubkeyR(16), - CamelliaSubkeyL(17),CamelliaSubkeyR(17), - t0,t1,il,ir); - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(18),CamelliaSubkeyR(18), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(19),CamelliaSubkeyR(19), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(20),CamelliaSubkeyR(20), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(21),CamelliaSubkeyR(21), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(22),CamelliaSubkeyR(22), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(23),CamelliaSubkeyR(23), - io[0],io[1],il,ir,t0,t1); - - /* post whitening but kw4 */ - io[2] ^= CamelliaSubkeyL(24); - io[3] ^= CamelliaSubkeyR(24); - - t0 = io[0]; - t1 = io[1]; - io[0] = io[2]; - io[1] = io[3]; - io[2] = t0; - io[3] = t1; - - blocks[0] = io[0]; - blocks[1] = io[1]; - blocks[2] = io[2]; - blocks[3] = io[3]; - - return; -} - -void camellia_decrypt128(const u32 *subkey, u32 *blocks) -{ - u32 il,ir,t0,t1; /* temporary valiables */ - u32 io[4]; - - io[0] = blocks[0]; - io[1] = blocks[1]; - io[2] = blocks[2]; - io[3] = blocks[3]; - - /* pre whitening but absorb kw2*/ - io[0] ^= CamelliaSubkeyL(24); - io[1] ^= CamelliaSubkeyR(24); - - /* main iteration */ - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(23),CamelliaSubkeyR(23), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(22),CamelliaSubkeyR(22), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(21),CamelliaSubkeyR(21), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(20),CamelliaSubkeyR(20), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(19),CamelliaSubkeyR(19), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(18),CamelliaSubkeyR(18), - io[0],io[1],il,ir,t0,t1); - - CAMELLIA_FLS(io[0],io[1],io[2],io[3], - CamelliaSubkeyL(17),CamelliaSubkeyR(17), - CamelliaSubkeyL(16),CamelliaSubkeyR(16), - t0,t1,il,ir); - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(15),CamelliaSubkeyR(15), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(14),CamelliaSubkeyR(14), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(13),CamelliaSubkeyR(13), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(12),CamelliaSubkeyR(12), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(11),CamelliaSubkeyR(11), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(10),CamelliaSubkeyR(10), - io[0],io[1],il,ir,t0,t1); - - CAMELLIA_FLS(io[0],io[1],io[2],io[3], - CamelliaSubkeyL(9),CamelliaSubkeyR(9), - CamelliaSubkeyL(8),CamelliaSubkeyR(8), - t0,t1,il,ir); - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(7),CamelliaSubkeyR(7), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(6),CamelliaSubkeyR(6), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(5),CamelliaSubkeyR(5), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(4),CamelliaSubkeyR(4), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(3),CamelliaSubkeyR(3), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(2),CamelliaSubkeyR(2), - io[0],io[1],il,ir,t0,t1); - - /* post whitening but kw4 */ - io[2] ^= CamelliaSubkeyL(0); - io[3] ^= CamelliaSubkeyR(0); - - t0 = io[0]; - t1 = io[1]; - io[0] = io[2]; - io[1] = io[3]; - io[2] = t0; - io[3] = t1; - - blocks[0] = io[0]; - blocks[1] = io[1]; - blocks[2] = io[2]; - blocks[3] = io[3]; - - return; -} - -/** - * stuff for 192 and 256bit encryption/decryption - */ -void camellia_encrypt256(const u32 *subkey, u32 *blocks) -{ - u32 il,ir,t0,t1; /* temporary valiables */ - u32 io[4]; - - io[0] = blocks[0]; - io[1] = blocks[1]; - io[2] = blocks[2]; - io[3] = blocks[3]; - - /* pre whitening but absorb kw2*/ - io[0] ^= CamelliaSubkeyL(0); - io[1] ^= CamelliaSubkeyR(0); - - /* main iteration */ - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(2),CamelliaSubkeyR(2), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(3),CamelliaSubkeyR(3), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(4),CamelliaSubkeyR(4), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(5),CamelliaSubkeyR(5), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(6),CamelliaSubkeyR(6), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(7),CamelliaSubkeyR(7), - io[0],io[1],il,ir,t0,t1); - - CAMELLIA_FLS(io[0],io[1],io[2],io[3], - CamelliaSubkeyL(8),CamelliaSubkeyR(8), - CamelliaSubkeyL(9),CamelliaSubkeyR(9), - t0,t1,il,ir); - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(10),CamelliaSubkeyR(10), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(11),CamelliaSubkeyR(11), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(12),CamelliaSubkeyR(12), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(13),CamelliaSubkeyR(13), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(14),CamelliaSubkeyR(14), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(15),CamelliaSubkeyR(15), - io[0],io[1],il,ir,t0,t1); - - CAMELLIA_FLS(io[0],io[1],io[2],io[3], - CamelliaSubkeyL(16),CamelliaSubkeyR(16), - CamelliaSubkeyL(17),CamelliaSubkeyR(17), - t0,t1,il,ir); - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(18),CamelliaSubkeyR(18), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(19),CamelliaSubkeyR(19), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(20),CamelliaSubkeyR(20), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(21),CamelliaSubkeyR(21), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(22),CamelliaSubkeyR(22), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(23),CamelliaSubkeyR(23), - io[0],io[1],il,ir,t0,t1); - - CAMELLIA_FLS(io[0],io[1],io[2],io[3], - CamelliaSubkeyL(24),CamelliaSubkeyR(24), - CamelliaSubkeyL(25),CamelliaSubkeyR(25), - t0,t1,il,ir); - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(26),CamelliaSubkeyR(26), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(27),CamelliaSubkeyR(27), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(28),CamelliaSubkeyR(28), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(29),CamelliaSubkeyR(29), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(30),CamelliaSubkeyR(30), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(31),CamelliaSubkeyR(31), - io[0],io[1],il,ir,t0,t1); - - /* post whitening but kw4 */ - io[2] ^= CamelliaSubkeyL(32); - io[3] ^= CamelliaSubkeyR(32); - - t0 = io[0]; - t1 = io[1]; - io[0] = io[2]; - io[1] = io[3]; - io[2] = t0; - io[3] = t1; - - blocks[0] = io[0]; - blocks[1] = io[1]; - blocks[2] = io[2]; - blocks[3] = io[3]; - - return; -} - -void camellia_decrypt256(const u32 *subkey, u32 *blocks) -{ - u32 il,ir,t0,t1; /* temporary valiables */ - u32 io[4]; - - io[0] = blocks[0]; - io[1] = blocks[1]; - io[2] = blocks[2]; - io[3] = blocks[3]; - - /* pre whitening but absorb kw2*/ - io[0] ^= CamelliaSubkeyL(32); - io[1] ^= CamelliaSubkeyR(32); - - /* main iteration */ - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(31),CamelliaSubkeyR(31), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(30),CamelliaSubkeyR(30), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(29),CamelliaSubkeyR(29), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(28),CamelliaSubkeyR(28), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(27),CamelliaSubkeyR(27), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(26),CamelliaSubkeyR(26), - io[0],io[1],il,ir,t0,t1); - - CAMELLIA_FLS(io[0],io[1],io[2],io[3], - CamelliaSubkeyL(25),CamelliaSubkeyR(25), - CamelliaSubkeyL(24),CamelliaSubkeyR(24), - t0,t1,il,ir); - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(23),CamelliaSubkeyR(23), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(22),CamelliaSubkeyR(22), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(21),CamelliaSubkeyR(21), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(20),CamelliaSubkeyR(20), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(19),CamelliaSubkeyR(19), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(18),CamelliaSubkeyR(18), - io[0],io[1],il,ir,t0,t1); - - CAMELLIA_FLS(io[0],io[1],io[2],io[3], - CamelliaSubkeyL(17),CamelliaSubkeyR(17), - CamelliaSubkeyL(16),CamelliaSubkeyR(16), - t0,t1,il,ir); - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(15),CamelliaSubkeyR(15), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(14),CamelliaSubkeyR(14), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(13),CamelliaSubkeyR(13), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(12),CamelliaSubkeyR(12), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(11),CamelliaSubkeyR(11), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(10),CamelliaSubkeyR(10), - io[0],io[1],il,ir,t0,t1); - - CAMELLIA_FLS(io[0],io[1],io[2],io[3], - CamelliaSubkeyL(9),CamelliaSubkeyR(9), - CamelliaSubkeyL(8),CamelliaSubkeyR(8), - t0,t1,il,ir); - - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(7),CamelliaSubkeyR(7), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(6),CamelliaSubkeyR(6), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(5),CamelliaSubkeyR(5), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(4),CamelliaSubkeyR(4), - io[0],io[1],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[0],io[1], - CamelliaSubkeyL(3),CamelliaSubkeyR(3), - io[2],io[3],il,ir,t0,t1); - CAMELLIA_ROUNDSM(io[2],io[3], - CamelliaSubkeyL(2),CamelliaSubkeyR(2), - io[0],io[1],il,ir,t0,t1); - - /* post whitening but kw4 */ - io[2] ^= CamelliaSubkeyL(0); - io[3] ^= CamelliaSubkeyR(0); - - t0 = io[0]; - t1 = io[1]; - io[0] = io[2]; - io[1] = io[3]; - io[2] = t0; - io[3] = t1; - - blocks[0] = io[0]; - blocks[1] = io[1]; - blocks[2] = io[2]; - blocks[3] = io[3]; - - return; -} -#endif /*!USE_ARM_ASM*/ - - -/*** - * - * API for compatibility - */ - -void Camellia_Ekeygen(const int keyBitLength, - const unsigned char *rawKey, - KEY_TABLE_TYPE keyTable) -{ - switch(keyBitLength) { - case 128: - camellia_setup128(rawKey, keyTable); - break; - case 192: - camellia_setup192(rawKey, keyTable); - break; - case 256: - camellia_setup256(rawKey, keyTable); - break; - default: - break; - } -} - - -#ifndef USE_ARM_ASM -void Camellia_EncryptBlock(const int keyBitLength, - const unsigned char *plaintext, - const KEY_TABLE_TYPE keyTable, - unsigned char *ciphertext) -{ - u32 tmp[4]; - - tmp[0] = GETU32(plaintext); - tmp[1] = GETU32(plaintext + 4); - tmp[2] = GETU32(plaintext + 8); - tmp[3] = GETU32(plaintext + 12); - - switch (keyBitLength) { - case 128: - camellia_encrypt128(keyTable, tmp); - break; - case 192: - /* fall through */ - case 256: - camellia_encrypt256(keyTable, tmp); - break; - default: - break; - } - - PUTU32(ciphertext, tmp[0]); - PUTU32(ciphertext + 4, tmp[1]); - PUTU32(ciphertext + 8, tmp[2]); - PUTU32(ciphertext + 12, tmp[3]); -} - -void Camellia_DecryptBlock(const int keyBitLength, - const unsigned char *ciphertext, - const KEY_TABLE_TYPE keyTable, - unsigned char *plaintext) -{ - u32 tmp[4]; - - tmp[0] = GETU32(ciphertext); - tmp[1] = GETU32(ciphertext + 4); - tmp[2] = GETU32(ciphertext + 8); - tmp[3] = GETU32(ciphertext + 12); - - switch (keyBitLength) { - case 128: - camellia_decrypt128(keyTable, tmp); - break; - case 192: - /* fall through */ - case 256: - camellia_decrypt256(keyTable, tmp); - break; - default: - break; - } - PUTU32(plaintext, tmp[0]); - PUTU32(plaintext + 4, tmp[1]); - PUTU32(plaintext + 8, tmp[2]); - PUTU32(plaintext + 12, tmp[3]); -} -#endif /*!USE_ARM_ASM*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia.h b/src/hos_libhttpserver/src/libgcrypt/cipher/camellia.h deleted file mode 100644 index d0e3c18e..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/camellia.h +++ /dev/null @@ -1,90 +0,0 @@ -/* camellia.h ver 1.2.0 - * - * Copyright (C) 2006,2007 - * NTT (Nippon Telegraph and Telephone Corporation). - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef HEADER_CAMELLIA_H -#define HEADER_CAMELLIA_H - -/* To use Camellia with libraries it is often useful to keep the name - * space of the library clean. The following macro is thus useful: - * - * #define CAMELLIA_EXT_SYM_PREFIX foo_ - * - * This prefixes all external symbols with "foo_". - */ -#ifdef HAVE_CONFIG_H -#include -/* USE_ARM_ASM indicates whether to use ARM assembly code. */ -# undef USE_ARM_ASM -# if defined(__ARMEL__) -# ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS -# define USE_ARM_ASM 1 -# endif -# endif -#endif -#ifdef CAMELLIA_EXT_SYM_PREFIX -#define CAMELLIA_PREFIX1(x,y) x ## y -#define CAMELLIA_PREFIX2(x,y) CAMELLIA_PREFIX1(x,y) -#define CAMELLIA_PREFIX(x) CAMELLIA_PREFIX2(CAMELLIA_EXT_SYM_PREFIX,x) -#define Camellia_Ekeygen CAMELLIA_PREFIX(Camellia_Ekeygen) -#define Camellia_EncryptBlock CAMELLIA_PREFIX(Camellia_EncryptBlock) -#define Camellia_DecryptBlock CAMELLIA_PREFIX(Camellia_DecryptBlock) -#define camellia_decrypt128 CAMELLIA_PREFIX(camellia_decrypt128) -#define camellia_decrypt256 CAMELLIA_PREFIX(camellia_decrypt256) -#define camellia_encrypt128 CAMELLIA_PREFIX(camellia_encrypt128) -#define camellia_encrypt256 CAMELLIA_PREFIX(camellia_encrypt256) -#define camellia_setup128 CAMELLIA_PREFIX(camellia_setup128) -#define camellia_setup192 CAMELLIA_PREFIX(camellia_setup192) -#define camellia_setup256 CAMELLIA_PREFIX(camellia_setup256) -#endif /*CAMELLIA_EXT_SYM_PREFIX*/ - - -#ifdef __cplusplus -extern "C" { -#endif - -#define CAMELLIA_BLOCK_SIZE 16 -#define CAMELLIA_TABLE_BYTE_LEN 272 -#define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4) - -typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN]; - - -void Camellia_Ekeygen(const int keyBitLength, - const unsigned char *rawKey, - KEY_TABLE_TYPE keyTable); - -#ifndef USE_ARM_ASM -void Camellia_EncryptBlock(const int keyBitLength, - const unsigned char *plaintext, - const KEY_TABLE_TYPE keyTable, - unsigned char *cipherText); - -void Camellia_DecryptBlock(const int keyBitLength, - const unsigned char *cipherText, - const KEY_TABLE_TYPE keyTable, - unsigned char *plaintext); -#endif /*!USE_ARMV6_ASM*/ - - -#ifdef __cplusplus -} -#endif - -#endif /* HEADER_CAMELLIA_H */ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cast5-amd64.S b/src/hos_libhttpserver/src/libgcrypt/cipher/cast5-amd64.S deleted file mode 100644 index c3b819d4..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cast5-amd64.S +++ /dev/null @@ -1,587 +0,0 @@ -/* cast5-amd64.S - AMD64 assembly implementation of CAST5 cipher - * - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifdef __x86_64 -#include -#if defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) && defined(USE_CAST5) - -#ifdef __PIC__ -# define RIP %rip -# define GET_EXTERN_POINTER(name, reg) movq name@GOTPCREL(%rip), reg -#else -# define RIP -# define GET_EXTERN_POINTER(name, reg) leaq name, reg -#endif - -.text - -.extern _gcry_cast5_s1to4; - -#define s1 0 -#define s2 (s1 + (4 * 256)) -#define s3 (s2 + (4 * 256)) -#define s4 (s3 + (4 * 256)) - -/* structure of CAST5_context: */ -#define Km 0 -#define Kr (Km + (16 * 4)) - -/* register macros */ -#define CTX %rdi -#define RIO %rsi -#define RTAB %r8 - -#define RLR0 %r9 -#define RLR1 %r10 -#define RLR2 %r11 -#define RLR3 %r12 - -#define RLR0d %r9d -#define RLR1d %r10d -#define RLR2d %r11d -#define RLR3d %r12d - -#define RX0 %rax -#define RX1 %rbx -#define RX2 %rdx - -#define RX0d %eax -#define RX1d %ebx -#define RX2d %edx - -#define RX0bl %al -#define RX1bl %bl -#define RX2bl %dl - -#define RX0bh %ah -#define RX1bh %bh -#define RX2bh %dh - -#define RKR %rcx -#define RKRd %ecx -#define RKRbl %cl - -#define RT0 %rbp -#define RT1 %rsi - -#define RT0d %ebp -#define RT1d %esi - -#define RKM0d %r13d -#define RKM1d %r14d - -/*********************************************************************** - * 1-way cast5 - ***********************************************************************/ -#define dummy(x) - -#define shr_kr(none) \ - shrq $8, RKR; - -#define F(km, load_next_kr, op0, op1, op2, op3) \ - op0 ## l RLR0d, km ## d; \ - roll RKRbl, km ## d; \ - rorq $32, RLR0; \ - movzbl km ## bh, RT0d; \ - movzbl km ## bl, RT1d; \ - roll $16, km ## d; \ - movl s1(RTAB,RT0,4), RT0d; \ - op1 ## l s2(RTAB,RT1,4), RT0d; \ - load_next_kr(kr_next); \ - movzbl km ## bh, RT1d; \ - movzbl km ## bl, km ## d; \ - op2 ## l s3(RTAB,RT1,4), RT0d; \ - op3 ## l s4(RTAB,km,4), RT0d; \ - xorq RT0, RLR0; - -#define F1(km, load_next_kr) \ - F(##km, load_next_kr, add, xor, sub, add) -#define F2(km, load_next_kr) \ - F(##km, load_next_kr, xor, sub, add, xor) -#define F3(km, load_next_kr) \ - F(##km, load_next_kr, sub, add, xor, sub) - -#define get_round_km(n, km) \ - movl Km+4*(n)(CTX), km; - -#define get_round_kr_enc(n) \ - movq $0x1010101010101010, RKR; \ - \ - /* merge rorl rk and rorl $16 */ \ - xorq Kr+(n)(CTX), RKR; - -#define get_round_kr_dec(n) \ - movq $0x1010101010101010, RKR; \ - \ - /* merge rorl rk and rorl $16 */ \ - xorq Kr+(n - 7)(CTX), RKR; \ - bswapq RKR; - -#define round_enc(n, FA, FB, fn1, fn2) \ - get_round_km(n + 1, RX2d); \ - FA(RX0, fn1); \ - get_round_km(n + 2, RX0d); \ - FB(RX2, fn2); - -#define round_enc_last(n, FXA, FXB) \ - get_round_km(n + 1, RX2d); \ - \ - FXA(RX0, shr_kr); \ - FXB(RX2, dummy); - -#define round_enc_1(n, FA, FB) \ - round_enc(n, FA, FB, shr_kr, shr_kr) - -#define round_enc_2(n, FA, FB) \ - round_enc(n, FA, FB, shr_kr, dummy) - -#define round_dec(n, FA, FB, fn1, fn2) \ - get_round_km(n - 1, RX2d); \ - FA(RX0, fn1); \ - get_round_km(n - 2, RX0d); \ - FB(RX2, fn2); - -#define round_dec_last(n, FXA, FXB) \ - get_round_km(n - 1, RX2d); \ - FXA(RX0, shr_kr); \ - FXB(RX2, dummy); - -#define round_dec_1(n, FA, FB) \ - round_dec(n, FA, FB, shr_kr, shr_kr) - -#define round_dec_2(n, FA, FB) \ - round_dec(n, FA, FB, shr_kr, dummy) - -#define read_block() \ - movq (RIO), RLR0; \ - bswapq RLR0; - -#define write_block() \ - bswapq RLR0; \ - rorq $32, RLR0; \ - movq RLR0, (RIO); - -.align 8 -.globl _gcry_cast5_amd64_encrypt_block -.type _gcry_cast5_amd64_encrypt_block,@function; - -_gcry_cast5_amd64_encrypt_block: - /* input: - * %rdi: ctx, CTX - * %rsi: dst - * %rdx: src - */ - pushq %rbp; - pushq %rbx; - - movq %rsi, %r10; - - GET_EXTERN_POINTER(_gcry_cast5_s1to4, RTAB); - - movq %rdx, RIO; - read_block(); - - get_round_km(0, RX0d); - get_round_kr_enc(0); - round_enc_1(0, F1, F2); - round_enc_1(2, F3, F1); - round_enc_1(4, F2, F3); - round_enc_2(6, F1, F2); - get_round_kr_enc(8); - round_enc_1(8, F3, F1); - round_enc_1(10, F2, F3); - round_enc_1(12, F1, F2); - round_enc_last(14, F3, F1); - - movq %r10, RIO; - write_block(); - - popq %rbx; - popq %rbp; - ret; -.size _gcry_cast5_amd64_encrypt_block,.-_gcry_cast5_amd64_encrypt_block; - -.align 8 -.globl _gcry_cast5_amd64_decrypt_block -.type _gcry_cast5_amd64_decrypt_block,@function; - -_gcry_cast5_amd64_decrypt_block: - /* input: - * %rdi: ctx, CTX - * %rsi: dst - * %rdx: src - */ - pushq %rbp; - pushq %rbx; - - movq %rsi, %r10; - - GET_EXTERN_POINTER(_gcry_cast5_s1to4, RTAB); - - movq %rdx, RIO; - read_block(); - - get_round_km(15, RX0d); - get_round_kr_dec(15); - round_dec_1(15, F1, F3); - round_dec_1(13, F2, F1); - round_dec_1(11, F3, F2); - round_dec_2(9, F1, F3); - get_round_kr_dec(7); - round_dec_1(7, F2, F1); - round_dec_1(5, F3, F2); - round_dec_1(3, F1, F3); - round_dec_last(1, F2, F1); - - movq %r10, RIO; - write_block(); - - popq %rbx; - popq %rbp; - ret; -.size _gcry_cast5_amd64_decrypt_block,.-_gcry_cast5_amd64_decrypt_block; - -/********************************************************************** - 4-way cast5, four blocks parallel - **********************************************************************/ -#define F_tail(rlr, rx, op1, op2, op3) \ - movzbl rx ## bh, RT0d; \ - movzbl rx ## bl, RT1d; \ - roll $16, rx ## d; \ - movl s1(RTAB,RT0,4), RT0d; \ - op1 ## l s2(RTAB,RT1,4), RT0d; \ - movzbl rx ## bh, RT1d; \ - movzbl rx ## bl, rx ## d; \ - op2 ## l s3(RTAB,RT1,4), RT0d; \ - op3 ## l s4(RTAB,rx,4), RT0d; \ - xorq RT0, rlr; - -#define F4(km, load_next_kr, op0, op1, op2, op3) \ - movl km, RX0d; \ - op0 ## l RLR0d, RX0d; \ - roll RKRbl, RX0d; \ - rorq $32, RLR0; \ - \ - movl km, RX1d; \ - op0 ## l RLR1d, RX1d; \ - roll RKRbl, RX1d; \ - rorq $32, RLR1; \ - \ - movl km, RX2d; \ - op0 ## l RLR2d, RX2d; \ - roll RKRbl, RX2d; \ - rorq $32, RLR2; \ - \ - F_tail(RLR0, RX0, op1, op2, op3); \ - F_tail(RLR1, RX1, op1, op2, op3); \ - F_tail(RLR2, RX2, op1, op2, op3); \ - \ - movl km, RX0d; \ - op0 ## l RLR3d, RX0d; \ - roll RKRbl, RX0d; \ - load_next_kr(); \ - rorq $32, RLR3; \ - \ - F_tail(RLR3, RX0, op1, op2, op3); - -#define F4_1(km, load_next_kr) \ - F4(km, load_next_kr, add, xor, sub, add) -#define F4_2(km, load_next_kr) \ - F4(km, load_next_kr, xor, sub, add, xor) -#define F4_3(km, load_next_kr) \ - F4(km, load_next_kr, sub, add, xor, sub) - -#define round_enc4(n, FA, FB, fn1, fn2) \ - get_round_km(n + 1, RKM1d); \ - FA(RKM0d, fn1); \ - get_round_km(n + 2, RKM0d); \ - FB(RKM1d, fn2); - -#define round_enc_last4(n, FXA, FXB) \ - get_round_km(n + 1, RKM1d); \ - FXA(RKM0d, shr_kr); \ - FXB(RKM1d, dummy); - -#define round_enc4_1(n, FA, FB) \ - round_enc4(n, FA, FB, shr_kr, shr_kr); - -#define round_enc4_2(n, FA, FB) \ - round_enc4(n, FA, FB, shr_kr, dummy); - -#define round_dec4(n, FA, FB, fn1, fn2) \ - get_round_km(n - 1, RKM1d); \ - FA(RKM0d, fn1); \ - get_round_km(n - 2, RKM0d); \ - FB(RKM1d, fn2); - -#define round_dec_last4(n, FXA, FXB) \ - get_round_km(n - 1, RKM1d); \ - FXA(RKM0d, shr_kr); \ - FXB(RKM1d, dummy); - -#define round_dec4_1(n, FA, FB) \ - round_dec4(n, FA, FB, shr_kr, shr_kr); - -#define round_dec4_2(n, FA, FB) \ - round_dec4(n, FA, FB, shr_kr, dummy); - -#define inbswap_block4(a, b, c, d) \ - bswapq a; \ - bswapq b; \ - bswapq c; \ - bswapq d; - -#define outbswap_block4(a, b, c, d) \ - bswapq a; \ - bswapq b; \ - bswapq c; \ - bswapq d; \ - rorq $32, a; \ - rorq $32, b; \ - rorq $32, c; \ - rorq $32, d; - -.align 8 -.type __cast5_enc_blk4,@function; - -__cast5_enc_blk4: - /* input: - * %rdi: ctx, CTX - * RLR0,RLR1,RLR2,RLR3: four input plaintext blocks - * output: - * RLR0,RLR1,RLR2,RLR3: four output ciphertext blocks - */ - GET_EXTERN_POINTER(_gcry_cast5_s1to4, RTAB); - - get_round_km(0, RKM0d); - get_round_kr_enc(0); - round_enc4_1(0, F4_1, F4_2); - round_enc4_1(2, F4_3, F4_1); - round_enc4_1(4, F4_2, F4_3); - round_enc4_2(6, F4_1, F4_2); - get_round_kr_enc(8); - round_enc4_1(8, F4_3, F4_1); - round_enc4_1(10, F4_2, F4_3); - round_enc4_1(12, F4_1, F4_2); - round_enc_last4(14, F4_3, F4_1); - - outbswap_block4(RLR0, RLR1, RLR2, RLR3); - ret; -.size __cast5_enc_blk4,.-__cast5_enc_blk4; - -.align 8 -.type __cast5_dec_blk4,@function; - -__cast5_dec_blk4: - /* input: - * %rdi: ctx, CTX - * RLR0,RLR1,RLR2,RLR3: four input ciphertext blocks - * output: - * RLR0,RLR1,RLR2,RLR3: four output plaintext blocks - */ - GET_EXTERN_POINTER(_gcry_cast5_s1to4, RTAB); - - inbswap_block4(RLR0, RLR1, RLR2, RLR3); - - get_round_km(15, RKM0d); - get_round_kr_dec(15); - round_dec4_1(15, F4_1, F4_3); - round_dec4_1(13, F4_2, F4_1); - round_dec4_1(11, F4_3, F4_2); - round_dec4_2(9, F4_1, F4_3); - get_round_kr_dec(7); - round_dec4_1(7, F4_2, F4_1); - round_dec4_1(5, F4_3, F4_2); - round_dec4_1(3, F4_1, F4_3); - round_dec_last4(1, F4_2, F4_1); - - outbswap_block4(RLR0, RLR1, RLR2, RLR3); - ret; -.size __cast5_dec_blk4,.-__cast5_dec_blk4; - -.align 8 -.globl _gcry_cast5_amd64_ctr_enc -.type _gcry_cast5_amd64_ctr_enc,@function; -_gcry_cast5_amd64_ctr_enc: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (8 blocks) - * %rdx: src (8 blocks) - * %rcx: iv (big endian, 64bit) - */ - - pushq %rbp; - pushq %rbx; - pushq %r12; - pushq %r13; - pushq %r14; - - pushq %rsi; - pushq %rdx; - - /* load IV and byteswap */ - movq (%rcx), RX0; - bswapq RX0; - movq RX0, RLR0; - - /* construct IVs */ - leaq 1(RX0), RLR1; - leaq 2(RX0), RLR2; - leaq 3(RX0), RLR3; - leaq 4(RX0), RX0; - bswapq RX0; - - /* store new IV */ - movq RX0, (%rcx); - - call __cast5_enc_blk4; - - popq %r14; /*src*/ - popq %r13; /*dst*/ - - /* XOR key-stream with plaintext */ - xorq 0 * 8(%r14), RLR0; - xorq 1 * 8(%r14), RLR1; - xorq 2 * 8(%r14), RLR2; - xorq 3 * 8(%r14), RLR3; - movq RLR0, 0 * 8(%r13); - movq RLR1, 1 * 8(%r13); - movq RLR2, 2 * 8(%r13); - movq RLR3, 3 * 8(%r13); - - popq %r14; - popq %r13; - popq %r12; - popq %rbx; - popq %rbp; - ret -.size _gcry_cast5_amd64_ctr_enc,.-_gcry_cast5_amd64_ctr_enc; - -.align 8 -.globl _gcry_cast5_amd64_cbc_dec -.type _gcry_cast5_amd64_cbc_dec,@function; -_gcry_cast5_amd64_cbc_dec: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (8 blocks) - * %rdx: src (8 blocks) - * %rcx: iv (64bit) - */ - - pushq %rbp; - pushq %rbx; - pushq %r12; - pushq %r13; - pushq %r14; - - pushq %rcx; - pushq %rsi; - pushq %rdx; - - /* load input */ - movq 0 * 8(%rdx), RLR0; - movq 1 * 8(%rdx), RLR1; - movq 2 * 8(%rdx), RLR2; - movq 3 * 8(%rdx), RLR3; - - call __cast5_dec_blk4; - - popq RX0; /*src*/ - popq RX1; /*dst*/ - popq RX2; /*iv*/ - - movq 3 * 8(RX0), %r14; - xorq (RX2), RLR0; - xorq 0 * 8(RX0), RLR1; - xorq 1 * 8(RX0), RLR2; - xorq 2 * 8(RX0), RLR3; - movq %r14, (RX2); /* store new IV */ - - movq RLR0, 0 * 8(RX1); - movq RLR1, 1 * 8(RX1); - movq RLR2, 2 * 8(RX1); - movq RLR3, 3 * 8(RX1); - - popq %r14; - popq %r13; - popq %r12; - popq %rbx; - popq %rbp; - ret; - -.size _gcry_cast5_amd64_cbc_dec,.-_gcry_cast5_amd64_cbc_dec; - -.align 8 -.globl _gcry_cast5_amd64_cfb_dec -.type _gcry_cast5_amd64_cfb_dec,@function; -_gcry_cast5_amd64_cfb_dec: - /* input: - * %rdi: ctx, CTX - * %rsi: dst (8 blocks) - * %rdx: src (8 blocks) - * %rcx: iv (64bit) - */ - - pushq %rbp; - pushq %rbx; - pushq %r12; - pushq %r13; - pushq %r14; - - pushq %rsi; - pushq %rdx; - - /* Load input */ - movq (%rcx), RLR0; - movq 0 * 8(%rdx), RLR1; - movq 1 * 8(%rdx), RLR2; - movq 2 * 8(%rdx), RLR3; - - inbswap_block4(RLR0, RLR1, RLR2, RLR3); - - /* Update IV */ - movq 3 * 8(%rdx), %rdx; - movq %rdx, (%rcx); - - call __cast5_enc_blk4; - - popq %rdx; /*src*/ - popq %rcx; /*dst*/ - - xorq 0 * 8(%rdx), RLR0; - xorq 1 * 8(%rdx), RLR1; - xorq 2 * 8(%rdx), RLR2; - xorq 3 * 8(%rdx), RLR3; - movq RLR0, 0 * 8(%rcx); - movq RLR1, 1 * 8(%rcx); - movq RLR2, 2 * 8(%rcx); - movq RLR3, 3 * 8(%rcx); - - popq %r14; - popq %r13; - popq %r12; - popq %rbx; - popq %rbp; - ret; - -.size _gcry_cast5_amd64_cfb_dec,.-_gcry_cast5_amd64_cfb_dec; - -#endif /*defined(USE_CAST5)*/ -#endif /*__x86_64*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cast5-arm.S b/src/hos_libhttpserver/src/libgcrypt/cipher/cast5-arm.S deleted file mode 100644 index db96db48..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cast5-arm.S +++ /dev/null @@ -1,728 +0,0 @@ -/* cast5-arm.S - ARM assembly implementation of CAST5 cipher - * - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include - -#if defined(__ARMEL__) -#ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS - -.text - -.syntax unified -.arm - -.extern _gcry_cast5_s1to4; - -#ifdef __PIC__ -# define GET_DATA_POINTER(reg, name, rtmp) \ - ldr reg, 1f; \ - ldr rtmp, 2f; \ - b 3f; \ - 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \ - 2: .word name(GOT); \ - 3: add reg, pc, reg; \ - ldr reg, [reg, rtmp]; -#else -# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name -#endif - -/* structure of crypto context */ -#define Km 0 -#define Kr (Km + (16 * 4)) -#define Kr_arm_enc (Kr + (16)) -#define Kr_arm_dec (Kr_arm_enc + (16)) - -/* register macros */ -#define CTX %r0 -#define Rs1 %r7 -#define Rs2 %r8 -#define Rs3 %r9 -#define Rs4 %r10 -#define RMASK %r11 -#define RKM %r1 -#define RKR %r2 - -#define RL0 %r3 -#define RR0 %r4 - -#define RL1 %r9 -#define RR1 %r10 - -#define RT0 %lr -#define RT1 %ip -#define RT2 %r5 -#define RT3 %r6 - -/* helper macros */ -#define ldr_unaligned_le(rout, rsrc, offs, rtmp) \ - ldrb rout, [rsrc, #((offs) + 0)]; \ - ldrb rtmp, [rsrc, #((offs) + 1)]; \ - orr rout, rout, rtmp, lsl #8; \ - ldrb rtmp, [rsrc, #((offs) + 2)]; \ - orr rout, rout, rtmp, lsl #16; \ - ldrb rtmp, [rsrc, #((offs) + 3)]; \ - orr rout, rout, rtmp, lsl #24; - -#define str_unaligned_le(rin, rdst, offs, rtmp0, rtmp1) \ - mov rtmp0, rin, lsr #8; \ - strb rin, [rdst, #((offs) + 0)]; \ - mov rtmp1, rin, lsr #16; \ - strb rtmp0, [rdst, #((offs) + 1)]; \ - mov rtmp0, rin, lsr #24; \ - strb rtmp1, [rdst, #((offs) + 2)]; \ - strb rtmp0, [rdst, #((offs) + 3)]; - -#define ldr_unaligned_be(rout, rsrc, offs, rtmp) \ - ldrb rout, [rsrc, #((offs) + 3)]; \ - ldrb rtmp, [rsrc, #((offs) + 2)]; \ - orr rout, rout, rtmp, lsl #8; \ - ldrb rtmp, [rsrc, #((offs) + 1)]; \ - orr rout, rout, rtmp, lsl #16; \ - ldrb rtmp, [rsrc, #((offs) + 0)]; \ - orr rout, rout, rtmp, lsl #24; - -#define str_unaligned_be(rin, rdst, offs, rtmp0, rtmp1) \ - mov rtmp0, rin, lsr #8; \ - strb rin, [rdst, #((offs) + 3)]; \ - mov rtmp1, rin, lsr #16; \ - strb rtmp0, [rdst, #((offs) + 2)]; \ - mov rtmp0, rin, lsr #24; \ - strb rtmp1, [rdst, #((offs) + 1)]; \ - strb rtmp0, [rdst, #((offs) + 0)]; - -#ifdef __ARMEL__ - #define ldr_unaligned_host ldr_unaligned_le - #define str_unaligned_host str_unaligned_le - - /* bswap on little-endian */ -#ifdef HAVE_ARM_ARCH_V6 - #define host_to_be(reg, rtmp) \ - rev reg, reg; - #define be_to_host(reg, rtmp) \ - rev reg, reg; -#else - #define host_to_be(reg, rtmp) \ - eor rtmp, reg, reg, ror #16; \ - mov rtmp, rtmp, lsr #8; \ - bic rtmp, rtmp, #65280; \ - eor reg, rtmp, reg, ror #8; - #define be_to_host(reg, rtmp) \ - eor rtmp, reg, reg, ror #16; \ - mov rtmp, rtmp, lsr #8; \ - bic rtmp, rtmp, #65280; \ - eor reg, rtmp, reg, ror #8; -#endif -#else - #define ldr_unaligned_host ldr_unaligned_be - #define str_unaligned_host str_unaligned_be - - /* nop on big-endian */ - #define host_to_be(reg, rtmp) /*_*/ - #define be_to_host(reg, rtmp) /*_*/ -#endif - -#define host_to_host(x, y) /*_*/ - -/********************************************************************** - 1-way cast5 - **********************************************************************/ - -#define dummy(n) /*_*/ - -#define load_kr(n) \ - ldr RKR, [CTX, #(Kr_arm_enc + (n))]; /* Kr[n] */ - -#define load_dec_kr(n) \ - ldr RKR, [CTX, #(Kr_arm_dec + (n) - 3)]; /* Kr[n] */ - -#define load_km(n) \ - ldr RKM, [CTX, #(Km + (n) * 4)]; /* Km[n] */ - -#define shift_kr(dummy) \ - mov RKR, RKR, lsr #8; - -#define F(n, rl, rr, op1, op2, op3, op4, dec, loadkm, shiftkr, loadkr) \ - op1 RKM, rr; \ - mov RKM, RKM, ror RKR; \ - \ - and RT0, RMASK, RKM, ror #(24); \ - and RT1, RMASK, RKM, lsr #(16); \ - and RT2, RMASK, RKM, lsr #(8); \ - ldr RT0, [Rs1, RT0]; \ - and RT3, RMASK, RKM; \ - ldr RT1, [Rs2, RT1]; \ - shiftkr(RKR); \ - \ - ldr RT2, [Rs3, RT2]; \ - \ - op2 RT0, RT1; \ - ldr RT3, [Rs4, RT3]; \ - op3 RT0, RT2; \ - loadkm((n) + (1 - ((dec) * 2))); \ - op4 RT0, RT3; \ - loadkr((n) + (1 - ((dec) * 2))); \ - eor rl, RT0; - -#define F1(n, rl, rr, dec, loadkm, shiftkr, loadkr) \ - F(n, rl, rr, add, eor, sub, add, dec, loadkm, shiftkr, loadkr) -#define F2(n, rl, rr, dec, loadkm, shiftkr, loadkr) \ - F(n, rl, rr, eor, sub, add, eor, dec, loadkm, shiftkr, loadkr) -#define F3(n, rl, rr, dec, loadkm, shiftkr, loadkr) \ - F(n, rl, rr, sub, add, eor, sub, dec, loadkm, shiftkr, loadkr) - -#define enc_round(n, Fx, rl, rr, loadkm, shiftkr, loadkr) \ - Fx(n, rl, rr, 0, loadkm, shiftkr, loadkr) - -#define dec_round(n, Fx, rl, rr, loadkm, shiftkr, loadkr) \ - Fx(n, rl, rr, 1, loadkm, shiftkr, loadkr) - -#define read_block_aligned(rin, offs, l0, r0, convert, rtmp) \ - ldr l0, [rin, #((offs) + 0)]; \ - ldr r0, [rin, #((offs) + 4)]; \ - convert(l0, rtmp); \ - convert(r0, rtmp); - -#define write_block_aligned(rout, offs, l0, r0, convert, rtmp) \ - convert(l0, rtmp); \ - convert(r0, rtmp); \ - str l0, [rout, #((offs) + 0)]; \ - str r0, [rout, #((offs) + 4)]; - -#ifdef __ARM_FEATURE_UNALIGNED - /* unaligned word reads allowed */ - #define read_block(rin, offs, l0, r0, rtmp0) \ - read_block_aligned(rin, offs, l0, r0, host_to_be, rtmp0) - - #define write_block(rout, offs, r0, l0, rtmp0, rtmp1) \ - write_block_aligned(rout, offs, r0, l0, be_to_host, rtmp0) - - #define read_block_host(rin, offs, l0, r0, rtmp0) \ - read_block_aligned(rin, offs, l0, r0, host_to_host, rtmp0) - - #define write_block_host(rout, offs, r0, l0, rtmp0, rtmp1) \ - write_block_aligned(rout, offs, r0, l0, host_to_host, rtmp0) -#else - /* need to handle unaligned reads by byte reads */ - #define read_block(rin, offs, l0, r0, rtmp0) \ - tst rin, #3; \ - beq 1f; \ - ldr_unaligned_be(l0, rin, (offs) + 0, rtmp0); \ - ldr_unaligned_be(r0, rin, (offs) + 4, rtmp0); \ - b 2f; \ - 1:;\ - read_block_aligned(rin, offs, l0, r0, host_to_be, rtmp0); \ - 2:; - - #define write_block(rout, offs, l0, r0, rtmp0, rtmp1) \ - tst rout, #3; \ - beq 1f; \ - str_unaligned_be(l0, rout, (offs) + 0, rtmp0, rtmp1); \ - str_unaligned_be(r0, rout, (offs) + 4, rtmp0, rtmp1); \ - b 2f; \ - 1:;\ - write_block_aligned(rout, offs, l0, r0, be_to_host, rtmp0); \ - 2:; - - #define read_block_host(rin, offs, l0, r0, rtmp0) \ - tst rin, #3; \ - beq 1f; \ - ldr_unaligned_host(l0, rin, (offs) + 0, rtmp0); \ - ldr_unaligned_host(r0, rin, (offs) + 4, rtmp0); \ - b 2f; \ - 1:;\ - read_block_aligned(rin, offs, l0, r0, host_to_host, rtmp0); \ - 2:; - - #define write_block_host(rout, offs, l0, r0, rtmp0, rtmp1) \ - tst rout, #3; \ - beq 1f; \ - str_unaligned_host(l0, rout, (offs) + 0, rtmp0, rtmp1); \ - str_unaligned_host(r0, rout, (offs) + 4, rtmp0, rtmp1); \ - b 2f; \ - 1:;\ - write_block_aligned(rout, offs, l0, r0, host_to_host, rtmp0); \ - 2:; -#endif - -.align 3 -.globl _gcry_cast5_arm_encrypt_block -.type _gcry_cast5_arm_encrypt_block,%function; - -_gcry_cast5_arm_encrypt_block: - /* input: - * %r0: CTX - * %r1: dst - * %r2: src - */ - push {%r1, %r4-%r11, %ip, %lr}; - - GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2); - mov RMASK, #(0xff << 2); - add Rs2, Rs1, #(0x100*4); - add Rs3, Rs1, #(0x100*4*2); - add Rs4, Rs1, #(0x100*4*3); - - read_block(%r2, 0, RL0, RR0, RT0); - - load_km(0); - load_kr(0); - enc_round(0, F1, RL0, RR0, load_km, shift_kr, dummy); - enc_round(1, F2, RR0, RL0, load_km, shift_kr, dummy); - enc_round(2, F3, RL0, RR0, load_km, shift_kr, dummy); - enc_round(3, F1, RR0, RL0, load_km, dummy, load_kr); - enc_round(4, F2, RL0, RR0, load_km, shift_kr, dummy); - enc_round(5, F3, RR0, RL0, load_km, shift_kr, dummy); - enc_round(6, F1, RL0, RR0, load_km, shift_kr, dummy); - enc_round(7, F2, RR0, RL0, load_km, dummy, load_kr); - enc_round(8, F3, RL0, RR0, load_km, shift_kr, dummy); - enc_round(9, F1, RR0, RL0, load_km, shift_kr, dummy); - enc_round(10, F2, RL0, RR0, load_km, shift_kr, dummy); - enc_round(11, F3, RR0, RL0, load_km, dummy, load_kr); - enc_round(12, F1, RL0, RR0, load_km, shift_kr, dummy); - enc_round(13, F2, RR0, RL0, load_km, shift_kr, dummy); - enc_round(14, F3, RL0, RR0, load_km, shift_kr, dummy); - enc_round(15, F1, RR0, RL0, dummy, dummy, dummy); - - ldr %r1, [%sp], #4; - write_block(%r1, 0, RR0, RL0, RT0, RT1); - - pop {%r4-%r11, %ip, %pc}; -.ltorg -.size _gcry_cast5_arm_encrypt_block,.-_gcry_cast5_arm_encrypt_block; - -.align 3 -.globl _gcry_cast5_arm_decrypt_block -.type _gcry_cast5_arm_decrypt_block,%function; - -_gcry_cast5_arm_decrypt_block: - /* input: - * %r0: CTX - * %r1: dst - * %r2: src - */ - push {%r1, %r4-%r11, %ip, %lr}; - - GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2); - mov RMASK, #(0xff << 2); - add Rs2, Rs1, #(0x100 * 4); - add Rs3, Rs1, #(0x100 * 4 * 2); - add Rs4, Rs1, #(0x100 * 4 * 3); - - read_block(%r2, 0, RL0, RR0, RT0); - - load_km(15); - load_dec_kr(15); - dec_round(15, F1, RL0, RR0, load_km, shift_kr, dummy); - dec_round(14, F3, RR0, RL0, load_km, shift_kr, dummy); - dec_round(13, F2, RL0, RR0, load_km, shift_kr, dummy); - dec_round(12, F1, RR0, RL0, load_km, dummy, load_dec_kr); - dec_round(11, F3, RL0, RR0, load_km, shift_kr, dummy); - dec_round(10, F2, RR0, RL0, load_km, shift_kr, dummy); - dec_round(9, F1, RL0, RR0, load_km, shift_kr, dummy); - dec_round(8, F3, RR0, RL0, load_km, dummy, load_dec_kr); - dec_round(7, F2, RL0, RR0, load_km, shift_kr, dummy); - dec_round(6, F1, RR0, RL0, load_km, shift_kr, dummy); - dec_round(5, F3, RL0, RR0, load_km, shift_kr, dummy); - dec_round(4, F2, RR0, RL0, load_km, dummy, load_dec_kr); - dec_round(3, F1, RL0, RR0, load_km, shift_kr, dummy); - dec_round(2, F3, RR0, RL0, load_km, shift_kr, dummy); - dec_round(1, F2, RL0, RR0, load_km, shift_kr, dummy); - dec_round(0, F1, RR0, RL0, dummy, dummy, dummy); - - ldr %r1, [%sp], #4; - write_block(%r1, 0, RR0, RL0, RT0, RT1); - - pop {%r4-%r11, %ip, %pc}; -.ltorg -.size _gcry_cast5_arm_decrypt_block,.-_gcry_cast5_arm_decrypt_block; - -/********************************************************************** - 2-way cast5 - **********************************************************************/ - -#define F_2w(n, rl0, rr0, rl1, rr1, op1, op2, op3, op4, dec, loadkm, shiftkr, \ - loadkr) \ - op1 RT3, RKM, rr0; \ - op1 RKM, RKM, rr1; \ - mov RT3, RT3, ror RKR; \ - mov RKM, RKM, ror RKR; \ - \ - and RT0, RMASK, RT3, ror #(24); \ - and RT1, RMASK, RT3, lsr #(16); \ - and RT2, RMASK, RT3, lsr #(8); \ - and RT3, RMASK, RT3; \ - \ - ldr RT0, [Rs1, RT0]; \ - add RT2, #(0x100 * 4); \ - ldr RT1, [Rs2, RT1]; \ - add RT3, #(0x100 * 4 * 2); \ - \ - ldr RT2, [Rs2, RT2]; \ - \ - op2 RT0, RT1; \ - ldr RT3, [Rs2, RT3]; \ - and RT1, RMASK, RKM, ror #(24); \ - op3 RT0, RT2; \ - and RT2, RMASK, RKM, lsr #(16); \ - op4 RT0, RT3; \ - and RT3, RMASK, RKM, lsr #(8); \ - eor rl0, RT0; \ - add RT3, #(0x100 * 4); \ - ldr RT1, [Rs1, RT1]; \ - and RT0, RMASK, RKM; \ - ldr RT2, [Rs2, RT2]; \ - add RT0, #(0x100 * 4 * 2); \ - \ - ldr RT3, [Rs2, RT3]; \ - \ - op2 RT1, RT2; \ - ldr RT0, [Rs2, RT0]; \ - op3 RT1, RT3; \ - loadkm((n) + (1 - ((dec) * 2))); \ - op4 RT1, RT0; \ - loadkr((n) + (1 - ((dec) * 2))); \ - shiftkr(RKR); \ - eor rl1, RT1; - -#define F1_2w(n, rl0, rr0, rl1, rr1, dec, loadkm, shiftkr, loadkr) \ - F_2w(n, rl0, rr0, rl1, rr1, add, eor, sub, add, dec, \ - loadkm, shiftkr, loadkr) -#define F2_2w(n, rl0, rr0, rl1, rr1, dec, loadkm, shiftkr, loadkr) \ - F_2w(n, rl0, rr0, rl1, rr1, eor, sub, add, eor, dec, \ - loadkm, shiftkr, loadkr) -#define F3_2w(n, rl0, rr0, rl1, rr1, dec, loadkm, shiftkr, loadkr) \ - F_2w(n, rl0, rr0, rl1, rr1, sub, add, eor, sub, dec, \ - loadkm, shiftkr, loadkr) - -#define enc_round2(n, Fx, rl, rr, loadkm, shiftkr, loadkr) \ - Fx##_2w(n, rl##0, rr##0, rl##1, rr##1, 0, loadkm, shiftkr, loadkr) - -#define dec_round2(n, Fx, rl, rr, loadkm, shiftkr, loadkr) \ - Fx##_2w(n, rl##0, rr##0, rl##1, rr##1, 1, loadkm, shiftkr, loadkr) - -#define read_block2_aligned(rin, l0, r0, l1, r1, convert, rtmp) \ - ldr l0, [rin, #(0)]; \ - ldr r0, [rin, #(4)]; \ - convert(l0, rtmp); \ - ldr l1, [rin, #(8)]; \ - convert(r0, rtmp); \ - ldr r1, [rin, #(12)]; \ - convert(l1, rtmp); \ - convert(r1, rtmp); - -#define write_block2_aligned(rout, l0, r0, l1, r1, convert, rtmp) \ - convert(l0, rtmp); \ - convert(r0, rtmp); \ - convert(l1, rtmp); \ - str l0, [rout, #(0)]; \ - convert(r1, rtmp); \ - str r0, [rout, #(4)]; \ - str l1, [rout, #(8)]; \ - str r1, [rout, #(12)]; - -#ifdef __ARM_FEATURE_UNALIGNED - /* unaligned word reads allowed */ - #define read_block2(rin, l0, r0, l1, r1, rtmp0) \ - read_block2_aligned(rin, l0, r0, l1, r1, host_to_be, rtmp0) - - #define write_block2(rout, l0, r0, l1, r1, rtmp0, rtmp1) \ - write_block2_aligned(rout, l0, r0, l1, r1, be_to_host, rtmp0) - - #define read_block2_host(rin, l0, r0, l1, r1, rtmp0) \ - read_block2_aligned(rin, l0, r0, l1, r1, host_to_host, rtmp0) - - #define write_block2_host(rout, l0, r0, l1, r1, rtmp0, rtmp1) \ - write_block2_aligned(rout, l0, r0, l1, r1, host_to_host, rtmp0) -#else - /* need to handle unaligned reads by byte reads */ - #define read_block2(rin, l0, r0, l1, r1, rtmp0) \ - tst rin, #3; \ - beq 1f; \ - ldr_unaligned_be(l0, rin, 0, rtmp0); \ - ldr_unaligned_be(r0, rin, 4, rtmp0); \ - ldr_unaligned_be(l1, rin, 8, rtmp0); \ - ldr_unaligned_be(r1, rin, 12, rtmp0); \ - b 2f; \ - 1:;\ - read_block2_aligned(rin, l0, r0, l1, r1, host_to_be, rtmp0); \ - 2:; - - #define write_block2(rout, l0, r0, l1, r1, rtmp0, rtmp1) \ - tst rout, #3; \ - beq 1f; \ - str_unaligned_be(l0, rout, 0, rtmp0, rtmp1); \ - str_unaligned_be(r0, rout, 4, rtmp0, rtmp1); \ - str_unaligned_be(l1, rout, 8, rtmp0, rtmp1); \ - str_unaligned_be(r1, rout, 12, rtmp0, rtmp1); \ - b 2f; \ - 1:;\ - write_block2_aligned(rout, l0, r0, l1, r1, be_to_host, rtmp0); \ - 2:; - - #define read_block2_host(rin, l0, r0, l1, r1, rtmp0) \ - tst rin, #3; \ - beq 1f; \ - ldr_unaligned_host(l0, rin, 0, rtmp0); \ - ldr_unaligned_host(r0, rin, 4, rtmp0); \ - ldr_unaligned_host(l1, rin, 8, rtmp0); \ - ldr_unaligned_host(r1, rin, 12, rtmp0); \ - b 2f; \ - 1:;\ - read_block2_aligned(rin, l0, r0, l1, r1, host_to_host, rtmp0); \ - 2:; - - #define write_block2_host(rout, l0, r0, l1, r1, rtmp0, rtmp1) \ - tst rout, #3; \ - beq 1f; \ - str_unaligned_host(l0, rout, 0, rtmp0, rtmp1); \ - str_unaligned_host(r0, rout, 4, rtmp0, rtmp1); \ - str_unaligned_host(l1, rout, 8, rtmp0, rtmp1); \ - str_unaligned_host(r1, rout, 12, rtmp0, rtmp1); \ - b 2f; \ - 1:;\ - write_block2_aligned(rout, l0, r0, l1, r1, host_to_host, rtmp0); \ - 2:; -#endif - -.align 3 -.type _gcry_cast5_arm_enc_blk2,%function; - -_gcry_cast5_arm_enc_blk2: - /* input: - * preloaded: CTX - * [RL0, RR0], [RL1, RR1]: src - * output: - * [RR0, RL0], [RR1, RL1]: dst - */ - push {%lr}; - - GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2); - mov RMASK, #(0xff << 2); - add Rs2, Rs1, #(0x100 * 4); - - load_km(0); - load_kr(0); - enc_round2(0, F1, RL, RR, load_km, shift_kr, dummy); - enc_round2(1, F2, RR, RL, load_km, shift_kr, dummy); - enc_round2(2, F3, RL, RR, load_km, shift_kr, dummy); - enc_round2(3, F1, RR, RL, load_km, dummy, load_kr); - enc_round2(4, F2, RL, RR, load_km, shift_kr, dummy); - enc_round2(5, F3, RR, RL, load_km, shift_kr, dummy); - enc_round2(6, F1, RL, RR, load_km, shift_kr, dummy); - enc_round2(7, F2, RR, RL, load_km, dummy, load_kr); - enc_round2(8, F3, RL, RR, load_km, shift_kr, dummy); - enc_round2(9, F1, RR, RL, load_km, shift_kr, dummy); - enc_round2(10, F2, RL, RR, load_km, shift_kr, dummy); - enc_round2(11, F3, RR, RL, load_km, dummy, load_kr); - enc_round2(12, F1, RL, RR, load_km, shift_kr, dummy); - enc_round2(13, F2, RR, RL, load_km, shift_kr, dummy); - enc_round2(14, F3, RL, RR, load_km, shift_kr, dummy); - enc_round2(15, F1, RR, RL, dummy, dummy, dummy); - - host_to_be(RR0, RT0); - host_to_be(RL0, RT0); - host_to_be(RR1, RT0); - host_to_be(RL1, RT0); - - pop {%pc}; -.ltorg -.size _gcry_cast5_arm_enc_blk2,.-_gcry_cast5_arm_enc_blk2; - -.align 3 -.globl _gcry_cast5_arm_cfb_dec; -.type _gcry_cast5_arm_cfb_dec,%function; - -_gcry_cast5_arm_cfb_dec: - /* input: - * %r0: CTX - * %r1: dst (2 blocks) - * %r2: src (2 blocks) - * %r3: iv (64bit) - */ - push {%r1, %r2, %r4-%r11, %ip, %lr}; - - mov %lr, %r3; - - /* Load input (iv/%r3 is aligned, src/%r2 might not be) */ - ldm %r3, {RL0, RR0}; - host_to_be(RL0, RT1); - host_to_be(RR0, RT1); - read_block(%r2, 0, RL1, RR1, %ip); - - /* Update IV, load src[1] and save to iv[0] */ - read_block_host(%r2, 8, %r5, %r6, %r7); - stm %lr, {%r5, %r6}; - - bl _gcry_cast5_arm_enc_blk2; - /* result in RR0:RL0, RR1:RL1 = %r4:%r3, %r10:%r9 */ - - /* %r0: dst, %r1: %src */ - pop {%r0, %r1}; - - /* dst = src ^ result */ - read_block2_host(%r1, %r5, %r6, %r7, %r8, %lr); - eor %r5, %r4; - eor %r6, %r3; - eor %r7, %r10; - eor %r8, %r9; - write_block2_host(%r0, %r5, %r6, %r7, %r8, %r1, %r2); - - pop {%r4-%r11, %ip, %pc}; -.ltorg -.size _gcry_cast5_arm_cfb_dec,.-_gcry_cast5_arm_cfb_dec; - -.align 3 -.globl _gcry_cast5_arm_ctr_enc; -.type _gcry_cast5_arm_ctr_enc,%function; - -_gcry_cast5_arm_ctr_enc: - /* input: - * %r0: CTX - * %r1: dst (2 blocks) - * %r2: src (2 blocks) - * %r3: iv (64bit, big-endian) - */ - push {%r1, %r2, %r4-%r11, %ip, %lr}; - - mov %lr, %r3; - - /* Load IV (big => host endian) */ - read_block_aligned(%lr, 0, RL0, RR0, be_to_host, RT1); - - /* Construct IVs */ - adds RR1, RR0, #1; /* +1 */ - adc RL1, RL0, #0; - adds %r6, RR1, #1; /* +2 */ - adc %r5, RL1, #0; - - /* Store new IV (host => big-endian) */ - write_block_aligned(%lr, 0, %r5, %r6, host_to_be, RT1); - - bl _gcry_cast5_arm_enc_blk2; - /* result in RR0:RL0, RR1:RL1 = %r4:%r3, %r10:%r9 */ - - /* %r0: dst, %r1: %src */ - pop {%r0, %r1}; - - /* XOR key-stream with plaintext */ - read_block2_host(%r1, %r5, %r6, %r7, %r8, %lr); - eor %r5, %r4; - eor %r6, %r3; - eor %r7, %r10; - eor %r8, %r9; - write_block2_host(%r0, %r5, %r6, %r7, %r8, %r1, %r2); - - pop {%r4-%r11, %ip, %pc}; -.ltorg -.size _gcry_cast5_arm_ctr_enc,.-_gcry_cast5_arm_ctr_enc; - -.align 3 -.type _gcry_cast5_arm_dec_blk2,%function; - -_gcry_cast5_arm_dec_blk2: - /* input: - * preloaded: CTX - * [RL0, RR0], [RL1, RR1]: src - * output: - * [RR0, RL0], [RR1, RL1]: dst - */ - - GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2); - mov RMASK, #(0xff << 2); - add Rs2, Rs1, #(0x100 * 4); - - load_km(15); - load_dec_kr(15); - dec_round2(15, F1, RL, RR, load_km, shift_kr, dummy); - dec_round2(14, F3, RR, RL, load_km, shift_kr, dummy); - dec_round2(13, F2, RL, RR, load_km, shift_kr, dummy); - dec_round2(12, F1, RR, RL, load_km, dummy, load_dec_kr); - dec_round2(11, F3, RL, RR, load_km, shift_kr, dummy); - dec_round2(10, F2, RR, RL, load_km, shift_kr, dummy); - dec_round2(9, F1, RL, RR, load_km, shift_kr, dummy); - dec_round2(8, F3, RR, RL, load_km, dummy, load_dec_kr); - dec_round2(7, F2, RL, RR, load_km, shift_kr, dummy); - dec_round2(6, F1, RR, RL, load_km, shift_kr, dummy); - dec_round2(5, F3, RL, RR, load_km, shift_kr, dummy); - dec_round2(4, F2, RR, RL, load_km, dummy, load_dec_kr); - dec_round2(3, F1, RL, RR, load_km, shift_kr, dummy); - dec_round2(2, F3, RR, RL, load_km, shift_kr, dummy); - dec_round2(1, F2, RL, RR, load_km, shift_kr, dummy); - dec_round2(0, F1, RR, RL, dummy, dummy, dummy); - - host_to_be(RR0, RT0); - host_to_be(RL0, RT0); - host_to_be(RR1, RT0); - host_to_be(RL1, RT0); - - b .Ldec_cbc_tail; -.ltorg -.size _gcry_cast5_arm_dec_blk2,.-_gcry_cast5_arm_dec_blk2; - -.align 3 -.globl _gcry_cast5_arm_cbc_dec; -.type _gcry_cast5_arm_cbc_dec,%function; - -_gcry_cast5_arm_cbc_dec: - /* input: - * %r0: CTX - * %r1: dst (2 blocks) - * %r2: src (2 blocks) - * %r3: iv (64bit) - */ - push {%r1-%r11, %ip, %lr}; - - read_block2(%r2, RL0, RR0, RL1, RR1, RT0); - - /* dec_blk2 is only used by cbc_dec, jump directly in/out instead - * of function call. */ - b _gcry_cast5_arm_dec_blk2; -.Ldec_cbc_tail: - /* result in RR0:RL0, RR1:RL1 = %r4:%r3, %r10:%r9 */ - - /* %r0: dst, %r1: %src, %r2: iv */ - pop {%r0-%r2}; - - /* load IV+1 (src[0]) to %r7:%r8. Might be unaligned. */ - read_block_host(%r1, 0, %r7, %r8, %r5); - /* load IV (iv[0]) to %r5:%r6. 'iv' is aligned. */ - ldm %r2, {%r5, %r6}; - - /* out[1] ^= IV+1 */ - eor %r10, %r7; - eor %r9, %r8; - /* out[0] ^= IV */ - eor %r4, %r5; - eor %r3, %r6; - - /* load IV+2 (src[1]) to %r7:%r8. Might be unaligned. */ - read_block_host(%r1, 8, %r7, %r8, %r5); - /* store IV+2 to iv[0] (aligned). */ - stm %r2, {%r7, %r8}; - - /* store result to dst[0-3]. Might be unaligned. */ - write_block2_host(%r0, %r4, %r3, %r10, %r9, %r5, %r6); - - pop {%r4-%r11, %ip, %pc}; -.ltorg -.size _gcry_cast5_arm_cbc_dec,.-_gcry_cast5_arm_cbc_dec; - -#endif /*HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS*/ -#endif /*__ARM_ARCH >= 6*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cast5.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cast5.c deleted file mode 100644 index 115e1e62..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cast5.c +++ /dev/null @@ -1,988 +0,0 @@ -/* cast5.c - CAST5 cipher (RFC2144) - * Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - -/* Test vectors: - * - * 128-bit key = 01 23 45 67 12 34 56 78 23 45 67 89 34 56 78 9A - * plaintext = 01 23 45 67 89 AB CD EF - * ciphertext = 23 8B 4F E5 84 7E 44 B2 - * - * 80-bit key = 01 23 45 67 12 34 56 78 23 45 - * = 01 23 45 67 12 34 56 78 23 45 00 00 00 00 00 00 - * plaintext = 01 23 45 67 89 AB CD EF - * ciphertext = EB 6A 71 1A 2C 02 27 1B - * - * 40-bit key = 01 23 45 67 12 - * = 01 23 45 67 12 00 00 00 00 00 00 00 00 00 00 00 - * plaintext = 01 23 45 67 89 AB CD EF - * ciphertext = 7A C8 16 D1 6E 9B 30 2E - */ - -#include -#include -#include -#include -#include "g10lib.h" -#include "types.h" -#include "cipher.h" -#include "bithelp.h" -#include "bufhelp.h" -#include "cipher-selftest.h" - -/* USE_AMD64_ASM indicates whether to use AMD64 assembly code. */ -#undef USE_AMD64_ASM -#if defined(__x86_64__) && defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) -# define USE_AMD64_ASM 1 -#endif - -/* USE_ARM_ASM indicates whether to use ARM assembly code. */ -#undef USE_ARM_ASM -#if defined(__ARMEL__) -# ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS -# define USE_ARM_ASM 1 -# endif -#endif - -#define CAST5_BLOCKSIZE 8 - -typedef struct { - u32 Km[16]; - byte Kr[16]; -#ifdef USE_ARM_ASM - u32 Kr_arm_enc[16 / sizeof(u32)]; - u32 Kr_arm_dec[16 / sizeof(u32)]; -#endif -} CAST5_context; - -static gcry_err_code_t cast_setkey (void *c, const byte *key, unsigned keylen); -static unsigned int encrypt_block (void *c, byte *outbuf, const byte *inbuf); -static unsigned int decrypt_block (void *c, byte *outbuf, const byte *inbuf); - - - -#define s1 _gcry_cast5_s1to4[0] -#define s2 _gcry_cast5_s1to4[1] -#define s3 _gcry_cast5_s1to4[2] -#define s4 _gcry_cast5_s1to4[3] - -const u32 _gcry_cast5_s1to4[4][256] = { { -0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949, -0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, 0x6e63a0e0, 0x15c361d2, 0xc2e7661d, 0x22d4ff8e, -0x28683b6f, 0xc07fd059, 0xff2379c8, 0x775f50e2, 0x43c340d3, 0xdf2f8656, 0x887ca41a, 0xa2d2bd2d, -0xa1c9e0d6, 0x346c4819, 0x61b76d87, 0x22540f2f, 0x2abe32e1, 0xaa54166b, 0x22568e3a, 0xa2d341d0, -0x66db40c8, 0xa784392f, 0x004dff2f, 0x2db9d2de, 0x97943fac, 0x4a97c1d8, 0x527644b7, 0xb5f437a7, -0xb82cbaef, 0xd751d159, 0x6ff7f0ed, 0x5a097a1f, 0x827b68d0, 0x90ecf52e, 0x22b0c054, 0xbc8e5935, -0x4b6d2f7f, 0x50bb64a2, 0xd2664910, 0xbee5812d, 0xb7332290, 0xe93b159f, 0xb48ee411, 0x4bff345d, -0xfd45c240, 0xad31973f, 0xc4f6d02e, 0x55fc8165, 0xd5b1caad, 0xa1ac2dae, 0xa2d4b76d, 0xc19b0c50, -0x882240f2, 0x0c6e4f38, 0xa4e4bfd7, 0x4f5ba272, 0x564c1d2f, 0xc59c5319, 0xb949e354, 0xb04669fe, -0xb1b6ab8a, 0xc71358dd, 0x6385c545, 0x110f935d, 0x57538ad5, 0x6a390493, 0xe63d37e0, 0x2a54f6b3, -0x3a787d5f, 0x6276a0b5, 0x19a6fcdf, 0x7a42206a, 0x29f9d4d5, 0xf61b1891, 0xbb72275e, 0xaa508167, -0x38901091, 0xc6b505eb, 0x84c7cb8c, 0x2ad75a0f, 0x874a1427, 0xa2d1936b, 0x2ad286af, 0xaa56d291, -0xd7894360, 0x425c750d, 0x93b39e26, 0x187184c9, 0x6c00b32d, 0x73e2bb14, 0xa0bebc3c, 0x54623779, -0x64459eab, 0x3f328b82, 0x7718cf82, 0x59a2cea6, 0x04ee002e, 0x89fe78e6, 0x3fab0950, 0x325ff6c2, -0x81383f05, 0x6963c5c8, 0x76cb5ad6, 0xd49974c9, 0xca180dcf, 0x380782d5, 0xc7fa5cf6, 0x8ac31511, -0x35e79e13, 0x47da91d0, 0xf40f9086, 0xa7e2419e, 0x31366241, 0x051ef495, 0xaa573b04, 0x4a805d8d, -0x548300d0, 0x00322a3c, 0xbf64cddf, 0xba57a68e, 0x75c6372b, 0x50afd341, 0xa7c13275, 0x915a0bf5, -0x6b54bfab, 0x2b0b1426, 0xab4cc9d7, 0x449ccd82, 0xf7fbf265, 0xab85c5f3, 0x1b55db94, 0xaad4e324, -0xcfa4bd3f, 0x2deaa3e2, 0x9e204d02, 0xc8bd25ac, 0xeadf55b3, 0xd5bd9e98, 0xe31231b2, 0x2ad5ad6c, -0x954329de, 0xadbe4528, 0xd8710f69, 0xaa51c90f, 0xaa786bf6, 0x22513f1e, 0xaa51a79b, 0x2ad344cc, -0x7b5a41f0, 0xd37cfbad, 0x1b069505, 0x41ece491, 0xb4c332e6, 0x032268d4, 0xc9600acc, 0xce387e6d, -0xbf6bb16c, 0x6a70fb78, 0x0d03d9c9, 0xd4df39de, 0xe01063da, 0x4736f464, 0x5ad328d8, 0xb347cc96, -0x75bb0fc3, 0x98511bfb, 0x4ffbcc35, 0xb58bcf6a, 0xe11f0abc, 0xbfc5fe4a, 0xa70aec10, 0xac39570a, -0x3f04442f, 0x6188b153, 0xe0397a2e, 0x5727cb79, 0x9ceb418f, 0x1cacd68d, 0x2ad37c96, 0x0175cb9d, -0xc69dff09, 0xc75b65f0, 0xd9db40d8, 0xec0e7779, 0x4744ead4, 0xb11c3274, 0xdd24cb9e, 0x7e1c54bd, -0xf01144f9, 0xd2240eb1, 0x9675b3fd, 0xa3ac3755, 0xd47c27af, 0x51c85f4d, 0x56907596, 0xa5bb15e6, -0x580304f0, 0xca042cf1, 0x011a37ea, 0x8dbfaadb, 0x35ba3e4a, 0x3526ffa0, 0xc37b4d09, 0xbc306ed9, -0x98a52666, 0x5648f725, 0xff5e569d, 0x0ced63d0, 0x7c63b2cf, 0x700b45e1, 0xd5ea50f1, 0x85a92872, -0xaf1fbda7, 0xd4234870, 0xa7870bf3, 0x2d3b4d79, 0x42e04198, 0x0cd0ede7, 0x26470db8, 0xf881814c, -0x474d6ad7, 0x7c0c5e5c, 0xd1231959, 0x381b7298, 0xf5d2f4db, 0xab838653, 0x6e2f1e23, 0x83719c9e, -0xbd91e046, 0x9a56456e, 0xdc39200c, 0x20c8c571, 0x962bda1c, 0xe1e696ff, 0xb141ab08, 0x7cca89b9, -0x1a69e783, 0x02cc4843, 0xa2f7c579, 0x429ef47d, 0x427b169c, 0x5ac9f049, 0xdd8f0f00, 0x5c8165bf -}, { -0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380, 0xfe61cf7a, 0xeec5207a, 0x55889c94, 0x72fc0651, -0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba, 0x99c430ef, 0x5f0c0794, 0x18dcdb7d, 0xa1d6eff3, -0xa0b52f7b, 0x59e83605, 0xee15b094, 0xe9ffd909, 0xdc440086, 0xef944459, 0xba83ccb3, 0xe0c3cdfb, -0xd1da4181, 0x3b092ab1, 0xf997f1c1, 0xa5e6cf7b, 0x01420ddb, 0xe4e7ef5b, 0x25a1ff41, 0xe180f806, -0x1fc41080, 0x179bee7a, 0xd37ac6a9, 0xfe5830a4, 0x98de8b7f, 0x77e83f4e, 0x79929269, 0x24fa9f7b, -0xe113c85b, 0xacc40083, 0xd7503525, 0xf7ea615f, 0x62143154, 0x0d554b63, 0x5d681121, 0xc866c359, -0x3d63cf73, 0xcee234c0, 0xd4d87e87, 0x5c672b21, 0x071f6181, 0x39f7627f, 0x361e3084, 0xe4eb573b, -0x602f64a4, 0xd63acd9c, 0x1bbc4635, 0x9e81032d, 0x2701f50c, 0x99847ab4, 0xa0e3df79, 0xba6cf38c, -0x10843094, 0x2537a95e, 0xf46f6ffe, 0xa1ff3b1f, 0x208cfb6a, 0x8f458c74, 0xd9e0a227, 0x4ec73a34, -0xfc884f69, 0x3e4de8df, 0xef0e0088, 0x3559648d, 0x8a45388c, 0x1d804366, 0x721d9bfd, 0xa58684bb, -0xe8256333, 0x844e8212, 0x128d8098, 0xfed33fb4, 0xce280ae1, 0x27e19ba5, 0xd5a6c252, 0xe49754bd, -0xc5d655dd, 0xeb667064, 0x77840b4d, 0xa1b6a801, 0x84db26a9, 0xe0b56714, 0x21f043b7, 0xe5d05860, -0x54f03084, 0x066ff472, 0xa31aa153, 0xdadc4755, 0xb5625dbf, 0x68561be6, 0x83ca6b94, 0x2d6ed23b, -0xeccf01db, 0xa6d3d0ba, 0xb6803d5c, 0xaf77a709, 0x33b4a34c, 0x397bc8d6, 0x5ee22b95, 0x5f0e5304, -0x81ed6f61, 0x20e74364, 0xb45e1378, 0xde18639b, 0x881ca122, 0xb96726d1, 0x8049a7e8, 0x22b7da7b, -0x5e552d25, 0x5272d237, 0x79d2951c, 0xc60d894c, 0x488cb402, 0x1ba4fe5b, 0xa4b09f6b, 0x1ca815cf, -0xa20c3005, 0x8871df63, 0xb9de2fcb, 0x0cc6c9e9, 0x0beeff53, 0xe3214517, 0xb4542835, 0x9f63293c, -0xee41e729, 0x6e1d2d7c, 0x50045286, 0x1e6685f3, 0xf33401c6, 0x30a22c95, 0x31a70850, 0x60930f13, -0x73f98417, 0xa1269859, 0xec645c44, 0x52c877a9, 0xcdff33a6, 0xa02b1741, 0x7cbad9a2, 0x2180036f, -0x50d99c08, 0xcb3f4861, 0xc26bd765, 0x64a3f6ab, 0x80342676, 0x25a75e7b, 0xe4e6d1fc, 0x20c710e6, -0xcdf0b680, 0x17844d3b, 0x31eef84d, 0x7e0824e4, 0x2ccb49eb, 0x846a3bae, 0x8ff77888, 0xee5d60f6, -0x7af75673, 0x2fdd5cdb, 0xa11631c1, 0x30f66f43, 0xb3faec54, 0x157fd7fa, 0xef8579cc, 0xd152de58, -0xdb2ffd5e, 0x8f32ce19, 0x306af97a, 0x02f03ef8, 0x99319ad5, 0xc242fa0f, 0xa7e3ebb0, 0xc68e4906, -0xb8da230c, 0x80823028, 0xdcdef3c8, 0xd35fb171, 0x088a1bc8, 0xbec0c560, 0x61a3c9e8, 0xbca8f54d, -0xc72feffa, 0x22822e99, 0x82c570b4, 0xd8d94e89, 0x8b1c34bc, 0x301e16e6, 0x273be979, 0xb0ffeaa6, -0x61d9b8c6, 0x00b24869, 0xb7ffce3f, 0x08dc283b, 0x43daf65a, 0xf7e19798, 0x7619b72f, 0x8f1c9ba4, -0xdc8637a0, 0x16a7d3b1, 0x9fc393b7, 0xa7136eeb, 0xc6bcc63e, 0x1a513742, 0xef6828bc, 0x520365d6, -0x2d6a77ab, 0x3527ed4b, 0x821fd216, 0x095c6e2e, 0xdb92f2fb, 0x5eea29cb, 0x145892f5, 0x91584f7f, -0x5483697b, 0x2667a8cc, 0x85196048, 0x8c4bacea, 0x833860d4, 0x0d23e0f9, 0x6c387e8a, 0x0ae6d249, -0xb284600c, 0xd835731d, 0xdcb1c647, 0xac4c56ea, 0x3ebd81b3, 0x230eabb0, 0x6438bc87, 0xf0b5b1fa, -0x8f5ea2b3, 0xfc184642, 0x0a036b7a, 0x4fb089bd, 0x649da589, 0xa345415e, 0x5c038323, 0x3e5d3bb9, -0x43d79572, 0x7e6dd07c, 0x06dfdf1e, 0x6c6cc4ef, 0x7160a539, 0x73bfbe70, 0x83877605, 0x4523ecf1 -}, { -0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907, 0x47607fff, 0x369fe44b, 0x8c1fc644, 0xaececa90, -0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae, 0x920e8806, 0xf0ad0548, 0xe13c8d83, 0x927010d5, -0x11107d9f, 0x07647db9, 0xb2e3e4d4, 0x3d4f285e, 0xb9afa820, 0xfade82e0, 0xa067268b, 0x8272792e, -0x553fb2c0, 0x489ae22b, 0xd4ef9794, 0x125e3fbc, 0x21fffcee, 0x825b1bfd, 0x9255c5ed, 0x1257a240, -0x4e1a8302, 0xbae07fff, 0x528246e7, 0x8e57140e, 0x3373f7bf, 0x8c9f8188, 0xa6fc4ee8, 0xc982b5a5, -0xa8c01db7, 0x579fc264, 0x67094f31, 0xf2bd3f5f, 0x40fff7c1, 0x1fb78dfc, 0x8e6bd2c1, 0x437be59b, -0x99b03dbf, 0xb5dbc64b, 0x638dc0e6, 0x55819d99, 0xa197c81c, 0x4a012d6e, 0xc5884a28, 0xccc36f71, -0xb843c213, 0x6c0743f1, 0x8309893c, 0x0feddd5f, 0x2f7fe850, 0xd7c07f7e, 0x02507fbf, 0x5afb9a04, -0xa747d2d0, 0x1651192e, 0xaf70bf3e, 0x58c31380, 0x5f98302e, 0x727cc3c4, 0x0a0fb402, 0x0f7fef82, -0x8c96fdad, 0x5d2c2aae, 0x8ee99a49, 0x50da88b8, 0x8427f4a0, 0x1eac5790, 0x796fb449, 0x8252dc15, -0xefbd7d9b, 0xa672597d, 0xada840d8, 0x45f54504, 0xfa5d7403, 0xe83ec305, 0x4f91751a, 0x925669c2, -0x23efe941, 0xa903f12e, 0x60270df2, 0x0276e4b6, 0x94fd6574, 0x927985b2, 0x8276dbcb, 0x02778176, -0xf8af918d, 0x4e48f79e, 0x8f616ddf, 0xe29d840e, 0x842f7d83, 0x340ce5c8, 0x96bbb682, 0x93b4b148, -0xef303cab, 0x984faf28, 0x779faf9b, 0x92dc560d, 0x224d1e20, 0x8437aa88, 0x7d29dc96, 0x2756d3dc, -0x8b907cee, 0xb51fd240, 0xe7c07ce3, 0xe566b4a1, 0xc3e9615e, 0x3cf8209d, 0x6094d1e3, 0xcd9ca341, -0x5c76460e, 0x00ea983b, 0xd4d67881, 0xfd47572c, 0xf76cedd9, 0xbda8229c, 0x127dadaa, 0x438a074e, -0x1f97c090, 0x081bdb8a, 0x93a07ebe, 0xb938ca15, 0x97b03cff, 0x3dc2c0f8, 0x8d1ab2ec, 0x64380e51, -0x68cc7bfb, 0xd90f2788, 0x12490181, 0x5de5ffd4, 0xdd7ef86a, 0x76a2e214, 0xb9a40368, 0x925d958f, -0x4b39fffa, 0xba39aee9, 0xa4ffd30b, 0xfaf7933b, 0x6d498623, 0x193cbcfa, 0x27627545, 0x825cf47a, -0x61bd8ba0, 0xd11e42d1, 0xcead04f4, 0x127ea392, 0x10428db7, 0x8272a972, 0x9270c4a8, 0x127de50b, -0x285ba1c8, 0x3c62f44f, 0x35c0eaa5, 0xe805d231, 0x428929fb, 0xb4fcdf82, 0x4fb66a53, 0x0e7dc15b, -0x1f081fab, 0x108618ae, 0xfcfd086d, 0xf9ff2889, 0x694bcc11, 0x236a5cae, 0x12deca4d, 0x2c3f8cc5, -0xd2d02dfe, 0xf8ef5896, 0xe4cf52da, 0x95155b67, 0x494a488c, 0xb9b6a80c, 0x5c8f82bc, 0x89d36b45, -0x3a609437, 0xec00c9a9, 0x44715253, 0x0a874b49, 0xd773bc40, 0x7c34671c, 0x02717ef6, 0x4feb5536, -0xa2d02fff, 0xd2bf60c4, 0xd43f03c0, 0x50b4ef6d, 0x07478cd1, 0x006e1888, 0xa2e53f55, 0xb9e6d4bc, -0xa2048016, 0x97573833, 0xd7207d67, 0xde0f8f3d, 0x72f87b33, 0xabcc4f33, 0x7688c55d, 0x7b00a6b0, -0x947b0001, 0x570075d2, 0xf9bb88f8, 0x8942019e, 0x4264a5ff, 0x856302e0, 0x72dbd92b, 0xee971b69, -0x6ea22fde, 0x5f08ae2b, 0xaf7a616d, 0xe5c98767, 0xcf1febd2, 0x61efc8c2, 0xf1ac2571, 0xcc8239c2, -0x67214cb8, 0xb1e583d1, 0xb7dc3e62, 0x7f10bdce, 0xf90a5c38, 0x0ff0443d, 0x606e6dc6, 0x60543a49, -0x5727c148, 0x2be98a1d, 0x8ab41738, 0x20e1be24, 0xaf96da0f, 0x68458425, 0x99833be5, 0x600d457d, -0x282f9350, 0x8334b362, 0xd91d1120, 0x2b6d8da0, 0x642b1e31, 0x9c305a00, 0x52bce688, 0x1b03588a, -0xf7baefd5, 0x4142ed9c, 0xa4315c11, 0x83323ec5, 0xdfef4636, 0xa133c501, 0xe9d3531c, 0xee353783 -}, { -0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298, 0x4a4f7bdb, 0x64ad8c57, 0x85510443, 0xfa020ed1, -0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120, 0xfd059d43, 0x6497b7b1, 0xf3641f63, 0x241e4adf, -0x28147f5f, 0x4fa2b8cd, 0xc9430040, 0x0cc32220, 0xfdd30b30, 0xc0a5374f, 0x1d2d00d9, 0x24147b15, -0xee4d111a, 0x0fca5167, 0x71ff904c, 0x2d195ffe, 0x1a05645f, 0x0c13fefe, 0x081b08ca, 0x05170121, -0x80530100, 0xe83e5efe, 0xac9af4f8, 0x7fe72701, 0xd2b8ee5f, 0x06df4261, 0xbb9e9b8a, 0x7293ea25, -0xce84ffdf, 0xf5718801, 0x3dd64b04, 0xa26f263b, 0x7ed48400, 0x547eebe6, 0x446d4ca0, 0x6cf3d6f5, -0x2649abdf, 0xaea0c7f5, 0x36338cc1, 0x503f7e93, 0xd3772061, 0x11b638e1, 0x72500e03, 0xf80eb2bb, -0xabe0502e, 0xec8d77de, 0x57971e81, 0xe14f6746, 0xc9335400, 0x6920318f, 0x081dbb99, 0xffc304a5, -0x4d351805, 0x7f3d5ce3, 0xa6c866c6, 0x5d5bcca9, 0xdaec6fea, 0x9f926f91, 0x9f46222f, 0x3991467d, -0xa5bf6d8e, 0x1143c44f, 0x43958302, 0xd0214eeb, 0x022083b8, 0x3fb6180c, 0x18f8931e, 0x281658e6, -0x26486e3e, 0x8bd78a70, 0x7477e4c1, 0xb506e07c, 0xf32d0a25, 0x79098b02, 0xe4eabb81, 0x28123b23, -0x69dead38, 0x1574ca16, 0xdf871b62, 0x211c40b7, 0xa51a9ef9, 0x0014377b, 0x041e8ac8, 0x09114003, -0xbd59e4d2, 0xe3d156d5, 0x4fe876d5, 0x2f91a340, 0x557be8de, 0x00eae4a7, 0x0ce5c2ec, 0x4db4bba6, -0xe756bdff, 0xdd3369ac, 0xec17b035, 0x06572327, 0x99afc8b0, 0x56c8c391, 0x6b65811c, 0x5e146119, -0x6e85cb75, 0xbe07c002, 0xc2325577, 0x893ff4ec, 0x5bbfc92d, 0xd0ec3b25, 0xb7801ab7, 0x8d6d3b24, -0x20c763ef, 0xc366a5fc, 0x9c382880, 0x0ace3205, 0xaac9548a, 0xeca1d7c7, 0x041afa32, 0x1d16625a, -0x6701902c, 0x9b757a54, 0x31d477f7, 0x9126b031, 0x36cc6fdb, 0xc70b8b46, 0xd9e66a48, 0x56e55a79, -0x026a4ceb, 0x52437eff, 0x2f8f76b4, 0x0df980a5, 0x8674cde3, 0xedda04eb, 0x17a9be04, 0x2c18f4df, -0xb7747f9d, 0xab2af7b4, 0xefc34d20, 0x2e096b7c, 0x1741a254, 0xe5b6a035, 0x213d42f6, 0x2c1c7c26, -0x61c2f50f, 0x6552daf9, 0xd2c231f8, 0x25130f69, 0xd8167fa2, 0x0418f2c8, 0x001a96a6, 0x0d1526ab, -0x63315c21, 0x5e0a72ec, 0x49bafefd, 0x187908d9, 0x8d0dbd86, 0x311170a7, 0x3e9b640c, 0xcc3e10d7, -0xd5cad3b6, 0x0caec388, 0xf73001e1, 0x6c728aff, 0x71eae2a1, 0x1f9af36e, 0xcfcbd12f, 0xc1de8417, -0xac07be6b, 0xcb44a1d8, 0x8b9b0f56, 0x013988c3, 0xb1c52fca, 0xb4be31cd, 0xd8782806, 0x12a3a4e2, -0x6f7de532, 0x58fd7eb6, 0xd01ee900, 0x24adffc2, 0xf4990fc5, 0x9711aac5, 0x001d7b95, 0x82e5e7d2, -0x109873f6, 0x00613096, 0xc32d9521, 0xada121ff, 0x29908415, 0x7fbb977f, 0xaf9eb3db, 0x29c9ed2a, -0x5ce2a465, 0xa730f32c, 0xd0aa3fe8, 0x8a5cc091, 0xd49e2ce7, 0x0ce454a9, 0xd60acd86, 0x015f1919, -0x77079103, 0xdea03af6, 0x78a8565e, 0xdee356df, 0x21f05cbe, 0x8b75e387, 0xb3c50651, 0xb8a5c3ef, -0xd8eeb6d2, 0xe523be77, 0xc2154529, 0x2f69efdf, 0xafe67afb, 0xf470c4b2, 0xf3e0eb5b, 0xd6cc9876, -0x39e4460c, 0x1fda8538, 0x1987832f, 0xca007367, 0xa99144f8, 0x296b299e, 0x492fc295, 0x9266beab, -0xb5676e69, 0x9bd3ddda, 0xdf7e052f, 0xdb25701c, 0x1b5e51ee, 0xf65324e6, 0x6afce36c, 0x0316cc04, -0x8644213e, 0xb7dc59d0, 0x7965291f, 0xccd6fd43, 0x41823979, 0x932bcdf6, 0xb657c34d, 0x4edfd282, -0x7ae5290c, 0x3cb9536b, 0x851e20fe, 0x9833557e, 0x13ecf0b0, 0xd3ffb372, 0x3f85c5c1, 0x0aef7ed2 -} }; -static const u32 s5[256] = { -0x7ec90c04, 0x2c6e74b9, 0x9b0e66df, 0xa6337911, 0xb86a7fff, 0x1dd358f5, 0x44dd9d44, 0x1731167f, -0x08fbf1fa, 0xe7f511cc, 0xd2051b00, 0x735aba00, 0x2ab722d8, 0x386381cb, 0xacf6243a, 0x69befd7a, -0xe6a2e77f, 0xf0c720cd, 0xc4494816, 0xccf5c180, 0x38851640, 0x15b0a848, 0xe68b18cb, 0x4caadeff, -0x5f480a01, 0x0412b2aa, 0x259814fc, 0x41d0efe2, 0x4e40b48d, 0x248eb6fb, 0x8dba1cfe, 0x41a99b02, -0x1a550a04, 0xba8f65cb, 0x7251f4e7, 0x95a51725, 0xc106ecd7, 0x97a5980a, 0xc539b9aa, 0x4d79fe6a, -0xf2f3f763, 0x68af8040, 0xed0c9e56, 0x11b4958b, 0xe1eb5a88, 0x8709e6b0, 0xd7e07156, 0x4e29fea7, -0x6366e52d, 0x02d1c000, 0xc4ac8e05, 0x9377f571, 0x0c05372a, 0x578535f2, 0x2261be02, 0xd642a0c9, -0xdf13a280, 0x74b55bd2, 0x682199c0, 0xd421e5ec, 0x53fb3ce8, 0xc8adedb3, 0x28a87fc9, 0x3d959981, -0x5c1ff900, 0xfe38d399, 0x0c4eff0b, 0x062407ea, 0xaa2f4fb1, 0x4fb96976, 0x90c79505, 0xb0a8a774, -0xef55a1ff, 0xe59ca2c2, 0xa6b62d27, 0xe66a4263, 0xdf65001f, 0x0ec50966, 0xdfdd55bc, 0x29de0655, -0x911e739a, 0x17af8975, 0x32c7911c, 0x89f89468, 0x0d01e980, 0x524755f4, 0x03b63cc9, 0x0cc844b2, -0xbcf3f0aa, 0x87ac36e9, 0xe53a7426, 0x01b3d82b, 0x1a9e7449, 0x64ee2d7e, 0xcddbb1da, 0x01c94910, -0xb868bf80, 0x0d26f3fd, 0x9342ede7, 0x04a5c284, 0x636737b6, 0x50f5b616, 0xf24766e3, 0x8eca36c1, -0x136e05db, 0xfef18391, 0xfb887a37, 0xd6e7f7d4, 0xc7fb7dc9, 0x3063fcdf, 0xb6f589de, 0xec2941da, -0x26e46695, 0xb7566419, 0xf654efc5, 0xd08d58b7, 0x48925401, 0xc1bacb7f, 0xe5ff550f, 0xb6083049, -0x5bb5d0e8, 0x87d72e5a, 0xab6a6ee1, 0x223a66ce, 0xc62bf3cd, 0x9e0885f9, 0x68cb3e47, 0x086c010f, -0xa21de820, 0xd18b69de, 0xf3f65777, 0xfa02c3f6, 0x407edac3, 0xcbb3d550, 0x1793084d, 0xb0d70eba, -0x0ab378d5, 0xd951fb0c, 0xded7da56, 0x4124bbe4, 0x94ca0b56, 0x0f5755d1, 0xe0e1e56e, 0x6184b5be, -0x580a249f, 0x94f74bc0, 0xe327888e, 0x9f7b5561, 0xc3dc0280, 0x05687715, 0x646c6bd7, 0x44904db3, -0x66b4f0a3, 0xc0f1648a, 0x697ed5af, 0x49e92ff6, 0x309e374f, 0x2cb6356a, 0x85808573, 0x4991f840, -0x76f0ae02, 0x083be84d, 0x28421c9a, 0x44489406, 0x736e4cb8, 0xc1092910, 0x8bc95fc6, 0x7d869cf4, -0x134f616f, 0x2e77118d, 0xb31b2be1, 0xaa90b472, 0x3ca5d717, 0x7d161bba, 0x9cad9010, 0xaf462ba2, -0x9fe459d2, 0x45d34559, 0xd9f2da13, 0xdbc65487, 0xf3e4f94e, 0x176d486f, 0x097c13ea, 0x631da5c7, -0x445f7382, 0x175683f4, 0xcdc66a97, 0x70be0288, 0xb3cdcf72, 0x6e5dd2f3, 0x20936079, 0x459b80a5, -0xbe60e2db, 0xa9c23101, 0xeba5315c, 0x224e42f2, 0x1c5c1572, 0xf6721b2c, 0x1ad2fff3, 0x8c25404e, -0x324ed72f, 0x4067b7fd, 0x0523138e, 0x5ca3bc78, 0xdc0fd66e, 0x75922283, 0x784d6b17, 0x58ebb16e, -0x44094f85, 0x3f481d87, 0xfcfeae7b, 0x77b5ff76, 0x8c2302bf, 0xaaf47556, 0x5f46b02a, 0x2b092801, -0x3d38f5f7, 0x0ca81f36, 0x52af4a8a, 0x66d5e7c0, 0xdf3b0874, 0x95055110, 0x1b5ad7a8, 0xf61ed5ad, -0x6cf6e479, 0x20758184, 0xd0cefa65, 0x88f7be58, 0x4a046826, 0x0ff6f8f3, 0xa09c7f70, 0x5346aba0, -0x5ce96c28, 0xe176eda3, 0x6bac307f, 0x376829d2, 0x85360fa9, 0x17e3fe2a, 0x24b79767, 0xf5a96b20, -0xd6cd2595, 0x68ff1ebf, 0x7555442c, 0xf19f06be, 0xf9e0659a, 0xeeb9491d, 0x34010718, 0xbb30cab8, -0xe822fe15, 0x88570983, 0x750e6249, 0xda627e55, 0x5e76ffa8, 0xb1534546, 0x6d47de08, 0xefe9e7d4 -}; -static const u32 s6[256] = { -0xf6fa8f9d, 0x2cac6ce1, 0x4ca34867, 0xe2337f7c, 0x95db08e7, 0x016843b4, 0xeced5cbc, 0x325553ac, -0xbf9f0960, 0xdfa1e2ed, 0x83f0579d, 0x63ed86b9, 0x1ab6a6b8, 0xde5ebe39, 0xf38ff732, 0x8989b138, -0x33f14961, 0xc01937bd, 0xf506c6da, 0xe4625e7e, 0xa308ea99, 0x4e23e33c, 0x79cbd7cc, 0x48a14367, -0xa3149619, 0xfec94bd5, 0xa114174a, 0xeaa01866, 0xa084db2d, 0x09a8486f, 0xa888614a, 0x2900af98, -0x01665991, 0xe1992863, 0xc8f30c60, 0x2e78ef3c, 0xd0d51932, 0xcf0fec14, 0xf7ca07d2, 0xd0a82072, -0xfd41197e, 0x9305a6b0, 0xe86be3da, 0x74bed3cd, 0x372da53c, 0x4c7f4448, 0xdab5d440, 0x6dba0ec3, -0x083919a7, 0x9fbaeed9, 0x49dbcfb0, 0x4e670c53, 0x5c3d9c01, 0x64bdb941, 0x2c0e636a, 0xba7dd9cd, -0xea6f7388, 0xe70bc762, 0x35f29adb, 0x5c4cdd8d, 0xf0d48d8c, 0xb88153e2, 0x08a19866, 0x1ae2eac8, -0x284caf89, 0xaa928223, 0x9334be53, 0x3b3a21bf, 0x16434be3, 0x9aea3906, 0xefe8c36e, 0xf890cdd9, -0x80226dae, 0xc340a4a3, 0xdf7e9c09, 0xa694a807, 0x5b7c5ecc, 0x221db3a6, 0x9a69a02f, 0x68818a54, -0xceb2296f, 0x53c0843a, 0xfe893655, 0x25bfe68a, 0xb4628abc, 0xcf222ebf, 0x25ac6f48, 0xa9a99387, -0x53bddb65, 0xe76ffbe7, 0xe967fd78, 0x0ba93563, 0x8e342bc1, 0xe8a11be9, 0x4980740d, 0xc8087dfc, -0x8de4bf99, 0xa11101a0, 0x7fd37975, 0xda5a26c0, 0xe81f994f, 0x9528cd89, 0xfd339fed, 0xb87834bf, -0x5f04456d, 0x22258698, 0xc9c4c83b, 0x2dc156be, 0x4f628daa, 0x57f55ec5, 0xe2220abe, 0xd2916ebf, -0x4ec75b95, 0x24f2c3c0, 0x42d15d99, 0xcd0d7fa0, 0x7b6e27ff, 0xa8dc8af0, 0x7345c106, 0xf41e232f, -0x35162386, 0xe6ea8926, 0x3333b094, 0x157ec6f2, 0x372b74af, 0x692573e4, 0xe9a9d848, 0xf3160289, -0x3a62ef1d, 0xa787e238, 0xf3a5f676, 0x74364853, 0x20951063, 0x4576698d, 0xb6fad407, 0x592af950, -0x36f73523, 0x4cfb6e87, 0x7da4cec0, 0x6c152daa, 0xcb0396a8, 0xc50dfe5d, 0xfcd707ab, 0x0921c42f, -0x89dff0bb, 0x5fe2be78, 0x448f4f33, 0x754613c9, 0x2b05d08d, 0x48b9d585, 0xdc049441, 0xc8098f9b, -0x7dede786, 0xc39a3373, 0x42410005, 0x6a091751, 0x0ef3c8a6, 0x890072d6, 0x28207682, 0xa9a9f7be, -0xbf32679d, 0xd45b5b75, 0xb353fd00, 0xcbb0e358, 0x830f220a, 0x1f8fb214, 0xd372cf08, 0xcc3c4a13, -0x8cf63166, 0x061c87be, 0x88c98f88, 0x6062e397, 0x47cf8e7a, 0xb6c85283, 0x3cc2acfb, 0x3fc06976, -0x4e8f0252, 0x64d8314d, 0xda3870e3, 0x1e665459, 0xc10908f0, 0x513021a5, 0x6c5b68b7, 0x822f8aa0, -0x3007cd3e, 0x74719eef, 0xdc872681, 0x073340d4, 0x7e432fd9, 0x0c5ec241, 0x8809286c, 0xf592d891, -0x08a930f6, 0x957ef305, 0xb7fbffbd, 0xc266e96f, 0x6fe4ac98, 0xb173ecc0, 0xbc60b42a, 0x953498da, -0xfba1ae12, 0x2d4bd736, 0x0f25faab, 0xa4f3fceb, 0xe2969123, 0x257f0c3d, 0x9348af49, 0x361400bc, -0xe8816f4a, 0x3814f200, 0xa3f94043, 0x9c7a54c2, 0xbc704f57, 0xda41e7f9, 0xc25ad33a, 0x54f4a084, -0xb17f5505, 0x59357cbe, 0xedbd15c8, 0x7f97c5ab, 0xba5ac7b5, 0xb6f6deaf, 0x3a479c3a, 0x5302da25, -0x653d7e6a, 0x54268d49, 0x51a477ea, 0x5017d55b, 0xd7d25d88, 0x44136c76, 0x0404a8c8, 0xb8e5a121, -0xb81a928a, 0x60ed5869, 0x97c55b96, 0xeaec991b, 0x29935913, 0x01fdb7f1, 0x088e8dfa, 0x9ab6f6f5, -0x3b4cbf9f, 0x4a5de3ab, 0xe6051d35, 0xa0e1d855, 0xd36b4cf1, 0xf544edeb, 0xb0e93524, 0xbebb8fbd, -0xa2d762cf, 0x49c92f54, 0x38b5f331, 0x7128a454, 0x48392905, 0xa65b1db8, 0x851c97bd, 0xd675cf2f -}; -static const u32 s7[256] = { -0x85e04019, 0x332bf567, 0x662dbfff, 0xcfc65693, 0x2a8d7f6f, 0xab9bc912, 0xde6008a1, 0x2028da1f, -0x0227bce7, 0x4d642916, 0x18fac300, 0x50f18b82, 0x2cb2cb11, 0xb232e75c, 0x4b3695f2, 0xb28707de, -0xa05fbcf6, 0xcd4181e9, 0xe150210c, 0xe24ef1bd, 0xb168c381, 0xfde4e789, 0x5c79b0d8, 0x1e8bfd43, -0x4d495001, 0x38be4341, 0x913cee1d, 0x92a79c3f, 0x089766be, 0xbaeeadf4, 0x1286becf, 0xb6eacb19, -0x2660c200, 0x7565bde4, 0x64241f7a, 0x8248dca9, 0xc3b3ad66, 0x28136086, 0x0bd8dfa8, 0x356d1cf2, -0x107789be, 0xb3b2e9ce, 0x0502aa8f, 0x0bc0351e, 0x166bf52a, 0xeb12ff82, 0xe3486911, 0xd34d7516, -0x4e7b3aff, 0x5f43671b, 0x9cf6e037, 0x4981ac83, 0x334266ce, 0x8c9341b7, 0xd0d854c0, 0xcb3a6c88, -0x47bc2829, 0x4725ba37, 0xa66ad22b, 0x7ad61f1e, 0x0c5cbafa, 0x4437f107, 0xb6e79962, 0x42d2d816, -0x0a961288, 0xe1a5c06e, 0x13749e67, 0x72fc081a, 0xb1d139f7, 0xf9583745, 0xcf19df58, 0xbec3f756, -0xc06eba30, 0x07211b24, 0x45c28829, 0xc95e317f, 0xbc8ec511, 0x38bc46e9, 0xc6e6fa14, 0xbae8584a, -0xad4ebc46, 0x468f508b, 0x7829435f, 0xf124183b, 0x821dba9f, 0xaff60ff4, 0xea2c4e6d, 0x16e39264, -0x92544a8b, 0x009b4fc3, 0xaba68ced, 0x9ac96f78, 0x06a5b79a, 0xb2856e6e, 0x1aec3ca9, 0xbe838688, -0x0e0804e9, 0x55f1be56, 0xe7e5363b, 0xb3a1f25d, 0xf7debb85, 0x61fe033c, 0x16746233, 0x3c034c28, -0xda6d0c74, 0x79aac56c, 0x3ce4e1ad, 0x51f0c802, 0x98f8f35a, 0x1626a49f, 0xeed82b29, 0x1d382fe3, -0x0c4fb99a, 0xbb325778, 0x3ec6d97b, 0x6e77a6a9, 0xcb658b5c, 0xd45230c7, 0x2bd1408b, 0x60c03eb7, -0xb9068d78, 0xa33754f4, 0xf430c87d, 0xc8a71302, 0xb96d8c32, 0xebd4e7be, 0xbe8b9d2d, 0x7979fb06, -0xe7225308, 0x8b75cf77, 0x11ef8da4, 0xe083c858, 0x8d6b786f, 0x5a6317a6, 0xfa5cf7a0, 0x5dda0033, -0xf28ebfb0, 0xf5b9c310, 0xa0eac280, 0x08b9767a, 0xa3d9d2b0, 0x79d34217, 0x021a718d, 0x9ac6336a, -0x2711fd60, 0x438050e3, 0x069908a8, 0x3d7fedc4, 0x826d2bef, 0x4eeb8476, 0x488dcf25, 0x36c9d566, -0x28e74e41, 0xc2610aca, 0x3d49a9cf, 0xbae3b9df, 0xb65f8de6, 0x92aeaf64, 0x3ac7d5e6, 0x9ea80509, -0xf22b017d, 0xa4173f70, 0xdd1e16c3, 0x15e0d7f9, 0x50b1b887, 0x2b9f4fd5, 0x625aba82, 0x6a017962, -0x2ec01b9c, 0x15488aa9, 0xd716e740, 0x40055a2c, 0x93d29a22, 0xe32dbf9a, 0x058745b9, 0x3453dc1e, -0xd699296e, 0x496cff6f, 0x1c9f4986, 0xdfe2ed07, 0xb87242d1, 0x19de7eae, 0x053e561a, 0x15ad6f8c, -0x66626c1c, 0x7154c24c, 0xea082b2a, 0x93eb2939, 0x17dcb0f0, 0x58d4f2ae, 0x9ea294fb, 0x52cf564c, -0x9883fe66, 0x2ec40581, 0x763953c3, 0x01d6692e, 0xd3a0c108, 0xa1e7160e, 0xe4f2dfa6, 0x693ed285, -0x74904698, 0x4c2b0edd, 0x4f757656, 0x5d393378, 0xa132234f, 0x3d321c5d, 0xc3f5e194, 0x4b269301, -0xc79f022f, 0x3c997e7e, 0x5e4f9504, 0x3ffafbbd, 0x76f7ad0e, 0x296693f4, 0x3d1fce6f, 0xc61e45be, -0xd3b5ab34, 0xf72bf9b7, 0x1b0434c0, 0x4e72b567, 0x5592a33d, 0xb5229301, 0xcfd2a87f, 0x60aeb767, -0x1814386b, 0x30bcc33d, 0x38a0c07d, 0xfd1606f2, 0xc363519b, 0x589dd390, 0x5479f8e6, 0x1cb8d647, -0x97fd61a9, 0xea7759f4, 0x2d57539d, 0x569a58cf, 0xe84e63ad, 0x462e1b78, 0x6580f87e, 0xf3817914, -0x91da55f4, 0x40a230f3, 0xd1988f35, 0xb6e318d2, 0x3ffa50bc, 0x3d40f021, 0xc3c0bdae, 0x4958c24c, -0x518f36b2, 0x84b1d370, 0x0fedce83, 0x878ddada, 0xf2a279c7, 0x94e01be8, 0x90716f4b, 0x954b8aa3 -}; -static const u32 s8[256] = { -0xe216300d, 0xbbddfffc, 0xa7ebdabd, 0x35648095, 0x7789f8b7, 0xe6c1121b, 0x0e241600, 0x052ce8b5, -0x11a9cfb0, 0xe5952f11, 0xece7990a, 0x9386d174, 0x2a42931c, 0x76e38111, 0xb12def3a, 0x37ddddfc, -0xde9adeb1, 0x0a0cc32c, 0xbe197029, 0x84a00940, 0xbb243a0f, 0xb4d137cf, 0xb44e79f0, 0x049eedfd, -0x0b15a15d, 0x480d3168, 0x8bbbde5a, 0x669ded42, 0xc7ece831, 0x3f8f95e7, 0x72df191b, 0x7580330d, -0x94074251, 0x5c7dcdfa, 0xabbe6d63, 0xaa402164, 0xb301d40a, 0x02e7d1ca, 0x53571dae, 0x7a3182a2, -0x12a8ddec, 0xfdaa335d, 0x176f43e8, 0x71fb46d4, 0x38129022, 0xce949ad4, 0xb84769ad, 0x965bd862, -0x82f3d055, 0x66fb9767, 0x15b80b4e, 0x1d5b47a0, 0x4cfde06f, 0xc28ec4b8, 0x57e8726e, 0x647a78fc, -0x99865d44, 0x608bd593, 0x6c200e03, 0x39dc5ff6, 0x5d0b00a3, 0xae63aff2, 0x7e8bd632, 0x70108c0c, -0xbbd35049, 0x2998df04, 0x980cf42a, 0x9b6df491, 0x9e7edd53, 0x06918548, 0x58cb7e07, 0x3b74ef2e, -0x522fffb1, 0xd24708cc, 0x1c7e27cd, 0xa4eb215b, 0x3cf1d2e2, 0x19b47a38, 0x424f7618, 0x35856039, -0x9d17dee7, 0x27eb35e6, 0xc9aff67b, 0x36baf5b8, 0x09c467cd, 0xc18910b1, 0xe11dbf7b, 0x06cd1af8, -0x7170c608, 0x2d5e3354, 0xd4de495a, 0x64c6d006, 0xbcc0c62c, 0x3dd00db3, 0x708f8f34, 0x77d51b42, -0x264f620f, 0x24b8d2bf, 0x15c1b79e, 0x46a52564, 0xf8d7e54e, 0x3e378160, 0x7895cda5, 0x859c15a5, -0xe6459788, 0xc37bc75f, 0xdb07ba0c, 0x0676a3ab, 0x7f229b1e, 0x31842e7b, 0x24259fd7, 0xf8bef472, -0x835ffcb8, 0x6df4c1f2, 0x96f5b195, 0xfd0af0fc, 0xb0fe134c, 0xe2506d3d, 0x4f9b12ea, 0xf215f225, -0xa223736f, 0x9fb4c428, 0x25d04979, 0x34c713f8, 0xc4618187, 0xea7a6e98, 0x7cd16efc, 0x1436876c, -0xf1544107, 0xbedeee14, 0x56e9af27, 0xa04aa441, 0x3cf7c899, 0x92ecbae6, 0xdd67016d, 0x151682eb, -0xa842eedf, 0xfdba60b4, 0xf1907b75, 0x20e3030f, 0x24d8c29e, 0xe139673b, 0xefa63fb8, 0x71873054, -0xb6f2cf3b, 0x9f326442, 0xcb15a4cc, 0xb01a4504, 0xf1e47d8d, 0x844a1be5, 0xbae7dfdc, 0x42cbda70, -0xcd7dae0a, 0x57e85b7a, 0xd53f5af6, 0x20cf4d8c, 0xcea4d428, 0x79d130a4, 0x3486ebfb, 0x33d3cddc, -0x77853b53, 0x37effcb5, 0xc5068778, 0xe580b3e6, 0x4e68b8f4, 0xc5c8b37e, 0x0d809ea2, 0x398feb7c, -0x132a4f94, 0x43b7950e, 0x2fee7d1c, 0x223613bd, 0xdd06caa2, 0x37df932b, 0xc4248289, 0xacf3ebc3, -0x5715f6b7, 0xef3478dd, 0xf267616f, 0xc148cbe4, 0x9052815e, 0x5e410fab, 0xb48a2465, 0x2eda7fa4, -0xe87b40e4, 0xe98ea084, 0x5889e9e1, 0xefd390fc, 0xdd07d35b, 0xdb485694, 0x38d7e5b2, 0x57720101, -0x730edebc, 0x5b643113, 0x94917e4f, 0x503c2fba, 0x646f1282, 0x7523d24a, 0xe0779695, 0xf9c17a8f, -0x7a5b2121, 0xd187b896, 0x29263a4d, 0xba510cdf, 0x81f47c9f, 0xad1163ed, 0xea7b5965, 0x1a00726e, -0x11403092, 0x00da6d77, 0x4a0cdd61, 0xad1f4603, 0x605bdfb0, 0x9eedc364, 0x22ebe6a8, 0xcee7d28a, -0xa0e736a0, 0x5564a6b9, 0x10853209, 0xc7eb8f37, 0x2de705ca, 0x8951570f, 0xdf09822b, 0xbd691a6c, -0xaa12e4f2, 0x87451c0f, 0xe0f6a27a, 0x3ada4819, 0x4cf1764f, 0x0d771c2b, 0x67cdb156, 0x350d8384, -0x5938fa0f, 0x42399ef3, 0x36997b07, 0x0e84093d, 0x4aa93e61, 0x8360d87b, 0x1fa98b0c, 0x1149382c, -0xe97625a5, 0x0614d1b7, 0x0e25244b, 0x0c768347, 0x589e8d82, 0x0d2059d1, 0xa466bb1e, 0xf8da0a82, -0x04f19130, 0xba6e4ec0, 0x99265164, 0x1ee7230d, 0x50b2ad80, 0xeaee6801, 0x8db2a283, 0xea8bf59e -}; - - -#ifdef USE_AMD64_ASM - -/* Assembly implementations of CAST5. */ -extern void _gcry_cast5_amd64_encrypt_block(CAST5_context *c, byte *outbuf, - const byte *inbuf); - -extern void _gcry_cast5_amd64_decrypt_block(CAST5_context *c, byte *outbuf, - const byte *inbuf); - -/* These assembly implementations process four blocks in parallel. */ -extern void _gcry_cast5_amd64_ctr_enc(CAST5_context *ctx, byte *out, - const byte *in, byte *ctr); - -extern void _gcry_cast5_amd64_cbc_dec(CAST5_context *ctx, byte *out, - const byte *in, byte *iv); - -extern void _gcry_cast5_amd64_cfb_dec(CAST5_context *ctx, byte *out, - const byte *in, byte *iv); - -static void -do_encrypt_block (CAST5_context *context, byte *outbuf, const byte *inbuf) -{ - _gcry_cast5_amd64_encrypt_block (context, outbuf, inbuf); -} - -static void -do_decrypt_block (CAST5_context *context, byte *outbuf, const byte *inbuf) -{ - _gcry_cast5_amd64_decrypt_block (context, outbuf, inbuf); -} - -static unsigned int -encrypt_block (void *context , byte *outbuf, const byte *inbuf) -{ - CAST5_context *c = (CAST5_context *) context; - do_encrypt_block (c, outbuf, inbuf); - return /*burn_stack*/ (2*8); -} - -static unsigned int -decrypt_block (void *context, byte *outbuf, const byte *inbuf) -{ - CAST5_context *c = (CAST5_context *) context; - _gcry_cast5_amd64_decrypt_block (c, outbuf, inbuf); - return /*burn_stack*/ (2*8); -} - -#elif defined(USE_ARM_ASM) - -/* ARM assembly implementations of CAST5. */ -extern void _gcry_cast5_arm_encrypt_block(CAST5_context *c, byte *outbuf, - const byte *inbuf); - -extern void _gcry_cast5_arm_decrypt_block(CAST5_context *c, byte *outbuf, - const byte *inbuf); - -/* These assembly implementations process two blocks in parallel. */ -extern void _gcry_cast5_arm_ctr_enc(CAST5_context *ctx, byte *out, - const byte *in, byte *ctr); - -extern void _gcry_cast5_arm_cbc_dec(CAST5_context *ctx, byte *out, - const byte *in, byte *iv); - -extern void _gcry_cast5_arm_cfb_dec(CAST5_context *ctx, byte *out, - const byte *in, byte *iv); - -static void -do_encrypt_block (CAST5_context *context, byte *outbuf, const byte *inbuf) -{ - _gcry_cast5_arm_encrypt_block (context, outbuf, inbuf); -} - -static void -do_decrypt_block (CAST5_context *context, byte *outbuf, const byte *inbuf) -{ - _gcry_cast5_arm_decrypt_block (context, outbuf, inbuf); -} - -static unsigned int -encrypt_block (void *context , byte *outbuf, const byte *inbuf) -{ - CAST5_context *c = (CAST5_context *) context; - do_encrypt_block (c, outbuf, inbuf); - return /*burn_stack*/ (10*4); -} - -static unsigned int -decrypt_block (void *context, byte *outbuf, const byte *inbuf) -{ - CAST5_context *c = (CAST5_context *) context; - do_decrypt_block (c, outbuf, inbuf); - return /*burn_stack*/ (10*4); -} - -#else /*USE_ARM_ASM*/ - -#define F1(D,m,r) ( (I = ((m) + (D))), (I=rol(I,(r))), \ - (((s1[I >> 24] ^ s2[(I>>16)&0xff]) - s3[(I>>8)&0xff]) + s4[I&0xff]) ) -#define F2(D,m,r) ( (I = ((m) ^ (D))), (I=rol(I,(r))), \ - (((s1[I >> 24] - s2[(I>>16)&0xff]) + s3[(I>>8)&0xff]) ^ s4[I&0xff]) ) -#define F3(D,m,r) ( (I = ((m) - (D))), (I=rol(I,(r))), \ - (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]) ) - -static void -do_encrypt_block( CAST5_context *c, byte *outbuf, const byte *inbuf ) -{ - u32 l, r, t; - u32 I; /* used by the Fx macros */ - u32 *Km; - byte *Kr; - - Km = c->Km; - Kr = c->Kr; - - /* (L0,R0) <-- (m1...m64). (Split the plaintext into left and - * right 32-bit halves L0 = m1...m32 and R0 = m33...m64.) - */ - l = buf_get_be32(inbuf + 0); - r = buf_get_be32(inbuf + 4); - - /* (16 rounds) for i from 1 to 16, compute Li and Ri as follows: - * Li = Ri-1; - * Ri = Li-1 ^ f(Ri-1,Kmi,Kri), where f is defined in Section 2.2 - * Rounds 1, 4, 7, 10, 13, and 16 use f function Type 1. - * Rounds 2, 5, 8, 11, and 14 use f function Type 2. - * Rounds 3, 6, 9, 12, and 15 use f function Type 3. - */ - - t = l; l = r; r = t ^ F1(r, Km[ 0], Kr[ 0]); - t = l; l = r; r = t ^ F2(r, Km[ 1], Kr[ 1]); - t = l; l = r; r = t ^ F3(r, Km[ 2], Kr[ 2]); - t = l; l = r; r = t ^ F1(r, Km[ 3], Kr[ 3]); - t = l; l = r; r = t ^ F2(r, Km[ 4], Kr[ 4]); - t = l; l = r; r = t ^ F3(r, Km[ 5], Kr[ 5]); - t = l; l = r; r = t ^ F1(r, Km[ 6], Kr[ 6]); - t = l; l = r; r = t ^ F2(r, Km[ 7], Kr[ 7]); - t = l; l = r; r = t ^ F3(r, Km[ 8], Kr[ 8]); - t = l; l = r; r = t ^ F1(r, Km[ 9], Kr[ 9]); - t = l; l = r; r = t ^ F2(r, Km[10], Kr[10]); - t = l; l = r; r = t ^ F3(r, Km[11], Kr[11]); - t = l; l = r; r = t ^ F1(r, Km[12], Kr[12]); - t = l; l = r; r = t ^ F2(r, Km[13], Kr[13]); - t = l; l = r; r = t ^ F3(r, Km[14], Kr[14]); - t = l; l = r; r = t ^ F1(r, Km[15], Kr[15]); - - /* c1...c64 <-- (R16,L16). (Exchange final blocks L16, R16 and - * concatenate to form the ciphertext.) */ - buf_put_be32(outbuf + 0, r); - buf_put_be32(outbuf + 4, l); -} - -static unsigned int -encrypt_block (void *context , byte *outbuf, const byte *inbuf) -{ - CAST5_context *c = (CAST5_context *) context; - do_encrypt_block (c, outbuf, inbuf); - return /*burn_stack*/ (20+4*sizeof(void*)); -} - - -static void -do_decrypt_block (CAST5_context *c, byte *outbuf, const byte *inbuf ) -{ - u32 l, r, t; - u32 I; - u32 *Km; - byte *Kr; - - Km = c->Km; - Kr = c->Kr; - - l = buf_get_be32(inbuf + 0); - r = buf_get_be32(inbuf + 4); - - t = l; l = r; r = t ^ F1(r, Km[15], Kr[15]); - t = l; l = r; r = t ^ F3(r, Km[14], Kr[14]); - t = l; l = r; r = t ^ F2(r, Km[13], Kr[13]); - t = l; l = r; r = t ^ F1(r, Km[12], Kr[12]); - t = l; l = r; r = t ^ F3(r, Km[11], Kr[11]); - t = l; l = r; r = t ^ F2(r, Km[10], Kr[10]); - t = l; l = r; r = t ^ F1(r, Km[ 9], Kr[ 9]); - t = l; l = r; r = t ^ F3(r, Km[ 8], Kr[ 8]); - t = l; l = r; r = t ^ F2(r, Km[ 7], Kr[ 7]); - t = l; l = r; r = t ^ F1(r, Km[ 6], Kr[ 6]); - t = l; l = r; r = t ^ F3(r, Km[ 5], Kr[ 5]); - t = l; l = r; r = t ^ F2(r, Km[ 4], Kr[ 4]); - t = l; l = r; r = t ^ F1(r, Km[ 3], Kr[ 3]); - t = l; l = r; r = t ^ F3(r, Km[ 2], Kr[ 2]); - t = l; l = r; r = t ^ F2(r, Km[ 1], Kr[ 1]); - t = l; l = r; r = t ^ F1(r, Km[ 0], Kr[ 0]); - - buf_put_be32(outbuf + 0, r); - buf_put_be32(outbuf + 4, l); -} - -static unsigned int -decrypt_block (void *context, byte *outbuf, const byte *inbuf) -{ - CAST5_context *c = (CAST5_context *) context; - do_decrypt_block (c, outbuf, inbuf); - return /*burn_stack*/ (20+4*sizeof(void*)); -} - -#endif /*!USE_ARM_ASM*/ - - -/* Bulk encryption of complete blocks in CTR mode. This function is only - intended for the bulk encryption feature of cipher.c. CTR is expected to be - of size CAST5_BLOCKSIZE. */ -void -_gcry_cast5_ctr_enc(void *context, unsigned char *ctr, void *outbuf_arg, - const void *inbuf_arg, size_t nblocks) -{ - CAST5_context *ctx = context; - unsigned char *outbuf = outbuf_arg; - const unsigned char *inbuf = inbuf_arg; - unsigned char tmpbuf[CAST5_BLOCKSIZE]; - int burn_stack_depth = (20 + 4 * sizeof(void*)) + 2 * CAST5_BLOCKSIZE; - - int i; - -#ifdef USE_AMD64_ASM - { - if (nblocks >= 4) - burn_stack_depth += 8 * sizeof(void*); - - /* Process data in 4 block chunks. */ - while (nblocks >= 4) - { - _gcry_cast5_amd64_ctr_enc(ctx, outbuf, inbuf, ctr); - - nblocks -= 4; - outbuf += 4 * CAST5_BLOCKSIZE; - inbuf += 4 * CAST5_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - /* TODO: use caching instead? */ - } -#elif defined(USE_ARM_ASM) - { - /* Process data in 2 block chunks. */ - while (nblocks >= 2) - { - _gcry_cast5_arm_ctr_enc(ctx, outbuf, inbuf, ctr); - - nblocks -= 2; - outbuf += 2 * CAST5_BLOCKSIZE; - inbuf += 2 * CAST5_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - /* TODO: use caching instead? */ - } -#endif - - for ( ;nblocks; nblocks-- ) - { - /* Encrypt the counter. */ - do_encrypt_block(ctx, tmpbuf, ctr); - /* XOR the input with the encrypted counter and store in output. */ - buf_xor(outbuf, tmpbuf, inbuf, CAST5_BLOCKSIZE); - outbuf += CAST5_BLOCKSIZE; - inbuf += CAST5_BLOCKSIZE; - /* Increment the counter. */ - for (i = CAST5_BLOCKSIZE; i > 0; i--) - { - ctr[i-1]++; - if (ctr[i-1]) - break; - } - } - - wipememory(tmpbuf, sizeof(tmpbuf)); - _gcry_burn_stack(burn_stack_depth); -} - - -/* Bulk decryption of complete blocks in CBC mode. This function is only - intended for the bulk encryption feature of cipher.c. */ -void -_gcry_cast5_cbc_dec(void *context, unsigned char *iv, void *outbuf_arg, - const void *inbuf_arg, size_t nblocks) -{ - CAST5_context *ctx = context; - unsigned char *outbuf = outbuf_arg; - const unsigned char *inbuf = inbuf_arg; - unsigned char savebuf[CAST5_BLOCKSIZE]; - int burn_stack_depth = (20 + 4 * sizeof(void*)) + 2 * CAST5_BLOCKSIZE; - -#ifdef USE_AMD64_ASM - { - if (nblocks >= 4) - burn_stack_depth += 8 * sizeof(void*); - - /* Process data in 4 block chunks. */ - while (nblocks >= 4) - { - _gcry_cast5_amd64_cbc_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 4; - outbuf += 4 * CAST5_BLOCKSIZE; - inbuf += 4 * CAST5_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - } -#elif defined(USE_ARM_ASM) - { - /* Process data in 2 block chunks. */ - while (nblocks >= 2) - { - _gcry_cast5_arm_cbc_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 2; - outbuf += 2 * CAST5_BLOCKSIZE; - inbuf += 2 * CAST5_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - } -#endif - - for ( ;nblocks; nblocks-- ) - { - /* INBUF is needed later and it may be identical to OUTBUF, so store - the intermediate result to SAVEBUF. */ - do_decrypt_block (ctx, savebuf, inbuf); - - buf_xor_n_copy_2(outbuf, savebuf, iv, inbuf, CAST5_BLOCKSIZE); - inbuf += CAST5_BLOCKSIZE; - outbuf += CAST5_BLOCKSIZE; - } - - wipememory(savebuf, sizeof(savebuf)); - _gcry_burn_stack(burn_stack_depth); -} - -/* Bulk decryption of complete blocks in CFB mode. This function is only - intended for the bulk encryption feature of cipher.c. */ -void -_gcry_cast5_cfb_dec(void *context, unsigned char *iv, void *outbuf_arg, - const void *inbuf_arg, size_t nblocks) -{ - CAST5_context *ctx = context; - unsigned char *outbuf = outbuf_arg; - const unsigned char *inbuf = inbuf_arg; - int burn_stack_depth = (20 + 4 * sizeof(void*)) + 2 * CAST5_BLOCKSIZE; - -#ifdef USE_AMD64_ASM - { - if (nblocks >= 4) - burn_stack_depth += 8 * sizeof(void*); - - /* Process data in 4 block chunks. */ - while (nblocks >= 4) - { - _gcry_cast5_amd64_cfb_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 4; - outbuf += 4 * CAST5_BLOCKSIZE; - inbuf += 4 * CAST5_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - } -#elif defined(USE_ARM_ASM) - { - /* Process data in 2 block chunks. */ - while (nblocks >= 2) - { - _gcry_cast5_arm_cfb_dec(ctx, outbuf, inbuf, iv); - - nblocks -= 2; - outbuf += 2 * CAST5_BLOCKSIZE; - inbuf += 2 * CAST5_BLOCKSIZE; - } - - /* Use generic code to handle smaller chunks... */ - } -#endif - - for ( ;nblocks; nblocks-- ) - { - do_encrypt_block(ctx, iv, iv); - buf_xor_n_copy(outbuf, iv, inbuf, CAST5_BLOCKSIZE); - outbuf += CAST5_BLOCKSIZE; - inbuf += CAST5_BLOCKSIZE; - } - - _gcry_burn_stack(burn_stack_depth); -} - - -/* Run the self-tests for CAST5-CTR, tests IV increment of bulk CTR - encryption. Returns NULL on success. */ -static const char * -selftest_ctr (void) -{ - const int nblocks = 4+1; - const int blocksize = CAST5_BLOCKSIZE; - const int context_size = sizeof(CAST5_context); - - return _gcry_selftest_helper_ctr("CAST5", &cast_setkey, - &encrypt_block, &_gcry_cast5_ctr_enc, nblocks, blocksize, - context_size); -} - - -/* Run the self-tests for CAST5-CBC, tests bulk CBC decryption. - Returns NULL on success. */ -static const char * -selftest_cbc (void) -{ - const int nblocks = 4+2; - const int blocksize = CAST5_BLOCKSIZE; - const int context_size = sizeof(CAST5_context); - - return _gcry_selftest_helper_cbc("CAST5", &cast_setkey, - &encrypt_block, &_gcry_cast5_cbc_dec, nblocks, blocksize, - context_size); -} - - -/* Run the self-tests for CAST5-CFB, tests bulk CBC decryption. - Returns NULL on success. */ -static const char * -selftest_cfb (void) -{ - const int nblocks = 4+2; - const int blocksize = CAST5_BLOCKSIZE; - const int context_size = sizeof(CAST5_context); - - return _gcry_selftest_helper_cfb("CAST5", &cast_setkey, - &encrypt_block, &_gcry_cast5_cfb_dec, nblocks, blocksize, - context_size); -} - - -static const char* -selftest(void) -{ - CAST5_context c; - static const byte key[16] = - { 0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78, - 0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, 0x9A }; - static const byte plain[8] = - { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF }; - static const byte cipher[8] = - { 0x23, 0x8B, 0x4F, 0xE5, 0x84, 0x7E, 0x44, 0xB2 }; - byte buffer[8]; - const char *r; - - cast_setkey( &c, key, 16 ); - encrypt_block( &c, buffer, plain ); - if( memcmp( buffer, cipher, 8 ) ) - return "1"; - decrypt_block( &c, buffer, buffer ); - if( memcmp( buffer, plain, 8 ) ) - return "2"; - -#if 0 /* full maintenance test */ - { - int i; - byte a0[16] = { 0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78, - 0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A }; - byte b0[16] = { 0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78, - 0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A }; - byte a1[16] = { 0xEE,0xA9,0xD0,0xA2,0x49,0xFD,0x3B,0xA6, - 0xB3,0x43,0x6F,0xB8,0x9D,0x6D,0xCA,0x92 }; - byte b1[16] = { 0xB2,0xC9,0x5E,0xB0,0x0C,0x31,0xAD,0x71, - 0x80,0xAC,0x05,0xB8,0xE8,0x3D,0x69,0x6E }; - - for(i=0; i < 1000000; i++ ) { - cast_setkey( &c, b0, 16 ); - encrypt_block( &c, a0, a0 ); - encrypt_block( &c, a0+8, a0+8 ); - cast_setkey( &c, a0, 16 ); - encrypt_block( &c, b0, b0 ); - encrypt_block( &c, b0+8, b0+8 ); - } - if( memcmp( a0, a1, 16 ) || memcmp( b0, b1, 16 ) ) - return "3"; - - } -#endif - - if ( (r = selftest_cbc ()) ) - return r; - - if ( (r = selftest_cfb ()) ) - return r; - - if ( (r = selftest_ctr ()) ) - return r; - - return NULL; -} - - -static void -key_schedule( u32 *x, u32 *z, u32 *k ) -{ - -#define xi(i) ((x[(i)/4] >> (8*(3-((i)%4)))) & 0xff) -#define zi(i) ((z[(i)/4] >> (8*(3-((i)%4)))) & 0xff) - - z[0] = x[0] ^ s5[xi(13)]^s6[xi(15)]^s7[xi(12)]^s8[xi(14)]^s7[xi( 8)]; - z[1] = x[2] ^ s5[zi( 0)]^s6[zi( 2)]^s7[zi( 1)]^s8[zi( 3)]^s8[xi(10)]; - z[2] = x[3] ^ s5[zi( 7)]^s6[zi( 6)]^s7[zi( 5)]^s8[zi( 4)]^s5[xi( 9)]; - z[3] = x[1] ^ s5[zi(10)]^s6[zi( 9)]^s7[zi(11)]^s8[zi( 8)]^s6[xi(11)]; - k[0] = s5[zi( 8)]^s6[zi( 9)]^s7[zi( 7)]^s8[zi( 6)]^s5[zi( 2)]; - k[1] = s5[zi(10)]^s6[zi(11)]^s7[zi( 5)]^s8[zi( 4)]^s6[zi( 6)]; - k[2] = s5[zi(12)]^s6[zi(13)]^s7[zi( 3)]^s8[zi( 2)]^s7[zi( 9)]; - k[3] = s5[zi(14)]^s6[zi(15)]^s7[zi( 1)]^s8[zi( 0)]^s8[zi(12)]; - - x[0] = z[2] ^ s5[zi( 5)]^s6[zi( 7)]^s7[zi( 4)]^s8[zi( 6)]^s7[zi( 0)]; - x[1] = z[0] ^ s5[xi( 0)]^s6[xi( 2)]^s7[xi( 1)]^s8[xi( 3)]^s8[zi( 2)]; - x[2] = z[1] ^ s5[xi( 7)]^s6[xi( 6)]^s7[xi( 5)]^s8[xi( 4)]^s5[zi( 1)]; - x[3] = z[3] ^ s5[xi(10)]^s6[xi( 9)]^s7[xi(11)]^s8[xi( 8)]^s6[zi( 3)]; - k[4] = s5[xi( 3)]^s6[xi( 2)]^s7[xi(12)]^s8[xi(13)]^s5[xi( 8)]; - k[5] = s5[xi( 1)]^s6[xi( 0)]^s7[xi(14)]^s8[xi(15)]^s6[xi(13)]; - k[6] = s5[xi( 7)]^s6[xi( 6)]^s7[xi( 8)]^s8[xi( 9)]^s7[xi( 3)]; - k[7] = s5[xi( 5)]^s6[xi( 4)]^s7[xi(10)]^s8[xi(11)]^s8[xi( 7)]; - - z[0] = x[0] ^ s5[xi(13)]^s6[xi(15)]^s7[xi(12)]^s8[xi(14)]^s7[xi( 8)]; - z[1] = x[2] ^ s5[zi( 0)]^s6[zi( 2)]^s7[zi( 1)]^s8[zi( 3)]^s8[xi(10)]; - z[2] = x[3] ^ s5[zi( 7)]^s6[zi( 6)]^s7[zi( 5)]^s8[zi( 4)]^s5[xi( 9)]; - z[3] = x[1] ^ s5[zi(10)]^s6[zi( 9)]^s7[zi(11)]^s8[zi( 8)]^s6[xi(11)]; - k[8] = s5[zi( 3)]^s6[zi( 2)]^s7[zi(12)]^s8[zi(13)]^s5[zi( 9)]; - k[9] = s5[zi( 1)]^s6[zi( 0)]^s7[zi(14)]^s8[zi(15)]^s6[zi(12)]; - k[10]= s5[zi( 7)]^s6[zi( 6)]^s7[zi( 8)]^s8[zi( 9)]^s7[zi( 2)]; - k[11]= s5[zi( 5)]^s6[zi( 4)]^s7[zi(10)]^s8[zi(11)]^s8[zi( 6)]; - - x[0] = z[2] ^ s5[zi( 5)]^s6[zi( 7)]^s7[zi( 4)]^s8[zi( 6)]^s7[zi( 0)]; - x[1] = z[0] ^ s5[xi( 0)]^s6[xi( 2)]^s7[xi( 1)]^s8[xi( 3)]^s8[zi( 2)]; - x[2] = z[1] ^ s5[xi( 7)]^s6[xi( 6)]^s7[xi( 5)]^s8[xi( 4)]^s5[zi( 1)]; - x[3] = z[3] ^ s5[xi(10)]^s6[xi( 9)]^s7[xi(11)]^s8[xi( 8)]^s6[zi( 3)]; - k[12]= s5[xi( 8)]^s6[xi( 9)]^s7[xi( 7)]^s8[xi( 6)]^s5[xi( 3)]; - k[13]= s5[xi(10)]^s6[xi(11)]^s7[xi( 5)]^s8[xi( 4)]^s6[xi( 7)]; - k[14]= s5[xi(12)]^s6[xi(13)]^s7[xi( 3)]^s8[xi( 2)]^s7[xi( 8)]; - k[15]= s5[xi(14)]^s6[xi(15)]^s7[xi( 1)]^s8[xi( 0)]^s8[xi(13)]; - -#undef xi -#undef zi -} - - -static gcry_err_code_t -do_cast_setkey( CAST5_context *c, const byte *key, unsigned keylen ) -{ - static int initialized; - static const char* selftest_failed; - int i; - u32 x[4]; - u32 z[4]; - u32 k[16]; - - if( !initialized ) - { - initialized = 1; - selftest_failed = selftest(); - if( selftest_failed ) - log_error ("CAST5 selftest failed (%s).\n", selftest_failed ); - } - if( selftest_failed ) - return GPG_ERR_SELFTEST_FAILED; - - if( keylen != 16 ) - return GPG_ERR_INV_KEYLEN; - - x[0] = buf_get_be32(key + 0); - x[1] = buf_get_be32(key + 4); - x[2] = buf_get_be32(key + 8); - x[3] = buf_get_be32(key + 12); - - key_schedule( x, z, k ); - for(i=0; i < 16; i++ ) - c->Km[i] = k[i]; - key_schedule( x, z, k ); - for(i=0; i < 16; i++ ) - c->Kr[i] = k[i] & 0x1f; - -#ifdef USE_ARM_ASM - for (i = 0; i < 4; i++) - { - byte Kr_arm[4]; - - /* Convert rotate left to rotate right and add shift left - * by 2. */ - Kr_arm[0] = ((32 - c->Kr[4 * i + 0]) - 2) & 0x1f; - Kr_arm[1] = ((32 - c->Kr[4 * i + 1]) - 2) & 0x1f; - Kr_arm[2] = ((32 - c->Kr[4 * i + 2]) - 2) & 0x1f; - Kr_arm[3] = ((32 - c->Kr[4 * i + 3]) - 2) & 0x1f; - - /* Endian friendly store. */ - c->Kr_arm_enc[i] = Kr_arm[0] | - (Kr_arm[1] << 8) | - (Kr_arm[2] << 16) | - (Kr_arm[3] << 24); - c->Kr_arm_dec[i] = Kr_arm[3] | - (Kr_arm[2] << 8) | - (Kr_arm[1] << 16) | - (Kr_arm[0] << 24); - - wipememory(Kr_arm, sizeof(Kr_arm)); - } -#endif - - wipememory(x, sizeof x); - wipememory(z, sizeof z); - wipememory(k, sizeof k); - -#undef xi -#undef zi - return GPG_ERR_NO_ERROR; -} - -static gcry_err_code_t -cast_setkey (void *context, const byte *key, unsigned keylen ) -{ - CAST5_context *c = (CAST5_context *) context; - gcry_err_code_t rc = do_cast_setkey (c, key, keylen); - return rc; -} - - -gcry_cipher_spec_t _gcry_cipher_spec_cast5 = - { - GCRY_CIPHER_CAST5, {0, 0}, - "CAST5", NULL, NULL, CAST5_BLOCKSIZE, 128, sizeof (CAST5_context), - cast_setkey, encrypt_block, decrypt_block - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-aeswrap.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-aeswrap.c deleted file mode 100644 index 50ac1073..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-aeswrap.c +++ /dev/null @@ -1,210 +0,0 @@ -/* cipher-aeswrap.c - Generic AESWRAP mode implementation - * Copyright (C) 2009, 2011 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "ath.h" -#include "bufhelp.h" -#include "./cipher-internal.h" - - -/* Perform the AES-Wrap algorithm as specified by RFC3394. We - implement this as a mode usable with any cipher algorithm of - blocksize 128. */ -gcry_err_code_t -_gcry_cipher_aeswrap_encrypt (gcry_cipher_hd_t c, - byte *outbuf, size_t outbuflen, - const byte *inbuf, size_t inbuflen ) -{ - int j, x; - size_t n, i; - unsigned char *r, *a, *b; - unsigned char t[8]; - unsigned int burn, nburn; - -#if MAX_BLOCKSIZE < 8 -#error Invalid block size -#endif - /* We require a cipher with a 128 bit block length. */ - if (c->spec->blocksize != 16) - return GPG_ERR_INV_LENGTH; - - /* The output buffer must be able to hold the input data plus one - additional block. */ - if (outbuflen < inbuflen + 8) - return GPG_ERR_BUFFER_TOO_SHORT; - /* Input data must be multiple of 64 bits. */ - if (inbuflen % 8) - return GPG_ERR_INV_ARG; - - n = inbuflen / 8; - - /* We need at least two 64 bit blocks. */ - if (n < 2) - return GPG_ERR_INV_ARG; - - burn = 0; - - r = outbuf; - a = outbuf; /* We store A directly in OUTBUF. */ - b = c->u_ctr.ctr; /* B is also used to concatenate stuff. */ - - /* If an IV has been set we use that IV as the Alternative Initial - Value; if it has not been set we use the standard value. */ - if (c->marks.iv) - memcpy (a, c->u_iv.iv, 8); - else - memset (a, 0xa6, 8); - - /* Copy the inbuf to the outbuf. */ - memmove (r+8, inbuf, inbuflen); - - memset (t, 0, sizeof t); /* t := 0. */ - - for (j = 0; j <= 5; j++) - { - for (i = 1; i <= n; i++) - { - /* B := AES_k( A | R[i] ) */ - memcpy (b, a, 8); - memcpy (b+8, r+i*8, 8); - nburn = c->spec->encrypt (&c->context.c, b, b); - burn = nburn > burn ? nburn : burn; - /* t := t + 1 */ - for (x = 7; x >= 0; x--) - { - t[x]++; - if (t[x]) - break; - } - /* A := MSB_64(B) ^ t */ - buf_xor(a, b, t, 8); - /* R[i] := LSB_64(B) */ - memcpy (r+i*8, b+8, 8); - } - } - - if (burn > 0) - _gcry_burn_stack (burn + 4 * sizeof(void *)); - - return 0; -} - -/* Perform the AES-Unwrap algorithm as specified by RFC3394. We - implement this as a mode usable with any cipher algorithm of - blocksize 128. */ -gcry_err_code_t -_gcry_cipher_aeswrap_decrypt (gcry_cipher_hd_t c, - byte *outbuf, size_t outbuflen, - const byte *inbuf, size_t inbuflen) -{ - int j, x; - size_t n, i; - unsigned char *r, *a, *b; - unsigned char t[8]; - unsigned int burn, nburn; - -#if MAX_BLOCKSIZE < 8 -#error Invalid block size -#endif - /* We require a cipher with a 128 bit block length. */ - if (c->spec->blocksize != 16) - return GPG_ERR_INV_LENGTH; - - /* The output buffer must be able to hold the input data minus one - additional block. Fixme: The caller has more restrictive checks - - we may want to fix them for this mode. */ - if (outbuflen + 8 < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - /* Input data must be multiple of 64 bits. */ - if (inbuflen % 8) - return GPG_ERR_INV_ARG; - - n = inbuflen / 8; - - /* We need at least three 64 bit blocks. */ - if (n < 3) - return GPG_ERR_INV_ARG; - - burn = 0; - - r = outbuf; - a = c->lastiv; /* We use c->LASTIV as buffer for A. */ - b = c->u_ctr.ctr; /* B is also used to concatenate stuff. */ - - /* Copy the inbuf to the outbuf and save A. */ - memcpy (a, inbuf, 8); - memmove (r, inbuf+8, inbuflen-8); - n--; /* Reduce to actual number of data blocks. */ - - /* t := 6 * n */ - i = n * 6; /* The range is valid because: n = inbuflen / 8 - 1. */ - for (x=0; x < 8 && x < sizeof (i); x++) - t[7-x] = i >> (8*x); - for (; x < 8; x++) - t[7-x] = 0; - - for (j = 5; j >= 0; j--) - { - for (i = n; i >= 1; i--) - { - /* B := AES_k^1( (A ^ t)| R[i] ) */ - buf_xor(b, a, t, 8); - memcpy (b+8, r+(i-1)*8, 8); - nburn = c->spec->decrypt (&c->context.c, b, b); - burn = nburn > burn ? nburn : burn; - /* t := t - 1 */ - for (x = 7; x >= 0; x--) - { - t[x]--; - if (t[x] != 0xff) - break; - } - /* A := MSB_64(B) */ - memcpy (a, b, 8); - /* R[i] := LSB_64(B) */ - memcpy (r+(i-1)*8, b+8, 8); - } - } - - /* If an IV has been set we compare against this Alternative Initial - Value; if it has not been set we compare against the standard IV. */ - if (c->marks.iv) - j = memcmp (a, c->u_iv.iv, 8); - else - { - for (j=0, x=0; x < 8; x++) - if (a[x] != 0xa6) - { - j=1; - break; - } - } - - if (burn > 0) - _gcry_burn_stack (burn + 4 * sizeof(void *)); - - return j? GPG_ERR_CHECKSUM : 0; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-cbc.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-cbc.c deleted file mode 100644 index 4b929daa..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-cbc.c +++ /dev/null @@ -1,205 +0,0 @@ -/* cipher-cbc.c - Generic CBC mode implementation - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 - * 2005, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "ath.h" -#include "./cipher-internal.h" -#include "bufhelp.h" - - - -gcry_err_code_t -_gcry_cipher_cbc_encrypt (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen) -{ - size_t n; - unsigned char *ivp; - int i; - size_t blocksize = c->spec->blocksize; - gcry_cipher_encrypt_t enc_fn = c->spec->encrypt; - size_t nblocks = inbuflen / blocksize; - unsigned int burn, nburn; - - if (outbuflen < ((c->flags & GCRY_CIPHER_CBC_MAC)? blocksize : inbuflen)) - return GPG_ERR_BUFFER_TOO_SHORT; - - if ((inbuflen % blocksize) - && !(inbuflen > blocksize - && (c->flags & GCRY_CIPHER_CBC_CTS))) - return GPG_ERR_INV_LENGTH; - - burn = 0; - - if ((c->flags & GCRY_CIPHER_CBC_CTS) && inbuflen > blocksize) - { - if ((inbuflen % blocksize) == 0) - nblocks--; - } - - if (c->bulk.cbc_enc) - { - c->bulk.cbc_enc (&c->context.c, c->u_iv.iv, outbuf, inbuf, nblocks, - (c->flags & GCRY_CIPHER_CBC_MAC)); - inbuf += nblocks * blocksize; - if (!(c->flags & GCRY_CIPHER_CBC_MAC)) - outbuf += nblocks * blocksize; - } - else - { - ivp = c->u_iv.iv; - - for (n=0; n < nblocks; n++ ) - { - buf_xor (outbuf, inbuf, ivp, blocksize); - nburn = enc_fn ( &c->context.c, outbuf, outbuf ); - burn = nburn > burn ? nburn : burn; - ivp = outbuf; - inbuf += blocksize; - if (!(c->flags & GCRY_CIPHER_CBC_MAC)) - outbuf += blocksize; - } - - if (ivp != c->u_iv.iv) - buf_cpy (c->u_iv.iv, ivp, blocksize ); - } - - if ((c->flags & GCRY_CIPHER_CBC_CTS) && inbuflen > blocksize) - { - /* We have to be careful here, since outbuf might be equal to - inbuf. */ - size_t restbytes; - unsigned char b; - - if ((inbuflen % blocksize) == 0) - restbytes = blocksize; - else - restbytes = inbuflen % blocksize; - - outbuf -= blocksize; - for (ivp = c->u_iv.iv, i = 0; i < restbytes; i++) - { - b = inbuf[i]; - outbuf[blocksize + i] = outbuf[i]; - outbuf[i] = b ^ *ivp++; - } - for (; i < blocksize; i++) - outbuf[i] = 0 ^ *ivp++; - - nburn = enc_fn (&c->context.c, outbuf, outbuf); - burn = nburn > burn ? nburn : burn; - buf_cpy (c->u_iv.iv, outbuf, blocksize); - } - - if (burn > 0) - _gcry_burn_stack (burn + 4 * sizeof(void *)); - - return 0; -} - - -gcry_err_code_t -_gcry_cipher_cbc_decrypt (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen) -{ - size_t n; - int i; - size_t blocksize = c->spec->blocksize; - gcry_cipher_decrypt_t dec_fn = c->spec->decrypt; - size_t nblocks = inbuflen / blocksize; - unsigned int burn, nburn; - - if (outbuflen < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - - if ((inbuflen % blocksize) - && !(inbuflen > blocksize - && (c->flags & GCRY_CIPHER_CBC_CTS))) - return GPG_ERR_INV_LENGTH; - - burn = 0; - - if ((c->flags & GCRY_CIPHER_CBC_CTS) && inbuflen > blocksize) - { - nblocks--; - if ((inbuflen % blocksize) == 0) - nblocks--; - buf_cpy (c->lastiv, c->u_iv.iv, blocksize); - } - - if (c->bulk.cbc_dec) - { - c->bulk.cbc_dec (&c->context.c, c->u_iv.iv, outbuf, inbuf, nblocks); - inbuf += nblocks * blocksize; - outbuf += nblocks * blocksize; - } - else - { - for (n=0; n < nblocks; n++ ) - { - /* Because outbuf and inbuf might be the same, we must not overwrite - the original ciphertext block. We use LASTIV as intermediate - storage here because it is not used otherwise. */ - nburn = dec_fn ( &c->context.c, c->lastiv, inbuf ); - burn = nburn > burn ? nburn : burn; - buf_xor_n_copy_2(outbuf, c->lastiv, c->u_iv.iv, inbuf, blocksize); - inbuf += blocksize; - outbuf += blocksize; - } - } - - if ((c->flags & GCRY_CIPHER_CBC_CTS) && inbuflen > blocksize) - { - size_t restbytes; - - if ((inbuflen % blocksize) == 0) - restbytes = blocksize; - else - restbytes = inbuflen % blocksize; - - buf_cpy (c->lastiv, c->u_iv.iv, blocksize ); /* Save Cn-2. */ - buf_cpy (c->u_iv.iv, inbuf + blocksize, restbytes ); /* Save Cn. */ - - nburn = dec_fn ( &c->context.c, outbuf, inbuf ); - burn = nburn > burn ? nburn : burn; - buf_xor(outbuf, outbuf, c->u_iv.iv, restbytes); - - buf_cpy (outbuf + blocksize, outbuf, restbytes); - for(i=restbytes; i < blocksize; i++) - c->u_iv.iv[i] = outbuf[i]; - nburn = dec_fn (&c->context.c, outbuf, c->u_iv.iv); - burn = nburn > burn ? nburn : burn; - buf_xor(outbuf, outbuf, c->lastiv, blocksize); - /* c->lastiv is now really lastlastiv, does this matter? */ - } - - if (burn > 0) - _gcry_burn_stack (burn + 4 * sizeof(void *)); - - return 0; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-ccm.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-ccm.c deleted file mode 100644 index 47f2162e..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-ccm.c +++ /dev/null @@ -1,442 +0,0 @@ -/* cipher-ccm.c - CTR mode with CBC-MAC mode implementation - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "ath.h" -#include "bufhelp.h" -#include "./cipher-internal.h" - -/* We need a 64 bit type for this code. */ -#ifdef HAVE_U64_TYPEDEF - - -#define set_burn(burn, nburn) do { \ - unsigned int __nburn = (nburn); \ - (burn) = (burn) > __nburn ? (burn) : __nburn; } while (0) - - -static unsigned int -do_cbc_mac (gcry_cipher_hd_t c, const unsigned char *inbuf, size_t inlen, - int do_padding) -{ - const unsigned int blocksize = 16; - gcry_cipher_encrypt_t enc_fn = c->spec->encrypt; - unsigned char tmp[blocksize]; - unsigned int burn = 0; - unsigned int unused = c->u_mode.ccm.mac_unused; - size_t nblocks; - - if (inlen == 0 && (unused == 0 || !do_padding)) - return 0; - - do - { - if (inlen + unused < blocksize || unused > 0) - { - for (; inlen && unused < blocksize; inlen--) - c->u_mode.ccm.macbuf[unused++] = *inbuf++; - } - if (!inlen) - { - if (!do_padding) - break; - - while (unused < blocksize) - c->u_mode.ccm.macbuf[unused++] = 0; - } - - if (unused > 0) - { - /* Process one block from macbuf. */ - buf_xor(c->u_iv.iv, c->u_iv.iv, c->u_mode.ccm.macbuf, blocksize); - set_burn (burn, enc_fn ( &c->context.c, c->u_iv.iv, c->u_iv.iv )); - - unused = 0; - } - - if (c->bulk.cbc_enc) - { - nblocks = inlen / blocksize; - c->bulk.cbc_enc (&c->context.c, c->u_iv.iv, tmp, inbuf, nblocks, 1); - inbuf += nblocks * blocksize; - inlen -= nblocks * blocksize; - - wipememory (tmp, sizeof(tmp)); - } - else - { - while (inlen >= blocksize) - { - buf_xor(c->u_iv.iv, c->u_iv.iv, inbuf, blocksize); - - set_burn (burn, enc_fn ( &c->context.c, c->u_iv.iv, c->u_iv.iv )); - - inlen -= blocksize; - inbuf += blocksize; - } - } - } - while (inlen > 0); - - c->u_mode.ccm.mac_unused = unused; - - if (burn) - burn += 4 * sizeof(void *); - - return burn; -} - - -gcry_err_code_t -_gcry_cipher_ccm_set_nonce (gcry_cipher_hd_t c, const unsigned char *nonce, - size_t noncelen) -{ - size_t L = 15 - noncelen; - size_t L_; - - L_ = L - 1; - - if (!nonce) - return GPG_ERR_INV_ARG; - /* Length field must be 2, 3, ..., or 8. */ - if (L < 2 || L > 8) - return GPG_ERR_INV_LENGTH; - - /* Reset state */ - memset (&c->u_mode, 0, sizeof(c->u_mode)); - memset (&c->marks, 0, sizeof(c->marks)); - memset (&c->u_iv, 0, sizeof(c->u_iv)); - memset (&c->u_ctr, 0, sizeof(c->u_ctr)); - memset (c->lastiv, 0, sizeof(c->lastiv)); - c->unused = 0; - - /* Setup CTR */ - c->u_ctr.ctr[0] = L_; - memcpy (&c->u_ctr.ctr[1], nonce, noncelen); - memset (&c->u_ctr.ctr[1 + noncelen], 0, L); - - /* Setup IV */ - c->u_iv.iv[0] = L_; - memcpy (&c->u_iv.iv[1], nonce, noncelen); - /* Add (8 * M_ + 64 * flags) to iv[0] and set iv[noncelen + 1 ... 15] later - in set_aad. */ - memset (&c->u_iv.iv[1 + noncelen], 0, L); - - c->u_mode.ccm.nonce = 1; - - return GPG_ERR_NO_ERROR; -} - - -gcry_err_code_t -_gcry_cipher_ccm_set_lengths (gcry_cipher_hd_t c, u64 encryptlen, u64 aadlen, - u64 taglen) -{ - unsigned int burn = 0; - unsigned char b0[16]; - size_t noncelen = 15 - (c->u_iv.iv[0] + 1); - u64 M = taglen; - u64 M_; - int i; - - M_ = (M - 2) / 2; - - /* Authentication field must be 4, 6, 8, 10, 12, 14 or 16. */ - if ((M_ * 2 + 2) != M || M < 4 || M > 16) - return GPG_ERR_INV_LENGTH; - if (!c->u_mode.ccm.nonce || c->marks.tag) - return GPG_ERR_INV_STATE; - if (c->u_mode.ccm.lengths) - return GPG_ERR_INV_STATE; - - c->u_mode.ccm.authlen = taglen; - c->u_mode.ccm.encryptlen = encryptlen; - c->u_mode.ccm.aadlen = aadlen; - - /* Complete IV setup. */ - c->u_iv.iv[0] += (aadlen > 0) * 64 + M_ * 8; - for (i = 16 - 1; i >= 1 + noncelen; i--) - { - c->u_iv.iv[i] = encryptlen & 0xff; - encryptlen >>= 8; - } - - memcpy (b0, c->u_iv.iv, 16); - memset (c->u_iv.iv, 0, 16); - - set_burn (burn, do_cbc_mac (c, b0, 16, 0)); - - if (aadlen == 0) - { - /* Do nothing. */ - } - else if (aadlen > 0 && aadlen <= (unsigned int)0xfeff) - { - b0[0] = (aadlen >> 8) & 0xff; - b0[1] = aadlen & 0xff; - set_burn (burn, do_cbc_mac (c, b0, 2, 0)); - } - else if (aadlen > 0xfeff && aadlen <= (unsigned int)0xffffffff) - { - b0[0] = 0xff; - b0[1] = 0xfe; - buf_put_be32(&b0[2], aadlen); - set_burn (burn, do_cbc_mac (c, b0, 6, 0)); - } - else if (aadlen > (unsigned int)0xffffffff) - { - b0[0] = 0xff; - b0[1] = 0xff; - buf_put_be64(&b0[2], aadlen); - set_burn (burn, do_cbc_mac (c, b0, 10, 0)); - } - - /* Generate S_0 and increase counter. */ - set_burn (burn, c->spec->encrypt ( &c->context.c, c->u_mode.ccm.s0, - c->u_ctr.ctr )); - c->u_ctr.ctr[15]++; - - if (burn) - _gcry_burn_stack (burn + sizeof(void *) * 5); - - c->u_mode.ccm.lengths = 1; - - return GPG_ERR_NO_ERROR; -} - - -gcry_err_code_t -_gcry_cipher_ccm_authenticate (gcry_cipher_hd_t c, const unsigned char *abuf, - size_t abuflen) -{ - unsigned int burn; - - if (abuflen > 0 && !abuf) - return GPG_ERR_INV_ARG; - if (!c->u_mode.ccm.nonce || !c->u_mode.ccm.lengths || c->marks.tag) - return GPG_ERR_INV_STATE; - if (abuflen > c->u_mode.ccm.aadlen) - return GPG_ERR_INV_LENGTH; - - c->u_mode.ccm.aadlen -= abuflen; - burn = do_cbc_mac (c, abuf, abuflen, c->u_mode.ccm.aadlen == 0); - - if (burn) - _gcry_burn_stack (burn + sizeof(void *) * 5); - - return GPG_ERR_NO_ERROR; -} - - -gcry_err_code_t -_gcry_cipher_ccm_tag (gcry_cipher_hd_t c, unsigned char *outbuf, - size_t outbuflen, int check) -{ - unsigned int burn; - - if (!outbuf || outbuflen == 0) - return GPG_ERR_INV_ARG; - /* Tag length must be same as initial authlen. */ - if (c->u_mode.ccm.authlen != outbuflen) - return GPG_ERR_INV_LENGTH; - if (!c->u_mode.ccm.nonce || !c->u_mode.ccm.lengths || c->u_mode.ccm.aadlen > 0) - return GPG_ERR_INV_STATE; - /* Initial encrypt length must match with length of actual data processed. */ - if (c->u_mode.ccm.encryptlen > 0) - return GPG_ERR_UNFINISHED; - - if (!c->marks.tag) - { - burn = do_cbc_mac (c, NULL, 0, 1); /* Perform final padding. */ - - /* Add S_0 */ - buf_xor (c->u_iv.iv, c->u_iv.iv, c->u_mode.ccm.s0, 16); - - wipememory (c->u_ctr.ctr, 16); - wipememory (c->u_mode.ccm.s0, 16); - wipememory (c->u_mode.ccm.macbuf, 16); - - if (burn) - _gcry_burn_stack (burn + sizeof(void *) * 5); - - c->marks.tag = 1; - } - - if (!check) - { - memcpy (outbuf, c->u_iv.iv, outbuflen); - return GPG_ERR_NO_ERROR; - } - else - { - return buf_eq_const(outbuf, c->u_iv.iv, outbuflen) ? - GPG_ERR_NO_ERROR : GPG_ERR_CHECKSUM; - } -} - - -gcry_err_code_t -_gcry_cipher_ccm_get_tag (gcry_cipher_hd_t c, unsigned char *outtag, - size_t taglen) -{ - return _gcry_cipher_ccm_tag (c, outtag, taglen, 0); -} - - -gcry_err_code_t -_gcry_cipher_ccm_check_tag (gcry_cipher_hd_t c, const unsigned char *intag, - size_t taglen) -{ - return _gcry_cipher_ccm_tag (c, (unsigned char *)intag, taglen, 1); -} - - -gcry_err_code_t -_gcry_cipher_ccm_encrypt (gcry_cipher_hd_t c, unsigned char *outbuf, - size_t outbuflen, const unsigned char *inbuf, - size_t inbuflen) -{ - unsigned int burn; - - if (outbuflen < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - if (!c->u_mode.ccm.nonce || c->marks.tag || !c->u_mode.ccm.lengths || - c->u_mode.ccm.aadlen > 0) - return GPG_ERR_INV_STATE; - if (inbuflen > c->u_mode.ccm.encryptlen) - return GPG_ERR_INV_LENGTH; - - c->u_mode.ccm.encryptlen -= inbuflen; - burn = do_cbc_mac (c, inbuf, inbuflen, 0); - if (burn) - _gcry_burn_stack (burn + sizeof(void *) * 5); - - return _gcry_cipher_ctr_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); -} - - -gcry_err_code_t -_gcry_cipher_ccm_decrypt (gcry_cipher_hd_t c, unsigned char *outbuf, - size_t outbuflen, const unsigned char *inbuf, - size_t inbuflen) -{ - gcry_err_code_t err; - unsigned int burn; - - if (outbuflen < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - if (!c->u_mode.ccm.nonce || c->marks.tag || !c->u_mode.ccm.lengths || - c->u_mode.ccm.aadlen > 0) - return GPG_ERR_INV_STATE; - if (inbuflen > c->u_mode.ccm.encryptlen) - return GPG_ERR_INV_LENGTH; - - err = _gcry_cipher_ctr_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); - if (err) - return err; - - c->u_mode.ccm.encryptlen -= inbuflen; - burn = do_cbc_mac (c, outbuf, inbuflen, 0); - if (burn) - _gcry_burn_stack (burn + sizeof(void *) * 5); - - return err; -} - -#else - -/* - * Provide dummy functions so that we avoid adding too much #ifdefs in - * cipher.c. - */ - -gcry_err_code_t -_gcry_cipher_ccm_encrypt(gcry_cipher_hd_t c, unsigned char *outbuf, - size_t outbuflen, const unsigned char *inbuf, - size_t inbuflen) -{ - (void)c; - (void)outbuf; - (void)outbuflen; - (void)inbuf; - (void)inbuflen; - return GPG_ERR_NOT_SUPPORTED; -} - -gcry_err_code_t -_gcry_cipher_ccm_decrypt(gcry_cipher_hd_t c, unsigned char *outbuf, - size_t outbuflen, const unsigned char *inbuf, - size_t inbuflen) -{ - (void)c; - (void)outbuf; - (void)outbuflen; - (void)inbuf; - (void)inbuflen; - return GPG_ERR_NOT_SUPPORTED; -} - -gcry_err_code_t -_gcry_cipher_ccm_set_nonce(gcry_cipher_hd_t c, const unsigned char *nonce, - size_t noncelen) -{ - (void)c; - (void)nonce; - (void)noncelen; - return GPG_ERR_NOT_SUPPORTED; -} - -gcry_err_code_t -_gcry_cipher_ccm_authenticate(gcry_cipher_hd_t c, const unsigned char *abuf, - size_t abuflen) -{ - (void)c; - (void)abuf; - (void)abuflen; - return GPG_ERR_NOT_SUPPORTED; -} - -gcry_err_code_t -_gcry_cipher_ccm_get_tag(gcry_cipher_hd_t c, unsigned char *outtag, - size_t taglen) -{ - (void)c; - (void)outtag; - (void)taglen; - return GPG_ERR_NOT_SUPPORTED; -} - -gcry_err_code_t -_gcry_cipher_ccm_check_tag(gcry_cipher_hd_t c, const unsigned char *intag, - size_t taglen) -{ - (void)c; - (void)intag; - (void)taglen; - return GPG_ERR_NOT_SUPPORTED; -} - -#endif /*HAVE_U64_TYPEDEF*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-cfb.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-cfb.c deleted file mode 100644 index 8539f548..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-cfb.c +++ /dev/null @@ -1,226 +0,0 @@ -/* cipher-cfb.c - Generic CFB mode implementation - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 - * 2005, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "ath.h" -#include "bufhelp.h" -#include "./cipher-internal.h" - - -gcry_err_code_t -_gcry_cipher_cfb_encrypt (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen) -{ - unsigned char *ivp; - gcry_cipher_encrypt_t enc_fn = c->spec->encrypt; - size_t blocksize = c->spec->blocksize; - size_t blocksize_x_2 = blocksize + blocksize; - unsigned int burn, nburn; - - if (outbuflen < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - - if ( inbuflen <= c->unused ) - { - /* Short enough to be encoded by the remaining XOR mask. */ - /* XOR the input with the IV and store input into IV. */ - ivp = c->u_iv.iv + blocksize - c->unused; - buf_xor_2dst(outbuf, ivp, inbuf, inbuflen); - c->unused -= inbuflen; - return 0; - } - - burn = 0; - - if ( c->unused ) - { - /* XOR the input with the IV and store input into IV */ - inbuflen -= c->unused; - ivp = c->u_iv.iv + blocksize - c->unused; - buf_xor_2dst(outbuf, ivp, inbuf, c->unused); - outbuf += c->unused; - inbuf += c->unused; - c->unused = 0; - } - - /* Now we can process complete blocks. We use a loop as long as we - have at least 2 blocks and use conditions for the rest. This - also allows to use a bulk encryption function if available. */ - if (inbuflen >= blocksize_x_2 && c->bulk.cfb_enc) - { - size_t nblocks = inbuflen / blocksize; - c->bulk.cfb_enc (&c->context.c, c->u_iv.iv, outbuf, inbuf, nblocks); - outbuf += nblocks * blocksize; - inbuf += nblocks * blocksize; - inbuflen -= nblocks * blocksize; - } - else - { - while ( inbuflen >= blocksize_x_2 ) - { - /* Encrypt the IV. */ - nburn = enc_fn ( &c->context.c, c->u_iv.iv, c->u_iv.iv ); - burn = nburn > burn ? nburn : burn; - /* XOR the input with the IV and store input into IV. */ - buf_xor_2dst(outbuf, c->u_iv.iv, inbuf, blocksize); - outbuf += blocksize; - inbuf += blocksize; - inbuflen -= blocksize; - } - } - - if ( inbuflen >= blocksize ) - { - /* Save the current IV and then encrypt the IV. */ - buf_cpy( c->lastiv, c->u_iv.iv, blocksize ); - nburn = enc_fn ( &c->context.c, c->u_iv.iv, c->u_iv.iv ); - burn = nburn > burn ? nburn : burn; - /* XOR the input with the IV and store input into IV */ - buf_xor_2dst(outbuf, c->u_iv.iv, inbuf, blocksize); - outbuf += blocksize; - inbuf += blocksize; - inbuflen -= blocksize; - } - if ( inbuflen ) - { - /* Save the current IV and then encrypt the IV. */ - buf_cpy( c->lastiv, c->u_iv.iv, blocksize ); - nburn = enc_fn ( &c->context.c, c->u_iv.iv, c->u_iv.iv ); - burn = nburn > burn ? nburn : burn; - c->unused = blocksize; - /* Apply the XOR. */ - c->unused -= inbuflen; - buf_xor_2dst(outbuf, c->u_iv.iv, inbuf, inbuflen); - outbuf += inbuflen; - inbuf += inbuflen; - inbuflen = 0; - } - - if (burn > 0) - _gcry_burn_stack (burn + 4 * sizeof(void *)); - - return 0; -} - - -gcry_err_code_t -_gcry_cipher_cfb_decrypt (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen) -{ - unsigned char *ivp; - gcry_cipher_encrypt_t enc_fn = c->spec->encrypt; - size_t blocksize = c->spec->blocksize; - size_t blocksize_x_2 = blocksize + blocksize; - unsigned int burn, nburn; - - if (outbuflen < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - - if (inbuflen <= c->unused) - { - /* Short enough to be encoded by the remaining XOR mask. */ - /* XOR the input with the IV and store input into IV. */ - ivp = c->u_iv.iv + blocksize - c->unused; - buf_xor_n_copy(outbuf, ivp, inbuf, inbuflen); - c->unused -= inbuflen; - return 0; - } - - burn = 0; - - if (c->unused) - { - /* XOR the input with the IV and store input into IV. */ - inbuflen -= c->unused; - ivp = c->u_iv.iv + blocksize - c->unused; - buf_xor_n_copy(outbuf, ivp, inbuf, c->unused); - outbuf += c->unused; - inbuf += c->unused; - c->unused = 0; - } - - /* Now we can process complete blocks. We use a loop as long as we - have at least 2 blocks and use conditions for the rest. This - also allows to use a bulk encryption function if available. */ - if (inbuflen >= blocksize_x_2 && c->bulk.cfb_dec) - { - size_t nblocks = inbuflen / blocksize; - c->bulk.cfb_dec (&c->context.c, c->u_iv.iv, outbuf, inbuf, nblocks); - outbuf += nblocks * blocksize; - inbuf += nblocks * blocksize; - inbuflen -= nblocks * blocksize; - } - else - { - while (inbuflen >= blocksize_x_2 ) - { - /* Encrypt the IV. */ - nburn = enc_fn ( &c->context.c, c->u_iv.iv, c->u_iv.iv ); - burn = nburn > burn ? nburn : burn; - /* XOR the input with the IV and store input into IV. */ - buf_xor_n_copy(outbuf, c->u_iv.iv, inbuf, blocksize); - outbuf += blocksize; - inbuf += blocksize; - inbuflen -= blocksize; - } - } - - if (inbuflen >= blocksize ) - { - /* Save the current IV and then encrypt the IV. */ - buf_cpy ( c->lastiv, c->u_iv.iv, blocksize); - nburn = enc_fn ( &c->context.c, c->u_iv.iv, c->u_iv.iv ); - burn = nburn > burn ? nburn : burn; - /* XOR the input with the IV and store input into IV */ - buf_xor_n_copy(outbuf, c->u_iv.iv, inbuf, blocksize); - outbuf += blocksize; - inbuf += blocksize; - inbuflen -= blocksize; - } - - if (inbuflen) - { - /* Save the current IV and then encrypt the IV. */ - buf_cpy ( c->lastiv, c->u_iv.iv, blocksize ); - nburn = enc_fn ( &c->context.c, c->u_iv.iv, c->u_iv.iv ); - burn = nburn > burn ? nburn : burn; - c->unused = blocksize; - /* Apply the XOR. */ - c->unused -= inbuflen; - buf_xor_n_copy(outbuf, c->u_iv.iv, inbuf, inbuflen); - outbuf += inbuflen; - inbuf += inbuflen; - inbuflen = 0; - } - - if (burn > 0) - _gcry_burn_stack (burn + 4 * sizeof(void *)); - - return 0; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-cmac.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-cmac.c deleted file mode 100644 index 25d5db26..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-cmac.c +++ /dev/null @@ -1,238 +0,0 @@ -/* cmac.c - CMAC, Cipher-based MAC. - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "cipher-internal.h" -#include "bufhelp.h" - - -#define set_burn(burn, nburn) do { \ - unsigned int __nburn = (nburn); \ - (burn) = (burn) > __nburn ? (burn) : __nburn; } while (0) - - -static void -cmac_write (gcry_cipher_hd_t c, const byte * inbuf, size_t inlen) -{ - gcry_cipher_encrypt_t enc_fn = c->spec->encrypt; - const unsigned int blocksize = c->spec->blocksize; - byte outbuf[MAX_BLOCKSIZE]; - unsigned int burn = 0; - unsigned int nblocks; - - if (!inlen || !inbuf) - return; - - /* Last block is needed for cmac_final. */ - if (c->unused + inlen <= blocksize) - { - for (; inlen && c->unused < blocksize; inlen--) - c->lastiv[c->unused++] = *inbuf++; - return; - } - - if (c->unused) - { - for (; inlen && c->unused < blocksize; inlen--) - c->lastiv[c->unused++] = *inbuf++; - - buf_xor (c->u_iv.iv, c->u_iv.iv, c->lastiv, blocksize); - set_burn (burn, enc_fn (&c->context.c, c->u_iv.iv, c->u_iv.iv)); - - c->unused = 0; - } - - if (c->bulk.cbc_enc && inlen > blocksize) - { - nblocks = inlen / blocksize; - nblocks -= (nblocks * blocksize == inlen); - - c->bulk.cbc_enc (&c->context.c, c->u_iv.iv, outbuf, inbuf, nblocks, 1); - inbuf += nblocks * blocksize; - inlen -= nblocks * blocksize; - - wipememory (outbuf, sizeof (outbuf)); - } - else - while (inlen > blocksize) - { - buf_xor (c->u_iv.iv, c->u_iv.iv, inbuf, blocksize); - set_burn (burn, enc_fn (&c->context.c, c->u_iv.iv, c->u_iv.iv)); - inlen -= blocksize; - inbuf += blocksize; - } - - /* Make sure that last block is passed to cmac_final. */ - if (inlen == 0) - BUG (); - - for (; inlen && c->unused < blocksize; inlen--) - c->lastiv[c->unused++] = *inbuf++; - - if (burn) - _gcry_burn_stack (burn + 4 * sizeof (void *)); -} - - -static void -cmac_generate_subkeys (gcry_cipher_hd_t c) -{ - const unsigned int blocksize = c->spec->blocksize; - byte rb, carry, t, bi; - unsigned int burn; - int i, j; - union - { - size_t _aligned; - byte buf[MAX_BLOCKSIZE]; - } u; - - if (MAX_BLOCKSIZE < blocksize) - BUG (); - - /* encrypt zero block */ - memset (u.buf, 0, blocksize); - burn = c->spec->encrypt (&c->context.c, u.buf, u.buf); - - /* Currently supported blocksizes are 16 and 8. */ - rb = blocksize == 16 ? 0x87 : 0x1B /*blocksize == 8 */ ; - - for (j = 0; j < 2; j++) - { - /* Generate subkeys K1 and K2 */ - carry = 0; - for (i = blocksize - 1; i >= 0; i--) - { - bi = u.buf[i]; - t = carry | (bi << 1); - carry = bi >> 7; - u.buf[i] = t & 0xff; - c->u_mode.cmac.subkeys[j][i] = u.buf[i]; - } - u.buf[blocksize - 1] ^= carry ? rb : 0; - c->u_mode.cmac.subkeys[j][blocksize - 1] = u.buf[blocksize - 1]; - } - - wipememory (&u, sizeof (u)); - if (burn) - _gcry_burn_stack (burn + 4 * sizeof (void *)); -} - - -static void -cmac_final (gcry_cipher_hd_t c) -{ - const unsigned int blocksize = c->spec->blocksize; - unsigned int count = c->unused; - unsigned int burn; - byte *subkey; - - if (count == blocksize) - subkey = c->u_mode.cmac.subkeys[0]; /* K1 */ - else - { - subkey = c->u_mode.cmac.subkeys[1]; /* K2 */ - c->lastiv[count++] = 0x80; - while (count < blocksize) - c->lastiv[count++] = 0; - } - - buf_xor (c->lastiv, c->lastiv, subkey, blocksize); - - buf_xor (c->u_iv.iv, c->u_iv.iv, c->lastiv, blocksize); - burn = c->spec->encrypt (&c->context.c, c->u_iv.iv, c->u_iv.iv); - if (burn) - _gcry_burn_stack (burn + 4 * sizeof (void *)); - - c->unused = 0; -} - - -static gcry_err_code_t -cmac_tag (gcry_cipher_hd_t c, unsigned char *tag, size_t taglen, int check) -{ - if (!tag || taglen == 0 || taglen > c->spec->blocksize) - return GPG_ERR_INV_ARG; - - if (!c->u_mode.cmac.tag) - { - cmac_final (c); - c->u_mode.cmac.tag = 1; - } - - if (!check) - { - memcpy (tag, c->u_iv.iv, taglen); - return GPG_ERR_NO_ERROR; - } - else - { - return buf_eq_const (tag, c->u_iv.iv, taglen) ? - GPG_ERR_NO_ERROR : GPG_ERR_CHECKSUM; - } -} - - -gcry_err_code_t -_gcry_cipher_cmac_authenticate (gcry_cipher_hd_t c, - const unsigned char *abuf, size_t abuflen) -{ - if (abuflen > 0 && !abuf) - return GPG_ERR_INV_ARG; - if (c->u_mode.cmac.tag) - return GPG_ERR_INV_STATE; - /* To support new blocksize, update cmac_generate_subkeys() then add new - blocksize here. */ - if (c->spec->blocksize != 16 && c->spec->blocksize != 8) - return GPG_ERR_INV_CIPHER_MODE; - - cmac_write (c, abuf, abuflen); - - return GPG_ERR_NO_ERROR; -} - - -gcry_err_code_t -_gcry_cipher_cmac_get_tag (gcry_cipher_hd_t c, - unsigned char *outtag, size_t taglen) -{ - return cmac_tag (c, outtag, taglen, 0); -} - - -gcry_err_code_t -_gcry_cipher_cmac_check_tag (gcry_cipher_hd_t c, - const unsigned char *intag, size_t taglen) -{ - return cmac_tag (c, (unsigned char *) intag, taglen, 1); -} - -gcry_err_code_t -_gcry_cipher_cmac_set_subkeys (gcry_cipher_hd_t c) -{ - cmac_generate_subkeys (c); - - return GPG_ERR_NO_ERROR; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-ctr.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-ctr.c deleted file mode 100644 index 1e7133c9..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-ctr.c +++ /dev/null @@ -1,111 +0,0 @@ -/* cipher-ctr.c - Generic CTR mode implementation - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 - * 2005, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "ath.h" -#include "bufhelp.h" -#include "./cipher-internal.h" - - -gcry_err_code_t -_gcry_cipher_ctr_encrypt (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen) -{ - size_t n; - int i; - gcry_cipher_encrypt_t enc_fn = c->spec->encrypt; - unsigned int blocksize = c->spec->blocksize; - size_t nblocks; - unsigned int burn, nburn; - - if (outbuflen < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - - burn = 0; - - /* First process a left over encrypted counter. */ - if (c->unused) - { - gcry_assert (c->unused < blocksize); - i = blocksize - c->unused; - n = c->unused > inbuflen ? inbuflen : c->unused; - buf_xor(outbuf, inbuf, &c->lastiv[i], n); - c->unused -= n; - inbuf += n; - outbuf += n; - inbuflen -= n; - } - - /* Use a bulk method if available. */ - nblocks = inbuflen / blocksize; - if (nblocks && c->bulk.ctr_enc) - { - c->bulk.ctr_enc (&c->context.c, c->u_ctr.ctr, outbuf, inbuf, nblocks); - inbuf += nblocks * blocksize; - outbuf += nblocks * blocksize; - inbuflen -= nblocks * blocksize; - } - - /* If we don't have a bulk method use the standard method. We also - use this method for the a remaining partial block. */ - if (inbuflen) - { - unsigned char tmp[MAX_BLOCKSIZE]; - - do { - nburn = enc_fn (&c->context.c, tmp, c->u_ctr.ctr); - burn = nburn > burn ? nburn : burn; - - for (i = blocksize; i > 0; i--) - { - c->u_ctr.ctr[i-1]++; - if (c->u_ctr.ctr[i-1] != 0) - break; - } - - n = blocksize < inbuflen ? blocksize : inbuflen; - buf_xor(outbuf, inbuf, tmp, n); - - inbuflen -= n; - outbuf += n; - inbuf += n; - } while (inbuflen); - - /* Save the unused bytes of the counter. */ - c->unused = blocksize - n; - if (c->unused) - buf_cpy (c->lastiv+n, tmp+n, c->unused); - - wipememory (tmp, sizeof tmp); - } - - if (burn > 0) - _gcry_burn_stack (burn + 4 * sizeof(void *)); - - return 0; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-gcm.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-gcm.c deleted file mode 100644 index 457e337a..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-gcm.c +++ /dev/null @@ -1,1180 +0,0 @@ -/* cipher-gcm.c - Generic Galois Counter Mode implementation - * Copyright (C) 2013 Dmitry Eremin-Solenikov - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "ath.h" -#include "bufhelp.h" -#include "./cipher-internal.h" - -#ifdef GCM_USE_TABLES -static const u16 gcmR[256] = { - 0x0000, 0x01c2, 0x0384, 0x0246, 0x0708, 0x06ca, 0x048c, 0x054e, - 0x0e10, 0x0fd2, 0x0d94, 0x0c56, 0x0918, 0x08da, 0x0a9c, 0x0b5e, - 0x1c20, 0x1de2, 0x1fa4, 0x1e66, 0x1b28, 0x1aea, 0x18ac, 0x196e, - 0x1230, 0x13f2, 0x11b4, 0x1076, 0x1538, 0x14fa, 0x16bc, 0x177e, - 0x3840, 0x3982, 0x3bc4, 0x3a06, 0x3f48, 0x3e8a, 0x3ccc, 0x3d0e, - 0x3650, 0x3792, 0x35d4, 0x3416, 0x3158, 0x309a, 0x32dc, 0x331e, - 0x2460, 0x25a2, 0x27e4, 0x2626, 0x2368, 0x22aa, 0x20ec, 0x212e, - 0x2a70, 0x2bb2, 0x29f4, 0x2836, 0x2d78, 0x2cba, 0x2efc, 0x2f3e, - 0x7080, 0x7142, 0x7304, 0x72c6, 0x7788, 0x764a, 0x740c, 0x75ce, - 0x7e90, 0x7f52, 0x7d14, 0x7cd6, 0x7998, 0x785a, 0x7a1c, 0x7bde, - 0x6ca0, 0x6d62, 0x6f24, 0x6ee6, 0x6ba8, 0x6a6a, 0x682c, 0x69ee, - 0x62b0, 0x6372, 0x6134, 0x60f6, 0x65b8, 0x647a, 0x663c, 0x67fe, - 0x48c0, 0x4902, 0x4b44, 0x4a86, 0x4fc8, 0x4e0a, 0x4c4c, 0x4d8e, - 0x46d0, 0x4712, 0x4554, 0x4496, 0x41d8, 0x401a, 0x425c, 0x439e, - 0x54e0, 0x5522, 0x5764, 0x56a6, 0x53e8, 0x522a, 0x506c, 0x51ae, - 0x5af0, 0x5b32, 0x5974, 0x58b6, 0x5df8, 0x5c3a, 0x5e7c, 0x5fbe, - 0xe100, 0xe0c2, 0xe284, 0xe346, 0xe608, 0xe7ca, 0xe58c, 0xe44e, - 0xef10, 0xeed2, 0xec94, 0xed56, 0xe818, 0xe9da, 0xeb9c, 0xea5e, - 0xfd20, 0xfce2, 0xfea4, 0xff66, 0xfa28, 0xfbea, 0xf9ac, 0xf86e, - 0xf330, 0xf2f2, 0xf0b4, 0xf176, 0xf438, 0xf5fa, 0xf7bc, 0xf67e, - 0xd940, 0xd882, 0xdac4, 0xdb06, 0xde48, 0xdf8a, 0xddcc, 0xdc0e, - 0xd750, 0xd692, 0xd4d4, 0xd516, 0xd058, 0xd19a, 0xd3dc, 0xd21e, - 0xc560, 0xc4a2, 0xc6e4, 0xc726, 0xc268, 0xc3aa, 0xc1ec, 0xc02e, - 0xcb70, 0xcab2, 0xc8f4, 0xc936, 0xcc78, 0xcdba, 0xcffc, 0xce3e, - 0x9180, 0x9042, 0x9204, 0x93c6, 0x9688, 0x974a, 0x950c, 0x94ce, - 0x9f90, 0x9e52, 0x9c14, 0x9dd6, 0x9898, 0x995a, 0x9b1c, 0x9ade, - 0x8da0, 0x8c62, 0x8e24, 0x8fe6, 0x8aa8, 0x8b6a, 0x892c, 0x88ee, - 0x83b0, 0x8272, 0x8034, 0x81f6, 0x84b8, 0x857a, 0x873c, 0x86fe, - 0xa9c0, 0xa802, 0xaa44, 0xab86, 0xaec8, 0xaf0a, 0xad4c, 0xac8e, - 0xa7d0, 0xa612, 0xa454, 0xa596, 0xa0d8, 0xa11a, 0xa35c, 0xa29e, - 0xb5e0, 0xb422, 0xb664, 0xb7a6, 0xb2e8, 0xb32a, 0xb16c, 0xb0ae, - 0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe, -}; - -#ifdef GCM_TABLES_USE_U64 -static void -bshift (u64 * b0, u64 * b1) -{ - u64 t[2], mask; - - t[0] = *b0; - t[1] = *b1; - mask = t[1] & 1 ? 0xe1 : 0; - mask <<= 56; - - *b1 = (t[1] >> 1) ^ (t[0] << 63); - *b0 = (t[0] >> 1) ^ mask; -} - -static void -do_fillM (unsigned char *h, u64 *M) -{ - int i, j; - - M[0 + 0] = 0; - M[0 + 16] = 0; - - M[8 + 0] = buf_get_be64 (h + 0); - M[8 + 16] = buf_get_be64 (h + 8); - - for (i = 4; i > 0; i /= 2) - { - M[i + 0] = M[2 * i + 0]; - M[i + 16] = M[2 * i + 16]; - - bshift (&M[i], &M[i + 16]); - } - - for (i = 2; i < 16; i *= 2) - for (j = 1; j < i; j++) - { - M[(i + j) + 0] = M[i + 0] ^ M[j + 0]; - M[(i + j) + 16] = M[i + 16] ^ M[j + 16]; - } -} - -static inline unsigned int -do_ghash (unsigned char *result, const unsigned char *buf, const u64 *gcmM) -{ - u64 V[2]; - u64 tmp[2]; - const u64 *M; - u64 T; - u32 A; - int i; - - buf_xor (V, result, buf, 16); - V[0] = be_bswap64 (V[0]); - V[1] = be_bswap64 (V[1]); - - /* First round can be manually tweaked based on fact that 'tmp' is zero. */ - i = 15; - - M = &gcmM[(V[1] & 0xf)]; - V[1] >>= 4; - tmp[0] = (M[0] >> 4) ^ ((u64) gcmR[(M[16] & 0xf) << 4] << 48); - tmp[1] = (M[16] >> 4) ^ (M[0] << 60); - tmp[0] ^= gcmM[(V[1] & 0xf) + 0]; - tmp[1] ^= gcmM[(V[1] & 0xf) + 16]; - V[1] >>= 4; - - --i; - while (1) - { - M = &gcmM[(V[1] & 0xf)]; - V[1] >>= 4; - - A = tmp[1] & 0xff; - T = tmp[0]; - tmp[0] = (T >> 8) ^ ((u64) gcmR[A] << 48) ^ gcmM[(V[1] & 0xf) + 0]; - tmp[1] = (T << 56) ^ (tmp[1] >> 8) ^ gcmM[(V[1] & 0xf) + 16]; - - tmp[0] ^= (M[0] >> 4) ^ ((u64) gcmR[(M[16] & 0xf) << 4] << 48); - tmp[1] ^= (M[16] >> 4) ^ (M[0] << 60); - - if (i == 0) - break; - else if (i == 8) - V[1] = V[0]; - else - V[1] >>= 4; - --i; - } - - buf_put_be64 (result + 0, tmp[0]); - buf_put_be64 (result + 8, tmp[1]); - - return (sizeof(V) + sizeof(T) + sizeof(tmp) + - sizeof(int)*2 + sizeof(void*)*5); -} - -#else - -static void -bshift (u32 * M, int i) -{ - u32 t[4], mask; - - t[0] = M[i * 4 + 0]; - t[1] = M[i * 4 + 1]; - t[2] = M[i * 4 + 2]; - t[3] = M[i * 4 + 3]; - mask = t[3] & 1 ? 0xe1 : 0; - - M[i * 4 + 3] = (t[3] >> 1) ^ (t[2] << 31); - M[i * 4 + 2] = (t[2] >> 1) ^ (t[1] << 31); - M[i * 4 + 1] = (t[1] >> 1) ^ (t[0] << 31); - M[i * 4 + 0] = (t[0] >> 1) ^ (mask << 24); -} - -static void -do_fillM (unsigned char *h, u32 *M) -{ - int i, j; - - M[0 * 4 + 0] = 0; - M[0 * 4 + 1] = 0; - M[0 * 4 + 2] = 0; - M[0 * 4 + 3] = 0; - - M[8 * 4 + 0] = buf_get_be32 (h + 0); - M[8 * 4 + 1] = buf_get_be32 (h + 4); - M[8 * 4 + 2] = buf_get_be32 (h + 8); - M[8 * 4 + 3] = buf_get_be32 (h + 12); - - for (i = 4; i > 0; i /= 2) - { - M[i * 4 + 0] = M[2 * i * 4 + 0]; - M[i * 4 + 1] = M[2 * i * 4 + 1]; - M[i * 4 + 2] = M[2 * i * 4 + 2]; - M[i * 4 + 3] = M[2 * i * 4 + 3]; - - bshift (M, i); - } - - for (i = 2; i < 16; i *= 2) - for (j = 1; j < i; j++) - { - M[(i + j) * 4 + 0] = M[i * 4 + 0] ^ M[j * 4 + 0]; - M[(i + j) * 4 + 1] = M[i * 4 + 1] ^ M[j * 4 + 1]; - M[(i + j) * 4 + 2] = M[i * 4 + 2] ^ M[j * 4 + 2]; - M[(i + j) * 4 + 3] = M[i * 4 + 3] ^ M[j * 4 + 3]; - } -} - -static inline unsigned int -do_ghash (unsigned char *result, const unsigned char *buf, const u32 *gcmM) -{ - byte V[16]; - u32 tmp[4]; - u32 v; - const u32 *M, *m; - u32 T[3]; - int i; - - buf_xor (V, result, buf, 16); /* V is big-endian */ - - /* First round can be manually tweaked based on fact that 'tmp' is zero. */ - i = 15; - - v = V[i]; - M = &gcmM[(v & 0xf) * 4]; - v = (v & 0xf0) >> 4; - m = &gcmM[v * 4]; - v = V[--i]; - - tmp[0] = (M[0] >> 4) ^ ((u64) gcmR[(M[3] << 4) & 0xf0] << 16) ^ m[0]; - tmp[1] = (M[1] >> 4) ^ (M[0] << 28) ^ m[1]; - tmp[2] = (M[2] >> 4) ^ (M[1] << 28) ^ m[2]; - tmp[3] = (M[3] >> 4) ^ (M[2] << 28) ^ m[3]; - - while (1) - { - M = &gcmM[(v & 0xf) * 4]; - v = (v & 0xf0) >> 4; - m = &gcmM[v * 4]; - - T[0] = tmp[0]; - T[1] = tmp[1]; - T[2] = tmp[2]; - tmp[0] = (T[0] >> 8) ^ ((u32) gcmR[tmp[3] & 0xff] << 16) ^ m[0]; - tmp[1] = (T[0] << 24) ^ (tmp[1] >> 8) ^ m[1]; - tmp[2] = (T[1] << 24) ^ (tmp[2] >> 8) ^ m[2]; - tmp[3] = (T[2] << 24) ^ (tmp[3] >> 8) ^ m[3]; - - tmp[0] ^= (M[0] >> 4) ^ ((u64) gcmR[(M[3] << 4) & 0xf0] << 16); - tmp[1] ^= (M[1] >> 4) ^ (M[0] << 28); - tmp[2] ^= (M[2] >> 4) ^ (M[1] << 28); - tmp[3] ^= (M[3] >> 4) ^ (M[2] << 28); - - if (i == 0) - break; - - v = V[--i]; - } - - buf_put_be32 (result + 0, tmp[0]); - buf_put_be32 (result + 4, tmp[1]); - buf_put_be32 (result + 8, tmp[2]); - buf_put_be32 (result + 12, tmp[3]); - - return (sizeof(V) + sizeof(T) + sizeof(tmp) + - sizeof(int)*2 + sizeof(void*)*6); -} -#endif /* !HAVE_U64_TYPEDEF || SIZEOF_UNSIGNED_LONG != 8 */ - -#define fillM(c, h) do_fillM (h, c->u_mode.gcm.gcm_table) -#define GHASH(c, result, buf) do_ghash (result, buf, c->u_mode.gcm.gcm_table) - -#else - -static unsigned long -bshift (unsigned long *b) -{ - unsigned long c; - int i; - c = b[3] & 1; - for (i = 3; i > 0; i--) - { - b[i] = (b[i] >> 1) | (b[i - 1] << 31); - } - b[i] >>= 1; - return c; -} - -static unsigned int -do_ghash (unsigned char *hsub, unsigned char *result, const unsigned char *buf) -{ - unsigned long V[4]; - int i, j; - byte *p; - -#ifdef WORDS_BIGENDIAN - p = result; -#else - unsigned long T[4]; - - buf_xor (V, result, buf, 16); - for (i = 0; i < 4; i++) - { - V[i] = (V[i] & 0x00ff00ff) << 8 | (V[i] & 0xff00ff00) >> 8; - V[i] = (V[i] & 0x0000ffff) << 16 | (V[i] & 0xffff0000) >> 16; - } - p = (byte *) T; -#endif - - memset (p, 0, 16); - - for (i = 0; i < 16; i++) - { - for (j = 0x80; j; j >>= 1) - { - if (hsub[i] & j) - buf_xor (p, p, V, 16); - if (bshift (V)) - V[0] ^= 0xe1000000; - } - } -#ifndef WORDS_BIGENDIAN - for (i = 0, p = (byte *) T; i < 16; i += 4, p += 4) - { - result[i + 0] = p[3]; - result[i + 1] = p[2]; - result[i + 2] = p[1]; - result[i + 3] = p[0]; - } -#endif - - return (sizeof(V) + sizeof(T) + sizeof(int)*2 + sizeof(void*)*5); -} - -#define fillM(c, h) do { } while (0) -#define GHASH(c, result, buf) do_ghash (c->u_mode.gcm.u_ghash_key.key, result, buf) - -#endif /* !GCM_USE_TABLES */ - - -#ifdef GCM_USE_INTEL_PCLMUL -/* - Intel PCLMUL ghash based on white paper: - "Intel® Carry-Less Multiplication Instruction and its Usage for Computing the - GCM Mode - Rev 2.01"; Shay Gueron, Michael E. Kounavis. - */ -static inline void gfmul_pclmul(void) -{ - /* Input: XMM0 and XMM1, Output: XMM1. Input XMM0 stays unmodified. - Input must be converted to little-endian. - */ - asm volatile (/* gfmul, xmm0 has operator a and xmm1 has operator b. */ - "pshufd $78, %%xmm0, %%xmm2\n\t" - "pshufd $78, %%xmm1, %%xmm4\n\t" - "pxor %%xmm0, %%xmm2\n\t" /* xmm2 holds a0+a1 */ - "pxor %%xmm1, %%xmm4\n\t" /* xmm4 holds b0+b1 */ - - "movdqa %%xmm0, %%xmm3\n\t" - "pclmulqdq $0, %%xmm1, %%xmm3\n\t" /* xmm3 holds a0*b0 */ - "movdqa %%xmm0, %%xmm6\n\t" - "pclmulqdq $17, %%xmm1, %%xmm6\n\t" /* xmm6 holds a1*b1 */ - "movdqa %%xmm3, %%xmm5\n\t" - "pclmulqdq $0, %%xmm2, %%xmm4\n\t" /* xmm4 holds (a0+a1)*(b0+b1) */ - - "pxor %%xmm6, %%xmm5\n\t" /* xmm5 holds a0*b0+a1*b1 */ - "pxor %%xmm5, %%xmm4\n\t" /* xmm4 holds a0*b0+a1*b1+(a0+a1)*(b0+b1) */ - "movdqa %%xmm4, %%xmm5\n\t" - "psrldq $8, %%xmm4\n\t" - "pslldq $8, %%xmm5\n\t" - "pxor %%xmm5, %%xmm3\n\t" - "pxor %%xmm4, %%xmm6\n\t" /* holds the result of the - carry-less multiplication of xmm0 - by xmm1 */ - - /* shift the result by one bit position to the left cope for - the fact that bits are reversed */ - "movdqa %%xmm3, %%xmm4\n\t" - "movdqa %%xmm6, %%xmm5\n\t" - "pslld $1, %%xmm3\n\t" - "pslld $1, %%xmm6\n\t" - "psrld $31, %%xmm4\n\t" - "psrld $31, %%xmm5\n\t" - "movdqa %%xmm4, %%xmm1\n\t" - "pslldq $4, %%xmm5\n\t" - "pslldq $4, %%xmm4\n\t" - "psrldq $12, %%xmm1\n\t" - "por %%xmm4, %%xmm3\n\t" - "por %%xmm5, %%xmm6\n\t" - "por %%xmm6, %%xmm1\n\t" - - /* first phase of the reduction */ - "movdqa %%xmm3, %%xmm6\n\t" - "movdqa %%xmm3, %%xmm7\n\t" - "pslld $31, %%xmm6\n\t" /* packed right shifting << 31 */ - "movdqa %%xmm3, %%xmm5\n\t" - "pslld $30, %%xmm7\n\t" /* packed right shifting shift << 30 */ - "pslld $25, %%xmm5\n\t" /* packed right shifting shift << 25 */ - "pxor %%xmm7, %%xmm6\n\t" /* xor the shifted versions */ - "pxor %%xmm5, %%xmm6\n\t" - "movdqa %%xmm6, %%xmm7\n\t" - "pslldq $12, %%xmm6\n\t" - "psrldq $4, %%xmm7\n\t" - "pxor %%xmm6, %%xmm3\n\t" /* first phase of the reduction - complete */ - - /* second phase of the reduction */ - "movdqa %%xmm3, %%xmm2\n\t" - "movdqa %%xmm3, %%xmm4\n\t" - "psrld $1, %%xmm2\n\t" /* packed left shifting >> 1 */ - "movdqa %%xmm3, %%xmm5\n\t" - "psrld $2, %%xmm4\n\t" /* packed left shifting >> 2 */ - "psrld $7, %%xmm5\n\t" /* packed left shifting >> 7 */ - "pxor %%xmm4, %%xmm2\n\t" /* xor the shifted versions */ - "pxor %%xmm5, %%xmm2\n\t" - "pxor %%xmm7, %%xmm2\n\t" - "pxor %%xmm2, %%xmm3\n\t" - "pxor %%xmm3, %%xmm1\n\t" /* the result is in xmm1 */ - ::: "cc" ); -} - -#ifdef __x86_64__ -static inline void gfmul_pclmul_aggr4(void) -{ - /* Input: - H¹: XMM0 X_i : XMM6 - H²: XMM8 X_(i-1) : XMM3 - H³: XMM9 X_(i-2) : XMM2 - Hâ´: XMM10 X_(i-3)⊕Y_(i-4): XMM1 - Output: - Y_i: XMM1 - Inputs XMM0 stays unmodified. - Input must be converted to little-endian. - */ - asm volatile (/* perform clmul and merge results... */ - "pshufd $78, %%xmm10, %%xmm11\n\t" - "pshufd $78, %%xmm1, %%xmm12\n\t" - "pxor %%xmm10, %%xmm11\n\t" /* xmm11 holds 4:a0+a1 */ - "pxor %%xmm1, %%xmm12\n\t" /* xmm12 holds 4:b0+b1 */ - - "pshufd $78, %%xmm9, %%xmm13\n\t" - "pshufd $78, %%xmm2, %%xmm14\n\t" - "pxor %%xmm9, %%xmm13\n\t" /* xmm13 holds 3:a0+a1 */ - "pxor %%xmm2, %%xmm14\n\t" /* xmm14 holds 3:b0+b1 */ - - "pshufd $78, %%xmm8, %%xmm5\n\t" - "pshufd $78, %%xmm3, %%xmm15\n\t" - "pxor %%xmm8, %%xmm5\n\t" /* xmm1 holds 2:a0+a1 */ - "pxor %%xmm3, %%xmm15\n\t" /* xmm2 holds 2:b0+b1 */ - - "movdqa %%xmm10, %%xmm4\n\t" - "movdqa %%xmm9, %%xmm7\n\t" - "pclmulqdq $0, %%xmm1, %%xmm4\n\t" /* xmm4 holds 4:a0*b0 */ - "pclmulqdq $0, %%xmm2, %%xmm7\n\t" /* xmm7 holds 3:a0*b0 */ - "pclmulqdq $17, %%xmm10, %%xmm1\n\t" /* xmm1 holds 4:a1*b1 */ - "pclmulqdq $17, %%xmm9, %%xmm2\n\t" /* xmm9 holds 3:a1*b1 */ - "pclmulqdq $0, %%xmm11, %%xmm12\n\t" /* xmm12 holds 4:(a0+a1)*(b0+b1) */ - "pclmulqdq $0, %%xmm13, %%xmm14\n\t" /* xmm14 holds 3:(a0+a1)*(b0+b1) */ - - "pshufd $78, %%xmm0, %%xmm10\n\t" - "pshufd $78, %%xmm6, %%xmm11\n\t" - "pxor %%xmm0, %%xmm10\n\t" /* xmm10 holds 1:a0+a1 */ - "pxor %%xmm6, %%xmm11\n\t" /* xmm11 holds 1:b0+b1 */ - - "pxor %%xmm4, %%xmm7\n\t" /* xmm7 holds 3+4:a0*b0 */ - "pxor %%xmm2, %%xmm1\n\t" /* xmm1 holds 3+4:a1*b1 */ - "pxor %%xmm14, %%xmm12\n\t" /* xmm12 holds 3+4:(a0+a1)*(b0+b1) */ - - "movdqa %%xmm8, %%xmm13\n\t" - "pclmulqdq $0, %%xmm3, %%xmm13\n\t" /* xmm13 holds 2:a0*b0 */ - "pclmulqdq $17, %%xmm8, %%xmm3\n\t" /* xmm3 holds 2:a1*b1 */ - "pclmulqdq $0, %%xmm5, %%xmm15\n\t" /* xmm15 holds 2:(a0+a1)*(b0+b1) */ - - "pxor %%xmm13, %%xmm7\n\t" /* xmm7 holds 2+3+4:a0*b0 */ - "pxor %%xmm3, %%xmm1\n\t" /* xmm1 holds 2+3+4:a1*b1 */ - "pxor %%xmm15, %%xmm12\n\t" /* xmm12 holds 2+3+4:(a0+a1)*(b0+b1) */ - - "movdqa %%xmm0, %%xmm3\n\t" - "pclmulqdq $0, %%xmm6, %%xmm3\n\t" /* xmm3 holds 1:a0*b0 */ - "pclmulqdq $17, %%xmm0, %%xmm6\n\t" /* xmm6 holds 1:a1*b1 */ - "movdqa %%xmm11, %%xmm4\n\t" - "pclmulqdq $0, %%xmm10, %%xmm4\n\t" /* xmm4 holds 1:(a0+a1)*(b0+b1) */ - - "pxor %%xmm7, %%xmm3\n\t" /* xmm3 holds 1+2+3+4:a0*b0 */ - "pxor %%xmm1, %%xmm6\n\t" /* xmm6 holds 1+2+3+4:a1*b1 */ - "pxor %%xmm12, %%xmm4\n\t" /* xmm4 holds 1+2+3+4:(a0+a1)*(b0+b1) */ - - /* aggregated reduction... */ - "movdqa %%xmm3, %%xmm5\n\t" - "pxor %%xmm6, %%xmm5\n\t" /* xmm5 holds a0*b0+a1*b1 */ - "pxor %%xmm5, %%xmm4\n\t" /* xmm4 holds a0*b0+a1*b1+(a0+a1)*(b0+b1) */ - "movdqa %%xmm4, %%xmm5\n\t" - "psrldq $8, %%xmm4\n\t" - "pslldq $8, %%xmm5\n\t" - "pxor %%xmm5, %%xmm3\n\t" - "pxor %%xmm4, %%xmm6\n\t" /* holds the result of the - carry-less multiplication of xmm0 - by xmm1 */ - - /* shift the result by one bit position to the left cope for - the fact that bits are reversed */ - "movdqa %%xmm3, %%xmm4\n\t" - "movdqa %%xmm6, %%xmm5\n\t" - "pslld $1, %%xmm3\n\t" - "pslld $1, %%xmm6\n\t" - "psrld $31, %%xmm4\n\t" - "psrld $31, %%xmm5\n\t" - "movdqa %%xmm4, %%xmm1\n\t" - "pslldq $4, %%xmm5\n\t" - "pslldq $4, %%xmm4\n\t" - "psrldq $12, %%xmm1\n\t" - "por %%xmm4, %%xmm3\n\t" - "por %%xmm5, %%xmm6\n\t" - "por %%xmm6, %%xmm1\n\t" - - /* first phase of the reduction */ - "movdqa %%xmm3, %%xmm6\n\t" - "movdqa %%xmm3, %%xmm7\n\t" - "pslld $31, %%xmm6\n\t" /* packed right shifting << 31 */ - "movdqa %%xmm3, %%xmm5\n\t" - "pslld $30, %%xmm7\n\t" /* packed right shifting shift << 30 */ - "pslld $25, %%xmm5\n\t" /* packed right shifting shift << 25 */ - "pxor %%xmm7, %%xmm6\n\t" /* xor the shifted versions */ - "pxor %%xmm5, %%xmm6\n\t" - "movdqa %%xmm6, %%xmm7\n\t" - "pslldq $12, %%xmm6\n\t" - "psrldq $4, %%xmm7\n\t" - "pxor %%xmm6, %%xmm3\n\t" /* first phase of the reduction - complete */ - - /* second phase of the reduction */ - "movdqa %%xmm3, %%xmm2\n\t" - "movdqa %%xmm3, %%xmm4\n\t" - "psrld $1, %%xmm2\n\t" /* packed left shifting >> 1 */ - "movdqa %%xmm3, %%xmm5\n\t" - "psrld $2, %%xmm4\n\t" /* packed left shifting >> 2 */ - "psrld $7, %%xmm5\n\t" /* packed left shifting >> 7 */ - "pxor %%xmm4, %%xmm2\n\t" /* xor the shifted versions */ - "pxor %%xmm5, %%xmm2\n\t" - "pxor %%xmm7, %%xmm2\n\t" - "pxor %%xmm2, %%xmm3\n\t" - "pxor %%xmm3, %%xmm1\n\t" /* the result is in xmm1 */ - :::"cc"); -} -#endif - -#endif /*GCM_USE_INTEL_PCLMUL*/ - - -static unsigned int -ghash (gcry_cipher_hd_t c, byte *result, const byte *buf, - size_t nblocks) -{ - const unsigned int blocksize = GCRY_GCM_BLOCK_LEN; - unsigned int burn; - - if (nblocks == 0) - return 0; - - if (0) - ; -#ifdef GCM_USE_INTEL_PCLMUL - else if (c->u_mode.gcm.use_intel_pclmul) - { - static const unsigned char be_mask[16] __attribute__ ((aligned (16))) = - { 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }; - - /* Preload hash and H1. */ - asm volatile ("movdqu %[hash], %%xmm1\n\t" - "movdqa %[hsub], %%xmm0\n\t" - "pshufb %[be_mask], %%xmm1\n\t" /* be => le */ - : - : [hash] "m" (*result), [be_mask] "m" (*be_mask), - [hsub] "m" (*c->u_mode.gcm.u_ghash_key.key)); - -#ifdef __x86_64__ - if (nblocks >= 4) - { - do - { - asm volatile ("movdqa %[be_mask], %%xmm4\n\t" - "movdqu 0*16(%[buf]), %%xmm5\n\t" - "movdqu 1*16(%[buf]), %%xmm2\n\t" - "movdqu 2*16(%[buf]), %%xmm3\n\t" - "movdqu 3*16(%[buf]), %%xmm6\n\t" - "pshufb %%xmm4, %%xmm5\n\t" /* be => le */ - - /* Load H2, H3, H4. */ - "movdqu 2*16(%[h_234]), %%xmm10\n\t" - "movdqu 1*16(%[h_234]), %%xmm9\n\t" - "movdqu 0*16(%[h_234]), %%xmm8\n\t" - - "pxor %%xmm5, %%xmm1\n\t" - "pshufb %%xmm4, %%xmm2\n\t" /* be => le */ - "pshufb %%xmm4, %%xmm3\n\t" /* be => le */ - "pshufb %%xmm4, %%xmm6\n\t" /* be => le */ - : - : [buf] "r" (buf), [be_mask] "m" (*be_mask), - [h_234] "r" (c->u_mode.gcm.gcm_table)); - - gfmul_pclmul_aggr4 (); - - buf += 4 * blocksize; - nblocks -= 4; - } - while (nblocks >= 4); - - /* Clear used x86-64/XMM registers. */ - asm volatile( "pxor %%xmm8, %%xmm8\n\t" - "pxor %%xmm9, %%xmm9\n\t" - "pxor %%xmm10, %%xmm10\n\t" - "pxor %%xmm11, %%xmm11\n\t" - "pxor %%xmm12, %%xmm12\n\t" - "pxor %%xmm13, %%xmm13\n\t" - "pxor %%xmm14, %%xmm14\n\t" - "pxor %%xmm15, %%xmm15\n\t" - ::: "cc" ); - } -#endif - - while (nblocks--) - { - asm volatile ("movdqu %[buf], %%xmm2\n\t" - "pshufb %[be_mask], %%xmm2\n\t" /* be => le */ - "pxor %%xmm2, %%xmm1\n\t" - : - : [buf] "m" (*buf), [be_mask] "m" (*be_mask)); - - gfmul_pclmul (); - - buf += blocksize; - } - - /* Store hash. */ - asm volatile ("pshufb %[be_mask], %%xmm1\n\t" /* be => le */ - "movdqu %%xmm1, %[hash]\n\t" - : [hash] "=m" (*result) - : [be_mask] "m" (*be_mask)); - - /* Clear used registers. */ - asm volatile( "pxor %%xmm0, %%xmm0\n\t" - "pxor %%xmm1, %%xmm1\n\t" - "pxor %%xmm2, %%xmm2\n\t" - "pxor %%xmm3, %%xmm3\n\t" - "pxor %%xmm4, %%xmm4\n\t" - "pxor %%xmm5, %%xmm5\n\t" - "pxor %%xmm6, %%xmm6\n\t" - "pxor %%xmm7, %%xmm7\n\t" - ::: "cc" ); - burn = 0; - } -#endif - else - { - while (nblocks) - { - burn = GHASH (c, result, buf); - buf += blocksize; - nblocks--; - } - } - - return burn + (burn ? 5*sizeof(void*) : 0); -} - - -static void -setupM (gcry_cipher_hd_t c, byte *h) -{ - if (0) - ; -#ifdef GCM_USE_INTEL_PCLMUL - else if (_gcry_get_hw_features () & HWF_INTEL_PCLMUL) - { - u64 tmp[2]; - - c->u_mode.gcm.use_intel_pclmul = 1; - - /* Swap endianness of hsub. */ - tmp[0] = buf_get_be64(c->u_mode.gcm.u_ghash_key.key + 8); - tmp[1] = buf_get_be64(c->u_mode.gcm.u_ghash_key.key + 0); - buf_cpy (c->u_mode.gcm.u_ghash_key.key, tmp, GCRY_GCM_BLOCK_LEN); - -#ifdef __x86_64__ - asm volatile ("movdqu %[h_1], %%xmm0\n\t" - "movdqa %%xmm0, %%xmm1\n\t" - : - : [h_1] "m" (*tmp)); - - gfmul_pclmul (); /* H•H => H² */ - - asm volatile ("movdqu %%xmm1, 0*16(%[h_234])\n\t" - "movdqa %%xmm1, %%xmm8\n\t" - : - : [h_234] "r" (c->u_mode.gcm.gcm_table) - : "memory"); - - gfmul_pclmul (); /* H•H² => H³ */ - - asm volatile ("movdqa %%xmm8, %%xmm0\n\t" - "movdqu %%xmm1, 1*16(%[h_234])\n\t" - "movdqa %%xmm8, %%xmm1\n\t" - : - : [h_234] "r" (c->u_mode.gcm.gcm_table) - : "memory"); - - gfmul_pclmul (); /* H²•H² => Hâ´ */ - - asm volatile ("movdqu %%xmm1, 2*16(%[h_234])\n\t" - : - : [h_234] "r" (c->u_mode.gcm.gcm_table) - : "memory"); - - /* Clear used registers. */ - asm volatile( "pxor %%xmm0, %%xmm0\n\t" - "pxor %%xmm1, %%xmm1\n\t" - "pxor %%xmm2, %%xmm2\n\t" - "pxor %%xmm3, %%xmm3\n\t" - "pxor %%xmm4, %%xmm4\n\t" - "pxor %%xmm5, %%xmm5\n\t" - "pxor %%xmm6, %%xmm6\n\t" - "pxor %%xmm7, %%xmm7\n\t" - "pxor %%xmm8, %%xmm8\n\t" - ::: "cc" ); -#endif - - wipememory (tmp, sizeof(tmp)); - } -#endif - else - fillM (c, h); -} - - -static inline void -gcm_bytecounter_add (u32 ctr[2], size_t add) -{ - if (sizeof(add) > sizeof(u32)) - { - u32 high_add = ((add >> 31) >> 1) & 0xffffffff; - ctr[1] += high_add; - } - - ctr[0] += add; - if (ctr[0] >= add) - return; - ++ctr[1]; -} - - -static inline u32 -gcm_add32_be128 (byte *ctr, unsigned int add) -{ - /* 'ctr' must be aligned to four bytes. */ - const unsigned int blocksize = GCRY_GCM_BLOCK_LEN; - u32 *pval = (u32 *)(void *)(ctr + blocksize - sizeof(u32)); - u32 val; - - val = be_bswap32(*pval) + add; - *pval = be_bswap32(val); - - return val; /* return result as host-endian value */ -} - - -static inline int -gcm_check_datalen (u32 ctr[2]) -{ - /* len(plaintext) <= 2^39-256 bits == 2^36-32 bytes == 2^32-2 blocks */ - if (ctr[1] > 0xfU) - return 0; - if (ctr[1] < 0xfU) - return 1; - - if (ctr[0] <= 0xffffffe0U) - return 1; - - return 0; -} - - -static inline int -gcm_check_aadlen_or_ivlen (u32 ctr[2]) -{ - /* len(aad/iv) <= 2^64-1 bits ~= 2^61-1 bytes */ - if (ctr[1] > 0x1fffffffU) - return 0; - if (ctr[1] < 0x1fffffffU) - return 1; - - if (ctr[0] <= 0xffffffffU) - return 1; - - return 0; -} - - -static void -do_ghash_buf(gcry_cipher_hd_t c, byte *hash, const byte *buf, - size_t buflen, int do_padding) -{ - unsigned int blocksize = GCRY_GCM_BLOCK_LEN; - unsigned int unused = c->u_mode.gcm.mac_unused; - size_t nblocks, n; - unsigned int burn = 0; - - if (buflen == 0 && (unused == 0 || !do_padding)) - return; - - do - { - if (buflen + unused < blocksize || unused > 0) - { - n = blocksize - unused; - n = n < buflen ? n : buflen; - - buf_cpy (&c->u_mode.gcm.macbuf[unused], buf, n); - - unused += n; - buf += n; - buflen -= n; - } - if (!buflen) - { - if (!do_padding) - break; - - while (unused < blocksize) - c->u_mode.gcm.macbuf[unused++] = 0; - } - - if (unused > 0) - { - gcry_assert (unused == blocksize); - - /* Process one block from macbuf. */ - burn = ghash (c, hash, c->u_mode.gcm.macbuf, 1); - unused = 0; - } - - nblocks = buflen / blocksize; - - if (nblocks) - { - burn = ghash (c, hash, buf, nblocks); - buf += blocksize * nblocks; - buflen -= blocksize * nblocks; - } - } - while (buflen > 0); - - c->u_mode.gcm.mac_unused = unused; - - if (burn) - _gcry_burn_stack (burn); -} - - -gcry_err_code_t -_gcry_cipher_gcm_encrypt (gcry_cipher_hd_t c, - byte *outbuf, size_t outbuflen, - const byte *inbuf, size_t inbuflen) -{ - static const unsigned char zerobuf[MAX_BLOCKSIZE]; - gcry_err_code_t err; - - if (c->spec->blocksize != GCRY_GCM_BLOCK_LEN) - return GPG_ERR_CIPHER_ALGO; - if (outbuflen < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - if (c->u_mode.gcm.datalen_over_limits) - return GPG_ERR_INV_LENGTH; - if (c->marks.tag || c->u_mode.gcm.ghash_data_finalized) - return GPG_ERR_INV_STATE; - - if (!c->marks.iv) - _gcry_cipher_gcm_setiv (c, zerobuf, GCRY_GCM_BLOCK_LEN); - - if (c->u_mode.gcm.disallow_encryption_because_of_setiv_in_fips_mode) - return GPG_ERR_INV_STATE; - - if (!c->u_mode.gcm.ghash_aad_finalized) - { - /* Start of encryption marks end of AAD stream. */ - do_ghash_buf(c, c->u_mode.gcm.u_tag.tag, NULL, 0, 1); - c->u_mode.gcm.ghash_aad_finalized = 1; - } - - gcm_bytecounter_add(c->u_mode.gcm.datalen, inbuflen); - if (!gcm_check_datalen(c->u_mode.gcm.datalen)) - { - c->u_mode.gcm.datalen_over_limits = 1; - return GPG_ERR_INV_LENGTH; - } - - err = _gcry_cipher_ctr_encrypt(c, outbuf, outbuflen, inbuf, inbuflen); - if (err != 0) - return err; - - do_ghash_buf(c, c->u_mode.gcm.u_tag.tag, outbuf, inbuflen, 0); - - return 0; -} - - -gcry_err_code_t -_gcry_cipher_gcm_decrypt (gcry_cipher_hd_t c, - byte *outbuf, size_t outbuflen, - const byte *inbuf, size_t inbuflen) -{ - static const unsigned char zerobuf[MAX_BLOCKSIZE]; - - if (c->spec->blocksize != GCRY_GCM_BLOCK_LEN) - return GPG_ERR_CIPHER_ALGO; - if (outbuflen < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - if (c->u_mode.gcm.datalen_over_limits) - return GPG_ERR_INV_LENGTH; - if (c->marks.tag || c->u_mode.gcm.ghash_data_finalized) - return GPG_ERR_INV_STATE; - - if (!c->marks.iv) - _gcry_cipher_gcm_setiv (c, zerobuf, GCRY_GCM_BLOCK_LEN); - - if (!c->u_mode.gcm.ghash_aad_finalized) - { - /* Start of decryption marks end of AAD stream. */ - do_ghash_buf(c, c->u_mode.gcm.u_tag.tag, NULL, 0, 1); - c->u_mode.gcm.ghash_aad_finalized = 1; - } - - gcm_bytecounter_add(c->u_mode.gcm.datalen, inbuflen); - if (!gcm_check_datalen(c->u_mode.gcm.datalen)) - { - c->u_mode.gcm.datalen_over_limits = 1; - return GPG_ERR_INV_LENGTH; - } - - do_ghash_buf(c, c->u_mode.gcm.u_tag.tag, inbuf, inbuflen, 0); - - return _gcry_cipher_ctr_encrypt(c, outbuf, outbuflen, inbuf, inbuflen); -} - - -gcry_err_code_t -_gcry_cipher_gcm_authenticate (gcry_cipher_hd_t c, - const byte * aadbuf, size_t aadbuflen) -{ - static const unsigned char zerobuf[MAX_BLOCKSIZE]; - - if (c->spec->blocksize != GCRY_GCM_BLOCK_LEN) - return GPG_ERR_CIPHER_ALGO; - if (c->u_mode.gcm.datalen_over_limits) - return GPG_ERR_INV_LENGTH; - if (c->marks.tag || c->u_mode.gcm.ghash_aad_finalized || - c->u_mode.gcm.ghash_data_finalized) - return GPG_ERR_INV_STATE; - - if (!c->marks.iv) - _gcry_cipher_gcm_setiv (c, zerobuf, GCRY_GCM_BLOCK_LEN); - - gcm_bytecounter_add(c->u_mode.gcm.aadlen, aadbuflen); - if (!gcm_check_aadlen_or_ivlen(c->u_mode.gcm.aadlen)) - { - c->u_mode.gcm.datalen_over_limits = 1; - return GPG_ERR_INV_LENGTH; - } - - do_ghash_buf(c, c->u_mode.gcm.u_tag.tag, aadbuf, aadbuflen, 0); - - return 0; -} - - -void -_gcry_cipher_gcm_setkey (gcry_cipher_hd_t c) -{ - memset (c->u_mode.gcm.u_ghash_key.key, 0, GCRY_GCM_BLOCK_LEN); - - c->spec->encrypt (&c->context.c, c->u_mode.gcm.u_ghash_key.key, - c->u_mode.gcm.u_ghash_key.key); - setupM (c, c->u_mode.gcm.u_ghash_key.key); -} - - -static gcry_err_code_t -_gcry_cipher_gcm_initiv (gcry_cipher_hd_t c, const byte *iv, size_t ivlen) -{ - memset (c->u_mode.gcm.aadlen, 0, sizeof(c->u_mode.gcm.aadlen)); - memset (c->u_mode.gcm.datalen, 0, sizeof(c->u_mode.gcm.datalen)); - memset (c->u_mode.gcm.u_tag.tag, 0, GCRY_GCM_BLOCK_LEN); - c->u_mode.gcm.datalen_over_limits = 0; - c->u_mode.gcm.ghash_data_finalized = 0; - c->u_mode.gcm.ghash_aad_finalized = 0; - - if (ivlen == 0) - return GPG_ERR_INV_LENGTH; - - if (ivlen != GCRY_GCM_BLOCK_LEN - 4) - { - u32 iv_bytes[2] = {0, 0}; - u32 bitlengths[2][2]; - - memset(c->u_ctr.ctr, 0, GCRY_GCM_BLOCK_LEN); - - gcm_bytecounter_add(iv_bytes, ivlen); - if (!gcm_check_aadlen_or_ivlen(iv_bytes)) - { - c->u_mode.gcm.datalen_over_limits = 1; - return GPG_ERR_INV_LENGTH; - } - - do_ghash_buf(c, c->u_ctr.ctr, iv, ivlen, 1); - - /* iv length, 64-bit */ - bitlengths[1][1] = be_bswap32(iv_bytes[0] << 3); - bitlengths[1][0] = be_bswap32((iv_bytes[0] >> 29) | - (iv_bytes[1] << 3)); - /* zeros, 64-bit */ - bitlengths[0][1] = 0; - bitlengths[0][0] = 0; - - do_ghash_buf(c, c->u_ctr.ctr, (byte*)bitlengths, GCRY_GCM_BLOCK_LEN, 1); - - wipememory (iv_bytes, sizeof iv_bytes); - wipememory (bitlengths, sizeof bitlengths); - } - else - { - /* 96-bit IV is handled differently. */ - memcpy (c->u_ctr.ctr, iv, ivlen); - c->u_ctr.ctr[12] = c->u_ctr.ctr[13] = c->u_ctr.ctr[14] = 0; - c->u_ctr.ctr[15] = 1; - } - - c->spec->encrypt (&c->context.c, c->u_mode.gcm.tagiv, c->u_ctr.ctr); - - gcm_add32_be128 (c->u_ctr.ctr, 1); - - c->unused = 0; - c->marks.iv = 1; - c->marks.tag = 0; - - return 0; -} - - -gcry_err_code_t -_gcry_cipher_gcm_setiv (gcry_cipher_hd_t c, const byte *iv, size_t ivlen) -{ - c->marks.iv = 0; - c->marks.tag = 0; - c->u_mode.gcm.disallow_encryption_because_of_setiv_in_fips_mode = 0; - - if (fips_mode ()) - { - /* Direct invocation of GCM setiv in FIPS mode disables encryption. */ - c->u_mode.gcm.disallow_encryption_because_of_setiv_in_fips_mode = 1; - } - - return _gcry_cipher_gcm_initiv (c, iv, ivlen); -} - - -#if 0 && TODO -void -_gcry_cipher_gcm_geniv (gcry_cipher_hd_t c, - byte *ivout, size_t ivoutlen, const byte *nonce, - size_t noncelen) -{ - /* nonce: user provided part (might be null) */ - /* noncelen: check if proper length (if nonce not null) */ - /* ivout: iv used to initialize gcm, output to user */ - /* ivoutlen: check correct size */ - byte iv[IVLEN]; - - if (!ivout) - return GPG_ERR_INV_ARG; - if (ivoutlen != IVLEN) - return GPG_ERR_INV_LENGTH; - if (nonce != NULL && !is_nonce_ok_len(noncelen)) - return GPG_ERR_INV_ARG; - - gcm_generate_iv(iv, nonce, noncelen); - - c->marks.iv = 0; - c->marks.tag = 0; - c->u_mode.gcm.disallow_encryption_because_of_setiv_in_fips_mode = 0; - - _gcry_cipher_gcm_initiv (c, iv, IVLEN); - - buf_cpy(ivout, iv, IVLEN); - wipememory(iv, sizeof(iv)); -} -#endif - - -static gcry_err_code_t -_gcry_cipher_gcm_tag (gcry_cipher_hd_t c, - byte * outbuf, size_t outbuflen, int check) -{ - if (outbuflen < GCRY_GCM_BLOCK_LEN) - return GPG_ERR_BUFFER_TOO_SHORT; - if (c->u_mode.gcm.datalen_over_limits) - return GPG_ERR_INV_LENGTH; - - if (!c->marks.tag) - { - u32 bitlengths[2][2]; - - /* aad length */ - bitlengths[0][1] = be_bswap32(c->u_mode.gcm.aadlen[0] << 3); - bitlengths[0][0] = be_bswap32((c->u_mode.gcm.aadlen[0] >> 29) | - (c->u_mode.gcm.aadlen[1] << 3)); - /* data length */ - bitlengths[1][1] = be_bswap32(c->u_mode.gcm.datalen[0] << 3); - bitlengths[1][0] = be_bswap32((c->u_mode.gcm.datalen[0] >> 29) | - (c->u_mode.gcm.datalen[1] << 3)); - - /* Finalize data-stream. */ - do_ghash_buf(c, c->u_mode.gcm.u_tag.tag, NULL, 0, 1); - c->u_mode.gcm.ghash_aad_finalized = 1; - c->u_mode.gcm.ghash_data_finalized = 1; - - /* Add bitlengths to tag. */ - do_ghash_buf(c, c->u_mode.gcm.u_tag.tag, (byte*)bitlengths, - GCRY_GCM_BLOCK_LEN, 1); - buf_xor (c->u_mode.gcm.u_tag.tag, c->u_mode.gcm.tagiv, - c->u_mode.gcm.u_tag.tag, GCRY_GCM_BLOCK_LEN); - c->marks.tag = 1; - - wipememory (bitlengths, sizeof (bitlengths)); - wipememory (c->u_mode.gcm.macbuf, GCRY_GCM_BLOCK_LEN); - wipememory (c->u_mode.gcm.tagiv, GCRY_GCM_BLOCK_LEN); - wipememory (c->u_mode.gcm.aadlen, sizeof (c->u_mode.gcm.aadlen)); - wipememory (c->u_mode.gcm.datalen, sizeof (c->u_mode.gcm.datalen)); - } - - if (!check) - { - memcpy (outbuf, c->u_mode.gcm.u_tag.tag, outbuflen); - return GPG_ERR_NO_ERROR; - } - else - { - return buf_eq_const(outbuf, c->u_mode.gcm.u_tag.tag, outbuflen) ? - GPG_ERR_NO_ERROR : GPG_ERR_CHECKSUM; - } - - return 0; -} - - -gcry_err_code_t -_gcry_cipher_gcm_get_tag (gcry_cipher_hd_t c, unsigned char *outtag, - size_t taglen) -{ - /* Outputting authentication tag is part of encryption. */ - if (c->u_mode.gcm.disallow_encryption_because_of_setiv_in_fips_mode) - return GPG_ERR_INV_STATE; - - return _gcry_cipher_gcm_tag (c, outtag, taglen, 0); -} - -gcry_err_code_t -_gcry_cipher_gcm_check_tag (gcry_cipher_hd_t c, const unsigned char *intag, - size_t taglen) -{ - return _gcry_cipher_gcm_tag (c, (unsigned char *) intag, taglen, 1); -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-internal.h b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-internal.h deleted file mode 100644 index cdac445f..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-internal.h +++ /dev/null @@ -1,322 +0,0 @@ -/* cipher-internal.h - Internal defs for cipher.c - * Copyright (C) 2011 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifndef G10_CIPHER_INTERNAL_H -#define G10_CIPHER_INTERNAL_H - -/* The maximum supported size of a block in bytes. */ -#define MAX_BLOCKSIZE 16 - -/* Magic values for the context structure. */ -#define CTX_MAGIC_NORMAL 0x24091964 -#define CTX_MAGIC_SECURE 0x46919042 - -/* Try to use 16 byte aligned cipher context for better performance. - We use the aligned attribute, thus it is only possible to implement - this with gcc. */ -#undef NEED_16BYTE_ALIGNED_CONTEXT -#ifdef HAVE_GCC_ATTRIBUTE_ALIGNED -# define NEED_16BYTE_ALIGNED_CONTEXT 1 -#endif - -/* Undef this symbol to trade GCM speed for 256 bytes of memory per context */ -#define GCM_USE_TABLES 1 - - -/* GCM_USE_INTEL_PCLMUL inidicates whether to compile GCM with Intel PCLMUL - code. */ -#undef GCM_USE_INTEL_PCLMUL -#if defined(ENABLE_PCLMUL_SUPPORT) && defined(GCM_USE_TABLES) -# if ((defined(__i386__) && SIZEOF_UNSIGNED_LONG == 4) || defined(__x86_64__)) -# if __GNUC__ >= 4 -# define GCM_USE_INTEL_PCLMUL 1 -# endif -# endif -#endif /* GCM_USE_INTEL_PCLMUL */ - - -/* A VIA processor with the Padlock engine as well as the Intel AES_NI - instructions require an alignment of most data on a 16 byte - boundary. Because we trick out the compiler while allocating the - context, the align attribute as used in rijndael.c does not work on - its own. Thus we need to make sure that the entire context - structure is a aligned on that boundary. We achieve this by - defining a new type and use that instead of our usual alignment - type. */ -typedef union -{ - PROPERLY_ALIGNED_TYPE foo; -#ifdef NEED_16BYTE_ALIGNED_CONTEXT - char bar[16] __attribute__ ((aligned (16))); -#endif - char c[1]; -} cipher_context_alignment_t; - - -/* The handle structure. */ -struct gcry_cipher_handle -{ - int magic; - size_t actual_handle_size; /* Allocated size of this handle. */ - size_t handle_offset; /* Offset to the malloced block. */ - gcry_cipher_spec_t *spec; - - /* The algorithm id. This is a hack required because the module - interface does not easily allow to retrieve this value. */ - int algo; - - /* A structure with function pointers for bulk operations. Due to - limitations of the module system (we don't want to change the - API) we need to keep these function pointers here. The cipher - open function intializes them and the actual encryption routines - use them if they are not NULL. */ - struct { - void (*cfb_enc)(void *context, unsigned char *iv, - void *outbuf_arg, const void *inbuf_arg, - size_t nblocks); - void (*cfb_dec)(void *context, unsigned char *iv, - void *outbuf_arg, const void *inbuf_arg, - size_t nblocks); - void (*cbc_enc)(void *context, unsigned char *iv, - void *outbuf_arg, const void *inbuf_arg, - size_t nblocks, int cbc_mac); - void (*cbc_dec)(void *context, unsigned char *iv, - void *outbuf_arg, const void *inbuf_arg, - size_t nblocks); - void (*ctr_enc)(void *context, unsigned char *iv, - void *outbuf_arg, const void *inbuf_arg, - size_t nblocks); - } bulk; - - - int mode; - unsigned int flags; - - struct { - unsigned int key:1; /* Set to 1 if a key has been set. */ - unsigned int iv:1; /* Set to 1 if a IV has been set. */ - unsigned int tag:1; /* Set to 1 if a tag is finalized. */ - } marks; - - /* The initialization vector. For best performance we make sure - that it is properly aligned. In particular some implementations - of bulk operations expect an 16 byte aligned IV. IV is also used - to store CBC-MAC in CCM mode; counter IV is stored in U_CTR. */ - union { - cipher_context_alignment_t iv_align; - unsigned char iv[MAX_BLOCKSIZE]; - } u_iv; - - /* The counter for CTR mode. This field is also used by AESWRAP and - thus we can't use the U_IV union. */ - union { - cipher_context_alignment_t iv_align; - unsigned char ctr[MAX_BLOCKSIZE]; - } u_ctr; - - /* Space to save an IV or CTR for chaining operations. */ - unsigned char lastiv[MAX_BLOCKSIZE]; - int unused; /* Number of unused bytes in LASTIV. */ - - union { -#ifdef HAVE_U64_TYPEDEF - /* Mode specific storage for CCM mode. */ - struct { - u64 encryptlen; - u64 aadlen; - unsigned int authlen; - - /* Space to save partial input lengths for MAC. */ - unsigned char macbuf[GCRY_CCM_BLOCK_LEN]; - int mac_unused; /* Number of unprocessed bytes in MACBUF. */ - - unsigned char s0[GCRY_CCM_BLOCK_LEN]; - - unsigned int nonce:1;/* Set to 1 if nonce has been set. */ - unsigned int lengths:1; /* Set to 1 if CCM length parameters has been - processed. */ - } ccm; -#endif - - /* Mode specific storage for CMAC mode. */ - struct { - unsigned int tag:1; /* Set to 1 if tag has been finalized. */ - - /* Subkeys for tag creation, not cleared by gcry_cipher_reset. */ - unsigned char subkeys[2][MAX_BLOCKSIZE]; - } cmac; - - /* Mode specific storage for GCM mode. */ - struct { - /* The interim tag for GCM mode. */ - union { - cipher_context_alignment_t iv_align; - unsigned char tag[MAX_BLOCKSIZE]; - } u_tag; - - /* Space to save partial input lengths for MAC. */ - unsigned char macbuf[GCRY_CCM_BLOCK_LEN]; - int mac_unused; /* Number of unprocessed bytes in MACBUF. */ - - /* byte counters for GCM */ - u32 aadlen[2]; - u32 datalen[2]; - - /* encrypted tag counter */ - unsigned char tagiv[MAX_BLOCKSIZE]; - - unsigned int ghash_data_finalized:1; - unsigned int ghash_aad_finalized:1; - - unsigned int datalen_over_limits:1; - unsigned int disallow_encryption_because_of_setiv_in_fips_mode:1; - - /* --- Following members are not cleared in gcry_cipher_reset --- */ - - /* GHASH multiplier from key. */ - union { - cipher_context_alignment_t iv_align; - unsigned char key[MAX_BLOCKSIZE]; - } u_ghash_key; - -#ifdef GCM_USE_INTEL_PCLMUL - /* Use Intel PCLMUL instructions for accelerated GHASH. */ - unsigned int use_intel_pclmul:1; -#endif - - /* Pre-calculated table for GCM. */ -#ifdef GCM_USE_TABLES - #if defined(HAVE_U64_TYPEDEF) && (SIZEOF_UNSIGNED_LONG == 8 \ - || defined(__x86_64__)) - #define GCM_TABLES_USE_U64 1 - u64 gcm_table[2 * 16]; - #else - #undef GCM_TABLES_USE_U64 - u32 gcm_table[4 * 16]; - #endif -#endif - } gcm; - } u_mode; - - /* What follows are two contexts of the cipher in use. The first - one needs to be aligned well enough for the cipher operation - whereas the second one is a copy created by cipher_setkey and - used by cipher_reset. That second copy has no need for proper - aligment because it is only accessed by memcpy. */ - cipher_context_alignment_t context; -}; - - -/*-- cipher-cbc.c --*/ -gcry_err_code_t _gcry_cipher_cbc_encrypt -/* */ (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen); -gcry_err_code_t _gcry_cipher_cbc_decrypt -/* */ (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen); - -/*-- cipher-cfb.c --*/ -gcry_err_code_t _gcry_cipher_cfb_encrypt -/* */ (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen); -gcry_err_code_t _gcry_cipher_cfb_decrypt -/* */ (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen); - - -/*-- cipher-ofb.c --*/ -gcry_err_code_t _gcry_cipher_ofb_encrypt -/* */ (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen); - -/*-- cipher-ctr.c --*/ -gcry_err_code_t _gcry_cipher_ctr_encrypt -/* */ (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen); - - -/*-- cipher-aeswrap.c --*/ -gcry_err_code_t _gcry_cipher_aeswrap_encrypt -/* */ (gcry_cipher_hd_t c, - byte *outbuf, size_t outbuflen, - const byte *inbuf, size_t inbuflen); -gcry_err_code_t _gcry_cipher_aeswrap_decrypt -/* */ (gcry_cipher_hd_t c, - byte *outbuf, size_t outbuflen, - const byte *inbuf, size_t inbuflen); - - -/*-- cipher-ccm.c --*/ -gcry_err_code_t _gcry_cipher_ccm_encrypt -/* */ (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen); -gcry_err_code_t _gcry_cipher_ccm_decrypt -/* */ (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen); -gcry_err_code_t _gcry_cipher_ccm_set_nonce -/* */ (gcry_cipher_hd_t c, const unsigned char *nonce, - size_t noncelen); -gcry_err_code_t _gcry_cipher_ccm_authenticate -/* */ (gcry_cipher_hd_t c, const unsigned char *abuf, size_t abuflen); -#ifdef HAVE_U64_TYPEDEF -gcry_err_code_t _gcry_cipher_ccm_set_lengths -/* */ (gcry_cipher_hd_t c, u64 encryptedlen, u64 aadlen, u64 taglen); -#endif -gcry_err_code_t _gcry_cipher_ccm_get_tag -/* */ (gcry_cipher_hd_t c, - unsigned char *outtag, size_t taglen); -gcry_err_code_t _gcry_cipher_ccm_check_tag -/* */ (gcry_cipher_hd_t c, - const unsigned char *intag, size_t taglen); - - -/*-- cipher-gcm.c --*/ -gcry_err_code_t _gcry_cipher_gcm_encrypt -/* */ (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen); -gcry_err_code_t _gcry_cipher_gcm_decrypt -/* */ (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen); -gcry_err_code_t _gcry_cipher_gcm_setiv -/* */ (gcry_cipher_hd_t c, - const unsigned char *iv, size_t ivlen); -gcry_err_code_t _gcry_cipher_gcm_authenticate -/* */ (gcry_cipher_hd_t c, - const unsigned char *aadbuf, size_t aadbuflen); -gcry_err_code_t _gcry_cipher_gcm_get_tag -/* */ (gcry_cipher_hd_t c, - unsigned char *outtag, size_t taglen); -gcry_err_code_t _gcry_cipher_gcm_check_tag -/* */ (gcry_cipher_hd_t c, - const unsigned char *intag, size_t taglen); -void _gcry_cipher_gcm_setkey -/* */ (gcry_cipher_hd_t c); - - -#endif /*G10_CIPHER_INTERNAL_H*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-ofb.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-ofb.c deleted file mode 100644 index 3842774f..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-ofb.c +++ /dev/null @@ -1,96 +0,0 @@ -/* cipher-ofb.c - Generic OFB mode implementation - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 - * 2005, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "ath.h" -#include "bufhelp.h" -#include "./cipher-internal.h" - - -gcry_err_code_t -_gcry_cipher_ofb_encrypt (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen) -{ - unsigned char *ivp; - gcry_cipher_encrypt_t enc_fn = c->spec->encrypt; - size_t blocksize = c->spec->blocksize; - unsigned int burn, nburn; - - if (outbuflen < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - - if ( inbuflen <= c->unused ) - { - /* Short enough to be encoded by the remaining XOR mask. */ - /* XOR the input with the IV */ - ivp = c->u_iv.iv + blocksize - c->unused; - buf_xor(outbuf, ivp, inbuf, inbuflen); - c->unused -= inbuflen; - return 0; - } - - burn = 0; - - if( c->unused ) - { - inbuflen -= c->unused; - ivp = c->u_iv.iv + blocksize - c->unused; - buf_xor(outbuf, ivp, inbuf, c->unused); - outbuf += c->unused; - inbuf += c->unused; - c->unused = 0; - } - - /* Now we can process complete blocks. */ - while ( inbuflen >= blocksize ) - { - /* Encrypt the IV (and save the current one). */ - nburn = enc_fn ( &c->context.c, c->u_iv.iv, c->u_iv.iv ); - burn = nburn > burn ? nburn : burn; - buf_xor(outbuf, c->u_iv.iv, inbuf, blocksize); - outbuf += blocksize; - inbuf += blocksize; - inbuflen -= blocksize; - } - if ( inbuflen ) - { /* process the remaining bytes */ - nburn = enc_fn ( &c->context.c, c->u_iv.iv, c->u_iv.iv ); - burn = nburn > burn ? nburn : burn; - c->unused = blocksize; - c->unused -= inbuflen; - buf_xor(outbuf, c->u_iv.iv, inbuf, inbuflen); - outbuf += inbuflen; - inbuf += inbuflen; - inbuflen = 0; - } - - if (burn > 0) - _gcry_burn_stack (burn + 4 * sizeof(void *)); - - return 0; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-selftest.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-selftest.c deleted file mode 100644 index bb33d942..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-selftest.c +++ /dev/null @@ -1,470 +0,0 @@ -/* cipher-selftest.c - Helper functions for bulk encryption selftests. - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#ifdef HAVE_SYSLOG -# include -#endif /*HAVE_SYSLOG*/ - -#include "types.h" -#include "g10lib.h" -#include "cipher.h" -#include "bufhelp.h" -#include "cipher-selftest.h" - -#ifdef HAVE_STDINT_H -# include /* uintptr_t */ -#elif defined(HAVE_INTTYPES_H) -# include -#else -/* In this case, uintptr_t is provided by config.h. */ -#endif - -/* Helper macro to force alignment to 16 bytes. */ -#ifdef HAVE_GCC_ATTRIBUTE_ALIGNED -# define ATTR_ALIGNED_16 __attribute__ ((aligned (16))) -#else -# define ATTR_ALIGNED_16 -#endif - - -/* Run the self-tests for -CBC-, tests bulk CBC - decryption. Returns NULL on success. */ -const char * -_gcry_selftest_helper_cbc (const char *cipher, gcry_cipher_setkey_t setkey_func, - gcry_cipher_encrypt_t encrypt_one, - gcry_cipher_bulk_cbc_dec_t bulk_cbc_dec, - const int nblocks, const int blocksize, - const int context_size) -{ - int i, offs; - unsigned char *ctx, *plaintext, *plaintext2, *ciphertext, *iv, *iv2, *mem; - unsigned int ctx_aligned_size, memsize; - - static const unsigned char key[16] ATTR_ALIGNED_16 = { - 0x66,0x9A,0x00,0x7F,0xC7,0x6A,0x45,0x9F, - 0x98,0xBA,0xF9,0x17,0xFE,0xDF,0x95,0x22 - }; - - /* Allocate buffers, align first two elements to 16 bytes and latter to - block size. */ - ctx_aligned_size = context_size + 15; - ctx_aligned_size -= ctx_aligned_size & 0xf; - - memsize = ctx_aligned_size + (blocksize * 2) + (blocksize * nblocks * 3) + 16; - - mem = xtrycalloc (1, memsize); - if (!mem) - return "failed to allocate memory"; - - offs = (16 - ((uintptr_t)mem & 15)) & 15; - ctx = (void*)(mem + offs); - iv = ctx + ctx_aligned_size; - iv2 = iv + blocksize; - plaintext = iv2 + blocksize; - plaintext2 = plaintext + nblocks * blocksize; - ciphertext = plaintext2 + nblocks * blocksize; - - /* Initialize ctx */ - setkey_func (ctx, key, sizeof(key)); - - /* Test single block code path */ - memset (iv, 0x4e, blocksize); - memset (iv2, 0x4e, blocksize); - for (i = 0; i < blocksize; i++) - plaintext[i] = i; - - /* CBC manually. */ - buf_xor (ciphertext, iv, plaintext, blocksize); - encrypt_one (ctx, ciphertext, ciphertext); - memcpy (iv, ciphertext, blocksize); - - /* CBC decrypt. */ - bulk_cbc_dec (ctx, iv2, plaintext2, ciphertext, 1); - if (memcmp (plaintext2, plaintext, blocksize)) - { - xfree (mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CBC-%d test failed (plaintext mismatch)", cipher, - blocksize * 8); -#endif - return "selftest for CBC failed - see syslog for details"; - } - - if (memcmp (iv2, iv, blocksize)) - { - xfree (mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CBC-%d test failed (IV mismatch)", cipher, blocksize * 8); -#endif - return "selftest for CBC failed - see syslog for details"; - } - - /* Test parallelized code paths */ - memset (iv, 0x5f, blocksize); - memset (iv2, 0x5f, blocksize); - - for (i = 0; i < nblocks * blocksize; i++) - plaintext[i] = i; - - /* Create CBC ciphertext manually. */ - for (i = 0; i < nblocks * blocksize; i+=blocksize) - { - buf_xor (&ciphertext[i], iv, &plaintext[i], blocksize); - encrypt_one (ctx, &ciphertext[i], &ciphertext[i]); - memcpy (iv, &ciphertext[i], blocksize); - } - - /* Decrypt using bulk CBC and compare result. */ - bulk_cbc_dec (ctx, iv2, plaintext2, ciphertext, nblocks); - - if (memcmp (plaintext2, plaintext, nblocks * blocksize)) - { - xfree (mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CBC-%d test failed (plaintext mismatch, parallel path)", - cipher, blocksize * 8); -#endif - return "selftest for CBC failed - see syslog for details"; - } - if (memcmp (iv2, iv, blocksize)) - { - xfree (mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CBC-%d test failed (IV mismatch, parallel path)", - cipher, blocksize * 8); -#endif - return "selftest for CBC failed - see syslog for details"; - } - - xfree (mem); - return NULL; -} - -/* Run the self-tests for -CFB-, tests bulk CFB - decryption. Returns NULL on success. */ -const char * -_gcry_selftest_helper_cfb (const char *cipher, gcry_cipher_setkey_t setkey_func, - gcry_cipher_encrypt_t encrypt_one, - gcry_cipher_bulk_cfb_dec_t bulk_cfb_dec, - const int nblocks, const int blocksize, - const int context_size) -{ - int i, offs; - unsigned char *ctx, *plaintext, *plaintext2, *ciphertext, *iv, *iv2, *mem; - unsigned int ctx_aligned_size, memsize; - - static const unsigned char key[16] ATTR_ALIGNED_16 = { - 0x11,0x9A,0x00,0x7F,0xC7,0x6A,0x45,0x9F, - 0x98,0xBA,0xF9,0x17,0xFE,0xDF,0x95,0x33 - }; - - /* Allocate buffers, align first two elements to 16 bytes and latter to - block size. */ - ctx_aligned_size = context_size + 15; - ctx_aligned_size -= ctx_aligned_size & 0xf; - - memsize = ctx_aligned_size + (blocksize * 2) + (blocksize * nblocks * 3) + 16; - - mem = xtrycalloc (1, memsize); - if (!mem) - return "failed to allocate memory"; - - offs = (16 - ((uintptr_t)mem & 15)) & 15; - ctx = (void*)(mem + offs); - iv = ctx + ctx_aligned_size; - iv2 = iv + blocksize; - plaintext = iv2 + blocksize; - plaintext2 = plaintext + nblocks * blocksize; - ciphertext = plaintext2 + nblocks * blocksize; - - /* Initialize ctx */ - setkey_func (ctx, key, sizeof(key)); - - /* Test single block code path */ - memset(iv, 0xd3, blocksize); - memset(iv2, 0xd3, blocksize); - for (i = 0; i < blocksize; i++) - plaintext[i] = i; - - /* CFB manually. */ - encrypt_one (ctx, ciphertext, iv); - buf_xor_2dst (iv, ciphertext, plaintext, blocksize); - - /* CFB decrypt. */ - bulk_cfb_dec (ctx, iv2, plaintext2, ciphertext, 1); - if (memcmp(plaintext2, plaintext, blocksize)) - { - xfree(mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CFB-%d test failed (plaintext mismatch)", cipher, - blocksize * 8); -#endif - return "selftest for CFB failed - see syslog for details"; - } - - if (memcmp(iv2, iv, blocksize)) - { - xfree(mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CFB-%d test failed (IV mismatch)", cipher, blocksize * 8); -#endif - return "selftest for CFB failed - see syslog for details"; - } - - /* Test parallelized code paths */ - memset(iv, 0xe6, blocksize); - memset(iv2, 0xe6, blocksize); - - for (i = 0; i < nblocks * blocksize; i++) - plaintext[i] = i; - - /* Create CFB ciphertext manually. */ - for (i = 0; i < nblocks * blocksize; i+=blocksize) - { - encrypt_one (ctx, &ciphertext[i], iv); - buf_xor_2dst (iv, &ciphertext[i], &plaintext[i], blocksize); - } - - /* Decrypt using bulk CBC and compare result. */ - bulk_cfb_dec (ctx, iv2, plaintext2, ciphertext, nblocks); - - if (memcmp(plaintext2, plaintext, nblocks * blocksize)) - { - xfree(mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CFB-%d test failed (plaintext mismatch, parallel path)", - cipher, blocksize * 8); -#endif - return "selftest for CFB failed - see syslog for details"; - } - if (memcmp(iv2, iv, blocksize)) - { - xfree(mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CFB-%d test failed (IV mismatch, parallel path)", cipher, - blocksize * 8); -#endif - return "selftest for CFB failed - see syslog for details"; - } - - xfree(mem); - return NULL; -} - -/* Run the self-tests for -CTR-, tests IV increment - of bulk CTR encryption. Returns NULL on success. */ -const char * -_gcry_selftest_helper_ctr (const char *cipher, gcry_cipher_setkey_t setkey_func, - gcry_cipher_encrypt_t encrypt_one, - gcry_cipher_bulk_ctr_enc_t bulk_ctr_enc, - const int nblocks, const int blocksize, - const int context_size) -{ - int i, j, offs, diff; - unsigned char *ctx, *plaintext, *plaintext2, *ciphertext, *ciphertext2, - *iv, *iv2, *mem; - unsigned int ctx_aligned_size, memsize; - - static const unsigned char key[16] ATTR_ALIGNED_16 = { - 0x06,0x9A,0x00,0x7F,0xC7,0x6A,0x45,0x9F, - 0x98,0xBA,0xF9,0x17,0xFE,0xDF,0x95,0x21 - }; - - /* Allocate buffers, align first two elements to 16 bytes and latter to - block size. */ - ctx_aligned_size = context_size + 15; - ctx_aligned_size -= ctx_aligned_size & 0xf; - - memsize = ctx_aligned_size + (blocksize * 2) + (blocksize * nblocks * 4) + 16; - - mem = xtrycalloc (1, memsize); - if (!mem) - return "failed to allocate memory"; - - offs = (16 - ((uintptr_t)mem & 15)) & 15; - ctx = (void*)(mem + offs); - iv = ctx + ctx_aligned_size; - iv2 = iv + blocksize; - plaintext = iv2 + blocksize; - plaintext2 = plaintext + nblocks * blocksize; - ciphertext = plaintext2 + nblocks * blocksize; - ciphertext2 = ciphertext + nblocks * blocksize; - - /* Initialize ctx */ - setkey_func (ctx, key, sizeof(key)); - - /* Test single block code path */ - memset (iv, 0xff, blocksize); - for (i = 0; i < blocksize; i++) - plaintext[i] = i; - - /* CTR manually. */ - encrypt_one (ctx, ciphertext, iv); - for (i = 0; i < blocksize; i++) - ciphertext[i] ^= plaintext[i]; - for (i = blocksize; i > 0; i--) - { - iv[i-1]++; - if (iv[i-1]) - break; - } - - memset (iv2, 0xff, blocksize); - bulk_ctr_enc (ctx, iv2, plaintext2, ciphertext, 1); - - if (memcmp (plaintext2, plaintext, blocksize)) - { - xfree (mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CTR-%d test failed (plaintext mismatch)", cipher, - blocksize * 8); -#endif - return "selftest for CTR failed - see syslog for details"; - } - - if (memcmp (iv2, iv, blocksize)) - { - xfree (mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CTR-%d test failed (IV mismatch)", cipher, - blocksize * 8); -#endif - return "selftest for CTR failed - see syslog for details"; - } - - /* Test bulk encryption with typical IV. */ - memset(iv, 0x57, blocksize-4); - iv[blocksize-1] = 1; - iv[blocksize-2] = 0; - iv[blocksize-3] = 0; - iv[blocksize-4] = 0; - memset(iv2, 0x57, blocksize-4); - iv2[blocksize-1] = 1; - iv2[blocksize-2] = 0; - iv2[blocksize-3] = 0; - iv2[blocksize-4] = 0; - - for (i = 0; i < blocksize * nblocks; i++) - plaintext2[i] = plaintext[i] = i; - - /* Create CTR ciphertext manually. */ - for (i = 0; i < blocksize * nblocks; i+=blocksize) - { - encrypt_one (ctx, &ciphertext[i], iv); - for (j = 0; j < blocksize; j++) - ciphertext[i+j] ^= plaintext[i+j]; - for (j = blocksize; j > 0; j--) - { - iv[j-1]++; - if (iv[j-1]) - break; - } - } - - bulk_ctr_enc (ctx, iv2, ciphertext2, plaintext2, nblocks); - - if (memcmp (ciphertext2, ciphertext, blocksize * nblocks)) - { - xfree (mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CTR-%d test failed (ciphertext mismatch, bulk)", cipher, - blocksize * 8); -#endif - return "selftest for CTR failed - see syslog for details"; - } - if (memcmp(iv2, iv, blocksize)) - { - xfree (mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CTR-%d test failed (IV mismatch, bulk)", cipher, - blocksize * 8); -#endif - return "selftest for CTR failed - see syslog for details"; - } - - /* Test parallelized code paths (check counter overflow handling) */ - for (diff = 0; diff < nblocks; diff++) { - memset(iv, 0xff, blocksize); - iv[blocksize-1] -= diff; - iv[0] = iv[1] = 0; - iv[2] = 0x07; - - for (i = 0; i < blocksize * nblocks; i++) - plaintext[i] = i; - - /* Create CTR ciphertext manually. */ - for (i = 0; i < blocksize * nblocks; i+=blocksize) - { - encrypt_one (ctx, &ciphertext[i], iv); - for (j = 0; j < blocksize; j++) - ciphertext[i+j] ^= plaintext[i+j]; - for (j = blocksize; j > 0; j--) - { - iv[j-1]++; - if (iv[j-1]) - break; - } - } - - /* Decrypt using bulk CTR and compare result. */ - memset(iv2, 0xff, blocksize); - iv2[blocksize-1] -= diff; - iv2[0] = iv2[1] = 0; - iv2[2] = 0x07; - - bulk_ctr_enc (ctx, iv2, plaintext2, ciphertext, nblocks); - - if (memcmp (plaintext2, plaintext, blocksize * nblocks)) - { - xfree (mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CTR-%d test failed (plaintext mismatch, diff: %d)", cipher, - blocksize * 8, diff); -#endif - return "selftest for CTR failed - see syslog for details"; - } - if (memcmp(iv2, iv, blocksize)) - { - xfree (mem); -#ifdef HAVE_SYSLOG - syslog (LOG_USER|LOG_WARNING, "Libgcrypt warning: " - "%s-CTR-%d test failed (IV mismatch, diff: %d)", cipher, - blocksize * 8, diff); -#endif - return "selftest for CTR failed - see syslog for details"; - } - } - - xfree (mem); - return NULL; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-selftest.h b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-selftest.h deleted file mode 100644 index 3a0fe98f..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher-selftest.h +++ /dev/null @@ -1,67 +0,0 @@ -/* cipher-selftest.h - Helper functions for bulk encryption selftests. - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifndef G10_SELFTEST_HELP_H -#define G10_SELFTEST_HELP_H - -#include -#include "types.h" -#include "g10lib.h" -#include "cipher.h" - -typedef void (*gcry_cipher_bulk_cbc_dec_t)(void *context, unsigned char *iv, - void *outbuf_arg, - const void *inbuf_arg, - size_t nblocks); - -typedef void (*gcry_cipher_bulk_cfb_dec_t)(void *context, unsigned char *iv, - void *outbuf_arg, - const void *inbuf_arg, - size_t nblocks); - -typedef void (*gcry_cipher_bulk_ctr_enc_t)(void *context, unsigned char *iv, - void *outbuf_arg, - const void *inbuf_arg, - size_t nblocks); - -/* Helper function for bulk CBC decryption selftest */ -const char * -_gcry_selftest_helper_cbc (const char *cipher, gcry_cipher_setkey_t setkey, - gcry_cipher_encrypt_t encrypt_one, - gcry_cipher_bulk_cbc_dec_t bulk_cbc_dec, - const int nblocks, const int blocksize, - const int context_size); - -/* Helper function for bulk CFB decryption selftest */ -const char * -_gcry_selftest_helper_cfb (const char *cipher, gcry_cipher_setkey_t setkey, - gcry_cipher_encrypt_t encrypt_one, - gcry_cipher_bulk_cfb_dec_t bulk_cfb_dec, - const int nblocks, const int blocksize, - const int context_size); - -/* Helper function for bulk CTR encryption selftest */ -const char * -_gcry_selftest_helper_ctr (const char *cipher, gcry_cipher_setkey_t setkey, - gcry_cipher_encrypt_t encrypt_one, - gcry_cipher_bulk_ctr_enc_t bulk_ctr_enc, - const int nblocks, const int blocksize, - const int context_size); - -#endif /*G10_SELFTEST_HELP_H*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher.c b/src/hos_libhttpserver/src/libgcrypt/cipher/cipher.c deleted file mode 100644 index 8c5a0b4e..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/cipher.c +++ /dev/null @@ -1,1393 +0,0 @@ -/* cipher.c - cipher dispatcher - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 - * 2005, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "ath.h" -#include "./cipher-internal.h" - - -/* This is the list of the default ciphers, which are included in - libgcrypt. */ -static gcry_cipher_spec_t *cipher_list[] = - { -#if USE_BLOWFISH - &_gcry_cipher_spec_blowfish, -#endif -#if USE_DES - &_gcry_cipher_spec_des, - &_gcry_cipher_spec_tripledes, -#endif -#if USE_ARCFOUR - &_gcry_cipher_spec_arcfour, -#endif -#if USE_CAST5 - &_gcry_cipher_spec_cast5, -#endif -#if USE_AES - &_gcry_cipher_spec_aes, - &_gcry_cipher_spec_aes192, - &_gcry_cipher_spec_aes256, -#endif -#if USE_TWOFISH - &_gcry_cipher_spec_twofish, - &_gcry_cipher_spec_twofish128, -#endif -#if USE_SERPENT - &_gcry_cipher_spec_serpent128, - &_gcry_cipher_spec_serpent192, - &_gcry_cipher_spec_serpent256, -#endif -#if USE_RFC2268 - &_gcry_cipher_spec_rfc2268_40, - &_gcry_cipher_spec_rfc2268_128, -#endif -#if USE_SEED - &_gcry_cipher_spec_seed, -#endif -#if USE_CAMELLIA - &_gcry_cipher_spec_camellia128, - &_gcry_cipher_spec_camellia192, - &_gcry_cipher_spec_camellia256, -#endif -#ifdef USE_IDEA - &_gcry_cipher_spec_idea, -#endif -#if USE_SALSA20 - &_gcry_cipher_spec_salsa20, - &_gcry_cipher_spec_salsa20r12, -#endif -#if USE_GOST28147 - &_gcry_cipher_spec_gost28147, -#endif - NULL - }; - - - - -static int -map_algo (int algo) -{ - return algo; -} - - -/* Return the spec structure for the cipher algorithm ALGO. For - an unknown algorithm NULL is returned. */ -static gcry_cipher_spec_t * -spec_from_algo (int algo) -{ - int idx; - gcry_cipher_spec_t *spec; - - algo = map_algo (algo); - - for (idx = 0; (spec = cipher_list[idx]); idx++) - if (algo == spec->algo) - return spec; - return NULL; -} - - -/* Lookup a cipher's spec by its name. */ -static gcry_cipher_spec_t * -spec_from_name (const char *name) -{ - gcry_cipher_spec_t *spec; - int idx; - const char **aliases; - - for (idx=0; (spec = cipher_list[idx]); idx++) - { - if (!stricmp (name, spec->name)) - return spec; - if (spec->aliases) - { - for (aliases = spec->aliases; *aliases; aliases++) - if (!stricmp (name, *aliases)) - return spec; - } - } - - return NULL; -} - - -/* Lookup a cipher's spec by its OID. */ -static gcry_cipher_spec_t * -spec_from_oid (const char *oid) -{ - gcry_cipher_spec_t *spec; - gcry_cipher_oid_spec_t *oid_specs; - int idx, j; - - for (idx=0; (spec = cipher_list[idx]); idx++) - { - oid_specs = spec->oids; - if (oid_specs) - { - for (j = 0; oid_specs[j].oid; j++) - if (!stricmp (oid, oid_specs[j].oid)) - return spec; - } - } - - return NULL; -} - - -/* Locate the OID in the oid table and return the spec or NULL if not - found. An optional "oid." or "OID." prefix in OID is ignored, the - OID is expected to be in standard IETF dotted notation. A pointer - to the OID specification of the module implementing this algorithm - is return in OID_SPEC unless passed as NULL.*/ -static gcry_cipher_spec_t * -search_oid (const char *oid, gcry_cipher_oid_spec_t *oid_spec) -{ - gcry_cipher_spec_t *spec; - int i; - - if (oid && ((! strncmp (oid, "oid.", 4)) - || (! strncmp (oid, "OID.", 4)))) - oid += 4; - - spec = spec_from_oid (oid); - if (spec && spec->oids) - { - for (i = 0; spec->oids[i].oid; i++) - if (!stricmp (oid, spec->oids[i].oid)) - { - if (oid_spec) - *oid_spec = spec->oids[i]; - return spec; - } - } - - return NULL; -} - - -/* Map STRING to the cipher algorithm identifier. Returns the - algorithm ID of the cipher for the given name or 0 if the name is - not known. It is valid to pass NULL for STRING which results in a - return value of 0. */ -int -_gcry_cipher_map_name (const char *string) -{ - gcry_cipher_spec_t *spec; - - if (!string) - return 0; - - /* If the string starts with a digit (optionally prefixed with - either "OID." or "oid."), we first look into our table of ASN.1 - object identifiers to figure out the algorithm */ - - spec = search_oid (string, NULL); - if (spec) - return spec->algo; - - spec = spec_from_name (string); - if (spec) - return spec->algo; - - return 0; -} - - -/* Given a STRING with an OID in dotted decimal notation, this - function returns the cipher mode (GCRY_CIPHER_MODE_*) associated - with that OID or 0 if no mode is known. Passing NULL for string - yields a return value of 0. */ -int -_gcry_cipher_mode_from_oid (const char *string) -{ - gcry_cipher_spec_t *spec; - gcry_cipher_oid_spec_t oid_spec; - - if (!string) - return 0; - - spec = search_oid (string, &oid_spec); - if (spec) - return oid_spec.mode; - - return 0; -} - - -/* Map the cipher algorithm identifier ALGORITHM to a string - representing this algorithm. This string is the default name as - used by Libgcrypt. A "?" is returned for an unknown algorithm. - NULL is never returned. */ -const char * -_gcry_cipher_algo_name (int algorithm) -{ - gcry_cipher_spec_t *spec; - - spec = spec_from_algo (algorithm); - return spec? spec->name : "?"; -} - - -/* Flag the cipher algorithm with the identifier ALGORITHM as - disabled. There is no error return, the function does nothing for - unknown algorithms. Disabled algorithms are virtually not - available in Libgcrypt. This is not thread safe and should thus be - called early. */ -static void -disable_cipher_algo (int algo) -{ - gcry_cipher_spec_t *spec = spec_from_algo (algo); - - if (spec) - spec->flags.disabled = 1; -} - - -/* Return 0 if the cipher algorithm with identifier ALGORITHM is - available. Returns a basic error code value if it is not - available. */ -static gcry_err_code_t -check_cipher_algo (int algorithm) -{ - gcry_cipher_spec_t *spec; - - spec = spec_from_algo (algorithm); - if (spec && !spec->flags.disabled) - return 0; - - return GPG_ERR_CIPHER_ALGO; -} - - -/* Return the standard length in bits of the key for the cipher - algorithm with the identifier ALGORITHM. */ -static unsigned int -cipher_get_keylen (int algorithm) -{ - gcry_cipher_spec_t *spec; - unsigned len = 0; - - spec = spec_from_algo (algorithm); - if (spec) - { - len = spec->keylen; - if (!len) - log_bug ("cipher %d w/o key length\n", algorithm); - } - - return len; -} - - -/* Return the block length of the cipher algorithm with the identifier - ALGORITHM. This function return 0 for an invalid algorithm. */ -static unsigned int -cipher_get_blocksize (int algorithm) -{ - gcry_cipher_spec_t *spec; - unsigned len = 0; - - spec = spec_from_algo (algorithm); - if (spec) - { - len = spec->blocksize; - if (!len) - log_bug ("cipher %d w/o blocksize\n", algorithm); - } - - return len; -} - - -/* - Open a cipher handle for use with cipher algorithm ALGORITHM, using - the cipher mode MODE (one of the GCRY_CIPHER_MODE_*) and return a - handle in HANDLE. Put NULL into HANDLE and return an error code if - something goes wrong. FLAGS may be used to modify the - operation. The defined flags are: - - GCRY_CIPHER_SECURE: allocate all internal buffers in secure memory. - GCRY_CIPHER_ENABLE_SYNC: Enable the sync operation as used in OpenPGP. - GCRY_CIPHER_CBC_CTS: Enable CTS mode. - GCRY_CIPHER_CBC_MAC: Enable MAC mode. - - Values for these flags may be combined using OR. - */ -gcry_err_code_t -_gcry_cipher_open (gcry_cipher_hd_t *handle, - int algo, int mode, unsigned int flags) -{ - gcry_err_code_t rc; - gcry_cipher_hd_t h = NULL; - - if (mode >= GCRY_CIPHER_MODE_INTERNAL) - rc = GPG_ERR_INV_CIPHER_MODE; - else - rc = _gcry_cipher_open_internal (&h, algo, mode, flags); - - *handle = rc ? NULL : h; - - return rc; -} - - -gcry_err_code_t -_gcry_cipher_open_internal (gcry_cipher_hd_t *handle, - int algo, int mode, unsigned int flags) -{ - int secure = (flags & GCRY_CIPHER_SECURE); - gcry_cipher_spec_t *spec; - gcry_cipher_hd_t h = NULL; - gcry_err_code_t err; - - /* If the application missed to call the random poll function, we do - it here to ensure that it is used once in a while. */ - _gcry_fast_random_poll (); - - spec = spec_from_algo (algo); - if (!spec) - err = GPG_ERR_CIPHER_ALGO; - else if (spec->flags.disabled) - err = GPG_ERR_CIPHER_ALGO; - else - err = 0; - - /* check flags */ - if ((! err) - && ((flags & ~(0 - | GCRY_CIPHER_SECURE - | GCRY_CIPHER_ENABLE_SYNC - | GCRY_CIPHER_CBC_CTS - | GCRY_CIPHER_CBC_MAC)) - || (flags & GCRY_CIPHER_CBC_CTS & GCRY_CIPHER_CBC_MAC))) - err = GPG_ERR_CIPHER_ALGO; - - /* check that a valid mode has been requested */ - if (! err) - switch (mode) - { - case GCRY_CIPHER_MODE_CCM: -#ifdef HAVE_U64_TYPEDEF - if (spec->blocksize != GCRY_CCM_BLOCK_LEN) - err = GPG_ERR_INV_CIPHER_MODE; - if (!spec->encrypt || !spec->decrypt) - err = GPG_ERR_INV_CIPHER_MODE; - break; -#else - err = GPG_ERR_NOT_SUPPORTED; -#endif - - case GCRY_CIPHER_MODE_ECB: - case GCRY_CIPHER_MODE_CBC: - case GCRY_CIPHER_MODE_CFB: - case GCRY_CIPHER_MODE_OFB: - case GCRY_CIPHER_MODE_CTR: - case GCRY_CIPHER_MODE_AESWRAP: - case GCRY_CIPHER_MODE_CMAC: - case GCRY_CIPHER_MODE_GCM: - if (!spec->encrypt || !spec->decrypt) - err = GPG_ERR_INV_CIPHER_MODE; - break; - - case GCRY_CIPHER_MODE_STREAM: - if (!spec->stencrypt || !spec->stdecrypt) - err = GPG_ERR_INV_CIPHER_MODE; - break; - - case GCRY_CIPHER_MODE_NONE: - /* This mode may be used for debugging. It copies the main - text verbatim to the ciphertext. We do not allow this in - fips mode or if no debug flag has been set. */ - if (fips_mode () || !_gcry_get_debug_flag (0)) - err = GPG_ERR_INV_CIPHER_MODE; - break; - - default: - err = GPG_ERR_INV_CIPHER_MODE; - } - - /* Perform selftest here and mark this with a flag in cipher_table? - No, we should not do this as it takes too long. Further it does - not make sense to exclude algorithms with failing selftests at - runtime: If a selftest fails there is something seriously wrong with the system and thus we better die immediately. */ - - if (! err) - { - size_t size = (sizeof (*h) - + 2 * spec->contextsize - - sizeof (cipher_context_alignment_t) -#ifdef NEED_16BYTE_ALIGNED_CONTEXT - + 15 /* Space for leading alignment gap. */ -#endif /*NEED_16BYTE_ALIGNED_CONTEXT*/ - ); - - if (secure) - h = xtrycalloc_secure (1, size); - else - h = xtrycalloc (1, size); - - if (! h) - err = gpg_err_code_from_syserror (); - else - { - size_t off = 0; - -#ifdef NEED_16BYTE_ALIGNED_CONTEXT - if ( ((unsigned long)h & 0x0f) ) - { - /* The malloced block is not aligned on a 16 byte - boundary. Correct for this. */ - off = 16 - ((unsigned long)h & 0x0f); - h = (void*)((char*)h + off); - } -#endif /*NEED_16BYTE_ALIGNED_CONTEXT*/ - - h->magic = secure ? CTX_MAGIC_SECURE : CTX_MAGIC_NORMAL; - h->actual_handle_size = size - off; - h->handle_offset = off; - h->spec = spec; - h->algo = algo; - h->mode = mode; - h->flags = flags; - - /* Setup bulk encryption routines. */ - switch (algo) - { -#ifdef USE_AES - case GCRY_CIPHER_AES128: - case GCRY_CIPHER_AES192: - case GCRY_CIPHER_AES256: - h->bulk.cfb_enc = _gcry_aes_cfb_enc; - h->bulk.cfb_dec = _gcry_aes_cfb_dec; - h->bulk.cbc_enc = _gcry_aes_cbc_enc; - h->bulk.cbc_dec = _gcry_aes_cbc_dec; - h->bulk.ctr_enc = _gcry_aes_ctr_enc; - break; -#endif /*USE_AES*/ -#ifdef USE_BLOWFISH - case GCRY_CIPHER_BLOWFISH: - h->bulk.cfb_dec = _gcry_blowfish_cfb_dec; - h->bulk.cbc_dec = _gcry_blowfish_cbc_dec; - h->bulk.ctr_enc = _gcry_blowfish_ctr_enc; - break; -#endif /*USE_BLOWFISH*/ -#ifdef USE_CAST5 - case GCRY_CIPHER_CAST5: - h->bulk.cfb_dec = _gcry_cast5_cfb_dec; - h->bulk.cbc_dec = _gcry_cast5_cbc_dec; - h->bulk.ctr_enc = _gcry_cast5_ctr_enc; - break; -#endif /*USE_CAMELLIA*/ -#ifdef USE_CAMELLIA - case GCRY_CIPHER_CAMELLIA128: - case GCRY_CIPHER_CAMELLIA192: - case GCRY_CIPHER_CAMELLIA256: - h->bulk.cbc_dec = _gcry_camellia_cbc_dec; - h->bulk.cfb_dec = _gcry_camellia_cfb_dec; - h->bulk.ctr_enc = _gcry_camellia_ctr_enc; - break; -#endif /*USE_CAMELLIA*/ -#ifdef USE_SERPENT - case GCRY_CIPHER_SERPENT128: - case GCRY_CIPHER_SERPENT192: - case GCRY_CIPHER_SERPENT256: - h->bulk.cbc_dec = _gcry_serpent_cbc_dec; - h->bulk.cfb_dec = _gcry_serpent_cfb_dec; - h->bulk.ctr_enc = _gcry_serpent_ctr_enc; - break; -#endif /*USE_SERPENT*/ -#ifdef USE_TWOFISH - case GCRY_CIPHER_TWOFISH: - case GCRY_CIPHER_TWOFISH128: - h->bulk.cbc_dec = _gcry_twofish_cbc_dec; - h->bulk.cfb_dec = _gcry_twofish_cfb_dec; - h->bulk.ctr_enc = _gcry_twofish_ctr_enc; - break; -#endif /*USE_TWOFISH*/ - - default: - break; - } - } - } - - /* Done. */ - - *handle = err ? NULL : h; - - return gcry_error (err); -} - - -/* Release all resources associated with the cipher handle H. H may be - NULL in which case this is a no-operation. */ -void -_gcry_cipher_close (gcry_cipher_hd_t h) -{ - size_t off; - - if (!h) - return; - - if ((h->magic != CTX_MAGIC_SECURE) - && (h->magic != CTX_MAGIC_NORMAL)) - _gcry_fatal_error(GPG_ERR_INTERNAL, - "gcry_cipher_close: already closed/invalid handle"); - else - h->magic = 0; - - /* We always want to wipe out the memory even when the context has - been allocated in secure memory. The user might have disabled - secure memory or is using his own implementation which does not - do the wiping. To accomplish this we need to keep track of the - actual size of this structure because we have no way to known - how large the allocated area was when using a standard malloc. */ - off = h->handle_offset; - wipememory (h, h->actual_handle_size); - - xfree ((char*)h - off); -} - - -/* Set the key to be used for the encryption context C to KEY with - length KEYLEN. The length should match the required length. */ -static gcry_err_code_t -cipher_setkey (gcry_cipher_hd_t c, byte *key, size_t keylen) -{ - gcry_err_code_t rc; - - rc = c->spec->setkey (&c->context.c, key, keylen); - if (!rc) - { - /* Duplicate initial context. */ - memcpy ((void *) ((char *) &c->context.c + c->spec->contextsize), - (void *) &c->context.c, - c->spec->contextsize); - c->marks.key = 1; - - switch (c->mode) - { - case GCRY_CIPHER_MODE_CMAC: - _gcry_cipher_cmac_set_subkeys (c); - break; - - case GCRY_CIPHER_MODE_GCM: - _gcry_cipher_gcm_setkey (c); - break; - - default: - break; - }; - } - else - c->marks.key = 0; - - return rc; -} - - -/* Set the IV to be used for the encryption context C to IV with - length IVLEN. The length should match the required length. */ -static gcry_err_code_t -cipher_setiv (gcry_cipher_hd_t c, const byte *iv, size_t ivlen) -{ - /* GCM has its own IV handler */ - if (c->mode == GCRY_CIPHER_MODE_GCM) - return _gcry_cipher_gcm_setiv (c, iv, ivlen); - - /* If the cipher has its own IV handler, we use only this one. This - is currently used for stream ciphers requiring a nonce. */ - if (c->spec->setiv) - { - c->spec->setiv (&c->context.c, iv, ivlen); - return 0; - } - - memset (c->u_iv.iv, 0, c->spec->blocksize); - if (iv) - { - if (ivlen != c->spec->blocksize) - { - log_info ("WARNING: cipher_setiv: ivlen=%u blklen=%u\n", - (unsigned int)ivlen, (unsigned int)c->spec->blocksize); - fips_signal_error ("IV length does not match blocklength"); - } - if (ivlen > c->spec->blocksize) - ivlen = c->spec->blocksize; - memcpy (c->u_iv.iv, iv, ivlen); - c->marks.iv = 1; - } - else - c->marks.iv = 0; - c->unused = 0; - - return 0; -} - - -/* Reset the cipher context to the initial context. This is basically - the same as an release followed by a new. */ -static void -cipher_reset (gcry_cipher_hd_t c) -{ - unsigned int marks_key; - - marks_key = c->marks.key; - - memcpy (&c->context.c, - (char *) &c->context.c + c->spec->contextsize, - c->spec->contextsize); - memset (&c->marks, 0, sizeof c->marks); - memset (c->u_iv.iv, 0, c->spec->blocksize); - memset (c->lastiv, 0, c->spec->blocksize); - memset (c->u_ctr.ctr, 0, c->spec->blocksize); - c->unused = 0; - - c->marks.key = marks_key; - - switch (c->mode) - { - case GCRY_CIPHER_MODE_CMAC: - /* Only clear 'tag' for cmac, keep subkeys. */ - c->u_mode.cmac.tag = 0; - break; - - case GCRY_CIPHER_MODE_GCM: - /* Only clear head of u_mode, keep ghash_key and gcm_table. */ - { - byte *u_mode_pos = (void *)&c->u_mode; - byte *ghash_key_pos = c->u_mode.gcm.u_ghash_key.key; - size_t u_mode_head_length = ghash_key_pos - u_mode_pos; - - memset (&c->u_mode, 0, u_mode_head_length); - } - break; - -#ifdef HAVE_U64_TYPEDEF - case GCRY_CIPHER_MODE_CCM: - memset (&c->u_mode.ccm, 0, sizeof c->u_mode.ccm); - break; -#endif - - default: - break; /* u_mode unused by other modes. */ - } -} - - - -static gcry_err_code_t -do_ecb_crypt (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen, - gcry_cipher_encrypt_t crypt_fn) -{ - unsigned int blocksize = c->spec->blocksize; - size_t n, nblocks; - unsigned int burn, nburn; - - if (outbuflen < inbuflen) - return GPG_ERR_BUFFER_TOO_SHORT; - if ((inbuflen % blocksize)) - return GPG_ERR_INV_LENGTH; - - nblocks = inbuflen / blocksize; - burn = 0; - - for (n=0; n < nblocks; n++ ) - { - nburn = crypt_fn (&c->context.c, outbuf, inbuf); - burn = nburn > burn ? nburn : burn; - inbuf += blocksize; - outbuf += blocksize; - } - - if (burn > 0) - _gcry_burn_stack (burn + 4 * sizeof(void *)); - - return 0; -} - -static gcry_err_code_t -do_ecb_encrypt (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen) -{ - return do_ecb_crypt (c, outbuf, outbuflen, inbuf, inbuflen, c->spec->encrypt); -} - -static gcry_err_code_t -do_ecb_decrypt (gcry_cipher_hd_t c, - unsigned char *outbuf, size_t outbuflen, - const unsigned char *inbuf, size_t inbuflen) -{ - return do_ecb_crypt (c, outbuf, outbuflen, inbuf, inbuflen, c->spec->decrypt); -} - - -/**************** - * Encrypt INBUF to OUTBUF with the mode selected at open. - * inbuf and outbuf may overlap or be the same. - * Depending on the mode some constraints apply to INBUFLEN. - */ -static gcry_err_code_t -cipher_encrypt (gcry_cipher_hd_t c, byte *outbuf, size_t outbuflen, - const byte *inbuf, size_t inbuflen) -{ - gcry_err_code_t rc; - - switch (c->mode) - { - case GCRY_CIPHER_MODE_ECB: - rc = do_ecb_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_CBC: - rc = _gcry_cipher_cbc_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_CFB: - rc = _gcry_cipher_cfb_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_OFB: - rc = _gcry_cipher_ofb_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_CTR: - rc = _gcry_cipher_ctr_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_AESWRAP: - rc = _gcry_cipher_aeswrap_encrypt (c, outbuf, outbuflen, - inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_CCM: - rc = _gcry_cipher_ccm_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_CMAC: - rc = GPG_ERR_INV_CIPHER_MODE; - break; - - case GCRY_CIPHER_MODE_GCM: - rc = _gcry_cipher_gcm_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_STREAM: - c->spec->stencrypt (&c->context.c, - outbuf, (byte*)/*arggg*/inbuf, inbuflen); - rc = 0; - break; - - case GCRY_CIPHER_MODE_NONE: - if (fips_mode () || !_gcry_get_debug_flag (0)) - { - fips_signal_error ("cipher mode NONE used"); - rc = GPG_ERR_INV_CIPHER_MODE; - } - else - { - if (inbuf != outbuf) - memmove (outbuf, inbuf, inbuflen); - rc = 0; - } - break; - - default: - log_fatal ("cipher_encrypt: invalid mode %d\n", c->mode ); - rc = GPG_ERR_INV_CIPHER_MODE; - break; - } - - return rc; -} - - -/**************** - * Encrypt IN and write it to OUT. If IN is NULL, in-place encryption has - * been requested. - */ -gcry_err_code_t -_gcry_cipher_encrypt (gcry_cipher_hd_t h, void *out, size_t outsize, - const void *in, size_t inlen) -{ - gcry_err_code_t rc; - - if (!in) /* Caller requested in-place encryption. */ - { - in = out; - inlen = outsize; - } - - rc = cipher_encrypt (h, out, outsize, in, inlen); - - /* Failsafe: Make sure that the plaintext will never make it into - OUT if the encryption returned an error. */ - if (rc && out) - memset (out, 0x42, outsize); - - return rc; -} - - - -/**************** - * Decrypt INBUF to OUTBUF with the mode selected at open. - * inbuf and outbuf may overlap or be the same. - * Depending on the mode some some contraints apply to INBUFLEN. - */ -static gcry_err_code_t -cipher_decrypt (gcry_cipher_hd_t c, byte *outbuf, size_t outbuflen, - const byte *inbuf, size_t inbuflen) -{ - gcry_err_code_t rc; - - switch (c->mode) - { - case GCRY_CIPHER_MODE_ECB: - rc = do_ecb_decrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_CBC: - rc = _gcry_cipher_cbc_decrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_CFB: - rc = _gcry_cipher_cfb_decrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_OFB: - rc = _gcry_cipher_ofb_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_CTR: - rc = _gcry_cipher_ctr_encrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_AESWRAP: - rc = _gcry_cipher_aeswrap_decrypt (c, outbuf, outbuflen, - inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_CCM: - rc = _gcry_cipher_ccm_decrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_CMAC: - rc = GPG_ERR_INV_CIPHER_MODE; - break; - - case GCRY_CIPHER_MODE_GCM: - rc = _gcry_cipher_gcm_decrypt (c, outbuf, outbuflen, inbuf, inbuflen); - break; - - case GCRY_CIPHER_MODE_STREAM: - c->spec->stdecrypt (&c->context.c, - outbuf, (byte*)/*arggg*/inbuf, inbuflen); - rc = 0; - break; - - case GCRY_CIPHER_MODE_NONE: - if (fips_mode () || !_gcry_get_debug_flag (0)) - { - fips_signal_error ("cipher mode NONE used"); - rc = GPG_ERR_INV_CIPHER_MODE; - } - else - { - if (inbuf != outbuf) - memmove (outbuf, inbuf, inbuflen); - rc = 0; - } - break; - - default: - log_fatal ("cipher_decrypt: invalid mode %d\n", c->mode ); - rc = GPG_ERR_INV_CIPHER_MODE; - break; - } - - return rc; -} - - -gcry_err_code_t -_gcry_cipher_decrypt (gcry_cipher_hd_t h, void *out, size_t outsize, - const void *in, size_t inlen) -{ - if (!in) /* Caller requested in-place encryption. */ - { - in = out; - inlen = outsize; - } - - return cipher_decrypt (h, out, outsize, in, inlen); -} - - - -/**************** - * Used for PGP's somewhat strange CFB mode. Only works if - * the corresponding flag is set. - */ -static void -cipher_sync (gcry_cipher_hd_t c) -{ - if ((c->flags & GCRY_CIPHER_ENABLE_SYNC) && c->unused) - { - memmove (c->u_iv.iv + c->unused, - c->u_iv.iv, c->spec->blocksize - c->unused); - memcpy (c->u_iv.iv, - c->lastiv + c->spec->blocksize - c->unused, c->unused); - c->unused = 0; - } -} - - -gcry_err_code_t -_gcry_cipher_setkey (gcry_cipher_hd_t hd, const void *key, size_t keylen) -{ - return cipher_setkey (hd, (void*)key, keylen); -} - - -gcry_err_code_t -_gcry_cipher_setiv (gcry_cipher_hd_t hd, const void *iv, size_t ivlen) -{ - gcry_err_code_t rc = 0; - - switch (hd->mode) - { - case GCRY_CIPHER_MODE_CCM: - rc = _gcry_cipher_ccm_set_nonce (hd, iv, ivlen); - break; - - default: - rc = cipher_setiv (hd, iv, ivlen); - break; - } - return rc; -} - -/* Set counter for CTR mode. (CTR,CTRLEN) must denote a buffer of - block size length, or (NULL,0) to set the CTR to the all-zero - block. */ -gpg_err_code_t -_gcry_cipher_setctr (gcry_cipher_hd_t hd, const void *ctr, size_t ctrlen) -{ - if (ctr && ctrlen == hd->spec->blocksize) - { - memcpy (hd->u_ctr.ctr, ctr, hd->spec->blocksize); - hd->unused = 0; - } - else if (!ctr || !ctrlen) - { - memset (hd->u_ctr.ctr, 0, hd->spec->blocksize); - hd->unused = 0; - } - else - return GPG_ERR_INV_ARG; - - return 0; -} - - -gcry_err_code_t -_gcry_cipher_authenticate (gcry_cipher_hd_t hd, const void *abuf, - size_t abuflen) -{ - gcry_err_code_t rc; - - switch (hd->mode) - { - case GCRY_CIPHER_MODE_CCM: - rc = _gcry_cipher_ccm_authenticate (hd, abuf, abuflen); - break; - - case GCRY_CIPHER_MODE_CMAC: - rc = _gcry_cipher_cmac_authenticate (hd, abuf, abuflen); - break; - - case GCRY_CIPHER_MODE_GCM: - rc = _gcry_cipher_gcm_authenticate (hd, abuf, abuflen); - break; - - default: - log_error ("gcry_cipher_authenticate: invalid mode %d\n", hd->mode); - rc = GPG_ERR_INV_CIPHER_MODE; - break; - } - - return rc; -} - - -gcry_err_code_t -_gcry_cipher_gettag (gcry_cipher_hd_t hd, void *outtag, size_t taglen) -{ - gcry_err_code_t rc; - - switch (hd->mode) - { - case GCRY_CIPHER_MODE_CCM: - rc = _gcry_cipher_ccm_get_tag (hd, outtag, taglen); - break; - - case GCRY_CIPHER_MODE_CMAC: - rc = _gcry_cipher_cmac_get_tag (hd, outtag, taglen); - break; - - case GCRY_CIPHER_MODE_GCM: - rc = _gcry_cipher_gcm_get_tag (hd, outtag, taglen); - break; - - default: - log_error ("gcry_cipher_gettag: invalid mode %d\n", hd->mode); - rc = GPG_ERR_INV_CIPHER_MODE; - break; - } - - return rc; -} - - -gcry_err_code_t -_gcry_cipher_checktag (gcry_cipher_hd_t hd, const void *intag, size_t taglen) -{ - gcry_err_code_t rc; - - switch (hd->mode) - { - case GCRY_CIPHER_MODE_CCM: - rc = _gcry_cipher_ccm_check_tag (hd, intag, taglen); - break; - - case GCRY_CIPHER_MODE_CMAC: - rc = _gcry_cipher_cmac_check_tag (hd, intag, taglen); - break; - - case GCRY_CIPHER_MODE_GCM: - rc = _gcry_cipher_gcm_check_tag (hd, intag, taglen); - break; - - default: - log_error ("gcry_cipher_checktag: invalid mode %d\n", hd->mode); - rc = GPG_ERR_INV_CIPHER_MODE; - break; - } - - return rc; -} - - -gcry_err_code_t -_gcry_cipher_ctl (gcry_cipher_hd_t h, int cmd, void *buffer, size_t buflen) -{ - gcry_err_code_t rc = 0; - - switch (cmd) - { - case GCRYCTL_RESET: - cipher_reset (h); - break; - - case GCRYCTL_CFB_SYNC: - cipher_sync( h ); - break; - - case GCRYCTL_SET_CBC_CTS: - if (buflen) - if (h->flags & GCRY_CIPHER_CBC_MAC) - rc = GPG_ERR_INV_FLAG; - else - h->flags |= GCRY_CIPHER_CBC_CTS; - else - h->flags &= ~GCRY_CIPHER_CBC_CTS; - break; - - case GCRYCTL_SET_CBC_MAC: - if (buflen) - if (h->flags & GCRY_CIPHER_CBC_CTS) - rc = GPG_ERR_INV_FLAG; - else - h->flags |= GCRY_CIPHER_CBC_MAC; - else - h->flags &= ~GCRY_CIPHER_CBC_MAC; - break; - - case GCRYCTL_SET_CCM_LENGTHS: -#ifdef HAVE_U64_TYPEDEF - { - u64 params[3]; - size_t encryptedlen; - size_t aadlen; - size_t authtaglen; - - if (h->mode != GCRY_CIPHER_MODE_CCM) - return gcry_error (GPG_ERR_INV_CIPHER_MODE); - - if (!buffer || buflen != 3 * sizeof(u64)) - return gcry_error (GPG_ERR_INV_ARG); - - /* This command is used to pass additional length parameters needed - by CCM mode to initialize CBC-MAC. */ - memcpy (params, buffer, sizeof(params)); - encryptedlen = params[0]; - aadlen = params[1]; - authtaglen = params[2]; - - rc = _gcry_cipher_ccm_set_lengths (h, encryptedlen, aadlen, authtaglen); - } -#else - rc = GPG_ERR_NOT_SUPPORTED; -#endif - break; - - case GCRYCTL_DISABLE_ALGO: - /* This command expects NULL for H and BUFFER to point to an - integer with the algo number. */ - if( h || !buffer || buflen != sizeof(int) ) - return gcry_error (GPG_ERR_CIPHER_ALGO); - disable_cipher_algo( *(int*)buffer ); - break; - - case 61: /* Disable weak key detection (private). */ - if (h->spec->set_extra_info) - rc = h->spec->set_extra_info - (&h->context.c, CIPHER_INFO_NO_WEAK_KEY, NULL, 0); - else - rc = GPG_ERR_NOT_SUPPORTED; - break; - - case 62: /* Return current input vector (private). */ - /* This is the input block as used in CFB and OFB mode which has - initially been set as IV. The returned format is: - 1 byte Actual length of the block in bytes. - n byte The block. - If the provided buffer is too short, an error is returned. */ - if (buflen < (1 + h->spec->blocksize)) - rc = GPG_ERR_TOO_SHORT; - else - { - unsigned char *ivp; - unsigned char *dst = buffer; - int n = h->unused; - - if (!n) - n = h->spec->blocksize; - gcry_assert (n <= h->spec->blocksize); - *dst++ = n; - ivp = h->u_iv.iv + h->spec->blocksize - n; - while (n--) - *dst++ = *ivp++; - } - break; - - default: - rc = GPG_ERR_INV_OP; - } - - return rc; -} - - -/* Return information about the cipher handle H. CMD is the kind of - information requested. BUFFER and NBYTES are reserved for now. - - There are no values for CMD yet defined. - - The function always returns GPG_ERR_INV_OP. - - */ -gcry_err_code_t -_gcry_cipher_info (gcry_cipher_hd_t h, int cmd, void *buffer, size_t *nbytes) -{ - gcry_err_code_t rc = 0; - - (void)h; - (void)buffer; - (void)nbytes; - - switch (cmd) - { - default: - rc = GPG_ERR_INV_OP; - } - - return rc; -} - -/* Return information about the given cipher algorithm ALGO. - - WHAT select the kind of information returned: - - GCRYCTL_GET_KEYLEN: - Return the length of the key. If the algorithm ALGO - supports multiple key lengths, the maximum supported key length - is returned. The key length is returned as number of octets. - BUFFER and NBYTES must be zero. - - GCRYCTL_GET_BLKLEN: - Return the blocklength of the algorithm ALGO counted in octets. - BUFFER and NBYTES must be zero. - - GCRYCTL_TEST_ALGO: - Returns 0 if the specified algorithm ALGO is available for use. - BUFFER and NBYTES must be zero. - - Note: Because this function is in most cases used to return an - integer value, we can make it easier for the caller to just look at - the return value. The caller will in all cases consult the value - and thereby detecting whether a error occurred or not (i.e. while - checking the block size) - */ -gcry_err_code_t -_gcry_cipher_algo_info (int algo, int what, void *buffer, size_t *nbytes) -{ - gcry_err_code_t rc = 0; - unsigned int ui; - - switch (what) - { - case GCRYCTL_GET_KEYLEN: - if (buffer || (! nbytes)) - rc = GPG_ERR_CIPHER_ALGO; - else - { - ui = cipher_get_keylen (algo); - if ((ui > 0) && (ui <= 512)) - *nbytes = (size_t) ui / 8; - else - /* The only reason for an error is an invalid algo. */ - rc = GPG_ERR_CIPHER_ALGO; - } - break; - - case GCRYCTL_GET_BLKLEN: - if (buffer || (! nbytes)) - rc = GPG_ERR_CIPHER_ALGO; - else - { - ui = cipher_get_blocksize (algo); - if ((ui > 0) && (ui < 10000)) - *nbytes = ui; - else - { - /* The only reason is an invalid algo or a strange - blocksize. */ - rc = GPG_ERR_CIPHER_ALGO; - } - } - break; - - case GCRYCTL_TEST_ALGO: - if (buffer || nbytes) - rc = GPG_ERR_INV_ARG; - else - rc = check_cipher_algo (algo); - break; - - default: - rc = GPG_ERR_INV_OP; - } - - return rc; -} - - -/* This function returns length of the key for algorithm ALGO. If the - algorithm supports multiple key lengths, the maximum supported key - length is returned. On error 0 is returned. The key length is - returned as number of octets. - - This is a convenience functions which should be preferred over - gcry_cipher_algo_info because it allows for proper type - checking. */ -size_t -_gcry_cipher_get_algo_keylen (int algo) -{ - size_t n; - - if (_gcry_cipher_algo_info (algo, GCRYCTL_GET_KEYLEN, NULL, &n)) - n = 0; - return n; -} - - -/* This functions returns the blocklength of the algorithm ALGO - counted in octets. On error 0 is returned. - - This is a convenience functions which should be preferred over - gcry_cipher_algo_info because it allows for proper type - checking. */ -size_t -_gcry_cipher_get_algo_blklen (int algo) -{ - size_t n; - - if (_gcry_cipher_algo_info( algo, GCRYCTL_GET_BLKLEN, NULL, &n)) - n = 0; - return n; -} - - -/* Explicitly initialize this module. */ -gcry_err_code_t -_gcry_cipher_init (void) -{ - return 0; -} - - -/* Run the selftests for cipher algorithm ALGO with optional reporting - function REPORT. */ -gpg_error_t -_gcry_cipher_selftest (int algo, int extended, selftest_report_func_t report) -{ - gcry_err_code_t ec = 0; - gcry_cipher_spec_t *spec; - - spec = spec_from_algo (algo); - if (spec && !spec->flags.disabled && spec->selftest) - ec = spec->selftest (algo, extended, report); - else - { - ec = GPG_ERR_CIPHER_ALGO; - if (report) - report ("cipher", algo, "module", - (spec && !spec->flags.disabled)? - "no selftest available" : - spec? "algorithm disabled" : "algorithm not found"); - } - - return gpg_error (ec); -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/crc.c b/src/hos_libhttpserver/src/libgcrypt/cipher/crc.c deleted file mode 100644 index 1322f0da..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/crc.c +++ /dev/null @@ -1,311 +0,0 @@ -/* crc.c - Cyclic redundancy checks. - * Copyright (C) 2003 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - */ - -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" - -#include "bithelp.h" - -/* Table of CRCs of all 8-bit messages. Generated by running code - from RFC 1952 modified to print out the table. */ -static u32 crc32_table[256] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - -/* - * The following function was extracted from RFC 1952 by Simon - * Josefsson, for the Shishi project, and modified to be compatible - * with the modified CRC-32 used by RFC 1510, and subsequently - * modified for GNU Libgcrypt to allow it to be used for calculating - * both unmodified CRC-32 and modified CRC-32 values. Original - * copyright and notice from the document follows: - * - * Copyright (c) 1996 L. Peter Deutsch - * - * Permission is granted to copy and distribute this document for - * any purpose and without charge, including translations into - * other languages and incorporation into compilations, provided - * that the copyright notice and this notice are preserved, and - * that any substantive changes or deletions from the original are - * clearly marked. - * - * The copyright on RFCs, and consequently the function below, are - * supposedly also retroactively claimed by the Internet Society - * (according to rfc-editor@rfc-editor.org), with the following - * copyright notice: - * - * Copyright (C) The Internet Society. All Rights Reserved. - * - * This document and translations of it may be copied and furnished - * to others, and derivative works that comment on or otherwise - * explain it or assist in its implementation may be prepared, - * copied, published and distributed, in whole or in part, without - * restriction of any kind, provided that the above copyright - * notice and this paragraph are included on all such copies and - * derivative works. However, this document itself may not be - * modified in any way, such as by removing the copyright notice or - * references to the Internet Society or other Internet - * organizations, except as needed for the purpose of developing - * Internet standards in which case the procedures for copyrights - * defined in the Internet Standards process must be followed, or - * as required to translate it into languages other than English. - * - * The limited permissions granted above are perpetual and will not be - * revoked by the Internet Society or its successors or assigns. - * - * This document and the information contained herein is provided - * on an "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET - * ENGINEERING TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE - * OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A - * PARTICULAR PURPOSE. - * - */ -static u32 -update_crc32 (u32 crc, const void *buf_arg, size_t len) -{ - const char *buf = buf_arg; - size_t n; - - for (n = 0; n < len; n++) - crc = crc32_table[(crc ^ buf[n]) & 0xff] ^ (crc >> 8); - - return crc; -} - -typedef struct -{ - u32 CRC; - byte buf[4]; -} -CRC_CONTEXT; - -/* CRC32 */ - -static void -crc32_init (void *context, unsigned int flags) -{ - CRC_CONTEXT *ctx = (CRC_CONTEXT *) context; - - (void)flags; - - ctx->CRC = 0 ^ 0xffffffffL; -} - -static void -crc32_write (void *context, const void *inbuf, size_t inlen) -{ - CRC_CONTEXT *ctx = (CRC_CONTEXT *) context; - if (!inbuf) - return; - ctx->CRC = update_crc32 (ctx->CRC, inbuf, inlen); -} - -static byte * -crc32_read (void *context) -{ - CRC_CONTEXT *ctx = (CRC_CONTEXT *) context; - return ctx->buf; -} - -static void -crc32_final (void *context) -{ - CRC_CONTEXT *ctx = (CRC_CONTEXT *) context; - ctx->CRC ^= 0xffffffffL; - ctx->buf[0] = (ctx->CRC >> 24) & 0xFF; - ctx->buf[1] = (ctx->CRC >> 16) & 0xFF; - ctx->buf[2] = (ctx->CRC >> 8) & 0xFF; - ctx->buf[3] = (ctx->CRC ) & 0xFF; -} - -/* CRC32 a'la RFC 1510 */ -static void -crc32rfc1510_init (void *context, unsigned int flags) -{ - CRC_CONTEXT *ctx = (CRC_CONTEXT *) context; - - (void)flags; - - ctx->CRC = 0; -} - -static void -crc32rfc1510_final (void *context) -{ - CRC_CONTEXT *ctx = (CRC_CONTEXT *) context; - ctx->buf[0] = (ctx->CRC >> 24) & 0xFF; - ctx->buf[1] = (ctx->CRC >> 16) & 0xFF; - ctx->buf[2] = (ctx->CRC >> 8) & 0xFF; - ctx->buf[3] = (ctx->CRC ) & 0xFF; -} - -/* CRC24 a'la RFC 2440 */ -/* - * The following CRC 24 routines are adapted from RFC 2440, which has - * the following copyright notice: - * - * Copyright (C) The Internet Society (1998). All Rights Reserved. - * - * This document and translations of it may be copied and furnished - * to others, and derivative works that comment on or otherwise - * explain it or assist in its implementation may be prepared, - * copied, published and distributed, in whole or in part, without - * restriction of any kind, provided that the above copyright notice - * and this paragraph are included on all such copies and derivative - * works. However, this document itself may not be modified in any - * way, such as by removing the copyright notice or references to - * the Internet Society or other Internet organizations, except as - * needed for the purpose of developing Internet standards in which - * case the procedures for copyrights defined in the Internet - * Standards process must be followed, or as required to translate - * it into languages other than English. - * - * The limited permissions granted above are perpetual and will not be - * revoked by the Internet Society or its successors or assigns. - * - * This document and the information contained herein is provided on - * an "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET - * ENGINEERING TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE - * OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR - * PURPOSE. - */ - -#define CRC24_INIT 0xb704ceL -#define CRC24_POLY 0x1864cfbL - -static void -crc24rfc2440_init (void *context, unsigned int flags) -{ - CRC_CONTEXT *ctx = (CRC_CONTEXT *) context; - - (void)flags; - - ctx->CRC = CRC24_INIT; -} - -static void -crc24rfc2440_write (void *context, const void *inbuf_arg, size_t inlen) -{ - const unsigned char *inbuf = inbuf_arg; - int i; - CRC_CONTEXT *ctx = (CRC_CONTEXT *) context; - - if (!inbuf) - return; - - while (inlen--) { - ctx->CRC ^= (*inbuf++) << 16; - for (i = 0; i < 8; i++) { - ctx->CRC <<= 1; - if (ctx->CRC & 0x1000000) - ctx->CRC ^= CRC24_POLY; - } - } -} - -static void -crc24rfc2440_final (void *context) -{ - CRC_CONTEXT *ctx = (CRC_CONTEXT *) context; - ctx->buf[0] = (ctx->CRC >> 16) & 0xFF; - ctx->buf[1] = (ctx->CRC >> 8) & 0xFF; - ctx->buf[2] = (ctx->CRC ) & 0xFF; -} - -/* We allow the CRC algorithms even in FIPS mode because they are - actually no cryptographic primitives. */ - -gcry_md_spec_t _gcry_digest_spec_crc32 = - { - GCRY_MD_CRC32, {0, 1}, - "CRC32", NULL, 0, NULL, 4, - crc32_init, crc32_write, crc32_final, crc32_read, - sizeof (CRC_CONTEXT) - }; - -gcry_md_spec_t _gcry_digest_spec_crc32_rfc1510 = - { - GCRY_MD_CRC32_RFC1510, {0, 1}, - "CRC32RFC1510", NULL, 0, NULL, 4, - crc32rfc1510_init, crc32_write, - crc32rfc1510_final, crc32_read, - sizeof (CRC_CONTEXT) - }; - -gcry_md_spec_t _gcry_digest_spec_crc24_rfc2440 = - { - GCRY_MD_CRC24_RFC2440, {0, 1}, - "CRC24RFC2440", NULL, 0, NULL, 3, - crc24rfc2440_init, crc24rfc2440_write, - crc24rfc2440_final, crc32_read, - sizeof (CRC_CONTEXT) - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/des.c b/src/hos_libhttpserver/src/libgcrypt/cipher/des.c deleted file mode 100644 index 6611fd3b..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/des.c +++ /dev/null @@ -1,1195 +0,0 @@ -/* des.c - DES and Triple-DES encryption/decryption Algorithm - * Copyright (C) 1998, 1999, 2001, 2002, 2003, - * 2008 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * For a description of triple encryption, see: - * Bruce Schneier: Applied Cryptography. Second Edition. - * John Wiley & Sons, 1996. ISBN 0-471-12845-7. Pages 358 ff. - * This implementation is according to the definition of DES in FIPS - * PUB 46-2 from December 1993. - */ - - -/* - * Written by Michael Roth , September 1998 - */ - - -/* - * U S A G E - * =========== - * - * For DES or Triple-DES encryption/decryption you must initialize a proper - * encryption context with a key. - * - * A DES key is 64bit wide but only 56bits of the key are used. The remaining - * bits are parity bits and they will _not_ checked in this implementation, but - * simply ignored. - * - * For Triple-DES you could use either two 64bit keys or three 64bit keys. - * The parity bits will _not_ checked, too. - * - * After initializing a context with a key you could use this context to - * encrypt or decrypt data in 64bit blocks in Electronic Codebook Mode. - * - * (In the examples below the slashes at the beginning and ending of comments - * are omited.) - * - * DES Example - * ----------- - * unsigned char key[8]; - * unsigned char plaintext[8]; - * unsigned char ciphertext[8]; - * unsigned char recoverd[8]; - * des_ctx context; - * - * * Fill 'key' and 'plaintext' with some data * - * .... - * - * * Set up the DES encryption context * - * des_setkey(context, key); - * - * * Encrypt the plaintext * - * des_ecb_encrypt(context, plaintext, ciphertext); - * - * * To recover the orginal plaintext from ciphertext use: * - * des_ecb_decrypt(context, ciphertext, recoverd); - * - * - * Triple-DES Example - * ------------------ - * unsigned char key1[8]; - * unsigned char key2[8]; - * unsigned char key3[8]; - * unsigned char plaintext[8]; - * unsigned char ciphertext[8]; - * unsigned char recoverd[8]; - * tripledes_ctx context; - * - * * If you would like to use two 64bit keys, fill 'key1' and'key2' - * then setup the encryption context: * - * tripledes_set2keys(context, key1, key2); - * - * * To use three 64bit keys with Triple-DES use: * - * tripledes_set3keys(context, key1, key2, key3); - * - * * Encrypting plaintext with Triple-DES * - * tripledes_ecb_encrypt(context, plaintext, ciphertext); - * - * * Decrypting ciphertext to recover the plaintext with Triple-DES * - * tripledes_ecb_decrypt(context, ciphertext, recoverd); - * - * - * Selftest - * -------- - * char *error_msg; - * - * * To perform a selftest of this DES/Triple-DES implementation use the - * function selftest(). It will return an error string if there are - * some problems with this library. * - * - * if ( (error_msg = selftest()) ) - * { - * fprintf(stderr, "An error in the DES/Triple-DES implementation occurred: %s\n", error_msg); - * abort(); - * } - */ - - -#include -#include -#include /* memcpy, memcmp */ -#include "types.h" /* for byte and u32 typedefs */ -#include "g10lib.h" -#include "cipher.h" -#include "bufhelp.h" - -#if defined(__GNUC__) && defined(__GNU_LIBRARY__) -#define working_memcmp memcmp -#else -/* - * According to the SunOS man page, memcmp returns indeterminate sign - * depending on whether characters are signed or not. - */ -static int -working_memcmp( const char *a, const char *b, size_t n ) -{ - for( ; n; n--, a++, b++ ) - if( *a != *b ) - return (int)(*(byte*)a) - (int)(*(byte*)b); - return 0; -} -#endif - -/* - * Encryption/Decryption context of DES - */ -typedef struct _des_ctx - { - u32 encrypt_subkeys[32]; - u32 decrypt_subkeys[32]; - } -des_ctx[1]; - -/* - * Encryption/Decryption context of Triple-DES - */ -typedef struct _tripledes_ctx - { - u32 encrypt_subkeys[96]; - u32 decrypt_subkeys[96]; - struct { - int no_weak_key; - } flags; - } -tripledes_ctx[1]; - -static void des_key_schedule (const byte *, u32 *); -static int des_setkey (struct _des_ctx *, const byte *); -static int des_ecb_crypt (struct _des_ctx *, const byte *, byte *, int); -static int tripledes_set2keys (struct _tripledes_ctx *, - const byte *, const byte *); -static int tripledes_set3keys (struct _tripledes_ctx *, - const byte *, const byte *, const byte *); -static int tripledes_ecb_crypt (struct _tripledes_ctx *, - const byte *, byte *, int); -static int is_weak_key ( const byte *key ); -static const char *selftest (void); - -static int initialized; - - - - -/* - * The s-box values are permuted according to the 'primitive function P' - * and are rotated one bit to the left. - */ -static u32 sbox1[64] = -{ - 0x01010400, 0x00000000, 0x00010000, 0x01010404, 0x01010004, 0x00010404, 0x00000004, 0x00010000, - 0x00000400, 0x01010400, 0x01010404, 0x00000400, 0x01000404, 0x01010004, 0x01000000, 0x00000004, - 0x00000404, 0x01000400, 0x01000400, 0x00010400, 0x00010400, 0x01010000, 0x01010000, 0x01000404, - 0x00010004, 0x01000004, 0x01000004, 0x00010004, 0x00000000, 0x00000404, 0x00010404, 0x01000000, - 0x00010000, 0x01010404, 0x00000004, 0x01010000, 0x01010400, 0x01000000, 0x01000000, 0x00000400, - 0x01010004, 0x00010000, 0x00010400, 0x01000004, 0x00000400, 0x00000004, 0x01000404, 0x00010404, - 0x01010404, 0x00010004, 0x01010000, 0x01000404, 0x01000004, 0x00000404, 0x00010404, 0x01010400, - 0x00000404, 0x01000400, 0x01000400, 0x00000000, 0x00010004, 0x00010400, 0x00000000, 0x01010004 -}; - -static u32 sbox2[64] = -{ - 0x80108020, 0x80008000, 0x00008000, 0x00108020, 0x00100000, 0x00000020, 0x80100020, 0x80008020, - 0x80000020, 0x80108020, 0x80108000, 0x80000000, 0x80008000, 0x00100000, 0x00000020, 0x80100020, - 0x00108000, 0x00100020, 0x80008020, 0x00000000, 0x80000000, 0x00008000, 0x00108020, 0x80100000, - 0x00100020, 0x80000020, 0x00000000, 0x00108000, 0x00008020, 0x80108000, 0x80100000, 0x00008020, - 0x00000000, 0x00108020, 0x80100020, 0x00100000, 0x80008020, 0x80100000, 0x80108000, 0x00008000, - 0x80100000, 0x80008000, 0x00000020, 0x80108020, 0x00108020, 0x00000020, 0x00008000, 0x80000000, - 0x00008020, 0x80108000, 0x00100000, 0x80000020, 0x00100020, 0x80008020, 0x80000020, 0x00100020, - 0x00108000, 0x00000000, 0x80008000, 0x00008020, 0x80000000, 0x80100020, 0x80108020, 0x00108000 -}; - -static u32 sbox3[64] = -{ - 0x00000208, 0x08020200, 0x00000000, 0x08020008, 0x08000200, 0x00000000, 0x00020208, 0x08000200, - 0x00020008, 0x08000008, 0x08000008, 0x00020000, 0x08020208, 0x00020008, 0x08020000, 0x00000208, - 0x08000000, 0x00000008, 0x08020200, 0x00000200, 0x00020200, 0x08020000, 0x08020008, 0x00020208, - 0x08000208, 0x00020200, 0x00020000, 0x08000208, 0x00000008, 0x08020208, 0x00000200, 0x08000000, - 0x08020200, 0x08000000, 0x00020008, 0x00000208, 0x00020000, 0x08020200, 0x08000200, 0x00000000, - 0x00000200, 0x00020008, 0x08020208, 0x08000200, 0x08000008, 0x00000200, 0x00000000, 0x08020008, - 0x08000208, 0x00020000, 0x08000000, 0x08020208, 0x00000008, 0x00020208, 0x00020200, 0x08000008, - 0x08020000, 0x08000208, 0x00000208, 0x08020000, 0x00020208, 0x00000008, 0x08020008, 0x00020200 -}; - -static u32 sbox4[64] = -{ - 0x00802001, 0x00002081, 0x00002081, 0x00000080, 0x00802080, 0x00800081, 0x00800001, 0x00002001, - 0x00000000, 0x00802000, 0x00802000, 0x00802081, 0x00000081, 0x00000000, 0x00800080, 0x00800001, - 0x00000001, 0x00002000, 0x00800000, 0x00802001, 0x00000080, 0x00800000, 0x00002001, 0x00002080, - 0x00800081, 0x00000001, 0x00002080, 0x00800080, 0x00002000, 0x00802080, 0x00802081, 0x00000081, - 0x00800080, 0x00800001, 0x00802000, 0x00802081, 0x00000081, 0x00000000, 0x00000000, 0x00802000, - 0x00002080, 0x00800080, 0x00800081, 0x00000001, 0x00802001, 0x00002081, 0x00002081, 0x00000080, - 0x00802081, 0x00000081, 0x00000001, 0x00002000, 0x00800001, 0x00002001, 0x00802080, 0x00800081, - 0x00002001, 0x00002080, 0x00800000, 0x00802001, 0x00000080, 0x00800000, 0x00002000, 0x00802080 -}; - -static u32 sbox5[64] = -{ - 0x00000100, 0x02080100, 0x02080000, 0x42000100, 0x00080000, 0x00000100, 0x40000000, 0x02080000, - 0x40080100, 0x00080000, 0x02000100, 0x40080100, 0x42000100, 0x42080000, 0x00080100, 0x40000000, - 0x02000000, 0x40080000, 0x40080000, 0x00000000, 0x40000100, 0x42080100, 0x42080100, 0x02000100, - 0x42080000, 0x40000100, 0x00000000, 0x42000000, 0x02080100, 0x02000000, 0x42000000, 0x00080100, - 0x00080000, 0x42000100, 0x00000100, 0x02000000, 0x40000000, 0x02080000, 0x42000100, 0x40080100, - 0x02000100, 0x40000000, 0x42080000, 0x02080100, 0x40080100, 0x00000100, 0x02000000, 0x42080000, - 0x42080100, 0x00080100, 0x42000000, 0x42080100, 0x02080000, 0x00000000, 0x40080000, 0x42000000, - 0x00080100, 0x02000100, 0x40000100, 0x00080000, 0x00000000, 0x40080000, 0x02080100, 0x40000100 -}; - -static u32 sbox6[64] = -{ - 0x20000010, 0x20400000, 0x00004000, 0x20404010, 0x20400000, 0x00000010, 0x20404010, 0x00400000, - 0x20004000, 0x00404010, 0x00400000, 0x20000010, 0x00400010, 0x20004000, 0x20000000, 0x00004010, - 0x00000000, 0x00400010, 0x20004010, 0x00004000, 0x00404000, 0x20004010, 0x00000010, 0x20400010, - 0x20400010, 0x00000000, 0x00404010, 0x20404000, 0x00004010, 0x00404000, 0x20404000, 0x20000000, - 0x20004000, 0x00000010, 0x20400010, 0x00404000, 0x20404010, 0x00400000, 0x00004010, 0x20000010, - 0x00400000, 0x20004000, 0x20000000, 0x00004010, 0x20000010, 0x20404010, 0x00404000, 0x20400000, - 0x00404010, 0x20404000, 0x00000000, 0x20400010, 0x00000010, 0x00004000, 0x20400000, 0x00404010, - 0x00004000, 0x00400010, 0x20004010, 0x00000000, 0x20404000, 0x20000000, 0x00400010, 0x20004010 -}; - -static u32 sbox7[64] = -{ - 0x00200000, 0x04200002, 0x04000802, 0x00000000, 0x00000800, 0x04000802, 0x00200802, 0x04200800, - 0x04200802, 0x00200000, 0x00000000, 0x04000002, 0x00000002, 0x04000000, 0x04200002, 0x00000802, - 0x04000800, 0x00200802, 0x00200002, 0x04000800, 0x04000002, 0x04200000, 0x04200800, 0x00200002, - 0x04200000, 0x00000800, 0x00000802, 0x04200802, 0x00200800, 0x00000002, 0x04000000, 0x00200800, - 0x04000000, 0x00200800, 0x00200000, 0x04000802, 0x04000802, 0x04200002, 0x04200002, 0x00000002, - 0x00200002, 0x04000000, 0x04000800, 0x00200000, 0x04200800, 0x00000802, 0x00200802, 0x04200800, - 0x00000802, 0x04000002, 0x04200802, 0x04200000, 0x00200800, 0x00000000, 0x00000002, 0x04200802, - 0x00000000, 0x00200802, 0x04200000, 0x00000800, 0x04000002, 0x04000800, 0x00000800, 0x00200002 -}; - -static u32 sbox8[64] = -{ - 0x10001040, 0x00001000, 0x00040000, 0x10041040, 0x10000000, 0x10001040, 0x00000040, 0x10000000, - 0x00040040, 0x10040000, 0x10041040, 0x00041000, 0x10041000, 0x00041040, 0x00001000, 0x00000040, - 0x10040000, 0x10000040, 0x10001000, 0x00001040, 0x00041000, 0x00040040, 0x10040040, 0x10041000, - 0x00001040, 0x00000000, 0x00000000, 0x10040040, 0x10000040, 0x10001000, 0x00041040, 0x00040000, - 0x00041040, 0x00040000, 0x10041000, 0x00001000, 0x00000040, 0x10040040, 0x00001000, 0x00041040, - 0x10001000, 0x00000040, 0x10000040, 0x10040000, 0x10040040, 0x10000000, 0x00040000, 0x10001040, - 0x00000000, 0x10041040, 0x00040040, 0x10000040, 0x10040000, 0x10001000, 0x10001040, 0x00000000, - 0x10041040, 0x00041000, 0x00041000, 0x00001040, 0x00001040, 0x00040040, 0x10000000, 0x10041000 -}; - - -/* - * These two tables are part of the 'permuted choice 1' function. - * In this implementation several speed improvements are done. - */ -static u32 leftkey_swap[16] = -{ - 0x00000000, 0x00000001, 0x00000100, 0x00000101, - 0x00010000, 0x00010001, 0x00010100, 0x00010101, - 0x01000000, 0x01000001, 0x01000100, 0x01000101, - 0x01010000, 0x01010001, 0x01010100, 0x01010101 -}; - -static u32 rightkey_swap[16] = -{ - 0x00000000, 0x01000000, 0x00010000, 0x01010000, - 0x00000100, 0x01000100, 0x00010100, 0x01010100, - 0x00000001, 0x01000001, 0x00010001, 0x01010001, - 0x00000101, 0x01000101, 0x00010101, 0x01010101, -}; - - - -/* - * Numbers of left shifts per round for encryption subkeys. - * To calculate the decryption subkeys we just reverse the - * ordering of the calculated encryption subkeys. So their - * is no need for a decryption rotate tab. - */ -static byte encrypt_rotate_tab[16] = -{ - 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1 -}; - - - -/* - * Table with weak DES keys sorted in ascending order. - * In DES their are 64 known keys which are weak. They are weak - * because they produce only one, two or four different - * subkeys in the subkey scheduling process. - * The keys in this table have all their parity bits cleared. - */ -static byte weak_keys[64][8] = -{ - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /*w*/ - { 0x00, 0x00, 0x1e, 0x1e, 0x00, 0x00, 0x0e, 0x0e }, - { 0x00, 0x00, 0xe0, 0xe0, 0x00, 0x00, 0xf0, 0xf0 }, - { 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe }, - { 0x00, 0x1e, 0x00, 0x1e, 0x00, 0x0e, 0x00, 0x0e }, /*sw*/ - { 0x00, 0x1e, 0x1e, 0x00, 0x00, 0x0e, 0x0e, 0x00 }, - { 0x00, 0x1e, 0xe0, 0xfe, 0x00, 0x0e, 0xf0, 0xfe }, - { 0x00, 0x1e, 0xfe, 0xe0, 0x00, 0x0e, 0xfe, 0xf0 }, - { 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xf0, 0x00, 0xf0 }, /*sw*/ - { 0x00, 0xe0, 0x1e, 0xfe, 0x00, 0xf0, 0x0e, 0xfe }, - { 0x00, 0xe0, 0xe0, 0x00, 0x00, 0xf0, 0xf0, 0x00 }, - { 0x00, 0xe0, 0xfe, 0x1e, 0x00, 0xf0, 0xfe, 0x0e }, - { 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe }, /*sw*/ - { 0x00, 0xfe, 0x1e, 0xe0, 0x00, 0xfe, 0x0e, 0xf0 }, - { 0x00, 0xfe, 0xe0, 0x1e, 0x00, 0xfe, 0xf0, 0x0e }, - { 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00 }, - { 0x1e, 0x00, 0x00, 0x1e, 0x0e, 0x00, 0x00, 0x0e }, - { 0x1e, 0x00, 0x1e, 0x00, 0x0e, 0x00, 0x0e, 0x00 }, /*sw*/ - { 0x1e, 0x00, 0xe0, 0xfe, 0x0e, 0x00, 0xf0, 0xfe }, - { 0x1e, 0x00, 0xfe, 0xe0, 0x0e, 0x00, 0xfe, 0xf0 }, - { 0x1e, 0x1e, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00 }, - { 0x1e, 0x1e, 0x1e, 0x1e, 0x0e, 0x0e, 0x0e, 0x0e }, /*w*/ - { 0x1e, 0x1e, 0xe0, 0xe0, 0x0e, 0x0e, 0xf0, 0xf0 }, - { 0x1e, 0x1e, 0xfe, 0xfe, 0x0e, 0x0e, 0xfe, 0xfe }, - { 0x1e, 0xe0, 0x00, 0xfe, 0x0e, 0xf0, 0x00, 0xfe }, - { 0x1e, 0xe0, 0x1e, 0xe0, 0x0e, 0xf0, 0x0e, 0xf0 }, /*sw*/ - { 0x1e, 0xe0, 0xe0, 0x1e, 0x0e, 0xf0, 0xf0, 0x0e }, - { 0x1e, 0xe0, 0xfe, 0x00, 0x0e, 0xf0, 0xfe, 0x00 }, - { 0x1e, 0xfe, 0x00, 0xe0, 0x0e, 0xfe, 0x00, 0xf0 }, - { 0x1e, 0xfe, 0x1e, 0xfe, 0x0e, 0xfe, 0x0e, 0xfe }, /*sw*/ - { 0x1e, 0xfe, 0xe0, 0x00, 0x0e, 0xfe, 0xf0, 0x00 }, - { 0x1e, 0xfe, 0xfe, 0x1e, 0x0e, 0xfe, 0xfe, 0x0e }, - { 0xe0, 0x00, 0x00, 0xe0, 0xf0, 0x00, 0x00, 0xf0 }, - { 0xe0, 0x00, 0x1e, 0xfe, 0xf0, 0x00, 0x0e, 0xfe }, - { 0xe0, 0x00, 0xe0, 0x00, 0xf0, 0x00, 0xf0, 0x00 }, /*sw*/ - { 0xe0, 0x00, 0xfe, 0x1e, 0xf0, 0x00, 0xfe, 0x0e }, - { 0xe0, 0x1e, 0x00, 0xfe, 0xf0, 0x0e, 0x00, 0xfe }, - { 0xe0, 0x1e, 0x1e, 0xe0, 0xf0, 0x0e, 0x0e, 0xf0 }, - { 0xe0, 0x1e, 0xe0, 0x1e, 0xf0, 0x0e, 0xf0, 0x0e }, /*sw*/ - { 0xe0, 0x1e, 0xfe, 0x00, 0xf0, 0x0e, 0xfe, 0x00 }, - { 0xe0, 0xe0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00 }, - { 0xe0, 0xe0, 0x1e, 0x1e, 0xf0, 0xf0, 0x0e, 0x0e }, - { 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0 }, /*w*/ - { 0xe0, 0xe0, 0xfe, 0xfe, 0xf0, 0xf0, 0xfe, 0xfe }, - { 0xe0, 0xfe, 0x00, 0x1e, 0xf0, 0xfe, 0x00, 0x0e }, - { 0xe0, 0xfe, 0x1e, 0x00, 0xf0, 0xfe, 0x0e, 0x00 }, - { 0xe0, 0xfe, 0xe0, 0xfe, 0xf0, 0xfe, 0xf0, 0xfe }, /*sw*/ - { 0xe0, 0xfe, 0xfe, 0xe0, 0xf0, 0xfe, 0xfe, 0xf0 }, - { 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe }, - { 0xfe, 0x00, 0x1e, 0xe0, 0xfe, 0x00, 0x0e, 0xf0 }, - { 0xfe, 0x00, 0xe0, 0x1e, 0xfe, 0x00, 0xf0, 0x0e }, - { 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00 }, /*sw*/ - { 0xfe, 0x1e, 0x00, 0xe0, 0xfe, 0x0e, 0x00, 0xf0 }, - { 0xfe, 0x1e, 0x1e, 0xfe, 0xfe, 0x0e, 0x0e, 0xfe }, - { 0xfe, 0x1e, 0xe0, 0x00, 0xfe, 0x0e, 0xf0, 0x00 }, - { 0xfe, 0x1e, 0xfe, 0x1e, 0xfe, 0x0e, 0xfe, 0x0e }, /*sw*/ - { 0xfe, 0xe0, 0x00, 0x1e, 0xfe, 0xf0, 0x00, 0x0e }, - { 0xfe, 0xe0, 0x1e, 0x00, 0xfe, 0xf0, 0x0e, 0x00 }, - { 0xfe, 0xe0, 0xe0, 0xfe, 0xfe, 0xf0, 0xf0, 0xfe }, - { 0xfe, 0xe0, 0xfe, 0xe0, 0xfe, 0xf0, 0xfe, 0xf0 }, /*sw*/ - { 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00 }, - { 0xfe, 0xfe, 0x1e, 0x1e, 0xfe, 0xfe, 0x0e, 0x0e }, - { 0xfe, 0xfe, 0xe0, 0xe0, 0xfe, 0xfe, 0xf0, 0xf0 }, - { 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe } /*w*/ -}; -static unsigned char weak_keys_chksum[20] = { - 0xD0, 0xCF, 0x07, 0x38, 0x93, 0x70, 0x8A, 0x83, 0x7D, 0xD7, - 0x8A, 0x36, 0x65, 0x29, 0x6C, 0x1F, 0x7C, 0x3F, 0xD3, 0x41 -}; - - - -/* - * Macro to swap bits across two words. - */ -#define DO_PERMUTATION(a, temp, b, offset, mask) \ - temp = ((a>>offset) ^ b) & mask; \ - b ^= temp; \ - a ^= temp<> 31); \ - temp = (left ^ right) & 0xaaaaaaaa; \ - right ^= temp; \ - left ^= temp; \ - left = (left << 1) | (left >> 31); - -/* - * The 'inverse initial permutation'. - */ -#define FINAL_PERMUTATION(left, temp, right) \ - left = (left << 31) | (left >> 1); \ - temp = (left ^ right) & 0xaaaaaaaa; \ - left ^= temp; \ - right ^= temp; \ - right = (right << 31) | (right >> 1); \ - DO_PERMUTATION(right, temp, left, 8, 0x00ff00ff) \ - DO_PERMUTATION(right, temp, left, 2, 0x33333333) \ - DO_PERMUTATION(left, temp, right, 16, 0x0000ffff) \ - DO_PERMUTATION(left, temp, right, 4, 0x0f0f0f0f) - - -/* - * A full DES round including 'expansion function', 'sbox substitution' - * and 'primitive function P' but without swapping the left and right word. - * Please note: The data in 'from' and 'to' is already rotated one bit to - * the left, done in the initial permutation. - */ -#define DES_ROUND(from, to, work, subkey) \ - work = from ^ *subkey++; \ - to ^= sbox8[ work & 0x3f ]; \ - to ^= sbox6[ (work>>8) & 0x3f ]; \ - to ^= sbox4[ (work>>16) & 0x3f ]; \ - to ^= sbox2[ (work>>24) & 0x3f ]; \ - work = ((from << 28) | (from >> 4)) ^ *subkey++; \ - to ^= sbox7[ work & 0x3f ]; \ - to ^= sbox5[ (work>>8) & 0x3f ]; \ - to ^= sbox3[ (work>>16) & 0x3f ]; \ - to ^= sbox1[ (work>>24) & 0x3f ]; - -/* - * Macros to convert 8 bytes from/to 32bit words. - */ -#define READ_64BIT_DATA(data, left, right) \ - left = buf_get_be32(data + 0); \ - right = buf_get_be32(data + 4); - -#define WRITE_64BIT_DATA(data, left, right) \ - buf_put_be32(data + 0, left); \ - buf_put_be32(data + 4, right); - -/* - * Handy macros for encryption and decryption of data - */ -#define des_ecb_encrypt(ctx, from, to) des_ecb_crypt(ctx, from, to, 0) -#define des_ecb_decrypt(ctx, from, to) des_ecb_crypt(ctx, from, to, 1) -#define tripledes_ecb_encrypt(ctx, from, to) tripledes_ecb_crypt(ctx,from,to,0) -#define tripledes_ecb_decrypt(ctx, from, to) tripledes_ecb_crypt(ctx,from,to,1) - - - - - - -/* - * des_key_schedule(): Calculate 16 subkeys pairs (even/odd) for - * 16 encryption rounds. - * To calculate subkeys for decryption the caller - * have to reorder the generated subkeys. - * - * rawkey: 8 Bytes of key data - * subkey: Array of at least 32 u32s. Will be filled - * with calculated subkeys. - * - */ -static void -des_key_schedule (const byte * rawkey, u32 * subkey) -{ - u32 left, right, work; - int round; - - READ_64BIT_DATA (rawkey, left, right) - - DO_PERMUTATION (right, work, left, 4, 0x0f0f0f0f) - DO_PERMUTATION (right, work, left, 0, 0x10101010) - - left = ((leftkey_swap[(left >> 0) & 0xf] << 3) - | (leftkey_swap[(left >> 8) & 0xf] << 2) - | (leftkey_swap[(left >> 16) & 0xf] << 1) - | (leftkey_swap[(left >> 24) & 0xf]) - | (leftkey_swap[(left >> 5) & 0xf] << 7) - | (leftkey_swap[(left >> 13) & 0xf] << 6) - | (leftkey_swap[(left >> 21) & 0xf] << 5) - | (leftkey_swap[(left >> 29) & 0xf] << 4)); - - left &= 0x0fffffff; - - right = ((rightkey_swap[(right >> 1) & 0xf] << 3) - | (rightkey_swap[(right >> 9) & 0xf] << 2) - | (rightkey_swap[(right >> 17) & 0xf] << 1) - | (rightkey_swap[(right >> 25) & 0xf]) - | (rightkey_swap[(right >> 4) & 0xf] << 7) - | (rightkey_swap[(right >> 12) & 0xf] << 6) - | (rightkey_swap[(right >> 20) & 0xf] << 5) - | (rightkey_swap[(right >> 28) & 0xf] << 4)); - - right &= 0x0fffffff; - - for (round = 0; round < 16; ++round) - { - left = ((left << encrypt_rotate_tab[round]) - | (left >> (28 - encrypt_rotate_tab[round]))) & 0x0fffffff; - right = ((right << encrypt_rotate_tab[round]) - | (right >> (28 - encrypt_rotate_tab[round]))) & 0x0fffffff; - - *subkey++ = (((left << 4) & 0x24000000) - | ((left << 28) & 0x10000000) - | ((left << 14) & 0x08000000) - | ((left << 18) & 0x02080000) - | ((left << 6) & 0x01000000) - | ((left << 9) & 0x00200000) - | ((left >> 1) & 0x00100000) - | ((left << 10) & 0x00040000) - | ((left << 2) & 0x00020000) - | ((left >> 10) & 0x00010000) - | ((right >> 13) & 0x00002000) - | ((right >> 4) & 0x00001000) - | ((right << 6) & 0x00000800) - | ((right >> 1) & 0x00000400) - | ((right >> 14) & 0x00000200) - | (right & 0x00000100) - | ((right >> 5) & 0x00000020) - | ((right >> 10) & 0x00000010) - | ((right >> 3) & 0x00000008) - | ((right >> 18) & 0x00000004) - | ((right >> 26) & 0x00000002) - | ((right >> 24) & 0x00000001)); - - *subkey++ = (((left << 15) & 0x20000000) - | ((left << 17) & 0x10000000) - | ((left << 10) & 0x08000000) - | ((left << 22) & 0x04000000) - | ((left >> 2) & 0x02000000) - | ((left << 1) & 0x01000000) - | ((left << 16) & 0x00200000) - | ((left << 11) & 0x00100000) - | ((left << 3) & 0x00080000) - | ((left >> 6) & 0x00040000) - | ((left << 15) & 0x00020000) - | ((left >> 4) & 0x00010000) - | ((right >> 2) & 0x00002000) - | ((right << 8) & 0x00001000) - | ((right >> 14) & 0x00000808) - | ((right >> 9) & 0x00000400) - | ((right) & 0x00000200) - | ((right << 7) & 0x00000100) - | ((right >> 7) & 0x00000020) - | ((right >> 3) & 0x00000011) - | ((right << 2) & 0x00000004) - | ((right >> 21) & 0x00000002)); - } -} - - -/* - * Fill a DES context with subkeys calculated from a 64bit key. - * Does not check parity bits, but simply ignore them. - * Does not check for weak keys. - */ -static int -des_setkey (struct _des_ctx *ctx, const byte * key) -{ - static const char *selftest_failed; - int i; - - if (!fips_mode () && !initialized) - { - initialized = 1; - selftest_failed = selftest (); - - if (selftest_failed) - log_error ("%s\n", selftest_failed); - } - if (selftest_failed) - return GPG_ERR_SELFTEST_FAILED; - - des_key_schedule (key, ctx->encrypt_subkeys); - _gcry_burn_stack (32); - - for(i=0; i<32; i+=2) - { - ctx->decrypt_subkeys[i] = ctx->encrypt_subkeys[30-i]; - ctx->decrypt_subkeys[i+1] = ctx->encrypt_subkeys[31-i]; - } - - return 0; -} - - - -/* - * Electronic Codebook Mode DES encryption/decryption of data according - * to 'mode'. - */ -static int -des_ecb_crypt (struct _des_ctx *ctx, const byte * from, byte * to, int mode) -{ - u32 left, right, work; - u32 *keys; - - keys = mode ? ctx->decrypt_subkeys : ctx->encrypt_subkeys; - - READ_64BIT_DATA (from, left, right) - INITIAL_PERMUTATION (left, work, right) - - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - - FINAL_PERMUTATION (right, work, left) - WRITE_64BIT_DATA (to, right, left) - - return 0; -} - - - -/* - * Fill a Triple-DES context with subkeys calculated from two 64bit keys. - * Does not check the parity bits of the keys, but simply ignore them. - * Does not check for weak keys. - */ -static int -tripledes_set2keys (struct _tripledes_ctx *ctx, - const byte * key1, - const byte * key2) -{ - int i; - - des_key_schedule (key1, ctx->encrypt_subkeys); - des_key_schedule (key2, &(ctx->decrypt_subkeys[32])); - _gcry_burn_stack (32); - - for(i=0; i<32; i+=2) - { - ctx->decrypt_subkeys[i] = ctx->encrypt_subkeys[30-i]; - ctx->decrypt_subkeys[i+1] = ctx->encrypt_subkeys[31-i]; - - ctx->encrypt_subkeys[i+32] = ctx->decrypt_subkeys[62-i]; - ctx->encrypt_subkeys[i+33] = ctx->decrypt_subkeys[63-i]; - - ctx->encrypt_subkeys[i+64] = ctx->encrypt_subkeys[i]; - ctx->encrypt_subkeys[i+65] = ctx->encrypt_subkeys[i+1]; - - ctx->decrypt_subkeys[i+64] = ctx->decrypt_subkeys[i]; - ctx->decrypt_subkeys[i+65] = ctx->decrypt_subkeys[i+1]; - } - - return 0; -} - - - -/* - * Fill a Triple-DES context with subkeys calculated from three 64bit keys. - * Does not check the parity bits of the keys, but simply ignore them. - * Does not check for weak keys. - */ -static int -tripledes_set3keys (struct _tripledes_ctx *ctx, - const byte * key1, - const byte * key2, - const byte * key3) -{ - static const char *selftest_failed; - int i; - - if (!fips_mode () && !initialized) - { - initialized = 1; - selftest_failed = selftest (); - - if (selftest_failed) - log_error ("%s\n", selftest_failed); - } - if (selftest_failed) - return GPG_ERR_SELFTEST_FAILED; - - des_key_schedule (key1, ctx->encrypt_subkeys); - des_key_schedule (key2, &(ctx->decrypt_subkeys[32])); - des_key_schedule (key3, &(ctx->encrypt_subkeys[64])); - _gcry_burn_stack (32); - - for(i=0; i<32; i+=2) - { - ctx->decrypt_subkeys[i] = ctx->encrypt_subkeys[94-i]; - ctx->decrypt_subkeys[i+1] = ctx->encrypt_subkeys[95-i]; - - ctx->encrypt_subkeys[i+32] = ctx->decrypt_subkeys[62-i]; - ctx->encrypt_subkeys[i+33] = ctx->decrypt_subkeys[63-i]; - - ctx->decrypt_subkeys[i+64] = ctx->encrypt_subkeys[30-i]; - ctx->decrypt_subkeys[i+65] = ctx->encrypt_subkeys[31-i]; - } - - return 0; -} - - - -/* - * Electronic Codebook Mode Triple-DES encryption/decryption of data - * according to 'mode'. Sometimes this mode is named 'EDE' mode - * (Encryption-Decryption-Encryption). - */ -static int -tripledes_ecb_crypt (struct _tripledes_ctx *ctx, const byte * from, - byte * to, int mode) -{ - u32 left, right, work; - u32 *keys; - - keys = mode ? ctx->decrypt_subkeys : ctx->encrypt_subkeys; - - READ_64BIT_DATA (from, left, right) - INITIAL_PERMUTATION (left, work, right) - - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - - DES_ROUND (left, right, work, keys) DES_ROUND (right, left, work, keys) - DES_ROUND (left, right, work, keys) DES_ROUND (right, left, work, keys) - DES_ROUND (left, right, work, keys) DES_ROUND (right, left, work, keys) - DES_ROUND (left, right, work, keys) DES_ROUND (right, left, work, keys) - DES_ROUND (left, right, work, keys) DES_ROUND (right, left, work, keys) - DES_ROUND (left, right, work, keys) DES_ROUND (right, left, work, keys) - DES_ROUND (left, right, work, keys) DES_ROUND (right, left, work, keys) - DES_ROUND (left, right, work, keys) DES_ROUND (right, left, work, keys) - - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - DES_ROUND (right, left, work, keys) DES_ROUND (left, right, work, keys) - - FINAL_PERMUTATION (right, work, left) - WRITE_64BIT_DATA (to, right, left) - - return 0; -} - - - - - -/* - * Check whether the 8 byte key is weak. - * Does not check the parity bits of the key but simple ignore them. - */ -static int -is_weak_key ( const byte *key ) -{ - byte work[8]; - int i, left, right, middle, cmp_result; - - /* clear parity bits */ - for(i=0; i<8; ++i) - work[i] = key[i] & 0xfe; - - /* binary search in the weak key table */ - left = 0; - right = 63; - while(left <= right) - { - middle = (left + right) / 2; - - if ( !(cmp_result=working_memcmp(work, weak_keys[middle], 8)) ) - return -1; - - if ( cmp_result > 0 ) - left = middle + 1; - else - right = middle - 1; - } - - return 0; -} - - - -/* - * Performs a selftest of this DES/Triple-DES implementation. - * Returns an string with the error text on failure. - * Returns NULL if all is ok. - */ -static const char * -selftest (void) -{ - /* - * Check if 'u32' is really 32 bits wide. This DES / 3DES implementation - * need this. - */ - if (sizeof (u32) != 4) - return "Wrong word size for DES configured."; - - /* - * DES Maintenance Test - */ - { - int i; - byte key[8] = - {0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55}; - byte input[8] = - {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - byte result[8] = - {0x24, 0x6e, 0x9d, 0xb9, 0xc5, 0x50, 0x38, 0x1a}; - byte temp1[8], temp2[8], temp3[8]; - des_ctx des; - - for (i = 0; i < 64; ++i) - { - des_setkey (des, key); - des_ecb_encrypt (des, input, temp1); - des_ecb_encrypt (des, temp1, temp2); - des_setkey (des, temp2); - des_ecb_decrypt (des, temp1, temp3); - memcpy (key, temp3, 8); - memcpy (input, temp1, 8); - } - if (memcmp (temp3, result, 8)) - return "DES maintenance test failed."; - } - - - /* - * Self made Triple-DES test (Does somebody know an official test?) - */ - { - int i; - byte input[8] = - {0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10}; - byte key1[8] = - {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0}; - byte key2[8] = - {0x11, 0x22, 0x33, 0x44, 0xff, 0xaa, 0xcc, 0xdd}; - byte result[8] = - {0x7b, 0x38, 0x3b, 0x23, 0xa2, 0x7d, 0x26, 0xd3}; - - tripledes_ctx des3; - - for (i = 0; i < 16; ++i) - { - tripledes_set2keys (des3, key1, key2); - tripledes_ecb_encrypt (des3, input, key1); - tripledes_ecb_decrypt (des3, input, key2); - tripledes_set3keys (des3, key1, input, key2); - tripledes_ecb_encrypt (des3, input, input); - } - if (memcmp (input, result, 8)) - return "Triple-DES test failed."; - } - - /* - * More Triple-DES test. These are testvectors as used by SSLeay, - * thanks to Jeroen C. van Gelderen. - */ - { - static const struct { byte key[24]; byte plain[8]; byte cipher[8]; } - testdata[] = { - { { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 }, - { 0x95,0xF8,0xA5,0xE5,0xDD,0x31,0xD9,0x00 }, - { 0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00 } - }, - - { { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 }, - { 0x9D,0x64,0x55,0x5A,0x9A,0x10,0xB8,0x52, }, - { 0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00 } - }, - { { 0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E, - 0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E, - 0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E }, - { 0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A }, - { 0x71,0x78,0x87,0x6E,0x01,0xF1,0x9B,0x2A } - }, - { { 0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6, - 0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6, - 0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6 }, - { 0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2 }, - { 0xAF,0x37,0xFB,0x42,0x1F,0x8C,0x40,0x95 } - }, - { { 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF }, - { 0x73,0x6F,0x6D,0x65,0x64,0x61,0x74,0x61 }, - { 0x3D,0x12,0x4F,0xE2,0x19,0x8B,0xA3,0x18 } - }, - { { 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, - 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF }, - { 0x73,0x6F,0x6D,0x65,0x64,0x61,0x74,0x61 }, - { 0xFB,0xAB,0xA1,0xFF,0x9D,0x05,0xE9,0xB1 } - }, - { { 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, - 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10 }, - { 0x73,0x6F,0x6D,0x65,0x64,0x61,0x74,0x61 }, - { 0x18,0xd7,0x48,0xe5,0x63,0x62,0x05,0x72 } - }, - { { 0x03,0x52,0x02,0x07,0x67,0x20,0x82,0x17, - 0x86,0x02,0x87,0x66,0x59,0x08,0x21,0x98, - 0x64,0x05,0x6A,0xBD,0xFE,0xA9,0x34,0x57 }, - { 0x73,0x71,0x75,0x69,0x67,0x67,0x6C,0x65 }, - { 0xc0,0x7d,0x2a,0x0f,0xa5,0x66,0xfa,0x30 } - }, - { { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x80,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x02 }, - { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, - { 0xe6,0xe6,0xdd,0x5b,0x7e,0x72,0x29,0x74 } - }, - { { 0x10,0x46,0x10,0x34,0x89,0x98,0x80,0x20, - 0x91,0x07,0xD0,0x15,0x89,0x19,0x01,0x01, - 0x19,0x07,0x92,0x10,0x98,0x1A,0x01,0x01 }, - { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, - { 0xe1,0xef,0x62,0xc3,0x32,0xfe,0x82,0x5b } - } - }; - - byte result[8]; - int i; - tripledes_ctx des3; - - for (i=0; iflags.no_weak_key) - ; /* Detection has been disabled. */ - else if (is_weak_key (key) || is_weak_key (key+8) || is_weak_key (key+16)) - { - _gcry_burn_stack (64); - return GPG_ERR_WEAK_KEY; - } - _gcry_burn_stack (64); - - return GPG_ERR_NO_ERROR; -} - - -static gcry_err_code_t -do_tripledes_set_extra_info (void *context, int what, - const void *buffer, size_t buflen) -{ - struct _tripledes_ctx *ctx = (struct _tripledes_ctx *)context; - gpg_err_code_t ec = 0; - - (void)buffer; - (void)buflen; - - switch (what) - { - case CIPHER_INFO_NO_WEAK_KEY: - ctx->flags.no_weak_key = 1; - break; - - default: - ec = GPG_ERR_INV_OP; - break; - } - return ec; -} - - -static unsigned int -do_tripledes_encrypt( void *context, byte *outbuf, const byte *inbuf ) -{ - struct _tripledes_ctx *ctx = (struct _tripledes_ctx *) context; - - tripledes_ecb_encrypt ( ctx, inbuf, outbuf ); - return /*burn_stack*/ (32); -} - -static unsigned int -do_tripledes_decrypt( void *context, byte *outbuf, const byte *inbuf ) -{ - struct _tripledes_ctx *ctx = (struct _tripledes_ctx *) context; - tripledes_ecb_decrypt ( ctx, inbuf, outbuf ); - return /*burn_stack*/ (32); -} - -static gcry_err_code_t -do_des_setkey (void *context, const byte *key, unsigned keylen) -{ - struct _des_ctx *ctx = (struct _des_ctx *) context; - - if (keylen != 8) - return GPG_ERR_INV_KEYLEN; - - des_setkey (ctx, key); - - if (is_weak_key (key)) { - _gcry_burn_stack (64); - return GPG_ERR_WEAK_KEY; - } - _gcry_burn_stack (64); - - return GPG_ERR_NO_ERROR; -} - - -static unsigned int -do_des_encrypt( void *context, byte *outbuf, const byte *inbuf ) -{ - struct _des_ctx *ctx = (struct _des_ctx *) context; - - des_ecb_encrypt ( ctx, inbuf, outbuf ); - return /*burn_stack*/ (32); -} - -static unsigned int -do_des_decrypt( void *context, byte *outbuf, const byte *inbuf ) -{ - struct _des_ctx *ctx = (struct _des_ctx *) context; - - des_ecb_decrypt ( ctx, inbuf, outbuf ); - return /*burn_stack*/ (32); -} - - - - -/* - Self-test section. - */ - - -/* Selftest for TripleDES. */ -static gpg_err_code_t -selftest_fips (int extended, selftest_report_func_t report) -{ - const char *what; - const char *errtxt; - - (void)extended; /* No extended tests available. */ - - what = "low-level"; - errtxt = selftest (); - if (errtxt) - goto failed; - - /* The low-level self-tests are quite extensive and thus we can do - without high level tests. This is also justified because we have - no custom block code implementation for 3des but always use the - standard high level block code. */ - - return 0; /* Succeeded. */ - - failed: - if (report) - report ("cipher", GCRY_CIPHER_3DES, what, errtxt); - return GPG_ERR_SELFTEST_FAILED; -} - - - -/* Run a full self-test for ALGO and return 0 on success. */ -static gpg_err_code_t -run_selftests (int algo, int extended, selftest_report_func_t report) -{ - gpg_err_code_t ec; - - switch (algo) - { - case GCRY_CIPHER_3DES: - ec = selftest_fips (extended, report); - break; - default: - ec = GPG_ERR_CIPHER_ALGO; - break; - - } - return ec; -} - - - -gcry_cipher_spec_t _gcry_cipher_spec_des = - { - GCRY_CIPHER_DES, {0, 0}, - "DES", NULL, NULL, 8, 64, sizeof (struct _des_ctx), - do_des_setkey, do_des_encrypt, do_des_decrypt - }; - -static gcry_cipher_oid_spec_t oids_tripledes[] = - { - { "1.2.840.113549.3.7", GCRY_CIPHER_MODE_CBC }, - /* Teletrust specific OID for 3DES. */ - { "1.3.36.3.1.3.2.1", GCRY_CIPHER_MODE_CBC }, - /* pbeWithSHAAnd3_KeyTripleDES_CBC */ - { "1.2.840.113549.1.12.1.3", GCRY_CIPHER_MODE_CBC }, - { NULL } - }; - -gcry_cipher_spec_t _gcry_cipher_spec_tripledes = - { - GCRY_CIPHER_3DES, {0, 1}, - "3DES", NULL, oids_tripledes, 8, 192, sizeof (struct _tripledes_ctx), - do_tripledes_setkey, do_tripledes_encrypt, do_tripledes_decrypt, - NULL, NULL, - run_selftests, - do_tripledes_set_extra_info - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/dsa-common.c b/src/hos_libhttpserver/src/libgcrypt/cipher/dsa-common.c deleted file mode 100644 index a5e42a21..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/dsa-common.c +++ /dev/null @@ -1,394 +0,0 @@ -/* dsa-common.c - Common code for DSA - * Copyright (C) 1998, 1999 Free Software Foundation, Inc. - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include - -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "pubkey-internal.h" - - -/* - * Generate a random secret exponent K less than Q. - * Note that ECDSA uses this code also to generate D. - */ -gcry_mpi_t -_gcry_dsa_gen_k (gcry_mpi_t q, int security_level) -{ - gcry_mpi_t k = mpi_alloc_secure (mpi_get_nlimbs (q)); - unsigned int nbits = mpi_get_nbits (q); - unsigned int nbytes = (nbits+7)/8; - char *rndbuf = NULL; - - /* To learn why we don't use mpi_mod to get the requested bit size, - read the paper: "The Insecurity of the Digital Signature - Algorithm with Partially Known Nonces" by Nguyen and Shparlinski. - Journal of Cryptology, New York. Vol 15, nr 3 (2003) */ - - if (DBG_CIPHER) - log_debug ("choosing a random k of %u bits at seclevel %d\n", - nbits, security_level); - for (;;) - { - if ( !rndbuf || nbits < 32 ) - { - xfree (rndbuf); - rndbuf = _gcry_random_bytes_secure (nbytes, security_level); - } - else - { /* Change only some of the higher bits. We could improve - this by directly requesting more memory at the first call - to get_random_bytes() and use these extra bytes here. - However the required management code is more complex and - thus we better use this simple method. */ - char *pp = _gcry_random_bytes_secure (4, security_level); - memcpy (rndbuf, pp, 4); - xfree (pp); - } - _gcry_mpi_set_buffer (k, rndbuf, nbytes, 0); - - /* Make sure we have the requested number of bits. This code - looks a bit funny but it is easy to understand if you - consider that mpi_set_highbit clears all higher bits. We - don't have a clear_highbit, thus we first set the high bit - and then clear it again. */ - if (mpi_test_bit (k, nbits-1)) - mpi_set_highbit (k, nbits-1); - else - { - mpi_set_highbit (k, nbits-1); - mpi_clear_bit (k, nbits-1); - } - - if (!(mpi_cmp (k, q) < 0)) /* check: k < q */ - { - if (DBG_CIPHER) - log_debug ("\tk too large - again\n"); - continue; /* no */ - } - if (!(mpi_cmp_ui (k, 0) > 0)) /* check: k > 0 */ - { - if (DBG_CIPHER) - log_debug ("\tk is zero - again\n"); - continue; /* no */ - } - break; /* okay */ - } - xfree (rndbuf); - - return k; -} - - -/* Turn VALUE into an octet string and store it in an allocated buffer - at R_FRAME. If the resulting octet string is shorter than NBYTES - the result will be left padded with zeroes. If VALUE does not fit - into NBYTES an error code is returned. */ -static gpg_err_code_t -int2octets (unsigned char **r_frame, gcry_mpi_t value, size_t nbytes) -{ - gpg_err_code_t rc; - size_t nframe, noff, n; - unsigned char *frame; - - rc = _gcry_mpi_print (GCRYMPI_FMT_USG, NULL, 0, &nframe, value); - if (rc) - return rc; - if (nframe > nbytes) - return GPG_ERR_TOO_LARGE; /* Value too long to fit into NBYTES. */ - - noff = (nframe < nbytes)? nbytes - nframe : 0; - n = nframe + noff; - frame = mpi_is_secure (value)? xtrymalloc_secure (n) : xtrymalloc (n); - if (!frame) - return gpg_err_code_from_syserror (); - if (noff) - memset (frame, 0, noff); - nframe += noff; - rc = _gcry_mpi_print (GCRYMPI_FMT_USG, frame+noff, nframe-noff, NULL, value); - if (rc) - { - xfree (frame); - return rc; - } - - *r_frame = frame; - return 0; -} - - -/* Connert the bit string BITS of length NBITS into an octet string - with a length of (QBITS+7)/8 bytes. On success store the result at - R_FRAME. */ -static gpg_err_code_t -bits2octets (unsigned char **r_frame, - const void *bits, unsigned int nbits, - gcry_mpi_t q, unsigned int qbits) -{ - gpg_err_code_t rc; - gcry_mpi_t z1; - - /* z1 = bits2int (b) */ - rc = _gcry_mpi_scan (&z1, GCRYMPI_FMT_USG, bits, (nbits+7)/8, NULL); - if (rc) - return rc; - if (nbits > qbits) - mpi_rshift (z1, z1, nbits - qbits); - - /* z2 - z1 mod q */ - if (mpi_cmp (z1, q) >= 0) - mpi_sub (z1, z1, q); - - /* Convert to an octet string. */ - rc = int2octets (r_frame, z1, (qbits+7)/8); - - mpi_free (z1); - return rc; -} - - -/* - * Generate a deterministic secret exponent K less than DSA_Q. H1 is - * the to be signed digest with a length of HLEN bytes. HALGO is the - * algorithm used to create the hash. On success the value for K is - * stored at R_K. - */ -gpg_err_code_t -_gcry_dsa_gen_rfc6979_k (gcry_mpi_t *r_k, - gcry_mpi_t dsa_q, gcry_mpi_t dsa_x, - const unsigned char *h1, unsigned int hlen, - int halgo, unsigned int extraloops) -{ - gpg_err_code_t rc; - unsigned char *V = NULL; - unsigned char *K = NULL; - unsigned char *x_buf = NULL; - unsigned char *h1_buf = NULL; - gcry_md_hd_t hd = NULL; - unsigned char *t = NULL; - gcry_mpi_t k = NULL; - unsigned int tbits, qbits; - int i; - - qbits = mpi_get_nbits (dsa_q); - - if (!qbits || !h1 || !hlen) - return GPG_ERR_EINVAL; - - if (_gcry_md_get_algo_dlen (halgo) != hlen) - return GPG_ERR_DIGEST_ALGO; - - /* Step b: V = 0x01 0x01 0x01 ... 0x01 */ - V = xtrymalloc (hlen); - if (!V) - { - rc = gpg_err_code_from_syserror (); - goto leave; - } - for (i=0; i < hlen; i++) - V[i] = 1; - - /* Step c: K = 0x00 0x00 0x00 ... 0x00 */ - K = xtrycalloc (1, hlen); - if (!K) - { - rc = gpg_err_code_from_syserror (); - goto leave; - } - - rc = int2octets (&x_buf, dsa_x, (qbits+7)/8); - if (rc) - goto leave; - - rc = bits2octets (&h1_buf, h1, hlen*8, dsa_q, qbits); - if (rc) - goto leave; - - /* Create a handle to compute the HMACs. */ - rc = _gcry_md_open (&hd, halgo, (GCRY_MD_FLAG_SECURE | GCRY_MD_FLAG_HMAC)); - if (rc) - goto leave; - - /* Step d: K = HMAC_K(V || 0x00 || int2octets(x) || bits2octets(h1) */ - rc = _gcry_md_setkey (hd, K, hlen); - if (rc) - goto leave; - _gcry_md_write (hd, V, hlen); - _gcry_md_write (hd, "", 1); - _gcry_md_write (hd, x_buf, (qbits+7)/8); - _gcry_md_write (hd, h1_buf, (qbits+7)/8); - memcpy (K, _gcry_md_read (hd, 0), hlen); - - /* Step e: V = HMAC_K(V) */ - rc = _gcry_md_setkey (hd, K, hlen); - if (rc) - goto leave; - _gcry_md_write (hd, V, hlen); - memcpy (V, _gcry_md_read (hd, 0), hlen); - - /* Step f: K = HMAC_K(V || 0x01 || int2octets(x) || bits2octets(h1) */ - rc = _gcry_md_setkey (hd, K, hlen); - if (rc) - goto leave; - _gcry_md_write (hd, V, hlen); - _gcry_md_write (hd, "\x01", 1); - _gcry_md_write (hd, x_buf, (qbits+7)/8); - _gcry_md_write (hd, h1_buf, (qbits+7)/8); - memcpy (K, _gcry_md_read (hd, 0), hlen); - - /* Step g: V = HMAC_K(V) */ - rc = _gcry_md_setkey (hd, K, hlen); - if (rc) - goto leave; - _gcry_md_write (hd, V, hlen); - memcpy (V, _gcry_md_read (hd, 0), hlen); - - /* Step h. */ - t = xtrymalloc ((qbits+7)/8+hlen); - if (!t) - { - rc = gpg_err_code_from_syserror (); - goto leave; - } - - again: - for (tbits = 0; tbits < qbits;) - { - /* V = HMAC_K(V) */ - rc = _gcry_md_setkey (hd, K, hlen); - if (rc) - goto leave; - _gcry_md_write (hd, V, hlen); - memcpy (V, _gcry_md_read (hd, 0), hlen); - - /* T = T || V */ - memcpy (t+(tbits+7)/8, V, hlen); - tbits += 8*hlen; - } - - /* k = bits2int (T) */ - mpi_free (k); - k = NULL; - rc = _gcry_mpi_scan (&k, GCRYMPI_FMT_USG, t, (tbits+7)/8, NULL); - if (rc) - goto leave; - if (tbits > qbits) - mpi_rshift (k, k, tbits - qbits); - - /* Check: k < q and k > 1 */ - if (!(mpi_cmp (k, dsa_q) < 0 && mpi_cmp_ui (k, 0) > 0)) - { - /* K = HMAC_K(V || 0x00) */ - rc = _gcry_md_setkey (hd, K, hlen); - if (rc) - goto leave; - _gcry_md_write (hd, V, hlen); - _gcry_md_write (hd, "", 1); - memcpy (K, _gcry_md_read (hd, 0), hlen); - - /* V = HMAC_K(V) */ - rc = _gcry_md_setkey (hd, K, hlen); - if (rc) - goto leave; - _gcry_md_write (hd, V, hlen); - memcpy (V, _gcry_md_read (hd, 0), hlen); - - goto again; - } - - /* The caller may have requested that we introduce some extra loops. - This is for example useful if the caller wants another value for - K because the last returned one yielded an R of 0. Becuase this - is very unlikely we implement it in a straightforward way. */ - if (extraloops) - { - extraloops--; - - /* K = HMAC_K(V || 0x00) */ - rc = _gcry_md_setkey (hd, K, hlen); - if (rc) - goto leave; - _gcry_md_write (hd, V, hlen); - _gcry_md_write (hd, "", 1); - memcpy (K, _gcry_md_read (hd, 0), hlen); - - /* V = HMAC_K(V) */ - rc = _gcry_md_setkey (hd, K, hlen); - if (rc) - goto leave; - _gcry_md_write (hd, V, hlen); - memcpy (V, _gcry_md_read (hd, 0), hlen); - - goto again; - } - - /* log_mpidump (" k", k); */ - - leave: - xfree (t); - _gcry_md_close (hd); - xfree (h1_buf); - xfree (x_buf); - xfree (K); - xfree (V); - - if (rc) - mpi_free (k); - else - *r_k = k; - return rc; -} - -/* - * Truncate opaque hash value to qbits for DSA. - * Non-opaque input is not truncated, in hope that user - * knows what is passed. It is not possible to correctly - * trucate non-opaque inputs. - */ -gpg_err_code_t -_gcry_dsa_normalize_hash (gcry_mpi_t input, - gcry_mpi_t *out, - unsigned int qbits) -{ - gpg_err_code_t rc = 0; - const void *abuf; - unsigned int abits; - gcry_mpi_t hash; - - if (mpi_is_opaque (input)) - { - abuf = mpi_get_opaque (input, &abits); - rc = _gcry_mpi_scan (&hash, GCRYMPI_FMT_USG, abuf, (abits+7)/8, NULL); - if (rc) - return rc; - if (abits > qbits) - mpi_rshift (hash, hash, abits - qbits); - } - else - hash = input; - - *out = hash; - - return rc; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/dsa.c b/src/hos_libhttpserver/src/libgcrypt/cipher/dsa.c deleted file mode 100644 index 09cd9693..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/dsa.c +++ /dev/null @@ -1,1299 +0,0 @@ -/* dsa.c - DSA signature algorithm - * Copyright (C) 1998, 2000, 2001, 2002, 2003, - * 2006, 2008 Free Software Foundation, Inc. - * Copyright (C) 2013 g10 Code GmbH. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include - -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "pubkey-internal.h" - - -typedef struct -{ - gcry_mpi_t p; /* prime */ - gcry_mpi_t q; /* group order */ - gcry_mpi_t g; /* group generator */ - gcry_mpi_t y; /* g^x mod p */ -} DSA_public_key; - - -typedef struct -{ - gcry_mpi_t p; /* prime */ - gcry_mpi_t q; /* group order */ - gcry_mpi_t g; /* group generator */ - gcry_mpi_t y; /* g^x mod p */ - gcry_mpi_t x; /* secret exponent */ -} DSA_secret_key; - - -/* A structure used to hold domain parameters. */ -typedef struct -{ - gcry_mpi_t p; /* prime */ - gcry_mpi_t q; /* group order */ - gcry_mpi_t g; /* group generator */ -} dsa_domain_t; - - -static const char *dsa_names[] = - { - "dsa", - "openpgp-dsa", - NULL, - }; - - -/* A sample 1024 bit DSA key used for the selftests. */ -static const char sample_secret_key[] = -"(private-key" -" (dsa" -" (p #00AD7C0025BA1A15F775F3F2D673718391D00456978D347B33D7B49E7F32EDAB" -" 96273899DD8B2BB46CD6ECA263FAF04A28903503D59062A8865D2AE8ADFB5191" -" CF36FFB562D0E2F5809801A1F675DAE59698A9E01EFE8D7DCFCA084F4C6F5A44" -" 44D499A06FFAEA5E8EF5E01F2FD20A7B7EF3F6968AFBA1FB8D91F1559D52D8777B#)" -" (q #00EB7B5751D25EBBB7BD59D920315FD840E19AEBF9#)" -" (g #1574363387FDFD1DDF38F4FBE135BB20C7EE4772FB94C337AF86EA8E49666503" -" AE04B6BE81A2F8DD095311E0217ACA698A11E6C5D33CCDAE71498ED35D13991E" -" B02F09AB40BD8F4C5ED8C75DA779D0AE104BC34C960B002377068AB4B5A1F984" -" 3FBA91F537F1B7CAC4D8DD6D89B0D863AF7025D549F9C765D2FC07EE208F8D15#)" -" (y #64B11EF8871BE4AB572AA810D5D3CA11A6CDBC637A8014602C72960DB135BF46" -" A1816A724C34F87330FC9E187C5D66897A04535CC2AC9164A7150ABFA8179827" -" 6E45831AB811EEE848EBB24D9F5F2883B6E5DDC4C659DEF944DCFD80BF4D0A20" -" 42CAA7DC289F0C5A9D155F02D3D551DB741A81695B74D4C8F477F9C7838EB0FB#)" -" (x #11D54E4ADBD3034160F2CED4B7CD292A4EBF3EC0#)))"; -/* A sample 1024 bit DSA key used for the selftests (public only). */ -static const char sample_public_key[] = -"(public-key" -" (dsa" -" (p #00AD7C0025BA1A15F775F3F2D673718391D00456978D347B33D7B49E7F32EDAB" -" 96273899DD8B2BB46CD6ECA263FAF04A28903503D59062A8865D2AE8ADFB5191" -" CF36FFB562D0E2F5809801A1F675DAE59698A9E01EFE8D7DCFCA084F4C6F5A44" -" 44D499A06FFAEA5E8EF5E01F2FD20A7B7EF3F6968AFBA1FB8D91F1559D52D8777B#)" -" (q #00EB7B5751D25EBBB7BD59D920315FD840E19AEBF9#)" -" (g #1574363387FDFD1DDF38F4FBE135BB20C7EE4772FB94C337AF86EA8E49666503" -" AE04B6BE81A2F8DD095311E0217ACA698A11E6C5D33CCDAE71498ED35D13991E" -" B02F09AB40BD8F4C5ED8C75DA779D0AE104BC34C960B002377068AB4B5A1F984" -" 3FBA91F537F1B7CAC4D8DD6D89B0D863AF7025D549F9C765D2FC07EE208F8D15#)" -" (y #64B11EF8871BE4AB572AA810D5D3CA11A6CDBC637A8014602C72960DB135BF46" -" A1816A724C34F87330FC9E187C5D66897A04535CC2AC9164A7150ABFA8179827" -" 6E45831AB811EEE848EBB24D9F5F2883B6E5DDC4C659DEF944DCFD80BF4D0A20" -" 42CAA7DC289F0C5A9D155F02D3D551DB741A81695B74D4C8F477F9C7838EB0FB#)))"; - - - - -static int test_keys (DSA_secret_key *sk, unsigned int qbits); -static int check_secret_key (DSA_secret_key *sk); -static gpg_err_code_t generate (DSA_secret_key *sk, - unsigned int nbits, - unsigned int qbits, - int transient_key, - dsa_domain_t *domain, - gcry_mpi_t **ret_factors); -static gpg_err_code_t sign (gcry_mpi_t r, gcry_mpi_t s, gcry_mpi_t input, - DSA_secret_key *skey, int flags, int hashalgo); -static gpg_err_code_t verify (gcry_mpi_t r, gcry_mpi_t s, gcry_mpi_t input, - DSA_public_key *pkey); -static unsigned int dsa_get_nbits (gcry_sexp_t parms); - - -static void (*progress_cb) (void *,const char *, int, int, int ); -static void *progress_cb_data; - - -void -_gcry_register_pk_dsa_progress (void (*cb) (void *, const char *, - int, int, int), - void *cb_data) -{ - progress_cb = cb; - progress_cb_data = cb_data; -} - - -static void -progress (int c) -{ - if (progress_cb) - progress_cb (progress_cb_data, "pk_dsa", c, 0, 0); -} - - -/* Check that a freshly generated key actually works. Returns 0 on success. */ -static int -test_keys (DSA_secret_key *sk, unsigned int qbits) -{ - int result = -1; /* Default to failure. */ - DSA_public_key pk; - gcry_mpi_t data = mpi_new (qbits); - gcry_mpi_t sig_a = mpi_new (qbits); - gcry_mpi_t sig_b = mpi_new (qbits); - - /* Put the relevant parameters into a public key structure. */ - pk.p = sk->p; - pk.q = sk->q; - pk.g = sk->g; - pk.y = sk->y; - - /* Create a random plaintext. */ - _gcry_mpi_randomize (data, qbits, GCRY_WEAK_RANDOM); - - /* Sign DATA using the secret key. */ - sign (sig_a, sig_b, data, sk, 0, 0); - - /* Verify the signature using the public key. */ - if ( verify (sig_a, sig_b, data, &pk) ) - goto leave; /* Signature does not match. */ - - /* Modify the data and check that the signing fails. */ - mpi_add_ui (data, data, 1); - if ( !verify (sig_a, sig_b, data, &pk) ) - goto leave; /* Signature matches but should not. */ - - result = 0; /* The test succeeded. */ - - leave: - _gcry_mpi_release (sig_b); - _gcry_mpi_release (sig_a); - _gcry_mpi_release (data); - return result; -} - - - -/* - Generate a DSA key pair with a key of size NBITS. If transient_key - is true the key is generated using the standard RNG and not the - very secure one. - - Returns: 2 structures filled with all needed values - and an array with the n-1 factors of (p-1) - */ -static gpg_err_code_t -generate (DSA_secret_key *sk, unsigned int nbits, unsigned int qbits, - int transient_key, dsa_domain_t *domain, gcry_mpi_t **ret_factors ) -{ - gpg_err_code_t rc; - gcry_mpi_t p; /* the prime */ - gcry_mpi_t q; /* the 160 bit prime factor */ - gcry_mpi_t g; /* the generator */ - gcry_mpi_t y; /* g^x mod p */ - gcry_mpi_t x; /* the secret exponent */ - gcry_mpi_t h, e; /* helper */ - unsigned char *rndbuf; - gcry_random_level_t random_level; - - if (qbits) - ; /* Caller supplied qbits. Use this value. */ - else if ( nbits >= 512 && nbits <= 1024 ) - qbits = 160; - else if ( nbits == 2048 ) - qbits = 224; - else if ( nbits == 3072 ) - qbits = 256; - else if ( nbits == 7680 ) - qbits = 384; - else if ( nbits == 15360 ) - qbits = 512; - else - return GPG_ERR_INV_VALUE; - - if (qbits < 160 || qbits > 512 || (qbits%8) ) - return GPG_ERR_INV_VALUE; - if (nbits < 2*qbits || nbits > 15360) - return GPG_ERR_INV_VALUE; - - if (fips_mode ()) - { - if (nbits < 1024) - return GPG_ERR_INV_VALUE; - if (transient_key) - return GPG_ERR_INV_VALUE; - } - - if (domain->p && domain->q && domain->g) - { - /* Domain parameters are given; use them. */ - p = mpi_copy (domain->p); - q = mpi_copy (domain->q); - g = mpi_copy (domain->g); - gcry_assert (mpi_get_nbits (p) == nbits); - gcry_assert (mpi_get_nbits (q) == qbits); - h = mpi_alloc (0); - e = NULL; - } - else - { - /* Generate new domain parameters. */ - rc = _gcry_generate_elg_prime (1, nbits, qbits, NULL, &p, ret_factors); - if (rc) - return rc; - - /* Get q out of factors. */ - q = mpi_copy ((*ret_factors)[0]); - gcry_assert (mpi_get_nbits (q) == qbits); - - /* Find a generator g (h and e are helpers). - e = (p-1)/q */ - e = mpi_alloc (mpi_get_nlimbs (p)); - mpi_sub_ui (e, p, 1); - mpi_fdiv_q (e, e, q); - g = mpi_alloc (mpi_get_nlimbs (p)); - h = mpi_alloc_set_ui (1); /* (We start with 2.) */ - do - { - mpi_add_ui (h, h, 1); - /* g = h^e mod p */ - mpi_powm (g, h, e, p); - } - while (!mpi_cmp_ui (g, 1)); /* Continue until g != 1. */ - } - - /* Select a random number X with the property: - * 0 < x < q-1 - * - * FIXME: Why do we use the requirement x < q-1 ? It should be - * sufficient to test for x < q. FIPS-186-3 check x < q-1 but it - * does not check for 0 < x because it makes sure that Q is unsigned - * and finally adds one to the result so that 0 will never be - * returned. We should replace the code below with _gcry_dsa_gen_k. - * - * This must be a very good random number because this is the secret - * part. The random quality depends on the transient_key flag. */ - random_level = transient_key ? GCRY_STRONG_RANDOM : GCRY_VERY_STRONG_RANDOM; - if (DBG_CIPHER) - log_debug("choosing a random x%s\n", transient_key? " (transient-key)":""); - gcry_assert( qbits >= 160 ); - x = mpi_alloc_secure( mpi_get_nlimbs(q) ); - mpi_sub_ui( h, q, 1 ); /* put q-1 into h */ - rndbuf = NULL; - do - { - if( DBG_CIPHER ) - progress('.'); - if( !rndbuf ) - rndbuf = _gcry_random_bytes_secure ((qbits+7)/8, random_level); - else - { /* Change only some of the higher bits (= 2 bytes)*/ - char *r = _gcry_random_bytes_secure (2, random_level); - memcpy(rndbuf, r, 2 ); - xfree(r); - } - - _gcry_mpi_set_buffer( x, rndbuf, (qbits+7)/8, 0 ); - mpi_clear_highbit( x, qbits+1 ); - } - while ( !( mpi_cmp_ui( x, 0 )>0 && mpi_cmp( x, h )<0 ) ); - xfree(rndbuf); - mpi_free( e ); - mpi_free( h ); - - /* y = g^x mod p */ - y = mpi_alloc( mpi_get_nlimbs(p) ); - mpi_powm (y, g, x, p); - - if( DBG_CIPHER ) - { - progress('\n'); - log_mpidump("dsa p", p ); - log_mpidump("dsa q", q ); - log_mpidump("dsa g", g ); - log_mpidump("dsa y", y ); - log_mpidump("dsa x", x ); - } - - /* Copy the stuff to the key structures. */ - sk->p = p; - sk->q = q; - sk->g = g; - sk->y = y; - sk->x = x; - - /* Now we can test our keys (this should never fail!). */ - if ( test_keys (sk, qbits) ) - { - _gcry_mpi_release (sk->p); sk->p = NULL; - _gcry_mpi_release (sk->q); sk->q = NULL; - _gcry_mpi_release (sk->g); sk->g = NULL; - _gcry_mpi_release (sk->y); sk->y = NULL; - _gcry_mpi_release (sk->x); sk->x = NULL; - fips_signal_error ("self-test after key generation failed"); - return GPG_ERR_SELFTEST_FAILED; - } - return 0; -} - - -/* Generate a DSA key pair with a key of size NBITS using the - algorithm given in FIPS-186-3. If USE_FIPS186_2 is true, - FIPS-186-2 is used and thus the length is restricted to 1024/160. - If DERIVEPARMS is not NULL it may contain a seed value. If domain - parameters are specified in DOMAIN, DERIVEPARMS may not be given - and NBITS and QBITS must match the specified domain parameters. */ -static gpg_err_code_t -generate_fips186 (DSA_secret_key *sk, unsigned int nbits, unsigned int qbits, - gcry_sexp_t deriveparms, int use_fips186_2, - dsa_domain_t *domain, - int *r_counter, void **r_seed, size_t *r_seedlen, - gcry_mpi_t *r_h) -{ - gpg_err_code_t ec; - struct { - gcry_sexp_t sexp; - const void *seed; - size_t seedlen; - } initial_seed = { NULL, NULL, 0 }; - gcry_mpi_t prime_q = NULL; - gcry_mpi_t prime_p = NULL; - gcry_mpi_t value_g = NULL; /* The generator. */ - gcry_mpi_t value_y = NULL; /* g^x mod p */ - gcry_mpi_t value_x = NULL; /* The secret exponent. */ - gcry_mpi_t value_h = NULL; /* Helper. */ - gcry_mpi_t value_e = NULL; /* Helper. */ - - /* Preset return values. */ - *r_counter = 0; - *r_seed = NULL; - *r_seedlen = 0; - *r_h = NULL; - - /* Derive QBITS from NBITS if requested */ - if (!qbits) - { - if (nbits == 1024) - qbits = 160; - else if (nbits == 2048) - qbits = 224; - else if (nbits == 3072) - qbits = 256; - } - - /* Check that QBITS and NBITS match the standard. Note that FIPS - 186-3 uses N for QBITS and L for NBITS. */ - if (nbits == 1024 && qbits == 160) - ; - else if (nbits == 2048 && qbits == 224) - ; - else if (nbits == 2048 && qbits == 256) - ; - else if (nbits == 3072 && qbits == 256) - ; - else - return GPG_ERR_INV_VALUE; - - if (domain->p && domain->q && domain->g) - { - /* Domain parameters are given; use them. */ - prime_p = mpi_copy (domain->p); - prime_q = mpi_copy (domain->q); - value_g = mpi_copy (domain->g); - gcry_assert (mpi_get_nbits (prime_p) == nbits); - gcry_assert (mpi_get_nbits (prime_q) == qbits); - gcry_assert (!deriveparms); - ec = 0; - } - else - { - /* Generate new domain parameters. */ - - /* Get an initial seed value. */ - if (deriveparms) - { - initial_seed.sexp = sexp_find_token (deriveparms, "seed", 0); - if (initial_seed.sexp) - initial_seed.seed = sexp_nth_data (initial_seed.sexp, 1, - &initial_seed.seedlen); - } - - /* Fixme: Enable 186-3 after it has been approved and after fixing - the generation function. */ - /* if (use_fips186_2) */ - (void)use_fips186_2; - ec = _gcry_generate_fips186_2_prime (nbits, qbits, - initial_seed.seed, - initial_seed.seedlen, - &prime_q, &prime_p, - r_counter, - r_seed, r_seedlen); - /* else */ - /* ec = _gcry_generate_fips186_3_prime (nbits, qbits, NULL, 0, */ - /* &prime_q, &prime_p, */ - /* r_counter, */ - /* r_seed, r_seedlen, NULL); */ - sexp_release (initial_seed.sexp); - if (ec) - goto leave; - - /* Find a generator g (h and e are helpers). - e = (p-1)/q */ - value_e = mpi_alloc_like (prime_p); - mpi_sub_ui (value_e, prime_p, 1); - mpi_fdiv_q (value_e, value_e, prime_q ); - value_g = mpi_alloc_like (prime_p); - value_h = mpi_alloc_set_ui (1); - do - { - mpi_add_ui (value_h, value_h, 1); - /* g = h^e mod p */ - mpi_powm (value_g, value_h, value_e, prime_p); - } - while (!mpi_cmp_ui (value_g, 1)); /* Continue until g != 1. */ - } - - - /* Select a random number x with: 0 < x < q */ - value_x = mpi_snew (qbits); - do - { - if( DBG_CIPHER ) - progress('.'); - _gcry_mpi_randomize (value_x, qbits, GCRY_VERY_STRONG_RANDOM); - mpi_clear_highbit (value_x, qbits+1); - } - while (!(mpi_cmp_ui (value_x, 0) > 0 && mpi_cmp (value_x, prime_q) < 0)); - - /* y = g^x mod p */ - value_y = mpi_alloc_like (prime_p); - mpi_powm (value_y, value_g, value_x, prime_p); - - if (DBG_CIPHER) - { - progress('\n'); - log_mpidump("dsa p", prime_p ); - log_mpidump("dsa q", prime_q ); - log_mpidump("dsa g", value_g ); - log_mpidump("dsa y", value_y ); - log_mpidump("dsa x", value_x ); - log_mpidump("dsa h", value_h ); - } - - /* Copy the stuff to the key structures. */ - sk->p = prime_p; prime_p = NULL; - sk->q = prime_q; prime_q = NULL; - sk->g = value_g; value_g = NULL; - sk->y = value_y; value_y = NULL; - sk->x = value_x; value_x = NULL; - *r_h = value_h; value_h = NULL; - - leave: - _gcry_mpi_release (prime_p); - _gcry_mpi_release (prime_q); - _gcry_mpi_release (value_g); - _gcry_mpi_release (value_y); - _gcry_mpi_release (value_x); - _gcry_mpi_release (value_h); - _gcry_mpi_release (value_e); - - /* As a last step test this keys (this should never fail of course). */ - if (!ec && test_keys (sk, qbits) ) - { - _gcry_mpi_release (sk->p); sk->p = NULL; - _gcry_mpi_release (sk->q); sk->q = NULL; - _gcry_mpi_release (sk->g); sk->g = NULL; - _gcry_mpi_release (sk->y); sk->y = NULL; - _gcry_mpi_release (sk->x); sk->x = NULL; - fips_signal_error ("self-test after key generation failed"); - ec = GPG_ERR_SELFTEST_FAILED; - } - - if (ec) - { - *r_counter = 0; - xfree (*r_seed); *r_seed = NULL; - *r_seedlen = 0; - _gcry_mpi_release (*r_h); *r_h = NULL; - } - - return ec; -} - - - -/* - Test whether the secret key is valid. - Returns: if this is a valid key. - */ -static int -check_secret_key( DSA_secret_key *sk ) -{ - int rc; - gcry_mpi_t y = mpi_alloc( mpi_get_nlimbs(sk->y) ); - - mpi_powm( y, sk->g, sk->x, sk->p ); - rc = !mpi_cmp( y, sk->y ); - mpi_free( y ); - return rc; -} - - - -/* - Make a DSA signature from INPUT and put it into r and s. - - INPUT may either be a plain MPI or an opaque MPI which is then - internally converted to a plain MPI. FLAGS and HASHALGO may both - be 0 for standard operation mode. - - The return value is 0 on success or an error code. Note that for - backward compatibility the function will not return any error if - FLAGS and HASHALGO are both 0 and INPUT is a plain MPI. - */ -static gpg_err_code_t -sign (gcry_mpi_t r, gcry_mpi_t s, gcry_mpi_t input, DSA_secret_key *skey, - int flags, int hashalgo) -{ - gpg_err_code_t rc; - gcry_mpi_t hash; - gcry_mpi_t k; - gcry_mpi_t kinv; - gcry_mpi_t tmp; - const void *abuf; - unsigned int abits, qbits; - int extraloops = 0; - - qbits = mpi_get_nbits (skey->q); - - /* Convert the INPUT into an MPI. */ - rc = _gcry_dsa_normalize_hash (input, &hash, qbits); - if (rc) - return rc; - - again: - /* Create the K value. */ - if ((flags & PUBKEY_FLAG_RFC6979) && hashalgo) - { - /* Use Pornin's method for deterministic DSA. If this flag is - set, it is expected that HASH is an opaque MPI with the to be - signed hash. That hash is also used as h1 from 3.2.a. */ - if (!mpi_is_opaque (input)) - { - rc = GPG_ERR_CONFLICT; - goto leave; - } - - abuf = mpi_get_opaque (input, &abits); - rc = _gcry_dsa_gen_rfc6979_k (&k, skey->q, skey->x, - abuf, (abits+7)/8, hashalgo, extraloops); - if (rc) - goto leave; - } - else - { - /* Select a random k with 0 < k < q */ - k = _gcry_dsa_gen_k (skey->q, GCRY_STRONG_RANDOM); - } - - /* r = (a^k mod p) mod q */ - mpi_powm( r, skey->g, k, skey->p ); - mpi_fdiv_r( r, r, skey->q ); - - /* kinv = k^(-1) mod q */ - kinv = mpi_alloc( mpi_get_nlimbs(k) ); - mpi_invm(kinv, k, skey->q ); - - /* s = (kinv * ( hash + x * r)) mod q */ - tmp = mpi_alloc( mpi_get_nlimbs(skey->p) ); - mpi_mul( tmp, skey->x, r ); - mpi_add( tmp, tmp, hash ); - mpi_mulm( s , kinv, tmp, skey->q ); - - mpi_free(k); - mpi_free(kinv); - mpi_free(tmp); - - if (!mpi_cmp_ui (r, 0)) - { - /* This is a highly unlikely code path. */ - extraloops++; - goto again; - } - - rc = 0; - - leave: - if (hash != input) - mpi_free (hash); - - return rc; -} - - -/* - Returns true if the signature composed from R and S is valid. - */ -static gpg_err_code_t -verify (gcry_mpi_t r, gcry_mpi_t s, gcry_mpi_t input, DSA_public_key *pkey ) -{ - gpg_err_code_t rc = 0; - gcry_mpi_t w, u1, u2, v; - gcry_mpi_t base[3]; - gcry_mpi_t ex[3]; - gcry_mpi_t hash; - unsigned int nbits; - - if( !(mpi_cmp_ui( r, 0 ) > 0 && mpi_cmp( r, pkey->q ) < 0) ) - return GPG_ERR_BAD_SIGNATURE; /* Assertion 0 < r < n failed. */ - if( !(mpi_cmp_ui( s, 0 ) > 0 && mpi_cmp( s, pkey->q ) < 0) ) - return GPG_ERR_BAD_SIGNATURE; /* Assertion 0 < s < n failed. */ - - nbits = mpi_get_nbits (pkey->q); - rc = _gcry_dsa_normalize_hash (input, &hash, nbits); - if (rc) - return rc; - - w = mpi_alloc( mpi_get_nlimbs(pkey->q) ); - u1 = mpi_alloc( mpi_get_nlimbs(pkey->q) ); - u2 = mpi_alloc( mpi_get_nlimbs(pkey->q) ); - v = mpi_alloc( mpi_get_nlimbs(pkey->p) ); - - /* w = s^(-1) mod q */ - mpi_invm( w, s, pkey->q ); - - /* u1 = (hash * w) mod q */ - mpi_mulm( u1, hash, w, pkey->q ); - - /* u2 = r * w mod q */ - mpi_mulm( u2, r, w, pkey->q ); - - /* v = g^u1 * y^u2 mod p mod q */ - base[0] = pkey->g; ex[0] = u1; - base[1] = pkey->y; ex[1] = u2; - base[2] = NULL; ex[2] = NULL; - mpi_mulpowm( v, base, ex, pkey->p ); - mpi_fdiv_r( v, v, pkey->q ); - - if (mpi_cmp( v, r )) - { - if (DBG_CIPHER) - { - log_mpidump (" i", input); - log_mpidump (" h", hash); - log_mpidump (" v", v); - log_mpidump (" r", r); - log_mpidump (" s", s); - } - rc = GPG_ERR_BAD_SIGNATURE; - } - - mpi_free(w); - mpi_free(u1); - mpi_free(u2); - mpi_free(v); - if (hash != input) - mpi_free (hash); - - return rc; -} - - -/********************************************* - ************** interface ****************** - *********************************************/ - -static gcry_err_code_t -dsa_generate (const gcry_sexp_t genparms, gcry_sexp_t *r_skey) -{ - gpg_err_code_t rc; - unsigned int nbits; - gcry_sexp_t domainsexp; - DSA_secret_key sk; - gcry_sexp_t l1; - unsigned int qbits = 0; - gcry_sexp_t deriveparms = NULL; - gcry_sexp_t seedinfo = NULL; - gcry_sexp_t misc_info = NULL; - int flags = 0; - dsa_domain_t domain; - gcry_mpi_t *factors = NULL; - - memset (&sk, 0, sizeof sk); - memset (&domain, 0, sizeof domain); - - rc = _gcry_pk_util_get_nbits (genparms, &nbits); - if (rc) - return rc; - - /* Parse the optional flags list. */ - l1 = sexp_find_token (genparms, "flags", 0); - if (l1) - { - rc = _gcry_pk_util_parse_flaglist (l1, &flags, NULL); - sexp_release (l1); - if (rc) - return rc;\ - } - - /* Parse the optional qbits element. */ - l1 = sexp_find_token (genparms, "qbits", 0); - if (l1) - { - char buf[50]; - const char *s; - size_t n; - - s = sexp_nth_data (l1, 1, &n); - if (!s || n >= DIM (buf) - 1 ) - { - sexp_release (l1); - return GPG_ERR_INV_OBJ; /* No value or value too large. */ - } - memcpy (buf, s, n); - buf[n] = 0; - qbits = (unsigned int)strtoul (buf, NULL, 0); - sexp_release (l1); - } - - /* Parse the optional transient-key flag. */ - if (!(flags & PUBKEY_FLAG_TRANSIENT_KEY)) - { - l1 = sexp_find_token (genparms, "transient-key", 0); - if (l1) - { - flags |= PUBKEY_FLAG_TRANSIENT_KEY; - sexp_release (l1); - } - } - - /* Get the optional derive parameters. */ - deriveparms = sexp_find_token (genparms, "derive-parms", 0); - - /* Parse the optional "use-fips186" flags. */ - if (!(flags & PUBKEY_FLAG_USE_FIPS186)) - { - l1 = sexp_find_token (genparms, "use-fips186", 0); - if (l1) - { - flags |= PUBKEY_FLAG_USE_FIPS186; - sexp_release (l1); - } - } - if (!(flags & PUBKEY_FLAG_USE_FIPS186_2)) - { - l1 = sexp_find_token (genparms, "use-fips186-2", 0); - if (l1) - { - flags |= PUBKEY_FLAG_USE_FIPS186_2; - sexp_release (l1); - } - } - - /* Check whether domain parameters are given. */ - domainsexp = sexp_find_token (genparms, "domain", 0); - if (domainsexp) - { - /* DERIVEPARMS can't be used together with domain parameters. - NBITS abnd QBITS may not be specified because there values - are derived from the domain parameters. */ - if (deriveparms || qbits || nbits) - { - sexp_release (domainsexp); - sexp_release (deriveparms); - return GPG_ERR_INV_VALUE; - } - - /* Put all domain parameters into the domain object. */ - l1 = sexp_find_token (domainsexp, "p", 0); - domain.p = sexp_nth_mpi (l1, 1, GCRYMPI_FMT_USG); - sexp_release (l1); - l1 = sexp_find_token (domainsexp, "q", 0); - domain.q = sexp_nth_mpi (l1, 1, GCRYMPI_FMT_USG); - sexp_release (l1); - l1 = sexp_find_token (domainsexp, "g", 0); - domain.g = sexp_nth_mpi (l1, 1, GCRYMPI_FMT_USG); - sexp_release (l1); - sexp_release (domainsexp); - - /* Check that all domain parameters are available. */ - if (!domain.p || !domain.q || !domain.g) - { - _gcry_mpi_release (domain.p); - _gcry_mpi_release (domain.q); - _gcry_mpi_release (domain.g); - sexp_release (deriveparms); - return GPG_ERR_MISSING_VALUE; - } - - /* Get NBITS and QBITS from the domain parameters. */ - nbits = mpi_get_nbits (domain.p); - qbits = mpi_get_nbits (domain.q); - } - - if (deriveparms - || (flags & PUBKEY_FLAG_USE_FIPS186) - || (flags & PUBKEY_FLAG_USE_FIPS186_2) - || fips_mode ()) - { - int counter; - void *seed; - size_t seedlen; - gcry_mpi_t h_value; - - rc = generate_fips186 (&sk, nbits, qbits, deriveparms, - !!(flags & PUBKEY_FLAG_USE_FIPS186_2), - &domain, - &counter, &seed, &seedlen, &h_value); - if (!rc && h_value) - { - /* Format the seed-values unless domain parameters are used - for which a H_VALUE of NULL is an indication. */ - rc = sexp_build (&seedinfo, NULL, - "(seed-values(counter %d)(seed %b)(h %m))", - counter, (int)seedlen, seed, h_value); - xfree (seed); - _gcry_mpi_release (h_value); - } - } - else - { - rc = generate (&sk, nbits, qbits, - !!(flags & PUBKEY_FLAG_TRANSIENT_KEY), - &domain, &factors); - } - - if (!rc) - { - /* Put the factors into MISC_INFO. Note that the factors are - not confidential thus we can store them in standard memory. */ - int nfactors, i, j; - char *p; - char *format = NULL; - void **arg_list = NULL; - - for (nfactors=0; factors && factors[nfactors]; nfactors++) - ; - /* Allocate space for the format string: - "(misc-key-info%S(pm1-factors%m))" - with one "%m" for each factor and construct it. */ - format = xtrymalloc (50 + 2*nfactors); - if (!format) - rc = gpg_err_code_from_syserror (); - else - { - p = stpcpy (format, "(misc-key-info"); - if (seedinfo) - p = stpcpy (p, "%S"); - if (nfactors) - { - p = stpcpy (p, "(pm1-factors"); - for (i=0; i < nfactors; i++) - p = stpcpy (p, "%m"); - p = stpcpy (p, ")"); - } - p = stpcpy (p, ")"); - - /* Allocate space for the list of factors plus one for the - seedinfo s-exp plus an extra NULL entry for safety and - fill it with the factors. */ - arg_list = xtrycalloc (nfactors+1+1, sizeof *arg_list); - if (!arg_list) - rc = gpg_err_code_from_syserror (); - else - { - i = 0; - if (seedinfo) - arg_list[i++] = &seedinfo; - for (j=0; j < nfactors; j++) - arg_list[i++] = factors + j; - arg_list[i] = NULL; - - rc = sexp_build_array (&misc_info, NULL, format, arg_list); - } - } - - xfree (arg_list); - xfree (format); - } - - if (!rc) - rc = sexp_build (r_skey, NULL, - "(key-data" - " (public-key" - " (dsa(p%m)(q%m)(g%m)(y%m)))" - " (private-key" - " (dsa(p%m)(q%m)(g%m)(y%m)(x%m)))" - " %S)", - sk.p, sk.q, sk.g, sk.y, - sk.p, sk.q, sk.g, sk.y, sk.x, - misc_info); - - - _gcry_mpi_release (sk.p); - _gcry_mpi_release (sk.q); - _gcry_mpi_release (sk.g); - _gcry_mpi_release (sk.y); - _gcry_mpi_release (sk.x); - - _gcry_mpi_release (domain.p); - _gcry_mpi_release (domain.q); - _gcry_mpi_release (domain.g); - - sexp_release (seedinfo); - sexp_release (misc_info); - sexp_release (deriveparms); - if (factors) - { - gcry_mpi_t *mp; - for (mp = factors; *mp; mp++) - mpi_free (*mp); - xfree (factors); - } - return rc; -} - - - -static gcry_err_code_t -dsa_check_secret_key (gcry_sexp_t keyparms) -{ - gcry_err_code_t rc; - DSA_secret_key sk = {NULL, NULL, NULL, NULL, NULL}; - - rc = _gcry_sexp_extract_param (keyparms, NULL, "pqgyx", - &sk.p, &sk.q, &sk.g, &sk.y, &sk.x, - NULL); - if (rc) - goto leave; - - if (!check_secret_key (&sk)) - rc = GPG_ERR_BAD_SECKEY; - - leave: - _gcry_mpi_release (sk.p); - _gcry_mpi_release (sk.q); - _gcry_mpi_release (sk.g); - _gcry_mpi_release (sk.y); - _gcry_mpi_release (sk.x); - if (DBG_CIPHER) - log_debug ("dsa_testkey => %s\n", gpg_strerror (rc)); - return rc; -} - - -static gcry_err_code_t -dsa_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_data, gcry_sexp_t keyparms) -{ - gcry_err_code_t rc; - struct pk_encoding_ctx ctx; - gcry_mpi_t data = NULL; - DSA_secret_key sk = {NULL, NULL, NULL, NULL, NULL}; - gcry_mpi_t sig_r = NULL; - gcry_mpi_t sig_s = NULL; - - _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_SIGN, - dsa_get_nbits (keyparms)); - - /* Extract the data. */ - rc = _gcry_pk_util_data_to_mpi (s_data, &data, &ctx); - if (rc) - goto leave; - if (DBG_CIPHER) - log_mpidump ("dsa_sign data", data); - - /* Extract the key. */ - rc = _gcry_sexp_extract_param (keyparms, NULL, "pqgyx", - &sk.p, &sk.q, &sk.g, &sk.y, &sk.x, NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_mpidump ("dsa_sign p", sk.p); - log_mpidump ("dsa_sign q", sk.q); - log_mpidump ("dsa_sign g", sk.g); - log_mpidump ("dsa_sign y", sk.y); - if (!fips_mode ()) - log_mpidump ("dsa_sign x", sk.x); - } - - sig_r = mpi_new (0); - sig_s = mpi_new (0); - rc = sign (sig_r, sig_s, data, &sk, ctx.flags, ctx.hash_algo); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_mpidump ("dsa_sign sig_r", sig_r); - log_mpidump ("dsa_sign sig_s", sig_s); - } - rc = sexp_build (r_sig, NULL, "(sig-val(dsa(r%M)(s%M)))", sig_r, sig_s); - - leave: - _gcry_mpi_release (sig_r); - _gcry_mpi_release (sig_s); - _gcry_mpi_release (sk.p); - _gcry_mpi_release (sk.q); - _gcry_mpi_release (sk.g); - _gcry_mpi_release (sk.y); - _gcry_mpi_release (sk.x); - _gcry_mpi_release (data); - _gcry_pk_util_free_encoding_ctx (&ctx); - if (DBG_CIPHER) - log_debug ("dsa_sign => %s\n", gpg_strerror (rc)); - return rc; -} - - -static gcry_err_code_t -dsa_verify (gcry_sexp_t s_sig, gcry_sexp_t s_data, gcry_sexp_t s_keyparms) -{ - gcry_err_code_t rc; - struct pk_encoding_ctx ctx; - gcry_sexp_t l1 = NULL; - gcry_mpi_t sig_r = NULL; - gcry_mpi_t sig_s = NULL; - gcry_mpi_t data = NULL; - DSA_public_key pk = { NULL, NULL, NULL, NULL }; - - _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_VERIFY, - dsa_get_nbits (s_keyparms)); - - /* Extract the data. */ - rc = _gcry_pk_util_data_to_mpi (s_data, &data, &ctx); - if (rc) - goto leave; - if (DBG_CIPHER) - log_mpidump ("dsa_verify data", data); - - /* Extract the signature value. */ - rc = _gcry_pk_util_preparse_sigval (s_sig, dsa_names, &l1, NULL); - if (rc) - goto leave; - rc = _gcry_sexp_extract_param (l1, NULL, "rs", &sig_r, &sig_s, NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_mpidump ("dsa_verify s_r", sig_r); - log_mpidump ("dsa_verify s_s", sig_s); - } - - /* Extract the key. */ - rc = _gcry_sexp_extract_param (s_keyparms, NULL, "pqgy", - &pk.p, &pk.q, &pk.g, &pk.y, NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_mpidump ("dsa_verify p", pk.p); - log_mpidump ("dsa_verify q", pk.q); - log_mpidump ("dsa_verify g", pk.g); - log_mpidump ("dsa_verify y", pk.y); - } - - /* Verify the signature. */ - rc = verify (sig_r, sig_s, data, &pk); - - leave: - _gcry_mpi_release (pk.p); - _gcry_mpi_release (pk.q); - _gcry_mpi_release (pk.g); - _gcry_mpi_release (pk.y); - _gcry_mpi_release (data); - _gcry_mpi_release (sig_r); - _gcry_mpi_release (sig_s); - sexp_release (l1); - _gcry_pk_util_free_encoding_ctx (&ctx); - if (DBG_CIPHER) - log_debug ("dsa_verify => %s\n", rc?gpg_strerror (rc):"Good"); - return rc; -} - - -/* Return the number of bits for the key described by PARMS. On error - * 0 is returned. The format of PARMS starts with the algorithm name; - * for example: - * - * (dsa - * (p ) - * (q ) - * (g ) - * (y )) - * - * More parameters may be given but we only need P here. - */ -static unsigned int -dsa_get_nbits (gcry_sexp_t parms) -{ - gcry_sexp_t l1; - gcry_mpi_t p; - unsigned int nbits; - - l1 = sexp_find_token (parms, "p", 1); - if (!l1) - return 0; /* Parameter P not found. */ - - p = sexp_nth_mpi (l1, 1, GCRYMPI_FMT_USG); - sexp_release (l1); - nbits = p? mpi_get_nbits (p) : 0; - _gcry_mpi_release (p); - return nbits; -} - - - -/* - Self-test section. - */ - -static const char * -selftest_sign_1024 (gcry_sexp_t pkey, gcry_sexp_t skey) -{ - static const char sample_data[] = - "(data (flags raw)" - " (value #a0b1c2d3e4f500102030405060708090a1b2c3d4#))"; - static const char sample_data_bad[] = - "(data (flags raw)" - " (value #a0b1c2d3e4f510102030405060708090a1b2c3d4#))"; - - const char *errtxt = NULL; - gcry_error_t err; - gcry_sexp_t data = NULL; - gcry_sexp_t data_bad = NULL; - gcry_sexp_t sig = NULL; - - err = sexp_sscan (&data, NULL, sample_data, strlen (sample_data)); - if (!err) - err = sexp_sscan (&data_bad, NULL, - sample_data_bad, strlen (sample_data_bad)); - if (err) - { - errtxt = "converting data failed"; - goto leave; - } - - err = _gcry_pk_sign (&sig, data, skey); - if (err) - { - errtxt = "signing failed"; - goto leave; - } - err = _gcry_pk_verify (sig, data, pkey); - if (err) - { - errtxt = "verify failed"; - goto leave; - } - err = _gcry_pk_verify (sig, data_bad, pkey); - if (gcry_err_code (err) != GPG_ERR_BAD_SIGNATURE) - { - errtxt = "bad signature not detected"; - goto leave; - } - - - leave: - sexp_release (sig); - sexp_release (data_bad); - sexp_release (data); - return errtxt; -} - - -static gpg_err_code_t -selftests_dsa (selftest_report_func_t report) -{ - const char *what; - const char *errtxt; - gcry_error_t err; - gcry_sexp_t skey = NULL; - gcry_sexp_t pkey = NULL; - - /* Convert the S-expressions into the internal representation. */ - what = "convert"; - err = sexp_sscan (&skey, NULL, sample_secret_key, strlen (sample_secret_key)); - if (!err) - err = sexp_sscan (&pkey, NULL, - sample_public_key, strlen (sample_public_key)); - if (err) - { - errtxt = _gcry_strerror (err); - goto failed; - } - - what = "key consistency"; - err = _gcry_pk_testkey (skey); - if (err) - { - errtxt = _gcry_strerror (err); - goto failed; - } - - what = "sign"; - errtxt = selftest_sign_1024 (pkey, skey); - if (errtxt) - goto failed; - - sexp_release (pkey); - sexp_release (skey); - return 0; /* Succeeded. */ - - failed: - sexp_release (pkey); - sexp_release (skey); - if (report) - report ("pubkey", GCRY_PK_DSA, what, errtxt); - return GPG_ERR_SELFTEST_FAILED; -} - - -/* Run a full self-test for ALGO and return 0 on success. */ -static gpg_err_code_t -run_selftests (int algo, int extended, selftest_report_func_t report) -{ - gpg_err_code_t ec; - - (void)extended; - - switch (algo) - { - case GCRY_PK_DSA: - ec = selftests_dsa (report); - break; - default: - ec = GPG_ERR_PUBKEY_ALGO; - break; - - } - return ec; -} - - - - -gcry_pk_spec_t _gcry_pubkey_spec_dsa = - { - GCRY_PK_DSA, { 0, 1 }, - GCRY_PK_USAGE_SIGN, - "DSA", dsa_names, - "pqgy", "pqgyx", "", "rs", "pqgy", - dsa_generate, - dsa_check_secret_key, - NULL, - NULL, - dsa_sign, - dsa_verify, - dsa_get_nbits, - run_selftests - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-common.h b/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-common.h deleted file mode 100644 index f066b4b7..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-common.h +++ /dev/null @@ -1,142 +0,0 @@ -/* ecc-common.h - Declarations of common ECC code - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifndef GCRY_ECC_COMMON_H -#define GCRY_ECC_COMMON_H - - -/* Definition of a curve. */ -typedef struct -{ - enum gcry_mpi_ec_models model;/* The model descrinbing this curve. */ - enum ecc_dialects dialect; /* The dialect used with the curve. */ - gcry_mpi_t p; /* Prime specifying the field GF(p). */ - gcry_mpi_t a; /* First coefficient of the Weierstrass equation. */ - gcry_mpi_t b; /* Second coefficient of the Weierstrass equation. - or d as used by Twisted Edwards curves. */ - mpi_point_struct G; /* Base point (generator). */ - gcry_mpi_t n; /* Order of G. */ - const char *name; /* Name of the curve or NULL. */ -} elliptic_curve_t; - - -typedef struct -{ - elliptic_curve_t E; - mpi_point_struct Q; /* Q = [d]G */ -} ECC_public_key; - - -typedef struct -{ - elliptic_curve_t E; - mpi_point_struct Q; - gcry_mpi_t d; -} ECC_secret_key; - - - -/* Set the value from S into D. */ -static inline void -point_set (mpi_point_t d, mpi_point_t s) -{ - mpi_set (d->x, s->x); - mpi_set (d->y, s->y); - mpi_set (d->z, s->z); -} - -#define point_init(a) _gcry_mpi_point_init ((a)) -#define point_free(a) _gcry_mpi_point_free_parts ((a)) - - -/*-- ecc-curves.c --*/ -gpg_err_code_t _gcry_ecc_fill_in_curve (unsigned int nbits, - const char *name, - elliptic_curve_t *curve, - unsigned int *r_nbits); -gpg_err_code_t _gcry_ecc_update_curve_param (const char *name, - enum gcry_mpi_ec_models *model, - enum ecc_dialects *dialect, - gcry_mpi_t *p, gcry_mpi_t *a, - gcry_mpi_t *b, gcry_mpi_t *g, - gcry_mpi_t *n); - -const char *_gcry_ecc_get_curve (gcry_sexp_t keyparms, - int iterator, - unsigned int *r_nbits); -gcry_sexp_t _gcry_ecc_get_param_sexp (const char *name); - -/*-- ecc-misc.c --*/ -void _gcry_ecc_curve_free (elliptic_curve_t *E); -elliptic_curve_t _gcry_ecc_curve_copy (elliptic_curve_t E); -const char *_gcry_ecc_model2str (enum gcry_mpi_ec_models model); -const char *_gcry_ecc_dialect2str (enum ecc_dialects dialect); -gcry_mpi_t _gcry_ecc_ec2os (gcry_mpi_t x, gcry_mpi_t y, gcry_mpi_t p); -gcry_err_code_t _gcry_ecc_os2ec (mpi_point_t result, gcry_mpi_t value); - -mpi_point_t _gcry_ecc_compute_public (mpi_point_t Q, mpi_ec_t ec, - mpi_point_t G, gcry_mpi_t d); - -/*-- ecc.c --*/ - -/*-- ecc-ecdsa.c --*/ -gpg_err_code_t _gcry_ecc_ecdsa_sign (gcry_mpi_t input, ECC_secret_key *skey, - gcry_mpi_t r, gcry_mpi_t s, - int flags, int hashalgo); -gpg_err_code_t _gcry_ecc_ecdsa_verify (gcry_mpi_t input, ECC_public_key *pkey, - gcry_mpi_t r, gcry_mpi_t s); - -/*-- ecc-eddsa.c --*/ -gpg_err_code_t _gcry_ecc_eddsa_recover_x (gcry_mpi_t x, gcry_mpi_t y, int sign, - mpi_ec_t ec); -gpg_err_code_t _gcry_ecc_eddsa_encodepoint (mpi_point_t point, mpi_ec_t ctx, - gcry_mpi_t x, gcry_mpi_t y, - int with_prefix, - unsigned char **r_buffer, - unsigned int *r_buflen); -gpg_err_code_t _gcry_ecc_eddsa_ensure_compact (gcry_mpi_t value, - unsigned int nbits); -gpg_err_code_t _gcry_ecc_eddsa_decodepoint (gcry_mpi_t pk, mpi_ec_t ctx, - mpi_point_t result, - unsigned char **r_encpk, - unsigned int *r_encpklen); -gpg_err_code_t _gcry_ecc_eddsa_compute_h_d (unsigned char **r_digest, - gcry_mpi_t d, mpi_ec_t ec); - -gpg_err_code_t _gcry_ecc_eddsa_genkey (ECC_secret_key *sk, - elliptic_curve_t *E, - mpi_ec_t ctx, - gcry_random_level_t random_level); -gpg_err_code_t _gcry_ecc_eddsa_sign (gcry_mpi_t input, - ECC_secret_key *sk, - gcry_mpi_t r_r, gcry_mpi_t s, - int hashalgo, gcry_mpi_t pk); -gpg_err_code_t _gcry_ecc_eddsa_verify (gcry_mpi_t input, - ECC_public_key *pk, - gcry_mpi_t r, gcry_mpi_t s, - int hashalgo, gcry_mpi_t pkmpi); - -/*-- ecc-gost.c --*/ -gpg_err_code_t _gcry_ecc_gost_sign (gcry_mpi_t input, ECC_secret_key *skey, - gcry_mpi_t r, gcry_mpi_t s); -gpg_err_code_t _gcry_ecc_gost_verify (gcry_mpi_t input, ECC_public_key *pkey, - gcry_mpi_t r, gcry_mpi_t s); - - -#endif /*GCRY_ECC_COMMON_H*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-curves.c b/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-curves.c deleted file mode 100644 index 306f2add..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-curves.c +++ /dev/null @@ -1,1162 +0,0 @@ -/* ecc-curves.c - Elliptic Curve parameter mangement - * Copyright (C) 2007, 2008, 2010, 2011 Free Software Foundation, Inc. - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "context.h" -#include "ec-context.h" -#include "pubkey-internal.h" -#include "ecc-common.h" - - -/* This tables defines aliases for curve names. */ -static const struct -{ - const char *name; /* Our name. */ - const char *other; /* Other name. */ -} curve_aliases[] = - { - /*{ "Curve25519", "1.3.6.1.4.1.3029.1.5.1" },*/ - { "Ed25519", "1.3.6.1.4.1.11591.15.1" }, - - { "NIST P-192", "1.2.840.10045.3.1.1" }, /* X9.62 OID */ - { "NIST P-192", "prime192v1" }, /* X9.62 name. */ - { "NIST P-192", "secp192r1" }, /* SECP name. */ - { "NIST P-192", "nistp192" }, /* rfc5656. */ - - { "NIST P-224", "secp224r1" }, - { "NIST P-224", "1.3.132.0.33" }, /* SECP OID. */ - { "NIST P-224", "nistp224" }, /* rfc5656. */ - - { "NIST P-256", "1.2.840.10045.3.1.7" }, /* From NIST SP 800-78-1. */ - { "NIST P-256", "prime256v1" }, - { "NIST P-256", "secp256r1" }, - { "NIST P-256", "nistp256" }, /* rfc5656. */ - - { "NIST P-384", "secp384r1" }, - { "NIST P-384", "1.3.132.0.34" }, - { "NIST P-384", "nistp384" }, /* rfc5656. */ - - { "NIST P-521", "secp521r1" }, - { "NIST P-521", "1.3.132.0.35" }, - { "NIST P-521", "nistp521" }, /* rfc5656. */ - - { "brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1" }, - { "brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3" }, - { "brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5" }, - { "brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7" }, - { "brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9" }, - { "brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11"}, - { "brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13"}, - - { NULL, NULL} - }; - - -typedef struct -{ - const char *desc; /* Description of the curve. */ - unsigned int nbits; /* Number of bits. */ - unsigned int fips:1; /* True if this is a FIPS140-2 approved curve. */ - - /* The model describing this curve. This is mainly used to select - the group equation. */ - enum gcry_mpi_ec_models model; - - /* The actual ECC dialect used. This is used for curve specific - optimizations and to select encodings etc. */ - enum ecc_dialects dialect; - - const char *p; /* The prime defining the field. */ - const char *a, *b; /* The coefficients. For Twisted Edwards - Curves b is used for d. */ - const char *n; /* The order of the base point. */ - const char *g_x, *g_y; /* Base point. */ -} ecc_domain_parms_t; - - -/* This static table defines all available curves. */ -static const ecc_domain_parms_t domain_parms[] = - { - { - /* (-x^2 + y^2 = 1 + dx^2y^2) */ - "Ed25519", 256, 0, - MPI_EC_TWISTEDEDWARDS, ECC_DIALECT_ED25519, - "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFED", - "-0x01", - "-0x2DFC9311D490018C7338BF8688861767FF8FF5B2BEBE27548A14B235ECA6874A", - "0x1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED", - "0x216936D3CD6E53FEC0A4E231FDD6DC5C692CC7609525A7B2C9562D608F25D51A", - "0x6666666666666666666666666666666666666666666666666666666666666658" - }, - { - "NIST P-192", 192, 1, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0xfffffffffffffffffffffffffffffffeffffffffffffffff", - "0xfffffffffffffffffffffffffffffffefffffffffffffffc", - "0x64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1", - "0xffffffffffffffffffffffff99def836146bc9b1b4d22831", - - "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012", - "0x07192b95ffc8da78631011ed6b24cdd573f977a11e794811" - }, - { - "NIST P-224", 224, 1, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0xffffffffffffffffffffffffffffffff000000000000000000000001", - "0xfffffffffffffffffffffffffffffffefffffffffffffffffffffffe", - "0xb4050a850c04b3abf54132565044b0b7d7bfd8ba270b39432355ffb4", - "0xffffffffffffffffffffffffffff16a2e0b8f03e13dd29455c5c2a3d" , - - "0xb70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21", - "0xbd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34" - }, - { - "NIST P-256", 256, 1, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0xffffffff00000001000000000000000000000000ffffffffffffffffffffffff", - "0xffffffff00000001000000000000000000000000fffffffffffffffffffffffc", - "0x5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b", - "0xffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551", - - "0x6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296", - "0x4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5" - }, - { - "NIST P-384", 384, 1, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" - "ffffffff0000000000000000ffffffff", - "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" - "ffffffff0000000000000000fffffffc", - "0xb3312fa7e23ee7e4988e056be3f82d19181d9c6efe8141120314088f5013875a" - "c656398d8a2ed19d2a85c8edd3ec2aef", - "0xffffffffffffffffffffffffffffffffffffffffffffffffc7634d81f4372ddf" - "581a0db248b0a77aecec196accc52973", - - "0xaa87ca22be8b05378eb1c71ef320ad746e1d3b628ba79b9859f741e082542a38" - "5502f25dbf55296c3a545e3872760ab7", - "0x3617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c0" - "0a60b1ce1d7e819d7a431d7c90ea0e5f" - }, - { - "NIST P-521", 521, 1, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0x01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", - "0x01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc", - "0x051953eb9618e1c9a1f929a21a0b68540eea2da725b99b315f3b8b489918ef10" - "9e156193951ec7e937b1652c0bd3bb1bf073573df883d2c34f1ef451fd46b503f00", - "0x1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - "ffa51868783bf2f966b7fcc0148f709a5d03bb5c9b8899c47aebb6fb71e91386409", - - "0x00c6858e06b70404e9cd9e3ecb662395b4429c648139053fb521f828af606b4d" - "3dbaa14b5e77efe75928fe1dc127a2ffa8de3348b3c1856a429bf97e7e31c2e5bd66", - "0x011839296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e" - "662c97ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650" - }, - - { "brainpoolP160r1", 160, 0, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0xe95e4a5f737059dc60dfc7ad95b3d8139515620f", - "0x340e7be2a280eb74e2be61bada745d97e8f7c300", - "0x1e589a8595423412134faa2dbdec95c8d8675e58", - "0xe95e4a5f737059dc60df5991d45029409e60fc09", - "0xbed5af16ea3f6a4f62938c4631eb5af7bdbcdbc3", - "0x1667cb477a1a8ec338f94741669c976316da6321" - }, - - { "brainpoolP192r1", 192, 0, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0xc302f41d932a36cda7a3463093d18db78fce476de1a86297", - "0x6a91174076b1e0e19c39c031fe8685c1cae040e5c69a28ef", - "0x469a28ef7c28cca3dc721d044f4496bcca7ef4146fbf25c9", - "0xc302f41d932a36cda7a3462f9e9e916b5be8f1029ac4acc1", - "0xc0a0647eaab6a48753b033c56cb0f0900a2f5c4853375fd6", - "0x14b690866abd5bb88b5f4828c1490002e6773fa2fa299b8f" - }, - - { "brainpoolP224r1", 224, 0, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0xd7c134aa264366862a18302575d1d787b09f075797da89f57ec8c0ff", - "0x68a5e62ca9ce6c1c299803a6c1530b514e182ad8b0042a59cad29f43", - "0x2580f63ccfe44138870713b1a92369e33e2135d266dbb372386c400b", - "0xd7c134aa264366862a18302575d0fb98d116bc4b6ddebca3a5a7939f", - "0x0d9029ad2c7e5cf4340823b2a87dc68c9e4ce3174c1e6efdee12c07d", - "0x58aa56f772c0726f24c6b89e4ecdac24354b9e99caa3f6d3761402cd" - }, - - { "brainpoolP256r1", 256, 0, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0xa9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e5377", - "0x7d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9", - "0x26dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b6", - "0xa9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a7", - "0x8bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262", - "0x547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f046997" - }, - - { "brainpoolP320r1", 320, 0, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0xd35e472036bc4fb7e13c785ed201e065f98fcfa6f6f40def4f92b9ec7893ec28" - "fcd412b1f1b32e27", - "0x3ee30b568fbab0f883ccebd46d3f3bb8a2a73513f5eb79da66190eb085ffa9f4" - "92f375a97d860eb4", - "0x520883949dfdbc42d3ad198640688a6fe13f41349554b49acc31dccd88453981" - "6f5eb4ac8fb1f1a6", - "0xd35e472036bc4fb7e13c785ed201e065f98fcfa5b68f12a32d482ec7ee8658e9" - "8691555b44c59311", - "0x43bd7e9afb53d8b85289bcc48ee5bfe6f20137d10a087eb6e7871e2a10a599c7" - "10af8d0d39e20611", - "0x14fdd05545ec1cc8ab4093247f77275e0743ffed117182eaa9c77877aaac6ac7" - "d35245d1692e8ee1" - }, - - { "brainpoolP384r1", 384, 0, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0x8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b412b1da197fb71123" - "acd3a729901d1a71874700133107ec53", - "0x7bc382c63d8c150c3c72080ace05afa0c2bea28e4fb22787139165efba91f90f" - "8aa5814a503ad4eb04a8c7dd22ce2826", - "0x04a8c7dd22ce28268b39b55416f0447c2fb77de107dcd2a62e880ea53eeb62d5" - "7cb4390295dbc9943ab78696fa504c11", - "0x8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b31f166e6cac0425a7" - "cf3ab6af6b7fc3103b883202e9046565", - "0x1d1c64f068cf45ffa2a63a81b7c13f6b8847a3e77ef14fe3db7fcafe0cbd10e8" - "e826e03436d646aaef87b2e247d4af1e", - "0x8abe1d7520f9c2a45cb1eb8e95cfd55262b70b29feec5864e19c054ff9912928" - "0e4646217791811142820341263c5315" - }, - - { "brainpoolP512r1", 512, 0, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0xaadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330871" - "7d4d9b009bc66842aecda12ae6a380e62881ff2f2d82c68528aa6056583a48f3", - "0x7830a3318b603b89e2327145ac234cc594cbdd8d3df91610a83441caea9863bc" - "2ded5d5aa8253aa10a2ef1c98b9ac8b57f1117a72bf2c7b9e7c1ac4d77fc94ca", - "0x3df91610a83441caea9863bc2ded5d5aa8253aa10a2ef1c98b9ac8b57f1117a7" - "2bf2c7b9e7c1ac4d77fc94cadc083e67984050b75ebae5dd2809bd638016f723", - "0xaadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330870" - "553e5c414ca92619418661197fac10471db1d381085ddaddb58796829ca90069", - "0x81aee4bdd82ed9645a21322e9c4c6a9385ed9f70b5d916c1b43b62eef4d0098e" - "ff3b1f78e2d0d48d50d1687b93b97d5f7c6d5047406a5e688b352209bcb9f822", - "0x7dde385d566332ecc0eabfa9cf7822fdf209f70024a57b1aa000c55b881f8111" - "b2dcde494a5f485e5bca4bd88a2763aed1ca2b2fa8f0540678cd1e0f3ad80892" - }, - { - "GOST2001-test", 256, 0, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0x8000000000000000000000000000000000000000000000000000000000000431", - "0x0000000000000000000000000000000000000000000000000000000000000007", - "0x5fbff498aa938ce739b8e022fbafef40563f6e6a3472fc2a514c0ce9dae23b7e", - "0x8000000000000000000000000000000150fe8a1892976154c59cfc193accf5b3", - - "0x0000000000000000000000000000000000000000000000000000000000000002", - "0x08e2a8a0e65147d4bd6316030e16d19c85c97f0a9ca267122b96abbcea7e8fc8", - }, - - { - "GOST2012-test", 511, 0, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, - "0x4531acd1fe0023c7550d267b6b2fee80922b14b2ffb90f04d4eb7c09b5d2d15d" - "f1d852741af4704a0458047e80e4546d35b8336fac224dd81664bbf528be6373", - "0x0000000000000000000000000000000000000000000000000000000000000007", - "0x1cff0806a31116da29d8cfa54e57eb748bc5f377e49400fdd788b649eca1ac4" - "361834013b2ad7322480a89ca58e0cf74bc9e540c2add6897fad0a3084f302adc", - "0x4531acd1fe0023c7550d267b6b2fee80922b14b2ffb90f04d4eb7c09b5d2d15d" - "a82f2d7ecb1dbac719905c5eecc423f1d86e25edbe23c595d644aaf187e6e6df", - - "0x24d19cc64572ee30f396bf6ebbfd7a6c5213b3b3d7057cc825f91093a68cd762" - "fd60611262cd838dc6b60aa7eee804e28bc849977fac33b4b530f1b120248a9a", - "0x2bb312a43bd2ce6e0d020613c857acddcfbf061e91e5f2c3f32447c259f39b2" - "c83ab156d77f1496bf7eb3351e1ee4e43dc1a18b91b24640b6dbb92cb1add371e", - }, - - { NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL } - }; - - - - -/* Return a copy of POINT. */ -static gcry_mpi_point_t -point_copy (gcry_mpi_point_t point) -{ - gcry_mpi_point_t newpoint; - - if (point) - { - newpoint = mpi_point_new (0); - point_set (newpoint, point); - } - else - newpoint = NULL; - return newpoint; -} - - -/* Helper to scan a hex string. */ -static gcry_mpi_t -scanval (const char *string) -{ - gpg_err_code_t rc; - gcry_mpi_t val; - - rc = _gcry_mpi_scan (&val, GCRYMPI_FMT_HEX, string, 0, NULL); - if (rc) - log_fatal ("scanning ECC parameter failed: %s\n", gpg_strerror (rc)); - return val; -} - - -/* Return the index of the domain_parms table for a curve with NAME. - Return -1 if not found. */ -static int -find_domain_parms_idx (const char *name) -{ - int idx, aliasno; - - /* First check our native curves. */ - for (idx = 0; domain_parms[idx].desc; idx++) - if (!strcmp (name, domain_parms[idx].desc)) - return idx; - - /* If not found consult the alias table. */ - if (!domain_parms[idx].desc) - { - for (aliasno = 0; curve_aliases[aliasno].name; aliasno++) - if (!strcmp (name, curve_aliases[aliasno].other)) - break; - if (curve_aliases[aliasno].name) - { - for (idx = 0; domain_parms[idx].desc; idx++) - if (!strcmp (curve_aliases[aliasno].name, domain_parms[idx].desc)) - return idx; - } - } - - return -1; -} - - -/* Generate the crypto system setup. This function takes the NAME of - a curve or the desired number of bits and stores at R_CURVE the - parameters of the named curve or those of a suitable curve. If - R_NBITS is not NULL, the chosen number of bits is stored there. - NULL may be given for R_CURVE, if the value is not required and for - example only a quick test for availability is desired. Note that - the curve fields should be initialized to zero because fields which - are not NULL are skipped. */ -gpg_err_code_t -_gcry_ecc_fill_in_curve (unsigned int nbits, const char *name, - elliptic_curve_t *curve, unsigned int *r_nbits) -{ - int idx; - const char *resname = NULL; /* Set to a found curve name. */ - - if (name) - idx = find_domain_parms_idx (name); - else - { - for (idx = 0; domain_parms[idx].desc; idx++) - if (nbits == domain_parms[idx].nbits - && domain_parms[idx].model == MPI_EC_WEIERSTRASS) - break; - if (!domain_parms[idx].desc) - idx = -1; - } - if (idx < 0) - return GPG_ERR_UNKNOWN_CURVE; - - resname = domain_parms[idx].desc; - - /* In fips mode we only support NIST curves. Note that it is - possible to bypass this check by specifying the curve parameters - directly. */ - if (fips_mode () && !domain_parms[idx].fips ) - return GPG_ERR_NOT_SUPPORTED; - - switch (domain_parms[idx].model) - { - case MPI_EC_WEIERSTRASS: - case MPI_EC_TWISTEDEDWARDS: - break; - case MPI_EC_MONTGOMERY: - return GPG_ERR_NOT_SUPPORTED; - default: - return GPG_ERR_BUG; - } - - - if (r_nbits) - *r_nbits = domain_parms[idx].nbits; - - if (curve) - { - curve->model = domain_parms[idx].model; - curve->dialect = domain_parms[idx].dialect; - if (!curve->p) - curve->p = scanval (domain_parms[idx].p); - if (!curve->a) - curve->a = scanval (domain_parms[idx].a); - if (!curve->b) - curve->b = scanval (domain_parms[idx].b); - if (!curve->n) - curve->n = scanval (domain_parms[idx].n); - if (!curve->G.x) - curve->G.x = scanval (domain_parms[idx].g_x); - if (!curve->G.y) - curve->G.y = scanval (domain_parms[idx].g_y); - if (!curve->G.z) - curve->G.z = mpi_alloc_set_ui (1); - if (!curve->name) - curve->name = resname; - } - - return 0; -} - - -/* Give the name of the curve NAME, store the curve parameters into P, - A, B, G, and N if they point to NULL value. Note that G is returned - in standard uncompressed format. Also update MODEL and DIALECT if - they are not NULL. */ -gpg_err_code_t -_gcry_ecc_update_curve_param (const char *name, - enum gcry_mpi_ec_models *model, - enum ecc_dialects *dialect, - gcry_mpi_t *p, gcry_mpi_t *a, gcry_mpi_t *b, - gcry_mpi_t *g, gcry_mpi_t *n) -{ - int idx; - - idx = find_domain_parms_idx (name); - if (idx < 0) - return GPG_ERR_UNKNOWN_CURVE; - - if (g) - { - char *buf; - size_t len; - - len = 4; - len += strlen (domain_parms[idx].g_x+2); - len += strlen (domain_parms[idx].g_y+2); - len++; - buf = xtrymalloc (len); - if (!buf) - return gpg_err_code_from_syserror (); - strcpy (stpcpy (stpcpy (buf, "0x04"), domain_parms[idx].g_x+2), - domain_parms[idx].g_y+2); - _gcry_mpi_release (*g); - *g = scanval (buf); - xfree (buf); - } - if (model) - *model = domain_parms[idx].model; - if (dialect) - *dialect = domain_parms[idx].dialect; - if (p) - { - _gcry_mpi_release (*p); - *p = scanval (domain_parms[idx].p); - } - if (a) - { - _gcry_mpi_release (*a); - *a = scanval (domain_parms[idx].a); - } - if (b) - { - _gcry_mpi_release (*b); - *b = scanval (domain_parms[idx].b); - } - if (n) - { - _gcry_mpi_release (*n); - *n = scanval (domain_parms[idx].n); - } - return 0; -} - - -/* Return the name matching the parameters in PKEY. This works only - with curves described by the Weierstrass equation. */ -const char * -_gcry_ecc_get_curve (gcry_sexp_t keyparms, int iterator, unsigned int *r_nbits) -{ - gpg_err_code_t rc; - const char *result = NULL; - elliptic_curve_t E; - gcry_mpi_t mpi_g = NULL; - gcry_mpi_t tmp = NULL; - int idx; - - memset (&E, 0, sizeof E); - - if (r_nbits) - *r_nbits = 0; - - if (!keyparms) - { - idx = iterator; - if (idx >= 0 && idx < DIM (domain_parms)) - { - result = domain_parms[idx].desc; - if (r_nbits) - *r_nbits = domain_parms[idx].nbits; - } - return result; - } - - - /* - * Extract the curve parameters.. - */ - rc = gpg_err_code (sexp_extract_param (keyparms, NULL, "-pabgn", - &E.p, &E.a, &E.b, &mpi_g, &E.n, - NULL)); - if (rc == GPG_ERR_NO_OBJ) - { - /* This might be the second use case of checking whether a - specific curve given by name is supported. */ - gcry_sexp_t l1; - char *name; - - l1 = sexp_find_token (keyparms, "curve", 5); - if (!l1) - goto leave; /* No curve name parameter. */ - - name = sexp_nth_string (l1, 1); - sexp_release (l1); - if (!name) - goto leave; /* Name missing or out of core. */ - - idx = find_domain_parms_idx (name); - xfree (name); - if (idx >= 0) /* Curve found. */ - { - result = domain_parms[idx].desc; - if (r_nbits) - *r_nbits = domain_parms[idx].nbits; - } - return result; - } - - if (rc) - goto leave; - - if (mpi_g) - { - _gcry_mpi_point_init (&E.G); - if (_gcry_ecc_os2ec (&E.G, mpi_g)) - goto leave; - } - - for (idx = 0; domain_parms[idx].desc; idx++) - { - mpi_free (tmp); - tmp = scanval (domain_parms[idx].p); - if (!mpi_cmp (tmp, E.p)) - { - mpi_free (tmp); - tmp = scanval (domain_parms[idx].a); - if (!mpi_cmp (tmp, E.a)) - { - mpi_free (tmp); - tmp = scanval (domain_parms[idx].b); - if (!mpi_cmp (tmp, E.b)) - { - mpi_free (tmp); - tmp = scanval (domain_parms[idx].n); - if (!mpi_cmp (tmp, E.n)) - { - mpi_free (tmp); - tmp = scanval (domain_parms[idx].g_x); - if (!mpi_cmp (tmp, E.G.x)) - { - mpi_free (tmp); - tmp = scanval (domain_parms[idx].g_y); - if (!mpi_cmp (tmp, E.G.y)) - { - result = domain_parms[idx].desc; - if (r_nbits) - *r_nbits = domain_parms[idx].nbits; - goto leave; - } - } - } - } - } - } - } - - leave: - _gcry_mpi_release (tmp); - _gcry_mpi_release (E.p); - _gcry_mpi_release (E.a); - _gcry_mpi_release (E.b); - _gcry_mpi_release (mpi_g); - _gcry_mpi_point_free_parts (&E.G); - _gcry_mpi_release (E.n); - return result; -} - - -/* Helper to extract an MPI from key parameters. */ -static gpg_err_code_t -mpi_from_keyparam (gcry_mpi_t *r_a, gcry_sexp_t keyparam, const char *name) -{ - gcry_err_code_t ec = 0; - gcry_sexp_t l1; - - l1 = sexp_find_token (keyparam, name, 0); - if (l1) - { - *r_a = sexp_nth_mpi (l1, 1, GCRYMPI_FMT_USG); - sexp_release (l1); - if (!*r_a) - ec = GPG_ERR_INV_OBJ; - } - return ec; -} - -/* Helper to extract a point from key parameters. If no parameter - with NAME is found, the functions tries to find a non-encoded point - by appending ".x", ".y" and ".z" to NAME. ".z" is in this case - optional and defaults to 1. EC is the context which at this point - may not be fully initialized. */ -static gpg_err_code_t -point_from_keyparam (gcry_mpi_point_t *r_a, - gcry_sexp_t keyparam, const char *name, mpi_ec_t ec) -{ - gcry_err_code_t rc; - gcry_sexp_t l1; - gcry_mpi_point_t point; - - l1 = sexp_find_token (keyparam, name, 0); - if (l1) - { - gcry_mpi_t a; - - a = sexp_nth_mpi (l1, 1, GCRYMPI_FMT_OPAQUE); - sexp_release (l1); - if (!a) - return GPG_ERR_INV_OBJ; - - point = mpi_point_new (0); - if (ec && ec->dialect == ECC_DIALECT_ED25519) - rc = _gcry_ecc_eddsa_decodepoint (a, ec, point, NULL, NULL); - else - rc = _gcry_ecc_os2ec (point, a); - mpi_free (a); - if (rc) - { - mpi_point_release (point); - return rc; - } - } - else - { - char *tmpname; - gcry_mpi_t x = NULL; - gcry_mpi_t y = NULL; - gcry_mpi_t z = NULL; - - tmpname = xtrymalloc (strlen (name) + 2 + 1); - if (!tmpname) - return gpg_err_code_from_syserror (); - strcpy (stpcpy (tmpname, name), ".x"); - rc = mpi_from_keyparam (&x, keyparam, tmpname); - if (rc) - { - xfree (tmpname); - return rc; - } - strcpy (stpcpy (tmpname, name), ".y"); - rc = mpi_from_keyparam (&y, keyparam, tmpname); - if (rc) - { - mpi_free (x); - xfree (tmpname); - return rc; - } - strcpy (stpcpy (tmpname, name), ".z"); - rc = mpi_from_keyparam (&z, keyparam, tmpname); - if (rc) - { - mpi_free (y); - mpi_free (x); - xfree (tmpname); - return rc; - } - if (!z) - z = mpi_set_ui (NULL, 1); - if (x && y) - point = mpi_point_snatch_set (NULL, x, y, z); - else - { - mpi_free (x); - mpi_free (y); - mpi_free (z); - point = NULL; - } - xfree (tmpname); - } - - if (point) - *r_a = point; - return 0; -} - - -/* This function creates a new context for elliptic curve operations. - Either KEYPARAM or CURVENAME must be given. If both are given and - KEYPARAM has no curve parameter, CURVENAME is used to add missing - parameters. On success 0 is returned and the new context stored at - R_CTX. On error NULL is stored at R_CTX and an error code is - returned. The context needs to be released using - gcry_ctx_release. */ -gpg_err_code_t -_gcry_mpi_ec_new (gcry_ctx_t *r_ctx, - gcry_sexp_t keyparam, const char *curvename) -{ - gpg_err_code_t errc; - gcry_ctx_t ctx = NULL; - enum gcry_mpi_ec_models model = MPI_EC_WEIERSTRASS; - enum ecc_dialects dialect = ECC_DIALECT_STANDARD; - gcry_mpi_t p = NULL; - gcry_mpi_t a = NULL; - gcry_mpi_t b = NULL; - gcry_mpi_point_t G = NULL; - gcry_mpi_t n = NULL; - gcry_mpi_point_t Q = NULL; - gcry_mpi_t d = NULL; - int flags = 0; - gcry_sexp_t l1; - - *r_ctx = NULL; - - if (keyparam) - { - /* Parse an optional flags list. */ - l1 = sexp_find_token (keyparam, "flags", 0); - if (l1) - { - errc = _gcry_pk_util_parse_flaglist (l1, &flags, NULL); - sexp_release (l1); - l1 = NULL; - if (errc) - goto leave; - } - - /* Check whether a curve name was given. */ - l1 = sexp_find_token (keyparam, "curve", 5); - - /* If we don't have a curve name or if override parameters have - explicitly been requested, parse them. */ - if (!l1 || (flags & PUBKEY_FLAG_PARAM)) - { - errc = mpi_from_keyparam (&p, keyparam, "p"); - if (errc) - goto leave; - errc = mpi_from_keyparam (&a, keyparam, "a"); - if (errc) - goto leave; - errc = mpi_from_keyparam (&b, keyparam, "b"); - if (errc) - goto leave; - errc = point_from_keyparam (&G, keyparam, "g", NULL); - if (errc) - goto leave; - errc = mpi_from_keyparam (&n, keyparam, "n"); - if (errc) - goto leave; - } - } - else - l1 = NULL; /* No curvename. */ - - /* Check whether a curve parameter is available and use that to fill - in missing values. If no curve parameter is available try an - optional provided curvename. If only the curvename has been - given use that one. */ - if (l1 || curvename) - { - char *name; - elliptic_curve_t *E; - - if (l1) - { - name = sexp_nth_string (l1, 1); - sexp_release (l1); - if (!name) - { - errc = GPG_ERR_INV_OBJ; /* Name missing or out of core. */ - goto leave; - } - } - else - name = NULL; - - E = xtrycalloc (1, sizeof *E); - if (!E) - { - errc = gpg_err_code_from_syserror (); - xfree (name); - goto leave; - } - - errc = _gcry_ecc_fill_in_curve (0, name? name : curvename, E, NULL); - xfree (name); - if (errc) - { - xfree (E); - goto leave; - } - - model = E->model; - dialect = E->dialect; - - if (!p) - { - p = E->p; - E->p = NULL; - } - if (!a) - { - a = E->a; - E->a = NULL; - } - if (!b) - { - b = E->b; - E->b = NULL; - } - if (!G) - { - G = mpi_point_snatch_set (NULL, E->G.x, E->G.y, E->G.z); - E->G.x = NULL; - E->G.y = NULL; - E->G.z = NULL; - } - if (!n) - { - n = E->n; - E->n = NULL; - } - _gcry_ecc_curve_free (E); - xfree (E); - } - - - errc = _gcry_mpi_ec_p_new (&ctx, model, dialect, flags, p, a, b); - if (!errc) - { - mpi_ec_t ec = _gcry_ctx_get_pointer (ctx, CONTEXT_TYPE_EC); - - if (b) - { - mpi_free (ec->b); - ec->b = b; - b = NULL; - } - if (G) - { - ec->G = G; - G = NULL; - } - if (n) - { - ec->n = n; - n = NULL; - } - - /* Now that we know the curve name we can look for the public key - Q. point_from_keyparam needs to know the curve parameters so - that it is able to use the correct decompression. Parsing - the private key D could have been done earlier but it is less - surprising if we do it here as well. */ - if (keyparam) - { - errc = point_from_keyparam (&Q, keyparam, "q", ec); - if (errc) - goto leave; - errc = mpi_from_keyparam (&d, keyparam, "d"); - if (errc) - goto leave; - } - - if (Q) - { - ec->Q = Q; - Q = NULL; - } - if (d) - { - ec->d = d; - d = NULL; - } - - *r_ctx = ctx; - ctx = NULL; - } - - leave: - _gcry_ctx_release (ctx); - mpi_free (p); - mpi_free (a); - mpi_free (b); - _gcry_mpi_point_release (G); - mpi_free (n); - _gcry_mpi_point_release (Q); - mpi_free (d); - return errc; -} - - -/* Return the parameters of the curve NAME as an S-expression. */ -gcry_sexp_t -_gcry_ecc_get_param_sexp (const char *name) -{ - unsigned int nbits; - elliptic_curve_t E; - mpi_ec_t ctx; - gcry_mpi_t g_x, g_y; - gcry_mpi_t pkey[6]; - gcry_sexp_t result; - int i; - - memset (&E, 0, sizeof E); - if (_gcry_ecc_fill_in_curve (0, name, &E, &nbits)) - return NULL; - - g_x = mpi_new (0); - g_y = mpi_new (0); - ctx = _gcry_mpi_ec_p_internal_new (MPI_EC_WEIERSTRASS, - ECC_DIALECT_STANDARD, - 0, - E.p, E.a, NULL); - if (_gcry_mpi_ec_get_affine (g_x, g_y, &E.G, ctx)) - log_fatal ("ecc get param: Failed to get affine coordinates\n"); - _gcry_mpi_ec_free (ctx); - _gcry_mpi_point_free_parts (&E.G); - - pkey[0] = E.p; - pkey[1] = E.a; - pkey[2] = E.b; - pkey[3] = _gcry_ecc_ec2os (g_x, g_y, E.p); - pkey[4] = E.n; - pkey[5] = NULL; - - mpi_free (g_x); - mpi_free (g_y); - - if (sexp_build (&result, NULL, - "(public-key(ecc(p%m)(a%m)(b%m)(g%m)(n%m)))", - pkey[0], pkey[1], pkey[2], pkey[3], pkey[4])) - result = NULL; - - for (i=0; pkey[i]; i++) - _gcry_mpi_release (pkey[i]); - - return result; -} - - -/* Return an MPI (or opaque MPI) described by NAME and the context EC. - If COPY is true a copy is returned, if not a const MPI may be - returned. In any case mpi_free must be used. */ -gcry_mpi_t -_gcry_ecc_get_mpi (const char *name, mpi_ec_t ec, int copy) -{ - if (!*name) - return NULL; - - if (!strcmp (name, "p") && ec->p) - return mpi_is_const (ec->p) && !copy? ec->p : mpi_copy (ec->p); - if (!strcmp (name, "a") && ec->a) - return mpi_is_const (ec->a) && !copy? ec->a : mpi_copy (ec->a); - if (!strcmp (name, "b") && ec->b) - return mpi_is_const (ec->b) && !copy? ec->b : mpi_copy (ec->b); - if (!strcmp (name, "n") && ec->n) - return mpi_is_const (ec->n) && !copy? ec->n : mpi_copy (ec->n); - if (!strcmp (name, "d") && ec->d) - return mpi_is_const (ec->d) && !copy? ec->d : mpi_copy (ec->d); - - /* Return a requested point coordinate. */ - if (!strcmp (name, "g.x") && ec->G && ec->G->x) - return mpi_is_const (ec->G->x) && !copy? ec->G->x : mpi_copy (ec->G->x); - if (!strcmp (name, "g.y") && ec->G && ec->G->y) - return mpi_is_const (ec->G->y) && !copy? ec->G->y : mpi_copy (ec->G->y); - if (!strcmp (name, "q.x") && ec->Q && ec->Q->x) - return mpi_is_const (ec->Q->x) && !copy? ec->Q->x : mpi_copy (ec->Q->x); - if (!strcmp (name, "q.y") && ec->Q && ec->Q->y) - return mpi_is_const (ec->G->y) && !copy? ec->Q->y : mpi_copy (ec->Q->y); - - /* If the base point has been requested, return it in standard - encoding. */ - if (!strcmp (name, "g") && ec->G) - return _gcry_mpi_ec_ec2os (ec->G, ec); - - /* If the public key has been requested, return it by default in - standard uncompressed encoding or if requested in other - encodings. */ - if (*name == 'q' && (!name[1] || name[1] == '@')) - { - /* If only the private key is given, compute the public key. */ - if (!ec->Q) - ec->Q = _gcry_ecc_compute_public (NULL, ec, NULL, NULL); - - if (!ec->Q) - return NULL; - - if (name[1] != '@') - return _gcry_mpi_ec_ec2os (ec->Q, ec); - - if (!strcmp (name+2, "eddsa") && ec->model == MPI_EC_TWISTEDEDWARDS) - { - unsigned char *encpk; - unsigned int encpklen; - - if (!_gcry_ecc_eddsa_encodepoint (ec->Q, ec, NULL, NULL, 0, - &encpk, &encpklen)) - return mpi_set_opaque (NULL, encpk, encpklen*8); - } - } - - return NULL; -} - - -/* Return a point described by NAME and the context EC. */ -gcry_mpi_point_t -_gcry_ecc_get_point (const char *name, mpi_ec_t ec) -{ - if (!strcmp (name, "g") && ec->G) - return point_copy (ec->G); - if (!strcmp (name, "q")) - { - /* If only the private key is given, compute the public key. */ - if (!ec->Q) - ec->Q = _gcry_ecc_compute_public (NULL, ec, NULL, NULL); - - if (ec->Q) - return point_copy (ec->Q); - } - - return NULL; -} - - -/* Store the MPI NEWVALUE into the context EC under NAME. */ -gpg_err_code_t -_gcry_ecc_set_mpi (const char *name, gcry_mpi_t newvalue, mpi_ec_t ec) -{ - gpg_err_code_t rc = 0; - - if (!*name) - ; - else if (!strcmp (name, "p")) - { - mpi_free (ec->p); - ec->p = mpi_copy (newvalue); - _gcry_mpi_ec_get_reset (ec); - } - else if (!strcmp (name, "a")) - { - mpi_free (ec->a); - ec->a = mpi_copy (newvalue); - _gcry_mpi_ec_get_reset (ec); - } - else if (!strcmp (name, "b")) - { - mpi_free (ec->b); - ec->b = mpi_copy (newvalue); - } - else if (!strcmp (name, "n")) - { - mpi_free (ec->n); - ec->n = mpi_copy (newvalue); - } - else if (*name == 'q' && (!name[1] || name[1] == '@')) - { - if (newvalue) - { - if (!ec->Q) - ec->Q = mpi_point_new (0); - if (ec->dialect == ECC_DIALECT_ED25519) - rc = _gcry_ecc_eddsa_decodepoint (newvalue, ec, ec->Q, NULL, NULL); - else - rc = _gcry_ecc_os2ec (ec->Q, newvalue); - } - if (rc || !newvalue) - { - _gcry_mpi_point_release (ec->Q); - ec->Q = NULL; - } - /* Note: We assume that Q matches d and thus do not reset d. */ - } - else if (!strcmp (name, "d")) - { - mpi_free (ec->d); - ec->d = mpi_copy (newvalue); - if (ec->d) - { - /* We need to reset the public key because it may not - anymore match. */ - _gcry_mpi_point_release (ec->Q); - ec->Q = NULL; - } - } - else - rc = GPG_ERR_UNKNOWN_NAME; - - return rc; -} - - -/* Store the point NEWVALUE into the context EC under NAME. */ -gpg_err_code_t -_gcry_ecc_set_point (const char *name, gcry_mpi_point_t newvalue, mpi_ec_t ec) -{ - if (!strcmp (name, "g")) - { - _gcry_mpi_point_release (ec->G); - ec->G = point_copy (newvalue); - } - else if (!strcmp (name, "q")) - { - _gcry_mpi_point_release (ec->Q); - ec->Q = point_copy (newvalue); - } - else - return GPG_ERR_UNKNOWN_NAME; - - return 0; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-ecdsa.c b/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-ecdsa.c deleted file mode 100644 index 1484830b..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-ecdsa.c +++ /dev/null @@ -1,234 +0,0 @@ -/* ecc-ecdsa.c - Elliptic Curve ECDSA signatures - * Copyright (C) 2007, 2008, 2010, 2011 Free Software Foundation, Inc. - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "context.h" -#include "ec-context.h" -#include "pubkey-internal.h" -#include "ecc-common.h" - - -/* Compute an ECDSA signature. - * Return the signature struct (r,s) from the message hash. The caller - * must have allocated R and S. - */ -gpg_err_code_t -_gcry_ecc_ecdsa_sign (gcry_mpi_t input, ECC_secret_key *skey, - gcry_mpi_t r, gcry_mpi_t s, - int flags, int hashalgo) -{ - gpg_err_code_t rc = 0; - int extraloops = 0; - gcry_mpi_t k, dr, sum, k_1, x; - mpi_point_struct I; - gcry_mpi_t hash; - const void *abuf; - unsigned int abits, qbits; - mpi_ec_t ctx; - - if (DBG_CIPHER) - log_mpidump ("ecdsa sign hash ", input ); - - qbits = mpi_get_nbits (skey->E.n); - - /* Convert the INPUT into an MPI if needed. */ - rc = _gcry_dsa_normalize_hash (input, &hash, qbits); - if (rc) - return rc; - - k = NULL; - dr = mpi_alloc (0); - sum = mpi_alloc (0); - k_1 = mpi_alloc (0); - x = mpi_alloc (0); - point_init (&I); - - ctx = _gcry_mpi_ec_p_internal_new (skey->E.model, skey->E.dialect, 0, - skey->E.p, skey->E.a, skey->E.b); - - /* Two loops to avoid R or S are zero. This is more of a joke than - a real demand because the probability of them being zero is less - than any hardware failure. Some specs however require it. */ - do - { - do - { - mpi_free (k); - k = NULL; - if ((flags & PUBKEY_FLAG_RFC6979) && hashalgo) - { - /* Use Pornin's method for deterministic DSA. If this - flag is set, it is expected that HASH is an opaque - MPI with the to be signed hash. That hash is also - used as h1 from 3.2.a. */ - if (!mpi_is_opaque (input)) - { - rc = GPG_ERR_CONFLICT; - goto leave; - } - - abuf = mpi_get_opaque (input, &abits); - rc = _gcry_dsa_gen_rfc6979_k (&k, skey->E.n, skey->d, - abuf, (abits+7)/8, - hashalgo, extraloops); - if (rc) - goto leave; - extraloops++; - } - else - k = _gcry_dsa_gen_k (skey->E.n, GCRY_STRONG_RANDOM); - - _gcry_mpi_ec_mul_point (&I, k, &skey->E.G, ctx); - if (_gcry_mpi_ec_get_affine (x, NULL, &I, ctx)) - { - if (DBG_CIPHER) - log_debug ("ecc sign: Failed to get affine coordinates\n"); - rc = GPG_ERR_BAD_SIGNATURE; - goto leave; - } - mpi_mod (r, x, skey->E.n); /* r = x mod n */ - } - while (!mpi_cmp_ui (r, 0)); - - mpi_mulm (dr, skey->d, r, skey->E.n); /* dr = d*r mod n */ - mpi_addm (sum, hash, dr, skey->E.n); /* sum = hash + (d*r) mod n */ - mpi_invm (k_1, k, skey->E.n); /* k_1 = k^(-1) mod n */ - mpi_mulm (s, k_1, sum, skey->E.n); /* s = k^(-1)*(hash+(d*r)) mod n */ - } - while (!mpi_cmp_ui (s, 0)); - - if (DBG_CIPHER) - { - log_mpidump ("ecdsa sign result r ", r); - log_mpidump ("ecdsa sign result s ", s); - } - - leave: - _gcry_mpi_ec_free (ctx); - point_free (&I); - mpi_free (x); - mpi_free (k_1); - mpi_free (sum); - mpi_free (dr); - mpi_free (k); - - if (hash != input) - mpi_free (hash); - - return rc; -} - - -/* Verify an ECDSA signature. - * Check if R and S verifies INPUT. - */ -gpg_err_code_t -_gcry_ecc_ecdsa_verify (gcry_mpi_t input, ECC_public_key *pkey, - gcry_mpi_t r, gcry_mpi_t s) -{ - gpg_err_code_t err = 0; - gcry_mpi_t hash, h, h1, h2, x; - mpi_point_struct Q, Q1, Q2; - mpi_ec_t ctx; - unsigned int nbits; - - if( !(mpi_cmp_ui (r, 0) > 0 && mpi_cmp (r, pkey->E.n) < 0) ) - return GPG_ERR_BAD_SIGNATURE; /* Assertion 0 < r < n failed. */ - if( !(mpi_cmp_ui (s, 0) > 0 && mpi_cmp (s, pkey->E.n) < 0) ) - return GPG_ERR_BAD_SIGNATURE; /* Assertion 0 < s < n failed. */ - - nbits = mpi_get_nbits (pkey->E.n); - err = _gcry_dsa_normalize_hash (input, &hash, nbits); - if (err) - return err; - - h = mpi_alloc (0); - h1 = mpi_alloc (0); - h2 = mpi_alloc (0); - x = mpi_alloc (0); - point_init (&Q); - point_init (&Q1); - point_init (&Q2); - - ctx = _gcry_mpi_ec_p_internal_new (pkey->E.model, pkey->E.dialect, 0, - pkey->E.p, pkey->E.a, pkey->E.b); - - /* h = s^(-1) (mod n) */ - mpi_invm (h, s, pkey->E.n); - /* h1 = hash * s^(-1) (mod n) */ - mpi_mulm (h1, hash, h, pkey->E.n); - /* Q1 = [ hash * s^(-1) ]G */ - _gcry_mpi_ec_mul_point (&Q1, h1, &pkey->E.G, ctx); - /* h2 = r * s^(-1) (mod n) */ - mpi_mulm (h2, r, h, pkey->E.n); - /* Q2 = [ r * s^(-1) ]Q */ - _gcry_mpi_ec_mul_point (&Q2, h2, &pkey->Q, ctx); - /* Q = ([hash * s^(-1)]G) + ([r * s^(-1)]Q) */ - _gcry_mpi_ec_add_points (&Q, &Q1, &Q2, ctx); - - if (!mpi_cmp_ui (Q.z, 0)) - { - if (DBG_CIPHER) - log_debug ("ecc verify: Rejected\n"); - err = GPG_ERR_BAD_SIGNATURE; - goto leave; - } - if (_gcry_mpi_ec_get_affine (x, NULL, &Q, ctx)) - { - if (DBG_CIPHER) - log_debug ("ecc verify: Failed to get affine coordinates\n"); - err = GPG_ERR_BAD_SIGNATURE; - goto leave; - } - mpi_mod (x, x, pkey->E.n); /* x = x mod E_n */ - if (mpi_cmp (x, r)) /* x != r */ - { - if (DBG_CIPHER) - { - log_mpidump (" x", x); - log_mpidump (" r", r); - log_mpidump (" s", s); - } - err = GPG_ERR_BAD_SIGNATURE; - goto leave; - } - - leave: - _gcry_mpi_ec_free (ctx); - point_free (&Q2); - point_free (&Q1); - point_free (&Q); - mpi_free (x); - mpi_free (h2); - mpi_free (h1); - mpi_free (h); - if (hash != input) - mpi_free (hash); - - return err; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-eddsa.c b/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-eddsa.c deleted file mode 100644 index 65024a30..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-eddsa.c +++ /dev/null @@ -1,840 +0,0 @@ -/* ecc-eddsa.c - Elliptic Curve EdDSA signatures - * Copyright (C) 2013, 2014 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "context.h" -#include "ec-context.h" -#include "ecc-common.h" - - - -static void -reverse_buffer (unsigned char *buffer, unsigned int length) -{ - unsigned int tmp, i; - - for (i=0; i < length/2; i++) - { - tmp = buffer[i]; - buffer[i] = buffer[length-1-i]; - buffer[length-1-i] = tmp; - } -} - - -/* Helper to scan a hex string. */ -static gcry_mpi_t -scanval (const char *string) -{ - gpg_err_code_t rc; - gcry_mpi_t val; - - rc = _gcry_mpi_scan (&val, GCRYMPI_FMT_HEX, string, 0, NULL); - if (rc) - log_fatal ("scanning ECC parameter failed: %s\n", gpg_strerror (rc)); - return val; -} - - - -/* Encode MPI using the EdDSA scheme. MINLEN specifies the required - length of the buffer in bytes. On success 0 is returned an a - malloced buffer with the encoded point is stored at R_BUFFER; the - length of this buffer is stored at R_BUFLEN. */ -static gpg_err_code_t -eddsa_encodempi (gcry_mpi_t mpi, unsigned int minlen, - unsigned char **r_buffer, unsigned int *r_buflen) -{ - unsigned char *rawmpi; - unsigned int rawmpilen; - - rawmpi = _gcry_mpi_get_buffer (mpi, minlen, &rawmpilen, NULL); - if (!rawmpi) - return gpg_err_code_from_syserror (); - - *r_buffer = rawmpi; - *r_buflen = rawmpilen; - return 0; -} - - -/* Encode (X,Y) using the EdDSA scheme. MINLEN is the required length - in bytes for the result. If WITH_PREFIX is set the returned buffer - is prefixed with a 0x40 byte. On success 0 is returned and a - malloced buffer with the encoded point is stored at R_BUFFER; the - length of this buffer is stored at R_BUFLEN. */ -static gpg_err_code_t -eddsa_encode_x_y (gcry_mpi_t x, gcry_mpi_t y, unsigned int minlen, - int with_prefix, - unsigned char **r_buffer, unsigned int *r_buflen) -{ - unsigned char *rawmpi; - unsigned int rawmpilen; - int off = with_prefix? 1:0; - - rawmpi = _gcry_mpi_get_buffer_extra (y, minlen, off?-1:0, &rawmpilen, NULL); - if (!rawmpi) - return gpg_err_code_from_syserror (); - if (mpi_test_bit (x, 0) && rawmpilen) - rawmpi[off + rawmpilen - 1] |= 0x80; /* Set sign bit. */ - if (off) - rawmpi[0] = 0x40; - - *r_buffer = rawmpi; - *r_buflen = rawmpilen + off; - return 0; -} - -/* Encode POINT using the EdDSA scheme. X and Y are either scratch - variables supplied by the caller or NULL. CTX is the usual - context. If WITH_PREFIX is set the returned buffer is prefixed - with a 0x40 byte. On success 0 is returned and a malloced buffer - with the encoded point is stored at R_BUFFER; the length of this - buffer is stored at R_BUFLEN. */ -gpg_err_code_t -_gcry_ecc_eddsa_encodepoint (mpi_point_t point, mpi_ec_t ec, - gcry_mpi_t x_in, gcry_mpi_t y_in, - int with_prefix, - unsigned char **r_buffer, unsigned int *r_buflen) -{ - gpg_err_code_t rc; - gcry_mpi_t x, y; - - x = x_in? x_in : mpi_new (0); - y = y_in? y_in : mpi_new (0); - - if (_gcry_mpi_ec_get_affine (x, y, point, ec)) - { - log_error ("eddsa_encodepoint: Failed to get affine coordinates\n"); - rc = GPG_ERR_INTERNAL; - } - else - rc = eddsa_encode_x_y (x, y, ec->nbits/8, with_prefix, r_buffer, r_buflen); - - if (!x_in) - mpi_free (x); - if (!y_in) - mpi_free (y); - return rc; -} - - -/* Make sure that the opaque MPI VALUE is in compact EdDSA format. - This function updates MPI if needed. */ -gpg_err_code_t -_gcry_ecc_eddsa_ensure_compact (gcry_mpi_t value, unsigned int nbits) -{ - gpg_err_code_t rc; - const unsigned char *buf; - unsigned int rawmpilen; - gcry_mpi_t x, y; - unsigned char *enc; - unsigned int enclen; - - if (!mpi_is_opaque (value)) - return GPG_ERR_INV_OBJ; - buf = mpi_get_opaque (value, &rawmpilen); - if (!buf) - return GPG_ERR_INV_OBJ; - rawmpilen = (rawmpilen + 7)/8; - - if (rawmpilen > 1 && (rawmpilen%2)) - { - if (buf[0] == 0x04) - { - /* Buffer is in SEC1 uncompressed format. Extract y and - compress. */ - rc = _gcry_mpi_scan (&x, GCRYMPI_FMT_STD, - buf+1, (rawmpilen-1)/2, NULL); - if (rc) - return rc; - rc = _gcry_mpi_scan (&y, GCRYMPI_FMT_STD, - buf+1+(rawmpilen-1)/2, (rawmpilen-1)/2, NULL); - if (rc) - { - mpi_free (x); - return rc; - } - - rc = eddsa_encode_x_y (x, y, nbits/8, 0, &enc, &enclen); - mpi_free (x); - mpi_free (y); - if (rc) - return rc; - - mpi_set_opaque (value, enc, 8*enclen); - } - else if (buf[0] == 0x40) - { - /* Buffer is compressed but with our SEC1 alike compression - indicator. Remove that byte. FIXME: We should write and - use a function to manipulate an opaque MPI in place. */ - if (!_gcry_mpi_set_opaque_copy (value, buf + 1, (rawmpilen - 1)*8)) - return gpg_err_code_from_syserror (); - } - } - - return 0; -} - - -/* Recover X from Y and SIGN (which actually is a parity bit). */ -gpg_err_code_t -_gcry_ecc_eddsa_recover_x (gcry_mpi_t x, gcry_mpi_t y, int sign, mpi_ec_t ec) -{ - gpg_err_code_t rc = 0; - gcry_mpi_t u, v, v3, t; - static gcry_mpi_t p58, seven; - - if (ec->dialect != ECC_DIALECT_ED25519) - return GPG_ERR_NOT_IMPLEMENTED; - - if (!p58) - p58 = scanval ("0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD"); - if (!seven) - seven = mpi_set_ui (NULL, 7); - - u = mpi_new (0); - v = mpi_new (0); - v3 = mpi_new (0); - t = mpi_new (0); - - /* Compute u and v */ - /* u = y^2 */ - mpi_mulm (u, y, y, ec->p); - /* v = b*y^2 */ - mpi_mulm (v, ec->b, u, ec->p); - /* u = y^2-1 */ - mpi_sub_ui (u, u, 1); - /* v = b*y^2+1 */ - mpi_add_ui (v, v, 1); - - /* Compute sqrt(u/v) */ - /* v3 = v^3 */ - mpi_powm (v3, v, mpi_const (MPI_C_THREE), ec->p); - /* t = v3 * v3 * u * v = u * v^7 */ - mpi_powm (t, v, seven, ec->p); - mpi_mulm (t, t, u, ec->p); - /* t = t^((p-5)/8) = (u * v^7)^((p-5)/8) */ - mpi_powm (t, t, p58, ec->p); - /* x = t * u * v^3 = (u * v^3) * (u * v^7)^((p-5)/8) */ - mpi_mulm (t, t, u, ec->p); - mpi_mulm (x, t, v3, ec->p); - - /* Adjust if needed. */ - /* t = v * x^2 */ - mpi_mulm (t, x, x, ec->p); - mpi_mulm (t, t, v, ec->p); - /* -t == u ? x = x * sqrt(-1) */ - mpi_neg (t, t); - if (!mpi_cmp (t, u)) - { - static gcry_mpi_t m1; /* Fixme: this is not thread-safe. */ - if (!m1) - m1 = scanval ("2B8324804FC1DF0B2B4D00993DFBD7A7" - "2F431806AD2FE478C4EE1B274A0EA0B0"); - mpi_mulm (x, x, m1, ec->p); - /* t = v * x^2 */ - mpi_mulm (t, x, x, ec->p); - mpi_mulm (t, t, v, ec->p); - /* -t == u ? x = x * sqrt(-1) */ - mpi_neg (t, t); - if (!mpi_cmp (t, u)) - rc = GPG_ERR_INV_OBJ; - } - - /* Choose the desired square root according to parity */ - if (mpi_test_bit (x, 0) != !!sign) - mpi_sub (x, ec->p, x); - - mpi_free (t); - mpi_free (v3); - mpi_free (v); - mpi_free (u); - - return rc; -} - - -/* Decode the EdDSA style encoded PK and set it into RESULT. CTX is - the usual curve context. If R_ENCPK is not NULL, the encoded PK is - stored at that address; this is a new copy to be released by the - caller. In contrast to the supplied PK, this is not an MPI and - thus guaranteed to be properly padded. R_ENCPKLEN receives the - length of that encoded key. */ -gpg_err_code_t -_gcry_ecc_eddsa_decodepoint (gcry_mpi_t pk, mpi_ec_t ctx, mpi_point_t result, - unsigned char **r_encpk, unsigned int *r_encpklen) -{ - gpg_err_code_t rc; - unsigned char *rawmpi; - unsigned int rawmpilen; - int sign; - - if (mpi_is_opaque (pk)) - { - const unsigned char *buf; - - buf = mpi_get_opaque (pk, &rawmpilen); - if (!buf) - return GPG_ERR_INV_OBJ; - rawmpilen = (rawmpilen + 7)/8; - - /* Handle compression prefixes. The size of the buffer will be - odd in this case. */ - if (rawmpilen > 1 && (rawmpilen%2)) - { - /* First check whether the public key has been given in - standard uncompressed format (SEC1). No need to recover - x in this case. */ - if (buf[0] == 0x04) - { - gcry_mpi_t x, y; - - rc = _gcry_mpi_scan (&x, GCRYMPI_FMT_STD, - buf+1, (rawmpilen-1)/2, NULL); - if (rc) - return rc; - rc = _gcry_mpi_scan (&y, GCRYMPI_FMT_STD, - buf+1+(rawmpilen-1)/2, (rawmpilen-1)/2,NULL); - if (rc) - { - mpi_free (x); - return rc; - } - - if (r_encpk) - { - rc = eddsa_encode_x_y (x, y, ctx->nbits/8, 0, - r_encpk, r_encpklen); - if (rc) - { - mpi_free (x); - mpi_free (y); - return rc; - } - } - mpi_snatch (result->x, x); - mpi_snatch (result->y, y); - mpi_set_ui (result->z, 1); - return 0; - } - - /* Check whether the public key has been prefixed with a 0x40 - byte to explicitly indicate compressed format using a SEC1 - alike prefix byte. This is a Libgcrypt extension. */ - if (buf[0] == 0x40) - { - rawmpilen--; - buf++; - } - } - - /* EdDSA compressed point. */ - rawmpi = xtrymalloc (rawmpilen? rawmpilen:1); - if (!rawmpi) - return gpg_err_code_from_syserror (); - memcpy (rawmpi, buf, rawmpilen); - reverse_buffer (rawmpi, rawmpilen); - } - else - { - /* Note: Without using an opaque MPI it is not reliable possible - to find out whether the public key has been given in - uncompressed format. Thus we expect native EdDSA format. */ - rawmpi = _gcry_mpi_get_buffer (pk, ctx->nbits/8, &rawmpilen, NULL); - if (!rawmpi) - return gpg_err_code_from_syserror (); - } - - if (rawmpilen) - { - sign = !!(rawmpi[0] & 0x80); - rawmpi[0] &= 0x7f; - } - else - sign = 0; - _gcry_mpi_set_buffer (result->y, rawmpi, rawmpilen, 0); - if (r_encpk) - { - /* Revert to little endian. */ - if (sign && rawmpilen) - rawmpi[0] |= 0x80; - reverse_buffer (rawmpi, rawmpilen); - *r_encpk = rawmpi; - if (r_encpklen) - *r_encpklen = rawmpilen; - } - else - xfree (rawmpi); - - rc = _gcry_ecc_eddsa_recover_x (result->x, result->y, sign, ctx); - mpi_set_ui (result->z, 1); - - return rc; -} - - -/* Compute the A value as used by EdDSA. The caller needs to provide - the context EC and the actual secret D as an MPI. The function - returns a newly allocated 64 byte buffer at r_digest; the first 32 - bytes represent the A value. NULL is returned on error and NULL - stored at R_DIGEST. */ -gpg_err_code_t -_gcry_ecc_eddsa_compute_h_d (unsigned char **r_digest, - gcry_mpi_t d, mpi_ec_t ec) -{ - gpg_err_code_t rc; - unsigned char *rawmpi = NULL; - unsigned int rawmpilen; - unsigned char *digest; - gcry_buffer_t hvec[2]; - int hashalgo, b; - - *r_digest = NULL; - - hashalgo = GCRY_MD_SHA512; - if (hashalgo != GCRY_MD_SHA512) - return GPG_ERR_DIGEST_ALGO; - - b = (ec->nbits+7)/8; - if (b != 256/8) - return GPG_ERR_INTERNAL; /* We only support 256 bit. */ - - /* Note that we clear DIGEST so we can use it as input to left pad - the key with zeroes for hashing. */ - digest = xtrycalloc_secure (2, b); - if (!digest) - return gpg_err_code_from_syserror (); - - memset (hvec, 0, sizeof hvec); - - rawmpi = _gcry_mpi_get_buffer (d, 0, &rawmpilen, NULL); - if (!rawmpi) - { - xfree (digest); - return gpg_err_code_from_syserror (); - } - - hvec[0].data = digest; - hvec[0].off = 0; - hvec[0].len = b > rawmpilen? b - rawmpilen : 0; - hvec[1].data = rawmpi; - hvec[1].off = 0; - hvec[1].len = rawmpilen; - rc = _gcry_md_hash_buffers (hashalgo, 0, digest, hvec, 2); - xfree (rawmpi); - if (rc) - { - xfree (digest); - return rc; - } - - /* Compute the A value. */ - reverse_buffer (digest, 32); /* Only the first half of the hash. */ - digest[0] = (digest[0] & 0x7f) | 0x40; - digest[31] &= 0xf8; - - *r_digest = digest; - return 0; -} - - -/* Ed25519 version of the key generation. */ -gpg_err_code_t -_gcry_ecc_eddsa_genkey (ECC_secret_key *sk, elliptic_curve_t *E, mpi_ec_t ctx, - gcry_random_level_t random_level) -{ - gpg_err_code_t rc; - int b = 256/8; /* The only size we currently support. */ - gcry_mpi_t a, x, y; - mpi_point_struct Q; - char *dbuf; - size_t dlen; - gcry_buffer_t hvec[1]; - unsigned char *hash_d = NULL; - - point_init (&Q); - memset (hvec, 0, sizeof hvec); - - a = mpi_snew (0); - x = mpi_new (0); - y = mpi_new (0); - - /* Generate a secret. */ - hash_d = xtrymalloc_secure (2*b); - if (!hash_d) - { - rc = gpg_error_from_syserror (); - goto leave; - } - dlen = b; - dbuf = _gcry_random_bytes_secure (dlen, random_level); - - /* Compute the A value. */ - hvec[0].data = dbuf; - hvec[0].len = dlen; - rc = _gcry_md_hash_buffers (GCRY_MD_SHA512, 0, hash_d, hvec, 1); - if (rc) - goto leave; - sk->d = _gcry_mpi_set_opaque (NULL, dbuf, dlen*8); - dbuf = NULL; - reverse_buffer (hash_d, 32); /* Only the first half of the hash. */ - hash_d[0] = (hash_d[0] & 0x7f) | 0x40; - hash_d[31] &= 0xf8; - _gcry_mpi_set_buffer (a, hash_d, 32, 0); - xfree (hash_d); hash_d = NULL; - /* log_printmpi ("ecgen a", a); */ - - /* Compute Q. */ - _gcry_mpi_ec_mul_point (&Q, a, &E->G, ctx); - if (DBG_CIPHER) - log_printpnt ("ecgen pk", &Q, ctx); - - /* Copy the stuff to the key structures. */ - sk->E.model = E->model; - sk->E.dialect = E->dialect; - sk->E.p = mpi_copy (E->p); - sk->E.a = mpi_copy (E->a); - sk->E.b = mpi_copy (E->b); - point_init (&sk->E.G); - point_set (&sk->E.G, &E->G); - sk->E.n = mpi_copy (E->n); - point_init (&sk->Q); - point_set (&sk->Q, &Q); - - leave: - point_free (&Q); - _gcry_mpi_release (a); - _gcry_mpi_release (x); - _gcry_mpi_release (y); - xfree (hash_d); - return rc; -} - - -/* Compute an EdDSA signature. See: - * [ed25519] 23pp. (PDF) Daniel J. Bernstein, Niels Duif, Tanja - * Lange, Peter Schwabe, Bo-Yin Yang. High-speed high-security - * signatures. Journal of Cryptographic Engineering 2 (2012), 77-89. - * Document ID: a1a62a2f76d23f65d622484ddd09caf8. - * URL: http://cr.yp.to/papers.html#ed25519. Date: 2011.09.26. - * - * Despite that this function requires the specification of a hash - * algorithm, we only support what has been specified by the paper. - * This may change in the future. Note that we don't check the used - * curve; the user is responsible to use Ed25519. - * - * Return the signature struct (r,s) from the message hash. The caller - * must have allocated R_R and S. - */ -gpg_err_code_t -_gcry_ecc_eddsa_sign (gcry_mpi_t input, ECC_secret_key *skey, - gcry_mpi_t r_r, gcry_mpi_t s, int hashalgo, gcry_mpi_t pk) -{ - int rc; - mpi_ec_t ctx = NULL; - int b; - unsigned int tmp; - unsigned char *digest; - gcry_buffer_t hvec[3]; - const void *mbuf; - size_t mlen; - unsigned char *rawmpi = NULL; - unsigned int rawmpilen; - unsigned char *encpk = NULL; /* Encoded public key. */ - unsigned int encpklen; - mpi_point_struct I; /* Intermediate value. */ - mpi_point_struct Q; /* Public key. */ - gcry_mpi_t a, x, y, r; - - memset (hvec, 0, sizeof hvec); - - if (!mpi_is_opaque (input)) - return GPG_ERR_INV_DATA; - - /* Initialize some helpers. */ - point_init (&I); - point_init (&Q); - a = mpi_snew (0); - x = mpi_new (0); - y = mpi_new (0); - r = mpi_new (0); - ctx = _gcry_mpi_ec_p_internal_new (skey->E.model, skey->E.dialect, 0, - skey->E.p, skey->E.a, skey->E.b); - b = (ctx->nbits+7)/8; - if (b != 256/8) - return GPG_ERR_INTERNAL; /* We only support 256 bit. */ - - rc = _gcry_ecc_eddsa_compute_h_d (&digest, skey->d, ctx); - if (rc) - goto leave; - _gcry_mpi_set_buffer (a, digest, 32, 0); - - /* Compute the public key if it has not been supplied as optional - parameter. */ - if (pk) - { - rc = _gcry_ecc_eddsa_decodepoint (pk, ctx, &Q, &encpk, &encpklen); - if (rc) - goto leave; - if (DBG_CIPHER) - log_printhex ("* e_pk", encpk, encpklen); - if (!_gcry_mpi_ec_curve_point (&Q, ctx)) - { - rc = GPG_ERR_BROKEN_PUBKEY; - goto leave; - } - } - else - { - _gcry_mpi_ec_mul_point (&Q, a, &skey->E.G, ctx); - rc = _gcry_ecc_eddsa_encodepoint (&Q, ctx, x, y, 0, &encpk, &encpklen); - if (rc) - goto leave; - if (DBG_CIPHER) - log_printhex (" e_pk", encpk, encpklen); - } - - /* Compute R. */ - mbuf = mpi_get_opaque (input, &tmp); - mlen = (tmp +7)/8; - if (DBG_CIPHER) - log_printhex (" m", mbuf, mlen); - - hvec[0].data = digest; - hvec[0].off = 32; - hvec[0].len = 32; - hvec[1].data = (char*)mbuf; - hvec[1].len = mlen; - rc = _gcry_md_hash_buffers (hashalgo, 0, digest, hvec, 2); - if (rc) - goto leave; - reverse_buffer (digest, 64); - if (DBG_CIPHER) - log_printhex (" r", digest, 64); - _gcry_mpi_set_buffer (r, digest, 64, 0); - _gcry_mpi_ec_mul_point (&I, r, &skey->E.G, ctx); - if (DBG_CIPHER) - log_printpnt (" r", &I, ctx); - - /* Convert R into affine coordinates and apply encoding. */ - rc = _gcry_ecc_eddsa_encodepoint (&I, ctx, x, y, 0, &rawmpi, &rawmpilen); - if (rc) - goto leave; - if (DBG_CIPHER) - log_printhex (" e_r", rawmpi, rawmpilen); - - /* S = r + a * H(encodepoint(R) + encodepoint(pk) + m) mod n */ - hvec[0].data = rawmpi; /* (this is R) */ - hvec[0].off = 0; - hvec[0].len = rawmpilen; - hvec[1].data = encpk; - hvec[1].off = 0; - hvec[1].len = encpklen; - hvec[2].data = (char*)mbuf; - hvec[2].off = 0; - hvec[2].len = mlen; - rc = _gcry_md_hash_buffers (hashalgo, 0, digest, hvec, 3); - if (rc) - goto leave; - - /* No more need for RAWMPI thus we now transfer it to R_R. */ - mpi_set_opaque (r_r, rawmpi, rawmpilen*8); - rawmpi = NULL; - - reverse_buffer (digest, 64); - if (DBG_CIPHER) - log_printhex (" H(R+)", digest, 64); - _gcry_mpi_set_buffer (s, digest, 64, 0); - mpi_mulm (s, s, a, skey->E.n); - mpi_addm (s, s, r, skey->E.n); - rc = eddsa_encodempi (s, b, &rawmpi, &rawmpilen); - if (rc) - goto leave; - if (DBG_CIPHER) - log_printhex (" e_s", rawmpi, rawmpilen); - mpi_set_opaque (s, rawmpi, rawmpilen*8); - rawmpi = NULL; - - rc = 0; - - leave: - _gcry_mpi_release (a); - _gcry_mpi_release (x); - _gcry_mpi_release (y); - _gcry_mpi_release (r); - xfree (digest); - _gcry_mpi_ec_free (ctx); - point_free (&I); - point_free (&Q); - xfree (encpk); - xfree (rawmpi); - return rc; -} - - -/* Verify an EdDSA signature. See sign_eddsa for the reference. - * Check if R_IN and S_IN verifies INPUT. PKEY has the curve - * parameters and PK is the EdDSA style encoded public key. - */ -gpg_err_code_t -_gcry_ecc_eddsa_verify (gcry_mpi_t input, ECC_public_key *pkey, - gcry_mpi_t r_in, gcry_mpi_t s_in, int hashalgo, - gcry_mpi_t pk) -{ - int rc; - mpi_ec_t ctx = NULL; - int b; - unsigned int tmp; - mpi_point_struct Q; /* Public key. */ - unsigned char *encpk = NULL; /* Encoded public key. */ - unsigned int encpklen; - const void *mbuf, *rbuf; - unsigned char *tbuf = NULL; - size_t mlen, rlen; - unsigned int tlen; - unsigned char digest[64]; - gcry_buffer_t hvec[3]; - gcry_mpi_t h, s; - mpi_point_struct Ia, Ib; - - if (!mpi_is_opaque (input) || !mpi_is_opaque (r_in) || !mpi_is_opaque (s_in)) - return GPG_ERR_INV_DATA; - if (hashalgo != GCRY_MD_SHA512) - return GPG_ERR_DIGEST_ALGO; - - point_init (&Q); - point_init (&Ia); - point_init (&Ib); - h = mpi_new (0); - s = mpi_new (0); - - ctx = _gcry_mpi_ec_p_internal_new (pkey->E.model, pkey->E.dialect, 0, - pkey->E.p, pkey->E.a, pkey->E.b); - b = ctx->nbits/8; - if (b != 256/8) - return GPG_ERR_INTERNAL; /* We only support 256 bit. */ - - /* Decode and check the public key. */ - rc = _gcry_ecc_eddsa_decodepoint (pk, ctx, &Q, &encpk, &encpklen); - if (rc) - goto leave; - if (!_gcry_mpi_ec_curve_point (&Q, ctx)) - { - rc = GPG_ERR_BROKEN_PUBKEY; - goto leave; - } - if (DBG_CIPHER) - log_printhex (" e_pk", encpk, encpklen); - if (encpklen != b) - { - rc = GPG_ERR_INV_LENGTH; - goto leave; - } - - /* Convert the other input parameters. */ - mbuf = mpi_get_opaque (input, &tmp); - mlen = (tmp +7)/8; - if (DBG_CIPHER) - log_printhex (" m", mbuf, mlen); - rbuf = mpi_get_opaque (r_in, &tmp); - rlen = (tmp +7)/8; - if (DBG_CIPHER) - log_printhex (" r", rbuf, rlen); - if (rlen != b) - { - rc = GPG_ERR_INV_LENGTH; - goto leave; - } - - /* h = H(encodepoint(R) + encodepoint(pk) + m) */ - hvec[0].data = (char*)rbuf; - hvec[0].off = 0; - hvec[0].len = rlen; - hvec[1].data = encpk; - hvec[1].off = 0; - hvec[1].len = encpklen; - hvec[2].data = (char*)mbuf; - hvec[2].off = 0; - hvec[2].len = mlen; - rc = _gcry_md_hash_buffers (hashalgo, 0, digest, hvec, 3); - if (rc) - goto leave; - reverse_buffer (digest, 64); - if (DBG_CIPHER) - log_printhex (" H(R+)", digest, 64); - _gcry_mpi_set_buffer (h, digest, 64, 0); - - /* According to the paper the best way for verification is: - encodepoint(sG - h·Q) = encodepoint(r) - because we don't need to decode R. */ - { - void *sbuf; - unsigned int slen; - - sbuf = _gcry_mpi_get_opaque_copy (s_in, &tmp); - slen = (tmp +7)/8; - reverse_buffer (sbuf, slen); - if (DBG_CIPHER) - log_printhex (" s", sbuf, slen); - _gcry_mpi_set_buffer (s, sbuf, slen, 0); - xfree (sbuf); - if (slen != b) - { - rc = GPG_ERR_INV_LENGTH; - goto leave; - } - } - - _gcry_mpi_ec_mul_point (&Ia, s, &pkey->E.G, ctx); - _gcry_mpi_ec_mul_point (&Ib, h, &Q, ctx); - _gcry_mpi_neg (Ib.x, Ib.x); - _gcry_mpi_ec_add_points (&Ia, &Ia, &Ib, ctx); - rc = _gcry_ecc_eddsa_encodepoint (&Ia, ctx, s, h, 0, &tbuf, &tlen); - if (rc) - goto leave; - if (tlen != rlen || memcmp (tbuf, rbuf, tlen)) - { - rc = GPG_ERR_BAD_SIGNATURE; - goto leave; - } - - rc = 0; - - leave: - xfree (encpk); - xfree (tbuf); - _gcry_mpi_ec_free (ctx); - _gcry_mpi_release (s); - _gcry_mpi_release (h); - point_free (&Ia); - point_free (&Ib); - point_free (&Q); - return rc; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-gost.c b/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-gost.c deleted file mode 100644 index a34fa084..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-gost.c +++ /dev/null @@ -1,233 +0,0 @@ -/* ecc-gots.c - Elliptic Curve GOST signatures - * Copyright (C) 2007, 2008, 2010, 2011 Free Software Foundation, Inc. - * Copyright (C) 2013 Dmitry Eremin-Solenikov - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "context.h" -#include "ec-context.h" -#include "ecc-common.h" -#include "pubkey-internal.h" - - -/* Compute an GOST R 34.10-01/-12 signature. - * Return the signature struct (r,s) from the message hash. The caller - * must have allocated R and S. - */ -gpg_err_code_t -_gcry_ecc_gost_sign (gcry_mpi_t input, ECC_secret_key *skey, - gcry_mpi_t r, gcry_mpi_t s) -{ - gpg_err_code_t rc = 0; - gcry_mpi_t k, dr, sum, ke, x, e; - mpi_point_struct I; - gcry_mpi_t hash; - const void *abuf; - unsigned int abits, qbits; - mpi_ec_t ctx; - - if (DBG_CIPHER) - log_mpidump ("gost sign hash ", input ); - - qbits = mpi_get_nbits (skey->E.n); - - /* Convert the INPUT into an MPI if needed. */ - if (mpi_is_opaque (input)) - { - abuf = mpi_get_opaque (input, &abits); - rc = _gcry_mpi_scan (&hash, GCRYMPI_FMT_USG, abuf, (abits+7)/8, NULL); - if (rc) - return rc; - if (abits > qbits) - mpi_rshift (hash, hash, abits - qbits); - } - else - hash = input; - - - k = NULL; - dr = mpi_alloc (0); - sum = mpi_alloc (0); - ke = mpi_alloc (0); - e = mpi_alloc (0); - x = mpi_alloc (0); - point_init (&I); - - ctx = _gcry_mpi_ec_p_internal_new (skey->E.model, skey->E.dialect, 0, - skey->E.p, skey->E.a, skey->E.b); - - mpi_mod (e, input, skey->E.n); /* e = hash mod n */ - - if (!mpi_cmp_ui (e, 0)) - mpi_set_ui (e, 1); - - /* Two loops to avoid R or S are zero. This is more of a joke than - a real demand because the probability of them being zero is less - than any hardware failure. Some specs however require it. */ - do - { - do - { - mpi_free (k); - k = _gcry_dsa_gen_k (skey->E.n, GCRY_STRONG_RANDOM); - - _gcry_mpi_ec_mul_point (&I, k, &skey->E.G, ctx); - if (_gcry_mpi_ec_get_affine (x, NULL, &I, ctx)) - { - if (DBG_CIPHER) - log_debug ("ecc sign: Failed to get affine coordinates\n"); - rc = GPG_ERR_BAD_SIGNATURE; - goto leave; - } - mpi_mod (r, x, skey->E.n); /* r = x mod n */ - } - while (!mpi_cmp_ui (r, 0)); - mpi_mulm (dr, skey->d, r, skey->E.n); /* dr = d*r mod n */ - mpi_mulm (ke, k, e, skey->E.n); /* ke = k*e mod n */ - mpi_addm (s, ke, dr, skey->E.n); /* sum = (k*e+ d*r) mod n */ - } - while (!mpi_cmp_ui (s, 0)); - - if (DBG_CIPHER) - { - log_mpidump ("gost sign result r ", r); - log_mpidump ("gost sign result s ", s); - } - - leave: - _gcry_mpi_ec_free (ctx); - point_free (&I); - mpi_free (x); - mpi_free (e); - mpi_free (ke); - mpi_free (sum); - mpi_free (dr); - mpi_free (k); - - if (hash != input) - mpi_free (hash); - - return rc; -} - - -/* Verify a GOST R 34.10-01/-12 signature. - * Check if R and S verifies INPUT. - */ -gpg_err_code_t -_gcry_ecc_gost_verify (gcry_mpi_t input, ECC_public_key *pkey, - gcry_mpi_t r, gcry_mpi_t s) -{ - gpg_err_code_t err = 0; - gcry_mpi_t e, x, z1, z2, v, rv, zero; - mpi_point_struct Q, Q1, Q2; - mpi_ec_t ctx; - - if( !(mpi_cmp_ui (r, 0) > 0 && mpi_cmp (r, pkey->E.n) < 0) ) - return GPG_ERR_BAD_SIGNATURE; /* Assertion 0 < r < n failed. */ - if( !(mpi_cmp_ui (s, 0) > 0 && mpi_cmp (s, pkey->E.n) < 0) ) - return GPG_ERR_BAD_SIGNATURE; /* Assertion 0 < s < n failed. */ - - x = mpi_alloc (0); - e = mpi_alloc (0); - z1 = mpi_alloc (0); - z2 = mpi_alloc (0); - v = mpi_alloc (0); - rv = mpi_alloc (0); - zero = mpi_alloc (0); - - point_init (&Q); - point_init (&Q1); - point_init (&Q2); - - ctx = _gcry_mpi_ec_p_internal_new (pkey->E.model, pkey->E.dialect, 0, - pkey->E.p, pkey->E.a, pkey->E.b); - - mpi_mod (e, input, pkey->E.n); /* e = hash mod n */ - if (!mpi_cmp_ui (e, 0)) - mpi_set_ui (e, 1); - mpi_invm (v, e, pkey->E.n); /* v = e^(-1) (mod n) */ - mpi_mulm (z1, s, v, pkey->E.n); /* z1 = s*v (mod n) */ - mpi_mulm (rv, r, v, pkey->E.n); /* rv = s*v (mod n) */ - mpi_subm (z2, zero, rv, pkey->E.n); /* z2 = -r*v (mod n) */ - - _gcry_mpi_ec_mul_point (&Q1, z1, &pkey->E.G, ctx); -/* log_mpidump ("Q1.x", Q1.x); */ -/* log_mpidump ("Q1.y", Q1.y); */ -/* log_mpidump ("Q1.z", Q1.z); */ - _gcry_mpi_ec_mul_point (&Q2, z2, &pkey->Q, ctx); -/* log_mpidump ("Q2.x", Q2.x); */ -/* log_mpidump ("Q2.y", Q2.y); */ -/* log_mpidump ("Q2.z", Q2.z); */ - _gcry_mpi_ec_add_points (&Q, &Q1, &Q2, ctx); -/* log_mpidump (" Q.x", Q.x); */ -/* log_mpidump (" Q.y", Q.y); */ -/* log_mpidump (" Q.z", Q.z); */ - - if (!mpi_cmp_ui (Q.z, 0)) - { - if (DBG_CIPHER) - log_debug ("ecc verify: Rejected\n"); - err = GPG_ERR_BAD_SIGNATURE; - goto leave; - } - if (_gcry_mpi_ec_get_affine (x, NULL, &Q, ctx)) - { - if (DBG_CIPHER) - log_debug ("ecc verify: Failed to get affine coordinates\n"); - err = GPG_ERR_BAD_SIGNATURE; - goto leave; - } - mpi_mod (x, x, pkey->E.n); /* x = x mod E_n */ - if (mpi_cmp (x, r)) /* x != r */ - { - if (DBG_CIPHER) - { - log_mpidump (" x", x); - log_mpidump (" r", r); - log_mpidump (" s", s); - log_debug ("ecc verify: Not verified\n"); - } - err = GPG_ERR_BAD_SIGNATURE; - goto leave; - } - if (DBG_CIPHER) - log_debug ("ecc verify: Accepted\n"); - - leave: - _gcry_mpi_ec_free (ctx); - point_free (&Q2); - point_free (&Q1); - point_free (&Q); - mpi_free (zero); - mpi_free (rv); - mpi_free (v); - mpi_free (z2); - mpi_free (z1); - mpi_free (x); - mpi_free (e); - return err; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-misc.c b/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-misc.c deleted file mode 100644 index 7b750c01..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc-misc.c +++ /dev/null @@ -1,287 +0,0 @@ -/* ecc-misc.c - Elliptic Curve miscellaneous functions - * Copyright (C) 2007, 2008, 2010, 2011 Free Software Foundation, Inc. - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "context.h" -#include "ec-context.h" -#include "ecc-common.h" - - -/* - * Release a curve object. - */ -void -_gcry_ecc_curve_free (elliptic_curve_t *E) -{ - mpi_free (E->p); E->p = NULL; - mpi_free (E->a); E->a = NULL; - mpi_free (E->b); E->b = NULL; - _gcry_mpi_point_free_parts (&E->G); - mpi_free (E->n); E->n = NULL; -} - - -/* - * Return a copy of a curve object. - */ -elliptic_curve_t -_gcry_ecc_curve_copy (elliptic_curve_t E) -{ - elliptic_curve_t R; - - R.model = E.model; - R.dialect = E.dialect; - R.name = E.name; - R.p = mpi_copy (E.p); - R.a = mpi_copy (E.a); - R.b = mpi_copy (E.b); - _gcry_mpi_point_init (&R.G); - point_set (&R.G, &E.G); - R.n = mpi_copy (E.n); - - return R; -} - - -/* - * Return a description of the curve model. - */ -const char * -_gcry_ecc_model2str (enum gcry_mpi_ec_models model) -{ - const char *str = "?"; - switch (model) - { - case MPI_EC_WEIERSTRASS: str = "Weierstrass"; break; - case MPI_EC_MONTGOMERY: str = "Montgomery"; break; - case MPI_EC_TWISTEDEDWARDS: str = "Twisted Edwards"; break; - } - return str; -} - - -/* - * Return a description of the curve dialect. - */ -const char * -_gcry_ecc_dialect2str (enum ecc_dialects dialect) -{ - const char *str = "?"; - switch (dialect) - { - case ECC_DIALECT_STANDARD: str = "Standard"; break; - case ECC_DIALECT_ED25519: str = "Ed25519"; break; - } - return str; -} - - -gcry_mpi_t -_gcry_ecc_ec2os (gcry_mpi_t x, gcry_mpi_t y, gcry_mpi_t p) -{ - gpg_err_code_t rc; - int pbytes = (mpi_get_nbits (p)+7)/8; - size_t n; - unsigned char *buf, *ptr; - gcry_mpi_t result; - - buf = xmalloc ( 1 + 2*pbytes ); - *buf = 04; /* Uncompressed point. */ - ptr = buf+1; - rc = _gcry_mpi_print (GCRYMPI_FMT_USG, ptr, pbytes, &n, x); - if (rc) - log_fatal ("mpi_print failed: %s\n", gpg_strerror (rc)); - if (n < pbytes) - { - memmove (ptr+(pbytes-n), ptr, n); - memset (ptr, 0, (pbytes-n)); - } - ptr += pbytes; - rc = _gcry_mpi_print (GCRYMPI_FMT_USG, ptr, pbytes, &n, y); - if (rc) - log_fatal ("mpi_print failed: %s\n", gpg_strerror (rc)); - if (n < pbytes) - { - memmove (ptr+(pbytes-n), ptr, n); - memset (ptr, 0, (pbytes-n)); - } - - rc = _gcry_mpi_scan (&result, GCRYMPI_FMT_USG, buf, 1+2*pbytes, NULL); - if (rc) - log_fatal ("mpi_scan failed: %s\n", gpg_strerror (rc)); - xfree (buf); - - return result; -} - - -/* Convert POINT into affine coordinates using the context CTX and - return a newly allocated MPI. If the conversion is not possible - NULL is returned. This function won't print an error message. */ -gcry_mpi_t -_gcry_mpi_ec_ec2os (gcry_mpi_point_t point, mpi_ec_t ectx) -{ - gcry_mpi_t g_x, g_y, result; - - g_x = mpi_new (0); - g_y = mpi_new (0); - if (_gcry_mpi_ec_get_affine (g_x, g_y, point, ectx)) - result = NULL; - else - result = _gcry_ecc_ec2os (g_x, g_y, ectx->p); - mpi_free (g_x); - mpi_free (g_y); - - return result; -} - - -/* RESULT must have been initialized and is set on success to the - point given by VALUE. */ -gcry_err_code_t -_gcry_ecc_os2ec (mpi_point_t result, gcry_mpi_t value) -{ - gcry_err_code_t rc; - size_t n; - const unsigned char *buf; - unsigned char *buf_memory; - gcry_mpi_t x, y; - - if (mpi_is_opaque (value)) - { - unsigned int nbits; - - buf = mpi_get_opaque (value, &nbits); - if (!buf) - return GPG_ERR_INV_OBJ; - n = (nbits + 7)/8; - buf_memory = NULL; - } - else - { - n = (mpi_get_nbits (value)+7)/8; - buf_memory = xmalloc (n); - rc = _gcry_mpi_print (GCRYMPI_FMT_USG, buf_memory, n, &n, value); - if (rc) - { - xfree (buf_memory); - return rc; - } - buf = buf_memory; - } - - if (n < 1) - { - xfree (buf_memory); - return GPG_ERR_INV_OBJ; - } - if (*buf != 4) - { - xfree (buf_memory); - return GPG_ERR_NOT_IMPLEMENTED; /* No support for point compression. */ - } - if ( ((n-1)%2) ) - { - xfree (buf_memory); - return GPG_ERR_INV_OBJ; - } - n = (n-1)/2; - rc = _gcry_mpi_scan (&x, GCRYMPI_FMT_USG, buf+1, n, NULL); - if (rc) - { - xfree (buf_memory); - return rc; - } - rc = _gcry_mpi_scan (&y, GCRYMPI_FMT_USG, buf+1+n, n, NULL); - xfree (buf_memory); - if (rc) - { - mpi_free (x); - return rc; - } - - mpi_set (result->x, x); - mpi_set (result->y, y); - mpi_set_ui (result->z, 1); - - mpi_free (x); - mpi_free (y); - - return 0; -} - - -/* Compute the public key from the the context EC. Obviously a - requirement is that the secret key is available in EC. On success - Q is returned; on error NULL. If Q is NULL a newly allocated point - is returned. If G or D are given they override the values taken - from EC. */ -mpi_point_t -_gcry_ecc_compute_public (mpi_point_t Q, mpi_ec_t ec, - mpi_point_t G, gcry_mpi_t d) -{ - if (!G) - G = ec->G; - if (!d) - d = ec->d; - - if (!d || !G || !ec->p || !ec->a) - return NULL; - if (ec->model == MPI_EC_TWISTEDEDWARDS && !ec->b) - return NULL; - - if (ec->dialect == ECC_DIALECT_ED25519 - && (ec->flags & PUBKEY_FLAG_EDDSA)) - { - gcry_mpi_t a; - unsigned char *digest; - - if (_gcry_ecc_eddsa_compute_h_d (&digest, d, ec)) - return NULL; - - a = mpi_snew (0); - _gcry_mpi_set_buffer (a, digest, 32, 0); - xfree (digest); - - /* And finally the public key. */ - if (!Q) - Q = mpi_point_new (0); - if (Q) - _gcry_mpi_ec_mul_point (Q, a, G, ec); - mpi_free (a); - } - else - { - if (!Q) - Q = mpi_point_new (0); - if (Q) - _gcry_mpi_ec_mul_point (Q, d, G, ec); - } - - return Q; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc.c b/src/hos_libhttpserver/src/libgcrypt/cipher/ecc.c deleted file mode 100644 index 885ff096..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/ecc.c +++ /dev/null @@ -1,1759 +0,0 @@ -/* ecc.c - Elliptic Curve Cryptography - * Copyright (C) 2007, 2008, 2010, 2011 Free Software Foundation, Inc. - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -/* This code is originally based on the Patch 0.1.6 for the gnupg - 1.4.x branch as retrieved on 2007-03-21 from - http://www.calcurco.cat/eccGnuPG/src/gnupg-1.4.6-ecc0.2.0beta1.diff.bz2 - The original authors are: - Written by - Sergi Blanch i Torne , - Ramiro Moreno Chiral - Maintainers - Sergi Blanch i Torne - Ramiro Moreno Chiral - Mikael Mylnikov (mmr) - For use in Libgcrypt the code has been heavily modified and cleaned - up. In fact there is not much left of the orginally code except for - some variable names and the text book implementaion of the sign and - verification algorithms. The arithmetic functions have entirely - been rewritten and moved to mpi/ec.c. - - ECDH encrypt and decrypt code written by Andrey Jivsov. -*/ - - -/* TODO: - - - In mpi/ec.c we use mpi_powm for x^2 mod p: Either implement a - special case in mpi_powm or check whether mpi_mulm is faster. - -*/ - - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "context.h" -#include "ec-context.h" -#include "pubkey-internal.h" -#include "ecc-common.h" - - -static const char *ecc_names[] = - { - "ecc", - "ecdsa", - "ecdh", - "eddsa", - "gost", - NULL, - }; - - -/* Registered progress function and its callback value. */ -static void (*progress_cb) (void *, const char*, int, int, int); -static void *progress_cb_data; - - - -/* Local prototypes. */ -static void test_keys (ECC_secret_key * sk, unsigned int nbits); -static unsigned int ecc_get_nbits (gcry_sexp_t parms); - - - - -void -_gcry_register_pk_ecc_progress (void (*cb) (void *, const char *, - int, int, int), - void *cb_data) -{ - progress_cb = cb; - progress_cb_data = cb_data; -} - -/* static void */ -/* progress (int c) */ -/* { */ -/* if (progress_cb) */ -/* progress_cb (progress_cb_data, "pk_ecc", c, 0, 0); */ -/* } */ - - - -/* Standard version of the key generation. */ -static gpg_err_code_t -nist_generate_key (ECC_secret_key *sk, elliptic_curve_t *E, mpi_ec_t ctx, - gcry_random_level_t random_level, unsigned int nbits) -{ - mpi_point_struct Q; - - point_init (&Q); - - /* Generate a secret. */ - if (ctx->dialect == ECC_DIALECT_ED25519) - { - char *rndbuf; - - sk->d = mpi_snew (256); - rndbuf = _gcry_random_bytes_secure (32, random_level); - rndbuf[0] &= 0x7f; /* Clear bit 255. */ - rndbuf[0] |= 0x40; /* Set bit 254. */ - rndbuf[31] &= 0xf8; /* Clear bits 2..0 so that d mod 8 == 0 */ - _gcry_mpi_set_buffer (sk->d, rndbuf, 32, 0); - xfree (rndbuf); - } - else - sk->d = _gcry_dsa_gen_k (E->n, random_level); - - - /* Compute Q. */ - _gcry_mpi_ec_mul_point (&Q, sk->d, &E->G, ctx); - - /* Copy the stuff to the key structures. */ - sk->E.model = E->model; - sk->E.dialect = E->dialect; - sk->E.p = mpi_copy (E->p); - sk->E.a = mpi_copy (E->a); - sk->E.b = mpi_copy (E->b); - point_init (&sk->E.G); - point_set (&sk->E.G, &E->G); - sk->E.n = mpi_copy (E->n); - point_init (&sk->Q); - - /* We want the Q=(x,y) be a "compliant key" in terms of the - * http://tools.ietf.org/html/draft-jivsov-ecc-compact, which simply - * means that we choose either Q=(x,y) or -Q=(x,p-y) such that we - * end up with the min(y,p-y) as the y coordinate. Such a public - * key allows the most efficient compression: y can simply be - * dropped because we know that it's a minimum of the two - * possibilities without any loss of security. Note that we don't - * do that for Ed25519 so that we do not violate the special - * construction of the secret key. */ - if (E->dialect == ECC_DIALECT_ED25519) - point_set (&sk->Q, &Q); - else - { - gcry_mpi_t x, y, negative; - const unsigned int pbits = mpi_get_nbits (E->p); - - x = mpi_new (pbits); - y = mpi_new (pbits); - negative = mpi_new (pbits); - - if (_gcry_mpi_ec_get_affine (x, y, &Q, ctx)) - log_fatal ("ecgen: Failed to get affine coordinates for %s\n", "Q"); - - if (E->model == MPI_EC_WEIERSTRASS) - mpi_sub (negative, E->p, y); /* negative = p - y */ - else - mpi_sub (negative, E->p, x); /* negative = p - x */ - - if (mpi_cmp (negative, y) < 0) /* p - y < p */ - { - /* We need to end up with -Q; this assures that new Q's y is - the smallest one */ - mpi_sub (sk->d, E->n, sk->d); /* d = order - d */ - if (E->model == MPI_EC_WEIERSTRASS) - mpi_point_snatch_set (&sk->Q, x, negative, - mpi_alloc_set_ui (1)); - else - mpi_point_snatch_set (&sk->Q, negative, y, mpi_alloc_set_ui (1)); - - if (DBG_CIPHER) - log_debug ("ecgen converted Q to a compliant point\n"); - } - else /* p - y >= p */ - { - /* No change is needed exactly 50% of the time: just copy. */ - point_set (&sk->Q, &Q); - if (DBG_CIPHER) - log_debug ("ecgen didn't need to convert Q to a compliant point\n"); - - mpi_free (negative); - if (E->model == MPI_EC_WEIERSTRASS) - mpi_free (x); - else - mpi_free (y); - } - - if (E->model == MPI_EC_WEIERSTRASS) - mpi_free (y); - else - mpi_free (x); - } - - point_free (&Q); - /* Now we can test our keys (this should never fail!). */ - test_keys (sk, nbits - 64); - - return 0; -} - - -/* - * To verify correct skey it use a random information. - * First, encrypt and decrypt this dummy value, - * test if the information is recuperated. - * Second, test with the sign and verify functions. - */ -static void -test_keys (ECC_secret_key *sk, unsigned int nbits) -{ - ECC_public_key pk; - gcry_mpi_t test = mpi_new (nbits); - mpi_point_struct R_; - gcry_mpi_t c = mpi_new (nbits); - gcry_mpi_t out = mpi_new (nbits); - gcry_mpi_t r = mpi_new (nbits); - gcry_mpi_t s = mpi_new (nbits); - - if (DBG_CIPHER) - log_debug ("Testing key.\n"); - - point_init (&R_); - - pk.E = _gcry_ecc_curve_copy (sk->E); - point_init (&pk.Q); - point_set (&pk.Q, &sk->Q); - - _gcry_mpi_randomize (test, nbits, GCRY_WEAK_RANDOM); - - if (_gcry_ecc_ecdsa_sign (test, sk, r, s, 0, 0) ) - log_fatal ("ECDSA operation: sign failed\n"); - - if (_gcry_ecc_ecdsa_verify (test, &pk, r, s)) - { - log_fatal ("ECDSA operation: sign, verify failed\n"); - } - - if (DBG_CIPHER) - log_debug ("ECDSA operation: sign, verify ok.\n"); - - point_free (&pk.Q); - _gcry_ecc_curve_free (&pk.E); - - point_free (&R_); - mpi_free (s); - mpi_free (r); - mpi_free (out); - mpi_free (c); - mpi_free (test); -} - - -/* - * To check the validity of the value, recalculate the correspondence - * between the public value and the secret one. - */ -static int -check_secret_key (ECC_secret_key *sk, mpi_ec_t ec, int flags) -{ - int rc = 1; - mpi_point_struct Q; - gcry_mpi_t x1, y1; - gcry_mpi_t x2 = NULL; - gcry_mpi_t y2 = NULL; - - point_init (&Q); - x1 = mpi_new (0); - y1 = mpi_new (0); - - /* G in E(F_p) */ - if (!_gcry_mpi_ec_curve_point (&sk->E.G, ec)) - { - if (DBG_CIPHER) - log_debug ("Bad check: Point 'G' does not belong to curve 'E'!\n"); - goto leave; - } - - /* G != PaI */ - if (!mpi_cmp_ui (sk->E.G.z, 0)) - { - if (DBG_CIPHER) - log_debug ("Bad check: 'G' cannot be Point at Infinity!\n"); - goto leave; - } - - /* Check order of curve. */ - if (sk->E.dialect != ECC_DIALECT_ED25519) - { - _gcry_mpi_ec_mul_point (&Q, sk->E.n, &sk->E.G, ec); - if (mpi_cmp_ui (Q.z, 0)) - { - if (DBG_CIPHER) - log_debug ("check_secret_key: E is not a curve of order n\n"); - goto leave; - } - } - - /* Pubkey cannot be PaI */ - if (!mpi_cmp_ui (sk->Q.z, 0)) - { - if (DBG_CIPHER) - log_debug ("Bad check: Q can not be a Point at Infinity!\n"); - goto leave; - } - - /* pubkey = [d]G over E */ - if (!_gcry_ecc_compute_public (&Q, ec, &sk->E.G, sk->d)) - { - if (DBG_CIPHER) - log_debug ("Bad check: computation of dG failed\n"); - goto leave; - } - if (_gcry_mpi_ec_get_affine (x1, y1, &Q, ec)) - { - if (DBG_CIPHER) - log_debug ("Bad check: Q can not be a Point at Infinity!\n"); - goto leave; - } - - if ((flags & PUBKEY_FLAG_EDDSA)) - ; /* Fixme: EdDSA is special. */ - else if (!mpi_cmp_ui (sk->Q.z, 1)) - { - /* Fast path if Q is already in affine coordinates. */ - if (mpi_cmp (x1, sk->Q.x) || mpi_cmp (y1, sk->Q.y)) - { - if (DBG_CIPHER) - log_debug - ("Bad check: There is NO correspondence between 'd' and 'Q'!\n"); - goto leave; - } - } - else - { - x2 = mpi_new (0); - y2 = mpi_new (0); - if (_gcry_mpi_ec_get_affine (x2, y2, &sk->Q, ec)) - { - if (DBG_CIPHER) - log_debug ("Bad check: Q can not be a Point at Infinity!\n"); - goto leave; - } - - if (mpi_cmp (x1, x2) || mpi_cmp (y1, y2)) - { - if (DBG_CIPHER) - log_debug - ("Bad check: There is NO correspondence between 'd' and 'Q'!\n"); - goto leave; - } - } - rc = 0; /* Okay. */ - - leave: - mpi_free (x2); - mpi_free (x1); - mpi_free (y1); - mpi_free (y2); - point_free (&Q); - return rc; -} - - - -/********************************************* - ************** interface ****************** - *********************************************/ - -static gcry_err_code_t -ecc_generate (const gcry_sexp_t genparms, gcry_sexp_t *r_skey) -{ - gpg_err_code_t rc; - unsigned int nbits; - elliptic_curve_t E; - ECC_secret_key sk; - gcry_mpi_t x = NULL; - gcry_mpi_t y = NULL; - char *curve_name = NULL; - gcry_sexp_t l1; - gcry_random_level_t random_level; - mpi_ec_t ctx = NULL; - gcry_sexp_t curve_info = NULL; - gcry_sexp_t curve_flags = NULL; - gcry_mpi_t base = NULL; - gcry_mpi_t public = NULL; - gcry_mpi_t secret = NULL; - int flags = 0; - - memset (&E, 0, sizeof E); - memset (&sk, 0, sizeof sk); - - rc = _gcry_pk_util_get_nbits (genparms, &nbits); - if (rc) - return rc; - - /* Parse the optional "curve" parameter. */ - l1 = sexp_find_token (genparms, "curve", 0); - if (l1) - { - curve_name = _gcry_sexp_nth_string (l1, 1); - sexp_release (l1); - if (!curve_name) - return GPG_ERR_INV_OBJ; /* No curve name or value too large. */ - } - - /* Parse the optional flags list. */ - l1 = sexp_find_token (genparms, "flags", 0); - if (l1) - { - rc = _gcry_pk_util_parse_flaglist (l1, &flags, NULL); - sexp_release (l1); - if (rc) - goto leave; - } - - /* Parse the deprecated optional transient-key flag. */ - l1 = sexp_find_token (genparms, "transient-key", 0); - if (l1) - { - flags |= PUBKEY_FLAG_TRANSIENT_KEY; - sexp_release (l1); - } - - /* NBITS is required if no curve name has been given. */ - if (!nbits && !curve_name) - return GPG_ERR_NO_OBJ; /* No NBITS parameter. */ - - rc = _gcry_ecc_fill_in_curve (nbits, curve_name, &E, &nbits); - xfree (curve_name); curve_name = NULL; - if (rc) - goto leave; - - if (DBG_CIPHER) - { - log_debug ("ecgen curve info: %s/%s\n", - _gcry_ecc_model2str (E.model), - _gcry_ecc_dialect2str (E.dialect)); - if (E.name) - log_debug ("ecgen curve used: %s\n", E.name); - log_printmpi ("ecgen curve p", E.p); - log_printmpi ("ecgen curve a", E.a); - log_printmpi ("ecgen curve b", E.b); - log_printmpi ("ecgen curve n", E.n); - log_printpnt ("ecgen curve G", &E.G, NULL); - } - - if ((flags & PUBKEY_FLAG_TRANSIENT_KEY)) - random_level = GCRY_STRONG_RANDOM; - else - random_level = GCRY_VERY_STRONG_RANDOM; - - ctx = _gcry_mpi_ec_p_internal_new (E.model, E.dialect, 0, E.p, E.a, E.b); - x = mpi_new (0); - y = mpi_new (0); - - if ((flags & PUBKEY_FLAG_EDDSA)) - rc = _gcry_ecc_eddsa_genkey (&sk, &E, ctx, random_level); - else - rc = nist_generate_key (&sk, &E, ctx, random_level, nbits); - if (rc) - goto leave; - - /* Copy data to the result. */ - if (_gcry_mpi_ec_get_affine (x, y, &sk.E.G, ctx)) - log_fatal ("ecgen: Failed to get affine coordinates for %s\n", "G"); - base = _gcry_ecc_ec2os (x, y, sk.E.p); - if (sk.E.dialect == ECC_DIALECT_ED25519 && !(flags & PUBKEY_FLAG_NOCOMP)) - { - unsigned char *encpk; - unsigned int encpklen; - - rc = _gcry_ecc_eddsa_encodepoint (&sk.Q, ctx, x, y, - !!(flags & PUBKEY_FLAG_COMP), - &encpk, &encpklen); - if (rc) - return rc; - public = mpi_new (0); - mpi_set_opaque (public, encpk, encpklen*8); - encpk = NULL; - } - else - { - if (_gcry_mpi_ec_get_affine (x, y, &sk.Q, ctx)) - log_fatal ("ecgen: Failed to get affine coordinates for %s\n", "Q"); - public = _gcry_ecc_ec2os (x, y, sk.E.p); - } - secret = sk.d; sk.d = NULL; - if (E.name) - { - rc = sexp_build (&curve_info, NULL, "(curve %s)", E.name); - if (rc) - goto leave; - } - - if ((flags & PUBKEY_FLAG_PARAM) || (flags & PUBKEY_FLAG_EDDSA)) - { - rc = sexp_build - (&curve_flags, NULL, - ((flags & PUBKEY_FLAG_PARAM) && (flags & PUBKEY_FLAG_EDDSA))? - "(flags param eddsa)" : - ((flags & PUBKEY_FLAG_PARAM))? - "(flags param)" : - "(flags eddsa)"); - if (rc) - goto leave; - } - - if ((flags & PUBKEY_FLAG_PARAM) && E.name) - rc = sexp_build (r_skey, NULL, - "(key-data" - " (public-key" - " (ecc%S%S(p%m)(a%m)(b%m)(g%m)(n%m)(q%m)))" - " (private-key" - " (ecc%S%S(p%m)(a%m)(b%m)(g%m)(n%m)(q%m)(d%m)))" - " )", - curve_info, curve_flags, - sk.E.p, sk.E.a, sk.E.b, base, sk.E.n, public, - curve_info, curve_flags, - sk.E.p, sk.E.a, sk.E.b, base, sk.E.n, public, secret); - else - rc = sexp_build (r_skey, NULL, - "(key-data" - " (public-key" - " (ecc%S%S(q%m)))" - " (private-key" - " (ecc%S%S(q%m)(d%m)))" - " )", - curve_info, curve_flags, - public, - curve_info, curve_flags, - public, secret); - if (rc) - goto leave; - - if (DBG_CIPHER) - { - log_printmpi ("ecgen result p", sk.E.p); - log_printmpi ("ecgen result a", sk.E.a); - log_printmpi ("ecgen result b", sk.E.b); - log_printmpi ("ecgen result G", base); - log_printmpi ("ecgen result n", sk.E.n); - log_printmpi ("ecgen result Q", public); - log_printmpi ("ecgen result d", secret); - if ((flags & PUBKEY_FLAG_EDDSA)) - log_debug ("ecgen result using Ed25519+EdDSA\n"); - } - - leave: - mpi_free (secret); - mpi_free (public); - mpi_free (base); - { - _gcry_ecc_curve_free (&sk.E); - point_free (&sk.Q); - mpi_free (sk.d); - } - _gcry_ecc_curve_free (&E); - mpi_free (x); - mpi_free (y); - _gcry_mpi_ec_free (ctx); - sexp_release (curve_flags); - sexp_release (curve_info); - return rc; -} - - -static gcry_err_code_t -ecc_check_secret_key (gcry_sexp_t keyparms) -{ - gcry_err_code_t rc; - gcry_sexp_t l1 = NULL; - int flags = 0; - char *curvename = NULL; - gcry_mpi_t mpi_g = NULL; - gcry_mpi_t mpi_q = NULL; - ECC_secret_key sk; - mpi_ec_t ec = NULL; - - memset (&sk, 0, sizeof sk); - - /* Look for flags. */ - l1 = sexp_find_token (keyparms, "flags", 0); - if (l1) - { - rc = _gcry_pk_util_parse_flaglist (l1, &flags, NULL); - if (rc) - goto leave; - } - - /* Extract the parameters. */ - if ((flags & PUBKEY_FLAG_PARAM)) - rc = sexp_extract_param (keyparms, NULL, "-p?a?b?g?n?/q?+d", - &sk.E.p, &sk.E.a, &sk.E.b, &mpi_g, &sk.E.n, - &mpi_q, &sk.d, NULL); - else - rc = sexp_extract_param (keyparms, NULL, "/q?+d", - &mpi_q, &sk.d, NULL); - if (rc) - goto leave; - - /* Add missing parameters using the optional curve parameter. */ - sexp_release (l1); - l1 = sexp_find_token (keyparms, "curve", 5); - if (l1) - { - curvename = sexp_nth_string (l1, 1); - if (curvename) - { - rc = _gcry_ecc_update_curve_param (curvename, - &sk.E.model, &sk.E.dialect, - &sk.E.p, &sk.E.a, &sk.E.b, - &mpi_g, &sk.E.n); - if (rc) - return rc; - } - } - if (mpi_g) - { - point_init (&sk.E.G); - rc = _gcry_ecc_os2ec (&sk.E.G, mpi_g); - if (rc) - goto leave; - } - - /* Guess required fields if a curve parameter has not been given. - FIXME: This is a crude hacks. We need to fix that. */ - if (!curvename) - { - sk.E.model = ((flags & PUBKEY_FLAG_EDDSA) - ? MPI_EC_TWISTEDEDWARDS - : MPI_EC_WEIERSTRASS); - sk.E.dialect = ((flags & PUBKEY_FLAG_EDDSA) - ? ECC_DIALECT_ED25519 - : ECC_DIALECT_STANDARD); - } - if (DBG_CIPHER) - { - log_debug ("ecc_testkey inf: %s/%s\n", - _gcry_ecc_model2str (sk.E.model), - _gcry_ecc_dialect2str (sk.E.dialect)); - if (sk.E.name) - log_debug ("ecc_testkey nam: %s\n", sk.E.name); - log_printmpi ("ecc_testkey p", sk.E.p); - log_printmpi ("ecc_testkey a", sk.E.a); - log_printmpi ("ecc_testkey b", sk.E.b); - log_printpnt ("ecc_testkey g", &sk.E.G, NULL); - log_printmpi ("ecc_testkey n", sk.E.n); - log_printmpi ("ecc_testkey q", mpi_q); - if (!fips_mode ()) - log_printmpi ("ecc_testkey d", sk.d); - } - if (!sk.E.p || !sk.E.a || !sk.E.b || !sk.E.G.x || !sk.E.n || !sk.d) - { - rc = GPG_ERR_NO_OBJ; - goto leave; - } - - ec = _gcry_mpi_ec_p_internal_new (sk.E.model, sk.E.dialect, 0, - sk.E.p, sk.E.a, sk.E.b); - - if (mpi_q) - { - point_init (&sk.Q); - if (ec->dialect == ECC_DIALECT_ED25519) - rc = _gcry_ecc_eddsa_decodepoint (mpi_q, ec, &sk.Q, NULL, NULL); - else - rc = _gcry_ecc_os2ec (&sk.Q, mpi_q); - if (rc) - goto leave; - } - else - { - /* The secret key test requires Q. */ - rc = GPG_ERR_NO_OBJ; - goto leave; - } - - if (check_secret_key (&sk, ec, flags)) - rc = GPG_ERR_BAD_SECKEY; - - leave: - _gcry_mpi_ec_free (ec); - _gcry_mpi_release (sk.E.p); - _gcry_mpi_release (sk.E.a); - _gcry_mpi_release (sk.E.b); - _gcry_mpi_release (mpi_g); - point_free (&sk.E.G); - _gcry_mpi_release (sk.E.n); - _gcry_mpi_release (mpi_q); - point_free (&sk.Q); - _gcry_mpi_release (sk.d); - xfree (curvename); - sexp_release (l1); - if (DBG_CIPHER) - log_debug ("ecc_testkey => %s\n", gpg_strerror (rc)); - return rc; -} - - -static gcry_err_code_t -ecc_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_data, gcry_sexp_t keyparms) -{ - gcry_err_code_t rc; - struct pk_encoding_ctx ctx; - gcry_mpi_t data = NULL; - gcry_sexp_t l1 = NULL; - char *curvename = NULL; - gcry_mpi_t mpi_g = NULL; - gcry_mpi_t mpi_q = NULL; - ECC_secret_key sk; - gcry_mpi_t sig_r = NULL; - gcry_mpi_t sig_s = NULL; - - memset (&sk, 0, sizeof sk); - - _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_SIGN, 0); - - /* Extract the data. */ - rc = _gcry_pk_util_data_to_mpi (s_data, &data, &ctx); - if (rc) - goto leave; - if (DBG_CIPHER) - log_mpidump ("ecc_sign data", data); - - /* - * Extract the key. - */ - if ((ctx.flags & PUBKEY_FLAG_PARAM)) - rc = sexp_extract_param (keyparms, NULL, "-p?a?b?g?n?/q?+d", - &sk.E.p, &sk.E.a, &sk.E.b, &mpi_g, &sk.E.n, - &mpi_q, &sk.d, NULL); - else - rc = sexp_extract_param (keyparms, NULL, "/q?+d", - &mpi_q, &sk.d, NULL); - if (rc) - goto leave; - if (mpi_g) - { - point_init (&sk.E.G); - rc = _gcry_ecc_os2ec (&sk.E.G, mpi_g); - if (rc) - goto leave; - } - /* Add missing parameters using the optional curve parameter. */ - sexp_release (l1); - l1 = sexp_find_token (keyparms, "curve", 5); - if (l1) - { - curvename = sexp_nth_string (l1, 1); - if (curvename) - { - rc = _gcry_ecc_fill_in_curve (0, curvename, &sk.E, NULL); - if (rc) - return rc; - } - } - /* Guess required fields if a curve parameter has not been given. - FIXME: This is a crude hacks. We need to fix that. */ - if (!curvename) - { - sk.E.model = ((ctx.flags & PUBKEY_FLAG_EDDSA) - ? MPI_EC_TWISTEDEDWARDS - : MPI_EC_WEIERSTRASS); - sk.E.dialect = ((ctx.flags & PUBKEY_FLAG_EDDSA) - ? ECC_DIALECT_ED25519 - : ECC_DIALECT_STANDARD); - } - if (DBG_CIPHER) - { - log_debug ("ecc_sign info: %s/%s%s\n", - _gcry_ecc_model2str (sk.E.model), - _gcry_ecc_dialect2str (sk.E.dialect), - (ctx.flags & PUBKEY_FLAG_EDDSA)? "+EdDSA":""); - if (sk.E.name) - log_debug ("ecc_sign name: %s\n", sk.E.name); - log_printmpi ("ecc_sign p", sk.E.p); - log_printmpi ("ecc_sign a", sk.E.a); - log_printmpi ("ecc_sign b", sk.E.b); - log_printpnt ("ecc_sign g", &sk.E.G, NULL); - log_printmpi ("ecc_sign n", sk.E.n); - log_printmpi ("ecc_sign q", mpi_q); - if (!fips_mode ()) - log_printmpi ("ecc_sign d", sk.d); - } - if (!sk.E.p || !sk.E.a || !sk.E.b || !sk.E.G.x || !sk.E.n || !sk.d) - { - rc = GPG_ERR_NO_OBJ; - goto leave; - } - - - sig_r = mpi_new (0); - sig_s = mpi_new (0); - if ((ctx.flags & PUBKEY_FLAG_EDDSA)) - { - /* EdDSA requires the public key. */ - rc = _gcry_ecc_eddsa_sign (data, &sk, sig_r, sig_s, ctx.hash_algo, mpi_q); - if (!rc) - rc = sexp_build (r_sig, NULL, - "(sig-val(eddsa(r%M)(s%M)))", sig_r, sig_s); - } - else if ((ctx.flags & PUBKEY_FLAG_GOST)) - { - rc = _gcry_ecc_gost_sign (data, &sk, sig_r, sig_s); - if (!rc) - rc = sexp_build (r_sig, NULL, - "(sig-val(gost(r%M)(s%M)))", sig_r, sig_s); - } - else - { - rc = _gcry_ecc_ecdsa_sign (data, &sk, sig_r, sig_s, - ctx.flags, ctx.hash_algo); - if (!rc) - rc = sexp_build (r_sig, NULL, - "(sig-val(ecdsa(r%M)(s%M)))", sig_r, sig_s); - } - - - leave: - _gcry_mpi_release (sk.E.p); - _gcry_mpi_release (sk.E.a); - _gcry_mpi_release (sk.E.b); - _gcry_mpi_release (mpi_g); - point_free (&sk.E.G); - _gcry_mpi_release (sk.E.n); - _gcry_mpi_release (mpi_q); - point_free (&sk.Q); - _gcry_mpi_release (sk.d); - _gcry_mpi_release (sig_r); - _gcry_mpi_release (sig_s); - xfree (curvename); - _gcry_mpi_release (data); - sexp_release (l1); - _gcry_pk_util_free_encoding_ctx (&ctx); - if (DBG_CIPHER) - log_debug ("ecc_sign => %s\n", gpg_strerror (rc)); - return rc; -} - - -static gcry_err_code_t -ecc_verify (gcry_sexp_t s_sig, gcry_sexp_t s_data, gcry_sexp_t s_keyparms) -{ - gcry_err_code_t rc; - struct pk_encoding_ctx ctx; - gcry_sexp_t l1 = NULL; - char *curvename = NULL; - gcry_mpi_t mpi_g = NULL; - gcry_mpi_t mpi_q = NULL; - gcry_mpi_t sig_r = NULL; - gcry_mpi_t sig_s = NULL; - gcry_mpi_t data = NULL; - ECC_public_key pk; - int sigflags; - - memset (&pk, 0, sizeof pk); - _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_VERIFY, - ecc_get_nbits (s_keyparms)); - - /* Extract the data. */ - rc = _gcry_pk_util_data_to_mpi (s_data, &data, &ctx); - if (rc) - goto leave; - if (DBG_CIPHER) - log_mpidump ("ecc_verify data", data); - - /* - * Extract the signature value. - */ - rc = _gcry_pk_util_preparse_sigval (s_sig, ecc_names, &l1, &sigflags); - if (rc) - goto leave; - rc = sexp_extract_param (l1, NULL, (sigflags & PUBKEY_FLAG_EDDSA)? "/rs":"rs", - &sig_r, &sig_s, NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_mpidump ("ecc_verify s_r", sig_r); - log_mpidump ("ecc_verify s_s", sig_s); - } - if ((ctx.flags & PUBKEY_FLAG_EDDSA) ^ (sigflags & PUBKEY_FLAG_EDDSA)) - { - rc = GPG_ERR_CONFLICT; /* Inconsistent use of flag/algoname. */ - goto leave; - } - - - /* - * Extract the key. - */ - if ((ctx.flags & PUBKEY_FLAG_PARAM)) - rc = sexp_extract_param (s_keyparms, NULL, "-p?a?b?g?n?/q", - &pk.E.p, &pk.E.a, &pk.E.b, &mpi_g, &pk.E.n, - &mpi_q, NULL); - else - rc = sexp_extract_param (s_keyparms, NULL, "/q", - &mpi_q, NULL); - if (rc) - goto leave; - if (mpi_g) - { - point_init (&pk.E.G); - rc = _gcry_ecc_os2ec (&pk.E.G, mpi_g); - if (rc) - goto leave; - } - /* Add missing parameters using the optional curve parameter. */ - sexp_release (l1); - l1 = sexp_find_token (s_keyparms, "curve", 5); - if (l1) - { - curvename = sexp_nth_string (l1, 1); - if (curvename) - { - rc = _gcry_ecc_fill_in_curve (0, curvename, &pk.E, NULL); - if (rc) - return rc; - } - } - /* Guess required fields if a curve parameter has not been given. - FIXME: This is a crude hacks. We need to fix that. */ - if (!curvename) - { - pk.E.model = ((sigflags & PUBKEY_FLAG_EDDSA) - ? MPI_EC_TWISTEDEDWARDS - : MPI_EC_WEIERSTRASS); - pk.E.dialect = ((sigflags & PUBKEY_FLAG_EDDSA) - ? ECC_DIALECT_ED25519 - : ECC_DIALECT_STANDARD); - } - - if (DBG_CIPHER) - { - log_debug ("ecc_verify info: %s/%s%s\n", - _gcry_ecc_model2str (pk.E.model), - _gcry_ecc_dialect2str (pk.E.dialect), - (sigflags & PUBKEY_FLAG_EDDSA)? "+EdDSA":""); - if (pk.E.name) - log_debug ("ecc_verify name: %s\n", pk.E.name); - log_printmpi ("ecc_verify p", pk.E.p); - log_printmpi ("ecc_verify a", pk.E.a); - log_printmpi ("ecc_verify b", pk.E.b); - log_printpnt ("ecc_verify g", &pk.E.G, NULL); - log_printmpi ("ecc_verify n", pk.E.n); - log_printmpi ("ecc_verify q", mpi_q); - } - if (!pk.E.p || !pk.E.a || !pk.E.b || !pk.E.G.x || !pk.E.n || !mpi_q) - { - rc = GPG_ERR_NO_OBJ; - goto leave; - } - - - /* - * Verify the signature. - */ - if ((sigflags & PUBKEY_FLAG_EDDSA)) - { - rc = _gcry_ecc_eddsa_verify (data, &pk, sig_r, sig_s, - ctx.hash_algo, mpi_q); - } - else if ((sigflags & PUBKEY_FLAG_GOST)) - { - point_init (&pk.Q); - rc = _gcry_ecc_os2ec (&pk.Q, mpi_q); - if (rc) - goto leave; - - rc = _gcry_ecc_gost_verify (data, &pk, sig_r, sig_s); - } - else - { - point_init (&pk.Q); - if (pk.E.dialect == ECC_DIALECT_ED25519) - { - mpi_ec_t ec; - - /* Fixme: Factor the curve context setup out of eddsa_verify - and ecdsa_verify. So that we don't do it twice. */ - ec = _gcry_mpi_ec_p_internal_new (pk.E.model, pk.E.dialect, 0, - pk.E.p, pk.E.a, pk.E.b); - - rc = _gcry_ecc_eddsa_decodepoint (mpi_q, ec, &pk.Q, NULL, NULL); - _gcry_mpi_ec_free (ec); - } - else - { - rc = _gcry_ecc_os2ec (&pk.Q, mpi_q); - } - if (rc) - goto leave; - - if (mpi_is_opaque (data)) - { - const void *abuf; - unsigned int abits, qbits; - gcry_mpi_t a; - - qbits = mpi_get_nbits (pk.E.n); - - abuf = mpi_get_opaque (data, &abits); - rc = _gcry_mpi_scan (&a, GCRYMPI_FMT_USG, abuf, (abits+7)/8, NULL); - if (!rc) - { - if (abits > qbits) - mpi_rshift (a, a, abits - qbits); - - rc = _gcry_ecc_ecdsa_verify (a, &pk, sig_r, sig_s); - _gcry_mpi_release (a); - } - } - else - rc = _gcry_ecc_ecdsa_verify (data, &pk, sig_r, sig_s); - } - - leave: - _gcry_mpi_release (pk.E.p); - _gcry_mpi_release (pk.E.a); - _gcry_mpi_release (pk.E.b); - _gcry_mpi_release (mpi_g); - point_free (&pk.E.G); - _gcry_mpi_release (pk.E.n); - _gcry_mpi_release (mpi_q); - point_free (&pk.Q); - _gcry_mpi_release (data); - _gcry_mpi_release (sig_r); - _gcry_mpi_release (sig_s); - xfree (curvename); - sexp_release (l1); - _gcry_pk_util_free_encoding_ctx (&ctx); - if (DBG_CIPHER) - log_debug ("ecc_verify => %s\n", rc?gpg_strerror (rc):"Good"); - return rc; -} - - -/* ecdh raw is classic 2-round DH protocol published in 1976. - * - * Overview of ecc_encrypt_raw and ecc_decrypt_raw. - * - * As with any PK operation, encrypt version uses a public key and - * decrypt -- private. - * - * Symbols used below: - * G - field generator point - * d - private long-term scalar - * dG - public long-term key - * k - ephemeral scalar - * kG - ephemeral public key - * dkG - shared secret - * - * ecc_encrypt_raw description: - * input: - * data[0] : private scalar (k) - * output: A new S-expression with the parameters: - * s : shared point (kdG) - * e : generated ephemeral public key (kG) - * - * ecc_decrypt_raw description: - * input: - * data[0] : a point kG (ephemeral public key) - * output: - * result[0] : shared point (kdG) - */ -static gcry_err_code_t -ecc_encrypt_raw (gcry_sexp_t *r_ciph, gcry_sexp_t s_data, gcry_sexp_t keyparms) -{ - gcry_err_code_t rc; - struct pk_encoding_ctx ctx; - gcry_sexp_t l1 = NULL; - char *curvename = NULL; - gcry_mpi_t mpi_g = NULL; - gcry_mpi_t mpi_q = NULL; - gcry_mpi_t mpi_s = NULL; - gcry_mpi_t mpi_e = NULL; - gcry_mpi_t data = NULL; - ECC_public_key pk; - mpi_ec_t ec = NULL; - - memset (&pk, 0, sizeof pk); - _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_ENCRYPT, - ecc_get_nbits (keyparms)); - - /* - * Extract the data. - */ - rc = _gcry_pk_util_data_to_mpi (s_data, &data, &ctx); - if (rc) - goto leave; - if (DBG_CIPHER) - log_mpidump ("ecc_encrypt data", data); - if (mpi_is_opaque (data)) - { - rc = GPG_ERR_INV_DATA; - goto leave; - } - - - /* - * Extract the key. - */ - rc = sexp_extract_param (keyparms, NULL, "-p?a?b?g?n?+q", - &pk.E.p, &pk.E.a, &pk.E.b, &mpi_g, &pk.E.n, - &mpi_q, NULL); - if (rc) - goto leave; - if (mpi_g) - { - point_init (&pk.E.G); - rc = _gcry_ecc_os2ec (&pk.E.G, mpi_g); - if (rc) - goto leave; - } - /* Add missing parameters using the optional curve parameter. */ - sexp_release (l1); - l1 = sexp_find_token (keyparms, "curve", 5); - if (l1) - { - curvename = sexp_nth_string (l1, 1); - if (curvename) - { - rc = _gcry_ecc_fill_in_curve (0, curvename, &pk.E, NULL); - if (rc) - return rc; - } - } - /* Guess required fields if a curve parameter has not been given. */ - if (!curvename) - { - pk.E.model = MPI_EC_WEIERSTRASS; - pk.E.dialect = ECC_DIALECT_STANDARD; - } - - if (DBG_CIPHER) - { - log_debug ("ecc_encrypt info: %s/%s\n", - _gcry_ecc_model2str (pk.E.model), - _gcry_ecc_dialect2str (pk.E.dialect)); - if (pk.E.name) - log_debug ("ecc_encrypt name: %s\n", pk.E.name); - log_printmpi ("ecc_encrypt p", pk.E.p); - log_printmpi ("ecc_encrypt a", pk.E.a); - log_printmpi ("ecc_encrypt b", pk.E.b); - log_printpnt ("ecc_encrypt g", &pk.E.G, NULL); - log_printmpi ("ecc_encrypt n", pk.E.n); - log_printmpi ("ecc_encrypt q", mpi_q); - } - if (!pk.E.p || !pk.E.a || !pk.E.b || !pk.E.G.x || !pk.E.n || !mpi_q) - { - rc = GPG_ERR_NO_OBJ; - goto leave; - } - - /* Convert the public key. */ - if (mpi_q) - { - point_init (&pk.Q); - rc = _gcry_ecc_os2ec (&pk.Q, mpi_q); - if (rc) - goto leave; - } - - /* Compute the encrypted value. */ - ec = _gcry_mpi_ec_p_internal_new (pk.E.model, pk.E.dialect, 0, - pk.E.p, pk.E.a, pk.E.b); - - /* The following is false: assert( mpi_cmp_ui( R.x, 1 )==0 );, so */ - { - mpi_point_struct R; /* Result that we return. */ - gcry_mpi_t x, y; - - x = mpi_new (0); - y = mpi_new (0); - - point_init (&R); - - /* R = kQ <=> R = kdG */ - _gcry_mpi_ec_mul_point (&R, data, &pk.Q, ec); - - if (_gcry_mpi_ec_get_affine (x, y, &R, ec)) - log_fatal ("ecdh: Failed to get affine coordinates for kdG\n"); - mpi_s = _gcry_ecc_ec2os (x, y, pk.E.p); - - /* R = kG */ - _gcry_mpi_ec_mul_point (&R, data, &pk.E.G, ec); - - if (_gcry_mpi_ec_get_affine (x, y, &R, ec)) - log_fatal ("ecdh: Failed to get affine coordinates for kG\n"); - mpi_e = _gcry_ecc_ec2os (x, y, pk.E.p); - - mpi_free (x); - mpi_free (y); - - point_free (&R); - } - - rc = sexp_build (r_ciph, NULL, "(enc-val(ecdh(s%m)(e%m)))", mpi_s, mpi_e); - - leave: - _gcry_mpi_release (pk.E.p); - _gcry_mpi_release (pk.E.a); - _gcry_mpi_release (pk.E.b); - _gcry_mpi_release (mpi_g); - point_free (&pk.E.G); - _gcry_mpi_release (pk.E.n); - _gcry_mpi_release (mpi_q); - point_free (&pk.Q); - _gcry_mpi_release (data); - _gcry_mpi_release (mpi_s); - _gcry_mpi_release (mpi_e); - xfree (curvename); - _gcry_mpi_ec_free (ec); - _gcry_pk_util_free_encoding_ctx (&ctx); - if (DBG_CIPHER) - log_debug ("ecc_encrypt => %s\n", gpg_strerror (rc)); - return rc; -} - - -/* input: - * data[0] : a point kG (ephemeral public key) - * output: - * resaddr[0] : shared point kdG - * - * see ecc_encrypt_raw for details. - */ -static gcry_err_code_t -ecc_decrypt_raw (gcry_sexp_t *r_plain, gcry_sexp_t s_data, gcry_sexp_t keyparms) -{ - gpg_err_code_t rc; - struct pk_encoding_ctx ctx; - gcry_sexp_t l1 = NULL; - gcry_mpi_t data_e = NULL; - ECC_secret_key sk; - gcry_mpi_t mpi_g = NULL; - char *curvename = NULL; - mpi_ec_t ec = NULL; - mpi_point_struct kG; - mpi_point_struct R; - gcry_mpi_t r = NULL; - - memset (&sk, 0, sizeof sk); - point_init (&kG); - point_init (&R); - - _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_DECRYPT, - ecc_get_nbits (keyparms)); - - /* - * Extract the data. - */ - rc = _gcry_pk_util_preparse_encval (s_data, ecc_names, &l1, &ctx); - if (rc) - goto leave; - rc = sexp_extract_param (l1, NULL, "e", &data_e, NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - log_printmpi ("ecc_decrypt d_e", data_e); - if (mpi_is_opaque (data_e)) - { - rc = GPG_ERR_INV_DATA; - goto leave; - } - - /* - * Extract the key. - */ - rc = sexp_extract_param (keyparms, NULL, "-p?a?b?g?n?+d", - &sk.E.p, &sk.E.a, &sk.E.b, &mpi_g, &sk.E.n, - &sk.d, NULL); - if (rc) - goto leave; - if (mpi_g) - { - point_init (&sk.E.G); - rc = _gcry_ecc_os2ec (&sk.E.G, mpi_g); - if (rc) - goto leave; - } - /* Add missing parameters using the optional curve parameter. */ - sexp_release (l1); - l1 = sexp_find_token (keyparms, "curve", 5); - if (l1) - { - curvename = sexp_nth_string (l1, 1); - if (curvename) - { - rc = _gcry_ecc_fill_in_curve (0, curvename, &sk.E, NULL); - if (rc) - return rc; - } - } - /* Guess required fields if a curve parameter has not been given. */ - if (!curvename) - { - sk.E.model = MPI_EC_WEIERSTRASS; - sk.E.dialect = ECC_DIALECT_STANDARD; - } - if (DBG_CIPHER) - { - log_debug ("ecc_decrypt info: %s/%s\n", - _gcry_ecc_model2str (sk.E.model), - _gcry_ecc_dialect2str (sk.E.dialect)); - if (sk.E.name) - log_debug ("ecc_decrypt name: %s\n", sk.E.name); - log_printmpi ("ecc_decrypt p", sk.E.p); - log_printmpi ("ecc_decrypt a", sk.E.a); - log_printmpi ("ecc_decrypt b", sk.E.b); - log_printpnt ("ecc_decrypt g", &sk.E.G, NULL); - log_printmpi ("ecc_decrypt n", sk.E.n); - if (!fips_mode ()) - log_printmpi ("ecc_decrypt d", sk.d); - } - if (!sk.E.p || !sk.E.a || !sk.E.b || !sk.E.G.x || !sk.E.n || !sk.d) - { - rc = GPG_ERR_NO_OBJ; - goto leave; - } - - - /* - * Compute the plaintext. - */ - rc = _gcry_ecc_os2ec (&kG, data_e); - if (rc) - { - point_free (&kG); - return rc; - } - - ec = _gcry_mpi_ec_p_internal_new (sk.E.model, sk.E.dialect, 0, - sk.E.p, sk.E.a, sk.E.b); - - /* R = dkG */ - _gcry_mpi_ec_mul_point (&R, sk.d, &kG, ec); - - /* The following is false: assert( mpi_cmp_ui( R.x, 1 )==0 );, so: */ - { - gcry_mpi_t x, y; - - x = mpi_new (0); - y = mpi_new (0); - - if (_gcry_mpi_ec_get_affine (x, y, &R, ec)) - log_fatal ("ecdh: Failed to get affine coordinates\n"); - - r = _gcry_ecc_ec2os (x, y, sk.E.p); - if (!r) - rc = gpg_err_code_from_syserror (); - else - rc = 0; - mpi_free (x); - mpi_free (y); - } - if (DBG_CIPHER) - log_printmpi ("ecc_decrypt res", r); - - if (!rc) - rc = sexp_build (r_plain, NULL, "(value %m)", r); - - leave: - point_free (&R); - point_free (&kG); - _gcry_mpi_release (r); - _gcry_mpi_release (sk.E.p); - _gcry_mpi_release (sk.E.a); - _gcry_mpi_release (sk.E.b); - _gcry_mpi_release (mpi_g); - point_free (&sk.E.G); - _gcry_mpi_release (sk.E.n); - _gcry_mpi_release (sk.d); - _gcry_mpi_release (data_e); - xfree (curvename); - sexp_release (l1); - _gcry_mpi_ec_free (ec); - _gcry_pk_util_free_encoding_ctx (&ctx); - if (DBG_CIPHER) - log_debug ("ecc_decrypt => %s\n", gpg_strerror (rc)); - return rc; -} - - -/* Return the number of bits for the key described by PARMS. On error - * 0 is returned. The format of PARMS starts with the algorithm name; - * for example: - * - * (ecc - * (p ) - * (a ) - * (b ) - * (g ) - * (n ) - * (q )) - * - * More parameters may be given currently P is needed. FIXME: We - * need allow for a "curve" parameter. - */ -static unsigned int -ecc_get_nbits (gcry_sexp_t parms) -{ - gcry_sexp_t l1; - gcry_mpi_t p; - unsigned int nbits = 0; - char *curve; - - l1 = sexp_find_token (parms, "p", 1); - if (!l1) - { /* Parameter P not found - check whether we have "curve". */ - l1 = sexp_find_token (parms, "curve", 5); - if (!l1) - return 0; /* Neither P nor CURVE found. */ - - curve = sexp_nth_string (l1, 1); - sexp_release (l1); - if (!curve) - return 0; /* No curve name given (or out of core). */ - - if (_gcry_ecc_fill_in_curve (0, curve, NULL, &nbits)) - nbits = 0; - xfree (curve); - } - else - { - p = sexp_nth_mpi (l1, 1, GCRYMPI_FMT_USG); - sexp_release (l1); - if (p) - { - nbits = mpi_get_nbits (p); - _gcry_mpi_release (p); - } - } - return nbits; -} - - -/* See rsa.c for a description of this function. */ -static gpg_err_code_t -compute_keygrip (gcry_md_hd_t md, gcry_sexp_t keyparms) -{ -#define N_COMPONENTS 6 - static const char names[N_COMPONENTS+1] = "pabgnq"; - gpg_err_code_t rc; - gcry_sexp_t l1; - gcry_mpi_t values[N_COMPONENTS]; - int idx; - char *curvename = NULL; - int flags = 0; - enum gcry_mpi_ec_models model = 0; - enum ecc_dialects dialect = 0; - - /* Clear the values first. */ - for (idx=0; idx < N_COMPONENTS; idx++) - values[idx] = NULL; - - - /* Look for flags. */ - l1 = sexp_find_token (keyparms, "flags", 0); - if (l1) - { - rc = _gcry_pk_util_parse_flaglist (l1, &flags, NULL); - if (rc) - goto leave; - } - - /* Extract the parameters. */ - if ((flags & PUBKEY_FLAG_PARAM)) - { - if ((flags & PUBKEY_FLAG_EDDSA)) - rc = sexp_extract_param (keyparms, NULL, "p?a?b?g?n?/q", - &values[0], &values[1], &values[2], - &values[3], &values[4], &values[5], - NULL); - else - rc = sexp_extract_param (keyparms, NULL, "p?a?b?g?n?q", - &values[0], &values[1], &values[2], - &values[3], &values[4], &values[5], - NULL); - } - else - { - if ((flags & PUBKEY_FLAG_EDDSA)) - rc = sexp_extract_param (keyparms, NULL, "/q", - &values[5], NULL); - else - rc = sexp_extract_param (keyparms, NULL, "q", - &values[5], NULL); - } - if (rc) - goto leave; - - /* Check whether a curve parameter is available and use that to fill - in missing values. */ - sexp_release (l1); - l1 = sexp_find_token (keyparms, "curve", 5); - if (l1) - { - curvename = sexp_nth_string (l1, 1); - if (curvename) - { - rc = _gcry_ecc_update_curve_param (curvename, - &model, &dialect, - &values[0], &values[1], &values[2], - &values[3], &values[4]); - if (rc) - goto leave; - } - } - - /* Guess required fields if a curve parameter has not been given. - FIXME: This is a crude hacks. We need to fix that. */ - if (!curvename) - { - model = ((flags & PUBKEY_FLAG_EDDSA) - ? MPI_EC_TWISTEDEDWARDS - : MPI_EC_WEIERSTRASS); - dialect = ((flags & PUBKEY_FLAG_EDDSA) - ? ECC_DIALECT_ED25519 - : ECC_DIALECT_STANDARD); - } - - /* Check that all parameters are known and normalize all MPIs (that - should not be required but we use an internal function later and - thus we better make 100% sure that they are normalized). */ - for (idx = 0; idx < N_COMPONENTS; idx++) - if (!values[idx]) - { - rc = GPG_ERR_NO_OBJ; - goto leave; - } - else - _gcry_mpi_normalize (values[idx]); - - /* Uncompress the public key with the exception of EdDSA where - compression is the default and we thus compute the keygrip using - the compressed version. Because we don't support any non-eddsa - compression, the only thing we need to do is to compress - EdDSA. */ - if ((flags & PUBKEY_FLAG_EDDSA)) - { - if (dialect == ECC_DIALECT_ED25519) - rc = _gcry_ecc_eddsa_ensure_compact (values[5], 256); - else - rc = GPG_ERR_NOT_IMPLEMENTED; - if (rc) - goto leave; - } - - /* Hash them all. */ - for (idx = 0; idx < N_COMPONENTS; idx++) - { - char buf[30]; - - if (mpi_is_opaque (values[idx])) - { - const unsigned char *raw; - unsigned int n; - - raw = mpi_get_opaque (values[idx], &n); - n = (n + 7)/8; - snprintf (buf, sizeof buf, "(1:%c%u:", names[idx], n); - _gcry_md_write (md, buf, strlen (buf)); - _gcry_md_write (md, raw, n); - _gcry_md_write (md, ")", 1); - } - else - { - unsigned char *rawmpi; - unsigned int rawmpilen; - - rawmpi = _gcry_mpi_get_buffer (values[idx], 0, &rawmpilen, NULL); - if (!rawmpi) - { - rc = gpg_err_code_from_syserror (); - goto leave; - } - snprintf (buf, sizeof buf, "(1:%c%u:", names[idx], rawmpilen); - _gcry_md_write (md, buf, strlen (buf)); - _gcry_md_write (md, rawmpi, rawmpilen); - _gcry_md_write (md, ")", 1); - xfree (rawmpi); - } - } - - leave: - xfree (curvename); - sexp_release (l1); - for (idx = 0; idx < N_COMPONENTS; idx++) - _gcry_mpi_release (values[idx]); - - return rc; -#undef N_COMPONENTS -} - - - -/* - Low-level API helper functions. - */ - -/* This is the worker function for gcry_pubkey_get_sexp for ECC - algorithms. Note that the caller has already stored NULL at - R_SEXP. */ -gpg_err_code_t -_gcry_pk_ecc_get_sexp (gcry_sexp_t *r_sexp, int mode, mpi_ec_t ec) -{ - gpg_err_code_t rc; - gcry_mpi_t mpi_G = NULL; - gcry_mpi_t mpi_Q = NULL; - - if (!ec->p || !ec->a || !ec->b || !ec->G || !ec->n) - return GPG_ERR_BAD_CRYPT_CTX; - - if (mode == GCRY_PK_GET_SECKEY && !ec->d) - return GPG_ERR_NO_SECKEY; - - /* Compute the public point if it is missing. */ - if (!ec->Q && ec->d) - ec->Q = _gcry_ecc_compute_public (NULL, ec, NULL, NULL); - - /* Encode G and Q. */ - mpi_G = _gcry_mpi_ec_ec2os (ec->G, ec); - if (!mpi_G) - { - rc = GPG_ERR_BROKEN_PUBKEY; - goto leave; - } - if (!ec->Q) - { - rc = GPG_ERR_BAD_CRYPT_CTX; - goto leave; - } - - if (ec->dialect == ECC_DIALECT_ED25519) - { - unsigned char *encpk; - unsigned int encpklen; - - rc = _gcry_ecc_eddsa_encodepoint (ec->Q, ec, NULL, NULL, 0, - &encpk, &encpklen); - if (rc) - goto leave; - mpi_Q = mpi_set_opaque (NULL, encpk, encpklen*8); - encpk = NULL; - } - else - { - mpi_Q = _gcry_mpi_ec_ec2os (ec->Q, ec); - } - if (!mpi_Q) - { - rc = GPG_ERR_BROKEN_PUBKEY; - goto leave; - } - - /* Fixme: We should return a curve name instead of the parameters if - if know that they match a curve. */ - - if (ec->d && (!mode || mode == GCRY_PK_GET_SECKEY)) - { - /* Let's return a private key. */ - rc = sexp_build (r_sexp, NULL, - "(private-key(ecc(p%m)(a%m)(b%m)(g%m)(n%m)(q%m)(d%m)))", - ec->p, ec->a, ec->b, mpi_G, ec->n, mpi_Q, ec->d); - } - else if (ec->Q) - { - /* Let's return a public key. */ - rc = sexp_build (r_sexp, NULL, - "(public-key(ecc(p%m)(a%m)(b%m)(g%m)(n%m)(q%m)))", - ec->p, ec->a, ec->b, mpi_G, ec->n, mpi_Q); - } - else - rc = GPG_ERR_BAD_CRYPT_CTX; - - leave: - mpi_free (mpi_Q); - mpi_free (mpi_G); - return rc; -} - - - -/* - Self-test section. - */ - - -static gpg_err_code_t -selftests_ecdsa (selftest_report_func_t report) -{ - const char *what; - const char *errtxt; - - what = "low-level"; - errtxt = NULL; /*selftest ();*/ - if (errtxt) - goto failed; - - /* FIXME: need more tests. */ - - return 0; /* Succeeded. */ - - failed: - if (report) - report ("pubkey", GCRY_PK_ECC, what, errtxt); - return GPG_ERR_SELFTEST_FAILED; -} - - -/* Run a full self-test for ALGO and return 0 on success. */ -static gpg_err_code_t -run_selftests (int algo, int extended, selftest_report_func_t report) -{ - (void)extended; - - if (algo != GCRY_PK_ECC) - return GPG_ERR_PUBKEY_ALGO; - - return selftests_ecdsa (report); -} - - - - -gcry_pk_spec_t _gcry_pubkey_spec_ecc = - { - GCRY_PK_ECC, { 0, 0 }, - (GCRY_PK_USAGE_SIGN | GCRY_PK_USAGE_ENCR), - "ECC", ecc_names, - "pabgnq", "pabgnqd", "sw", "rs", "pabgnq", - ecc_generate, - ecc_check_secret_key, - ecc_encrypt_raw, - ecc_decrypt_raw, - ecc_sign, - ecc_verify, - ecc_get_nbits, - run_selftests, - compute_keygrip, - _gcry_ecc_get_curve, - _gcry_ecc_get_param_sexp - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/elgamal.c b/src/hos_libhttpserver/src/libgcrypt/cipher/elgamal.c deleted file mode 100644 index 4eb52d62..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/elgamal.c +++ /dev/null @@ -1,1149 +0,0 @@ -/* Elgamal.c - Elgamal Public Key encryption - * Copyright (C) 1998, 2000, 2001, 2002, 2003, - * 2008 Free Software Foundation, Inc. - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - * - * For a description of the algorithm, see: - * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. - * ISBN 0-471-11709-9. Pages 476 ff. - */ - -#include -#include -#include -#include -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "pubkey-internal.h" - - -/* Blinding is used to mitigate side-channel attacks. You may undef - this to speed up the operation in case the system is secured - against physical and network mounted side-channel attacks. */ -#define USE_BLINDING 1 - - -typedef struct -{ - gcry_mpi_t p; /* prime */ - gcry_mpi_t g; /* group generator */ - gcry_mpi_t y; /* g^x mod p */ -} ELG_public_key; - - -typedef struct -{ - gcry_mpi_t p; /* prime */ - gcry_mpi_t g; /* group generator */ - gcry_mpi_t y; /* g^x mod p */ - gcry_mpi_t x; /* secret exponent */ -} ELG_secret_key; - - -static const char *elg_names[] = - { - "elg", - "openpgp-elg", - "openpgp-elg-sig", - NULL, - }; - - -static int test_keys (ELG_secret_key *sk, unsigned int nbits, int nodie); -static gcry_mpi_t gen_k (gcry_mpi_t p, int small_k); -static gcry_err_code_t generate (ELG_secret_key *sk, unsigned nbits, - gcry_mpi_t **factors); -static int check_secret_key (ELG_secret_key *sk); -static void do_encrypt (gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, - ELG_public_key *pkey); -static void decrypt (gcry_mpi_t output, gcry_mpi_t a, gcry_mpi_t b, - ELG_secret_key *skey); -static void sign (gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, - ELG_secret_key *skey); -static int verify (gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, - ELG_public_key *pkey); -static unsigned int elg_get_nbits (gcry_sexp_t parms); - - -static void (*progress_cb) (void *, const char *, int, int, int); -static void *progress_cb_data; - -void -_gcry_register_pk_elg_progress (void (*cb) (void *, const char *, - int, int, int), - void *cb_data) -{ - progress_cb = cb; - progress_cb_data = cb_data; -} - - -static void -progress (int c) -{ - if (progress_cb) - progress_cb (progress_cb_data, "pk_elg", c, 0, 0); -} - - -/**************** - * Michael Wiener's table on subgroup sizes to match field sizes. - * (floating around somewhere, probably based on the paper from - * Eurocrypt 96, page 332) - */ -static unsigned int -wiener_map( unsigned int n ) -{ - static struct { unsigned int p_n, q_n; } t[] = - { /* p q attack cost */ - { 512, 119 }, /* 9 x 10^17 */ - { 768, 145 }, /* 6 x 10^21 */ - { 1024, 165 }, /* 7 x 10^24 */ - { 1280, 183 }, /* 3 x 10^27 */ - { 1536, 198 }, /* 7 x 10^29 */ - { 1792, 212 }, /* 9 x 10^31 */ - { 2048, 225 }, /* 8 x 10^33 */ - { 2304, 237 }, /* 5 x 10^35 */ - { 2560, 249 }, /* 3 x 10^37 */ - { 2816, 259 }, /* 1 x 10^39 */ - { 3072, 269 }, /* 3 x 10^40 */ - { 3328, 279 }, /* 8 x 10^41 */ - { 3584, 288 }, /* 2 x 10^43 */ - { 3840, 296 }, /* 4 x 10^44 */ - { 4096, 305 }, /* 7 x 10^45 */ - { 4352, 313 }, /* 1 x 10^47 */ - { 4608, 320 }, /* 2 x 10^48 */ - { 4864, 328 }, /* 2 x 10^49 */ - { 5120, 335 }, /* 3 x 10^50 */ - { 0, 0 } - }; - int i; - - for(i=0; t[i].p_n; i++ ) - { - if( n <= t[i].p_n ) - return t[i].q_n; - } - /* Not in table - use an arbitrary high number. */ - return n / 8 + 200; -} - -static int -test_keys ( ELG_secret_key *sk, unsigned int nbits, int nodie ) -{ - ELG_public_key pk; - gcry_mpi_t test = mpi_new ( 0 ); - gcry_mpi_t out1_a = mpi_new ( nbits ); - gcry_mpi_t out1_b = mpi_new ( nbits ); - gcry_mpi_t out2 = mpi_new ( nbits ); - int failed = 0; - - pk.p = sk->p; - pk.g = sk->g; - pk.y = sk->y; - - _gcry_mpi_randomize ( test, nbits, GCRY_WEAK_RANDOM ); - - do_encrypt ( out1_a, out1_b, test, &pk ); - decrypt ( out2, out1_a, out1_b, sk ); - if ( mpi_cmp( test, out2 ) ) - failed |= 1; - - sign ( out1_a, out1_b, test, sk ); - if ( !verify( out1_a, out1_b, test, &pk ) ) - failed |= 2; - - _gcry_mpi_release ( test ); - _gcry_mpi_release ( out1_a ); - _gcry_mpi_release ( out1_b ); - _gcry_mpi_release ( out2 ); - - if (failed && !nodie) - log_fatal ("Elgamal test key for %s %s failed\n", - (failed & 1)? "encrypt+decrypt":"", - (failed & 2)? "sign+verify":""); - if (failed && DBG_CIPHER) - log_debug ("Elgamal test key for %s %s failed\n", - (failed & 1)? "encrypt+decrypt":"", - (failed & 2)? "sign+verify":""); - - return failed; -} - - -/**************** - * Generate a random secret exponent k from prime p, so that k is - * relatively prime to p-1. With SMALL_K set, k will be selected for - * better encryption performance - this must never be used signing! - */ -static gcry_mpi_t -gen_k( gcry_mpi_t p, int small_k ) -{ - gcry_mpi_t k = mpi_alloc_secure( 0 ); - gcry_mpi_t temp = mpi_alloc( mpi_get_nlimbs(p) ); - gcry_mpi_t p_1 = mpi_copy(p); - unsigned int orig_nbits = mpi_get_nbits(p); - unsigned int nbits, nbytes; - char *rndbuf = NULL; - - if (small_k) - { - /* Using a k much lesser than p is sufficient for encryption and - * it greatly improves the encryption performance. We use - * Wiener's table and add a large safety margin. */ - nbits = wiener_map( orig_nbits ) * 3 / 2; - if( nbits >= orig_nbits ) - BUG(); - } - else - nbits = orig_nbits; - - - nbytes = (nbits+7)/8; - if( DBG_CIPHER ) - log_debug("choosing a random k\n"); - mpi_sub_ui( p_1, p, 1); - for(;;) - { - if( !rndbuf || nbits < 32 ) - { - xfree(rndbuf); - rndbuf = _gcry_random_bytes_secure( nbytes, GCRY_STRONG_RANDOM ); - } - else - { - /* Change only some of the higher bits. We could improve - this by directly requesting more memory at the first call - to get_random_bytes() and use this the here maybe it is - easier to do this directly in random.c Anyway, it is - highly inlikely that we will ever reach this code. */ - char *pp = _gcry_random_bytes_secure( 4, GCRY_STRONG_RANDOM ); - memcpy( rndbuf, pp, 4 ); - xfree(pp); - } - _gcry_mpi_set_buffer( k, rndbuf, nbytes, 0 ); - - for(;;) - { - if( !(mpi_cmp( k, p_1 ) < 0) ) /* check: k < (p-1) */ - { - if( DBG_CIPHER ) - progress('+'); - break; /* no */ - } - if( !(mpi_cmp_ui( k, 0 ) > 0) ) /* check: k > 0 */ - { - if( DBG_CIPHER ) - progress('-'); - break; /* no */ - } - if (mpi_gcd( temp, k, p_1 )) - goto found; /* okay, k is relative prime to (p-1) */ - mpi_add_ui( k, k, 1 ); - if( DBG_CIPHER ) - progress('.'); - } - } - found: - xfree (rndbuf); - if( DBG_CIPHER ) - progress('\n'); - mpi_free(p_1); - mpi_free(temp); - - return k; -} - -/**************** - * Generate a key pair with a key of size NBITS - * Returns: 2 structures filled with all needed values - * and an array with n-1 factors of (p-1) - */ -static gcry_err_code_t -generate ( ELG_secret_key *sk, unsigned int nbits, gcry_mpi_t **ret_factors ) -{ - gcry_err_code_t rc; - gcry_mpi_t p; /* the prime */ - gcry_mpi_t p_min1; - gcry_mpi_t g; - gcry_mpi_t x; /* the secret exponent */ - gcry_mpi_t y; - unsigned int qbits; - unsigned int xbits; - byte *rndbuf; - - p_min1 = mpi_new ( nbits ); - qbits = wiener_map( nbits ); - if( qbits & 1 ) /* better have a even one */ - qbits++; - g = mpi_alloc(1); - rc = _gcry_generate_elg_prime (0, nbits, qbits, g, &p, ret_factors); - if (rc) - { - mpi_free (p_min1); - mpi_free (g); - return rc; - } - mpi_sub_ui(p_min1, p, 1); - - - /* Select a random number which has these properties: - * 0 < x < p-1 - * This must be a very good random number because this is the - * secret part. The prime is public and may be shared anyway, - * so a random generator level of 1 is used for the prime. - * - * I don't see a reason to have a x of about the same size - * as the p. It should be sufficient to have one about the size - * of q or the later used k plus a large safety margin. Decryption - * will be much faster with such an x. - */ - xbits = qbits * 3 / 2; - if( xbits >= nbits ) - BUG(); - x = mpi_snew ( xbits ); - if( DBG_CIPHER ) - log_debug("choosing a random x of size %u\n", xbits ); - rndbuf = NULL; - do - { - if( DBG_CIPHER ) - progress('.'); - if( rndbuf ) - { /* Change only some of the higher bits */ - if( xbits < 16 ) /* should never happen ... */ - { - xfree(rndbuf); - rndbuf = _gcry_random_bytes_secure ((xbits+7)/8, - GCRY_VERY_STRONG_RANDOM); - } - else - { - char *r = _gcry_random_bytes_secure (2, GCRY_VERY_STRONG_RANDOM); - memcpy(rndbuf, r, 2 ); - xfree (r); - } - } - else - { - rndbuf = _gcry_random_bytes_secure ((xbits+7)/8, - GCRY_VERY_STRONG_RANDOM ); - } - _gcry_mpi_set_buffer( x, rndbuf, (xbits+7)/8, 0 ); - mpi_clear_highbit( x, xbits+1 ); - } - while( !( mpi_cmp_ui( x, 0 )>0 && mpi_cmp( x, p_min1 )<0 ) ); - xfree(rndbuf); - - y = mpi_new (nbits); - mpi_powm( y, g, x, p ); - - if( DBG_CIPHER ) - { - progress ('\n'); - log_mpidump ("elg p", p ); - log_mpidump ("elg g", g ); - log_mpidump ("elg y", y ); - log_mpidump ("elg x", x ); - } - - /* Copy the stuff to the key structures */ - sk->p = p; - sk->g = g; - sk->y = y; - sk->x = x; - - _gcry_mpi_release ( p_min1 ); - - /* Now we can test our keys (this should never fail!) */ - test_keys ( sk, nbits - 64, 0 ); - - return 0; -} - - -/* Generate a key pair with a key of size NBITS not using a random - value for the secret key but the one given as X. This is useful to - implement a passphrase based decryption for a public key based - encryption. It has appliactions in backup systems. - - Returns: A structure filled with all needed values and an array - with n-1 factors of (p-1). */ -static gcry_err_code_t -generate_using_x (ELG_secret_key *sk, unsigned int nbits, gcry_mpi_t x, - gcry_mpi_t **ret_factors ) -{ - gcry_err_code_t rc; - gcry_mpi_t p; /* The prime. */ - gcry_mpi_t p_min1; /* The prime minus 1. */ - gcry_mpi_t g; /* The generator. */ - gcry_mpi_t y; /* g^x mod p. */ - unsigned int qbits; - unsigned int xbits; - - sk->p = NULL; - sk->g = NULL; - sk->y = NULL; - sk->x = NULL; - - /* Do a quick check to see whether X is suitable. */ - xbits = mpi_get_nbits (x); - if ( xbits < 64 || xbits >= nbits ) - return GPG_ERR_INV_VALUE; - - p_min1 = mpi_new ( nbits ); - qbits = wiener_map ( nbits ); - if ( (qbits & 1) ) /* Better have an even one. */ - qbits++; - g = mpi_alloc (1); - rc = _gcry_generate_elg_prime (0, nbits, qbits, g, &p, ret_factors ); - if (rc) - { - mpi_free (p_min1); - mpi_free (g); - return rc; - } - mpi_sub_ui (p_min1, p, 1); - - if (DBG_CIPHER) - log_debug ("using a supplied x of size %u", xbits ); - if ( !(mpi_cmp_ui ( x, 0 ) > 0 && mpi_cmp ( x, p_min1 ) <0 ) ) - { - _gcry_mpi_release ( p_min1 ); - _gcry_mpi_release ( p ); - _gcry_mpi_release ( g ); - return GPG_ERR_INV_VALUE; - } - - y = mpi_new (nbits); - mpi_powm ( y, g, x, p ); - - if ( DBG_CIPHER ) - { - progress ('\n'); - log_mpidump ("elg p", p ); - log_mpidump ("elg g", g ); - log_mpidump ("elg y", y ); - log_mpidump ("elg x", x ); - } - - /* Copy the stuff to the key structures */ - sk->p = p; - sk->g = g; - sk->y = y; - sk->x = mpi_copy (x); - - _gcry_mpi_release ( p_min1 ); - - /* Now we can test our keys. */ - if ( test_keys ( sk, nbits - 64, 1 ) ) - { - _gcry_mpi_release ( sk->p ); sk->p = NULL; - _gcry_mpi_release ( sk->g ); sk->g = NULL; - _gcry_mpi_release ( sk->y ); sk->y = NULL; - _gcry_mpi_release ( sk->x ); sk->x = NULL; - return GPG_ERR_BAD_SECKEY; - } - - return 0; -} - - -/**************** - * Test whether the secret key is valid. - * Returns: if this is a valid key. - */ -static int -check_secret_key( ELG_secret_key *sk ) -{ - int rc; - gcry_mpi_t y = mpi_alloc( mpi_get_nlimbs(sk->y) ); - - mpi_powm (y, sk->g, sk->x, sk->p); - rc = !mpi_cmp( y, sk->y ); - mpi_free( y ); - return rc; -} - - -static void -do_encrypt(gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, ELG_public_key *pkey ) -{ - gcry_mpi_t k; - - /* Note: maybe we should change the interface, so that it - * is possible to check that input is < p and return an - * error code. - */ - - k = gen_k( pkey->p, 1 ); - mpi_powm (a, pkey->g, k, pkey->p); - - /* b = (y^k * input) mod p - * = ((y^k mod p) * (input mod p)) mod p - * and because input is < p - * = ((y^k mod p) * input) mod p - */ - mpi_powm (b, pkey->y, k, pkey->p); - mpi_mulm (b, b, input, pkey->p); -#if 0 - if( DBG_CIPHER ) - { - log_mpidump("elg encrypted y", pkey->y); - log_mpidump("elg encrypted p", pkey->p); - log_mpidump("elg encrypted k", k); - log_mpidump("elg encrypted M", input); - log_mpidump("elg encrypted a", a); - log_mpidump("elg encrypted b", b); - } -#endif - mpi_free(k); -} - - - - -static void -decrypt (gcry_mpi_t output, gcry_mpi_t a, gcry_mpi_t b, ELG_secret_key *skey ) -{ - gcry_mpi_t t1, t2, r; - unsigned int nbits = mpi_get_nbits (skey->p); - - mpi_normalize (a); - mpi_normalize (b); - - t1 = mpi_snew (nbits); - -#ifdef USE_BLINDING - - t2 = mpi_snew (nbits); - r = mpi_new (nbits); - - /* We need a random number of about the prime size. The random - number merely needs to be unpredictable; thus we use level 0. */ - _gcry_mpi_randomize (r, nbits, GCRY_WEAK_RANDOM); - - /* t1 = r^x mod p */ - mpi_powm (t1, r, skey->x, skey->p); - /* t2 = (a * r)^-x mod p */ - mpi_mulm (t2, a, r, skey->p); - mpi_powm (t2, t2, skey->x, skey->p); - mpi_invm (t2, t2, skey->p); - /* t1 = (t1 * t2) mod p*/ - mpi_mulm (t1, t1, t2, skey->p); - - mpi_free (r); - mpi_free (t2); - -#else /*!USE_BLINDING*/ - - /* output = b/(a^x) mod p */ - mpi_powm (t1, a, skey->x, skey->p); - mpi_invm (t1, t1, skey->p); - -#endif /*!USE_BLINDING*/ - - mpi_mulm (output, b, t1, skey->p); - -#if 0 - if( DBG_CIPHER ) - { - log_mpidump ("elg decrypted x", skey->x); - log_mpidump ("elg decrypted p", skey->p); - log_mpidump ("elg decrypted a", a); - log_mpidump ("elg decrypted b", b); - log_mpidump ("elg decrypted M", output); - } -#endif - mpi_free (t1); -} - - -/**************** - * Make an Elgamal signature out of INPUT - */ - -static void -sign(gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, ELG_secret_key *skey ) -{ - gcry_mpi_t k; - gcry_mpi_t t = mpi_alloc( mpi_get_nlimbs(a) ); - gcry_mpi_t inv = mpi_alloc( mpi_get_nlimbs(a) ); - gcry_mpi_t p_1 = mpi_copy(skey->p); - - /* - * b = (t * inv) mod (p-1) - * b = (t * inv(k,(p-1),(p-1)) mod (p-1) - * b = (((M-x*a) mod (p-1)) * inv(k,(p-1),(p-1))) mod (p-1) - * - */ - mpi_sub_ui(p_1, p_1, 1); - k = gen_k( skey->p, 0 /* no small K ! */ ); - mpi_powm( a, skey->g, k, skey->p ); - mpi_mul(t, skey->x, a ); - mpi_subm(t, input, t, p_1 ); - mpi_invm(inv, k, p_1 ); - mpi_mulm(b, t, inv, p_1 ); - -#if 0 - if( DBG_CIPHER ) - { - log_mpidump ("elg sign p", skey->p); - log_mpidump ("elg sign g", skey->g); - log_mpidump ("elg sign y", skey->y); - log_mpidump ("elg sign x", skey->x); - log_mpidump ("elg sign k", k); - log_mpidump ("elg sign M", input); - log_mpidump ("elg sign a", a); - log_mpidump ("elg sign b", b); - } -#endif - mpi_free(k); - mpi_free(t); - mpi_free(inv); - mpi_free(p_1); -} - - -/**************** - * Returns true if the signature composed of A and B is valid. - */ -static int -verify(gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, ELG_public_key *pkey ) -{ - int rc; - gcry_mpi_t t1; - gcry_mpi_t t2; - gcry_mpi_t base[4]; - gcry_mpi_t ex[4]; - - if( !(mpi_cmp_ui( a, 0 ) > 0 && mpi_cmp( a, pkey->p ) < 0) ) - return 0; /* assertion 0 < a < p failed */ - - t1 = mpi_alloc( mpi_get_nlimbs(a) ); - t2 = mpi_alloc( mpi_get_nlimbs(a) ); - -#if 0 - /* t1 = (y^a mod p) * (a^b mod p) mod p */ - gcry_mpi_powm( t1, pkey->y, a, pkey->p ); - gcry_mpi_powm( t2, a, b, pkey->p ); - mpi_mulm( t1, t1, t2, pkey->p ); - - /* t2 = g ^ input mod p */ - gcry_mpi_powm( t2, pkey->g, input, pkey->p ); - - rc = !mpi_cmp( t1, t2 ); -#elif 0 - /* t1 = (y^a mod p) * (a^b mod p) mod p */ - base[0] = pkey->y; ex[0] = a; - base[1] = a; ex[1] = b; - base[2] = NULL; ex[2] = NULL; - mpi_mulpowm( t1, base, ex, pkey->p ); - - /* t2 = g ^ input mod p */ - gcry_mpi_powm( t2, pkey->g, input, pkey->p ); - - rc = !mpi_cmp( t1, t2 ); -#else - /* t1 = g ^ - input * y ^ a * a ^ b mod p */ - mpi_invm(t2, pkey->g, pkey->p ); - base[0] = t2 ; ex[0] = input; - base[1] = pkey->y; ex[1] = a; - base[2] = a; ex[2] = b; - base[3] = NULL; ex[3] = NULL; - mpi_mulpowm( t1, base, ex, pkey->p ); - rc = !mpi_cmp_ui( t1, 1 ); - -#endif - - mpi_free(t1); - mpi_free(t2); - return rc; -} - -/********************************************* - ************** interface ****************** - *********************************************/ - -static gpg_err_code_t -elg_generate (const gcry_sexp_t genparms, gcry_sexp_t *r_skey) -{ - gpg_err_code_t rc; - unsigned int nbits; - ELG_secret_key sk; - gcry_mpi_t xvalue = NULL; - gcry_sexp_t l1; - gcry_mpi_t *factors = NULL; - gcry_sexp_t misc_info = NULL; - - memset (&sk, 0, sizeof sk); - - rc = _gcry_pk_util_get_nbits (genparms, &nbits); - if (rc) - return rc; - - /* Parse the optional xvalue element. */ - l1 = sexp_find_token (genparms, "xvalue", 0); - if (l1) - { - xvalue = sexp_nth_mpi (l1, 1, 0); - sexp_release (l1); - if (!xvalue) - return GPG_ERR_BAD_MPI; - } - - if (xvalue) - { - rc = generate_using_x (&sk, nbits, xvalue, &factors); - mpi_free (xvalue); - } - else - { - rc = generate (&sk, nbits, &factors); - } - if (rc) - goto leave; - - if (factors && factors[0]) - { - int nfac; - void **arg_list; - char *buffer, *p; - - for (nfac = 0; factors[nfac]; nfac++) - ; - arg_list = xtrycalloc (nfac+1, sizeof *arg_list); - if (!arg_list) - { - rc = gpg_err_code_from_syserror (); - goto leave; - } - buffer = xtrymalloc (30 + nfac*2 + 2 + 1); - if (!buffer) - { - rc = gpg_err_code_from_syserror (); - xfree (arg_list); - goto leave; - } - p = stpcpy (buffer, "(misc-key-info(pm1-factors"); - for(nfac = 0; factors[nfac]; nfac++) - { - p = stpcpy (p, "%m"); - arg_list[nfac] = factors + nfac; - } - p = stpcpy (p, "))"); - rc = sexp_build_array (&misc_info, NULL, buffer, arg_list); - xfree (arg_list); - xfree (buffer); - if (rc) - goto leave; - } - - rc = sexp_build (r_skey, NULL, - "(key-data" - " (public-key" - " (elg(p%m)(g%m)(y%m)))" - " (private-key" - " (elg(p%m)(g%m)(y%m)(x%m)))" - " %S)", - sk.p, sk.g, sk.y, - sk.p, sk.g, sk.y, sk.x, - misc_info); - - leave: - mpi_free (sk.p); - mpi_free (sk.g); - mpi_free (sk.y); - mpi_free (sk.x); - sexp_release (misc_info); - if (factors) - { - gcry_mpi_t *mp; - for (mp = factors; *mp; mp++) - mpi_free (*mp); - xfree (factors); - } - - return rc; -} - - -static gcry_err_code_t -elg_check_secret_key (gcry_sexp_t keyparms) -{ - gcry_err_code_t rc; - ELG_secret_key sk = {NULL, NULL, NULL, NULL}; - - rc = sexp_extract_param (keyparms, NULL, "pgyx", - &sk.p, &sk.g, &sk.y, &sk.x, - NULL); - if (rc) - goto leave; - - if (!check_secret_key (&sk)) - rc = GPG_ERR_BAD_SECKEY; - - leave: - _gcry_mpi_release (sk.p); - _gcry_mpi_release (sk.g); - _gcry_mpi_release (sk.y); - _gcry_mpi_release (sk.x); - if (DBG_CIPHER) - log_debug ("elg_testkey => %s\n", gpg_strerror (rc)); - return rc; -} - - -static gcry_err_code_t -elg_encrypt (gcry_sexp_t *r_ciph, gcry_sexp_t s_data, gcry_sexp_t keyparms) -{ - gcry_err_code_t rc; - struct pk_encoding_ctx ctx; - gcry_mpi_t mpi_a = NULL; - gcry_mpi_t mpi_b = NULL; - gcry_mpi_t data = NULL; - ELG_public_key pk = { NULL, NULL, NULL }; - - _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_ENCRYPT, - elg_get_nbits (keyparms)); - - /* Extract the data. */ - rc = _gcry_pk_util_data_to_mpi (s_data, &data, &ctx); - if (rc) - goto leave; - if (DBG_CIPHER) - log_mpidump ("elg_encrypt data", data); - if (mpi_is_opaque (data)) - { - rc = GPG_ERR_INV_DATA; - goto leave; - } - - /* Extract the key. */ - rc = sexp_extract_param (keyparms, NULL, "pgy", - &pk.p, &pk.g, &pk.y, NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_mpidump ("elg_encrypt p", pk.p); - log_mpidump ("elg_encrypt g", pk.g); - log_mpidump ("elg_encrypt y", pk.y); - } - - /* Do Elgamal computation and build result. */ - mpi_a = mpi_new (0); - mpi_b = mpi_new (0); - do_encrypt (mpi_a, mpi_b, data, &pk); - rc = sexp_build (r_ciph, NULL, "(enc-val(elg(a%m)(b%m)))", mpi_a, mpi_b); - - leave: - _gcry_mpi_release (mpi_a); - _gcry_mpi_release (mpi_b); - _gcry_mpi_release (pk.p); - _gcry_mpi_release (pk.g); - _gcry_mpi_release (pk.y); - _gcry_mpi_release (data); - _gcry_pk_util_free_encoding_ctx (&ctx); - if (DBG_CIPHER) - log_debug ("elg_encrypt => %s\n", gpg_strerror (rc)); - return rc; -} - - -static gcry_err_code_t -elg_decrypt (gcry_sexp_t *r_plain, gcry_sexp_t s_data, gcry_sexp_t keyparms) -{ - gpg_err_code_t rc; - struct pk_encoding_ctx ctx; - gcry_sexp_t l1 = NULL; - gcry_mpi_t data_a = NULL; - gcry_mpi_t data_b = NULL; - ELG_secret_key sk = {NULL, NULL, NULL, NULL}; - gcry_mpi_t plain = NULL; - unsigned char *unpad = NULL; - size_t unpadlen = 0; - - _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_DECRYPT, - elg_get_nbits (keyparms)); - - /* Extract the data. */ - rc = _gcry_pk_util_preparse_encval (s_data, elg_names, &l1, &ctx); - if (rc) - goto leave; - rc = sexp_extract_param (l1, NULL, "ab", &data_a, &data_b, NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_printmpi ("elg_decrypt d_a", data_a); - log_printmpi ("elg_decrypt d_b", data_b); - } - if (mpi_is_opaque (data_a) || mpi_is_opaque (data_b)) - { - rc = GPG_ERR_INV_DATA; - goto leave; - } - - /* Extract the key. */ - rc = sexp_extract_param (keyparms, NULL, "pgyx", - &sk.p, &sk.g, &sk.y, &sk.x, - NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_printmpi ("elg_decrypt p", sk.p); - log_printmpi ("elg_decrypt g", sk.g); - log_printmpi ("elg_decrypt y", sk.y); - if (!fips_mode ()) - log_printmpi ("elg_decrypt x", sk.x); - } - - plain = mpi_snew (ctx.nbits); - decrypt (plain, data_a, data_b, &sk); - if (DBG_CIPHER) - log_printmpi ("elg_decrypt res", plain); - - /* Reverse the encoding and build the s-expression. */ - switch (ctx.encoding) - { - case PUBKEY_ENC_PKCS1: - rc = _gcry_rsa_pkcs1_decode_for_enc (&unpad, &unpadlen, ctx.nbits, plain); - mpi_free (plain); plain = NULL; - if (!rc) - rc = sexp_build (r_plain, NULL, "(value %b)", (int)unpadlen, unpad); - break; - - case PUBKEY_ENC_OAEP: - rc = _gcry_rsa_oaep_decode (&unpad, &unpadlen, - ctx.nbits, ctx.hash_algo, plain, - ctx.label, ctx.labellen); - mpi_free (plain); plain = NULL; - if (!rc) - rc = sexp_build (r_plain, NULL, "(value %b)", (int)unpadlen, unpad); - break; - - default: - /* Raw format. For backward compatibility we need to assume a - signed mpi by using the sexp format string "%m". */ - rc = sexp_build (r_plain, NULL, - (ctx.flags & PUBKEY_FLAG_LEGACYRESULT) - ? "%m" : "(value %m)", - plain); - break; - } - - - leave: - xfree (unpad); - _gcry_mpi_release (plain); - _gcry_mpi_release (sk.p); - _gcry_mpi_release (sk.g); - _gcry_mpi_release (sk.y); - _gcry_mpi_release (sk.x); - _gcry_mpi_release (data_a); - _gcry_mpi_release (data_b); - sexp_release (l1); - _gcry_pk_util_free_encoding_ctx (&ctx); - if (DBG_CIPHER) - log_debug ("elg_decrypt => %s\n", gpg_strerror (rc)); - return rc; -} - - -static gcry_err_code_t -elg_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_data, gcry_sexp_t keyparms) -{ - gcry_err_code_t rc; - struct pk_encoding_ctx ctx; - gcry_mpi_t data = NULL; - ELG_secret_key sk = {NULL, NULL, NULL, NULL}; - gcry_mpi_t sig_r = NULL; - gcry_mpi_t sig_s = NULL; - - _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_SIGN, - elg_get_nbits (keyparms)); - - /* Extract the data. */ - rc = _gcry_pk_util_data_to_mpi (s_data, &data, &ctx); - if (rc) - goto leave; - if (DBG_CIPHER) - log_mpidump ("elg_sign data", data); - if (mpi_is_opaque (data)) - { - rc = GPG_ERR_INV_DATA; - goto leave; - } - - /* Extract the key. */ - rc = sexp_extract_param (keyparms, NULL, "pgyx", - &sk.p, &sk.g, &sk.y, &sk.x, NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_mpidump ("elg_sign p", sk.p); - log_mpidump ("elg_sign g", sk.g); - log_mpidump ("elg_sign y", sk.y); - if (!fips_mode ()) - log_mpidump ("elg_sign x", sk.x); - } - - sig_r = mpi_new (0); - sig_s = mpi_new (0); - sign (sig_r, sig_s, data, &sk); - if (DBG_CIPHER) - { - log_mpidump ("elg_sign sig_r", sig_r); - log_mpidump ("elg_sign sig_s", sig_s); - } - rc = sexp_build (r_sig, NULL, "(sig-val(elg(r%M)(s%M)))", sig_r, sig_s); - - leave: - _gcry_mpi_release (sig_r); - _gcry_mpi_release (sig_s); - _gcry_mpi_release (sk.p); - _gcry_mpi_release (sk.g); - _gcry_mpi_release (sk.y); - _gcry_mpi_release (sk.x); - _gcry_mpi_release (data); - _gcry_pk_util_free_encoding_ctx (&ctx); - if (DBG_CIPHER) - log_debug ("elg_sign => %s\n", gpg_strerror (rc)); - return rc; -} - - -static gcry_err_code_t -elg_verify (gcry_sexp_t s_sig, gcry_sexp_t s_data, gcry_sexp_t s_keyparms) -{ - gcry_err_code_t rc; - struct pk_encoding_ctx ctx; - gcry_sexp_t l1 = NULL; - gcry_mpi_t sig_r = NULL; - gcry_mpi_t sig_s = NULL; - gcry_mpi_t data = NULL; - ELG_public_key pk = { NULL, NULL, NULL }; - - _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_VERIFY, - elg_get_nbits (s_keyparms)); - - /* Extract the data. */ - rc = _gcry_pk_util_data_to_mpi (s_data, &data, &ctx); - if (rc) - goto leave; - if (DBG_CIPHER) - log_mpidump ("elg_verify data", data); - if (mpi_is_opaque (data)) - { - rc = GPG_ERR_INV_DATA; - goto leave; - } - - /* Extract the signature value. */ - rc = _gcry_pk_util_preparse_sigval (s_sig, elg_names, &l1, NULL); - if (rc) - goto leave; - rc = sexp_extract_param (l1, NULL, "rs", &sig_r, &sig_s, NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_mpidump ("elg_verify s_r", sig_r); - log_mpidump ("elg_verify s_s", sig_s); - } - - /* Extract the key. */ - rc = sexp_extract_param (s_keyparms, NULL, "pgy", - &pk.p, &pk.g, &pk.y, NULL); - if (rc) - goto leave; - if (DBG_CIPHER) - { - log_mpidump ("elg_verify p", pk.p); - log_mpidump ("elg_verify g", pk.g); - log_mpidump ("elg_verify y", pk.y); - } - - /* Verify the signature. */ - if (!verify (sig_r, sig_s, data, &pk)) - rc = GPG_ERR_BAD_SIGNATURE; - - leave: - _gcry_mpi_release (pk.p); - _gcry_mpi_release (pk.g); - _gcry_mpi_release (pk.y); - _gcry_mpi_release (data); - _gcry_mpi_release (sig_r); - _gcry_mpi_release (sig_s); - sexp_release (l1); - _gcry_pk_util_free_encoding_ctx (&ctx); - if (DBG_CIPHER) - log_debug ("elg_verify => %s\n", rc?gpg_strerror (rc):"Good"); - return rc; -} - - -/* Return the number of bits for the key described by PARMS. On error - * 0 is returned. The format of PARMS starts with the algorithm name; - * for example: - * - * (dsa - * (p ) - * (g ) - * (y )) - * - * More parameters may be given but we only need P here. - */ -static unsigned int -elg_get_nbits (gcry_sexp_t parms) -{ - gcry_sexp_t l1; - gcry_mpi_t p; - unsigned int nbits; - - l1 = sexp_find_token (parms, "p", 1); - if (!l1) - return 0; /* Parameter P not found. */ - - p= sexp_nth_mpi (l1, 1, GCRYMPI_FMT_USG); - sexp_release (l1); - nbits = p? mpi_get_nbits (p) : 0; - _gcry_mpi_release (p); - return nbits; -} - - - -gcry_pk_spec_t _gcry_pubkey_spec_elg = - { - GCRY_PK_ELG, { 0, 0 }, - (GCRY_PK_USAGE_SIGN | GCRY_PK_USAGE_ENCR), - "ELG", elg_names, - "pgy", "pgyx", "ab", "rs", "pgy", - elg_generate, - elg_check_secret_key, - elg_encrypt, - elg_decrypt, - elg_sign, - elg_verify, - elg_get_nbits, - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/gost.h b/src/hos_libhttpserver/src/libgcrypt/cipher/gost.h deleted file mode 100644 index d058eb22..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/gost.h +++ /dev/null @@ -1,31 +0,0 @@ -/* gost.h - GOST 28147-89 implementation - * Copyright (C) 2012 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifndef _GCRY_GOST_H -#define _GCRY_GOST_H - -typedef struct { - u32 key[8]; -} GOST28147_context; - -/* This is a simple interface that will be used by GOST R 34.11-94 */ -extern unsigned int _gcry_gost_enc_one (GOST28147_context *c, const byte *key, - byte *out, byte *in); - -#endif diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/gost28147.c b/src/hos_libhttpserver/src/libgcrypt/cipher/gost28147.c deleted file mode 100644 index c094209c..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/gost28147.c +++ /dev/null @@ -1,452 +0,0 @@ -/* gost28147.c - GOST 28147-89 implementation for Libgcrypt - * Copyright (C) 2012 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -/* GOST 28147-89 defines several modes of encryption: - * - ECB which should be used only for key transfer - * - CFB mode - * - OFB-like mode with additional transformation on keystream - * RFC 5830 names this 'counter encryption' mode - * Original GOST text uses the term 'gammirovanie' - * - MAC mode - * - * This implementation handles ECB and CFB modes via usual libgcrypt handling. - * OFB-like and MAC modes are unsupported. - */ - -#include -#include "types.h" -#include "g10lib.h" -#include "cipher.h" - - -/* This is an s-box from RFC4357, named GostR3411-94-TestParamSet - * For now it is the only s-box supported, as libgcrypt lacks mechanism - * for passing parameters to cipher in a usefull way. - * S-boxes was modified from 4->4 to 8->8 bits unit with precalculated - * shift and rotation by optimisation reasons. - */ -static const u32 test_sbox[4][256] = { - /* 0 */ - { 0x00072000, 0x00075000, 0x00074800, 0x00071000, - 0x00076800, 0x00074000, 0x00070000, 0x00077000, - 0x00073000, 0x00075800, 0x00070800, 0x00076000, - 0x00073800, 0x00077800, 0x00072800, 0x00071800, - 0x0005a000, 0x0005d000, 0x0005c800, 0x00059000, - 0x0005e800, 0x0005c000, 0x00058000, 0x0005f000, - 0x0005b000, 0x0005d800, 0x00058800, 0x0005e000, - 0x0005b800, 0X0005F800, 0x0005a800, 0x00059800, - 0x00022000, 0x00025000, 0x00024800, 0x00021000, - 0x00026800, 0x00024000, 0x00020000, 0x00027000, - 0X00023000, 0x00025800, 0x00020800, 0x00026000, - 0x00023800, 0x00027800, 0x00022800, 0x00021800, - 0x00062000, 0x00065000, 0x00064800, 0x00061000, - 0x00066800, 0x00064000, 0x00060000, 0x00067000, - 0x00063000, 0x00065800, 0x00060800, 0x00066000, - 0x00063800, 0x00067800, 0x00062800, 0x00061800, - 0x00032000, 0x00035000, 0x00034800, 0x00031000, - 0x00036800, 0x00034000, 0x00030000, 0x00037000, - 0x00033000, 0x00035800, 0x00030800, 0x00036000, - 0x00033800, 0x00037800, 0x00032800, 0x00031800, - 0x0006a000, 0x0006d000, 0x0006c800, 0x00069000, - 0x0006e800, 0x0006c000, 0x00068000, 0x0006f000, - 0x0006b000, 0x0006d800, 0x00068800, 0x0006e000, - 0x0006b800, 0x0006f800, 0x0006a800, 0x00069800, - 0x0007a000, 0x0007d000, 0x0007c800, 0x00079000, - 0x0007e800, 0x0007c000, 0x00078000, 0x0007f000, - 0x0007b000, 0x0007d800, 0x00078800, 0x0007e000, - 0x0007b800, 0x0007f800, 0x0007a800, 0x00079800, - 0x00052000, 0x00055000, 0x00054800, 0x00051000, - 0x00056800, 0x00054000, 0x00050000, 0x00057000, - 0x00053000, 0x00055800, 0x00050800, 0x00056000, - 0x00053800, 0x00057800, 0x00052800, 0x00051800, - 0x00012000, 0x00015000, 0x00014800, 0x00011000, - 0x00016800, 0x00014000, 0x00010000, 0x00017000, - 0x00013000, 0x00015800, 0x00010800, 0x00016000, - 0x00013800, 0x00017800, 0x00012800, 0x00011800, - 0x0001a000, 0x0001d000, 0x0001c800, 0x00019000, - 0x0001e800, 0x0001c000, 0x00018000, 0x0001f000, - 0x0001b000, 0x0001d800, 0x00018800, 0x0001e000, - 0x0001b800, 0x0001f800, 0x0001a800, 0x00019800, - 0x00042000, 0x00045000, 0x00044800, 0x00041000, - 0x00046800, 0x00044000, 0x00040000, 0x00047000, - 0x00043000, 0x00045800, 0x00040800, 0x00046000, - 0x00043800, 0x00047800, 0x00042800, 0x00041800, - 0x0000a000, 0x0000d000, 0x0000c800, 0x00009000, - 0x0000e800, 0x0000c000, 0x00008000, 0x0000f000, - 0x0000b000, 0x0000d800, 0x00008800, 0x0000e000, - 0x0000b800, 0x0000f800, 0x0000a800, 0x00009800, - 0x00002000, 0x00005000, 0x00004800, 0x00001000, - 0x00006800, 0x00004000, 0x00000000, 0x00007000, - 0x00003000, 0x00005800, 0x00000800, 0x00006000, - 0x00003800, 0x00007800, 0x00002800, 0x00001800, - 0x0003a000, 0x0003d000, 0x0003c800, 0x00039000, - 0x0003e800, 0x0003c000, 0x00038000, 0x0003f000, - 0x0003b000, 0x0003d800, 0x00038800, 0x0003e000, - 0x0003b800, 0x0003f800, 0x0003a800, 0x00039800, - 0x0002a000, 0x0002d000, 0x0002c800, 0x00029000, - 0x0002e800, 0x0002c000, 0x00028000, 0x0002f000, - 0x0002b000, 0x0002d800, 0x00028800, 0x0002e000, - 0x0002b800, 0x0002f800, 0x0002a800, 0x00029800, - 0x0004a000, 0x0004d000, 0x0004c800, 0x00049000, - 0x0004e800, 0x0004c000, 0x00048000, 0x0004f000, - 0x0004b000, 0x0004d800, 0x00048800, 0x0004e000, - 0x0004b800, 0x0004f800, 0x0004a800, 0x00049800 }, - /* 1 */ - { 0x03a80000, 0x03c00000, 0x03880000, 0x03e80000, - 0x03d00000, 0x03980000, 0x03a00000, 0x03900000, - 0x03f00000, 0x03f80000, 0x03e00000, 0x03b80000, - 0x03b00000, 0x03800000, 0x03c80000, 0x03d80000, - 0x06a80000, 0x06c00000, 0x06880000, 0x06e80000, - 0x06d00000, 0x06980000, 0x06a00000, 0x06900000, - 0x06f00000, 0x06f80000, 0x06e00000, 0x06b80000, - 0x06b00000, 0x06800000, 0x06c80000, 0x06d80000, - 0x05280000, 0x05400000, 0x05080000, 0x05680000, - 0x05500000, 0x05180000, 0x05200000, 0x05100000, - 0x05700000, 0x05780000, 0x05600000, 0x05380000, - 0x05300000, 0x05000000, 0x05480000, 0x05580000, - 0x00a80000, 0x00c00000, 0x00880000, 0x00e80000, - 0x00d00000, 0x00980000, 0x00a00000, 0x00900000, - 0x00f00000, 0x00f80000, 0x00e00000, 0x00b80000, - 0x00b00000, 0x00800000, 0x00c80000, 0x00d80000, - 0x00280000, 0x00400000, 0x00080000, 0x00680000, - 0x00500000, 0x00180000, 0x00200000, 0x00100000, - 0x00700000, 0x00780000, 0x00600000, 0x00380000, - 0x00300000, 0x00000000, 0x00480000, 0x00580000, - 0x04280000, 0x04400000, 0x04080000, 0x04680000, - 0x04500000, 0x04180000, 0x04200000, 0x04100000, - 0x04700000, 0x04780000, 0x04600000, 0x04380000, - 0x04300000, 0x04000000, 0x04480000, 0x04580000, - 0x04a80000, 0x04c00000, 0x04880000, 0x04e80000, - 0x04d00000, 0x04980000, 0x04a00000, 0x04900000, - 0x04f00000, 0x04f80000, 0x04e00000, 0x04b80000, - 0x04b00000, 0x04800000, 0x04c80000, 0x04d80000, - 0x07a80000, 0x07c00000, 0x07880000, 0x07e80000, - 0x07d00000, 0x07980000, 0x07a00000, 0x07900000, - 0x07f00000, 0x07f80000, 0x07e00000, 0x07b80000, - 0x07b00000, 0x07800000, 0x07c80000, 0x07d80000, - 0x07280000, 0x07400000, 0x07080000, 0x07680000, - 0x07500000, 0x07180000, 0x07200000, 0x07100000, - 0x07700000, 0x07780000, 0x07600000, 0x07380000, - 0x07300000, 0x07000000, 0x07480000, 0x07580000, - 0x02280000, 0x02400000, 0x02080000, 0x02680000, - 0x02500000, 0x02180000, 0x02200000, 0x02100000, - 0x02700000, 0x02780000, 0x02600000, 0x02380000, - 0x02300000, 0x02000000, 0x02480000, 0x02580000, - 0x03280000, 0x03400000, 0x03080000, 0x03680000, - 0x03500000, 0x03180000, 0x03200000, 0x03100000, - 0x03700000, 0x03780000, 0x03600000, 0x03380000, - 0x03300000, 0x03000000, 0x03480000, 0x03580000, - 0x06280000, 0x06400000, 0x06080000, 0x06680000, - 0x06500000, 0x06180000, 0x06200000, 0x06100000, - 0x06700000, 0x06780000, 0x06600000, 0x06380000, - 0x06300000, 0x06000000, 0x06480000, 0x06580000, - 0x05a80000, 0x05c00000, 0x05880000, 0x05e80000, - 0x05d00000, 0x05980000, 0x05a00000, 0x05900000, - 0x05f00000, 0x05f80000, 0x05e00000, 0x05b80000, - 0x05b00000, 0x05800000, 0x05c80000, 0x05d80000, - 0x01280000, 0x01400000, 0x01080000, 0x01680000, - 0x01500000, 0x01180000, 0x01200000, 0x01100000, - 0x01700000, 0x01780000, 0x01600000, 0x01380000, - 0x01300000, 0x01000000, 0x01480000, 0x01580000, - 0x02a80000, 0x02c00000, 0x02880000, 0x02e80000, - 0x02d00000, 0x02980000, 0x02a00000, 0x02900000, - 0x02f00000, 0x02f80000, 0x02e00000, 0x02b80000, - 0x02b00000, 0x02800000, 0x02c80000, 0x02d80000, - 0x01a80000, 0x01c00000, 0x01880000, 0x01e80000, - 0x01d00000, 0x01980000, 0x01a00000, 0x01900000, - 0x01f00000, 0x01f80000, 0x01e00000, 0x01b80000, - 0x01b00000, 0x01800000, 0x01c80000, 0x01d80000 }, - /* 2 */ - { 0x30000002, 0x60000002, 0x38000002, 0x08000002, - 0x28000002, 0x78000002, 0x68000002, 0x40000002, - 0x20000002, 0x50000002, 0x48000002, 0x70000002, - 0x00000002, 0x18000002, 0x58000002, 0x10000002, - 0xb0000005, 0xe0000005, 0xb8000005, 0x88000005, - 0xa8000005, 0xf8000005, 0xe8000005, 0xc0000005, - 0xa0000005, 0xd0000005, 0xc8000005, 0xf0000005, - 0x80000005, 0x98000005, 0xd8000005, 0x90000005, - 0x30000005, 0x60000005, 0x38000005, 0x08000005, - 0x28000005, 0x78000005, 0x68000005, 0x40000005, - 0x20000005, 0x50000005, 0x48000005, 0x70000005, - 0x00000005, 0x18000005, 0x58000005, 0x10000005, - 0x30000000, 0x60000000, 0x38000000, 0x08000000, - 0x28000000, 0x78000000, 0x68000000, 0x40000000, - 0x20000000, 0x50000000, 0x48000000, 0x70000000, - 0x00000000, 0x18000000, 0x58000000, 0x10000000, - 0xb0000003, 0xe0000003, 0xb8000003, 0x88000003, - 0xa8000003, 0xf8000003, 0xe8000003, 0xc0000003, - 0xa0000003, 0xd0000003, 0xc8000003, 0xf0000003, - 0x80000003, 0x98000003, 0xd8000003, 0x90000003, - 0x30000001, 0x60000001, 0x38000001, 0x08000001, - 0x28000001, 0x78000001, 0x68000001, 0x40000001, - 0x20000001, 0x50000001, 0x48000001, 0x70000001, - 0x00000001, 0x18000001, 0x58000001, 0x10000001, - 0xb0000000, 0xe0000000, 0xb8000000, 0x88000000, - 0xa8000000, 0xf8000000, 0xe8000000, 0xc0000000, - 0xa0000000, 0xd0000000, 0xc8000000, 0xf0000000, - 0x80000000, 0x98000000, 0xd8000000, 0x90000000, - 0xb0000006, 0xe0000006, 0xb8000006, 0x88000006, - 0xa8000006, 0xf8000006, 0xe8000006, 0xc0000006, - 0xa0000006, 0xd0000006, 0xc8000006, 0xf0000006, - 0x80000006, 0x98000006, 0xd8000006, 0x90000006, - 0xb0000001, 0xe0000001, 0xb8000001, 0x88000001, - 0xa8000001, 0xf8000001, 0xe8000001, 0xc0000001, - 0xa0000001, 0xd0000001, 0xc8000001, 0xf0000001, - 0x80000001, 0x98000001, 0xd8000001, 0x90000001, - 0x30000003, 0x60000003, 0x38000003, 0x08000003, - 0x28000003, 0x78000003, 0x68000003, 0x40000003, - 0x20000003, 0x50000003, 0x48000003, 0x70000003, - 0x00000003, 0x18000003, 0x58000003, 0x10000003, - 0x30000004, 0x60000004, 0x38000004, 0x08000004, - 0x28000004, 0x78000004, 0x68000004, 0x40000004, - 0x20000004, 0x50000004, 0x48000004, 0x70000004, - 0x00000004, 0x18000004, 0x58000004, 0x10000004, - 0xb0000002, 0xe0000002, 0xb8000002, 0x88000002, - 0xa8000002, 0xf8000002, 0xe8000002, 0xc0000002, - 0xa0000002, 0xd0000002, 0xc8000002, 0xf0000002, - 0x80000002, 0x98000002, 0xd8000002, 0x90000002, - 0xb0000004, 0xe0000004, 0xb8000004, 0x88000004, - 0xa8000004, 0xf8000004, 0xe8000004, 0xc0000004, - 0xa0000004, 0xd0000004, 0xc8000004, 0xf0000004, - 0x80000004, 0x98000004, 0xd8000004, 0x90000004, - 0x30000006, 0x60000006, 0x38000006, 0x08000006, - 0x28000006, 0x78000006, 0x68000006, 0x40000006, - 0x20000006, 0x50000006, 0x48000006, 0x70000006, - 0x00000006, 0x18000006, 0x58000006, 0x10000006, - 0xb0000007, 0xe0000007, 0xb8000007, 0x88000007, - 0xa8000007, 0xf8000007, 0xe8000007, 0xc0000007, - 0xa0000007, 0xd0000007, 0xc8000007, 0xf0000007, - 0x80000007, 0x98000007, 0xd8000007, 0x90000007, - 0x30000007, 0x60000007, 0x38000007, 0x08000007, - 0x28000007, 0x78000007, 0x68000007, 0x40000007, - 0x20000007, 0x50000007, 0x48000007, 0x70000007, - 0x00000007, 0x18000007, 0x58000007, 0x10000007 }, - /* 3 */ - { 0x000000e8, 0x000000d8, 0x000000a0, 0x00000088, - 0x00000098, 0x000000f8, 0x000000a8, 0x000000c8, - 0x00000080, 0x000000d0, 0x000000f0, 0x000000b8, - 0x000000b0, 0x000000c0, 0x00000090, 0x000000e0, - 0x000007e8, 0x000007d8, 0x000007a0, 0x00000788, - 0x00000798, 0x000007f8, 0x000007a8, 0x000007c8, - 0x00000780, 0x000007d0, 0x000007f0, 0x000007b8, - 0x000007b0, 0x000007c0, 0x00000790, 0x000007e0, - 0x000006e8, 0x000006d8, 0x000006a0, 0x00000688, - 0x00000698, 0x000006f8, 0x000006a8, 0x000006c8, - 0x00000680, 0x000006d0, 0x000006f0, 0x000006b8, - 0x000006b0, 0x000006c0, 0x00000690, 0x000006e0, - 0x00000068, 0x00000058, 0x00000020, 0x00000008, - 0x00000018, 0x00000078, 0x00000028, 0x00000048, - 0x00000000, 0x00000050, 0x00000070, 0x00000038, - 0x00000030, 0x00000040, 0x00000010, 0x00000060, - 0x000002e8, 0x000002d8, 0x000002a0, 0x00000288, - 0x00000298, 0x000002f8, 0x000002a8, 0x000002c8, - 0x00000280, 0x000002d0, 0x000002f0, 0x000002b8, - 0x000002b0, 0x000002c0, 0x00000290, 0x000002e0, - 0x000003e8, 0x000003d8, 0x000003a0, 0x00000388, - 0x00000398, 0x000003f8, 0x000003a8, 0x000003c8, - 0x00000380, 0x000003d0, 0x000003f0, 0x000003b8, - 0x000003b0, 0x000003c0, 0x00000390, 0x000003e0, - 0x00000568, 0x00000558, 0x00000520, 0x00000508, - 0x00000518, 0x00000578, 0x00000528, 0x00000548, - 0x00000500, 0x00000550, 0x00000570, 0x00000538, - 0x00000530, 0x00000540, 0x00000510, 0x00000560, - 0x00000268, 0x00000258, 0x00000220, 0x00000208, - 0x00000218, 0x00000278, 0x00000228, 0x00000248, - 0x00000200, 0x00000250, 0x00000270, 0x00000238, - 0x00000230, 0x00000240, 0x00000210, 0x00000260, - 0x000004e8, 0x000004d8, 0x000004a0, 0x00000488, - 0x00000498, 0x000004f8, 0x000004a8, 0x000004c8, - 0x00000480, 0x000004d0, 0x000004f0, 0x000004b8, - 0x000004b0, 0x000004c0, 0x00000490, 0x000004e0, - 0x00000168, 0x00000158, 0x00000120, 0x00000108, - 0x00000118, 0x00000178, 0x00000128, 0x00000148, - 0x00000100, 0x00000150, 0x00000170, 0x00000138, - 0x00000130, 0x00000140, 0x00000110, 0x00000160, - 0x000001e8, 0x000001d8, 0x000001a0, 0x00000188, - 0x00000198, 0x000001f8, 0x000001a8, 0x000001c8, - 0x00000180, 0x000001d0, 0x000001f0, 0x000001b8, - 0x000001b0, 0x000001c0, 0x00000190, 0x000001e0, - 0x00000768, 0x00000758, 0x00000720, 0x00000708, - 0x00000718, 0x00000778, 0x00000728, 0x00000748, - 0x00000700, 0x00000750, 0x00000770, 0x00000738, - 0x00000730, 0x00000740, 0x00000710, 0x00000760, - 0x00000368, 0x00000358, 0x00000320, 0x00000308, - 0x00000318, 0x00000378, 0x00000328, 0x00000348, - 0x00000300, 0x00000350, 0x00000370, 0x00000338, - 0x00000330, 0x00000340, 0x00000310, 0x00000360, - 0x000005e8, 0x000005d8, 0x000005a0, 0x00000588, - 0x00000598, 0x000005f8, 0x000005a8, 0x000005c8, - 0x00000580, 0x000005d0, 0x000005f0, 0x000005b8, - 0x000005b0, 0x000005c0, 0x00000590, 0x000005e0, - 0x00000468, 0x00000458, 0x00000420, 0x00000408, - 0x00000418, 0x00000478, 0x00000428, 0x00000448, - 0x00000400, 0x00000450, 0x00000470, 0x00000438, - 0x00000430, 0x00000440, 0x00000410, 0x00000460, - 0x00000668, 0x00000658, 0x00000620, 0x00000608, - 0x00000618, 0x00000678, 0x00000628, 0x00000648, - 0x00000600, 0x00000650, 0x00000670, 0x00000638, - 0x00000630, 0x00000640, 0x00000610, 0x00000660 } -}; - -#include "gost.h" - -static gcry_err_code_t -gost_setkey (void *c, const byte *key, unsigned keylen) -{ - int i; - GOST28147_context *ctx = c; - - if (keylen != 256 / 8) - return GPG_ERR_INV_KEYLEN; - - for (i = 0; i < 8; i++) - { - ctx->key[i] = (key[4 * i + 3] << 24) | - (key[4 * i + 2] << 16) | - (key[4 * i + 1] << 8) | - (key[4 * i + 0] << 0); - } - return GPG_ERR_NO_ERROR; -} - -static u32 -gost_val (GOST28147_context *ctx, u32 cm1, int subkey) -{ - cm1 += ctx->key[subkey]; - cm1 = test_sbox[0][ (cm1 >> 0) & 0xff] | - test_sbox[1][ (cm1 >> 8) & 0xff] | - test_sbox[2][ (cm1 >> 16) & 0xff] | - test_sbox[3][ (cm1 >> 24) & 0xff]; - return cm1; -} - -static unsigned int -gost_encrypt_block (void *c, byte *outbuf, const byte *inbuf) -{ - GOST28147_context *ctx = c; - u32 n1, n2; - - n1 = (inbuf[0] << 0) | - (inbuf[1] << 8) | - (inbuf[2] << 16) | - (inbuf[3] << 24); - n2 = (inbuf[4] << 0) | - (inbuf[5] << 8) | - (inbuf[6] << 16) | - (inbuf[7] << 24); - - n2 ^= gost_val (ctx, n1, 0); n1 ^= gost_val (ctx, n2, 1); - n2 ^= gost_val (ctx, n1, 2); n1 ^= gost_val (ctx, n2, 3); - n2 ^= gost_val (ctx, n1, 4); n1 ^= gost_val (ctx, n2, 5); - n2 ^= gost_val (ctx, n1, 6); n1 ^= gost_val (ctx, n2, 7); - - n2 ^= gost_val (ctx, n1, 0); n1 ^= gost_val (ctx, n2, 1); - n2 ^= gost_val (ctx, n1, 2); n1 ^= gost_val (ctx, n2, 3); - n2 ^= gost_val (ctx, n1, 4); n1 ^= gost_val (ctx, n2, 5); - n2 ^= gost_val (ctx, n1, 6); n1 ^= gost_val (ctx, n2, 7); - - n2 ^= gost_val (ctx, n1, 0); n1 ^= gost_val (ctx, n2, 1); - n2 ^= gost_val (ctx, n1, 2); n1 ^= gost_val (ctx, n2, 3); - n2 ^= gost_val (ctx, n1, 4); n1 ^= gost_val (ctx, n2, 5); - n2 ^= gost_val (ctx, n1, 6); n1 ^= gost_val (ctx, n2, 7); - - n2 ^= gost_val (ctx, n1, 7); n1 ^= gost_val (ctx, n2, 6); - n2 ^= gost_val (ctx, n1, 5); n1 ^= gost_val (ctx, n2, 4); - n2 ^= gost_val (ctx, n1, 3); n1 ^= gost_val (ctx, n2, 2); - n2 ^= gost_val (ctx, n1, 1); n1 ^= gost_val (ctx, n2, 0); - - outbuf[0 + 0] = (n2 >> (0 * 8)) & 0xff; - outbuf[1 + 0] = (n2 >> (1 * 8)) & 0xff; - outbuf[2 + 0] = (n2 >> (2 * 8)) & 0xff; - outbuf[3 + 0] = (n2 >> (3 * 8)) & 0xff; - outbuf[0 + 4] = (n1 >> (0 * 8)) & 0xff; - outbuf[1 + 4] = (n1 >> (1 * 8)) & 0xff; - outbuf[2 + 4] = (n1 >> (2 * 8)) & 0xff; - outbuf[3 + 4] = (n1 >> (3 * 8)) & 0xff; - - return /* burn_stack */ 4*sizeof(void*) /* func call */ + - 3*sizeof(void*) /* stack */ + - 4*sizeof(void*) /* gost_val call */; -} - -unsigned int _gcry_gost_enc_one (GOST28147_context *c, const byte *key, - byte *out, byte *in) -{ - gost_setkey (c, key, 32); - return gost_encrypt_block (c, out, in) + 5 * sizeof(void *); -} - -static unsigned int -gost_decrypt_block (void *c, byte *outbuf, const byte *inbuf) -{ - GOST28147_context *ctx = c; - u32 n1, n2; - - n1 = (inbuf[0] << 0) | - (inbuf[1] << 8) | - (inbuf[2] << 16) | - (inbuf[3] << 24); - n2 = (inbuf[4] << 0) | - (inbuf[5] << 8) | - (inbuf[6] << 16) | - (inbuf[7] << 24); - - n2 ^= gost_val (ctx, n1, 0); n1 ^= gost_val (ctx, n2, 1); - n2 ^= gost_val (ctx, n1, 2); n1 ^= gost_val (ctx, n2, 3); - n2 ^= gost_val (ctx, n1, 4); n1 ^= gost_val (ctx, n2, 5); - n2 ^= gost_val (ctx, n1, 6); n1 ^= gost_val (ctx, n2, 7); - - n2 ^= gost_val (ctx, n1, 7); n1 ^= gost_val (ctx, n2, 6); - n2 ^= gost_val (ctx, n1, 5); n1 ^= gost_val (ctx, n2, 4); - n2 ^= gost_val (ctx, n1, 3); n1 ^= gost_val (ctx, n2, 2); - n2 ^= gost_val (ctx, n1, 1); n1 ^= gost_val (ctx, n2, 0); - - n2 ^= gost_val (ctx, n1, 7); n1 ^= gost_val (ctx, n2, 6); - n2 ^= gost_val (ctx, n1, 5); n1 ^= gost_val (ctx, n2, 4); - n2 ^= gost_val (ctx, n1, 3); n1 ^= gost_val (ctx, n2, 2); - n2 ^= gost_val (ctx, n1, 1); n1 ^= gost_val (ctx, n2, 0); - - n2 ^= gost_val (ctx, n1, 7); n1 ^= gost_val (ctx, n2, 6); - n2 ^= gost_val (ctx, n1, 5); n1 ^= gost_val (ctx, n2, 4); - n2 ^= gost_val (ctx, n1, 3); n1 ^= gost_val (ctx, n2, 2); - n2 ^= gost_val (ctx, n1, 1); n1 ^= gost_val (ctx, n2, 0); - - outbuf[0 + 0] = (n2 >> (0 * 8)) & 0xff; - outbuf[1 + 0] = (n2 >> (1 * 8)) & 0xff; - outbuf[2 + 0] = (n2 >> (2 * 8)) & 0xff; - outbuf[3 + 0] = (n2 >> (3 * 8)) & 0xff; - outbuf[0 + 4] = (n1 >> (0 * 8)) & 0xff; - outbuf[1 + 4] = (n1 >> (1 * 8)) & 0xff; - outbuf[2 + 4] = (n1 >> (2 * 8)) & 0xff; - outbuf[3 + 4] = (n1 >> (3 * 8)) & 0xff; - - return /* burn_stack */ 4*sizeof(void*) /* func call */ + - 3*sizeof(void*) /* stack */ + - 4*sizeof(void*) /* gost_val call */; -} - -gcry_cipher_spec_t _gcry_cipher_spec_gost28147 = - { - GCRY_CIPHER_GOST28147, {0, 0}, - "GOST28147", NULL, NULL, 8, 256, - sizeof (GOST28147_context), - gost_setkey, - gost_encrypt_block, - gost_decrypt_block, - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/gostr3411-94.c b/src/hos_libhttpserver/src/libgcrypt/cipher/gostr3411-94.c deleted file mode 100644 index 5486964d..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/gostr3411-94.c +++ /dev/null @@ -1,286 +0,0 @@ -/* gostr3411-94.c - GOST R 34.11-94 hash function - * Copyright (C) 2012 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - - -#include -#include -#include -#include - -#include "g10lib.h" -#include "bithelp.h" -#include "cipher.h" -#include "hash-common.h" - -#include "gost.h" - -#define max(a, b) (((a) > (b)) ? (a) : (b)) - -typedef struct { - gcry_md_block_ctx_t bctx; - GOST28147_context hd; - byte h[32]; - byte sigma[32]; - u32 len; -} GOSTR3411_CONTEXT; - -static unsigned int -transform (void *c, const unsigned char *data); - -static void -gost3411_init (void *context, unsigned int flags) -{ - GOSTR3411_CONTEXT *hd = context; - - (void)flags; - - memset (&hd->hd, 0, sizeof(hd->hd)); - memset (hd->h, 0, 32); - memset (hd->sigma, 0, 32); - - hd->bctx.nblocks = 0; - hd->bctx.count = 0; - hd->bctx.blocksize = 32; - hd->bctx.bwrite = transform; -} - -static void -do_p (unsigned char *p, unsigned char *u, unsigned char *v) -{ - int i, k; - for (k = 0; k < 8; k++) - { - for (i = 0; i < 4; i++) - { - p[i + 4 * k] = u[8 * i + k] ^ v[8 * i + k]; - } - } -} - -static void -do_a (unsigned char *u) -{ - unsigned char temp[8]; - int i; - memcpy (temp, u, 8); - memmove (u, u+8, 24); - for (i = 0; i < 8; i++) - { - u[24 + i] = u[i] ^ temp[i]; - } -} -/* apply do_a twice: 1 2 3 4 -> 3 4 1^2 2^3 */ -static void -do_a2 (unsigned char *u) -{ - unsigned char temp[16]; - int i; - memcpy (temp, u, 16); - memcpy (u, u + 16, 16); - for (i = 0; i < 8; i++) - { - u[16 + i] = temp[i] ^ temp[8 + i]; - u[24 + i] = u[i] ^ temp[8 + i]; - } -} - -static void -do_apply_c2 (unsigned char *u) -{ - u[ 1] ^= 0xff; - u[ 3] ^= 0xff; - u[ 5] ^= 0xff; - u[ 7] ^= 0xff; - - u[ 8] ^= 0xff; - u[10] ^= 0xff; - u[12] ^= 0xff; - u[14] ^= 0xff; - - u[17] ^= 0xff; - u[18] ^= 0xff; - u[20] ^= 0xff; - u[23] ^= 0xff; - - u[24] ^= 0xff; - u[28] ^= 0xff; - u[29] ^= 0xff; - u[31] ^= 0xff; -} - -#define do_phi_step(e, i) \ - e[(0 + 2*i) % 32] ^= e[(2 + 2*i) % 32] ^ e[(4 + 2*i) % 32] ^ e[(6 + 2*i) % 32] ^ e[(24 + 2*i) % 32] ^ e[(30 + 2*i) % 32]; \ - e[(1 + 2*i) % 32] ^= e[(3 + 2*i) % 32] ^ e[(5 + 2*i) % 32] ^ e[(7 + 2*i) % 32] ^ e[(25 + 2*i) % 32] ^ e[(31 + 2*i) % 32]; - -static void -do_phi_submix (unsigned char *e, unsigned char *x, int round) -{ - int i; - round *= 2; - for (i = 0; i < 32; i++) - { - e[(i + round) % 32] ^= x[i]; - } -} - -static void -do_add (unsigned char *s, unsigned char *a) -{ - unsigned temp = 0; - int i; - - for (i = 0; i < 32; i++) - { - temp = s[i] + a[i] + (temp >> 8); - s[i] = temp & 0xff; - } -} - -static unsigned int -do_hash_step (GOST28147_context *hd, unsigned char *h, unsigned char *m) -{ - unsigned char u[32], v[32], s[32]; - unsigned char k[32]; - unsigned int burn; - int i; - - memcpy (u, h, 32); - memcpy (v, m, 32); - - for (i = 0; i < 4; i++) { - do_p (k, u, v); - - burn = _gcry_gost_enc_one (hd, k, s + i*8, h + i*8); - - do_a (u); - if (i == 1) - do_apply_c2 (u); - do_a2 (v); - } - - for (i = 0; i < 5; i++) - { - do_phi_step (s, 0); - do_phi_step (s, 1); - do_phi_step (s, 2); - do_phi_step (s, 3); - do_phi_step (s, 4); - do_phi_step (s, 5); - do_phi_step (s, 6); - do_phi_step (s, 7); - do_phi_step (s, 8); - do_phi_step (s, 9); - /* That is in total 12 + 1 + 61 = 74 = 16 * 4 + 10 rounds */ - if (i == 4) - break; - do_phi_step (s, 10); - do_phi_step (s, 11); - if (i == 0) - do_phi_submix(s, m, 12); - do_phi_step (s, 12); - if (i == 0) - do_phi_submix(s, h, 13); - do_phi_step (s, 13); - do_phi_step (s, 14); - do_phi_step (s, 15); - } - - memcpy (h, s+20, 12); - memcpy (h+12, s, 20); - - return /* burn_stack */ 4 * sizeof(void*) /* func call (ret addr + args) */ + - 4 * 32 + 2 * sizeof(int) /* stack */ + - max(burn /* _gcry_gost_enc_one */, - sizeof(void*) * 2 /* do_a2 call */ + - 16 + sizeof(int) /* do_a2 stack */ ); -} - - -static unsigned int -transform (void *ctx, const unsigned char *data) -{ - GOSTR3411_CONTEXT *hd = ctx; - byte m[32]; - unsigned int burn; - - memcpy (m, data, 32); - burn = do_hash_step (&hd->hd, hd->h, m); - do_add (hd->sigma, m); - - return /* burn_stack */ burn + 3 * sizeof(void*) + 32 + 2 * sizeof(void*); -} - -/* - The routine finally terminates the computation and returns the - digest. The handle is prepared for a new cycle, but adding bytes - to the handle will the destroy the returned buffer. Returns: 32 - bytes with the message the digest. */ -static void -gost3411_final (void *context) -{ - GOSTR3411_CONTEXT *hd = context; - size_t padlen = 0; - byte l[32]; - int i; - u32 nblocks; - - if (hd->bctx.count > 0) - { - padlen = 32 - hd->bctx.count; - memset (hd->bctx.buf + hd->bctx.count, 0, padlen); - hd->bctx.count += padlen; - _gcry_md_block_write (hd, NULL, 0); /* flush */; - } - - if (hd->bctx.count != 0) - return; /* Something went wrong */ - - memset (l, 0, 32); - - nblocks = hd->bctx.nblocks; - if (padlen) - { - nblocks --; - l[0] = 256 - padlen * 8; - } - - for (i = 1; i < 32 && nblocks != 0; i++) - { - l[i] = nblocks % 256; - nblocks /= 256; - } - - do_hash_step (&hd->hd, hd->h, l); - do_hash_step (&hd->hd, hd->h, hd->sigma); -} - -static byte * -gost3411_read (void *context) -{ - GOSTR3411_CONTEXT *hd = context; - - return hd->h; -} -gcry_md_spec_t _gcry_digest_spec_gost3411_94 = - { - GCRY_MD_GOSTR3411_94, {0, 0}, - "GOSTR3411_94", NULL, 0, NULL, 32, - gost3411_init, _gcry_md_block_write, gost3411_final, gost3411_read, - sizeof (GOSTR3411_CONTEXT) - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/hash-common.c b/src/hos_libhttpserver/src/libgcrypt/cipher/hash-common.c deleted file mode 100644 index ffbc39ed..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/hash-common.c +++ /dev/null @@ -1,145 +0,0 @@ -/* hash-common.c - Common code for hash algorithms - * Copyright (C) 2008 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#ifdef HAVE_STDINT_H -# include -#endif - -#include "g10lib.h" -#include "hash-common.h" - - -/* Run a selftest for hash algorithm ALGO. If the resulting digest - matches EXPECT/EXPECTLEN and everything else is fine as well, - return NULL. If an error occurs, return a static text string - describing the error. - - DATAMODE controls what will be hashed according to this table: - - 0 - Hash the supplied DATA of DATALEN. - 1 - Hash one million times a 'a'. DATA and DATALEN are ignored. - -*/ -const char * -_gcry_hash_selftest_check_one (int algo, - int datamode, const void *data, size_t datalen, - const void *expect, size_t expectlen) -{ - const char *result = NULL; - gcry_error_t err = 0; - gcry_md_hd_t hd; - unsigned char *digest; - - if (_gcry_md_get_algo_dlen (algo) != expectlen) - return "digest size does not match expected size"; - - err = _gcry_md_open (&hd, algo, 0); - if (err) - return "gcry_md_open failed"; - - switch (datamode) - { - case 0: - _gcry_md_write (hd, data, datalen); - break; - - case 1: /* Hash one million times an "a". */ - { - char aaa[1000]; - int i; - - /* Write in odd size chunks so that we test the buffering. */ - memset (aaa, 'a', 1000); - for (i = 0; i < 1000; i++) - _gcry_md_write (hd, aaa, 1000); - } - break; - - default: - result = "invalid DATAMODE"; - } - - if (!result) - { - digest = _gcry_md_read (hd, algo); - - if ( memcmp (digest, expect, expectlen) ) - result = "digest mismatch"; - } - - _gcry_md_close (hd); - - return result; -} - - -/* Common function to write a chunk of data to the transform function - of a hash algorithm. Note that the use of the term "block" does - not imply a fixed size block. */ -void -_gcry_md_block_write (void *context, const void *inbuf_arg, size_t inlen) -{ - const unsigned char *inbuf = inbuf_arg; - gcry_md_block_ctx_t *hd = context; - unsigned int stack_burn = 0; - - if (sizeof(hd->buf) < hd->blocksize) - BUG(); - - if (hd->buf == NULL || hd->bwrite == NULL) - return; - - if (hd->count == hd->blocksize) /* Flush the buffer. */ - { - stack_burn = hd->bwrite (hd, hd->buf); - _gcry_burn_stack (stack_burn); - stack_burn = 0; - hd->count = 0; - if (!++hd->nblocks) - hd->nblocks_high++; - } - if (!inbuf) - return; - - if (hd->count) - { - for (; inlen && hd->count < hd->blocksize; inlen--) - hd->buf[hd->count++] = *inbuf++; - _gcry_md_block_write (hd, NULL, 0); - if (!inlen) - return; - } - - while (inlen >= hd->blocksize) - { - stack_burn = hd->bwrite (hd, inbuf); - hd->count = 0; - if (!++hd->nblocks) - hd->nblocks_high++; - inlen -= hd->blocksize; - inbuf += hd->blocksize; - } - _gcry_burn_stack (stack_burn); - for (; inlen && hd->count < hd->blocksize; inlen--) - hd->buf[hd->count++] = *inbuf++; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/hash-common.h b/src/hos_libhttpserver/src/libgcrypt/cipher/hash-common.h deleted file mode 100644 index aa95365a..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/hash-common.h +++ /dev/null @@ -1,58 +0,0 @@ -/* hash-common.h - Declarations of common code for hash algorithms. - * Copyright (C) 2008 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifndef GCRY_HASH_COMMON_H -#define GCRY_HASH_COMMON_H - -#include "types.h" - - -const char * _gcry_hash_selftest_check_one -/**/ (int algo, - int datamode, const void *data, size_t datalen, - const void *expect, size_t expectlen); - -/* Type for the md_write helper function. */ -typedef unsigned int (*_gcry_md_block_write_t) (void *c, - const unsigned char *buf); - -#if defined(HAVE_U64_TYPEDEF) && (defined(USE_SHA512) || defined(USE_WHIRLPOOL)) -/* SHA-512 needs u64 and larger buffer. Whirlpool needs u64. */ -# define MD_BLOCK_MAX_BLOCKSIZE 128 -# define MD_NBLOCKS_TYPE u64 -#else -# define MD_BLOCK_MAX_BLOCKSIZE 64 -# define MD_NBLOCKS_TYPE u32 -#endif - -typedef struct gcry_md_block_ctx -{ - byte buf[MD_BLOCK_MAX_BLOCKSIZE]; - MD_NBLOCKS_TYPE nblocks; - MD_NBLOCKS_TYPE nblocks_high; - int count; - size_t blocksize; - _gcry_md_block_write_t bwrite; -} gcry_md_block_ctx_t; - - -void -_gcry_md_block_write( void *context, const void *inbuf_arg, size_t inlen); - -#endif /*GCRY_HASH_COMMON_H*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/hmac-tests.c b/src/hos_libhttpserver/src/libgcrypt/cipher/hmac-tests.c deleted file mode 100644 index 7c27342c..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/hmac-tests.c +++ /dev/null @@ -1,732 +0,0 @@ -/* hmac-tests.c - HMAC selftests. - * Copyright (C) 2008 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -/* - Although algorithm self-tests are usually implemented in the module - implementing the algorithm, the case for HMAC is different because - HMAC is implemnetd on a higher level using a special feature of the - gcry_md_ functions. It would be possible to do this also in the - digest algorithm modules, but that would blow up the code too much - and spread the hmac tests over several modules. - - Thus we implement all HMAC tests in this test module and provide a - function to run the tests. -*/ - -#include -#include -#include -#include -#ifdef HAVE_STDINT_H -# include -#endif - -#include "g10lib.h" -#include "cipher.h" -#include "hmac256.h" - -/* Check one HMAC with digest ALGO using the regualr HAMC - API. (DATA,DATALEN) is the data to be MACed, (KEY,KEYLEN) the key - and (EXPECT,EXPECTLEN) the expected result. Returns NULL on - succdess or a string describing the failure. */ -static const char * -check_one (int algo, - const void *data, size_t datalen, - const void *key, size_t keylen, - const void *expect, size_t expectlen) -{ - gcry_md_hd_t hd; - const unsigned char *digest; - -/* printf ("HMAC algo %d\n", algo); */ - if (_gcry_md_get_algo_dlen (algo) != expectlen) - return "invalid tests data"; - if (_gcry_md_open (&hd, algo, GCRY_MD_FLAG_HMAC)) - return "gcry_md_open failed"; - if (_gcry_md_setkey (hd, key, keylen)) - { - _gcry_md_close (hd); - return "gcry_md_setkey failed"; - } - _gcry_md_write (hd, data, datalen); - digest = _gcry_md_read (hd, algo); - if (!digest) - { - _gcry_md_close (hd); - return "gcry_md_read failed"; - } - if (memcmp (digest, expect, expectlen)) - { -/* int i; */ - -/* fputs (" {", stdout); */ -/* for (i=0; i < expectlen-1; i++) */ -/* { */ -/* if (i && !(i % 8)) */ -/* fputs ("\n ", stdout); */ -/* printf (" 0x%02x,", digest[i]); */ -/* } */ -/* printf (" 0x%02x } },\n", digest[i]); */ - - _gcry_md_close (hd); - return "does not match"; - } - _gcry_md_close (hd); - return NULL; -} - - -static gpg_err_code_t -selftests_sha1 (int extended, selftest_report_func_t report) -{ - const char *what; - const char *errtxt; - unsigned char key[128]; - int i, j; - - what = "FIPS-198a, A.1"; - for (i=0; i < 64; i++) - key[i] = i; - errtxt = check_one (GCRY_MD_SHA1, - "Sample #1", 9, - key, 64, - "\x4f\x4c\xa3\xd5\xd6\x8b\xa7\xcc\x0a\x12" - "\x08\xc9\xc6\x1e\x9c\x5d\xa0\x40\x3c\x0a", 20); - if (errtxt) - goto failed; - - if (extended) - { - what = "FIPS-198a, A.2"; - for (i=0, j=0x30; i < 20; i++) - key[i] = j++; - errtxt = check_one (GCRY_MD_SHA1, - "Sample #2", 9, - key, 20, - "\x09\x22\xd3\x40\x5f\xaa\x3d\x19\x4f\x82" - "\xa4\x58\x30\x73\x7d\x5c\xc6\xc7\x5d\x24", 20); - if (errtxt) - goto failed; - - what = "FIPS-198a, A.3"; - for (i=0, j=0x50; i < 100; i++) - key[i] = j++; - errtxt = check_one (GCRY_MD_SHA1, - "Sample #3", 9, - key, 100, - "\xbc\xf4\x1e\xab\x8b\xb2\xd8\x02\xf3\xd0" - "\x5c\xaf\x7c\xb0\x92\xec\xf8\xd1\xa3\xaa", 20 ); - if (errtxt) - goto failed; - - what = "FIPS-198a, A.4"; - for (i=0, j=0x70; i < 49; i++) - key[i] = j++; - errtxt = check_one (GCRY_MD_SHA1, - "Sample #4", 9, - key, 49, - "\x9e\xa8\x86\xef\xe2\x68\xdb\xec\xce\x42" - "\x0c\x75\x24\xdf\x32\xe0\x75\x1a\x2a\x26", 20 ); - if (errtxt) - goto failed; - } - - return 0; /* Succeeded. */ - - failed: - if (report) - report ("hmac", GCRY_MD_SHA1, what, errtxt); - return GPG_ERR_SELFTEST_FAILED; -} - - - -static gpg_err_code_t -selftests_sha224 (int extended, selftest_report_func_t report) -{ - static struct - { - const char * const desc; - const char * const data; - const char * const key; - const char expect[28]; - } tv[] = - { - { "data-28 key-4", - "what do ya want for nothing?", - "Jefe", - { 0xa3, 0x0e, 0x01, 0x09, 0x8b, 0xc6, 0xdb, 0xbf, - 0x45, 0x69, 0x0f, 0x3a, 0x7e, 0x9e, 0x6d, 0x0f, - 0x8b, 0xbe, 0xa2, 0xa3, 0x9e, 0x61, 0x48, 0x00, - 0x8f, 0xd0, 0x5e, 0x44 } }, - - { "data-9 key-20", - "Hi There", - "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" - "\x0b\x0b\x0b\x0b", - { 0x89, 0x6f, 0xb1, 0x12, 0x8a, 0xbb, 0xdf, 0x19, - 0x68, 0x32, 0x10, 0x7c, 0xd4, 0x9d, 0xf3, 0x3f, - 0x47, 0xb4, 0xb1, 0x16, 0x99, 0x12, 0xba, 0x4f, - 0x53, 0x68, 0x4b, 0x22 } }, - - { "data-50 key-20", - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa", - { 0x7f, 0xb3, 0xcb, 0x35, 0x88, 0xc6, 0xc1, 0xf6, - 0xff, 0xa9, 0x69, 0x4d, 0x7d, 0x6a, 0xd2, 0x64, - 0x93, 0x65, 0xb0, 0xc1, 0xf6, 0x5d, 0x69, 0xd1, - 0xec, 0x83, 0x33, 0xea } }, - - { "data-50 key-26", - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd", - "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10" - "\x11\x12\x13\x14\x15\x16\x17\x18\x19", - { 0x6c, 0x11, 0x50, 0x68, 0x74, 0x01, 0x3c, 0xac, - 0x6a, 0x2a, 0xbc, 0x1b, 0xb3, 0x82, 0x62, 0x7c, - 0xec, 0x6a, 0x90, 0xd8, 0x6e, 0xfc, 0x01, 0x2d, - 0xe7, 0xaf, 0xec, 0x5a } }, - - { "data-54 key-131", - "Test Using Larger Than Block-Size Key - Hash Key First", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa", - { 0x95, 0xe9, 0xa0, 0xdb, 0x96, 0x20, 0x95, 0xad, - 0xae, 0xbe, 0x9b, 0x2d, 0x6f, 0x0d, 0xbc, 0xe2, - 0xd4, 0x99, 0xf1, 0x12, 0xf2, 0xd2, 0xb7, 0x27, - 0x3f, 0xa6, 0x87, 0x0e } }, - - { "data-152 key-131", - "This is a test using a larger than block-size key and a larger " - "than block-size data. The key needs to be hashed before being " - "used by the HMAC algorithm.", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa", - { 0x3a, 0x85, 0x41, 0x66, 0xac, 0x5d, 0x9f, 0x02, - 0x3f, 0x54, 0xd5, 0x17, 0xd0, 0xb3, 0x9d, 0xbd, - 0x94, 0x67, 0x70, 0xdb, 0x9c, 0x2b, 0x95, 0xc9, - 0xf6, 0xf5, 0x65, 0xd1 } }, - - { NULL } - }; - const char *what; - const char *errtxt; - int tvidx; - - for (tvidx=0; tv[tvidx].desc; tvidx++) - { - what = tv[tvidx].desc; - errtxt = check_one (GCRY_MD_SHA224, - tv[tvidx].data, strlen (tv[tvidx].data), - tv[tvidx].key, strlen (tv[tvidx].key), - tv[tvidx].expect, DIM (tv[tvidx].expect) ); - if (errtxt) - goto failed; - if (!extended) - break; - } - - return 0; /* Succeeded. */ - - failed: - if (report) - report ("hmac", GCRY_MD_SHA224, what, errtxt); - return GPG_ERR_SELFTEST_FAILED; -} - - -static gpg_err_code_t -selftests_sha256 (int extended, selftest_report_func_t report) -{ - static struct - { - const char * const desc; - const char * const data; - const char * const key; - const char expect[32]; - } tv[] = - { - { "data-28 key-4", - "what do ya want for nothing?", - "Jefe", - { 0x5b, 0xdc, 0xc1, 0x46, 0xbf, 0x60, 0x75, 0x4e, - 0x6a, 0x04, 0x24, 0x26, 0x08, 0x95, 0x75, 0xc7, - 0x5a, 0x00, 0x3f, 0x08, 0x9d, 0x27, 0x39, 0x83, - 0x9d, 0xec, 0x58, 0xb9, 0x64, 0xec, 0x38, 0x43 } }, - - { "data-9 key-20", - "Hi There", - "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" - "\x0b\x0b\x0b\x0b", - { 0xb0, 0x34, 0x4c, 0x61, 0xd8, 0xdb, 0x38, 0x53, - 0x5c, 0xa8, 0xaf, 0xce, 0xaf, 0x0b, 0xf1, 0x2b, - 0x88, 0x1d, 0xc2, 0x00, 0xc9, 0x83, 0x3d, 0xa7, - 0x26, 0xe9, 0x37, 0x6c, 0x2e, 0x32, 0xcf, 0xf7 } }, - - { "data-50 key-20", - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa", - { 0x77, 0x3e, 0xa9, 0x1e, 0x36, 0x80, 0x0e, 0x46, - 0x85, 0x4d, 0xb8, 0xeb, 0xd0, 0x91, 0x81, 0xa7, - 0x29, 0x59, 0x09, 0x8b, 0x3e, 0xf8, 0xc1, 0x22, - 0xd9, 0x63, 0x55, 0x14, 0xce, 0xd5, 0x65, 0xfe } }, - - { "data-50 key-26", - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd", - "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10" - "\x11\x12\x13\x14\x15\x16\x17\x18\x19", - { 0x82, 0x55, 0x8a, 0x38, 0x9a, 0x44, 0x3c, 0x0e, - 0xa4, 0xcc, 0x81, 0x98, 0x99, 0xf2, 0x08, 0x3a, - 0x85, 0xf0, 0xfa, 0xa3, 0xe5, 0x78, 0xf8, 0x07, - 0x7a, 0x2e, 0x3f, 0xf4, 0x67, 0x29, 0x66, 0x5b } }, - - { "data-54 key-131", - "Test Using Larger Than Block-Size Key - Hash Key First", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa", - { 0x60, 0xe4, 0x31, 0x59, 0x1e, 0xe0, 0xb6, 0x7f, - 0x0d, 0x8a, 0x26, 0xaa, 0xcb, 0xf5, 0xb7, 0x7f, - 0x8e, 0x0b, 0xc6, 0x21, 0x37, 0x28, 0xc5, 0x14, - 0x05, 0x46, 0x04, 0x0f, 0x0e, 0xe3, 0x7f, 0x54 } }, - - { "data-152 key-131", - "This is a test using a larger than block-size key and a larger " - "than block-size data. The key needs to be hashed before being " - "used by the HMAC algorithm.", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa", - { 0x9b, 0x09, 0xff, 0xa7, 0x1b, 0x94, 0x2f, 0xcb, - 0x27, 0x63, 0x5f, 0xbc, 0xd5, 0xb0, 0xe9, 0x44, - 0xbf, 0xdc, 0x63, 0x64, 0x4f, 0x07, 0x13, 0x93, - 0x8a, 0x7f, 0x51, 0x53, 0x5c, 0x3a, 0x35, 0xe2 } }, - - { NULL } - }; - const char *what; - const char *errtxt; - int tvidx; - - for (tvidx=0; tv[tvidx].desc; tvidx++) - { - hmac256_context_t hmachd; - const unsigned char *digest; - size_t dlen; - - what = tv[tvidx].desc; - errtxt = check_one (GCRY_MD_SHA256, - tv[tvidx].data, strlen (tv[tvidx].data), - tv[tvidx].key, strlen (tv[tvidx].key), - tv[tvidx].expect, DIM (tv[tvidx].expect) ); - if (errtxt) - goto failed; - - hmachd = _gcry_hmac256_new (tv[tvidx].key, strlen (tv[tvidx].key)); - if (!hmachd) - { - errtxt = "_gcry_hmac256_new failed"; - goto failed; - } - _gcry_hmac256_update (hmachd, tv[tvidx].data, strlen (tv[tvidx].data)); - digest = _gcry_hmac256_finalize (hmachd, &dlen); - if (!digest) - { - errtxt = "_gcry_hmac256_finalize failed"; - _gcry_hmac256_release (hmachd); - goto failed; - } - if (dlen != DIM (tv[tvidx].expect) - || memcmp (digest, tv[tvidx].expect, DIM (tv[tvidx].expect))) - { - errtxt = "does not match in second implementation"; - _gcry_hmac256_release (hmachd); - goto failed; - } - _gcry_hmac256_release (hmachd); - - if (!extended) - break; - } - - return 0; /* Succeeded. */ - - failed: - if (report) - report ("hmac", GCRY_MD_SHA256, what, errtxt); - return GPG_ERR_SELFTEST_FAILED; -} - - -static gpg_err_code_t -selftests_sha384 (int extended, selftest_report_func_t report) -{ - static struct - { - const char * const desc; - const char * const data; - const char * const key; - const char expect[48]; - } tv[] = - { - { "data-28 key-4", - "what do ya want for nothing?", - "Jefe", - { 0xaf, 0x45, 0xd2, 0xe3, 0x76, 0x48, 0x40, 0x31, - 0x61, 0x7f, 0x78, 0xd2, 0xb5, 0x8a, 0x6b, 0x1b, - 0x9c, 0x7e, 0xf4, 0x64, 0xf5, 0xa0, 0x1b, 0x47, - 0xe4, 0x2e, 0xc3, 0x73, 0x63, 0x22, 0x44, 0x5e, - 0x8e, 0x22, 0x40, 0xca, 0x5e, 0x69, 0xe2, 0xc7, - 0x8b, 0x32, 0x39, 0xec, 0xfa, 0xb2, 0x16, 0x49 } }, - - { "data-9 key-20", - "Hi There", - "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" - "\x0b\x0b\x0b\x0b", - { 0xaf, 0xd0, 0x39, 0x44, 0xd8, 0x48, 0x95, 0x62, - 0x6b, 0x08, 0x25, 0xf4, 0xab, 0x46, 0x90, 0x7f, - 0x15, 0xf9, 0xda, 0xdb, 0xe4, 0x10, 0x1e, 0xc6, - 0x82, 0xaa, 0x03, 0x4c, 0x7c, 0xeb, 0xc5, 0x9c, - 0xfa, 0xea, 0x9e, 0xa9, 0x07, 0x6e, 0xde, 0x7f, - 0x4a, 0xf1, 0x52, 0xe8, 0xb2, 0xfa, 0x9c, 0xb6 } }, - - { "data-50 key-20", - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa", - { 0x88, 0x06, 0x26, 0x08, 0xd3, 0xe6, 0xad, 0x8a, - 0x0a, 0xa2, 0xac, 0xe0, 0x14, 0xc8, 0xa8, 0x6f, - 0x0a, 0xa6, 0x35, 0xd9, 0x47, 0xac, 0x9f, 0xeb, - 0xe8, 0x3e, 0xf4, 0xe5, 0x59, 0x66, 0x14, 0x4b, - 0x2a, 0x5a, 0xb3, 0x9d, 0xc1, 0x38, 0x14, 0xb9, - 0x4e, 0x3a, 0xb6, 0xe1, 0x01, 0xa3, 0x4f, 0x27 } }, - - { "data-50 key-26", - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd", - "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10" - "\x11\x12\x13\x14\x15\x16\x17\x18\x19", - { 0x3e, 0x8a, 0x69, 0xb7, 0x78, 0x3c, 0x25, 0x85, - 0x19, 0x33, 0xab, 0x62, 0x90, 0xaf, 0x6c, 0xa7, - 0x7a, 0x99, 0x81, 0x48, 0x08, 0x50, 0x00, 0x9c, - 0xc5, 0x57, 0x7c, 0x6e, 0x1f, 0x57, 0x3b, 0x4e, - 0x68, 0x01, 0xdd, 0x23, 0xc4, 0xa7, 0xd6, 0x79, - 0xcc, 0xf8, 0xa3, 0x86, 0xc6, 0x74, 0xcf, 0xfb } }, - - { "data-54 key-131", - "Test Using Larger Than Block-Size Key - Hash Key First", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa", - { 0x4e, 0xce, 0x08, 0x44, 0x85, 0x81, 0x3e, 0x90, - 0x88, 0xd2, 0xc6, 0x3a, 0x04, 0x1b, 0xc5, 0xb4, - 0x4f, 0x9e, 0xf1, 0x01, 0x2a, 0x2b, 0x58, 0x8f, - 0x3c, 0xd1, 0x1f, 0x05, 0x03, 0x3a, 0xc4, 0xc6, - 0x0c, 0x2e, 0xf6, 0xab, 0x40, 0x30, 0xfe, 0x82, - 0x96, 0x24, 0x8d, 0xf1, 0x63, 0xf4, 0x49, 0x52 } }, - - { "data-152 key-131", - "This is a test using a larger than block-size key and a larger " - "than block-size data. The key needs to be hashed before being " - "used by the HMAC algorithm.", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa", - { 0x66, 0x17, 0x17, 0x8e, 0x94, 0x1f, 0x02, 0x0d, - 0x35, 0x1e, 0x2f, 0x25, 0x4e, 0x8f, 0xd3, 0x2c, - 0x60, 0x24, 0x20, 0xfe, 0xb0, 0xb8, 0xfb, 0x9a, - 0xdc, 0xce, 0xbb, 0x82, 0x46, 0x1e, 0x99, 0xc5, - 0xa6, 0x78, 0xcc, 0x31, 0xe7, 0x99, 0x17, 0x6d, - 0x38, 0x60, 0xe6, 0x11, 0x0c, 0x46, 0x52, 0x3e } }, - - { NULL } - }; - const char *what; - const char *errtxt; - int tvidx; - - for (tvidx=0; tv[tvidx].desc; tvidx++) - { - what = tv[tvidx].desc; - errtxt = check_one (GCRY_MD_SHA384, - tv[tvidx].data, strlen (tv[tvidx].data), - tv[tvidx].key, strlen (tv[tvidx].key), - tv[tvidx].expect, DIM (tv[tvidx].expect) ); - if (errtxt) - goto failed; - if (!extended) - break; - } - - return 0; /* Succeeded. */ - - failed: - if (report) - report ("hmac", GCRY_MD_SHA384, what, errtxt); - return GPG_ERR_SELFTEST_FAILED; -} - - -static gpg_err_code_t -selftests_sha512 (int extended, selftest_report_func_t report) -{ - static struct - { - const char * const desc; - const char * const data; - const char * const key; - const char expect[64]; - } tv[] = - { - { "data-28 key-4", - "what do ya want for nothing?", - "Jefe", - { 0x16, 0x4b, 0x7a, 0x7b, 0xfc, 0xf8, 0x19, 0xe2, - 0xe3, 0x95, 0xfb, 0xe7, 0x3b, 0x56, 0xe0, 0xa3, - 0x87, 0xbd, 0x64, 0x22, 0x2e, 0x83, 0x1f, 0xd6, - 0x10, 0x27, 0x0c, 0xd7, 0xea, 0x25, 0x05, 0x54, - 0x97, 0x58, 0xbf, 0x75, 0xc0, 0x5a, 0x99, 0x4a, - 0x6d, 0x03, 0x4f, 0x65, 0xf8, 0xf0, 0xe6, 0xfd, - 0xca, 0xea, 0xb1, 0xa3, 0x4d, 0x4a, 0x6b, 0x4b, - 0x63, 0x6e, 0x07, 0x0a, 0x38, 0xbc, 0xe7, 0x37 } }, - - { "data-9 key-20", - "Hi There", - "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" - "\x0b\x0b\x0b\x0b", - { 0x87, 0xaa, 0x7c, 0xde, 0xa5, 0xef, 0x61, 0x9d, - 0x4f, 0xf0, 0xb4, 0x24, 0x1a, 0x1d, 0x6c, 0xb0, - 0x23, 0x79, 0xf4, 0xe2, 0xce, 0x4e, 0xc2, 0x78, - 0x7a, 0xd0, 0xb3, 0x05, 0x45, 0xe1, 0x7c, 0xde, - 0xda, 0xa8, 0x33, 0xb7, 0xd6, 0xb8, 0xa7, 0x02, - 0x03, 0x8b, 0x27, 0x4e, 0xae, 0xa3, 0xf4, 0xe4, - 0xbe, 0x9d, 0x91, 0x4e, 0xeb, 0x61, 0xf1, 0x70, - 0x2e, 0x69, 0x6c, 0x20, 0x3a, 0x12, 0x68, 0x54 } }, - - { "data-50 key-20", - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" - "\xdd\xdd", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa", - { 0xfa, 0x73, 0xb0, 0x08, 0x9d, 0x56, 0xa2, 0x84, - 0xef, 0xb0, 0xf0, 0x75, 0x6c, 0x89, 0x0b, 0xe9, - 0xb1, 0xb5, 0xdb, 0xdd, 0x8e, 0xe8, 0x1a, 0x36, - 0x55, 0xf8, 0x3e, 0x33, 0xb2, 0x27, 0x9d, 0x39, - 0xbf, 0x3e, 0x84, 0x82, 0x79, 0xa7, 0x22, 0xc8, - 0x06, 0xb4, 0x85, 0xa4, 0x7e, 0x67, 0xc8, 0x07, - 0xb9, 0x46, 0xa3, 0x37, 0xbe, 0xe8, 0x94, 0x26, - 0x74, 0x27, 0x88, 0x59, 0xe1, 0x32, 0x92, 0xfb } }, - - { "data-50 key-26", - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" - "\xcd\xcd", - "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10" - "\x11\x12\x13\x14\x15\x16\x17\x18\x19", - { 0xb0, 0xba, 0x46, 0x56, 0x37, 0x45, 0x8c, 0x69, - 0x90, 0xe5, 0xa8, 0xc5, 0xf6, 0x1d, 0x4a, 0xf7, - 0xe5, 0x76, 0xd9, 0x7f, 0xf9, 0x4b, 0x87, 0x2d, - 0xe7, 0x6f, 0x80, 0x50, 0x36, 0x1e, 0xe3, 0xdb, - 0xa9, 0x1c, 0xa5, 0xc1, 0x1a, 0xa2, 0x5e, 0xb4, - 0xd6, 0x79, 0x27, 0x5c, 0xc5, 0x78, 0x80, 0x63, - 0xa5, 0xf1, 0x97, 0x41, 0x12, 0x0c, 0x4f, 0x2d, - 0xe2, 0xad, 0xeb, 0xeb, 0x10, 0xa2, 0x98, 0xdd } }, - - { "data-54 key-131", - "Test Using Larger Than Block-Size Key - Hash Key First", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa", - { 0x80, 0xb2, 0x42, 0x63, 0xc7, 0xc1, 0xa3, 0xeb, - 0xb7, 0x14, 0x93, 0xc1, 0xdd, 0x7b, 0xe8, 0xb4, - 0x9b, 0x46, 0xd1, 0xf4, 0x1b, 0x4a, 0xee, 0xc1, - 0x12, 0x1b, 0x01, 0x37, 0x83, 0xf8, 0xf3, 0x52, - 0x6b, 0x56, 0xd0, 0x37, 0xe0, 0x5f, 0x25, 0x98, - 0xbd, 0x0f, 0xd2, 0x21, 0x5d, 0x6a, 0x1e, 0x52, - 0x95, 0xe6, 0x4f, 0x73, 0xf6, 0x3f, 0x0a, 0xec, - 0x8b, 0x91, 0x5a, 0x98, 0x5d, 0x78, 0x65, 0x98 } }, - - { "data-152 key-131", - "This is a test using a larger than block-size key and a larger " - "than block-size data. The key needs to be hashed before being " - "used by the HMAC algorithm.", - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" - "\xaa\xaa\xaa", - { 0xe3, 0x7b, 0x6a, 0x77, 0x5d, 0xc8, 0x7d, 0xba, - 0xa4, 0xdf, 0xa9, 0xf9, 0x6e, 0x5e, 0x3f, 0xfd, - 0xde, 0xbd, 0x71, 0xf8, 0x86, 0x72, 0x89, 0x86, - 0x5d, 0xf5, 0xa3, 0x2d, 0x20, 0xcd, 0xc9, 0x44, - 0xb6, 0x02, 0x2c, 0xac, 0x3c, 0x49, 0x82, 0xb1, - 0x0d, 0x5e, 0xeb, 0x55, 0xc3, 0xe4, 0xde, 0x15, - 0x13, 0x46, 0x76, 0xfb, 0x6d, 0xe0, 0x44, 0x60, - 0x65, 0xc9, 0x74, 0x40, 0xfa, 0x8c, 0x6a, 0x58 } }, - - { NULL } - }; - const char *what; - const char *errtxt; - int tvidx; - - for (tvidx=0; tv[tvidx].desc; tvidx++) - { - what = tv[tvidx].desc; - errtxt = check_one (GCRY_MD_SHA512, - tv[tvidx].data, strlen (tv[tvidx].data), - tv[tvidx].key, strlen (tv[tvidx].key), - tv[tvidx].expect, DIM (tv[tvidx].expect) ); - if (errtxt) - goto failed; - if (!extended) - break; - } - - return 0; /* Succeeded. */ - - failed: - if (report) - report ("hmac", GCRY_MD_SHA512, what, errtxt); - return GPG_ERR_SELFTEST_FAILED; -} - - - -/* Run a full self-test for ALGO and return 0 on success. */ -static gpg_err_code_t -run_selftests (int algo, int extended, selftest_report_func_t report) -{ - gpg_err_code_t ec; - - switch (algo) - { - case GCRY_MD_SHA1: - ec = selftests_sha1 (extended, report); - break; - case GCRY_MD_SHA224: - ec = selftests_sha224 (extended, report); - break; - case GCRY_MD_SHA256: - ec = selftests_sha256 (extended, report); - break; - case GCRY_MD_SHA384: - ec = selftests_sha384 (extended, report); - break; - case GCRY_MD_SHA512: - ec = selftests_sha512 (extended, report); - break; - default: - ec = GPG_ERR_DIGEST_ALGO; - break; - } - return ec; -} - - - - -/* Run the selftests for HMAC with digest algorithm ALGO with optional - reporting function REPORT. */ -gpg_error_t -_gcry_hmac_selftest (int algo, int extended, selftest_report_func_t report) -{ - gcry_err_code_t ec = 0; - - if (!_gcry_md_test_algo (algo)) - { - ec = run_selftests (algo, extended, report); - } - else - { - ec = GPG_ERR_DIGEST_ALGO; - if (report) - report ("hmac", algo, "module", "algorithm not available"); - } - return gpg_error (ec); -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/idea.c b/src/hos_libhttpserver/src/libgcrypt/cipher/idea.c deleted file mode 100644 index 14234cf0..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/idea.c +++ /dev/null @@ -1,379 +0,0 @@ -/* idea.c - IDEA function - * Copyright 1997, 1998, 1999, 2001 Werner Koch (dd9jn) - * Copyright 2013 g10 Code GmbH - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * WERNER KOCH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of Werner Koch shall not be - * used in advertising or otherwise to promote the sale, use or other dealings - * in this Software without prior written authorization from Werner Koch. - * - * Patents on IDEA have expired: - * Europe: EP0482154 on 2011-05-16, - * Japan: JP3225440 on 2011-05-16, - * U.S.: 5,214,703 on 2012-01-07. - */ - -/* - * Please see http://www.noepatents.org/ to learn why software patents - * are bad for society and what you can do to fight them. - * - * The code herein is based on the one from: - * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996. - * ISBN 0-471-11709-9. - */ - - -#include -#include -#include -#include -#include - -#include "types.h" /* for byte and u32 typedefs */ -#include "g10lib.h" -#include "cipher.h" - - -#define IDEA_KEYSIZE 16 -#define IDEA_BLOCKSIZE 8 -#define IDEA_ROUNDS 8 -#define IDEA_KEYLEN (6*IDEA_ROUNDS+4) - -typedef struct { - u16 ek[IDEA_KEYLEN]; - u16 dk[IDEA_KEYLEN]; - int have_dk; -} IDEA_context; - -static const char *selftest(void); - - -static u16 -mul_inv( u16 x ) -{ - u16 t0, t1; - u16 q, y; - - if( x < 2 ) - return x; - t1 = 0x10001UL / x; - y = 0x10001UL % x; - if( y == 1 ) - return (1-t1) & 0xffff; - - t0 = 1; - do { - q = x / y; - x = x % y; - t0 += q * t1; - if( x == 1 ) - return t0; - q = y / x; - y = y % x; - t1 += q * t0; - } while( y != 1 ); - return (1-t1) & 0xffff; -} - - - -static void -expand_key( const byte *userkey, u16 *ek ) -{ - int i,j; - - for(j=0; j < 8; j++ ) { - ek[j] = (*userkey << 8) + userkey[1]; - userkey += 2; - } - for(i=0; j < IDEA_KEYLEN; j++ ) { - i++; - ek[i+7] = ek[i&7] << 9 | ek[(i+1)&7] >> 7; - ek += i & 8; - i &= 7; - } -} - - -static void -invert_key( u16 *ek, u16 dk[IDEA_KEYLEN] ) -{ - int i; - u16 t1, t2, t3; - u16 temp[IDEA_KEYLEN]; - u16 *p = temp + IDEA_KEYLEN; - - t1 = mul_inv( *ek++ ); - t2 = -*ek++; - t3 = -*ek++; - *--p = mul_inv( *ek++ ); - *--p = t3; - *--p = t2; - *--p = t1; - - for(i=0; i < IDEA_ROUNDS-1; i++ ) { - t1 = *ek++; - *--p = *ek++; - *--p = t1; - - t1 = mul_inv( *ek++ ); - t2 = -*ek++; - t3 = -*ek++; - *--p = mul_inv( *ek++ ); - *--p = t2; - *--p = t3; - *--p = t1; - } - t1 = *ek++; - *--p = *ek++; - *--p = t1; - - t1 = mul_inv( *ek++ ); - t2 = -*ek++; - t3 = -*ek++; - *--p = mul_inv( *ek++ ); - *--p = t3; - *--p = t2; - *--p = t1; - memcpy(dk, temp, sizeof(temp) ); - memset(temp, 0, sizeof(temp) ); /* burn temp */ -} - - -static void -cipher( byte *outbuf, const byte *inbuf, u16 *key ) -{ - u16 s2, s3; - u16 in[4]; - int r = IDEA_ROUNDS; -#define x1 (in[0]) -#define x2 (in[1]) -#define x3 (in[2]) -#define x4 (in[3]) -#define MUL(x,y) \ - do {u16 _t16; u32 _t32; \ - if( (_t16 = (y)) ) { \ - if( (x = (x)&0xffff) ) { \ - _t32 = (u32)x * _t16; \ - x = _t32 & 0xffff; \ - _t16 = _t32 >> 16; \ - x = ((x)-_t16) + (x<_t16?1:0); \ - } \ - else { \ - x = 1 - _t16; \ - } \ - } \ - else { \ - x = 1 - x; \ - } \ - } while(0) - - memcpy (in, inbuf, sizeof in); -#ifndef WORDS_BIGENDIAN - x1 = (x1>>8) | (x1<<8); - x2 = (x2>>8) | (x2<<8); - x3 = (x3>>8) | (x3<<8); - x4 = (x4>>8) | (x4<<8); -#endif - do { - MUL(x1, *key++); - x2 += *key++; - x3 += *key++; - MUL(x4, *key++ ); - - s3 = x3; - x3 ^= x1; - MUL(x3, *key++); - s2 = x2; - x2 ^=x4; - x2 += x3; - MUL(x2, *key++); - x3 += x2; - - x1 ^= x2; - x4 ^= x3; - - x2 ^= s3; - x3 ^= s2; - } while( --r ); - MUL(x1, *key++); - x3 += *key++; - x2 += *key++; - MUL(x4, *key); - -#ifndef WORDS_BIGENDIAN - x1 = (x1>>8) | (x1<<8); - x2 = (x2>>8) | (x2<<8); - x3 = (x3>>8) | (x3<<8); - x4 = (x4>>8) | (x4<<8); -#endif - memcpy (outbuf+0, &x1, 2); - memcpy (outbuf+2, &x3, 2); - memcpy (outbuf+4, &x2, 2); - memcpy (outbuf+6, &x4, 2); -#undef MUL -#undef x1 -#undef x2 -#undef x3 -#undef x4 -} - - -static int -do_setkey( IDEA_context *c, const byte *key, unsigned int keylen ) -{ - static int initialized = 0; - static const char *selftest_failed = 0; - - if( !initialized ) { - initialized = 1; - selftest_failed = selftest(); - if( selftest_failed ) - log_error( "%s\n", selftest_failed ); - } - if( selftest_failed ) - return GPG_ERR_SELFTEST_FAILED; - - assert(keylen == 16); - c->have_dk = 0; - expand_key( key, c->ek ); - invert_key( c->ek, c->dk ); - return 0; -} - -static gcry_err_code_t -idea_setkey (void *context, const byte *key, unsigned int keylen) -{ - IDEA_context *ctx = context; - int rc = do_setkey (ctx, key, keylen); - _gcry_burn_stack (23+6*sizeof(void*)); - return rc; -} - -static void -encrypt_block( IDEA_context *c, byte *outbuf, const byte *inbuf ) -{ - cipher( outbuf, inbuf, c->ek ); -} - -static unsigned int -idea_encrypt (void *context, byte *out, const byte *in) -{ - IDEA_context *ctx = context; - encrypt_block (ctx, out, in); - return /*burn_stack*/ (24+3*sizeof (void*)); -} - -static void -decrypt_block( IDEA_context *c, byte *outbuf, const byte *inbuf ) -{ - if( !c->have_dk ) { - c->have_dk = 1; - invert_key( c->ek, c->dk ); - } - cipher( outbuf, inbuf, c->dk ); -} - -static unsigned int -idea_decrypt (void *context, byte *out, const byte *in) -{ - IDEA_context *ctx = context; - decrypt_block (ctx, out, in); - return /*burn_stack*/ (24+3*sizeof (void*)); -} - - -static const char * -selftest( void ) -{ -static struct { - byte key[16]; - byte plain[8]; - byte cipher[8]; -} test_vectors[] = { - { { 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, - 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08 }, - { 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03 }, - { 0x11, 0xFB, 0xED, 0x2B, 0x01, 0x98, 0x6D, 0xE5 } }, - { { 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, - 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08 }, - { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }, - { 0x54, 0x0E, 0x5F, 0xEA, 0x18, 0xC2, 0xF8, 0xB1 } }, - { { 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, - 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08 }, - { 0x00, 0x19, 0x32, 0x4B, 0x64, 0x7D, 0x96, 0xAF }, - { 0x9F, 0x0A, 0x0A, 0xB6, 0xE1, 0x0C, 0xED, 0x78 } }, - { { 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, - 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08 }, - { 0xF5, 0x20, 0x2D, 0x5B, 0x9C, 0x67, 0x1B, 0x08 }, - { 0xCF, 0x18, 0xFD, 0x73, 0x55, 0xE2, 0xC5, 0xC5 } }, - { { 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, - 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08 }, - { 0xFA, 0xE6, 0xD2, 0xBE, 0xAA, 0x96, 0x82, 0x6E }, - { 0x85, 0xDF, 0x52, 0x00, 0x56, 0x08, 0x19, 0x3D } }, - { { 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, - 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08 }, - { 0x0A, 0x14, 0x1E, 0x28, 0x32, 0x3C, 0x46, 0x50 }, - { 0x2F, 0x7D, 0xE7, 0x50, 0x21, 0x2F, 0xB7, 0x34 } }, - { { 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, - 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08 }, - { 0x05, 0x0A, 0x0F, 0x14, 0x19, 0x1E, 0x23, 0x28 }, - { 0x7B, 0x73, 0x14, 0x92, 0x5D, 0xE5, 0x9C, 0x09 } }, - { { 0x00, 0x05, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x14, - 0x00, 0x19, 0x00, 0x1E, 0x00, 0x23, 0x00, 0x28 }, - { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }, - { 0x3E, 0xC0, 0x47, 0x80, 0xBE, 0xFF, 0x6E, 0x20 } }, - { { 0x3A, 0x98, 0x4E, 0x20, 0x00, 0x19, 0x5D, 0xB3, - 0x2E, 0xE5, 0x01, 0xC8, 0xC4, 0x7C, 0xEA, 0x60 }, - { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }, - { 0x97, 0xBC, 0xD8, 0x20, 0x07, 0x80, 0xDA, 0x86 } }, - { { 0x00, 0x64, 0x00, 0xC8, 0x01, 0x2C, 0x01, 0x90, - 0x01, 0xF4, 0x02, 0x58, 0x02, 0xBC, 0x03, 0x20 }, - { 0x05, 0x32, 0x0A, 0x64, 0x14, 0xC8, 0x19, 0xFA }, - { 0x65, 0xBE, 0x87, 0xE7, 0xA2, 0x53, 0x8A, 0xED } }, - { { 0x9D, 0x40, 0x75, 0xC1, 0x03, 0xBC, 0x32, 0x2A, - 0xFB, 0x03, 0xE7, 0xBE, 0x6A, 0xB3, 0x00, 0x06 }, - { 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08 }, - { 0xF5, 0xDB, 0x1A, 0xC4, 0x5E, 0x5E, 0xF9, 0xF9 } } -}; - IDEA_context c; - byte buffer[8]; - int i; - - for(i=0; i < DIM(test_vectors); i++ ) { - do_setkey( &c, test_vectors[i].key, 16 ); - encrypt_block( &c, buffer, test_vectors[i].plain ); - if( memcmp( buffer, test_vectors[i].cipher, 8 ) ) - return "IDEA test encryption failed."; - decrypt_block( &c, buffer, test_vectors[i].cipher ); - if( memcmp( buffer, test_vectors[i].plain, 8 ) ) - return "IDEA test decryption failed."; - } - - return NULL; -} - - -gcry_cipher_spec_t _gcry_cipher_spec_idea = - { - GCRY_CIPHER_IDEA, {0, 0}, - "IDEA", NULL, NULL, IDEA_BLOCKSIZE, 128, - sizeof (IDEA_context), - idea_setkey, idea_encrypt, idea_decrypt - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/kdf-internal.h b/src/hos_libhttpserver/src/libgcrypt/cipher/kdf-internal.h deleted file mode 100644 index 7079860e..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/kdf-internal.h +++ /dev/null @@ -1,40 +0,0 @@ -/* kdf-internal.h - Internal defs for kdf.c - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifndef GCRY_KDF_INTERNAL_H -#define GCRY_KDF_INTERNAL_H - -/*-- kdf.c --*/ -gpg_err_code_t -_gcry_kdf_pkdf2 (const void *passphrase, size_t passphraselen, - int hashalgo, - const void *salt, size_t saltlen, - unsigned long iterations, - size_t keysize, void *keybuffer); - -/*-- scrypt.c --*/ -gcry_err_code_t -_gcry_kdf_scrypt (const unsigned char *passwd, size_t passwdlen, - int algo, int subalgo, - const unsigned char *salt, size_t saltlen, - unsigned long iterations, - size_t dklen, unsigned char *dk); - - -#endif /*GCRY_KDF_INTERNAL_H*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/kdf.c b/src/hos_libhttpserver/src/libgcrypt/cipher/kdf.c deleted file mode 100644 index af0dc480..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/kdf.c +++ /dev/null @@ -1,300 +0,0 @@ -/* kdf.c - Key Derivation Functions - * Copyright (C) 1998, 2011 Free Software Foundation, Inc. - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "ath.h" -#include "kdf-internal.h" - - -/* Transform a passphrase into a suitable key of length KEYSIZE and - store this key in the caller provided buffer KEYBUFFER. The caller - must provide an HASHALGO, a valid ALGO and depending on that algo a - SALT of 8 bytes and the number of ITERATIONS. Code taken from - gnupg/agent/protect.c:hash_passphrase. */ -static gpg_err_code_t -openpgp_s2k (const void *passphrase, size_t passphraselen, - int algo, int hashalgo, - const void *salt, size_t saltlen, - unsigned long iterations, - size_t keysize, void *keybuffer) -{ - gpg_err_code_t ec; - gcry_md_hd_t md; - char *key = keybuffer; - int pass, i; - int used = 0; - int secmode; - - if ((algo == GCRY_KDF_SALTED_S2K || algo == GCRY_KDF_ITERSALTED_S2K) - && (!salt || saltlen != 8)) - return GPG_ERR_INV_VALUE; - - secmode = _gcry_is_secure (passphrase) || _gcry_is_secure (keybuffer); - - ec = _gcry_md_open (&md, hashalgo, secmode? GCRY_MD_FLAG_SECURE : 0); - if (ec) - return ec; - - for (pass=0; used < keysize; pass++) - { - if (pass) - { - _gcry_md_reset (md); - for (i=0; i < pass; i++) /* Preset the hash context. */ - _gcry_md_putc (md, 0); - } - - if (algo == GCRY_KDF_SALTED_S2K || algo == GCRY_KDF_ITERSALTED_S2K) - { - int len2 = passphraselen + 8; - unsigned long count = len2; - - if (algo == GCRY_KDF_ITERSALTED_S2K) - { - count = iterations; - if (count < len2) - count = len2; - } - - while (count > len2) - { - _gcry_md_write (md, salt, saltlen); - _gcry_md_write (md, passphrase, passphraselen); - count -= len2; - } - if (count < saltlen) - _gcry_md_write (md, salt, count); - else - { - _gcry_md_write (md, salt, saltlen); - count -= saltlen; - _gcry_md_write (md, passphrase, count); - } - } - else - _gcry_md_write (md, passphrase, passphraselen); - - _gcry_md_final (md); - i = _gcry_md_get_algo_dlen (hashalgo); - if (i > keysize - used) - i = keysize - used; - memcpy (key+used, _gcry_md_read (md, hashalgo), i); - used += i; - } - _gcry_md_close (md); - return 0; -} - - -/* Transform a passphrase into a suitable key of length KEYSIZE and - store this key in the caller provided buffer KEYBUFFER. The caller - must provide PRFALGO which indicates the pseudorandom function to - use: This shall be the algorithms id of a hash algorithm; it is - used in HMAC mode. SALT is a salt of length SALTLEN and ITERATIONS - gives the number of iterations. */ -gpg_err_code_t -_gcry_kdf_pkdf2 (const void *passphrase, size_t passphraselen, - int hashalgo, - const void *salt, size_t saltlen, - unsigned long iterations, - size_t keysize, void *keybuffer) -{ - gpg_err_code_t ec; - gcry_md_hd_t md; - int secmode; - unsigned int dklen = keysize; - char *dk = keybuffer; - unsigned int hlen; /* Output length of the digest function. */ - unsigned int l; /* Rounded up number of blocks. */ - unsigned int r; /* Number of octets in the last block. */ - char *sbuf; /* Malloced buffer to concatenate salt and iter - as well as space to hold TBUF and UBUF. */ - char *tbuf; /* Buffer for T; ptr into SBUF, size is HLEN. */ - char *ubuf; /* Buffer for U; ptr into SBUF, size is HLEN. */ - unsigned int lidx; /* Current block number. */ - unsigned long iter; /* Current iteration number. */ - unsigned int i; - - /* NWe allow for a saltlen of 0 here to support scrypt. It is not - clear whether rfc2898 allows for this this, thus we do a test on - saltlen > 0 only in gcry_kdf_derive. */ - if (!salt || !iterations || !dklen) - return GPG_ERR_INV_VALUE; - - hlen = _gcry_md_get_algo_dlen (hashalgo); - if (!hlen) - return GPG_ERR_DIGEST_ALGO; - - secmode = _gcry_is_secure (passphrase) || _gcry_is_secure (keybuffer); - - /* We ignore step 1 from pksc5v2.1 which demands a check that dklen - is not larger that 0xffffffff * hlen. */ - - /* Step 2 */ - l = ((dklen - 1)/ hlen) + 1; - r = dklen - (l - 1) * hlen; - - /* Setup buffers and prepare a hash context. */ - sbuf = (secmode - ? xtrymalloc_secure (saltlen + 4 + hlen + hlen) - : xtrymalloc (saltlen + 4 + hlen + hlen)); - if (!sbuf) - return gpg_err_code_from_syserror (); - tbuf = sbuf + saltlen + 4; - ubuf = tbuf + hlen; - - ec = _gcry_md_open (&md, hashalgo, (GCRY_MD_FLAG_HMAC - | (secmode?GCRY_MD_FLAG_SECURE:0))); - if (ec) - { - xfree (sbuf); - return ec; - } - - ec = _gcry_md_setkey (md, passphrase, passphraselen); - if (ec) - { - _gcry_md_close (md); - xfree (sbuf); - return ec; - } - - /* Step 3 and 4. */ - memcpy (sbuf, salt, saltlen); - for (lidx = 1; lidx <= l; lidx++) - { - for (iter = 0; iter < iterations; iter++) - { - _gcry_md_reset (md); - if (!iter) /* Compute U_1: */ - { - sbuf[saltlen] = (lidx >> 24); - sbuf[saltlen + 1] = (lidx >> 16); - sbuf[saltlen + 2] = (lidx >> 8); - sbuf[saltlen + 3] = lidx; - _gcry_md_write (md, sbuf, saltlen + 4); - memcpy (ubuf, _gcry_md_read (md, 0), hlen); - memcpy (tbuf, ubuf, hlen); - } - else /* Compute U_(2..c): */ - { - _gcry_md_write (md, ubuf, hlen); - memcpy (ubuf, _gcry_md_read (md, 0), hlen); - for (i=0; i < hlen; i++) - tbuf[i] ^= ubuf[i]; - } - } - if (lidx == l) /* Last block. */ - memcpy (dk, tbuf, r); - else - { - memcpy (dk, tbuf, hlen); - dk += hlen; - } - } - - _gcry_md_close (md); - xfree (sbuf); - return 0; -} - - -/* Derive a key from a passphrase. KEYSIZE gives the requested size - of the keys in octets. KEYBUFFER is a caller provided buffer - filled on success with the derived key. The input passphrase is - taken from (PASSPHRASE,PASSPHRASELEN) which is an arbitrary memory - buffer. ALGO specifies the KDF algorithm to use; these are the - constants GCRY_KDF_*. SUBALGO specifies an algorithm used - internally by the KDF algorithms; this is usually a hash algorithm - but certain KDF algorithm may use it differently. {SALT,SALTLEN} - is a salt as needed by most KDF algorithms. ITERATIONS is a - positive integer parameter to most KDFs. 0 is returned on success, - or an error code on failure. */ -gpg_err_code_t -_gcry_kdf_derive (const void *passphrase, size_t passphraselen, - int algo, int subalgo, - const void *salt, size_t saltlen, - unsigned long iterations, - size_t keysize, void *keybuffer) -{ - gpg_err_code_t ec; - - if (!passphrase) - { - ec = GPG_ERR_INV_DATA; - goto leave; - } - - if (!keybuffer || !keysize) - { - ec = GPG_ERR_INV_VALUE; - goto leave; - } - - - switch (algo) - { - case GCRY_KDF_SIMPLE_S2K: - case GCRY_KDF_SALTED_S2K: - case GCRY_KDF_ITERSALTED_S2K: - if (!passphraselen) - ec = GPG_ERR_INV_DATA; - else - ec = openpgp_s2k (passphrase, passphraselen, algo, subalgo, - salt, saltlen, iterations, keysize, keybuffer); - break; - - case GCRY_KDF_PBKDF1: - ec = GPG_ERR_UNSUPPORTED_ALGORITHM; - break; - - case GCRY_KDF_PBKDF2: - if (!saltlen) - ec = GPG_ERR_INV_VALUE; - else - ec = _gcry_kdf_pkdf2 (passphrase, passphraselen, subalgo, - salt, saltlen, iterations, keysize, keybuffer); - break; - - case 41: - case GCRY_KDF_SCRYPT: -#if USE_SCRYPT - ec = _gcry_kdf_scrypt (passphrase, passphraselen, algo, subalgo, - salt, saltlen, iterations, keysize, keybuffer); -#else - ec = GPG_ERR_UNSUPPORTED_ALGORITHM; -#endif /*USE_SCRYPT*/ - break; - - default: - ec = GPG_ERR_UNKNOWN_ALGORITHM; - break; - } - - leave: - return ec; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/mac-cmac.c b/src/hos_libhttpserver/src/libgcrypt/cipher/mac-cmac.c deleted file mode 100644 index 69a2f174..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/mac-cmac.c +++ /dev/null @@ -1,226 +0,0 @@ -/* mac-cmac.c - CMAC glue for MAC API - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "./mac-internal.h" - - -static int -map_mac_algo_to_cipher (int mac_algo) -{ - switch (mac_algo) - { - default: - return GCRY_CIPHER_NONE; - case GCRY_MAC_CMAC_AES: - return GCRY_CIPHER_AES; - case GCRY_MAC_CMAC_3DES: - return GCRY_CIPHER_3DES; - case GCRY_MAC_CMAC_CAMELLIA: - return GCRY_CIPHER_CAMELLIA128; - case GCRY_MAC_CMAC_IDEA: - return GCRY_CIPHER_IDEA; - case GCRY_MAC_CMAC_CAST5: - return GCRY_CIPHER_CAST5; - case GCRY_MAC_CMAC_BLOWFISH: - return GCRY_CIPHER_BLOWFISH; - case GCRY_MAC_CMAC_TWOFISH: - return GCRY_CIPHER_TWOFISH; - case GCRY_MAC_CMAC_SERPENT: - return GCRY_CIPHER_SERPENT128; - case GCRY_MAC_CMAC_SEED: - return GCRY_CIPHER_SEED; - case GCRY_MAC_CMAC_RFC2268: - return GCRY_CIPHER_RFC2268_128; - case GCRY_MAC_CMAC_GOST28147: - return GCRY_CIPHER_GOST28147; - } -} - - -static gcry_err_code_t -cmac_open (gcry_mac_hd_t h) -{ - gcry_err_code_t err; - gcry_cipher_hd_t hd; - int secure = (h->magic == CTX_MAGIC_SECURE); - int cipher_algo; - unsigned int flags; - - cipher_algo = map_mac_algo_to_cipher (h->spec->algo); - flags = (secure ? GCRY_CIPHER_SECURE : 0); - - err = _gcry_cipher_open_internal (&hd, cipher_algo, GCRY_CIPHER_MODE_CMAC, - flags); - if (err) - return err; - - h->u.cmac.cipher_algo = cipher_algo; - h->u.cmac.ctx = hd; - h->u.cmac.blklen = _gcry_cipher_get_algo_blklen (cipher_algo); - return 0; -} - - -static void -cmac_close (gcry_mac_hd_t h) -{ - _gcry_cipher_close (h->u.cmac.ctx); - h->u.cmac.ctx = NULL; -} - - -static gcry_err_code_t -cmac_setkey (gcry_mac_hd_t h, const unsigned char *key, size_t keylen) -{ - return _gcry_cipher_setkey (h->u.cmac.ctx, key, keylen); -} - - -static gcry_err_code_t -cmac_reset (gcry_mac_hd_t h) -{ - return _gcry_cipher_reset (h->u.cmac.ctx); -} - - -static gcry_err_code_t -cmac_write (gcry_mac_hd_t h, const unsigned char *buf, size_t buflen) -{ - return _gcry_cipher_cmac_authenticate (h->u.cmac.ctx, buf, buflen); -} - - -static gcry_err_code_t -cmac_read (gcry_mac_hd_t h, unsigned char *outbuf, size_t * outlen) -{ - if (*outlen > h->u.cmac.blklen) - *outlen = h->u.cmac.blklen; - return _gcry_cipher_cmac_get_tag (h->u.cmac.ctx, outbuf, *outlen); -} - - -static gcry_err_code_t -cmac_verify (gcry_mac_hd_t h, const unsigned char *buf, size_t buflen) -{ - return _gcry_cipher_cmac_check_tag (h->u.cmac.ctx, buf, buflen); -} - - -static unsigned int -cmac_get_maclen (int algo) -{ - return _gcry_cipher_get_algo_blklen (map_mac_algo_to_cipher (algo)); -} - - -static unsigned int -cmac_get_keylen (int algo) -{ - return _gcry_cipher_get_algo_keylen (map_mac_algo_to_cipher (algo)); -} - - -static gcry_mac_spec_ops_t cmac_ops = { - cmac_open, - cmac_close, - cmac_setkey, - NULL, - cmac_reset, - cmac_write, - cmac_read, - cmac_verify, - cmac_get_maclen, - cmac_get_keylen -}; - - -#if USE_BLOWFISH -gcry_mac_spec_t _gcry_mac_type_spec_cmac_blowfish = { - GCRY_MAC_CMAC_BLOWFISH, {0, 0}, "CMAC_BLOWFISH", - &cmac_ops -}; -#endif -#if USE_DES -gcry_mac_spec_t _gcry_mac_type_spec_cmac_tripledes = { - GCRY_MAC_CMAC_3DES, {0, 1}, "CMAC_3DES", - &cmac_ops -}; -#endif -#if USE_CAST5 -gcry_mac_spec_t _gcry_mac_type_spec_cmac_cast5 = { - GCRY_MAC_CMAC_CAST5, {0, 0}, "CMAC_CAST5", - &cmac_ops -}; -#endif -#if USE_AES -gcry_mac_spec_t _gcry_mac_type_spec_cmac_aes = { - GCRY_MAC_CMAC_AES, {0, 1}, "CMAC_AES", - &cmac_ops -}; -#endif -#if USE_TWOFISH -gcry_mac_spec_t _gcry_mac_type_spec_cmac_twofish = { - GCRY_MAC_CMAC_TWOFISH, {0, 0}, "CMAC_TWOFISH", - &cmac_ops -}; -#endif -#if USE_SERPENT -gcry_mac_spec_t _gcry_mac_type_spec_cmac_serpent = { - GCRY_MAC_CMAC_SERPENT, {0, 0}, "CMAC_SERPENT", - &cmac_ops -}; -#endif -#if USE_RFC2268 -gcry_mac_spec_t _gcry_mac_type_spec_cmac_rfc2268 = { - GCRY_MAC_CMAC_RFC2268, {0, 0}, "CMAC_RFC2268", - &cmac_ops -}; -#endif -#if USE_SEED -gcry_mac_spec_t _gcry_mac_type_spec_cmac_seed = { - GCRY_MAC_CMAC_SEED, {0, 0}, "CMAC_SEED", - &cmac_ops -}; -#endif -#if USE_CAMELLIA -gcry_mac_spec_t _gcry_mac_type_spec_cmac_camellia = { - GCRY_MAC_CMAC_CAMELLIA, {0, 0}, "CMAC_CAMELLIA", - &cmac_ops -}; -#endif -#ifdef USE_IDEA -gcry_mac_spec_t _gcry_mac_type_spec_cmac_idea = { - GCRY_MAC_CMAC_IDEA, {0, 0}, "CMAC_IDEA", - &cmac_ops -}; -#endif -#if USE_GOST28147 -gcry_mac_spec_t _gcry_mac_type_spec_cmac_gost28147 = { - GCRY_MAC_CMAC_GOST28147, {0, 0}, "CMAC_GOST28147", - &cmac_ops -}; -#endif diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/mac-gmac.c b/src/hos_libhttpserver/src/libgcrypt/cipher/mac-gmac.c deleted file mode 100644 index 18d56b5c..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/mac-gmac.c +++ /dev/null @@ -1,185 +0,0 @@ -/* mac-gmac.c - GMAC glue for MAC API - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "./mac-internal.h" - - -static int -map_mac_algo_to_cipher (int mac_algo) -{ - switch (mac_algo) - { - default: - return GCRY_CIPHER_NONE; - case GCRY_MAC_GMAC_AES: - return GCRY_CIPHER_AES; - case GCRY_MAC_GMAC_CAMELLIA: - return GCRY_CIPHER_CAMELLIA128; - case GCRY_MAC_GMAC_TWOFISH: - return GCRY_CIPHER_TWOFISH; - case GCRY_MAC_GMAC_SERPENT: - return GCRY_CIPHER_SERPENT128; - case GCRY_MAC_GMAC_SEED: - return GCRY_CIPHER_SEED; - } -} - - -static gcry_err_code_t -gmac_open (gcry_mac_hd_t h) -{ - gcry_err_code_t err; - gcry_cipher_hd_t hd; - int secure = (h->magic == CTX_MAGIC_SECURE); - int cipher_algo; - unsigned int flags; - - cipher_algo = map_mac_algo_to_cipher (h->spec->algo); - flags = (secure ? GCRY_CIPHER_SECURE : 0); - - err = _gcry_cipher_open_internal (&hd, cipher_algo, GCRY_CIPHER_MODE_GCM, - flags); - if (err) - return err; - - h->u.gmac.cipher_algo = cipher_algo; - h->u.gmac.ctx = hd; - return 0; -} - - -static void -gmac_close (gcry_mac_hd_t h) -{ - _gcry_cipher_close (h->u.gmac.ctx); - h->u.gmac.ctx = NULL; -} - - -static gcry_err_code_t -gmac_setkey (gcry_mac_hd_t h, const unsigned char *key, size_t keylen) -{ - return _gcry_cipher_setkey (h->u.gmac.ctx, key, keylen); -} - - -static gcry_err_code_t -gmac_setiv (gcry_mac_hd_t h, const unsigned char *iv, size_t ivlen) -{ - return _gcry_cipher_setiv (h->u.gmac.ctx, iv, ivlen); -} - - -static gcry_err_code_t -gmac_reset (gcry_mac_hd_t h) -{ - return _gcry_cipher_reset (h->u.gmac.ctx); -} - - -static gcry_err_code_t -gmac_write (gcry_mac_hd_t h, const unsigned char *buf, size_t buflen) -{ - return _gcry_cipher_authenticate (h->u.gmac.ctx, buf, buflen); -} - - -static gcry_err_code_t -gmac_read (gcry_mac_hd_t h, unsigned char *outbuf, size_t * outlen) -{ - if (*outlen > GCRY_GCM_BLOCK_LEN) - *outlen = GCRY_GCM_BLOCK_LEN; - return _gcry_cipher_gettag (h->u.gmac.ctx, outbuf, *outlen); -} - - -static gcry_err_code_t -gmac_verify (gcry_mac_hd_t h, const unsigned char *buf, size_t buflen) -{ - return _gcry_cipher_checktag (h->u.gmac.ctx, buf, buflen); -} - - -static unsigned int -gmac_get_maclen (int algo) -{ - (void)algo; - return GCRY_GCM_BLOCK_LEN; -} - - -static unsigned int -gmac_get_keylen (int algo) -{ - return _gcry_cipher_get_algo_keylen (map_mac_algo_to_cipher (algo)); -} - - -static gcry_mac_spec_ops_t gmac_ops = { - gmac_open, - gmac_close, - gmac_setkey, - gmac_setiv, - gmac_reset, - gmac_write, - gmac_read, - gmac_verify, - gmac_get_maclen, - gmac_get_keylen -}; - - -#if USE_AES -gcry_mac_spec_t _gcry_mac_type_spec_gmac_aes = { - GCRY_MAC_GMAC_AES, {0, 1}, "GMAC_AES", - &gmac_ops -}; -#endif -#if USE_TWOFISH -gcry_mac_spec_t _gcry_mac_type_spec_gmac_twofish = { - GCRY_MAC_GMAC_TWOFISH, {0, 0}, "GMAC_TWOFISH", - &gmac_ops -}; -#endif -#if USE_SERPENT -gcry_mac_spec_t _gcry_mac_type_spec_gmac_serpent = { - GCRY_MAC_GMAC_SERPENT, {0, 0}, "GMAC_SERPENT", - &gmac_ops -}; -#endif -#if USE_SEED -gcry_mac_spec_t _gcry_mac_type_spec_gmac_seed = { - GCRY_MAC_GMAC_SEED, {0, 0}, "GMAC_SEED", - &gmac_ops -}; -#endif -#if USE_CAMELLIA -gcry_mac_spec_t _gcry_mac_type_spec_gmac_camellia = { - GCRY_MAC_GMAC_CAMELLIA, {0, 0}, "GMAC_CAMELLIA", - &gmac_ops -}; -#endif diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/mac-hmac.c b/src/hos_libhttpserver/src/libgcrypt/cipher/mac-hmac.c deleted file mode 100644 index 15c613d5..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/mac-hmac.c +++ /dev/null @@ -1,272 +0,0 @@ -/* mac-hmac.c - HMAC glue for MAC API - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "./mac-internal.h" -#include "bufhelp.h" - - -static int -map_mac_algo_to_md (int mac_algo) -{ - switch (mac_algo) - { - default: - return GCRY_MD_NONE; - case GCRY_MAC_HMAC_MD4: - return GCRY_MD_MD4; - case GCRY_MAC_HMAC_MD5: - return GCRY_MD_MD5; - case GCRY_MAC_HMAC_SHA1: - return GCRY_MD_SHA1; - case GCRY_MAC_HMAC_SHA224: - return GCRY_MD_SHA224; - case GCRY_MAC_HMAC_SHA256: - return GCRY_MD_SHA256; - case GCRY_MAC_HMAC_SHA384: - return GCRY_MD_SHA384; - case GCRY_MAC_HMAC_SHA512: - return GCRY_MD_SHA512; - case GCRY_MAC_HMAC_RMD160: - return GCRY_MD_RMD160; - case GCRY_MAC_HMAC_TIGER1: - return GCRY_MD_TIGER1; - case GCRY_MAC_HMAC_WHIRLPOOL: - return GCRY_MD_WHIRLPOOL; - case GCRY_MAC_HMAC_GOSTR3411_94: - return GCRY_MD_GOSTR3411_94; - case GCRY_MAC_HMAC_STRIBOG256: - return GCRY_MD_STRIBOG256; - case GCRY_MAC_HMAC_STRIBOG512: - return GCRY_MD_STRIBOG512; - } -} - - -static gcry_err_code_t -hmac_open (gcry_mac_hd_t h) -{ - gcry_err_code_t err; - gcry_md_hd_t hd; - int secure = (h->magic == CTX_MAGIC_SECURE); - unsigned int flags; - int md_algo; - - md_algo = map_mac_algo_to_md (h->spec->algo); - - flags = GCRY_MD_FLAG_HMAC; - flags |= (secure ? GCRY_MD_FLAG_SECURE : 0); - - err = _gcry_md_open (&hd, md_algo, flags); - if (err) - return err; - - h->u.hmac.md_algo = md_algo; - h->u.hmac.md_ctx = hd; - return 0; -} - - -static void -hmac_close (gcry_mac_hd_t h) -{ - _gcry_md_close (h->u.hmac.md_ctx); - h->u.hmac.md_ctx = NULL; -} - - -static gcry_err_code_t -hmac_setkey (gcry_mac_hd_t h, const unsigned char *key, size_t keylen) -{ - return _gcry_md_setkey (h->u.hmac.md_ctx, key, keylen); -} - - -static gcry_err_code_t -hmac_reset (gcry_mac_hd_t h) -{ - _gcry_md_reset (h->u.hmac.md_ctx); - return 0; -} - - -static gcry_err_code_t -hmac_write (gcry_mac_hd_t h, const unsigned char *buf, size_t buflen) -{ - _gcry_md_write (h->u.hmac.md_ctx, buf, buflen); - return 0; -} - - -static gcry_err_code_t -hmac_read (gcry_mac_hd_t h, unsigned char *outbuf, size_t * outlen) -{ - unsigned int dlen; - const unsigned char *digest; - - dlen = _gcry_md_get_algo_dlen (h->u.hmac.md_algo); - digest = _gcry_md_read (h->u.hmac.md_ctx, h->u.hmac.md_algo); - - if (*outlen <= dlen) - buf_cpy (outbuf, digest, *outlen); - else - { - buf_cpy (outbuf, digest, dlen); - *outlen = dlen; - } - - return 0; -} - - -static gcry_err_code_t -hmac_verify (gcry_mac_hd_t h, const unsigned char *buf, size_t buflen) -{ - unsigned int dlen; - const unsigned char *digest; - - dlen = _gcry_md_get_algo_dlen (h->u.hmac.md_algo); - digest = _gcry_md_read (h->u.hmac.md_ctx, h->u.hmac.md_algo); - - if (buflen > dlen) - return GPG_ERR_INV_LENGTH; - - return buf_eq_const (buf, digest, buflen) ? 0 : GPG_ERR_CHECKSUM; -} - - -static unsigned int -hmac_get_maclen (int algo) -{ - return _gcry_md_get_algo_dlen (map_mac_algo_to_md (algo)); -} - - -static unsigned int -hmac_get_keylen (int algo) -{ - /* Return blocksize for default key length. */ - switch (algo) - { - case GCRY_MAC_HMAC_SHA384: - case GCRY_MAC_HMAC_SHA512: - return 128; - case GCRY_MAC_HMAC_GOSTR3411_94: - return 32; - default: - return 64; - } -} - - -static const gcry_mac_spec_ops_t hmac_ops = { - hmac_open, - hmac_close, - hmac_setkey, - NULL, - hmac_reset, - hmac_write, - hmac_read, - hmac_verify, - hmac_get_maclen, - hmac_get_keylen -}; - - -#if USE_SHA1 -gcry_mac_spec_t _gcry_mac_type_spec_hmac_sha1 = { - GCRY_MAC_HMAC_SHA1, {0, 1}, "HMAC_SHA1", - &hmac_ops -}; -#endif -#if USE_SHA256 -gcry_mac_spec_t _gcry_mac_type_spec_hmac_sha256 = { - GCRY_MAC_HMAC_SHA256, {0, 1}, "HMAC_SHA256", - &hmac_ops -}; - -gcry_mac_spec_t _gcry_mac_type_spec_hmac_sha224 = { - GCRY_MAC_HMAC_SHA224, {0, 1}, "HMAC_SHA224", - &hmac_ops -}; -#endif -#if USE_SHA512 -gcry_mac_spec_t _gcry_mac_type_spec_hmac_sha512 = { - GCRY_MAC_HMAC_SHA512, {0, 1}, "HMAC_SHA512", - &hmac_ops -}; - -gcry_mac_spec_t _gcry_mac_type_spec_hmac_sha384 = { - GCRY_MAC_HMAC_SHA384, {0, 1}, "HMAC_SHA384", - &hmac_ops -}; -#endif -#ifdef USE_GOST_R_3411_94 -gcry_mac_spec_t _gcry_mac_type_spec_hmac_gost3411_94 = { - GCRY_MAC_HMAC_GOSTR3411_94, {0, 0}, "HMAC_GOSTR3411_94", - &hmac_ops -}; -#endif -#ifdef USE_GOST_R_3411_12 -gcry_mac_spec_t _gcry_mac_type_spec_hmac_stribog256 = { - GCRY_MAC_HMAC_STRIBOG256, {0, 0}, "HMAC_STRIBOG256", - &hmac_ops -}; - -gcry_mac_spec_t _gcry_mac_type_spec_hmac_stribog512 = { - GCRY_MAC_HMAC_STRIBOG512, {0, 0}, "HMAC_STRIBOG512", - &hmac_ops -}; -#endif -#if USE_WHIRLPOOL -gcry_mac_spec_t _gcry_mac_type_spec_hmac_whirlpool = { - GCRY_MAC_HMAC_WHIRLPOOL, {0, 0}, "HMAC_WHIRLPOOL", - &hmac_ops -}; -#endif -#if USE_RMD160 -gcry_mac_spec_t _gcry_mac_type_spec_hmac_rmd160 = { - GCRY_MAC_HMAC_RMD160, {0, 0}, "HMAC_RIPEMD160", - &hmac_ops -}; -#endif -#if USE_TIGER -gcry_mac_spec_t _gcry_mac_type_spec_hmac_tiger1 = { - GCRY_MAC_HMAC_TIGER1, {0, 0}, "HMAC_TIGER", - &hmac_ops -}; -#endif -#if USE_MD5 -gcry_mac_spec_t _gcry_mac_type_spec_hmac_md5 = { - GCRY_MAC_HMAC_MD5, {0, 0}, "HMAC_MD5", - &hmac_ops -}; -#endif -#if USE_MD4 -gcry_mac_spec_t _gcry_mac_type_spec_hmac_md4 = { - GCRY_MAC_HMAC_MD4, {0, 0}, "HMAC_MD4", - &hmac_ops -}; -#endif diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/mac-internal.h b/src/hos_libhttpserver/src/libgcrypt/cipher/mac-internal.h deleted file mode 100644 index 6fc304ba..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/mac-internal.h +++ /dev/null @@ -1,204 +0,0 @@ -/* mac-internal.h - Internal defs for mac.c - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -/* The data object used to hold a handle to an encryption object. */ -struct gcry_mac_handle; - - -/* - * - * Message authentication code related definitions. - * - */ - - -/* Magic values for the context structure. */ -#define CTX_MAGIC_NORMAL 0x59d9b8af -#define CTX_MAGIC_SECURE 0x12c27cd0 - - -/* MAC module functions. */ -typedef gcry_err_code_t (*gcry_mac_open_func_t)(gcry_mac_hd_t h); -typedef void (*gcry_mac_close_func_t)(gcry_mac_hd_t h); -typedef gcry_err_code_t (*gcry_mac_setkey_func_t)(gcry_mac_hd_t h, - const unsigned char *key, - size_t keylen); -typedef gcry_err_code_t (*gcry_mac_setiv_func_t)(gcry_mac_hd_t h, - const unsigned char *iv, - size_t ivlen); -typedef gcry_err_code_t (*gcry_mac_reset_func_t)(gcry_mac_hd_t h); -typedef gcry_err_code_t (*gcry_mac_write_func_t)(gcry_mac_hd_t h, - const unsigned char *inbuf, - size_t inlen); -typedef gcry_err_code_t (*gcry_mac_read_func_t)(gcry_mac_hd_t h, - unsigned char *outbuf, - size_t *outlen); -typedef gcry_err_code_t (*gcry_mac_verify_func_t)(gcry_mac_hd_t h, - const unsigned char *inbuf, - size_t inlen); -typedef unsigned int (*gcry_mac_get_maclen_func_t)(int algo); -typedef unsigned int (*gcry_mac_get_keylen_func_t)(int algo); - - -typedef struct gcry_mac_spec_ops -{ - gcry_mac_open_func_t open; - gcry_mac_close_func_t close; - gcry_mac_setkey_func_t setkey; - gcry_mac_setiv_func_t setiv; - gcry_mac_reset_func_t reset; - gcry_mac_write_func_t write; - gcry_mac_read_func_t read; - gcry_mac_verify_func_t verify; - gcry_mac_get_maclen_func_t get_maclen; - gcry_mac_get_keylen_func_t get_keylen; -} gcry_mac_spec_ops_t; - - -/* Module specification structure for message authentication codes. */ -typedef struct gcry_mac_spec -{ - int algo; - struct { - unsigned int disabled:1; - unsigned int fips:1; - } flags; - const char *name; - const gcry_mac_spec_ops_t *ops; -} gcry_mac_spec_t; - - - -/* The handle structure. */ -struct gcry_mac_handle -{ - int magic; - int algo; - const gcry_mac_spec_t *spec; - gcry_ctx_t gcry_ctx; - union { - struct { - gcry_md_hd_t md_ctx; - int md_algo; - } hmac; - struct { - gcry_cipher_hd_t ctx; - int cipher_algo; - unsigned int blklen; - } cmac; - struct { - gcry_cipher_hd_t ctx; - int cipher_algo; - } gmac; - } u; -}; - - -/* - * The HMAC algorithm specifications (mac-hmac.c). - */ -#if USE_SHA1 -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_sha1; -#endif -#if USE_SHA256 -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_sha256; -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_sha224; -#endif -#if USE_SHA512 -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_sha512; -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_sha384; -#endif -#ifdef USE_GOST_R_3411_94 -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_gost3411_94; -#endif -#ifdef USE_GOST_R_3411_12 -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_stribog256; -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_stribog512; -#endif -#if USE_WHIRLPOOL -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_whirlpool; -#endif -#if USE_RMD160 -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_rmd160; -#endif -#if USE_TIGER -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_tiger1; -#endif -#if USE_MD5 -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_md5; -#endif -#if USE_MD4 -extern gcry_mac_spec_t _gcry_mac_type_spec_hmac_md4; -#endif - -/* - * The CMAC algorithm specifications (mac-cmac.c). - */ -#if USE_BLOWFISH -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_blowfish; -#endif -#if USE_DES -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_tripledes; -#endif -#if USE_CAST5 -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_cast5; -#endif -#if USE_AES -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_aes; -#endif -#if USE_TWOFISH -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_twofish; -#endif -#if USE_SERPENT -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_serpent; -#endif -#if USE_RFC2268 -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_rfc2268; -#endif -#if USE_SEED -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_seed; -#endif -#if USE_CAMELLIA -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_camellia; -#endif -#ifdef USE_IDEA -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_idea; -#endif -#if USE_GOST28147 -extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_gost28147; -#endif - -/* - * The GMAC algorithm specifications (mac-gmac.c). - */ -#if USE_AES -extern gcry_mac_spec_t _gcry_mac_type_spec_gmac_aes; -#endif -#if USE_TWOFISH -extern gcry_mac_spec_t _gcry_mac_type_spec_gmac_twofish; -#endif -#if USE_SERPENT -extern gcry_mac_spec_t _gcry_mac_type_spec_gmac_serpent; -#endif -#if USE_SEED -extern gcry_mac_spec_t _gcry_mac_type_spec_gmac_seed; -#endif -#if USE_CAMELLIA -extern gcry_mac_spec_t _gcry_mac_type_spec_gmac_camellia; -#endif diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/mac.c b/src/hos_libhttpserver/src/libgcrypt/cipher/mac.c deleted file mode 100644 index d87ac137..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/mac.c +++ /dev/null @@ -1,466 +0,0 @@ -/* mac.c - message authentication code dispatcher - * Copyright © 2013 Jussi Kivilinna - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "mac-internal.h" - - -/* This is the list of the digest implementations included in - libgcrypt. */ -static gcry_mac_spec_t *mac_list[] = { -#if USE_SHA1 - &_gcry_mac_type_spec_hmac_sha1, -#endif -#if USE_SHA256 - &_gcry_mac_type_spec_hmac_sha256, - &_gcry_mac_type_spec_hmac_sha224, -#endif -#if USE_SHA512 - &_gcry_mac_type_spec_hmac_sha512, - &_gcry_mac_type_spec_hmac_sha384, -#endif -#ifdef USE_GOST_R_3411_94 - &_gcry_mac_type_spec_hmac_gost3411_94, -#endif -#ifdef USE_GOST_R_3411_12 - &_gcry_mac_type_spec_hmac_stribog256, - &_gcry_mac_type_spec_hmac_stribog512, -#endif -#if USE_WHIRLPOOL - &_gcry_mac_type_spec_hmac_whirlpool, -#endif -#if USE_RMD160 - &_gcry_mac_type_spec_hmac_rmd160, -#endif -#if USE_TIGER - &_gcry_mac_type_spec_hmac_tiger1, -#endif -#if USE_MD5 - &_gcry_mac_type_spec_hmac_md5, -#endif -#if USE_MD4 - &_gcry_mac_type_spec_hmac_md4, -#endif -#if USE_BLOWFISH - &_gcry_mac_type_spec_cmac_blowfish, -#endif -#if USE_DES - &_gcry_mac_type_spec_cmac_tripledes, -#endif -#if USE_CAST5 - &_gcry_mac_type_spec_cmac_cast5, -#endif -#if USE_AES - &_gcry_mac_type_spec_cmac_aes, - &_gcry_mac_type_spec_gmac_aes, -#endif -#if USE_TWOFISH - &_gcry_mac_type_spec_cmac_twofish, - &_gcry_mac_type_spec_gmac_twofish, -#endif -#if USE_SERPENT - &_gcry_mac_type_spec_cmac_serpent, - &_gcry_mac_type_spec_gmac_serpent, -#endif -#if USE_RFC2268 - &_gcry_mac_type_spec_cmac_rfc2268, -#endif -#if USE_SEED - &_gcry_mac_type_spec_cmac_seed, - &_gcry_mac_type_spec_gmac_seed, -#endif -#if USE_CAMELLIA - &_gcry_mac_type_spec_cmac_camellia, - &_gcry_mac_type_spec_gmac_camellia, -#endif -#ifdef USE_IDEA - &_gcry_mac_type_spec_cmac_idea, -#endif -#if USE_GOST28147 - &_gcry_mac_type_spec_cmac_gost28147, -#endif - NULL, -}; - - - -/* Return the spec structure for the MAC algorithm ALGO. For an - unknown algorithm NULL is returned. */ -static gcry_mac_spec_t * -spec_from_algo (int algo) -{ - gcry_mac_spec_t *spec; - int idx; - - for (idx = 0; (spec = mac_list[idx]); idx++) - if (algo == spec->algo) - return spec; - return NULL; -} - - -/* Lookup a mac's spec by its name. */ -static gcry_mac_spec_t * -spec_from_name (const char *name) -{ - gcry_mac_spec_t *spec; - int idx; - - for (idx = 0; (spec = mac_list[idx]); idx++) - if (!stricmp (name, spec->name)) - return spec; - - return NULL; -} - - -/**************** - * Map a string to the mac algo - */ -int -_gcry_mac_map_name (const char *string) -{ - gcry_mac_spec_t *spec; - - if (!string) - return 0; - - /* Not found, search a matching mac name. */ - spec = spec_from_name (string); - if (spec) - return spec->algo; - - return 0; -} - - -/**************** - * This function simply returns the name of the algorithm or some constant - * string when there is no algo. It will never return NULL. - * Use the macro gcry_mac_test_algo() to check whether the algorithm - * is valid. - */ -const char * -_gcry_mac_algo_name (int algorithm) -{ - gcry_mac_spec_t *spec; - - spec = spec_from_algo (algorithm); - return spec ? spec->name : "?"; -} - - -static gcry_err_code_t -check_mac_algo (int algorithm) -{ - gcry_mac_spec_t *spec; - - spec = spec_from_algo (algorithm); - if (spec && !spec->flags.disabled) - return 0; - - return GPG_ERR_MAC_ALGO; -} - - -/**************** - * Open a message digest handle for use with algorithm ALGO. - */ -static gcry_err_code_t -mac_open (gcry_mac_hd_t * hd, int algo, int secure, gcry_ctx_t ctx) -{ - gcry_mac_spec_t *spec; - gcry_err_code_t err; - gcry_mac_hd_t h; - - spec = spec_from_algo (algo); - if (!spec) - return GPG_ERR_MAC_ALGO; - else if (spec->flags.disabled) - return GPG_ERR_MAC_ALGO; - else if (!spec->ops) - return GPG_ERR_MAC_ALGO; - else if (!spec->ops->open || !spec->ops->write || !spec->ops->setkey || - !spec->ops->read || !spec->ops->verify || !spec->ops->reset) - return GPG_ERR_MAC_ALGO; - - if (secure) - h = xtrycalloc_secure (1, sizeof (*h)); - else - h = xtrycalloc (1, sizeof (*h)); - - if (!h) - return gpg_err_code_from_syserror (); - - h->magic = secure ? CTX_MAGIC_SECURE : CTX_MAGIC_NORMAL; - h->spec = spec; - h->algo = algo; - h->gcry_ctx = ctx; - - err = h->spec->ops->open (h); - if (err) - xfree (h); - else - *hd = h; - - return err; -} - - -static gcry_error_t -mac_reset (gcry_mac_hd_t hd) -{ - if (hd->spec->ops->reset) - return hd->spec->ops->reset (hd); - - return 0; -} - - -static void -mac_close (gcry_mac_hd_t hd) -{ - if (hd->spec->ops->close) - hd->spec->ops->close (hd); - - wipememory (hd, sizeof (*hd)); - - xfree (hd); -} - - -static gcry_error_t -mac_setkey (gcry_mac_hd_t hd, const void *key, size_t keylen) -{ - if (!hd->spec->ops->setkey) - return GPG_ERR_INV_ARG; - if (keylen > 0 && !key) - return GPG_ERR_INV_ARG; - - return hd->spec->ops->setkey (hd, key, keylen); -} - - -static gcry_error_t -mac_setiv (gcry_mac_hd_t hd, const void *iv, size_t ivlen) -{ - if (!hd->spec->ops->setiv) - return GPG_ERR_INV_ARG; - if (ivlen > 0 && !iv) - return GPG_ERR_INV_ARG; - - return hd->spec->ops->setiv (hd, iv, ivlen); -} - - -static gcry_error_t -mac_write (gcry_mac_hd_t hd, const void *inbuf, size_t inlen) -{ - if (!hd->spec->ops->write) - return GPG_ERR_INV_ARG; - if (inlen > 0 && !inbuf) - return GPG_ERR_INV_ARG; - - return hd->spec->ops->write (hd, inbuf, inlen); -} - - -static gcry_error_t -mac_read (gcry_mac_hd_t hd, void *outbuf, size_t * outlen) -{ - if (!outbuf || !outlen || *outlen == 0 || !hd->spec->ops->read) - return GPG_ERR_INV_ARG; - - return hd->spec->ops->read (hd, outbuf, outlen); -} - - -static gcry_error_t -mac_verify (gcry_mac_hd_t hd, const void *buf, size_t buflen) -{ - if (!buf || buflen == 0 || !hd->spec->ops->verify) - return GPG_ERR_INV_ARG; - - return hd->spec->ops->verify (hd, buf, buflen); -} - - -/* Create a MAC object for algorithm ALGO. FLAGS may be - given as an bitwise OR of the gcry_mac_flags values. - H is guaranteed to be a valid handle or NULL on error. */ -gpg_err_code_t -_gcry_mac_open (gcry_mac_hd_t * h, int algo, unsigned int flags, - gcry_ctx_t ctx) -{ - gcry_err_code_t rc; - gcry_mac_hd_t hd = NULL; - - if ((flags & ~GCRY_MAC_FLAG_SECURE)) - rc = GPG_ERR_INV_ARG; - else - rc = mac_open (&hd, algo, !!(flags & GCRY_MAC_FLAG_SECURE), ctx); - - *h = rc ? NULL : hd; - return rc; -} - - -void -_gcry_mac_close (gcry_mac_hd_t hd) -{ - if (hd) - mac_close (hd); -} - - -gcry_err_code_t -_gcry_mac_setkey (gcry_mac_hd_t hd, const void *key, size_t keylen) -{ - return mac_setkey (hd, key, keylen); -} - - -gcry_err_code_t -_gcry_mac_setiv (gcry_mac_hd_t hd, const void *iv, size_t ivlen) -{ - return mac_setiv (hd, iv, ivlen); -} - - -gcry_err_code_t -_gcry_mac_write (gcry_mac_hd_t hd, const void *inbuf, size_t inlen) -{ - return mac_write (hd, inbuf, inlen); -} - - -gcry_err_code_t -_gcry_mac_read (gcry_mac_hd_t hd, void *outbuf, size_t * outlen) -{ - return mac_read (hd, outbuf, outlen); -} - - -gcry_err_code_t -_gcry_mac_verify (gcry_mac_hd_t hd, const void *buf, size_t buflen) -{ - return mac_verify (hd, buf, buflen); -} - - -unsigned int -_gcry_mac_get_algo_maclen (int algo) -{ - gcry_mac_spec_t *spec; - - spec = spec_from_algo (algo); - if (!spec || !spec->ops || !spec->ops->get_maclen) - return 0; - - return spec->ops->get_maclen (algo); -} - - -unsigned int -_gcry_mac_get_algo_keylen (int algo) -{ - gcry_mac_spec_t *spec; - - spec = spec_from_algo (algo); - if (!spec || !spec->ops || !spec->ops->get_keylen) - return 0; - - return spec->ops->get_keylen (algo); -} - - -gcry_err_code_t -_gcry_mac_ctl (gcry_mac_hd_t hd, int cmd, void *buffer, size_t buflen) -{ - gcry_err_code_t rc; - - /* Currently not used. */ - (void) hd; - (void) buffer; - (void) buflen; - - switch (cmd) - { - case GCRYCTL_RESET: - rc = mac_reset (hd); - break; - default: - rc = GPG_ERR_INV_OP; - } - return rc; -} - - -/* Return information about the given MAC algorithm ALGO. - - GCRYCTL_TEST_ALGO: - Returns 0 if the specified algorithm ALGO is available for use. - BUFFER and NBYTES must be zero. - - Note: Because this function is in most cases used to return an - integer value, we can make it easier for the caller to just look at - the return value. The caller will in all cases consult the value - and thereby detecting whether a error occurred or not (i.e. while - checking the block size) - */ -gcry_err_code_t -_gcry_mac_algo_info (int algo, int what, void *buffer, size_t * nbytes) -{ - gcry_err_code_t rc = 0; - unsigned int ui; - - switch (what) - { - case GCRYCTL_GET_KEYLEN: - if (buffer || (!nbytes)) - rc = GPG_ERR_INV_ARG; - else - { - ui = _gcry_mac_get_algo_keylen (algo); - if (ui > 0) - *nbytes = (size_t) ui; - else - /* The only reason for an error is an invalid algo. */ - rc = GPG_ERR_MAC_ALGO; - } - break; - case GCRYCTL_TEST_ALGO: - if (buffer || nbytes) - rc = GPG_ERR_INV_ARG; - else - rc = check_mac_algo (algo); - break; - - default: - rc = GPG_ERR_INV_OP; - } - - return rc; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/md.c b/src/hos_libhttpserver/src/libgcrypt/cipher/md.c deleted file mode 100644 index 008ef5b2..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/md.c +++ /dev/null @@ -1,1261 +0,0 @@ -/* md.c - message digest dispatcher - * Copyright (C) 1998, 1999, 2002, 2003, 2006, - * 2008 Free Software Foundation, Inc. - * Copyright (C) 2013, 2014 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" -#include "ath.h" - -#include "rmd.h" - - -/* This is the list of the digest implementations included in - libgcrypt. */ -static gcry_md_spec_t *digest_list[] = - { -#if USE_CRC - &_gcry_digest_spec_crc32, - &_gcry_digest_spec_crc32_rfc1510, - &_gcry_digest_spec_crc24_rfc2440, -#endif -#if USE_SHA1 - &_gcry_digest_spec_sha1, -#endif -#if USE_SHA256 - &_gcry_digest_spec_sha256, - &_gcry_digest_spec_sha224, -#endif -#if USE_SHA512 - &_gcry_digest_spec_sha512, - &_gcry_digest_spec_sha384, -#endif -#ifdef USE_GOST_R_3411_94 - &_gcry_digest_spec_gost3411_94, -#endif -#ifdef USE_GOST_R_3411_12 - &_gcry_digest_spec_stribog_256, - &_gcry_digest_spec_stribog_512, -#endif -#if USE_WHIRLPOOL - &_gcry_digest_spec_whirlpool, -#endif -#if USE_RMD160 - &_gcry_digest_spec_rmd160, -#endif -#if USE_TIGER - &_gcry_digest_spec_tiger, - &_gcry_digest_spec_tiger1, - &_gcry_digest_spec_tiger2, -#endif -#if USE_MD5 - &_gcry_digest_spec_md5, -#endif -#if USE_MD4 - &_gcry_digest_spec_md4, -#endif - NULL - }; - - -typedef struct gcry_md_list -{ - gcry_md_spec_t *spec; - struct gcry_md_list *next; - size_t actual_struct_size; /* Allocated size of this structure. */ - PROPERLY_ALIGNED_TYPE context; -} GcryDigestEntry; - -/* This structure is put right after the gcry_md_hd_t buffer, so that - * only one memory block is needed. */ -struct gcry_md_context -{ - int magic; - size_t actual_handle_size; /* Allocated size of this handle. */ - FILE *debug; - struct { - unsigned int secure: 1; - unsigned int finalized:1; - unsigned int bugemu1:1; - } flags; - GcryDigestEntry *list; - byte *macpads; - int macpads_Bsize; /* Blocksize as used for the HMAC pads. */ -}; - - -#define CTX_MAGIC_NORMAL 0x11071961 -#define CTX_MAGIC_SECURE 0x16917011 - -static gcry_err_code_t md_enable (gcry_md_hd_t hd, int algo); -static void md_close (gcry_md_hd_t a); -static void md_write (gcry_md_hd_t a, const void *inbuf, size_t inlen); -static byte *md_read( gcry_md_hd_t a, int algo ); -static int md_get_algo( gcry_md_hd_t a ); -static int md_digest_length( int algo ); -static void md_start_debug ( gcry_md_hd_t a, const char *suffix ); -static void md_stop_debug ( gcry_md_hd_t a ); - - - -static int -map_algo (int algo) -{ - return algo; -} - - -/* Return the spec structure for the hash algorithm ALGO. For an - unknown algorithm NULL is returned. */ -static gcry_md_spec_t * -spec_from_algo (int algo) -{ - int idx; - gcry_md_spec_t *spec; - - algo = map_algo (algo); - - for (idx = 0; (spec = digest_list[idx]); idx++) - if (algo == spec->algo) - return spec; - return NULL; -} - - -/* Lookup a hash's spec by its name. */ -static gcry_md_spec_t * -spec_from_name (const char *name) -{ - gcry_md_spec_t *spec; - int idx; - - for (idx=0; (spec = digest_list[idx]); idx++) - { - if (!stricmp (name, spec->name)) - return spec; - } - - return NULL; -} - - -/* Lookup a hash's spec by its OID. */ -static gcry_md_spec_t * -spec_from_oid (const char *oid) -{ - gcry_md_spec_t *spec; - gcry_md_oid_spec_t *oid_specs; - int idx, j; - - for (idx=0; (spec = digest_list[idx]); idx++) - { - oid_specs = spec->oids; - if (oid_specs) - { - for (j = 0; oid_specs[j].oidstring; j++) - if (!stricmp (oid, oid_specs[j].oidstring)) - return spec; - } - } - - return NULL; -} - - -static gcry_md_spec_t * -search_oid (const char *oid, gcry_md_oid_spec_t *oid_spec) -{ - gcry_md_spec_t *spec; - int i; - - if (oid && ((! strncmp (oid, "oid.", 4)) - || (! strncmp (oid, "OID.", 4)))) - oid += 4; - - spec = spec_from_oid (oid); - if (spec && spec->oids) - { - for (i = 0; spec->oids[i].oidstring; i++) - if (!stricmp (oid, spec->oids[i].oidstring)) - { - if (oid_spec) - *oid_spec = spec->oids[i]; - return spec; - } - } - - return NULL; -} - - -/**************** - * Map a string to the digest algo - */ -int -_gcry_md_map_name (const char *string) -{ - gcry_md_spec_t *spec; - - if (!string) - return 0; - - /* If the string starts with a digit (optionally prefixed with - either "OID." or "oid."), we first look into our table of ASN.1 - object identifiers to figure out the algorithm */ - spec = search_oid (string, NULL); - if (spec) - return spec->algo; - - /* Not found, search a matching digest name. */ - spec = spec_from_name (string); - if (spec) - return spec->algo; - - return 0; -} - - -/**************** - * This function simply returns the name of the algorithm or some constant - * string when there is no algo. It will never return NULL. - * Use the macro gcry_md_test_algo() to check whether the algorithm - * is valid. - */ -const char * -_gcry_md_algo_name (int algorithm) -{ - gcry_md_spec_t *spec; - - spec = spec_from_algo (algorithm); - return spec ? spec->name : "?"; -} - - -static gcry_err_code_t -check_digest_algo (int algorithm) -{ - gcry_md_spec_t *spec; - - spec = spec_from_algo (algorithm); - if (spec && !spec->flags.disabled) - return 0; - - return GPG_ERR_DIGEST_ALGO; - -} - - -/**************** - * Open a message digest handle for use with algorithm ALGO. - * More algorithms may be added by md_enable(). The initial algorithm - * may be 0. - */ -static gcry_err_code_t -md_open (gcry_md_hd_t *h, int algo, unsigned int flags) -{ - gcry_err_code_t err = 0; - int secure = !!(flags & GCRY_MD_FLAG_SECURE); - int hmac = !!(flags & GCRY_MD_FLAG_HMAC); - int bufsize = secure ? 512 : 1024; - struct gcry_md_context *ctx; - gcry_md_hd_t hd; - size_t n; - - /* Allocate a memory area to hold the caller visible buffer with it's - * control information and the data required by this module. Set the - * context pointer at the beginning to this area. - * We have to use this strange scheme because we want to hide the - * internal data but have a variable sized buffer. - * - * +---+------+---........------+-------------+ - * !ctx! bctl ! buffer ! private ! - * +---+------+---........------+-------------+ - * ! ^ - * !---------------------------! - * - * We have to make sure that private is well aligned. - */ - n = sizeof (struct gcry_md_handle) + bufsize; - n = ((n + sizeof (PROPERLY_ALIGNED_TYPE) - 1) - / sizeof (PROPERLY_ALIGNED_TYPE)) * sizeof (PROPERLY_ALIGNED_TYPE); - - /* Allocate and set the Context pointer to the private data */ - if (secure) - hd = xtrymalloc_secure (n + sizeof (struct gcry_md_context)); - else - hd = xtrymalloc (n + sizeof (struct gcry_md_context)); - - if (! hd) - err = gpg_err_code_from_errno (errno); - - if (! err) - { - hd->ctx = ctx = (struct gcry_md_context *) ((char *) hd + n); - /* Setup the globally visible data (bctl in the diagram).*/ - hd->bufsize = n - sizeof (struct gcry_md_handle) + 1; - hd->bufpos = 0; - - /* Initialize the private data. */ - memset (hd->ctx, 0, sizeof *hd->ctx); - ctx->magic = secure ? CTX_MAGIC_SECURE : CTX_MAGIC_NORMAL; - ctx->actual_handle_size = n + sizeof (struct gcry_md_context); - ctx->flags.secure = secure; - ctx->flags.bugemu1 = !!(flags & GCRY_MD_FLAG_BUGEMU1); - - if (hmac) - { - switch (algo) - { - case GCRY_MD_SHA384: - case GCRY_MD_SHA512: - ctx->macpads_Bsize = 128; - break; - case GCRY_MD_GOSTR3411_94: - ctx->macpads_Bsize = 32; - break; - default: - ctx->macpads_Bsize = 64; - break; - } - ctx->macpads = xtrymalloc_secure (2*(ctx->macpads_Bsize)); - if (!ctx->macpads) - { - err = gpg_err_code_from_errno (errno); - md_close (hd); - } - } - } - - if (! err) - { - /* Hmmm, should we really do that? - yes [-wk] */ - _gcry_fast_random_poll (); - - if (algo) - { - err = md_enable (hd, algo); - if (err) - md_close (hd); - } - } - - if (! err) - *h = hd; - - return err; -} - -/* Create a message digest object for algorithm ALGO. FLAGS may be - given as an bitwise OR of the gcry_md_flags values. ALGO may be - given as 0 if the algorithms to be used are later set using - gcry_md_enable. H is guaranteed to be a valid handle or NULL on - error. */ -gcry_err_code_t -_gcry_md_open (gcry_md_hd_t *h, int algo, unsigned int flags) -{ - gcry_err_code_t rc; - gcry_md_hd_t hd; - - if ((flags & ~(GCRY_MD_FLAG_SECURE - | GCRY_MD_FLAG_HMAC - | GCRY_MD_FLAG_BUGEMU1))) - rc = GPG_ERR_INV_ARG; - else - rc = md_open (&hd, algo, flags); - - *h = rc? NULL : hd; - return rc; -} - - - -static gcry_err_code_t -md_enable (gcry_md_hd_t hd, int algorithm) -{ - struct gcry_md_context *h = hd->ctx; - gcry_md_spec_t *spec; - GcryDigestEntry *entry; - gcry_err_code_t err = 0; - - for (entry = h->list; entry; entry = entry->next) - if (entry->spec->algo == algorithm) - return 0; /* Already enabled */ - - spec = spec_from_algo (algorithm); - if (!spec) - { - log_debug ("md_enable: algorithm %d not available\n", algorithm); - err = GPG_ERR_DIGEST_ALGO; - } - - - if (!err && algorithm == GCRY_MD_MD5 && fips_mode ()) - { - _gcry_inactivate_fips_mode ("MD5 used"); - if (_gcry_enforced_fips_mode () ) - { - /* We should never get to here because we do not register - MD5 in enforced fips mode. But better throw an error. */ - err = GPG_ERR_DIGEST_ALGO; - } - } - - if (!err) - { - size_t size = (sizeof (*entry) - + spec->contextsize - - sizeof (entry->context)); - - /* And allocate a new list entry. */ - if (h->flags.secure) - entry = xtrymalloc_secure (size); - else - entry = xtrymalloc (size); - - if (! entry) - err = gpg_err_code_from_errno (errno); - else - { - entry->spec = spec; - entry->next = h->list; - entry->actual_struct_size = size; - h->list = entry; - - /* And init this instance. */ - entry->spec->init (&entry->context.c, - h->flags.bugemu1? GCRY_MD_FLAG_BUGEMU1:0); - } - } - - return err; -} - - -gcry_err_code_t -_gcry_md_enable (gcry_md_hd_t hd, int algorithm) -{ - return md_enable (hd, algorithm); -} - - -static gcry_err_code_t -md_copy (gcry_md_hd_t ahd, gcry_md_hd_t *b_hd) -{ - gcry_err_code_t err = 0; - struct gcry_md_context *a = ahd->ctx; - struct gcry_md_context *b; - GcryDigestEntry *ar, *br; - gcry_md_hd_t bhd; - size_t n; - - if (ahd->bufpos) - md_write (ahd, NULL, 0); - - n = (char *) ahd->ctx - (char *) ahd; - if (a->flags.secure) - bhd = xtrymalloc_secure (n + sizeof (struct gcry_md_context)); - else - bhd = xtrymalloc (n + sizeof (struct gcry_md_context)); - - if (! bhd) - err = gpg_err_code_from_errno (errno); - - if (! err) - { - bhd->ctx = b = (struct gcry_md_context *) ((char *) bhd + n); - /* No need to copy the buffer due to the write above. */ - gcry_assert (ahd->bufsize == (n - sizeof (struct gcry_md_handle) + 1)); - bhd->bufsize = ahd->bufsize; - bhd->bufpos = 0; - gcry_assert (! ahd->bufpos); - memcpy (b, a, sizeof *a); - b->list = NULL; - b->debug = NULL; - if (a->macpads) - { - b->macpads = xtrymalloc_secure (2*(a->macpads_Bsize)); - if (! b->macpads) - { - err = gpg_err_code_from_errno (errno); - md_close (bhd); - } - else - memcpy (b->macpads, a->macpads, (2*(a->macpads_Bsize))); - } - } - - /* Copy the complete list of algorithms. The copied list is - reversed, but that doesn't matter. */ - if (!err) - { - for (ar = a->list; ar; ar = ar->next) - { - if (a->flags.secure) - br = xtrymalloc_secure (sizeof *br - + ar->spec->contextsize - - sizeof(ar->context)); - else - br = xtrymalloc (sizeof *br - + ar->spec->contextsize - - sizeof (ar->context)); - if (!br) - { - err = gpg_err_code_from_errno (errno); - md_close (bhd); - break; - } - - memcpy (br, ar, (sizeof (*br) + ar->spec->contextsize - - sizeof (ar->context))); - br->next = b->list; - b->list = br; - } - } - - if (a->debug && !err) - md_start_debug (bhd, "unknown"); - - if (!err) - *b_hd = bhd; - - return err; -} - - -gcry_err_code_t -_gcry_md_copy (gcry_md_hd_t *handle, gcry_md_hd_t hd) -{ - gcry_err_code_t rc; - - rc = md_copy (hd, handle); - if (rc) - *handle = NULL; - return rc; -} - - -/* - * Reset all contexts and discard any buffered stuff. This may be used - * instead of a md_close(); md_open(). - */ -void -_gcry_md_reset (gcry_md_hd_t a) -{ - GcryDigestEntry *r; - - /* Note: We allow this even in fips non operational mode. */ - - a->bufpos = a->ctx->flags.finalized = 0; - - for (r = a->ctx->list; r; r = r->next) - { - memset (r->context.c, 0, r->spec->contextsize); - (*r->spec->init) (&r->context.c, - a->ctx->flags.bugemu1? GCRY_MD_FLAG_BUGEMU1:0); - } - if (a->ctx->macpads) - md_write (a, a->ctx->macpads, a->ctx->macpads_Bsize); /* inner pad */ -} - - -static void -md_close (gcry_md_hd_t a) -{ - GcryDigestEntry *r, *r2; - - if (! a) - return; - if (a->ctx->debug) - md_stop_debug (a); - for (r = a->ctx->list; r; r = r2) - { - r2 = r->next; - wipememory (r, r->actual_struct_size); - xfree (r); - } - - if (a->ctx->macpads) - { - wipememory (a->ctx->macpads, 2*(a->ctx->macpads_Bsize)); - xfree(a->ctx->macpads); - } - - wipememory (a, a->ctx->actual_handle_size); - xfree(a); -} - - -void -_gcry_md_close (gcry_md_hd_t hd) -{ - /* Note: We allow this even in fips non operational mode. */ - md_close (hd); -} - - -static void -md_write (gcry_md_hd_t a, const void *inbuf, size_t inlen) -{ - GcryDigestEntry *r; - - if (a->ctx->debug) - { - if (a->bufpos && fwrite (a->buf, a->bufpos, 1, a->ctx->debug) != 1) - BUG(); - if (inlen && fwrite (inbuf, inlen, 1, a->ctx->debug) != 1) - BUG(); - } - - for (r = a->ctx->list; r; r = r->next) - { - if (a->bufpos) - (*r->spec->write) (&r->context.c, a->buf, a->bufpos); - (*r->spec->write) (&r->context.c, inbuf, inlen); - } - a->bufpos = 0; -} - - -void -_gcry_md_write (gcry_md_hd_t hd, const void *inbuf, size_t inlen) -{ - md_write (hd, inbuf, inlen); -} - - -static void -md_final (gcry_md_hd_t a) -{ - GcryDigestEntry *r; - - if (a->ctx->flags.finalized) - return; - - if (a->bufpos) - md_write (a, NULL, 0); - - for (r = a->ctx->list; r; r = r->next) - (*r->spec->final) (&r->context.c); - - a->ctx->flags.finalized = 1; - - if (a->ctx->macpads) - { - /* Finish the hmac. */ - int algo = md_get_algo (a); - byte *p = md_read (a, algo); - size_t dlen = md_digest_length (algo); - gcry_md_hd_t om; - gcry_err_code_t err; - - err = md_open (&om, algo, - ((a->ctx->flags.secure? GCRY_MD_FLAG_SECURE:0) - | (a->ctx->flags.bugemu1? GCRY_MD_FLAG_BUGEMU1:0))); - if (err) - _gcry_fatal_error (err, NULL); - md_write (om, - (a->ctx->macpads)+(a->ctx->macpads_Bsize), - a->ctx->macpads_Bsize); - md_write (om, p, dlen); - md_final (om); - /* Replace our digest with the mac (they have the same size). */ - memcpy (p, md_read (om, algo), dlen); - md_close (om); - } -} - - -static gcry_err_code_t -prepare_macpads (gcry_md_hd_t hd, const unsigned char *key, size_t keylen) -{ - int i; - int algo = md_get_algo (hd); - unsigned char *helpkey = NULL; - unsigned char *ipad, *opad; - - if (!algo) - return GPG_ERR_DIGEST_ALGO; /* Might happen if no algo is enabled. */ - - if ( keylen > hd->ctx->macpads_Bsize ) - { - helpkey = xtrymalloc_secure (md_digest_length (algo)); - if (!helpkey) - return gpg_err_code_from_errno (errno); - _gcry_md_hash_buffer (algo, helpkey, key, keylen); - key = helpkey; - keylen = md_digest_length (algo); - gcry_assert ( keylen <= hd->ctx->macpads_Bsize ); - } - - memset ( hd->ctx->macpads, 0, 2*(hd->ctx->macpads_Bsize) ); - ipad = hd->ctx->macpads; - opad = (hd->ctx->macpads)+(hd->ctx->macpads_Bsize); - memcpy ( ipad, key, keylen ); - memcpy ( opad, key, keylen ); - for (i=0; i < hd->ctx->macpads_Bsize; i++ ) - { - ipad[i] ^= 0x36; - opad[i] ^= 0x5c; - } - xfree (helpkey); - - return 0; -} - - -gcry_err_code_t -_gcry_md_ctl (gcry_md_hd_t hd, int cmd, void *buffer, size_t buflen) -{ - gcry_err_code_t rc = 0; - - (void)buflen; /* Currently not used. */ - - switch (cmd) - { - case GCRYCTL_FINALIZE: - md_final (hd); - break; - case GCRYCTL_START_DUMP: - md_start_debug (hd, buffer); - break; - case GCRYCTL_STOP_DUMP: - md_stop_debug ( hd ); - break; - default: - rc = GPG_ERR_INV_OP; - } - return rc; -} - - -gcry_err_code_t -_gcry_md_setkey (gcry_md_hd_t hd, const void *key, size_t keylen) -{ - gcry_err_code_t rc; - - if (!hd->ctx->macpads) - rc = GPG_ERR_CONFLICT; - else - { - rc = prepare_macpads (hd, key, keylen); - if (!rc) - _gcry_md_reset (hd); - } - - return rc; -} - - -/* The new debug interface. If SUFFIX is a string it creates an debug - file for the context HD. IF suffix is NULL, the file is closed and - debugging is stopped. */ -void -_gcry_md_debug (gcry_md_hd_t hd, const char *suffix) -{ - if (suffix) - md_start_debug (hd, suffix); - else - md_stop_debug (hd); -} - - -/**************** - * If ALGO is null get the digest for the used algo (which should be - * only one) - */ -static byte * -md_read( gcry_md_hd_t a, int algo ) -{ - GcryDigestEntry *r = a->ctx->list; - - if (! algo) - { - /* Return the first algorithm */ - if (r) - { - if (r->next) - log_debug ("more than one algorithm in md_read(0)\n"); - return r->spec->read (&r->context.c); - } - } - else - { - for (r = a->ctx->list; r; r = r->next) - if (r->spec->algo == algo) - return r->spec->read (&r->context.c); - } - BUG(); - return NULL; -} - - -/* - * Read out the complete digest, this function implictly finalizes - * the hash. - */ -byte * -_gcry_md_read (gcry_md_hd_t hd, int algo) -{ - /* This function is expected to always return a digest, thus we - can't return an error which we actually should do in - non-operational state. */ - _gcry_md_ctl (hd, GCRYCTL_FINALIZE, NULL, 0); - return md_read (hd, algo); -} - - -/* - * Read out an intermediate digest. Not yet functional. - */ -gcry_err_code_t -_gcry_md_get (gcry_md_hd_t hd, int algo, byte *buffer, int buflen) -{ - (void)hd; - (void)algo; - (void)buffer; - (void)buflen; - - /*md_digest ... */ - fips_signal_error ("unimplemented function called"); - return GPG_ERR_INTERNAL; -} - - -/* - * Shortcut function to hash a buffer with a given algo. The only - * guaranteed supported algorithms are RIPE-MD160 and SHA-1. The - * supplied digest buffer must be large enough to store the resulting - * hash. No error is returned, the function will abort on an invalid - * algo. DISABLED_ALGOS are ignored here. */ -void -_gcry_md_hash_buffer (int algo, void *digest, - const void *buffer, size_t length) -{ - if (algo == GCRY_MD_SHA1) - _gcry_sha1_hash_buffer (digest, buffer, length); - else if (algo == GCRY_MD_RMD160 && !fips_mode () ) - _gcry_rmd160_hash_buffer (digest, buffer, length); - else - { - /* For the others we do not have a fast function, so we use the - normal functions. */ - gcry_md_hd_t h; - gpg_err_code_t err; - - if (algo == GCRY_MD_MD5 && fips_mode ()) - { - _gcry_inactivate_fips_mode ("MD5 used"); - if (_gcry_enforced_fips_mode () ) - { - /* We should never get to here because we do not register - MD5 in enforced fips mode. */ - _gcry_fips_noreturn (); - } - } - - err = md_open (&h, algo, 0); - if (err) - log_bug ("gcry_md_open failed for algo %d: %s", - algo, gpg_strerror (gcry_error(err))); - md_write (h, (byte *) buffer, length); - md_final (h); - memcpy (digest, md_read (h, algo), md_digest_length (algo)); - md_close (h); - } -} - - -/* Shortcut function to hash multiple buffers with a given algo. In - contrast to gcry_md_hash_buffer, this function returns an error on - invalid arguments or on other problems; disabled algorithms are - _not_ ignored but flagged as an error. - - The data to sign is taken from the array IOV which has IOVCNT items. - - The only supported flag in FLAGS is GCRY_MD_FLAG_HMAC which turns - this function into a HMAC function; the first item in IOV is then - used as the key. - - On success 0 is returned and resulting hash or HMAC is stored at - DIGEST which must have been provided by the caller with an - appropriate length. */ -gpg_err_code_t -_gcry_md_hash_buffers (int algo, unsigned int flags, void *digest, - const gcry_buffer_t *iov, int iovcnt) -{ - int hmac; - - if (!iov || iovcnt < 0) - return GPG_ERR_INV_ARG; - if (flags & ~(GCRY_MD_FLAG_HMAC)) - return GPG_ERR_INV_ARG; - - hmac = !!(flags & GCRY_MD_FLAG_HMAC); - if (hmac && iovcnt < 1) - return GPG_ERR_INV_ARG; - - if (algo == GCRY_MD_SHA1 && !hmac) - _gcry_sha1_hash_buffers (digest, iov, iovcnt); - else - { - /* For the others we do not have a fast function, so we use the - normal functions. */ - gcry_md_hd_t h; - gpg_err_code_t rc; - - if (algo == GCRY_MD_MD5 && fips_mode ()) - { - _gcry_inactivate_fips_mode ("MD5 used"); - if (_gcry_enforced_fips_mode () ) - { - /* We should never get to here because we do not register - MD5 in enforced fips mode. */ - _gcry_fips_noreturn (); - } - } - - rc = md_open (&h, algo, (hmac? GCRY_MD_FLAG_HMAC:0)); - if (rc) - return rc; - - if (hmac) - { - rc = _gcry_md_setkey (h, - (const char*)iov[0].data + iov[0].off, - iov[0].len); - if (rc) - { - md_close (h); - return rc; - } - iov++; iovcnt--; - } - for (;iovcnt; iov++, iovcnt--) - md_write (h, (const char*)iov[0].data + iov[0].off, iov[0].len); - md_final (h); - memcpy (digest, md_read (h, algo), md_digest_length (algo)); - md_close (h); - } - - return 0; -} - - -static int -md_get_algo (gcry_md_hd_t a) -{ - GcryDigestEntry *r = a->ctx->list; - - if (r && r->next) - { - fips_signal_error ("possible usage error"); - log_error ("WARNING: more than one algorithm in md_get_algo()\n"); - } - return r ? r->spec->algo : 0; -} - - -int -_gcry_md_get_algo (gcry_md_hd_t hd) -{ - return md_get_algo (hd); -} - - -/**************** - * Return the length of the digest - */ -static int -md_digest_length (int algorithm) -{ - gcry_md_spec_t *spec; - - spec = spec_from_algo (algorithm); - return spec? spec->mdlen : 0; -} - - -/**************** - * Return the length of the digest in bytes. - * This function will return 0 in case of errors. - */ -unsigned int -_gcry_md_get_algo_dlen (int algorithm) -{ - return md_digest_length (algorithm); -} - - -/* Hmmm: add a mode to enumerate the OIDs - * to make g10/sig-check.c more portable */ -static const byte * -md_asn_oid (int algorithm, size_t *asnlen, size_t *mdlen) -{ - gcry_md_spec_t *spec; - const byte *asnoid = NULL; - - spec = spec_from_algo (algorithm); - if (spec) - { - if (asnlen) - *asnlen = spec->asnlen; - if (mdlen) - *mdlen = spec->mdlen; - asnoid = spec->asnoid; - } - else - log_bug ("no ASN.1 OID for md algo %d\n", algorithm); - - return asnoid; -} - - -/**************** - * Return information about the given cipher algorithm - * WHAT select the kind of information returned: - * GCRYCTL_TEST_ALGO: - * Returns 0 when the specified algorithm is available for use. - * buffer and nbytes must be zero. - * GCRYCTL_GET_ASNOID: - * Return the ASNOID of the algorithm in buffer. if buffer is NULL, only - * the required length is returned. - * GCRYCTL_SELFTEST - * Helper for the regression tests - shall not be used by applications. - * - * Note: Because this function is in most cases used to return an - * integer value, we can make it easier for the caller to just look at - * the return value. The caller will in all cases consult the value - * and thereby detecting whether a error occurred or not (i.e. while checking - * the block size) - */ -gcry_err_code_t -_gcry_md_algo_info (int algo, int what, void *buffer, size_t *nbytes) -{ - gcry_err_code_t rc; - - switch (what) - { - case GCRYCTL_TEST_ALGO: - if (buffer || nbytes) - rc = GPG_ERR_INV_ARG; - else - rc = check_digest_algo (algo); - break; - - case GCRYCTL_GET_ASNOID: - /* We need to check that the algo is available because - md_asn_oid would otherwise raise an assertion. */ - rc = check_digest_algo (algo); - if (!rc) - { - const char unsigned *asn; - size_t asnlen; - - asn = md_asn_oid (algo, &asnlen, NULL); - if (buffer && (*nbytes >= asnlen)) - { - memcpy (buffer, asn, asnlen); - *nbytes = asnlen; - } - else if (!buffer && nbytes) - *nbytes = asnlen; - else - { - if (buffer) - rc = GPG_ERR_TOO_SHORT; - else - rc = GPG_ERR_INV_ARG; - } - } - break; - - case GCRYCTL_SELFTEST: - /* Helper function for the regression tests. */ - rc = gpg_err_code (_gcry_md_selftest (algo, nbytes? (int)*nbytes : 0, - NULL)); - break; - - default: - rc = GPG_ERR_INV_OP; - break; - } - - return rc; -} - - -static void -md_start_debug ( gcry_md_hd_t md, const char *suffix ) -{ - static int idx=0; - char buf[50]; - - if (fips_mode ()) - return; - - if ( md->ctx->debug ) - { - log_debug("Oops: md debug already started\n"); - return; - } - idx++; - snprintf (buf, DIM(buf)-1, "dbgmd-%05d.%.10s", idx, suffix ); - md->ctx->debug = fopen(buf, "w"); - if ( !md->ctx->debug ) - log_debug("md debug: can't open %s\n", buf ); -} - - -static void -md_stop_debug( gcry_md_hd_t md ) -{ - if ( md->ctx->debug ) - { - if ( md->bufpos ) - md_write ( md, NULL, 0 ); - fclose (md->ctx->debug); - md->ctx->debug = NULL; - } - -#ifdef HAVE_U64_TYPEDEF - { /* a kludge to pull in the __muldi3 for Solaris */ - volatile u32 a = (u32)(ulong)md; - volatile u64 b = 42; - volatile u64 c; - c = a * b; - (void)c; - } -#endif -} - - - -/* - * Return information about the digest handle. - * GCRYCTL_IS_SECURE: - * Returns 1 when the handle works on secured memory - * otherwise 0 is returned. There is no error return. - * GCRYCTL_IS_ALGO_ENABLED: - * Returns 1 if the algo is enabled for that handle. - * The algo must be passed as the address of an int. - */ -gcry_err_code_t -_gcry_md_info (gcry_md_hd_t h, int cmd, void *buffer, size_t *nbytes) -{ - gcry_err_code_t rc = 0; - - switch (cmd) - { - case GCRYCTL_IS_SECURE: - *nbytes = h->ctx->flags.secure; - break; - - case GCRYCTL_IS_ALGO_ENABLED: - { - GcryDigestEntry *r; - int algo; - - if ( !buffer || !nbytes || *nbytes != sizeof (int)) - rc = GPG_ERR_INV_ARG; - else - { - algo = *(int*)buffer; - - *nbytes = 0; - for(r=h->ctx->list; r; r = r->next ) { - if (r->spec->algo == algo) - { - *nbytes = 1; - break; - } - } - } - break; - } - - default: - rc = GPG_ERR_INV_OP; - } - - return rc; -} - - -/* Explicitly initialize this module. */ -gcry_err_code_t -_gcry_md_init (void) -{ - return 0; -} - - -int -_gcry_md_is_secure (gcry_md_hd_t a) -{ - size_t value; - - if (_gcry_md_info (a, GCRYCTL_IS_SECURE, NULL, &value)) - value = 1; /* It seems to be better to assume secure memory on - error. */ - return value; -} - - -int -_gcry_md_is_enabled (gcry_md_hd_t a, int algo) -{ - size_t value; - - value = sizeof algo; - if (_gcry_md_info (a, GCRYCTL_IS_ALGO_ENABLED, &algo, &value)) - value = 0; - return value; -} - - -/* Run the selftests for digest algorithm ALGO with optional reporting - function REPORT. */ -gpg_error_t -_gcry_md_selftest (int algo, int extended, selftest_report_func_t report) -{ - gcry_err_code_t ec = 0; - gcry_md_spec_t *spec; - - spec = spec_from_algo (algo); - if (spec && !spec->flags.disabled && spec->selftest) - ec = spec->selftest (algo, extended, report); - else - { - ec = (spec && spec->selftest) ? GPG_ERR_DIGEST_ALGO - /* */ : GPG_ERR_NOT_IMPLEMENTED; - if (report) - report ("digest", algo, "module", - (spec && !spec->flags.disabled)? - "no selftest available" : - spec? "algorithm disabled" : "algorithm not found"); - } - - return gpg_error (ec); -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/md4.c b/src/hos_libhttpserver/src/libgcrypt/cipher/md4.c deleted file mode 100644 index 624ae997..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/md4.c +++ /dev/null @@ -1,276 +0,0 @@ -/* md4.c - MD4 Message-Digest Algorithm - * Copyright (C) 2002, 2003 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * Based on md5.c in libgcrypt, but rewritten to compute md4 checksums - * using a public domain md4 implementation with the following comments: - * - * Modified by Wei Dai from Andrew M. Kuchling's md4.c - * The original code and all modifications are in the public domain. - * - * This is the original introductory comment: - * - * md4.c : MD4 hash algorithm. - * - * Part of the Python Cryptography Toolkit, version 1.1 - * - * Distribute and use freely; there are no restrictions on further - * dissemination and usage except those imposed by the laws of your - * country of residence. - * - */ - -/* MD4 test suite: - * MD4 ("") = 31d6cfe0d16ae931b73c59d7e0c089c0 - * MD4 ("a") = bde52cb31de33e46245e05fbdbd6fb24 - * MD4 ("abc") = a448017aaf21d8525fc10ae87aa6729d - * MD4 ("message digest") = d9130a8164549fe818874806e1c7014b - * MD4 ("abcdefghijklmnopqrstuvwxyz") = d79e1c308aa5bbcdeea8ed63df412da9 - * MD4 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") = - * 043f8582f241db351ce627e153e7f0e4 - * MD4 ("123456789012345678901234567890123456789012345678901234567890123456 - * 78901234567890") = e33b4ddc9c38f2199c3e7b164fcc0536 - */ - -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" - -#include "bithelp.h" -#include "bufhelp.h" -#include "hash-common.h" - - -typedef struct { - gcry_md_block_ctx_t bctx; - u32 A,B,C,D; /* chaining variables */ -} MD4_CONTEXT; - -static unsigned int -transform ( void *c, const unsigned char *data ); - -static void -md4_init (void *context, unsigned int flags) -{ - MD4_CONTEXT *ctx = context; - - (void)flags; - - ctx->A = 0x67452301; - ctx->B = 0xefcdab89; - ctx->C = 0x98badcfe; - ctx->D = 0x10325476; - - ctx->bctx.nblocks = 0; - ctx->bctx.nblocks_high = 0; - ctx->bctx.count = 0; - ctx->bctx.blocksize = 64; - ctx->bctx.bwrite = transform; -} - -#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z)))) -#define G(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) - - -/**************** - * transform 64 bytes - */ -static unsigned int -transform ( void *c, const unsigned char *data ) -{ - MD4_CONTEXT *ctx = c; - u32 in[16]; - register u32 A = ctx->A; - register u32 B = ctx->B; - register u32 C = ctx->C; - register u32 D = ctx->D; - int i; - - for ( i = 0; i < 16; i++ ) - in[i] = buf_get_le32(data + i * 4); - - /* Round 1. */ -#define function(a,b,c,d,k,s) a=rol(a+F(b,c,d)+in[k],s); - function(A,B,C,D, 0, 3); - function(D,A,B,C, 1, 7); - function(C,D,A,B, 2,11); - function(B,C,D,A, 3,19); - function(A,B,C,D, 4, 3); - function(D,A,B,C, 5, 7); - function(C,D,A,B, 6,11); - function(B,C,D,A, 7,19); - function(A,B,C,D, 8, 3); - function(D,A,B,C, 9, 7); - function(C,D,A,B,10,11); - function(B,C,D,A,11,19); - function(A,B,C,D,12, 3); - function(D,A,B,C,13, 7); - function(C,D,A,B,14,11); - function(B,C,D,A,15,19); - -#undef function - - /* Round 2. */ -#define function(a,b,c,d,k,s) a=rol(a+G(b,c,d)+in[k]+0x5a827999,s); - - function(A,B,C,D, 0, 3); - function(D,A,B,C, 4, 5); - function(C,D,A,B, 8, 9); - function(B,C,D,A,12,13); - function(A,B,C,D, 1, 3); - function(D,A,B,C, 5, 5); - function(C,D,A,B, 9, 9); - function(B,C,D,A,13,13); - function(A,B,C,D, 2, 3); - function(D,A,B,C, 6, 5); - function(C,D,A,B,10, 9); - function(B,C,D,A,14,13); - function(A,B,C,D, 3, 3); - function(D,A,B,C, 7, 5); - function(C,D,A,B,11, 9); - function(B,C,D,A,15,13); - -#undef function - - /* Round 3. */ -#define function(a,b,c,d,k,s) a=rol(a+H(b,c,d)+in[k]+0x6ed9eba1,s); - - function(A,B,C,D, 0, 3); - function(D,A,B,C, 8, 9); - function(C,D,A,B, 4,11); - function(B,C,D,A,12,15); - function(A,B,C,D, 2, 3); - function(D,A,B,C,10, 9); - function(C,D,A,B, 6,11); - function(B,C,D,A,14,15); - function(A,B,C,D, 1, 3); - function(D,A,B,C, 9, 9); - function(C,D,A,B, 5,11); - function(B,C,D,A,13,15); - function(A,B,C,D, 3, 3); - function(D,A,B,C,11, 9); - function(C,D,A,B, 7,11); - function(B,C,D,A,15,15); - - - /* Put checksum in context given as argument. */ - ctx->A += A; - ctx->B += B; - ctx->C += C; - ctx->D += D; - - return /*burn_stack*/ 80+6*sizeof(void*); -} - - - -/* The routine final terminates the message-digest computation and - * ends with the desired message digest in mdContext->digest[0...15]. - * The handle is prepared for a new MD4 cycle. - * Returns 16 bytes representing the digest. - */ - -static void -md4_final( void *context ) -{ - MD4_CONTEXT *hd = context; - u32 t, th, msb, lsb; - byte *p; - unsigned int burn; - - _gcry_md_block_write(hd, NULL, 0); /* flush */; - - t = hd->bctx.nblocks; - if (sizeof t == sizeof hd->bctx.nblocks) - th = hd->bctx.nblocks_high; - else - th = hd->bctx.nblocks >> 32; - - /* multiply by 64 to make a byte count */ - lsb = t << 6; - msb = (th << 6) | (t >> 26); - /* add the count */ - t = lsb; - if( (lsb += hd->bctx.count) < t ) - msb++; - /* multiply by 8 to make a bit count */ - t = lsb; - lsb <<= 3; - msb <<= 3; - msb |= t >> 29; - - if( hd->bctx.count < 56 ) /* enough room */ - { - hd->bctx.buf[hd->bctx.count++] = 0x80; /* pad */ - while( hd->bctx.count < 56 ) - hd->bctx.buf[hd->bctx.count++] = 0; /* pad */ - } - else /* need one extra block */ - { - hd->bctx.buf[hd->bctx.count++] = 0x80; /* pad character */ - while( hd->bctx.count < 64 ) - hd->bctx.buf[hd->bctx.count++] = 0; - _gcry_md_block_write(hd, NULL, 0); /* flush */; - memset(hd->bctx.buf, 0, 56 ); /* fill next block with zeroes */ - } - /* append the 64 bit count */ - buf_put_le32(hd->bctx.buf + 56, lsb); - buf_put_le32(hd->bctx.buf + 60, msb); - burn = transform( hd, hd->bctx.buf ); - _gcry_burn_stack (burn); - - p = hd->bctx.buf; -#define X(a) do { *(u32*)p = le_bswap32((*hd).a) ; p += 4; } while(0) - X(A); - X(B); - X(C); - X(D); -#undef X - -} - -static byte * -md4_read (void *context) -{ - MD4_CONTEXT *hd = context; - return hd->bctx.buf; -} - -static byte asn[18] = /* Object ID is 1.2.840.113549.2.4 */ - { 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86,0x48, - 0x86, 0xf7, 0x0d, 0x02, 0x04, 0x05, 0x00, 0x04, 0x10 }; - -static gcry_md_oid_spec_t oid_spec_md4[] = - { - /* iso.member-body.us.rsadsi.digestAlgorithm.md4 */ - { "1.2.840.113549.2.4" }, - { NULL }, - }; - -gcry_md_spec_t _gcry_digest_spec_md4 = - { - GCRY_MD_MD4, {0, 0}, - "MD4", asn, DIM (asn), oid_spec_md4,16, - md4_init, _gcry_md_block_write, md4_final, md4_read, - sizeof (MD4_CONTEXT) - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/md5.c b/src/hos_libhttpserver/src/libgcrypt/cipher/md5.c deleted file mode 100644 index b0187c98..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/md5.c +++ /dev/null @@ -1,302 +0,0 @@ -/* md5.c - MD5 Message-Digest Algorithm - * Copyright (C) 1995,1996,1998,1999,2001,2002, - * 2003 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * According to the definition of MD5 in RFC 1321 from April 1992. - * NOTE: This is *not* the same file as the one from glibc. - * Written by Ulrich Drepper , 1995. - * heavily modified for GnuPG by Werner Koch - */ - -/* Test values: - * "" D4 1D 8C D9 8F 00 B2 04 E9 80 09 98 EC F8 42 7E - * "a" 0C C1 75 B9 C0 F1 B6 A8 31 C3 99 E2 69 77 26 61 - * "abc 90 01 50 98 3C D2 4F B0 D6 96 3F 7D 28 E1 7F 72 - * "message digest" F9 6B 69 7D 7C B7 93 8D 52 5A 2F 31 AA F1 61 D0 - */ - -#include -#include -#include -#include - -#include "g10lib.h" -#include "cipher.h" - -#include "bithelp.h" -#include "bufhelp.h" -#include "hash-common.h" - - -typedef struct { - gcry_md_block_ctx_t bctx; - u32 A,B,C,D; /* chaining variables */ -} MD5_CONTEXT; - -static unsigned int -transform ( void *ctx, const unsigned char *data ); - -static void -md5_init( void *context, unsigned int flags) -{ - MD5_CONTEXT *ctx = context; - - (void)flags; - - ctx->A = 0x67452301; - ctx->B = 0xefcdab89; - ctx->C = 0x98badcfe; - ctx->D = 0x10325476; - - ctx->bctx.nblocks = 0; - ctx->bctx.nblocks_high = 0; - ctx->bctx.count = 0; - ctx->bctx.blocksize = 64; - ctx->bctx.bwrite = transform; -} - - -/* These are the four functions used in the four steps of the MD5 algorithm - and defined in the RFC 1321. The first function is a little bit optimized - (as found in Colin Plumbs public domain implementation). */ -/* #define FF(b, c, d) ((b & c) | (~b & d)) */ -#define FF(b, c, d) (d ^ (b & (c ^ d))) -#define FG(b, c, d) FF (d, b, c) -#define FH(b, c, d) (b ^ c ^ d) -#define FI(b, c, d) (c ^ (b | ~d)) - - -/**************** - * transform n*64 bytes - */ -static unsigned int -transform ( void *c, const unsigned char *data ) -{ - MD5_CONTEXT *ctx = c; - u32 correct_words[16]; - register u32 A = ctx->A; - register u32 B = ctx->B; - register u32 C = ctx->C; - register u32 D = ctx->D; - u32 *cwp = correct_words; - int i; - - for ( i = 0; i < 16; i++ ) - correct_words[i] = buf_get_le32(data + i * 4); - -#define OP(a, b, c, d, s, T) \ - do \ - { \ - a += FF (b, c, d) + (*cwp++) + T; \ - a = rol(a, s); \ - a += b; \ - } \ - while (0) - - /* Before we start, one word about the strange constants. - They are defined in RFC 1321 as - - T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64 - */ - - /* Round 1. */ - OP (A, B, C, D, 7, 0xd76aa478); - OP (D, A, B, C, 12, 0xe8c7b756); - OP (C, D, A, B, 17, 0x242070db); - OP (B, C, D, A, 22, 0xc1bdceee); - OP (A, B, C, D, 7, 0xf57c0faf); - OP (D, A, B, C, 12, 0x4787c62a); - OP (C, D, A, B, 17, 0xa8304613); - OP (B, C, D, A, 22, 0xfd469501); - OP (A, B, C, D, 7, 0x698098d8); - OP (D, A, B, C, 12, 0x8b44f7af); - OP (C, D, A, B, 17, 0xffff5bb1); - OP (B, C, D, A, 22, 0x895cd7be); - OP (A, B, C, D, 7, 0x6b901122); - OP (D, A, B, C, 12, 0xfd987193); - OP (C, D, A, B, 17, 0xa679438e); - OP (B, C, D, A, 22, 0x49b40821); - -#undef OP -#define OP(f, a, b, c, d, k, s, T) \ - do \ - { \ - a += f (b, c, d) + correct_words[k] + T; \ - a = rol(a, s); \ - a += b; \ - } \ - while (0) - - /* Round 2. */ - OP (FG, A, B, C, D, 1, 5, 0xf61e2562); - OP (FG, D, A, B, C, 6, 9, 0xc040b340); - OP (FG, C, D, A, B, 11, 14, 0x265e5a51); - OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa); - OP (FG, A, B, C, D, 5, 5, 0xd62f105d); - OP (FG, D, A, B, C, 10, 9, 0x02441453); - OP (FG, C, D, A, B, 15, 14, 0xd8a1e681); - OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8); - OP (FG, A, B, C, D, 9, 5, 0x21e1cde6); - OP (FG, D, A, B, C, 14, 9, 0xc33707d6); - OP (FG, C, D, A, B, 3, 14, 0xf4d50d87); - OP (FG, B, C, D, A, 8, 20, 0x455a14ed); - OP (FG, A, B, C, D, 13, 5, 0xa9e3e905); - OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8); - OP (FG, C, D, A, B, 7, 14, 0x676f02d9); - OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a); - - /* Round 3. */ - OP (FH, A, B, C, D, 5, 4, 0xfffa3942); - OP (FH, D, A, B, C, 8, 11, 0x8771f681); - OP (FH, C, D, A, B, 11, 16, 0x6d9d6122); - OP (FH, B, C, D, A, 14, 23, 0xfde5380c); - OP (FH, A, B, C, D, 1, 4, 0xa4beea44); - OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9); - OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60); - OP (FH, B, C, D, A, 10, 23, 0xbebfbc70); - OP (FH, A, B, C, D, 13, 4, 0x289b7ec6); - OP (FH, D, A, B, C, 0, 11, 0xeaa127fa); - OP (FH, C, D, A, B, 3, 16, 0xd4ef3085); - OP (FH, B, C, D, A, 6, 23, 0x04881d05); - OP (FH, A, B, C, D, 9, 4, 0xd9d4d039); - OP (FH, D, A, B, C, 12, 11, 0xe6db99e5); - OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8); - OP (FH, B, C, D, A, 2, 23, 0xc4ac5665); - - /* Round 4. */ - OP (FI, A, B, C, D, 0, 6, 0xf4292244); - OP (FI, D, A, B, C, 7, 10, 0x432aff97); - OP (FI, C, D, A, B, 14, 15, 0xab9423a7); - OP (FI, B, C, D, A, 5, 21, 0xfc93a039); - OP (FI, A, B, C, D, 12, 6, 0x655b59c3); - OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92); - OP (FI, C, D, A, B, 10, 15, 0xffeff47d); - OP (FI, B, C, D, A, 1, 21, 0x85845dd1); - OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f); - OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0); - OP (FI, C, D, A, B, 6, 15, 0xa3014314); - OP (FI, B, C, D, A, 13, 21, 0x4e0811a1); - OP (FI, A, B, C, D, 4, 6, 0xf7537e82); - OP (FI, D, A, B, C, 11, 10, 0xbd3af235); - OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb); - OP (FI, B, C, D, A, 9, 21, 0xeb86d391); - - /* Put checksum in context given as argument. */ - ctx->A += A; - ctx->B += B; - ctx->C += C; - ctx->D += D; - - return /*burn_stack*/ 80+6*sizeof(void*); -} - - - -/* The routine final terminates the message-digest computation and - * ends with the desired message digest in mdContext->digest[0...15]. - * The handle is prepared for a new MD5 cycle. - * Returns 16 bytes representing the digest. - */ - -static void -md5_final( void *context) -{ - MD5_CONTEXT *hd = context; - u32 t, th, msb, lsb; - byte *p; - unsigned int burn; - - _gcry_md_block_write(hd, NULL, 0); /* flush */; - - t = hd->bctx.nblocks; - if (sizeof t == sizeof hd->bctx.nblocks) - th = hd->bctx.nblocks_high; - else - th = hd->bctx.nblocks >> 32; - - /* multiply by 64 to make a byte count */ - lsb = t << 6; - msb = (th << 6) | (t >> 26); - /* add the count */ - t = lsb; - if( (lsb += hd->bctx.count) < t ) - msb++; - /* multiply by 8 to make a bit count */ - t = lsb; - lsb <<= 3; - msb <<= 3; - msb |= t >> 29; - - if( hd->bctx.count < 56 ) /* enough room */ - { - hd->bctx.buf[hd->bctx.count++] = 0x80; /* pad */ - while( hd->bctx.count < 56 ) - hd->bctx.buf[hd->bctx.count++] = 0; /* pad */ - } - else /* need one extra block */ - { - hd->bctx.buf[hd->bctx.count++] = 0x80; /* pad character */ - while( hd->bctx.count < 64 ) - hd->bctx.buf[hd->bctx.count++] = 0; - _gcry_md_block_write(hd, NULL, 0); /* flush */; - memset(hd->bctx.buf, 0, 56 ); /* fill next block with zeroes */ - } - /* append the 64 bit count */ - buf_put_le32(hd->bctx.buf + 56, lsb); - buf_put_le32(hd->bctx.buf + 60, msb); - burn = transform( hd, hd->bctx.buf ); - _gcry_burn_stack (burn); - - p = hd->bctx.buf; -#define X(a) do { *(u32*)p = le_bswap32((*hd).a) ; p += 4; } while(0) - X(A); - X(B); - X(C); - X(D); -#undef X - -} - -static byte * -md5_read( void *context ) -{ - MD5_CONTEXT *hd = (MD5_CONTEXT *) context; - return hd->bctx.buf; -} - -static byte asn[18] = /* Object ID is 1.2.840.113549.2.5 */ - { 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86,0x48, - 0x86, 0xf7, 0x0d, 0x02, 0x05, 0x05, 0x00, 0x04, 0x10 }; - -static gcry_md_oid_spec_t oid_spec_md5[] = - { - /* iso.member-body.us.rsadsi.pkcs.pkcs-1.4 (md5WithRSAEncryption) */ - { "1.2.840.113549.1.1.4" }, - /* RSADSI digestAlgorithm MD5 */ - { "1.2.840.113549.2.5" }, - { NULL }, - }; - -gcry_md_spec_t _gcry_digest_spec_md5 = - { - GCRY_MD_MD5, {0, 1}, - "MD5", asn, DIM (asn), oid_spec_md5, 16, - md5_init, _gcry_md_block_write, md5_final, md5_read, - sizeof (MD5_CONTEXT) - }; diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/primegen.c b/src/hos_libhttpserver/src/libgcrypt/cipher/primegen.c deleted file mode 100644 index e46bf184..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/primegen.c +++ /dev/null @@ -1,1867 +0,0 @@ -/* primegen.c - prime number generator - * Copyright (C) 1998, 2000, 2001, 2002, 2003 - * 2004, 2008 Free Software Foundation, Inc. - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - -#include - -#include -#include -#include -#include - -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "ath.h" - -static gcry_mpi_t gen_prime (unsigned int nbits, int secret, int randomlevel, - int (*extra_check)(void *, gcry_mpi_t), - void *extra_check_arg); -static int check_prime( gcry_mpi_t prime, gcry_mpi_t val_2, int rm_rounds, - gcry_prime_check_func_t cb_func, void *cb_arg ); -static int is_prime (gcry_mpi_t n, int steps, unsigned int *count); -static void m_out_of_n( char *array, int m, int n ); - -static void (*progress_cb) (void *,const char*,int,int, int ); -static void *progress_cb_data; - -/* Note: 2 is not included because it can be tested more easily by - looking at bit 0. The last entry in this list is marked by a zero */ -static ushort small_prime_numbers[] = { - 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, - 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, - 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, - 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, - 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, - 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, - 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, - 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, - 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, - 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, - 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, - 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, - 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, - 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, - 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, - 919, 929, 937, 941, 947, 953, 967, 971, 977, 983, - 991, 997, 1009, 1013, 1019, 1021, 1031, 1033, - 1039, 1049, 1051, 1061, 1063, 1069, 1087, 1091, - 1093, 1097, 1103, 1109, 1117, 1123, 1129, 1151, - 1153, 1163, 1171, 1181, 1187, 1193, 1201, 1213, - 1217, 1223, 1229, 1231, 1237, 1249, 1259, 1277, - 1279, 1283, 1289, 1291, 1297, 1301, 1303, 1307, - 1319, 1321, 1327, 1361, 1367, 1373, 1381, 1399, - 1409, 1423, 1427, 1429, 1433, 1439, 1447, 1451, - 1453, 1459, 1471, 1481, 1483, 1487, 1489, 1493, - 1499, 1511, 1523, 1531, 1543, 1549, 1553, 1559, - 1567, 1571, 1579, 1583, 1597, 1601, 1607, 1609, - 1613, 1619, 1621, 1627, 1637, 1657, 1663, 1667, - 1669, 1693, 1697, 1699, 1709, 1721, 1723, 1733, - 1741, 1747, 1753, 1759, 1777, 1783, 1787, 1789, - 1801, 1811, 1823, 1831, 1847, 1861, 1867, 1871, - 1873, 1877, 1879, 1889, 1901, 1907, 1913, 1931, - 1933, 1949, 1951, 1973, 1979, 1987, 1993, 1997, - 1999, 2003, 2011, 2017, 2027, 2029, 2039, 2053, - 2063, 2069, 2081, 2083, 2087, 2089, 2099, 2111, - 2113, 2129, 2131, 2137, 2141, 2143, 2153, 2161, - 2179, 2203, 2207, 2213, 2221, 2237, 2239, 2243, - 2251, 2267, 2269, 2273, 2281, 2287, 2293, 2297, - 2309, 2311, 2333, 2339, 2341, 2347, 2351, 2357, - 2371, 2377, 2381, 2383, 2389, 2393, 2399, 2411, - 2417, 2423, 2437, 2441, 2447, 2459, 2467, 2473, - 2477, 2503, 2521, 2531, 2539, 2543, 2549, 2551, - 2557, 2579, 2591, 2593, 2609, 2617, 2621, 2633, - 2647, 2657, 2659, 2663, 2671, 2677, 2683, 2687, - 2689, 2693, 2699, 2707, 2711, 2713, 2719, 2729, - 2731, 2741, 2749, 2753, 2767, 2777, 2789, 2791, - 2797, 2801, 2803, 2819, 2833, 2837, 2843, 2851, - 2857, 2861, 2879, 2887, 2897, 2903, 2909, 2917, - 2927, 2939, 2953, 2957, 2963, 2969, 2971, 2999, - 3001, 3011, 3019, 3023, 3037, 3041, 3049, 3061, - 3067, 3079, 3083, 3089, 3109, 3119, 3121, 3137, - 3163, 3167, 3169, 3181, 3187, 3191, 3203, 3209, - 3217, 3221, 3229, 3251, 3253, 3257, 3259, 3271, - 3299, 3301, 3307, 3313, 3319, 3323, 3329, 3331, - 3343, 3347, 3359, 3361, 3371, 3373, 3389, 3391, - 3407, 3413, 3433, 3449, 3457, 3461, 3463, 3467, - 3469, 3491, 3499, 3511, 3517, 3527, 3529, 3533, - 3539, 3541, 3547, 3557, 3559, 3571, 3581, 3583, - 3593, 3607, 3613, 3617, 3623, 3631, 3637, 3643, - 3659, 3671, 3673, 3677, 3691, 3697, 3701, 3709, - 3719, 3727, 3733, 3739, 3761, 3767, 3769, 3779, - 3793, 3797, 3803, 3821, 3823, 3833, 3847, 3851, - 3853, 3863, 3877, 3881, 3889, 3907, 3911, 3917, - 3919, 3923, 3929, 3931, 3943, 3947, 3967, 3989, - 4001, 4003, 4007, 4013, 4019, 4021, 4027, 4049, - 4051, 4057, 4073, 4079, 4091, 4093, 4099, 4111, - 4127, 4129, 4133, 4139, 4153, 4157, 4159, 4177, - 4201, 4211, 4217, 4219, 4229, 4231, 4241, 4243, - 4253, 4259, 4261, 4271, 4273, 4283, 4289, 4297, - 4327, 4337, 4339, 4349, 4357, 4363, 4373, 4391, - 4397, 4409, 4421, 4423, 4441, 4447, 4451, 4457, - 4463, 4481, 4483, 4493, 4507, 4513, 4517, 4519, - 4523, 4547, 4549, 4561, 4567, 4583, 4591, 4597, - 4603, 4621, 4637, 4639, 4643, 4649, 4651, 4657, - 4663, 4673, 4679, 4691, 4703, 4721, 4723, 4729, - 4733, 4751, 4759, 4783, 4787, 4789, 4793, 4799, - 4801, 4813, 4817, 4831, 4861, 4871, 4877, 4889, - 4903, 4909, 4919, 4931, 4933, 4937, 4943, 4951, - 4957, 4967, 4969, 4973, 4987, 4993, 4999, - 0 -}; -static int no_of_small_prime_numbers = DIM (small_prime_numbers) - 1; - - - -/* An object and a list to build up a global pool of primes. See - save_pool_prime and get_pool_prime. */ -struct primepool_s -{ - struct primepool_s *next; - gcry_mpi_t prime; /* If this is NULL the entry is not used. */ - unsigned int nbits; - gcry_random_level_t randomlevel; -}; -struct primepool_s *primepool; -/* Mutex used to protect access to the primepool. */ -static ath_mutex_t primepool_lock; - - -gcry_err_code_t -_gcry_primegen_init (void) -{ - gcry_err_code_t ec; - - ec = ath_mutex_init (&primepool_lock); - if (ec) - return gpg_err_code_from_errno (ec); - return ec; -} - - -/* Save PRIME which has been generated at RANDOMLEVEL for later - use. Needs to be called while primepool_lock is being hold. Note - that PRIME should be considered released after calling this - function. */ -static void -save_pool_prime (gcry_mpi_t prime, gcry_random_level_t randomlevel) -{ - struct primepool_s *item, *item2; - size_t n; - - for (n=0, item = primepool; item; item = item->next, n++) - if (!item->prime) - break; - if (!item && n > 100) - { - /* Remove some of the entries. Our strategy is removing - the last third from the list. */ - int i; - - for (i=0, item2 = primepool; item2; item2 = item2->next) - { - if (i >= n/3*2) - { - _gcry_mpi_release (item2->prime); - item2->prime = NULL; - if (!item) - item = item2; - } - } - } - if (!item) - { - item = xtrycalloc (1, sizeof *item); - if (!item) - { - /* Out of memory. Silently giving up. */ - _gcry_mpi_release (prime); - return; - } - item->next = primepool; - primepool = item; - } - item->prime = prime; - item->nbits = mpi_get_nbits (prime); - item->randomlevel = randomlevel; -} - - -/* Return a prime for the prime pool or NULL if none has been found. - The prime needs to match NBITS and randomlevel. This function needs - to be called with the primepool_look is being hold. */ -static gcry_mpi_t -get_pool_prime (unsigned int nbits, gcry_random_level_t randomlevel) -{ - struct primepool_s *item; - - for (item = primepool; item; item = item->next) - if (item->prime - && item->nbits == nbits && item->randomlevel == randomlevel) - { - gcry_mpi_t prime = item->prime; - item->prime = NULL; - gcry_assert (nbits == mpi_get_nbits (prime)); - return prime; - } - return NULL; -} - - - - - - -void -_gcry_register_primegen_progress ( void (*cb)(void *,const char*,int,int,int), - void *cb_data ) -{ - progress_cb = cb; - progress_cb_data = cb_data; -} - - -static void -progress( int c ) -{ - if ( progress_cb ) - progress_cb ( progress_cb_data, "primegen", c, 0, 0 ); -} - - -/**************** - * Generate a prime number (stored in secure memory) - */ -gcry_mpi_t -_gcry_generate_secret_prime (unsigned int nbits, - gcry_random_level_t random_level, - int (*extra_check)(void*, gcry_mpi_t), - void *extra_check_arg) -{ - gcry_mpi_t prime; - - prime = gen_prime (nbits, 1, random_level, extra_check, extra_check_arg); - progress('\n'); - return prime; -} - - -/* Generate a prime number which may be public, i.e. not allocated in - secure memory. */ -gcry_mpi_t -_gcry_generate_public_prime (unsigned int nbits, - gcry_random_level_t random_level, - int (*extra_check)(void*, gcry_mpi_t), - void *extra_check_arg) -{ - gcry_mpi_t prime; - - prime = gen_prime (nbits, 0, random_level, extra_check, extra_check_arg); - progress('\n'); - return prime; -} - - -/* Core prime generation function. The algorithm used to generate - practically save primes is due to Lim and Lee as described in the - CRYPTO '97 proceedings (ISBN3540633847) page 260. - - NEED_Q_FACTOR: If true make sure that at least one factor is of - size qbits. This is for example required for DSA. - PRIME_GENERATED: Adresss of a variable where the resulting prime - number will be stored. - PBITS: Requested size of the prime number. At least 48. - QBITS: One factor of the prime needs to be of this size. Maybe 0 - if this is not required. See also MODE. - G: If not NULL an MPI which will receive a generator for the prime - for use with Elgamal. - RET_FACTORS: if not NULL, an array with all factors are stored at - that address. - ALL_FACTORS: If set to true all factors of prime-1 are returned. - RANDOMLEVEL: How strong should the random numers be. - FLAGS: Prime generation bit flags. Currently supported: - GCRY_PRIME_FLAG_SECRET - The prime needs to be kept secret. - CB_FUNC, CB_ARG: Callback to be used for extra checks. - - */ -static gcry_err_code_t -prime_generate_internal (int need_q_factor, - gcry_mpi_t *prime_generated, unsigned int pbits, - unsigned int qbits, gcry_mpi_t g, - gcry_mpi_t **ret_factors, - gcry_random_level_t randomlevel, unsigned int flags, - int all_factors, - gcry_prime_check_func_t cb_func, void *cb_arg) -{ - gcry_err_code_t err = 0; - gcry_mpi_t *factors_new = NULL; /* Factors to return to the - caller. */ - gcry_mpi_t *factors = NULL; /* Current factors. */ - gcry_random_level_t poolrandomlevel; /* Random level used for pool primes. */ - gcry_mpi_t *pool = NULL; /* Pool of primes. */ - int *pool_in_use = NULL; /* Array with currently used POOL elements. */ - unsigned char *perms = NULL; /* Permutations of POOL. */ - gcry_mpi_t q_factor = NULL; /* Used if QBITS is non-zero. */ - unsigned int fbits = 0; /* Length of prime factors. */ - unsigned int n = 0; /* Number of factors. */ - unsigned int m = 0; /* Number of primes in pool. */ - gcry_mpi_t q = NULL; /* First prime factor. */ - gcry_mpi_t prime = NULL; /* Prime candidate. */ - unsigned int nprime = 0; /* Bits of PRIME. */ - unsigned int req_qbits; /* The original QBITS value. */ - gcry_mpi_t val_2; /* For check_prime(). */ - int is_locked = 0; /* Flag to help unlocking the primepool. */ - unsigned int is_secret = (flags & GCRY_PRIME_FLAG_SECRET); - unsigned int count1 = 0, count2 = 0; - unsigned int i = 0, j = 0; - - if (pbits < 48) - return GPG_ERR_INV_ARG; - - /* We won't use a too strong random elvel for the pooled subprimes. */ - poolrandomlevel = (randomlevel > GCRY_STRONG_RANDOM? - GCRY_STRONG_RANDOM : randomlevel); - - - /* If QBITS is not given, assume a reasonable value. */ - if (!qbits) - qbits = pbits / 3; - - req_qbits = qbits; - - /* Find number of needed prime factors N. */ - for (n = 1; (pbits - qbits - 1) / n >= qbits; n++) - ; - n--; - - val_2 = mpi_alloc_set_ui (2); - - if ((! n) || ((need_q_factor) && (n < 2))) - { - err = GPG_ERR_INV_ARG; - goto leave; - } - - if (need_q_factor) - { - n--; /* Need one factor less because we want a specific Q-FACTOR. */ - fbits = (pbits - 2 * req_qbits -1) / n; - qbits = pbits - req_qbits - n * fbits; - } - else - { - fbits = (pbits - req_qbits -1) / n; - qbits = pbits - n * fbits; - } - - if (DBG_CIPHER) - log_debug ("gen prime: pbits=%u qbits=%u fbits=%u/%u n=%d\n", - pbits, req_qbits, qbits, fbits, n); - - /* Allocate an integer to old the new prime. */ - prime = mpi_new (pbits); - - /* Generate first prime factor. */ - q = gen_prime (qbits, is_secret, randomlevel, NULL, NULL); - - /* Generate a specific Q-Factor if requested. */ - if (need_q_factor) - q_factor = gen_prime (req_qbits, is_secret, randomlevel, NULL, NULL); - - /* Allocate an array to hold all factors + 2 for later usage. */ - factors = xtrycalloc (n + 2, sizeof (*factors)); - if (!factors) - { - err = gpg_err_code_from_errno (errno); - goto leave; - } - - /* Allocate an array to track pool usage. */ - pool_in_use = xtrymalloc (n * sizeof *pool_in_use); - if (!pool_in_use) - { - err = gpg_err_code_from_errno (errno); - goto leave; - } - for (i=0; i < n; i++) - pool_in_use[i] = -1; - - /* Make a pool of 3n+5 primes (this is an arbitrary value). We - require at least 30 primes for are useful selection process. - - Fixme: We need to research the best formula for sizing the pool. - */ - m = n * 3 + 5; - if (need_q_factor) /* Need some more in this case. */ - m += 5; - if (m < 30) - m = 30; - pool = xtrycalloc (m , sizeof (*pool)); - if (! pool) - { - err = gpg_err_code_from_errno (errno); - goto leave; - } - - /* Permutate over the pool of primes until we find a prime of the - requested length. */ - do - { - next_try: - for (i=0; i < n; i++) - pool_in_use[i] = -1; - - if (!perms) - { - /* Allocate new primes. This is done right at the beginning - of the loop and if we have later run out of primes. */ - for (i = 0; i < m; i++) - { - mpi_free (pool[i]); - pool[i] = NULL; - } - - /* Init m_out_of_n(). */ - perms = xtrycalloc (1, m); - if (!perms) - { - err = gpg_err_code_from_errno (errno); - goto leave; - } - - if (ath_mutex_lock (&primepool_lock)) - { - err = GPG_ERR_INTERNAL; - goto leave; - } - is_locked = 1; - for (i = 0; i < n; i++) - { - perms[i] = 1; - /* At a maximum we use strong random for the factors. - This saves us a lot of entropy. Given that Q and - possible Q-factor are also used in the final prime - this should be acceptable. We also don't allocate in - secure memory to save on that scare resource too. If - Q has been allocated in secure memory, the final - prime will be saved there anyway. This is because - our MPI routines take care of that. GnuPG has worked - this way ever since. */ - pool[i] = NULL; - if (is_locked) - { - pool[i] = get_pool_prime (fbits, poolrandomlevel); - if (!pool[i]) - { - if (ath_mutex_unlock (&primepool_lock)) - { - err = GPG_ERR_INTERNAL; - goto leave; - } - is_locked = 0; - } - } - if (!pool[i]) - pool[i] = gen_prime (fbits, 0, poolrandomlevel, NULL, NULL); - pool_in_use[i] = i; - factors[i] = pool[i]; - } - if (is_locked && ath_mutex_unlock (&primepool_lock)) - { - err = GPG_ERR_INTERNAL; - goto leave; - } - is_locked = 0; - } - else - { - /* Get next permutation. */ - m_out_of_n ( (char*)perms, n, m); - if (ath_mutex_lock (&primepool_lock)) - { - err = GPG_ERR_INTERNAL; - goto leave; - } - is_locked = 1; - for (i = j = 0; (i < m) && (j < n); i++) - if (perms[i]) - { - /* If the subprime has not yet beed generated do it now. */ - if (!pool[i] && is_locked) - { - pool[i] = get_pool_prime (fbits, poolrandomlevel); - if (!pool[i]) - { - if (ath_mutex_unlock (&primepool_lock)) - { - err = GPG_ERR_INTERNAL; - goto leave; - } - is_locked = 0; - } - } - if (!pool[i]) - pool[i] = gen_prime (fbits, 0, poolrandomlevel, NULL, NULL); - pool_in_use[j] = i; - factors[j++] = pool[i]; - } - if (is_locked && ath_mutex_unlock (&primepool_lock)) - { - err = GPG_ERR_INTERNAL; - goto leave; - } - is_locked = 0; - if (i == n) - { - /* Ran out of permutations: Allocate new primes. */ - xfree (perms); - perms = NULL; - progress ('!'); - goto next_try; - } - } - - /* Generate next prime candidate: - p = 2 * q [ * q_factor] * factor_0 * factor_1 * ... * factor_n + 1. - */ - mpi_set (prime, q); - mpi_mul_ui (prime, prime, 2); - if (need_q_factor) - mpi_mul (prime, prime, q_factor); - for(i = 0; i < n; i++) - mpi_mul (prime, prime, factors[i]); - mpi_add_ui (prime, prime, 1); - nprime = mpi_get_nbits (prime); - - if (nprime < pbits) - { - if (++count1 > 20) - { - count1 = 0; - qbits++; - progress('>'); - mpi_free (q); - q = gen_prime (qbits, is_secret, randomlevel, NULL, NULL); - goto next_try; - } - } - else - count1 = 0; - - if (nprime > pbits) - { - if (++count2 > 20) - { - count2 = 0; - qbits--; - progress('<'); - mpi_free (q); - q = gen_prime (qbits, is_secret, randomlevel, NULL, NULL); - goto next_try; - } - } - else - count2 = 0; - } - while (! ((nprime == pbits) && check_prime (prime, val_2, 5, - cb_func, cb_arg))); - - if (DBG_CIPHER) - { - progress ('\n'); - log_mpidump ("prime ", prime); - log_mpidump ("factor q", q); - if (need_q_factor) - log_mpidump ("factor q0", q_factor); - for (i = 0; i < n; i++) - log_mpidump ("factor pi", factors[i]); - log_debug ("bit sizes: prime=%u, q=%u", - mpi_get_nbits (prime), mpi_get_nbits (q)); - if (need_q_factor) - log_printf (", q0=%u", mpi_get_nbits (q_factor)); - for (i = 0; i < n; i++) - log_printf (", p%d=%u", i, mpi_get_nbits (factors[i])); - log_printf ("\n"); - } - - if (ret_factors) - { - /* Caller wants the factors. */ - factors_new = xtrycalloc (n + 4, sizeof (*factors_new)); - if (! factors_new) - { - err = gpg_err_code_from_errno (errno); - goto leave; - } - - if (all_factors) - { - i = 0; - factors_new[i++] = mpi_set_ui (NULL, 2); - factors_new[i++] = mpi_copy (q); - if (need_q_factor) - factors_new[i++] = mpi_copy (q_factor); - for(j=0; j < n; j++) - factors_new[i++] = mpi_copy (factors[j]); - } - else - { - i = 0; - if (need_q_factor) - { - factors_new[i++] = mpi_copy (q_factor); - for (; i <= n; i++) - factors_new[i] = mpi_copy (factors[i]); - } - else - for (; i < n; i++ ) - factors_new[i] = mpi_copy (factors[i]); - } - } - - if (g) - { - /* Create a generator (start with 3). */ - gcry_mpi_t tmp = mpi_alloc (mpi_get_nlimbs (prime)); - gcry_mpi_t b = mpi_alloc (mpi_get_nlimbs (prime)); - gcry_mpi_t pmin1 = mpi_alloc (mpi_get_nlimbs (prime)); - - if (need_q_factor) - err = GPG_ERR_NOT_IMPLEMENTED; - else - { - factors[n] = q; - factors[n + 1] = mpi_alloc_set_ui (2); - mpi_sub_ui (pmin1, prime, 1); - mpi_set_ui (g, 2); - do - { - mpi_add_ui (g, g, 1); - if (DBG_CIPHER) - log_printmpi ("checking g", g); - else - progress('^'); - for (i = 0; i < n + 2; i++) - { - mpi_fdiv_q (tmp, pmin1, factors[i]); - /* No mpi_pow(), but it is okay to use this with mod - prime. */ - mpi_powm (b, g, tmp, prime); - if (! mpi_cmp_ui (b, 1)) - break; - } - if (DBG_CIPHER) - progress('\n'); - } - while (i < n + 2); - - mpi_free (factors[n+1]); - mpi_free (tmp); - mpi_free (b); - mpi_free (pmin1); - } - } - - if (! DBG_CIPHER) - progress ('\n'); - - - leave: - if (pool) - { - is_locked = !ath_mutex_lock (&primepool_lock); - for(i = 0; i < m; i++) - { - if (pool[i]) - { - for (j=0; j < n; j++) - if (pool_in_use[j] == i) - break; - if (j == n && is_locked) - { - /* This pooled subprime has not been used. */ - save_pool_prime (pool[i], poolrandomlevel); - } - else - mpi_free (pool[i]); - } - } - if (is_locked && ath_mutex_unlock (&primepool_lock)) - err = GPG_ERR_INTERNAL; - is_locked = 0; - xfree (pool); - } - xfree (pool_in_use); - if (factors) - xfree (factors); /* Factors are shallow copies. */ - if (perms) - xfree (perms); - - mpi_free (val_2); - mpi_free (q); - mpi_free (q_factor); - - if (! err) - { - *prime_generated = prime; - if (ret_factors) - *ret_factors = factors_new; - } - else - { - if (factors_new) - { - for (i = 0; factors_new[i]; i++) - mpi_free (factors_new[i]); - xfree (factors_new); - } - mpi_free (prime); - } - - return err; -} - - -/* Generate a prime used for discrete logarithm algorithms; i.e. this - prime will be public and no strong random is required. On success - R_PRIME receives a new MPI with the prime. On error R_PRIME is set - to NULL and an error code is returned. If RET_FACTORS is not NULL - it is set to an allocated array of factors on success or to NULL on - error. */ -gcry_err_code_t -_gcry_generate_elg_prime (int mode, unsigned pbits, unsigned qbits, - gcry_mpi_t g, - gcry_mpi_t *r_prime, gcry_mpi_t **ret_factors) -{ - *r_prime = NULL; - if (ret_factors) - *ret_factors = NULL; - return prime_generate_internal ((mode == 1), r_prime, pbits, qbits, g, - ret_factors, GCRY_WEAK_RANDOM, 0, 0, - NULL, NULL); -} - - -static gcry_mpi_t -gen_prime (unsigned int nbits, int secret, int randomlevel, - int (*extra_check)(void *, gcry_mpi_t), void *extra_check_arg) -{ - gcry_mpi_t prime, ptest, pminus1, val_2, val_3, result; - int i; - unsigned int x, step; - unsigned int count1, count2; - int *mods; - -/* if ( DBG_CIPHER ) */ -/* log_debug ("generate a prime of %u bits ", nbits ); */ - - if (nbits < 16) - log_fatal ("can't generate a prime with less than %d bits\n", 16); - - mods = xmalloc (no_of_small_prime_numbers * sizeof *mods); - /* Make nbits fit into gcry_mpi_t implementation. */ - val_2 = mpi_alloc_set_ui( 2 ); - val_3 = mpi_alloc_set_ui( 3); - prime = secret? mpi_snew (nbits): mpi_new (nbits); - result = mpi_alloc_like( prime ); - pminus1= mpi_alloc_like( prime ); - ptest = mpi_alloc_like( prime ); - count1 = count2 = 0; - for (;;) - { /* try forvever */ - int dotcount=0; - - /* generate a random number */ - _gcry_mpi_randomize( prime, nbits, randomlevel ); - - /* Set high order bit to 1, set low order bit to 1. If we are - generating a secret prime we are most probably doing that - for RSA, to make sure that the modulus does have the - requested key size we set the 2 high order bits. */ - mpi_set_highbit (prime, nbits-1); - if (secret) - mpi_set_bit (prime, nbits-2); - mpi_set_bit(prime, 0); - - /* Calculate all remainders. */ - for (i=0; (x = small_prime_numbers[i]); i++ ) - mods[i] = mpi_fdiv_r_ui(NULL, prime, x); - - /* Now try some primes starting with prime. */ - for(step=0; step < 20000; step += 2 ) - { - /* Check against all the small primes we have in mods. */ - count1++; - for (i=0; (x = small_prime_numbers[i]); i++ ) - { - while ( mods[i] + step >= x ) - mods[i] -= x; - if ( !(mods[i] + step) ) - break; - } - if ( x ) - continue; /* Found a multiple of an already known prime. */ - - mpi_add_ui( ptest, prime, step ); - - /* Do a fast Fermat test now. */ - count2++; - mpi_sub_ui( pminus1, ptest, 1); - mpi_powm( result, val_2, pminus1, ptest ); - if ( !mpi_cmp_ui( result, 1 ) ) - { - /* Not composite, perform stronger tests */ - if (is_prime(ptest, 5, &count2 )) - { - if (!mpi_test_bit( ptest, nbits-1-secret )) - { - progress('\n'); - log_debug ("overflow in prime generation\n"); - break; /* Stop loop, continue with a new prime. */ - } - - if (extra_check && extra_check (extra_check_arg, ptest)) - { - /* The extra check told us that this prime is - not of the caller's taste. */ - progress ('/'); - } - else - { - /* Got it. */ - mpi_free(val_2); - mpi_free(val_3); - mpi_free(result); - mpi_free(pminus1); - mpi_free(prime); - xfree(mods); - return ptest; - } - } - } - if (++dotcount == 10 ) - { - progress('.'); - dotcount = 0; - } - } - progress(':'); /* restart with a new random value */ - } -} - -/**************** - * Returns: true if this may be a prime - * RM_ROUNDS gives the number of Rabin-Miller tests to run. - */ -static int -check_prime( gcry_mpi_t prime, gcry_mpi_t val_2, int rm_rounds, - gcry_prime_check_func_t cb_func, void *cb_arg) -{ - int i; - unsigned int x; - unsigned int count=0; - - /* Check against small primes. */ - for (i=0; (x = small_prime_numbers[i]); i++ ) - { - if ( mpi_divisible_ui( prime, x ) ) - return !mpi_cmp_ui (prime, x); - } - - /* A quick Fermat test. */ - { - gcry_mpi_t result = mpi_alloc_like( prime ); - gcry_mpi_t pminus1 = mpi_alloc_like( prime ); - mpi_sub_ui( pminus1, prime, 1); - mpi_powm( result, val_2, pminus1, prime ); - mpi_free( pminus1 ); - if ( mpi_cmp_ui( result, 1 ) ) - { - /* Is composite. */ - mpi_free( result ); - progress('.'); - return 0; - } - mpi_free( result ); - } - - if (!cb_func || cb_func (cb_arg, GCRY_PRIME_CHECK_AT_MAYBE_PRIME, prime)) - { - /* Perform stronger tests. */ - if ( is_prime( prime, rm_rounds, &count ) ) - { - if (!cb_func - || cb_func (cb_arg, GCRY_PRIME_CHECK_AT_GOT_PRIME, prime)) - return 1; /* Probably a prime. */ - } - } - progress('.'); - return 0; -} - - -/* - * Return true if n is probably a prime - */ -static int -is_prime (gcry_mpi_t n, int steps, unsigned int *count) -{ - gcry_mpi_t x = mpi_alloc( mpi_get_nlimbs( n ) ); - gcry_mpi_t y = mpi_alloc( mpi_get_nlimbs( n ) ); - gcry_mpi_t z = mpi_alloc( mpi_get_nlimbs( n ) ); - gcry_mpi_t nminus1 = mpi_alloc( mpi_get_nlimbs( n ) ); - gcry_mpi_t a2 = mpi_alloc_set_ui( 2 ); - gcry_mpi_t q; - unsigned i, j, k; - int rc = 0; - unsigned nbits = mpi_get_nbits( n ); - - if (steps < 5) /* Make sure that we do at least 5 rounds. */ - steps = 5; - - mpi_sub_ui( nminus1, n, 1 ); - - /* Find q and k, so that n = 1 + 2^k * q . */ - q = mpi_copy ( nminus1 ); - k = mpi_trailing_zeros ( q ); - mpi_tdiv_q_2exp (q, q, k); - - for (i=0 ; i < steps; i++ ) - { - ++*count; - if( !i ) - { - mpi_set_ui( x, 2 ); - } - else - { - _gcry_mpi_randomize( x, nbits, GCRY_WEAK_RANDOM ); - - /* Make sure that the number is smaller than the prime and - keep the randomness of the high bit. */ - if ( mpi_test_bit ( x, nbits-2) ) - { - mpi_set_highbit ( x, nbits-2); /* Clear all higher bits. */ - } - else - { - mpi_set_highbit( x, nbits-2 ); - mpi_clear_bit( x, nbits-2 ); - } - gcry_assert (mpi_cmp (x, nminus1) < 0 && mpi_cmp_ui (x, 1) > 0); - } - mpi_powm ( y, x, q, n); - if ( mpi_cmp_ui(y, 1) && mpi_cmp( y, nminus1 ) ) - { - for ( j=1; j < k && mpi_cmp( y, nminus1 ); j++ ) - { - mpi_powm(y, y, a2, n); - if( !mpi_cmp_ui( y, 1 ) ) - goto leave; /* Not a prime. */ - } - if (mpi_cmp( y, nminus1 ) ) - goto leave; /* Not a prime. */ - } - progress('+'); - } - rc = 1; /* May be a prime. */ - - leave: - mpi_free( x ); - mpi_free( y ); - mpi_free( z ); - mpi_free( nminus1 ); - mpi_free( q ); - mpi_free( a2 ); - - return rc; -} - - -/* Given ARRAY of size N with M elements set to true produce a - modified array with the next permutation of M elements. Note, that - ARRAY is used in a one-bit-per-byte approach. To detected the last - permutation it is useful to initialize the array with the first M - element set to true and use this test: - m_out_of_n (array, m, n); - for (i = j = 0; i < n && j < m; i++) - if (array[i]) - j++; - if (j == m) - goto ready; - - This code is based on the algorithm 452 from the "Collected - Algorithms From ACM, Volume II" by C. N. Liu and D. T. Tang. -*/ -static void -m_out_of_n ( char *array, int m, int n ) -{ - int i=0, i1=0, j=0, jp=0, j1=0, k1=0, k2=0; - - if( !m || m >= n ) - return; - - /* Need to handle this simple case separately. */ - if( m == 1 ) - { - for (i=0; i < n; i++ ) - { - if ( array[i] ) - { - array[i++] = 0; - if( i >= n ) - i = 0; - array[i] = 1; - return; - } - } - BUG(); - } - - - for (j=1; j < n; j++ ) - { - if ( array[n-1] == array[n-j-1]) - continue; - j1 = j; - break; - } - - if ( (m & 1) ) - { - /* M is odd. */ - if( array[n-1] ) - { - if( j1 & 1 ) - { - k1 = n - j1; - k2 = k1+2; - if( k2 > n ) - k2 = n; - goto leave; - } - goto scan; - } - k2 = n - j1 - 1; - if( k2 == 0 ) - { - k1 = i; - k2 = n - j1; - } - else if( array[k2] && array[k2-1] ) - k1 = n; - else - k1 = k2 + 1; - } - else - { - /* M is even. */ - if( !array[n-1] ) - { - k1 = n - j1; - k2 = k1 + 1; - goto leave; - } - - if( !(j1 & 1) ) - { - k1 = n - j1; - k2 = k1+2; - if( k2 > n ) - k2 = n; - goto leave; - } - scan: - jp = n - j1 - 1; - for (i=1; i <= jp; i++ ) - { - i1 = jp + 2 - i; - if( array[i1-1] ) - { - if( array[i1-2] ) - { - k1 = i1 - 1; - k2 = n - j1; - } - else - { - k1 = i1 - 1; - k2 = n + 1 - j1; - } - goto leave; - } - } - k1 = 1; - k2 = n + 1 - m; - } - leave: - /* Now complement the two selected bits. */ - array[k1-1] = !array[k1-1]; - array[k2-1] = !array[k2-1]; -} - - -/* Generate a new prime number of PRIME_BITS bits and store it in - PRIME. If FACTOR_BITS is non-zero, one of the prime factors of - (prime - 1) / 2 must be FACTOR_BITS bits long. If FACTORS is - non-zero, allocate a new, NULL-terminated array holding the prime - factors and store it in FACTORS. FLAGS might be used to influence - the prime number generation process. */ -gcry_err_code_t -_gcry_prime_generate (gcry_mpi_t *prime, unsigned int prime_bits, - unsigned int factor_bits, gcry_mpi_t **factors, - gcry_prime_check_func_t cb_func, void *cb_arg, - gcry_random_level_t random_level, - unsigned int flags) -{ - gcry_err_code_t rc = 0; - gcry_mpi_t *factors_generated = NULL; - gcry_mpi_t prime_generated = NULL; - unsigned int mode = 0; - - if (!prime) - return GPG_ERR_INV_ARG; - *prime = NULL; - - if (flags & GCRY_PRIME_FLAG_SPECIAL_FACTOR) - mode = 1; - - /* Generate. */ - rc = prime_generate_internal ((mode==1), &prime_generated, prime_bits, - factor_bits, NULL, - factors? &factors_generated : NULL, - random_level, flags, 1, - cb_func, cb_arg); - - if (!rc && cb_func) - { - /* Additional check. */ - if ( !cb_func (cb_arg, GCRY_PRIME_CHECK_AT_FINISH, prime_generated)) - { - /* Failed, deallocate resources. */ - unsigned int i; - - mpi_free (prime_generated); - if (factors) - { - for (i = 0; factors_generated[i]; i++) - mpi_free (factors_generated[i]); - xfree (factors_generated); - } - rc = GPG_ERR_GENERAL; - } - } - - if (!rc) - { - if (factors) - *factors = factors_generated; - *prime = prime_generated; - } - - return rc; -} - -/* Check whether the number X is prime. */ -gcry_err_code_t -_gcry_prime_check (gcry_mpi_t x, unsigned int flags) -{ - (void)flags; - - switch (mpi_cmp_ui (x, 2)) - { - case 0: return 0; /* 2 is a prime */ - case -1: return GPG_ERR_NO_PRIME; /* Only numbers > 1 are primes. */ - } - - /* We use 64 rounds because the prime we are going to test is not - guaranteed to be a random one. */ - if (check_prime (x, mpi_const (MPI_C_TWO), 64, NULL, NULL)) - return 0; - - return GPG_ERR_NO_PRIME; -} - -/* Find a generator for PRIME where the factorization of (prime-1) is - in the NULL terminated array FACTORS. Return the generator as a - newly allocated MPI in R_G. If START_G is not NULL, use this as s - atart for the search. Returns 0 on success.*/ -gcry_err_code_t -_gcry_prime_group_generator (gcry_mpi_t *r_g, - gcry_mpi_t prime, gcry_mpi_t *factors, - gcry_mpi_t start_g) -{ - gcry_mpi_t tmp = mpi_new (0); - gcry_mpi_t b = mpi_new (0); - gcry_mpi_t pmin1 = mpi_new (0); - gcry_mpi_t g = start_g? mpi_copy (start_g) : mpi_set_ui (NULL, 3); - int first = 1; - int i, n; - - if (!factors || !r_g || !prime) - return GPG_ERR_INV_ARG; - *r_g = NULL; - - for (n=0; factors[n]; n++) - ; - if (n < 2) - return GPG_ERR_INV_ARG; - - /* Extra sanity check - usually disabled. */ -/* mpi_set (tmp, factors[0]); */ -/* for(i = 1; i < n; i++) */ -/* mpi_mul (tmp, tmp, factors[i]); */ -/* mpi_add_ui (tmp, tmp, 1); */ -/* if (mpi_cmp (prime, tmp)) */ -/* return gpg_error (GPG_ERR_INV_ARG); */ - - mpi_sub_ui (pmin1, prime, 1); - do - { - if (first) - first = 0; - else - mpi_add_ui (g, g, 1); - - if (DBG_CIPHER) - log_printmpi ("checking g", g); - else - progress('^'); - - for (i = 0; i < n; i++) - { - mpi_fdiv_q (tmp, pmin1, factors[i]); - mpi_powm (b, g, tmp, prime); - if (! mpi_cmp_ui (b, 1)) - break; - } - if (DBG_CIPHER) - progress('\n'); - } - while (i < n); - - _gcry_mpi_release (tmp); - _gcry_mpi_release (b); - _gcry_mpi_release (pmin1); - *r_g = g; - - return 0; -} - -/* Convenience function to release the factors array. */ -void -_gcry_prime_release_factors (gcry_mpi_t *factors) -{ - if (factors) - { - int i; - - for (i=0; factors[i]; i++) - mpi_free (factors[i]); - xfree (factors); - } -} - - - -/* Helper for _gcry_derive_x931_prime. */ -static gcry_mpi_t -find_x931_prime (const gcry_mpi_t pfirst) -{ - gcry_mpi_t val_2 = mpi_alloc_set_ui (2); - gcry_mpi_t prime; - - prime = mpi_copy (pfirst); - /* If P is even add 1. */ - mpi_set_bit (prime, 0); - - /* We use 64 Rabin-Miller rounds which is better and thus - sufficient. We do not have a Lucas test implementaion thus we - can't do it in the X9.31 preferred way of running a few - Rabin-Miller followed by one Lucas test. */ - while ( !check_prime (prime, val_2, 64, NULL, NULL) ) - mpi_add_ui (prime, prime, 2); - - mpi_free (val_2); - - return prime; -} - - -/* Generate a prime using the algorithm from X9.31 appendix B.4. - - This function requires that the provided public exponent E is odd. - XP, XP1 and XP2 are the seed values. All values are mandatory. - - On success the prime is returned. If R_P1 or R_P2 are given the - internal values P1 and P2 are saved at these addresses. On error - NULL is returned. */ -gcry_mpi_t -_gcry_derive_x931_prime (const gcry_mpi_t xp, - const gcry_mpi_t xp1, const gcry_mpi_t xp2, - const gcry_mpi_t e, - gcry_mpi_t *r_p1, gcry_mpi_t *r_p2) -{ - gcry_mpi_t p1, p2, p1p2, yp0; - - if (!xp || !xp1 || !xp2) - return NULL; - if (!e || !mpi_test_bit (e, 0)) - return NULL; /* We support only odd values for E. */ - - p1 = find_x931_prime (xp1); - p2 = find_x931_prime (xp2); - p1p2 = mpi_alloc_like (xp); - mpi_mul (p1p2, p1, p2); - - { - gcry_mpi_t r1, tmp; - - /* r1 = (p2^{-1} mod p1)p2 - (p1^{-1} mod p2) */ - tmp = mpi_alloc_like (p1); - mpi_invm (tmp, p2, p1); - mpi_mul (tmp, tmp, p2); - r1 = tmp; - - tmp = mpi_alloc_like (p2); - mpi_invm (tmp, p1, p2); - mpi_mul (tmp, tmp, p1); - mpi_sub (r1, r1, tmp); - - /* Fixup a negative value. */ - if (mpi_has_sign (r1)) - mpi_add (r1, r1, p1p2); - - /* yp0 = xp + (r1 - xp mod p1*p2) */ - yp0 = tmp; tmp = NULL; - mpi_subm (yp0, r1, xp, p1p2); - mpi_add (yp0, yp0, xp); - mpi_free (r1); - - /* Fixup a negative value. */ - if (mpi_cmp (yp0, xp) < 0 ) - mpi_add (yp0, yp0, p1p2); - } - - /* yp0 is now the first integer greater than xp with p1 being a - large prime factor of yp0-1 and p2 a large prime factor of yp0+1. */ - - /* Note that the first example from X9.31 (D.1.1) which uses - (Xq1 #1A5CF72EE770DE50CB09ACCEA9#) - (Xq2 #134E4CAA16D2350A21D775C404#) - (Xq #CC1092495D867E64065DEE3E7955F2EBC7D47A2D - 7C9953388F97DDDC3E1CA19C35CA659EDC2FC325 - 6D29C2627479C086A699A49C4C9CEE7EF7BD1B34 - 321DE34A#)))) - returns an yp0 of - #CC1092495D867E64065DEE3E7955F2EBC7D47A2D - 7C9953388F97DDDC3E1CA19C35CA659EDC2FC4E3 - BF20CB896EE37E098A906313271422162CB6C642 - 75C1201F# - and not - #CC1092495D867E64065DEE3E7955F2EBC7D47A2D - 7C9953388F97DDDC3E1CA19C35CA659EDC2FC2E6 - C88FE299D52D78BE405A97E01FD71DD7819ECB91 - FA85A076# - as stated in the standard. This seems to be a bug in X9.31. - */ - - { - gcry_mpi_t val_2 = mpi_alloc_set_ui (2); - gcry_mpi_t gcdtmp = mpi_alloc_like (yp0); - int gcdres; - - mpi_sub_ui (p1p2, p1p2, 1); /* Adjust for loop body. */ - mpi_sub_ui (yp0, yp0, 1); /* Ditto. */ - for (;;) - { - gcdres = mpi_gcd (gcdtmp, e, yp0); - mpi_add_ui (yp0, yp0, 1); - if (!gcdres) - progress ('/'); /* gcd (e, yp0-1) != 1 */ - else if (check_prime (yp0, val_2, 64, NULL, NULL)) - break; /* Found. */ - /* We add p1p2-1 because yp0 is incremented after the gcd test. */ - mpi_add (yp0, yp0, p1p2); - } - mpi_free (gcdtmp); - mpi_free (val_2); - } - - mpi_free (p1p2); - - progress('\n'); - if (r_p1) - *r_p1 = p1; - else - mpi_free (p1); - if (r_p2) - *r_p2 = p2; - else - mpi_free (p2); - return yp0; -} - - - -/* Generate the two prime used for DSA using the algorithm specified - in FIPS 186-2. PBITS is the desired length of the prime P and a - QBITS the length of the prime Q. If SEED is not supplied and - SEEDLEN is 0 the function generates an appropriate SEED. On - success the generated primes are stored at R_Q and R_P, the counter - value is stored at R_COUNTER and the seed actually used for - generation is stored at R_SEED and R_SEEDVALUE. */ -gpg_err_code_t -_gcry_generate_fips186_2_prime (unsigned int pbits, unsigned int qbits, - const void *seed, size_t seedlen, - gcry_mpi_t *r_q, gcry_mpi_t *r_p, - int *r_counter, - void **r_seed, size_t *r_seedlen) -{ - gpg_err_code_t ec; - unsigned char seed_help_buffer[160/8]; /* Used to hold a generated SEED. */ - unsigned char *seed_plus; /* Malloced buffer to hold SEED+x. */ - unsigned char digest[160/8]; /* Helper buffer for SHA-1 digest. */ - gcry_mpi_t val_2 = NULL; /* Helper for the prime test. */ - gcry_mpi_t tmpval = NULL; /* Helper variable. */ - int i; - - unsigned char value_u[160/8]; - int value_n, value_b, value_k; - int counter; - gcry_mpi_t value_w = NULL; - gcry_mpi_t value_x = NULL; - gcry_mpi_t prime_q = NULL; - gcry_mpi_t prime_p = NULL; - - /* FIPS 186-2 allows only for 1024/160 bit. */ - if (pbits != 1024 || qbits != 160) - return GPG_ERR_INV_KEYLEN; - - if (!seed && !seedlen) - ; /* No seed value given: We are asked to generate it. */ - else if (!seed || seedlen < qbits/8) - return GPG_ERR_INV_ARG; - - /* Allocate a buffer to later compute SEED+some_increment. */ - seed_plus = xtrymalloc (seedlen < 20? 20:seedlen); - if (!seed_plus) - { - ec = gpg_err_code_from_syserror (); - goto leave; - } - - val_2 = mpi_alloc_set_ui (2); - value_n = (pbits - 1) / qbits; - value_b = (pbits - 1) - value_n * qbits; - value_w = mpi_new (pbits); - value_x = mpi_new (pbits); - - restart: - /* Generate Q. */ - for (;;) - { - /* Step 1: Generate a (new) seed unless one has been supplied. */ - if (!seed) - { - seedlen = sizeof seed_help_buffer; - _gcry_create_nonce (seed_help_buffer, seedlen); - seed = seed_help_buffer; - } - - /* Step 2: U = sha1(seed) ^ sha1((seed+1) mod 2^{qbits}) */ - memcpy (seed_plus, seed, seedlen); - for (i=seedlen-1; i >= 0; i--) - { - seed_plus[i]++; - if (seed_plus[i]) - break; - } - _gcry_md_hash_buffer (GCRY_MD_SHA1, value_u, seed, seedlen); - _gcry_md_hash_buffer (GCRY_MD_SHA1, digest, seed_plus, seedlen); - for (i=0; i < sizeof value_u; i++) - value_u[i] ^= digest[i]; - - /* Step 3: Form q from U */ - _gcry_mpi_release (prime_q); prime_q = NULL; - ec = _gcry_mpi_scan (&prime_q, GCRYMPI_FMT_USG, - value_u, sizeof value_u, NULL); - if (ec) - goto leave; - mpi_set_highbit (prime_q, qbits-1 ); - mpi_set_bit (prime_q, 0); - - /* Step 4: Test whether Q is prime using 64 round of Rabin-Miller. */ - if (check_prime (prime_q, val_2, 64, NULL, NULL)) - break; /* Yes, Q is prime. */ - - /* Step 5. */ - seed = NULL; /* Force a new seed at Step 1. */ - } - - /* Step 6. Note that we do no use an explicit offset but increment - SEED_PLUS accordingly. SEED_PLUS is currently SEED+1. */ - counter = 0; - - /* Generate P. */ - prime_p = mpi_new (pbits); - for (;;) - { - /* Step 7: For k = 0,...n let - V_k = sha1(seed+offset+k) mod 2^{qbits} - Step 8: W = V_0 + V_1*2^160 + - ... - + V_{n-1}*2^{(n-1)*160} - + (V_{n} mod 2^b)*2^{n*160} - */ - mpi_set_ui (value_w, 0); - for (value_k=0; value_k <= value_n; value_k++) - { - /* There is no need to have an explicit offset variable: In - the first round we shall have an offset of 2, this is - achieved by using SEED_PLUS which is already at SEED+1, - thus we just need to increment it once again. The - requirement for the next round is to update offset by N, - which we implictly did at the end of this loop, and then - to add one; this one is the same as in the first round. */ - for (i=seedlen-1; i >= 0; i--) - { - seed_plus[i]++; - if (seed_plus[i]) - break; - } - _gcry_md_hash_buffer (GCRY_MD_SHA1, digest, seed_plus, seedlen); - - _gcry_mpi_release (tmpval); tmpval = NULL; - ec = _gcry_mpi_scan (&tmpval, GCRYMPI_FMT_USG, - digest, sizeof digest, NULL); - if (ec) - goto leave; - if (value_k == value_n) - mpi_clear_highbit (tmpval, value_b); /* (V_n mod 2^b) */ - mpi_lshift (tmpval, tmpval, value_k*qbits); - mpi_add (value_w, value_w, tmpval); - } - - /* Step 8 continued: X = W + 2^{L-1} */ - mpi_set_ui (value_x, 0); - mpi_set_highbit (value_x, pbits-1); - mpi_add (value_x, value_x, value_w); - - /* Step 9: c = X mod 2q, p = X - (c - 1) */ - mpi_mul_2exp (tmpval, prime_q, 1); - mpi_mod (tmpval, value_x, tmpval); - mpi_sub_ui (tmpval, tmpval, 1); - mpi_sub (prime_p, value_x, tmpval); - - /* Step 10: If p < 2^{L-1} skip the primality test. */ - /* Step 11 and 12: Primality test. */ - if (mpi_get_nbits (prime_p) >= pbits-1 - && check_prime (prime_p, val_2, 64, NULL, NULL) ) - break; /* Yes, P is prime, continue with Step 15. */ - - /* Step 13: counter = counter + 1, offset = offset + n + 1. */ - counter++; - - /* Step 14: If counter >= 2^12 goto Step 1. */ - if (counter >= 4096) - goto restart; - } - - /* Step 15: Save p, q, counter and seed. */ -/* log_debug ("fips186-2 pbits p=%u q=%u counter=%d\n", */ -/* mpi_get_nbits (prime_p), mpi_get_nbits (prime_q), counter); */ -/* log_printhex("fips186-2 seed:", seed, seedlen); */ -/* log_mpidump ("fips186-2 prime p", prime_p); */ -/* log_mpidump ("fips186-2 prime q", prime_q); */ - if (r_q) - { - *r_q = prime_q; - prime_q = NULL; - } - if (r_p) - { - *r_p = prime_p; - prime_p = NULL; - } - if (r_counter) - *r_counter = counter; - if (r_seed && r_seedlen) - { - memcpy (seed_plus, seed, seedlen); - *r_seed = seed_plus; - seed_plus = NULL; - *r_seedlen = seedlen; - } - - - leave: - _gcry_mpi_release (tmpval); - _gcry_mpi_release (value_x); - _gcry_mpi_release (value_w); - _gcry_mpi_release (prime_p); - _gcry_mpi_release (prime_q); - xfree (seed_plus); - _gcry_mpi_release (val_2); - return ec; -} - - - -/* WARNING: The code below has not yet been tested! However, it is - not yet used. We need to wait for FIPS 186-3 final and for test - vectors. - - Generate the two prime used for DSA using the algorithm specified - in FIPS 186-3, A.1.1.2. PBITS is the desired length of the prime P - and a QBITS the length of the prime Q. If SEED is not supplied and - SEEDLEN is 0 the function generates an appropriate SEED. On - success the generated primes are stored at R_Q and R_P, the counter - value is stored at R_COUNTER and the seed actually used for - generation is stored at R_SEED and R_SEEDVALUE. The hash algorithm - used is stored at R_HASHALGO. - - Note that this function is very similar to the fips186_2 code. Due - to the minor differences, other buffer sizes and for documentarion, - we use a separate function. -*/ -gpg_err_code_t -_gcry_generate_fips186_3_prime (unsigned int pbits, unsigned int qbits, - const void *seed, size_t seedlen, - gcry_mpi_t *r_q, gcry_mpi_t *r_p, - int *r_counter, - void **r_seed, size_t *r_seedlen, - int *r_hashalgo) -{ - gpg_err_code_t ec; - unsigned char seed_help_buffer[256/8]; /* Used to hold a generated SEED. */ - unsigned char *seed_plus; /* Malloced buffer to hold SEED+x. */ - unsigned char digest[256/8]; /* Helper buffer for SHA-1 digest. */ - gcry_mpi_t val_2 = NULL; /* Helper for the prime test. */ - gcry_mpi_t tmpval = NULL; /* Helper variable. */ - int hashalgo; /* The id of the Approved Hash Function. */ - int i; - - unsigned char value_u[256/8]; - int value_n, value_b, value_j; - int counter; - gcry_mpi_t value_w = NULL; - gcry_mpi_t value_x = NULL; - gcry_mpi_t prime_q = NULL; - gcry_mpi_t prime_p = NULL; - - gcry_assert (sizeof seed_help_buffer == sizeof digest - && sizeof seed_help_buffer == sizeof value_u); - - /* Step 1: Check the requested prime lengths. */ - /* Note that due to the size of our buffers QBITS is limited to 256. */ - if (pbits == 1024 && qbits == 160) - hashalgo = GCRY_MD_SHA1; - else if (pbits == 2048 && qbits == 224) - hashalgo = GCRY_MD_SHA224; - else if (pbits == 2048 && qbits == 256) - hashalgo = GCRY_MD_SHA256; - else if (pbits == 3072 && qbits == 256) - hashalgo = GCRY_MD_SHA256; - else - return GPG_ERR_INV_KEYLEN; - - /* Also check that the hash algorithm is available. */ - ec = _gcry_md_test_algo (hashalgo); - if (ec) - return ec; - gcry_assert (qbits/8 <= sizeof digest); - gcry_assert (_gcry_md_get_algo_dlen (hashalgo) == qbits/8); - - - /* Step 2: Check seedlen. */ - if (!seed && !seedlen) - ; /* No seed value given: We are asked to generate it. */ - else if (!seed || seedlen < qbits/8) - return GPG_ERR_INV_ARG; - - /* Allocate a buffer to later compute SEED+some_increment and a few - helper variables. */ - seed_plus = xtrymalloc (seedlen < sizeof seed_help_buffer? - sizeof seed_help_buffer : seedlen); - if (!seed_plus) - { - ec = gpg_err_code_from_syserror (); - goto leave; - } - val_2 = mpi_alloc_set_ui (2); - value_w = mpi_new (pbits); - value_x = mpi_new (pbits); - - /* Step 3: n = \lceil L / outlen \rceil - 1 */ - value_n = (pbits + qbits - 1) / qbits - 1; - /* Step 4: b = L - 1 - (n * outlen) */ - value_b = pbits - 1 - (value_n * qbits); - - restart: - /* Generate Q. */ - for (;;) - { - /* Step 5: Generate a (new) seed unless one has been supplied. */ - if (!seed) - { - seedlen = qbits/8; - gcry_assert (seedlen <= sizeof seed_help_buffer); - _gcry_create_nonce (seed_help_buffer, seedlen); - seed = seed_help_buffer; - } - - /* Step 6: U = hash(seed) */ - _gcry_md_hash_buffer (hashalgo, value_u, seed, seedlen); - - /* Step 7: q = 2^{N-1} + U + 1 - (U mod 2) */ - if ( !(value_u[qbits/8-1] & 0x01) ) - { - for (i=qbits/8-1; i >= 0; i--) - { - value_u[i]++; - if (value_u[i]) - break; - } - } - _gcry_mpi_release (prime_q); prime_q = NULL; - ec = _gcry_mpi_scan (&prime_q, GCRYMPI_FMT_USG, - value_u, sizeof value_u, NULL); - if (ec) - goto leave; - mpi_set_highbit (prime_q, qbits-1 ); - - /* Step 8: Test whether Q is prime using 64 round of Rabin-Miller. - According to table C.1 this is sufficient for all - supported prime sizes (i.e. up 3072/256). */ - if (check_prime (prime_q, val_2, 64, NULL, NULL)) - break; /* Yes, Q is prime. */ - - /* Step 8. */ - seed = NULL; /* Force a new seed at Step 5. */ - } - - /* Step 11. Note that we do no use an explicit offset but increment - SEED_PLUS accordingly. */ - memcpy (seed_plus, seed, seedlen); - counter = 0; - - /* Generate P. */ - prime_p = mpi_new (pbits); - for (;;) - { - /* Step 11.1: For j = 0,...n let - V_j = hash(seed+offset+j) - Step 11.2: W = V_0 + V_1*2^outlen + - ... - + V_{n-1}*2^{(n-1)*outlen} - + (V_{n} mod 2^b)*2^{n*outlen} - */ - mpi_set_ui (value_w, 0); - for (value_j=0; value_j <= value_n; value_j++) - { - /* There is no need to have an explicit offset variable: In - the first round we shall have an offset of 1 and a j of - 0. This is achieved by incrementing SEED_PLUS here. For - the next round offset is implicitly updated by using - SEED_PLUS again. */ - for (i=seedlen-1; i >= 0; i--) - { - seed_plus[i]++; - if (seed_plus[i]) - break; - } - _gcry_md_hash_buffer (GCRY_MD_SHA1, digest, seed_plus, seedlen); - - _gcry_mpi_release (tmpval); tmpval = NULL; - ec = _gcry_mpi_scan (&tmpval, GCRYMPI_FMT_USG, - digest, sizeof digest, NULL); - if (ec) - goto leave; - if (value_j == value_n) - mpi_clear_highbit (tmpval, value_b); /* (V_n mod 2^b) */ - mpi_lshift (tmpval, tmpval, value_j*qbits); - mpi_add (value_w, value_w, tmpval); - } - - /* Step 11.3: X = W + 2^{L-1} */ - mpi_set_ui (value_x, 0); - mpi_set_highbit (value_x, pbits-1); - mpi_add (value_x, value_x, value_w); - - /* Step 11.4: c = X mod 2q */ - mpi_mul_2exp (tmpval, prime_q, 1); - mpi_mod (tmpval, value_x, tmpval); - - /* Step 11.5: p = X - (c - 1) */ - mpi_sub_ui (tmpval, tmpval, 1); - mpi_sub (prime_p, value_x, tmpval); - - /* Step 11.6: If p < 2^{L-1} skip the primality test. */ - /* Step 11.7 and 11.8: Primality test. */ - if (mpi_get_nbits (prime_p) >= pbits-1 - && check_prime (prime_p, val_2, 64, NULL, NULL) ) - break; /* Yes, P is prime, continue with Step 15. */ - - /* Step 11.9: counter = counter + 1, offset = offset + n + 1. - If counter >= 4L goto Step 5. */ - counter++; - if (counter >= 4*pbits) - goto restart; - } - - /* Step 12: Save p, q, counter and seed. */ - log_debug ("fips186-3 pbits p=%u q=%u counter=%d\n", - mpi_get_nbits (prime_p), mpi_get_nbits (prime_q), counter); - log_printhex ("fips186-3 seed", seed, seedlen); - log_printmpi ("fips186-3 p", prime_p); - log_printmpi ("fips186-3 q", prime_q); - if (r_q) - { - *r_q = prime_q; - prime_q = NULL; - } - if (r_p) - { - *r_p = prime_p; - prime_p = NULL; - } - if (r_counter) - *r_counter = counter; - if (r_seed && r_seedlen) - { - memcpy (seed_plus, seed, seedlen); - *r_seed = seed_plus; - seed_plus = NULL; - *r_seedlen = seedlen; - } - if (r_hashalgo) - *r_hashalgo = hashalgo; - - leave: - _gcry_mpi_release (tmpval); - _gcry_mpi_release (value_x); - _gcry_mpi_release (value_w); - _gcry_mpi_release (prime_p); - _gcry_mpi_release (prime_q); - xfree (seed_plus); - _gcry_mpi_release (val_2); - return ec; -} diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/pubkey-internal.h b/src/hos_libhttpserver/src/libgcrypt/cipher/pubkey-internal.h deleted file mode 100644 index 193248c3..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/pubkey-internal.h +++ /dev/null @@ -1,100 +0,0 @@ -/* pubkey-internal.h - Internal defs for pubkey.c - * Copyright (C) 2013 g10 code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser general Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#ifndef GCRY_PUBKEY_INTERNAL_H -#define GCRY_PUBKEY_INTERNAL_H - -/*-- pubkey-util.c --*/ -gpg_err_code_t _gcry_pk_util_parse_flaglist (gcry_sexp_t list, - int *r_flags, - enum pk_encoding *r_encoding); -gpg_err_code_t _gcry_pk_util_get_nbits (gcry_sexp_t list, - unsigned int *r_nbits); -gpg_err_code_t _gcry_pk_util_get_rsa_use_e (gcry_sexp_t list, - unsigned long *r_e); -gpg_err_code_t _gcry_pk_util_preparse_sigval (gcry_sexp_t s_sig, - const char **algo_names, - gcry_sexp_t *r_parms, - int *r_eccflags); -gpg_err_code_t _gcry_pk_util_preparse_encval (gcry_sexp_t sexp, - const char **algo_names, - gcry_sexp_t *r_parms, - struct pk_encoding_ctx *ctx); -void _gcry_pk_util_init_encoding_ctx (struct pk_encoding_ctx *ctx, - enum pk_operation op, - unsigned int nbits); -void _gcry_pk_util_free_encoding_ctx (struct pk_encoding_ctx *ctx); -gcry_err_code_t _gcry_pk_util_data_to_mpi (gcry_sexp_t input, - gcry_mpi_t *ret_mpi, - struct pk_encoding_ctx *ctx); - - - -/*-- rsa-common.c --*/ -gpg_err_code_t -_gcry_rsa_pkcs1_encode_for_enc (gcry_mpi_t *r_result, unsigned int nbits, - const unsigned char *value, size_t valuelen, - const unsigned char *random_override, - size_t random_override_len); -gpg_err_code_t -_gcry_rsa_pkcs1_decode_for_enc (unsigned char **r_result, size_t *r_resultlen, - unsigned int nbits, gcry_mpi_t value); -gpg_err_code_t -_gcry_rsa_pkcs1_encode_for_sig (gcry_mpi_t *r_result, unsigned int nbits, - const unsigned char *value, size_t valuelen, - int algo); -gpg_err_code_t -_gcry_rsa_oaep_encode (gcry_mpi_t *r_result, unsigned int nbits, int algo, - const unsigned char *value, size_t valuelen, - const unsigned char *label, size_t labellen, - const void *random_override, size_t random_override_len); -gpg_err_code_t -_gcry_rsa_oaep_decode (unsigned char **r_result, size_t *r_resultlen, - unsigned int nbits, int algo, - gcry_mpi_t value, - const unsigned char *label, size_t labellen); -gpg_err_code_t -_gcry_rsa_pss_encode (gcry_mpi_t *r_result, unsigned int nbits, int algo, - const unsigned char *value, size_t valuelen, int saltlen, - const void *random_override, size_t random_override_len); -gpg_err_code_t -_gcry_rsa_pss_verify (gcry_mpi_t value, gcry_mpi_t encoded, - unsigned int nbits, int algo, size_t saltlen); - - - -/*-- dsa-common.c --*/ -gcry_mpi_t _gcry_dsa_gen_k (gcry_mpi_t q, int security_level); -gpg_err_code_t _gcry_dsa_gen_rfc6979_k (gcry_mpi_t *r_k, - gcry_mpi_t dsa_q, gcry_mpi_t dsa_x, - const unsigned char *h1, - unsigned int h1len, - int halgo, - unsigned int extraloops); - -gpg_err_code_t _gcry_dsa_normalize_hash (gcry_mpi_t input, - gcry_mpi_t *out, - unsigned int qbits); - -/*-- ecc.c --*/ -gpg_err_code_t _gcry_pk_ecc_get_sexp (gcry_sexp_t *r_sexp, int mode, - mpi_ec_t ec); - - -#endif /*GCRY_PUBKEY_INTERNAL_H*/ diff --git a/src/hos_libhttpserver/src/libgcrypt/cipher/pubkey-util.c b/src/hos_libhttpserver/src/libgcrypt/cipher/pubkey-util.c deleted file mode 100644 index 616b4990..00000000 --- a/src/hos_libhttpserver/src/libgcrypt/cipher/pubkey-util.c +++ /dev/null @@ -1,1050 +0,0 @@ -/* pubkey-util.c - Supporting functions for all pubkey modules. - * Copyright (C) 1998, 1999, 2000, 2002, 2003, 2005, - * 2007, 2008, 2011 Free Software Foundation, Inc. - * Copyright (C) 2013 g10 Code GmbH - * - * This file is part of Libgcrypt. - * - * Libgcrypt is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * Libgcrypt 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - */ - -#include -#include -#include -#include - -#include "g10lib.h" -#include "mpi.h" -#include "cipher.h" -#include "pubkey-internal.h" - - -/* Callback for the pubkey algorithm code to verify PSS signatures. - OPAQUE is the data provided by the actual caller. The meaning of - TMP depends on the actual algorithm (but there is only RSA); now - for RSA it is the output of running the public key function on the - input. */ -static int -pss_verify_cmp (void *opaque, gcry_mpi_t tmp) -{ - struct pk_encoding_ctx *ctx = opaque; - gcry_mpi_t hash = ctx->verify_arg; - - return _gcry_rsa_pss_verify (hash, tmp, ctx->nbits - 1, - ctx->hash_algo, ctx->saltlen); -} - - -/* Parser for a flag list. On return the encoding is stored at - R_ENCODING and the flags are stored at R_FLAGS. If any of them is - not needed, NULL may be passed. The function returns 0 on success - or an error code. */ -gpg_err_code_t -_gcry_pk_util_parse_flaglist (gcry_sexp_t list, - int *r_flags, enum pk_encoding *r_encoding) -{ - gpg_err_code_t rc = 0; - const char *s; - size_t n; - int i; - int encoding = PUBKEY_ENC_UNKNOWN; - int flags = 0; - int igninvflag = 0; - - for (i = list ? sexp_length (list)-1 : 0; i > 0; i--) - { - s = sexp_nth_data (list, i, &n); - if (!s) - continue; /* Not a data element. */ - - switch (n) - { - case 3: - if (!memcmp (s, "pss", 3) && encoding == PUBKEY_ENC_UNKNOWN) - { - encoding = PUBKEY_ENC_PSS; - flags |= PUBKEY_FLAG_FIXEDLEN; - } - else if (!memcmp (s, "raw", 3) && encoding == PUBKEY_ENC_UNKNOWN) - { - encoding = PUBKEY_ENC_RAW; - flags |= PUBKEY_FLAG_RAW_FLAG; /* Explicitly given. */ - } - else if (!igninvflag) - rc = GPG_ERR_INV_FLAG; - break; - - case 4: - if (!memcmp (s, "comp", 4)) - flags |= PUBKEY_FLAG_COMP; - else if (!memcmp (s, "oaep", 4) && encoding == PUBKEY_ENC_UNKNOWN) - { - encoding = PUBKEY_ENC_OAEP; - flags |= PUBKEY_FLAG_FIXEDLEN; - } - else if (!memcmp (s, "gost", 4)) - { - encoding = PUBKEY_ENC_RAW; - flags |= PUBKEY_FLAG_GOST; - } - else if (!igninvflag) - rc = GPG_ERR_INV_FLAG; - break; - - case 5: - if (!memcmp (s, "eddsa", 5)) - { - encoding = PUBKEY_ENC_RAW; - flags |= PUBKEY_FLAG_EDDSA; - } - else if (!memcmp (s, "pkcs1", 5) && encoding == PUBKEY_ENC_UNKNOWN) - { - encoding = PUBKEY_ENC_PKCS1; - flags |= PUBKEY_FLAG_FIXEDLEN; - } - else if (!memcmp (s, "param", 5)) - flags |= PUBKEY_FLAG_PARAM; - else if (!igninvflag) - rc = GPG_ERR_INV_FLAG; - break; - - case 6: - if (!memcmp (s, "nocomp", 6)) - flags |= PUBKEY_FLAG_NOCOMP; - else if (!igninvflag) - rc = GPG_ERR_INV_FLAG; - break; - - case 7: - if (!memcmp (s, "rfc6979", 7)) - flags |= PUBKEY_FLAG_RFC6979; - else if (!memcmp (s, "noparam", 7)) - ; /* Ignore - it is the default. */ - else if (!igninvflag) - rc = GPG_ERR_INV_FLAG; - break; - - case 8: - if (!memcmp (s, "use-x931", 8)) - flags |= PUBKEY_FLAG_USE_X931; - else if (!igninvflag) - rc = GPG_ERR_INV_FLAG; - break; - - case 10: - if (!memcmp (s, "igninvflag", 10)) - igninvflag = 1; - break; - - case 11: - if (!memcmp (s, "no-blinding", 11)) - flags |= PUBKEY_FLAG_NO_BLINDING; - else if (!memcmp (s, "use-fips186", 11)) - flags |= PUBKEY_FLAG_USE_FIPS186; - else if (!igninvflag) - rc = GPG_ERR_INV_FLAG; - break; - - case 13: - if (!memcmp (s, "use-fips186-2", 13)) - flags |= PUBKEY_FLAG_USE_FIPS186_2; - else if (!memcmp (s, "transient-key", 13)) - flags |= PUBKEY_FLAG_TRANSIENT_KEY; - else if (!igninvflag) - rc = GPG_ERR_INV_FLAG; - break; - - default: - if (!igninvflag) - rc = GPG_ERR_INV_FLAG; - break; - } - } - - if (r_flags) - *r_flags = flags; - if (r_encoding) - *r_encoding = encoding; - - return rc; -} - - -static int -get_hash_algo (const char *s, size_t n) -{ - static const struct { const char *name; int algo; } hashnames[] = { - { "sha1", GCRY_MD_SHA1 }, - { "md5", GCRY_MD_MD5 }, - { "sha256", GCRY_MD_SHA256 }, - { "ripemd160", GCRY_MD_RMD160 }, - { "rmd160", GCRY_MD_RMD160 }, - { "sha384", GCRY_MD_SHA384 }, - { "sha512", GCRY_MD_SHA512 }, - { "sha224", GCRY_MD_SHA224 }, - { "md2", GCRY_MD_MD2 }, - { "md4", GCRY_MD_MD4 }, - { "tiger", GCRY_MD_TIGER }, - { "haval", GCRY_MD_HAVAL }, - { NULL, 0 } - }; - int algo; - int i; - - for (i=0; hashnames[i].name; i++) - { - if ( strlen (hashnames[i].name) == n - && !memcmp (hashnames[i].name, s, n)) - break; - } - if (hashnames[i].name) - algo = hashnames[i].algo; - else - { - /* In case of not listed or dynamically allocated hash - algorithm we fall back to this somewhat slower - method. Further, it also allows to use OIDs as - algorithm names. */ - char *tmpname; - - tmpname = xtrymalloc (n+1); - if (!tmpname) - algo = 0; /* Out of core - silently give up. */ - else - { - memcpy (tmpname, s, n); - tmpname[n] = 0; - algo = _gcry_md_map_name (tmpname); - xfree (tmpname); - } - } - return algo; -} - - -/* Get the "nbits" parameter from an s-expression of the format: - * - * (algo - * (parameter_name_1 ....) - * .... - * (parameter_name_n ....)) - * - * Example: - * - * (rsa - * (nbits 4:2048)) - * - * On success the value for nbits is stored at R_NBITS. If no nbits - * parameter is found, the function returns success and stores 0 at - * R_NBITS. For parsing errors the function returns an error code and - * stores 0 at R_NBITS. - */ -gpg_err_code_t -_gcry_pk_util_get_nbits (gcry_sexp_t list, unsigned int *r_nbits) -{ - char buf[50]; - const char *s; - size_t n; - - *r_nbits = 0; - - list = sexp_find_token (list, "nbits", 0); - if (!list) - return 0; /* No NBITS found. */ - - s = sexp_nth_data (list, 1, &n); - if (!s || n >= DIM (buf) - 1 ) - { - /* NBITS given without a cdr. */ - sexp_release (list); - return GPG_ERR_INV_OBJ; - } - memcpy (buf, s, n); - buf[n] = 0; - *r_nbits = (unsigned int)strtoul (buf, NULL, 0); - sexp_release (list); - return 0; -} - - -/* Get the optional "rsa-use-e" parameter from an s-expression of the - * format: - * - * (algo - * (parameter_name_1 ....) - * .... - * (parameter_name_n ....)) - * - * Example: - * - * (rsa - * (nbits 4:2048) - * (rsa-use-e 2:41)) - * - * On success the value for nbits is stored at R_E. If no rsa-use-e - * parameter is found, the function returns success and stores 65537 at - * R_E. For parsing errors the function returns an error code and - * stores 0 at R_E. - */ -gpg_err_code_t -_gcry_pk_util_get_rsa_use_e (gcry_sexp_t list, unsigned long *r_e) -{ - char buf[50]; - const char *s; - size_t n; - - *r_e = 0; - - list = sexp_find_token (list, "rsa-use-e", 0); - if (!list) - { - *r_e = 65537; /* Not given, use the value generated by old versions. */ - return 0; - } - - s = sexp_nth_data (list, 1, &n); - if (!s || n >= DIM (buf) - 1 ) - { - /* No value or value too large. */ - sexp_release (list); - return GPG_ERR_INV_OBJ; - } - memcpy (buf, s, n); - buf[n] = 0; - *r_e = strtoul (buf, NULL, 0); - sexp_release (list); - return 0; -} - - -/* Parse a "sig-val" s-expression and store the inner parameter list at - R_PARMS. ALGO_NAMES is used to verify that the algorithm in - "sig-val" is valid. Returns 0 on success and stores a new list at - R_PARMS which must be freed by the caller. On error R_PARMS is set - to NULL and an error code returned. If R_ECCFLAGS is not NULL flag - values are set into it; as of now they are only used with ecc - algorithms. */ -gpg_err_code_t -_gcry_pk_util_preparse_sigval (gcry_sexp_t s_sig, const char **algo_names, - gcry_sexp_t *r_parms, int *r_eccflags) -{ - gpg_err_code_t rc; - gcry_sexp_t l1 = NULL; - gcry_sexp_t l2 = NULL; - char *name = NULL; - int i; - - *r_parms = NULL; - if (r_eccflags) - *r_eccflags = 0; - - /* Extract the signature value. */ - l1 = sexp_find_token (s_sig, "sig-val", 0); - if (!l1) - { - rc = GPG_ERR_INV_OBJ; /* Does not contain a signature value object. */ - goto leave; - } - - l2 = sexp_nth (l1, 1); - if (!l2) - { - rc = GPG_ERR_NO_OBJ; /* No cadr for the sig object. */ - goto leave; - } - name = sexp_nth_string (l2, 0); - if (!name) - { - rc = GPG_ERR_INV_OBJ; /* Invalid structure of object. */ - goto leave; - } - else if (!strcmp (name, "flags")) - { - /* Skip a "flags" parameter and look again for the algorithm - name. This is not used but here just for the sake of - consistent S-expressions we need to handle it. */ - sexp_release (l2); - l2 = sexp_nth (l1, 2); - if (!l2) - { - rc = GPG_ERR_INV_OBJ; - goto leave; - } - xfree (name); - name = sexp_nth_string (l2, 0); - if (!name) - { - rc = GPG_ERR_INV_OBJ; /* Invalid structure of object. */ - goto leave; - } - } - - for (i=0; algo_names[i]; i++) - if (!stricmp (name, algo_names[i])) - break; - if (!algo_names[i]) - { - rc = GPG_ERR_CONFLICT; /* "sig-val" uses an unexpected algo. */ - goto leave; - } - if (r_eccflags) - { - if (!strcmp (name, "eddsa")) - *r_eccflags = PUBKEY_FLAG_EDDSA; - if (!strcmp (name, "gost")) - *r_eccflags = PUBKEY_FLAG_GOST; - } - - *r_parms = l2; - l2 = NULL; - rc = 0; - - leave: - xfree (name); - sexp_release (l2); - sexp_release (l1); - return rc; -} - - -/* Parse a "enc-val" s-expression and store the inner parameter list - at R_PARMS. ALGO_NAMES is used to verify that the algorithm in - "enc-val" is valid. Returns 0 on success and stores a new list at - R_PARMS which must be freed by the caller. On error R_PARMS is set - to NULL and an error code returned. If R_ECCFLAGS is not NULL flag - values are set into it; as of now they are only used with ecc - algorithms. - - (enc-val - [(flags [raw, pkcs1, oaep, no-blinding])] - [(hash-algo )] - [(label

\n\ - \n\ -
\n\ - "; -@end verbatim -@noindent - -If the upload has succeeded, the server will respond with a message saying so. -@verbatim -const char* completepage = "The upload has been completed."; -@end verbatim -@noindent - -We want the server to report internal errors, such as memory shortage or file access problems, -adequately. -@verbatim -const char* servererrorpage - = "An internal server error has occured."; -const char* fileexistspage - = "This file already exists."; -@end verbatim -@noindent - -It would be tolerable to send all these responses undifferentiated with a @code{200 HTTP_OK} -status code but in order to improve the @code{HTTP} conformance of our server a bit, we extend the -@code{send_page} function so that it accepts individual status codes. - -@verbatim -static int -send_page (struct MHD_Connection *connection, - const char* page, int status_code) -{ - int ret; - struct MHD_Response *response; - - response = MHD_create_response_from_buffer (strlen (page), (void*) page, - MHD_RESPMEM_MUST_COPY); - if (!response) return MHD_NO; - - ret = MHD_queue_response (connection, status_code, response); - MHD_destroy_response (response); - - return ret; -} -@end verbatim -@noindent - -Note how we ask @emph{MHD} to make its own copy of the message data. The reason behind this will -become clear later. - - -@heading Connection cycle -The decision whether the server is busy or not is made right at the beginning of the connection. To -do that at this stage is especially important for @emph{POST} requests because if no response is -queued at this point, and @code{MHD_YES} returned, @emph{MHD} will not sent any queued messages until -a postprocessor has been created and the post iterator is called at least once. - -@verbatim -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, - const char *method, const char *version, - const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - if (NULL == *con_cls) - { - struct connection_info_struct *con_info; - - if (nr_of_uploading_clients >= MAXCLIENTS) - return send_page(connection, busypage, MHD_HTTP_SERVICE_UNAVAILABLE); -@end verbatim -@noindent - -If the server is not busy, the @code{connection_info} structure is initialized as usual, with -the addition of a filepointer for each connection. - -@verbatim - con_info = malloc (sizeof (struct connection_info_struct)); - if (NULL == con_info) return MHD_NO; - con_info->fp = 0; - - if (0 == strcmp (method, "POST")) - { - ... - } - else con_info->connectiontype = GET; - - *con_cls = (void*) con_info; - - return MHD_YES; - } -@end verbatim -@noindent - -For @emph{POST} requests, the postprocessor is created and we register a new uploading client. From -this point on, there are many possible places for errors to occur that make it necessary to interrupt -the uploading process. We need a means of having the proper response message ready at all times. -Therefore, the @code{connection_info} structure is extended to hold the most current response -message so that whenever a response is sent, the client will get the most informative message. Here, -the structure is initialized to "no error". -@verbatim - if (0 == strcmp (method, "POST")) - { - con_info->postprocessor - = MHD_create_post_processor (connection, POSTBUFFERSIZE, - iterate_post, (void*) con_info); - - if (NULL == con_info->postprocessor) - { - free (con_info); - return MHD_NO; - } - - nr_of_uploading_clients++; - - con_info->connectiontype = POST; - con_info->answercode = MHD_HTTP_OK; - con_info->answerstring = completepage; - } - else con_info->connectiontype = GET; -@end verbatim -@noindent - -If the connection handler is called for the second time, @emph{GET} requests will be answered with -the @emph{form}. We can keep the buffer under function scope, because we asked @emph{MHD} to make its -own copy of it for as long as it is needed. -@verbatim - if (0 == strcmp (method, "GET")) - { - int ret; - char buffer[1024]; - - sprintf (buffer, askpage, nr_of_uploading_clients); - return send_page (connection, buffer, MHD_HTTP_OK); - } -@end verbatim -@noindent - - -The rest of the @code{answer_to_connection} function is very similar to the @code{simplepost.c} -example, except the more flexible content of the responses. The @emph{POST} data is processed until -there is none left and the execution falls through to return an error page if the connection -constituted no expected request method. -@verbatim - if (0 == strcmp (method, "POST")) - { - struct connection_info_struct *con_info = *con_cls; - - if (0 != *upload_data_size) - { - MHD_post_process (con_info->postprocessor, - upload_data, *upload_data_size); - *upload_data_size = 0; - - return MHD_YES; - } - else - return send_page (connection, con_info->answerstring, - con_info->answercode); - } - - return send_page(connection, errorpage, MHD_HTTP_BAD_REQUEST); -} -@end verbatim -@noindent - - -@heading Storing to data -Unlike the @code{simplepost.c} example, here it is to be expected that post iterator will be called -several times now. This means that for any given connection (there might be several concurrent of them) -the posted data has to be written to the correct file. That is why we store a file handle in every -@code{connection_info}, so that the it is preserved between successive iterations. -@verbatim -static int -iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, - const char *key, - const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, - uint64_t off, size_t size) -{ - struct connection_info_struct *con_info = coninfo_cls; -@end verbatim -@noindent - -Because the following actions depend heavily on correct file processing, which might be error prone, -we default to reporting internal errors in case anything will go wrong. - -@verbatim -con_info->answerstring = servererrorpage; -con_info->answercode = MHD_HTTP_INTERNAL_SERVER_ERROR; -@end verbatim -@noindent - -In the "askpage" @emph{form}, we told the client to label its post data with the "file" key. Anything else -would be an error. - -@verbatim - if (0 != strcmp (key, "file")) return MHD_NO; -@end verbatim -@noindent - -If the iterator is called for the first time, no file will have been opened yet. The @code{filename} -string contains the name of the file (without any paths) the user selected on his system. We want to -take this as the name the file will be stored on the server and make sure no file of that name exists -(or is being uploaded) before we create one (note that the code below technically contains a -race between the two "fopen" calls, but we will overlook this for portability sake). -@verbatim - if (!con_info->fp) - { - if (NULL != (fp = fopen (filename, "rb")) ) - { - fclose (fp); - con_info->answerstring = fileexistspage; - con_info->answercode = MHD_HTTP_FORBIDDEN; - return MHD_NO; - } - - con_info->fp = fopen (filename, "ab"); - if (!con_info->fp) return MHD_NO; - } -@end verbatim -@noindent - - -Occasionally, the iterator function will be called even when there are 0 new bytes to process. The -server only needs to write data to the file if there is some. -@verbatim -if (size > 0) - { - if (!fwrite (data, size, sizeof(char), con_info->fp)) - return MHD_NO; - } -@end verbatim -@noindent - -If this point has been reached, everything worked well for this iteration and the response can -be set to success again. If the upload has finished, this iterator function will not be called again. -@verbatim - con_info->answerstring = completepage; - con_info->answercode = MHD_HTTP_OK; - - return MHD_YES; -} -@end verbatim -@noindent - - -The new client was registered when the postprocessor was created. Likewise, we unregister the client -on destroying the postprocessor when the request is completed. -@verbatim -void request_completed (void *cls, struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct connection_info_struct *con_info = *con_cls; - - if (NULL == con_info) return; - - if (con_info->connectiontype == POST) - { - if (NULL != con_info->postprocessor) - { - MHD_destroy_post_processor (con_info->postprocessor); - nr_of_uploading_clients--; - } - - if (con_info->fp) fclose (con_info->fp); - } - - free (con_info); - *con_cls = NULL; -} -@end verbatim -@noindent - - -This is essentially the whole example @code{largepost.c}. - - -@heading Remarks -Now that the clients are able to create files on the server, security aspects are becoming even more -important than before. Aside from proper client authentication, the server should always make sure -explicitly that no files will be created outside of a dedicated upload directory. In particular, -filenames must be checked to not contain strings like "../". diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/processingpost.inc b/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/processingpost.inc deleted file mode 100644 index 92f93f55..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/processingpost.inc +++ /dev/null @@ -1,238 +0,0 @@ -The previous chapters already have demonstrated a variety of possibilities to send information -to the HTTP server, but it is not recommended that the @emph{GET} method is used to alter the way -the server operates. To induce changes on the server, the @emph{POST} method is preferred over -and is much more powerful than @emph{GET} and will be introduced in this chapter. - -We are going to write an application that asks for the visitor's name and, after the user has posted it, -composes an individual response text. Even though it was not mandatory to use the @emph{POST} method here, -as there is no permanent change caused by the POST, it is an illustrative example on how to share data -between different functions for the same connection. Furthermore, the reader should be able to extend -it easily. - -@heading GET request -When the first @emph{GET} request arrives, the server shall respond with a HTML page containing an -edit field for the name. - -@verbatim -const char* askpage = "\ - What's your name, Sir?
\ -
\ -
\ - "; -@end verbatim -@noindent - -The @code{action} entry is the @emph{URI} to be called by the browser when posting, and the -@code{name} will be used later to be sure it is the editbox's content that has been posted. - -We also prepare the answer page, where the name is to be filled in later, and an error page -as the response for anything but proper @emph{GET} and @emph{POST} requests: - -@verbatim -const char* greatingpage="

Welcome, %s!

"; - -const char* errorpage="This doesn't seem to be right."; -@end verbatim -@noindent - -Whenever we need to send a page, we use an extra function -@code{int send_page(struct MHD_Connection *connection, const char* page)} -for this, which does not contain anything new and whose implementation is therefore -not discussed further in the tutorial. - - -@heading POST request -Posted data can be of arbitrary and considerable size; for example, if a user uploads a big -image to the server. Similar to the case of the header fields, there may also be different streams -of posted data, such as one containing the text of an editbox and another the state of a button. -Likewise, we will have to register an iterator function that is going to be called maybe several times -not only if there are different POSTs but also if one POST has only been received partly yet and -needs processing before another chunk can be received. - -Such an iterator function is called by a @emph{postprocessor}, which must be created upon arriving -of the post request. We want the iterator function to read the first post data which is tagged -@code{name} and to create an individual greeting string based on the template and the name. -But in order to pass this string to other functions and still be able to differentiate different -connections, we must first define a structure to share the information, holding the most import entries. - -@verbatim -struct connection_info_struct -{ - int connectiontype; - char *answerstring; - struct MHD_PostProcessor *postprocessor; -}; -@end verbatim -@noindent - -With these information available to the iterator function, it is able to fulfill its task. -Once it has composed the greeting string, it returns @code{MHD_NO} to inform the post processor -that it does not need to be called again. Note that this function does not handle processing -of data for the same @code{key}. If we were to expect that the name will be posted in several -chunks, we had to expand the namestring dynamically as additional parts of it with the same @code{key} -came in. But in this example, the name is assumed to fit entirely inside one single packet. - -@verbatim -static int -iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, - const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, - uint64_t off, size_t size) -{ - struct connection_info_struct *con_info = coninfo_cls; - - if (0 == strcmp (key, "name")) - { - if ((size > 0) && (size <= MAXNAMESIZE)) - { - char *answerstring; - answerstring = malloc (MAXANSWERSIZE); - if (!answerstring) return MHD_NO; - - snprintf (answerstring, MAXANSWERSIZE, greatingpage, data); - con_info->answerstring = answerstring; - } - else con_info->answerstring = NULL; - - return MHD_NO; - } - - return MHD_YES; -} -@end verbatim -@noindent - -Once a connection has been established, it can be terminated for many reasons. As these -reasons include unexpected events, we have to register another function that cleans up any resources -that might have been allocated for that connection by us, namely the post processor and the greetings -string. This cleanup function must take into account that it will also be called for finished -requests other than @emph{POST} requests. - -@verbatim -void request_completed (void *cls, struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct connection_info_struct *con_info = *con_cls; - - if (NULL == con_info) return; - if (con_info->connectiontype == POST) - { - MHD_destroy_post_processor (con_info->postprocessor); - if (con_info->answerstring) free (con_info->answerstring); - } - - free (con_info); - *con_cls = NULL; -} -@end verbatim -@noindent - -@emph{GNU libmicrohttpd} is informed that it shall call the above function when the daemon is started -in the main function. - -@verbatim -... -daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &request_completed, NULL, - MHD_OPTION_END); -... -@end verbatim -@noindent - -@heading Request handling -With all other functions prepared, we can now discuss the actual request handling. - -On the first iteration for a new request, we start by allocating a new instance of a -@code{struct connection_info_struct} structure, which will store all necessary information for later -iterations and other functions. - -@verbatim -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, - const char *method, const char *version, - const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - if(NULL == *con_cls) - { - struct connection_info_struct *con_info; - - con_info = malloc (sizeof (struct connection_info_struct)); - if (NULL == con_info) return MHD_NO; - con_info->answerstring = NULL; -@end verbatim -@noindent - -If the new request is a @emph{POST}, the postprocessor must be created now. In addition, the type -of the request is stored for convenience. -@verbatim - if (0 == strcmp (method, "POST")) - { - con_info->postprocessor - = MHD_create_post_processor (connection, POSTBUFFERSIZE, - iterate_post, (void*) con_info); - - if (NULL == con_info->postprocessor) - { - free (con_info); - return MHD_NO; - } - con_info->connectiontype = POST; - } - else con_info->connectiontype = GET; -@end verbatim -@noindent - -The address of our structure will both serve as the indicator for successive iterations and to remember -the particular details about the connection. -@verbatim - *con_cls = (void*) con_info; - return MHD_YES; - } -@end verbatim -@noindent - -The rest of the function will not be executed on the first iteration. A @emph{GET} request is easily -satisfied by sending the question form. -@verbatim - if (0 == strcmp (method, "GET")) - { - return send_page (connection, askpage); - } -@end verbatim -@noindent - -In case of @emph{POST}, we invoke the post processor for as long as data keeps incoming, setting -@code{*upload_data_size} to zero in order to indicate that we have processed---or at least have -considered---all of it. -@verbatim - if (0 == strcmp (method, "POST")) - { - struct connection_info_struct *con_info = *con_cls; - - if (*upload_data_size != 0) - { - MHD_post_process (con_info->postprocessor, upload_data, - *upload_data_size); - *upload_data_size = 0; - - return MHD_YES; - } - else if (NULL != con_info->answerstring) - return send_page (connection, con_info->answerstring); - } -@end verbatim -@noindent - -Finally, if they are neither @emph{GET} nor @emph{POST} requests, the error page is returned. -@verbatim - return send_page(connection, errorpage); -} -@end verbatim -@noindent - -These were the important parts of the program @code{simplepost.c}. diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/responseheaders.inc b/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/responseheaders.inc deleted file mode 100644 index ece7ce1c..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/responseheaders.inc +++ /dev/null @@ -1,193 +0,0 @@ -Now that we are able to inspect the incoming request in great detail, -this chapter discusses the means to enrich the outgoing responses likewise. - -As you have learned in the @emph{Hello, Browser} chapter, some obligatory -header fields are added and set automatically for simple responses by the library -itself but if more advanced features are desired, additional fields have to be created. -One of the possible fields is the content type field and an example will be developed around it. -This will lead to an application capable of correctly serving different types of files. - - -When we responded with HTML page packed in the static string previously, the client had no choice -but guessing about how to handle the response, because the server had not told him. -What if we had sent a picture or a sound file? Would the message have been understood -or merely been displayed as an endless stream of random characters in the browser? -This is what the mime content types are for. The header of the response is extended -by certain information about how the data is to be interpreted. - -To introduce the concept, a picture of the format @emph{PNG} will be sent to the client -and labeled accordingly with @code{image/png}. -Once again, we can base the new example on the @code{hellobrowser} program. - -@verbatim -#define FILENAME "picture.png" -#define MIMETYPE "image/png" - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, - const char *method, const char *version, - const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - unsigned char *buffer = NULL; - struct MHD_Response *response; -@end verbatim -@noindent - -We want the program to open the file for reading and determine its size: -@verbatim - int fd; - int ret; - struct stat sbuf; - - if (0 != strcmp (method, "GET")) - return MHD_NO; - if ( (-1 == (fd = open (FILENAME, O_RDONLY))) || - (0 != fstat (fd, &sbuf)) ) - { - /* error accessing file */ - /* ... (see below) */ - } - /* ... (see below) */ -@end verbatim -@noindent - -When dealing with files, there is a lot that could go wrong on the -server side and if so, the client should be informed with @code{MHD_HTTP_INTERNAL_SERVER_ERROR}. - -@verbatim - /* error accessing file */ - if (fd != -1) close (fd); - const char *errorstr = - "An internal server error has occured!\ - "; - response = - MHD_create_response_from_buffer (strlen (errorstr), - (void *) errorstr, - MHD_RESPMEM_PERSISTENT); - if (response) - { - ret = - MHD_queue_response (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - response); - MHD_destroy_response (response); - - return MHD_YES; - } - else - return MHD_NO; - if (!ret) - { - const char *errorstr = "An internal server error has occured!\ - "; - - if (buffer) free(buffer); - - response = MHD_create_response_from_buffer (strlen(errorstr), (void*) errorstr, - MHD_RESPMEM_PERSISTENT); - - if (response) - { - ret = MHD_queue_response (connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - response); - MHD_destroy_response (response); - - return MHD_YES; - } - else return MHD_NO; - } -@end verbatim -@noindent - -Note that we nevertheless have to create a response object even for sending a simple error code. -Otherwise, the connection would just be closed without comment, leaving the client curious about -what has happened. - -But in the case of success a response will be constructed directly from the file descriptor: - -@verbatim - /* error accessing file */ - /* ... (see above) */ - } - - response = - MHD_create_response_from_fd_at_offset (sbuf.st_size, fd, 0); - MHD_add_response_header (response, "Content-Type", MIMETYPE); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); -@end verbatim -@noindent - -Note that the response object will take care of closing the file desciptor for us. - -Up to this point, there was little new. The actual novelty is that we enhance the header with the -meta data about the content. Aware of the field's name we want to add, it is as easy as that: -@verbatim -MHD_add_response_header(response, "Content-Type", MIMETYPE); -@end verbatim -@noindent -We do not have to append a colon expected by the protocol behind the first -field---@emph{GNU libhttpdmicro} will take care of this. - -The function finishes with the well-known lines -@verbatim - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} -@end verbatim -@noindent - -The complete program @code{responseheaders.c} is in the @code{examples} section as usual. -Find a @emph{PNG} file you like and save it to the directory the example is run from under the name -@code{picture.png}. You should find the image displayed on your browser if everything worked well. - -@heading Remarks -The include file of the @emph{MHD} library comes with the header types mentioned in @emph{RFC 2616} -already defined as macros. Thus, we could have written @code{MHD_HTTP_HEADER_CONTENT_TYPE} instead -of @code{"Content-Type"} as well. However, one is not limited to these standard headers and could -add custom response headers without violating the protocol. Whether, and how, the client would react -to these custom header is up to the receiver. Likewise, the client is allowed to send custom request -headers to the server as well, opening up yet more possibilities how client and server could -communicate with each other. - -The method of creating the response from a file on disk only works for static content. -Serving dynamically created responses will be a topic of a future chapter. - -@heading Exercises -@itemize @bullet - -@item -Remember that the original program was written under a few assumptions---a static response -using a local file being one of them. In order to simulate a very large or hard to reach file that cannot be provided -instantly, postpone the queuing in the callback with the @code{sleep} function for 30 seconds -@emph{if} the file @code{/big.png} is requested (but deliver the same as above). A request for -@code{/picture.png} should provide just the same but without any artificial delays. - -Now start two instances of your browser (or even use two machines) and see how the second client -is put on hold while the first waits for his request on the slow file to be fulfilled. - -Finally, change the sourcecode to use @code{MHD_USE_THREAD_PER_CONNECTION} when the daemon is -started and try again. - - -@item -Did you succeed in implementing the clock exercise yet? This time, let the server save the -program's start time @code{t} and implement a response simulating a countdown that reaches 0 at -@code{t+60}. Returning a message saying on which point the countdown is, the response should -ultimately be to reply "Done" if the program has been running long enough, - -An unofficial, but widely understood, response header line is @code{Refresh: DELAY; url=URL} with -the uppercase words substituted to tell the client it should request the given resource after -the given delay again. Improve your program in that the browser (any modern browser should work) -automatically reconnects and asks for the status again every 5 seconds or so. The URL would have -to be composed so that it begins with "http://", followed by the @emph{URI} the server is reachable -from the client's point of view. - -Maybe you want also to visualize the countdown as a status bar by creating a -@code{} consisting of one row and @code{n} columns whose fields contain small images of either -a red or a green light. - -@end itemize diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/sessions.inc b/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/sessions.inc deleted file mode 100644 index e4ee91d4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/sessions.inc +++ /dev/null @@ -1,71 +0,0 @@ -This chapter discusses how one should manage sessions, that is, share state between multiple -HTTP requests from the same user. We use a simple example where the user submits multiple -forms and the server is supposed to accumulate state from all of these forms. Naturally, as -this is a network protocol, our session mechanism must support having many users with -many concurrent sessions at the same time. - -In order to track users, we use a simple session cookie. A session cookie expires when the -user closes the browser. Changing from session cookies to persistent cookies only requires -adding an expiration time to the cookie. The server creates a fresh session cookie whenever -a request without a cookie is received, or if the supplied session cookie is not known to -the server. - -@heading Looking up the cookie - -Since MHD parses the HTTP cookie header for us, looking up an existing cookie -is straightforward: - -@verbatim -FIXME. -@end verbatim - -Here, FIXME is the name we chose for our session cookie. - - -@heading Setting the cookie header - -MHD requires the user to provide the full cookie format string in order to set -cookies. In order to generate a unique cookie, our example creates a random -64-character text string to be used as the value of the cookie: - -@verbatim -FIXME. -@end verbatim - -Given this cookie value, we can then set the cookie header in our HTTP response -as follows: - -@verbatim -FIXME. -@end verbatim - - -@heading Remark: Session expiration - -It is of course possible that clients stop their interaction with the -server at any time. In order to avoid using too much storage, the -server must thus discard inactive sessions at some point. Our example -implements this by discarding inactive sessions after a certain amount -of time. Alternatively, the implementation may limit the total number -of active sessions. Which bounds are used for idle sessions or the -total number of sessions obviously depends largely on the type of -the application and available server resources. - -@heading Example code - -A sample application implementing a website with multiple -forms (which are dynamically created using values from previous -POST requests from the same session) is available -as the example @code{sessions.c}. - -Note that the example uses a simple, $O(n)$ linked list traversal to -look up sessions and to expire old sessions. Using a hash table and a -heap would be more appropriate if a large number of concurrent -sessions is expected. - -@heading Remarks - -Naturally, it is quite conceivable to store session data in a database -instead of in memory. Still, having mechanisms to expire data -associated with long-time idle sessions (where the business process -has still not finished) is likely a good idea. diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/tlsauthentication.inc b/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/tlsauthentication.inc deleted file mode 100644 index c1b66735..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/chapters/tlsauthentication.inc +++ /dev/null @@ -1,488 +0,0 @@ -We left the basic authentication chapter with the unsatisfactory conclusion that -any traffic, including the credentials, could be intercepted by anyone between -the browser client and the server. Protecting the data while it is sent over -unsecured lines will be the goal of this chapter. - -Since version 0.4, the @emph{MHD} library includes support for encrypting the -traffic by employing SSL/TSL. If @emph{GNU libmicrohttpd} has been configured to -support these, encryption and decryption can be applied transparently on the -data being sent, with only minimal changes to the actual source code of the example. - - -@heading Preparation - -First, a private key for the server will be generated. With this key, the server -will later be able to authenticate itself to the client---preventing anyone else -from stealing the password by faking its identity. The @emph{OpenSSL} suite, which -is available on many operating systems, can generate such a key. For the scope of -this tutorial, we will be content with a 1024 bit key: -@verbatim -> openssl genrsa -out server.key 1024 -@end verbatim -@noindent - -In addition to the key, a certificate describing the server in human readable tokens -is also needed. This certificate will be attested with our aforementioned key. In this way, -we obtain a self-signed certificate, valid for one year. - -@verbatim -> openssl req -days 365 -out server.pem -new -x509 -key server.key -@end verbatim -@noindent - -To avoid unnecessary error messages in the browser, the certificate needs to -have a name that matches the @emph{URI}, for example, "localhost" or the domain. -If you plan to have a publicly reachable server, you will need to ask a trusted third party, -called @emph{Certificate Authority}, or @emph{CA}, to attest the certificate for you. This way, -any visitor can make sure the server's identity is real. - -Whether the server's certificate is signed by us or a third party, once it has been accepted -by the client, both sides will be communicating over encrypted channels. From this point on, -it is the client's turn to authenticate itself. But this has already been implemented in the basic -authentication scheme. - - -@heading Changing the source code - -We merely have to extend the server program so that it loads the two files into memory, - -@verbatim -int -main () -{ - struct MHD_Daemon *daemon; - char *key_pem; - char *cert_pem; - - key_pem = load_file (SERVERKEYFILE); - cert_pem = load_file (SERVERCERTFILE); - - if ((key_pem == NULL) || (cert_pem == NULL)) - { - printf ("The key/certificate files could not be read.\n"); - return 1; - } -@end verbatim -@noindent - -and then we point the @emph{MHD} daemon to it upon initalization. -@verbatim - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, - PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_HTTPS_MEM_KEY, key_pem, - MHD_OPTION_HTTPS_MEM_CERT, cert_pem, - MHD_OPTION_END); - - if (NULL == daemon) - { - printf ("%s\n", cert_pem); - - free (key_pem); - free (cert_pem); - - return 1; - } -@end verbatim -@noindent - - -The rest consists of little new besides some additional memory cleanups. -@verbatim - - getchar (); - - MHD_stop_daemon (daemon); - free (key_pem); - free (cert_pem); - - return 0; -} -@end verbatim -@noindent - - -The rather unexciting file loader can be found in the complete example @code{tlsauthentication.c}. - - -@heading Remarks -@itemize @bullet -@item -While the standard @emph{HTTP} port is 80, it is 443 for @emph{HTTPS}. The common internet browsers assume -standard @emph{HTTP} if they are asked to access other ports than these. Therefore, you will have to type -@code{https://localhost:8888} explicitly when you test the example, or the browser will not know how to -handle the answer properly. - -@item -The remaining weak point is the question how the server will be trusted initially. Either a @emph{CA} signs the -certificate or the client obtains the key over secure means. Anyway, the clients have to be aware (or configured) -that they should not accept certificates of unknown origin. - -@item -The introduced method of certificates makes it mandatory to set an expiration date---making it less feasible to -hardcode certificates in embedded devices. - -@item -The cryptographic facilities consume memory space and computing time. For this reason, websites usually consists -both of uncritically @emph{HTTP} parts and secured @emph{HTTPS}. - -@end itemize - - -@heading Client authentication - -You can also use MHD to authenticate the client via SSL/TLS certificates -(as an alternative to using the password-based Basic or Digest authentication). -To do this, you will need to link your application against @emph{gnutls}. -Next, when you start the MHD daemon, you must specify the root CA that you're -willing to trust: -@verbatim - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, - PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_HTTPS_MEM_KEY, key_pem, - MHD_OPTION_HTTPS_MEM_CERT, cert_pem, - MHD_OPTION_HTTPS_MEM_TRUST, root_ca_pem, - MHD_OPTION_END); -@end verbatim - -With this, you can then obtain client certificates for each session. -In order to obtain the identity of the client, you first need to -obtain the raw GnuTLS session handle from @emph{MHD} using -@code{MHD_get_connection_info}. - -@verbatim -#include -#include - -gnutls_session_t tls_session; -union MHD_ConnectionInfo *ci; - -ci = MHD_get_connection_info (connection, - MHD_CONNECTION_INFO_GNUTLS_SESSION); -tls_session = ci->tls_session; -@end verbatim - -You can then extract the client certificate: - -@verbatim -/** - * Get the client's certificate - * - * @param tls_session the TLS session - * @return NULL if no valid client certificate could be found, a pointer - * to the certificate if found - */ -static gnutls_x509_crt_t -get_client_certificate (gnutls_session_t tls_session) -{ - unsigned int listsize; - const gnutls_datum_t * pcert; - gnutls_certificate_status_t client_cert_status; - gnutls_x509_crt_t client_cert; - - if (tls_session == NULL) - return NULL; - if (gnutls_certificate_verify_peers2(tls_session, - &client_cert_status)) - return NULL; - pcert = gnutls_certificate_get_peers(tls_session, - &listsize); - if ( (pcert == NULL) || - (listsize == 0)) - { - fprintf (stderr, - "Failed to retrieve client certificate chain\n"); - return NULL; - } - if (gnutls_x509_crt_init(&client_cert)) - { - fprintf (stderr, - "Failed to initialize client certificate\n"); - return NULL; - } - /* Note that by passing values between 0 and listsize here, you - can get access to the CA's certs */ - if (gnutls_x509_crt_import(client_cert, - &pcert[0], - GNUTLS_X509_FMT_DER)) - { - fprintf (stderr, - "Failed to import client certificate\n"); - gnutls_x509_crt_deinit(client_cert); - return NULL; - } - return client_cert; -} -@end verbatim - -Using the client certificate, you can then get the client's distinguished name -and alternative names: - -@verbatim -/** - * Get the distinguished name from the client's certificate - * - * @param client_cert the client certificate - * @return NULL if no dn or certificate could be found, a pointer - * to the dn if found - */ -char * -cert_auth_get_dn(gnutls_x509_crt_c client_cert) -{ - char* buf; - size_t lbuf; - - lbuf = 0; - gnutls_x509_crt_get_dn(client_cert, NULL, &lbuf); - buf = malloc(lbuf); - if (buf == NULL) - { - fprintf (stderr, - "Failed to allocate memory for certificate dn\n"); - return NULL; - } - gnutls_x509_crt_get_dn(client_cert, buf, &lbuf); - return buf; -} - - -/** - * Get the alternative name of specified type from the client's certificate - * - * @param client_cert the client certificate - * @param nametype The requested name type - * @param index The position of the alternative name if multiple names are - * matching the requested type, 0 for the first matching name - * @return NULL if no matching alternative name could be found, a pointer - * to the alternative name if found - */ -char * -MHD_cert_auth_get_alt_name(gnutls_x509_crt_t client_cert, - int nametype, - unsigned int index) -{ - char* buf; - size_t lbuf; - unsigned int seq; - unsigned int subseq; - unsigned int type; - int result; - - subseq = 0; - for (seq=0;;seq++) - { - lbuf = 0; - result = gnutls_x509_crt_get_subject_alt_name2(client_cert, seq, NULL, &lbuf, - &type, NULL); - if (result == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) - return NULL; - if (nametype != (int) type) - continue; - if (subseq == index) - break; - subseq++; - } - buf = malloc(lbuf); - if (buf == NULL) - { - fprintf (stderr, - "Failed to allocate memory for certificate alt name\n"); - return NULL; - } - result = gnutls_x509_crt_get_subject_alt_name2(client_cert, - seq, - buf, - &lbuf, - NULL, NULL); - if (result != nametype) - { - fprintf (stderr, - "Unexpected return value from gnutls: %d\n", - result); - free (buf); - return NULL; - } - return buf; -} -@end verbatim - -Finally, you should release the memory associated with the client -certificate: - -@verbatim -gnutls_x509_crt_deinit (client_cert); -@end verbatim - - - -@heading Using TLS Server Name Indication (SNI) - -SNI enables hosting multiple domains under one IP address with TLS. So -SNI is the TLS-equivalent of virtual hosting. To use SNI with MHD, you -need at least GnuTLS 3.0. The main change compared to the simple hosting -of one domain is that you need to provide a callback instead of the key -and certificate. For example, when you start the MHD daemon, you could -do this: -@verbatim - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, - PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_HTTPS_CERT_CALLBACK, &sni_callback, - MHD_OPTION_END); -@end verbatim -Here, @code{sni_callback} is the name of a function that you will have to -implement to retrieve the X.509 certificate for an incoming connection. -The callback has type @code{gnutls_certificate_retrieve_function2} and -is documented in the GnuTLS API for the @code{gnutls_certificate_set_retrieve_function2} -as follows: - -@deftypefn {Function Pointer} int {*gnutls_certificate_retrieve_function2} (gnutls_session_t, const gnutls_datum_t* req_ca_dn, int nreqs, const gnutls_pk_algorithm_t* pk_algos, int pk_algos_length, gnutls_pcert_st** pcert, unsigned int *pcert_length, gnutls_privkey_t * pkey) - -@table @var -@item req_ca_cert -is only used in X.509 certificates. Contains a list with the CA names that the server considers trusted. Normally we should send a certificate that is signed by one of these CAs. These names are DER encoded. To get a more meaningful value use the function @code{gnutls_x509_rdn_get()}. - -@item pk_algos -contains a list with server’s acceptable signature algorithms. The certificate returned should support the server’s given algorithms. - -@item pcert -should contain a single certificate and public or a list of them. - -@item pcert_length -is the size of the previous list. - -@item pkey -is the private key. -@end table -@end deftypefn - -A possible implementation of this callback would look like this: - -@verbatim -struct Hosts -{ - struct Hosts *next; - const char *hostname; - gnutls_pcert_st pcrt; - gnutls_privkey_t key; -}; - -static struct Hosts *hosts; - -int -sni_callback (gnutls_session_t session, - const gnutls_datum_t* req_ca_dn, - int nreqs, - const gnutls_pk_algorithm_t* pk_algos, - int pk_algos_length, - gnutls_pcert_st** pcert, - unsigned int *pcert_length, - gnutls_privkey_t * pkey) -{ - char name[256]; - size_t name_len; - struct Hosts *host; - unsigned int type; - - name_len = sizeof (name); - if (GNUTLS_E_SUCCESS != - gnutls_server_name_get (session, - name, - &name_len, - &type, - 0 /* index */)) - return -1; - for (host = hosts; NULL != host; host = host->next) - if (0 == strncmp (name, host->hostname, name_len)) - break; - if (NULL == host) - { - fprintf (stderr, - "Need certificate for %.*s\n", - (int) name_len, - name); - return -1; - } - fprintf (stderr, - "Returning certificate for %.*s\n", - (int) name_len, - name); - *pkey = host->key; - *pcert_length = 1; - *pcert = &host->pcrt; - return 0; -} -@end verbatim - -Note that MHD cannot offer passing a closure or any other additional information -to this callback, as the GnuTLS API unfortunately does not permit this at this -point. - -The @code{hosts} list can be initialized by loading the private keys and X.509 -certificats from disk as follows: - -@verbatim -static void -load_keys(const char *hostname, - const char *CERT_FILE, - const char *KEY_FILE) -{ - int ret; - gnutls_datum_t data; - struct Hosts *host; - - host = malloc (sizeof (struct Hosts)); - host->hostname = hostname; - host->next = hosts; - hosts = host; - - ret = gnutls_load_file (CERT_FILE, &data); - if (ret < 0) - { - fprintf (stderr, - "*** Error loading certificate file %s.\n", - CERT_FILE); - exit(1); - } - ret = - gnutls_pcert_import_x509_raw (&host->pcrt, &data, GNUTLS_X509_FMT_PEM, - 0); - if (ret < 0) - { - fprintf(stderr, - "*** Error loading certificate file: %s\n", - gnutls_strerror (ret)); - exit(1); - } - gnutls_free (data.data); - - ret = gnutls_load_file (KEY_FILE, &data); - if (ret < 0) - { - fprintf (stderr, - "*** Error loading key file %s.\n", - KEY_FILE); - exit(1); - } - - gnutls_privkey_init (&host->key); - ret = - gnutls_privkey_import_x509_raw (host->key, - &data, GNUTLS_X509_FMT_PEM, - NULL, 0); - if (ret < 0) - { - fprintf (stderr, - "*** Error loading key file: %s\n", - gnutls_strerror (ret)); - exit(1); - } - gnutls_free (data.data); -} -@end verbatim - -The code above was largely lifted from GnuTLS. You can find other -methods for initializing certificates and keys in the GnuTLS manual -and source code. diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/doxygen/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/doc/doxygen/Makefile.am deleted file mode 100644 index 6f132dd8..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/doxygen/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -# This Makefile.am is in the public domain -all: - @echo -e \ -"Generate documentation:\n" \ -"\tmake full - full documentation with dependency graphs (slow)\n" \ -"\tmake fast - fast mode without dependency graphs" - -full: libmicrohttpd.doxy - doxygen $< - -fast: libmicrohttpd.doxy - sed 's/\(HAVE_DOT.*=\).*/\1 NO/' $< | doxygen - - -clean: - rm -rf html - - -EXTRA_DIST = libmicrohttpd.doxy diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/doxygen/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/doc/doxygen/Makefile.in deleted file mode 100644 index aaeb8946..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/doxygen/Makefile.in +++ /dev/null @@ -1,495 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = doc/doxygen -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = libmicrohttpd.doxy -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/doxygen/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/doxygen/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags-am uninstall uninstall-am - - -# This Makefile.am is in the public domain -all: - @echo -e \ -"Generate documentation:\n" \ -"\tmake full - full documentation with dependency graphs (slow)\n" \ -"\tmake fast - fast mode without dependency graphs" - -full: libmicrohttpd.doxy - doxygen $< - -fast: libmicrohttpd.doxy - sed 's/\(HAVE_DOT.*=\).*/\1 NO/' $< | doxygen - - -clean: - rm -rf html - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/doxygen/libmicrohttpd.doxy b/src/hos_libhttpserver/src/libmicrohttpd/doc/doxygen/libmicrohttpd.doxy deleted file mode 100644 index 38301617..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/doxygen/libmicrohttpd.doxy +++ /dev/null @@ -1,248 +0,0 @@ -# Doxyfile 1.5.5 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = "GNU libmicrohttpd" -PROJECT_NUMBER = 0.9.29 -OUTPUT_DIRECTORY = . -CREATE_SUBDIRS = YES -OUTPUT_LANGUAGE = English -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = YES -STRIP_FROM_PATH = ../.. -STRIP_FROM_INC_PATH = ../../src/include \ - src/include -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO -QT_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = NO -INHERIT_DOCS = NO -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = NO -OPTIMIZE_FOR_FORTRAN = NO -OPTIMIZE_OUTPUT_VHDL = NO -BUILTIN_STL_SUPPORT = NO -CPP_CLI_SUPPORT = NO -SIP_SUPPORT = NO -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -TYPEDEF_HIDES_STRUCT = NO -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = YES -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = NO -EXTRACT_LOCAL_METHODS = YES -EXTRACT_ANON_NSPACES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_GROUP_NAMES = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = NO -GENERATE_TESTLIST = NO -GENERATE_BUGLIST = NO -GENERATE_DEPRECATEDLIST= NO -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = ../.. -INPUT_ENCODING = UTF-8 -FILE_PATTERNS = *.c \ - *.h -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = */test_* */.svn/* */perf_* */tls_test_* */examples/* */testcurl/* */testspdy/* */testzzuf/* */platform/* */symbian/* MHD_config.h -EXCLUDE_SYMBOLS = MHD_DLOG -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = NO -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -GENERATE_HTMLHELP = NO -GENERATE_DOCSET = NO -DOCSET_FEEDNAME = "Doxygen generated docs" -DOCSET_BUNDLE_ID = org.doxygen.Project -HTML_DYNAMIC_SECTIONS = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = YES -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -MSCGEN_PATH = -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = YES -CLASS_GRAPH = NO -COLLABORATION_GRAPH = NO -GROUP_GRAPHS = NO -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = YES -CALLER_GRAPH = YES -GRAPHICAL_HIERARCHY = NO -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -DOT_GRAPH_MAX_NODES = 25 -MAX_DOT_GRAPH_DEPTH = 2 -DOT_TRANSPARENT = YES -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = YES diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/ecos.texi b/src/hos_libhttpserver/src/libmicrohttpd/doc/ecos.texi deleted file mode 100644 index 00fad740..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/ecos.texi +++ /dev/null @@ -1,405 +0,0 @@ -@cindex GPL, GNU General Public License -@cindex eCos, GNU General Public License with eCos Extension -@center Version 2, June 1991 - -@display -Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc. -59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. -@end display - - - - -@subheading Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software---to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - -@iftex -@subheading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end iftex -@ifinfo -@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end ifinfo - -@enumerate -@item -This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The ``Program'', below, -refers to any such program or work, and a ``work based on the Program'' -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term ``modification''.) Each licensee is addressed as ``you''. - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - -@item -You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - -@item -You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - -@enumerate a -@item -You must cause the modified files to carry prominent notices -stating that you changed the files and the date of any change. - -@item -You must cause any work that you distribute or publish, that in -whole or in part contains or is derived from the Program or any -part thereof, to be licensed as a whole at no charge to all third -parties under the terms of this License. - -@item -If the modified program normally reads commands interactively -when run, you must cause it, when started running for such -interactive use in the most ordinary way, to print or display an -announcement including an appropriate copyright notice and a -notice that there is no warranty (or else, saying that you provide -a warranty) and that users may redistribute the program under -these conditions, and telling the user how to view a copy of this -License. (Exception: if the Program itself is interactive but -does not normally print such an announcement, your work based on -the Program is not required to print an announcement.) -@end enumerate - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - -@item -You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - -@enumerate a -@item -Accompany it with the complete corresponding machine-readable -source code, which must be distributed under the terms of Sections -1 and 2 above on a medium customarily used for software interchange; or, - -@item -Accompany it with a written offer, valid for at least three -years, to give any third party, for a charge no more than your -cost of physically performing source distribution, a complete -machine-readable copy of the corresponding source code, to be -distributed under the terms of Sections 1 and 2 above on a medium -customarily used for software interchange; or, - -@item -Accompany it with the information you received as to the offer -to distribute corresponding source code. (This alternative is -allowed only for noncommercial distribution and only if you -received the program in object code or executable form with such -an offer, in accord with Subsection b above.) -@end enumerate - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - -@item -You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - -@item -You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -@item -Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - -@item -If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - -@item -If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - -@item -The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and ``any -later version'', you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - -@item -If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - -@center @b{NO WARRANTY} - -@item -BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - -@item -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - -@center @b{ECOS EXTENSION} - - -@item -As a special exception, if other files instantiate templates or use -macros or inline functions from this file, or you compile this file -and link it with other works to produce a work based on this file, -this file does not by itself cause the resulting work to be covered by -the GNU General Public License. However the source code for this file -must still be made available in accordance with section (3) of the GNU -General Public License v2. - -This exception does not invalidate any other reasons why a work based -on this file might be covered by the GNU General Public License. - -@end enumerate - - -@subheading END OF TERMS AND CONDITIONS - -@page -@unnumberedsec How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the ``copyright'' line and a pointer to where the full notice is found. - -@smallexample -@var{one line to give the program's name and an idea of what it does.} -Copyright (C) 19@var{yy} @var{name of author} - -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., -59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -@end smallexample - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - -@smallexample -Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author} -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details -type `show w'. This is free software, and you are welcome -to redistribute it under certain conditions; type `show c' -for details. -@end smallexample - -The hypothetical commands @samp{show w} and @samp{show c} should show -the appropriate parts of the General Public License. Of course, the -commands you use may be called something other than @samp{show w} and -@samp{show c}; they could even be mouse-clicks or menu items---whatever -suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a ``copyright disclaimer'' for the program, if -necessary. Here is a sample; alter the names: - -@smallexample -@group -Yoyodyne, Inc., hereby disclaims all copyright -interest in the program `Gnomovision' -(which makes passes at compilers) written -by James Hacker. - -@var{signature of Ty Coon}, 1 April 1989 -Ty Coon, President of Vice -@end group -@end smallexample - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/Makefile.am deleted file mode 100644 index 7bb02dac..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ -# This Makefile.am is in the public domain -SUBDIRS = . - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include - -AM_CFLAGS = @LIBGCRYPT_CFLAGS@ - -if USE_COVERAGE - AM_CFLAGS += --coverage -endif - -# example programs -noinst_PROGRAMS = \ - basicauthentication \ - hellobrowser \ - logging \ - responseheaders - -if ENABLE_HTTPS -noinst_PROGRAMS += \ - tlsauthentication -endif -if HAVE_POSTPROCESSOR -noinst_PROGRAMS += simplepost largepost sessions -endif - -if HAVE_W32 -AM_CPPFLAGS += -DWINDOWS -endif - -basicauthentication_SOURCES = \ - basicauthentication.c -basicauthentication_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -hellobrowser_SOURCES = \ - hellobrowser.c -hellobrowser_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -logging_SOURCES = \ - logging.c -logging_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -responseheaders_SOURCES = \ - responseheaders.c -responseheaders_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -sessions_SOURCES = \ - sessions.c -sessions_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -tlsauthentication_SOURCES = \ - tlsauthentication.c -tlsauthentication_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -simplepost_SOURCES = \ - simplepost.c -simplepost_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -largepost_SOURCES = \ - largepost.c -largepost_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/Makefile.in deleted file mode 100644 index a39cd326..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/Makefile.in +++ /dev/null @@ -1,880 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@USE_COVERAGE_TRUE@am__append_1 = --coverage -noinst_PROGRAMS = basicauthentication$(EXEEXT) hellobrowser$(EXEEXT) \ - logging$(EXEEXT) responseheaders$(EXEEXT) $(am__EXEEXT_1) \ - $(am__EXEEXT_2) -@ENABLE_HTTPS_TRUE@am__append_2 = \ -@ENABLE_HTTPS_TRUE@ tlsauthentication - -@HAVE_POSTPROCESSOR_TRUE@am__append_3 = simplepost largepost sessions -@HAVE_W32_TRUE@am__append_4 = -DWINDOWS -subdir = doc/examples -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -@ENABLE_HTTPS_TRUE@am__EXEEXT_1 = tlsauthentication$(EXEEXT) -@HAVE_POSTPROCESSOR_TRUE@am__EXEEXT_2 = simplepost$(EXEEXT) \ -@HAVE_POSTPROCESSOR_TRUE@ largepost$(EXEEXT) sessions$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) -am_basicauthentication_OBJECTS = basicauthentication.$(OBJEXT) -basicauthentication_OBJECTS = $(am_basicauthentication_OBJECTS) -basicauthentication_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -am_hellobrowser_OBJECTS = hellobrowser.$(OBJEXT) -hellobrowser_OBJECTS = $(am_hellobrowser_OBJECTS) -hellobrowser_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_largepost_OBJECTS = largepost.$(OBJEXT) -largepost_OBJECTS = $(am_largepost_OBJECTS) -largepost_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_logging_OBJECTS = logging.$(OBJEXT) -logging_OBJECTS = $(am_logging_OBJECTS) -logging_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_responseheaders_OBJECTS = responseheaders.$(OBJEXT) -responseheaders_OBJECTS = $(am_responseheaders_OBJECTS) -responseheaders_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_sessions_OBJECTS = sessions.$(OBJEXT) -sessions_OBJECTS = $(am_sessions_OBJECTS) -sessions_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_simplepost_OBJECTS = simplepost.$(OBJEXT) -simplepost_OBJECTS = $(am_simplepost_OBJECTS) -simplepost_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_tlsauthentication_OBJECTS = tlsauthentication.$(OBJEXT) -tlsauthentication_OBJECTS = $(am_tlsauthentication_OBJECTS) -tlsauthentication_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(basicauthentication_SOURCES) $(hellobrowser_SOURCES) \ - $(largepost_SOURCES) $(logging_SOURCES) \ - $(responseheaders_SOURCES) $(sessions_SOURCES) \ - $(simplepost_SOURCES) $(tlsauthentication_SOURCES) -DIST_SOURCES = $(basicauthentication_SOURCES) $(hellobrowser_SOURCES) \ - $(largepost_SOURCES) $(logging_SOURCES) \ - $(responseheaders_SOURCES) $(sessions_SOURCES) \ - $(simplepost_SOURCES) $(tlsauthentication_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -SUBDIRS = . -AM_CPPFLAGS = -I$(top_srcdir)/src/include $(am__append_4) -AM_CFLAGS = @LIBGCRYPT_CFLAGS@ $(am__append_1) -basicauthentication_SOURCES = \ - basicauthentication.c - -basicauthentication_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -hellobrowser_SOURCES = \ - hellobrowser.c - -hellobrowser_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -logging_SOURCES = \ - logging.c - -logging_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -responseheaders_SOURCES = \ - responseheaders.c - -responseheaders_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -sessions_SOURCES = \ - sessions.c - -sessions_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -tlsauthentication_SOURCES = \ - tlsauthentication.c - -tlsauthentication_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -simplepost_SOURCES = \ - simplepost.c - -simplepost_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -largepost_SOURCES = \ - largepost.c - -largepost_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/examples/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/examples/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -basicauthentication$(EXEEXT): $(basicauthentication_OBJECTS) $(basicauthentication_DEPENDENCIES) $(EXTRA_basicauthentication_DEPENDENCIES) - @rm -f basicauthentication$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(basicauthentication_OBJECTS) $(basicauthentication_LDADD) $(LIBS) - -hellobrowser$(EXEEXT): $(hellobrowser_OBJECTS) $(hellobrowser_DEPENDENCIES) $(EXTRA_hellobrowser_DEPENDENCIES) - @rm -f hellobrowser$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hellobrowser_OBJECTS) $(hellobrowser_LDADD) $(LIBS) - -largepost$(EXEEXT): $(largepost_OBJECTS) $(largepost_DEPENDENCIES) $(EXTRA_largepost_DEPENDENCIES) - @rm -f largepost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(largepost_OBJECTS) $(largepost_LDADD) $(LIBS) - -logging$(EXEEXT): $(logging_OBJECTS) $(logging_DEPENDENCIES) $(EXTRA_logging_DEPENDENCIES) - @rm -f logging$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(logging_OBJECTS) $(logging_LDADD) $(LIBS) - -responseheaders$(EXEEXT): $(responseheaders_OBJECTS) $(responseheaders_DEPENDENCIES) $(EXTRA_responseheaders_DEPENDENCIES) - @rm -f responseheaders$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(responseheaders_OBJECTS) $(responseheaders_LDADD) $(LIBS) - -sessions$(EXEEXT): $(sessions_OBJECTS) $(sessions_DEPENDENCIES) $(EXTRA_sessions_DEPENDENCIES) - @rm -f sessions$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sessions_OBJECTS) $(sessions_LDADD) $(LIBS) - -simplepost$(EXEEXT): $(simplepost_OBJECTS) $(simplepost_DEPENDENCIES) $(EXTRA_simplepost_DEPENDENCIES) - @rm -f simplepost$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(simplepost_OBJECTS) $(simplepost_LDADD) $(LIBS) - -tlsauthentication$(EXEEXT): $(tlsauthentication_OBJECTS) $(tlsauthentication_DEPENDENCIES) $(EXTRA_tlsauthentication_DEPENDENCIES) - @rm -f tlsauthentication$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tlsauthentication_OBJECTS) $(tlsauthentication_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basicauthentication.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hellobrowser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/largepost.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logging.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/responseheaders.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sessions.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simplepost.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tlsauthentication.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(PROGRAMS) -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool \ - clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/basicauthentication.c b/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/basicauthentication.c deleted file mode 100644 index 407738be..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/basicauthentication.c +++ /dev/null @@ -1,83 +0,0 @@ -/* Feel free to use this example code in any way - you see fit (Public Domain) */ - -#include -#ifndef _WIN32 -#include -#include -#else -#include -#endif -#include -#include -#include -#include -#include - -#define PORT 8888 - - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - char *user; - char *pass; - int fail; - int ret; - struct MHD_Response *response; - - if (0 != strcmp (method, "GET")) - return MHD_NO; - if (NULL == *con_cls) - { - *con_cls = connection; - return MHD_YES; - } - pass = NULL; - user = MHD_basic_auth_get_username_password (connection, &pass); - fail = ( (user == NULL) || - (0 != strcmp (user, "root")) || - (0 != strcmp (pass, "pa$$w0rd") ) ); - if (user != NULL) free (user); - if (pass != NULL) free (pass); - if (fail) - { - const char *page = "Go away."; - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_basic_auth_fail_response (connection, - "my realm", - response); - } - else - { - const char *page = "A secret."; - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - } - MHD_destroy_response (response); - return ret; -} - - -int -main () -{ - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - - (void) getchar (); - - MHD_stop_daemon (daemon); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/hellobrowser.c b/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/hellobrowser.c deleted file mode 100644 index df38e72b..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/hellobrowser.c +++ /dev/null @@ -1,51 +0,0 @@ -/* Feel free to use this example code in any way - you see fit (Public Domain) */ - -#include -#ifndef _WIN32 -#include -#include -#else -#include -#endif -#include -#include -#include - -#define PORT 8888 - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - const char *page = "Hello, browser!"; - struct MHD_Response *response; - int ret; - - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - - return ret; -} - - -int -main () -{ - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - - (void) getchar (); - - MHD_stop_daemon (daemon); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/largepost.c b/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/largepost.c deleted file mode 100644 index 0b9de2d5..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/largepost.c +++ /dev/null @@ -1,242 +0,0 @@ -/* Feel free to use this example code in any way - you see fit (Public Domain) */ - -#include -#ifndef _WIN32 -#include -#include -#else -#include -#endif -#include -#include -#include -#include - -#define PORT 8888 -#define POSTBUFFERSIZE 512 -#define MAXCLIENTS 2 - -#define GET 0 -#define POST 1 - -static unsigned int nr_of_uploading_clients = 0; - -struct connection_info_struct -{ - int connectiontype; - struct MHD_PostProcessor *postprocessor; - FILE *fp; - const char *answerstring; - int answercode; -}; - -const char *askpage = "\n\ - Upload a file, please!
\n\ - There are %u clients uploading at the moment.
\n\ -
\n\ - \n\ - \n\ - "; - -const char *busypage = - "This server is busy, please try again later."; - -const char *completepage = - "The upload has been completed."; - -const char *errorpage = - "This doesn't seem to be right."; -const char *servererrorpage = - "An internal server error has occured."; -const char *fileexistspage = - "This file already exists."; - - -static int -send_page (struct MHD_Connection *connection, const char *page, - int status_code) -{ - int ret; - struct MHD_Response *response; - - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_MUST_COPY); - if (!response) - return MHD_NO; - MHD_add_response_header (response, MHD_HTTP_HEADER_CONTENT_TYPE, "text/html"); - ret = MHD_queue_response (connection, status_code, response); - MHD_destroy_response (response); - - return ret; -} - - -static int -iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, - const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, uint64_t off, - size_t size) -{ - struct connection_info_struct *con_info = coninfo_cls; - FILE *fp; - - con_info->answerstring = servererrorpage; - con_info->answercode = MHD_HTTP_INTERNAL_SERVER_ERROR; - - if (0 != strcmp (key, "file")) - return MHD_NO; - - if (!con_info->fp) - { - if (NULL != (fp = fopen (filename, "rb"))) - { - fclose (fp); - con_info->answerstring = fileexistspage; - con_info->answercode = MHD_HTTP_FORBIDDEN; - return MHD_NO; - } - - con_info->fp = fopen (filename, "ab"); - if (!con_info->fp) - return MHD_NO; - } - - if (size > 0) - { - if (!fwrite (data, size, sizeof (char), con_info->fp)) - return MHD_NO; - } - - con_info->answerstring = completepage; - con_info->answercode = MHD_HTTP_OK; - - return MHD_YES; -} - - -static void -request_completed (void *cls, struct MHD_Connection *connection, - void **con_cls, enum MHD_RequestTerminationCode toe) -{ - struct connection_info_struct *con_info = *con_cls; - - if (NULL == con_info) - return; - - if (con_info->connectiontype == POST) - { - if (NULL != con_info->postprocessor) - { - MHD_destroy_post_processor (con_info->postprocessor); - nr_of_uploading_clients--; - } - - if (con_info->fp) - fclose (con_info->fp); - } - - free (con_info); - *con_cls = NULL; -} - - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - if (NULL == *con_cls) - { - struct connection_info_struct *con_info; - - if (nr_of_uploading_clients >= MAXCLIENTS) - return send_page (connection, busypage, MHD_HTTP_SERVICE_UNAVAILABLE); - - con_info = malloc (sizeof (struct connection_info_struct)); - if (NULL == con_info) - return MHD_NO; - - con_info->fp = NULL; - - if (0 == strcmp (method, "POST")) - { - con_info->postprocessor = - MHD_create_post_processor (connection, POSTBUFFERSIZE, - iterate_post, (void *) con_info); - - if (NULL == con_info->postprocessor) - { - free (con_info); - return MHD_NO; - } - - nr_of_uploading_clients++; - - con_info->connectiontype = POST; - con_info->answercode = MHD_HTTP_OK; - con_info->answerstring = completepage; - } - else - con_info->connectiontype = GET; - - *con_cls = (void *) con_info; - - return MHD_YES; - } - - if (0 == strcmp (method, "GET")) - { - char buffer[1024]; - - snprintf (buffer, sizeof (buffer), askpage, nr_of_uploading_clients); - return send_page (connection, buffer, MHD_HTTP_OK); - } - - if (0 == strcmp (method, "POST")) - { - struct connection_info_struct *con_info = *con_cls; - - if (0 != *upload_data_size) - { - MHD_post_process (con_info->postprocessor, upload_data, - *upload_data_size); - *upload_data_size = 0; - - return MHD_YES; - } - else - { - if (NULL != con_info->fp) - { - fclose (con_info->fp); - con_info->fp = NULL; - } - /* Now it is safe to open and inspect the file before calling send_page with a response */ - return send_page (connection, con_info->answerstring, - con_info->answercode); - } - - } - - return send_page (connection, errorpage, MHD_HTTP_BAD_REQUEST); -} - - -int -main () -{ - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_NOTIFY_COMPLETED, request_completed, - NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - (void) getchar (); - MHD_stop_daemon (daemon); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/logging.c b/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/logging.c deleted file mode 100644 index c896a7dd..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/logging.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Feel free to use this example code in any way - you see fit (Public Domain) */ - -#include -#ifndef _WIN32 -#include -#include -#else -#include -#endif -#include -#include - -#define PORT 8888 - - -static int -print_out_key (void *cls, enum MHD_ValueKind kind, const char *key, - const char *value) -{ - printf ("%s: %s\n", key, value); - return MHD_YES; -} - - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - printf ("New %s request for %s using version %s\n", method, url, version); - - MHD_get_connection_values (connection, MHD_HEADER_KIND, print_out_key, - NULL); - - return MHD_NO; -} - - -int -main () -{ - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - - (void) getchar (); - - MHD_stop_daemon (daemon); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/responseheaders.c b/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/responseheaders.c deleted file mode 100644 index 25cca43e..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/responseheaders.c +++ /dev/null @@ -1,86 +0,0 @@ -/* Feel free to use this example code in any way - you see fit (Public Domain) */ - -#include -#ifndef _WIN32 -#include -#include -#else -#include -#endif -#include -#include -#include -#include -#include -#include - -#define PORT 8888 -#define FILENAME "picture.png" -#define MIMETYPE "image/png" - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - struct MHD_Response *response; - int fd; - int ret; - struct stat sbuf; - - if (0 != strcmp (method, "GET")) - return MHD_NO; - - if ( (-1 == (fd = open (FILENAME, O_RDONLY))) || - (0 != fstat (fd, &sbuf)) ) - { - /* error accessing file */ - if (fd != -1) - (void) close (fd); - const char *errorstr = - "An internal server error has occured!\ - "; - response = - MHD_create_response_from_buffer (strlen (errorstr), - (void *) errorstr, - MHD_RESPMEM_PERSISTENT); - if (NULL != response) - { - ret = - MHD_queue_response (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - response); - MHD_destroy_response (response); - - return ret; - } - else - return MHD_NO; - } - response = - MHD_create_response_from_fd_at_offset (sbuf.st_size, fd, 0); - MHD_add_response_header (response, "Content-Type", MIMETYPE); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - - return ret; -} - - -int -main () -{ - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - - (void) getchar (); - - MHD_stop_daemon (daemon); - - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/sessions.c b/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/sessions.c deleted file mode 100644 index 0fd27666..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/sessions.c +++ /dev/null @@ -1,774 +0,0 @@ -/* Feel free to use this example code in any way - you see fit (Public Domain) */ - -/* needed for asprintf */ -#define _GNU_SOURCE - -#include -#include -#include -#include -#include -#include - -#if defined _WIN32 && !defined(__MINGW64_VERSION_MAJOR) -static int -asprintf (char **resultp, const char *format, ...) -{ - va_list argptr; - char *result = NULL; - int len = 0; - - if (format == NULL) - return -1; - - va_start (argptr, format); - - len = _vscprintf ((char *) format, argptr); - if (len >= 0) - { - len += 1; - result = (char *) malloc (sizeof (char *) * len); - if (result != NULL) - { - int len2 = _vscprintf ((char *) format, argptr); - if (len2 != len - 1 || len2 <= 0) - { - free (result); - result = NULL; - len = -1; - } - else - { - len = len2; - if (resultp) - *resultp = result; - } - } - } - va_end (argptr); - return len; -} -#endif - -/** - * Invalid method page. - */ -#define METHOD_ERROR "Illegal requestGo away." - -/** - * Invalid URL page. - */ -#define NOT_FOUND_ERROR "Not foundGo away." - -/** - * Front page. (/) - */ -#define MAIN_PAGE "Welcome
What is your name? " - -/** - * Second page. (/2) - */ -#define SECOND_PAGE "Tell me moreprevious %s, what is your job? " - -/** - * Second page (/S) - */ -#define SUBMIT_PAGE "Ready to submit?previous " - -/** - * Last page. - */ -#define LAST_PAGE "Thank youThank you." - -/** - * Name of our cookie. - */ -#define COOKIE_NAME "session" - - -/** - * State we keep for each user/session/browser. - */ -struct Session -{ - /** - * We keep all sessions in a linked list. - */ - struct Session *next; - - /** - * Unique ID for this session. - */ - char sid[33]; - - /** - * Reference counter giving the number of connections - * currently using this session. - */ - unsigned int rc; - - /** - * Time when this session was last active. - */ - time_t start; - - /** - * String submitted via form. - */ - char value_1[64]; - - /** - * Another value submitted via form. - */ - char value_2[64]; - -}; - - -/** - * Data kept per request. - */ -struct Request -{ - - /** - * Associated session. - */ - struct Session *session; - - /** - * Post processor handling form data (IF this is - * a POST request). - */ - struct MHD_PostProcessor *pp; - - /** - * URL to serve in response to this POST (if this request - * was a 'POST') - */ - const char *post_url; - -}; - - -/** - * Linked list of all active sessions. Yes, O(n) but a - * hash table would be overkill for a simple example... - */ -static struct Session *sessions; - - - - -/** - * Return the session handle for this connection, or - * create one if this is a new user. - */ -static struct Session * -get_session (struct MHD_Connection *connection) -{ - struct Session *ret; - const char *cookie; - - cookie = MHD_lookup_connection_value (connection, - MHD_COOKIE_KIND, - COOKIE_NAME); - if (cookie != NULL) - { - /* find existing session */ - ret = sessions; - while (NULL != ret) - { - if (0 == strcmp (cookie, ret->sid)) - break; - ret = ret->next; - } - if (NULL != ret) - { - ret->rc++; - return ret; - } - } - /* create fresh session */ - ret = calloc (1, sizeof (struct Session)); - if (NULL == ret) - { - fprintf (stderr, "calloc error: %s\n", strerror (errno)); - return NULL; - } - /* not a super-secure way to generate a random session ID, - but should do for a simple example... */ - snprintf (ret->sid, - sizeof (ret->sid), - "%X%X%X%X", - (unsigned int) rand (), - (unsigned int) rand (), - (unsigned int) rand (), - (unsigned int) rand ()); - ret->rc++; - ret->start = time (NULL); - ret->next = sessions; - sessions = ret; - return ret; -} - - -/** - * Type of handler that generates a reply. - * - * @param cls content for the page (handler-specific) - * @param mime mime type to use - * @param session session information - * @param connection connection to process - * @param MHD_YES on success, MHD_NO on failure - */ -typedef int (*PageHandler)(const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection); - - -/** - * Entry we generate for each page served. - */ -struct Page -{ - /** - * Acceptable URL for this page. - */ - const char *url; - - /** - * Mime type to set for the page. - */ - const char *mime; - - /** - * Handler to call to generate response. - */ - PageHandler handler; - - /** - * Extra argument to handler. - */ - const void *handler_cls; -}; - - -/** - * Add header to response to set a session cookie. - * - * @param session session to use - * @param response response to modify - */ -static void -add_session_cookie (struct Session *session, - struct MHD_Response *response) -{ - char cstr[256]; - snprintf (cstr, - sizeof (cstr), - "%s=%s", - COOKIE_NAME, - session->sid); - if (MHD_NO == - MHD_add_response_header (response, - MHD_HTTP_HEADER_SET_COOKIE, - cstr)) - { - fprintf (stderr, - "Failed to set session cookie header!\n"); - } -} - - -/** - * Handler that returns a simple static HTTP page that - * is passed in via 'cls'. - * - * @param cls a 'const char *' with the HTML webpage to return - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ -static int -serve_simple_form (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) -{ - int ret; - const char *form = cls; - struct MHD_Response *response; - - /* return static form */ - response = MHD_create_response_from_buffer (strlen (form), - (void *) form, - MHD_RESPMEM_PERSISTENT); - add_session_cookie (session, response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; -} - - -/** - * Handler that adds the 'v1' value to the given HTML code. - * - * @param cls a 'const char *' with the HTML webpage to return - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ -static int -fill_v1_form (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) -{ - int ret; - const char *form = cls; - char *reply; - struct MHD_Response *response; - - if (-1 == asprintf (&reply, - form, - session->value_1)) - { - /* oops */ - return MHD_NO; - } - /* return static form */ - response = MHD_create_response_from_buffer (strlen (reply), - (void *) reply, - MHD_RESPMEM_MUST_FREE); - add_session_cookie (session, response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; -} - - -/** - * Handler that adds the 'v1' and 'v2' values to the given HTML code. - * - * @param cls a 'const char *' with the HTML webpage to return - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ -static int -fill_v1_v2_form (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) -{ - int ret; - const char *form = cls; - char *reply; - struct MHD_Response *response; - - if (-1 == asprintf (&reply, - form, - session->value_1, - session->value_2)) - { - /* oops */ - return MHD_NO; - } - /* return static form */ - response = MHD_create_response_from_buffer (strlen (reply), - (void *) reply, - MHD_RESPMEM_MUST_FREE); - add_session_cookie (session, response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; -} - - -/** - * Handler used to generate a 404 reply. - * - * @param cls a 'const char *' with the HTML webpage to return - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ -static int -not_found_page (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) -{ - int ret; - struct MHD_Response *response; - - /* unsupported HTTP method */ - response = MHD_create_response_from_buffer (strlen (NOT_FOUND_ERROR), - (void *) NOT_FOUND_ERROR, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, - MHD_HTTP_NOT_FOUND, - response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - MHD_destroy_response (response); - return ret; -} - - -/** - * List of all pages served by this HTTP server. - */ -static struct Page pages[] = - { - { "/", "text/html", &fill_v1_form, MAIN_PAGE }, - { "/2", "text/html", &fill_v1_v2_form, SECOND_PAGE }, - { "/S", "text/html", &serve_simple_form, SUBMIT_PAGE }, - { "/F", "text/html", &serve_simple_form, LAST_PAGE }, - { NULL, NULL, ¬_found_page, NULL } /* 404 */ - }; - - - -/** - * Iterator over key-value pairs where the value - * maybe made available in increments and/or may - * not be zero-terminated. Used for processing - * POST data. - * - * @param cls user-specified closure - * @param kind type of the value - * @param key 0-terminated key for the value - * @param filename name of the uploaded file, NULL if not known - * @param content_type mime-type of the data, NULL if not known - * @param transfer_encoding encoding of the data, NULL if not known - * @param data pointer to size bytes of data at the - * specified offset - * @param off offset of data in the overall value - * @param size number of bytes in data available - * @return MHD_YES to continue iterating, - * MHD_NO to abort the iteration - */ -static int -post_iterator (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *data, uint64_t off, size_t size) -{ - struct Request *request = cls; - struct Session *session = request->session; - - if (0 == strcmp ("DONE", key)) - { - fprintf (stdout, - "Session `%s' submitted `%s', `%s'\n", - session->sid, - session->value_1, - session->value_2); - return MHD_YES; - } - if (0 == strcmp ("v1", key)) - { - if (size + off > sizeof(session->value_1)) - size = sizeof (session->value_1) - off; - memcpy (&session->value_1[off], - data, - size); - if (size + off < sizeof (session->value_1)) - session->value_1[size+off] = '\0'; - return MHD_YES; - } - if (0 == strcmp ("v2", key)) - { - if (size + off > sizeof(session->value_2)) - size = sizeof (session->value_2) - off; - memcpy (&session->value_2[off], - data, - size); - if (size + off < sizeof (session->value_2)) - session->value_2[size+off] = '\0'; - return MHD_YES; - } - fprintf (stderr, "Unsupported form value `%s'\n", key); - return MHD_YES; -} - - -/** - * Main MHD callback for handling requests. - * - * - * @param cls argument given together with the function - * pointer when the handler was registered with MHD - * @param connection handle to connection which is being processed - * @param url the requested url - * @param method the HTTP method used ("GET", "PUT", etc.) - * @param version the HTTP version string (i.e. "HTTP/1.1") - * @param upload_data the data being uploaded (excluding HEADERS, - * for a POST that fits into memory and that is encoded - * with a supported encoding, the POST data will NOT be - * given in upload_data and is instead available as - * part of MHD_get_connection_values; very large POST - * data *will* be made available incrementally in - * upload_data) - * @param upload_data_size set initially to the size of the - * upload_data provided; the method must update this - * value to the number of bytes NOT processed; - * @param ptr pointer that the callback can set to some - * address and that will be preserved by MHD for future - * calls for this request; since the access handler may - * be called many times (i.e., for a PUT/POST operation - * with plenty of upload data) this allows the application - * to easily associate some request-specific state. - * If necessary, this state can be cleaned up in the - * global "MHD_RequestCompleted" callback (which - * can be set with the MHD_OPTION_NOTIFY_COMPLETED). - * Initially, *con_cls will be NULL. - * @return MHS_YES if the connection was handled successfully, - * MHS_NO if the socket must be closed due to a serios - * error while handling the request - */ -static int -create_response (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, - void **ptr) -{ - struct MHD_Response *response; - struct Request *request; - struct Session *session; - int ret; - unsigned int i; - - request = *ptr; - if (NULL == request) - { - request = calloc (1, sizeof (struct Request)); - if (NULL == request) - { - fprintf (stderr, "calloc error: %s\n", strerror (errno)); - return MHD_NO; - } - *ptr = request; - if (0 == strcmp (method, MHD_HTTP_METHOD_POST)) - { - request->pp = MHD_create_post_processor (connection, 1024, - &post_iterator, request); - if (NULL == request->pp) - { - fprintf (stderr, "Failed to setup post processor for `%s'\n", - url); - return MHD_NO; /* internal error */ - } - } - return MHD_YES; - } - if (NULL == request->session) - { - request->session = get_session (connection); - if (NULL == request->session) - { - fprintf (stderr, "Failed to setup session for `%s'\n", - url); - return MHD_NO; /* internal error */ - } - } - session = request->session; - session->start = time (NULL); - if (0 == strcmp (method, MHD_HTTP_METHOD_POST)) - { - /* evaluate POST data */ - MHD_post_process (request->pp, - upload_data, - *upload_data_size); - if (0 != *upload_data_size) - { - *upload_data_size = 0; - return MHD_YES; - } - /* done with POST data, serve response */ - MHD_destroy_post_processor (request->pp); - request->pp = NULL; - method = MHD_HTTP_METHOD_GET; /* fake 'GET' */ - if (NULL != request->post_url) - url = request->post_url; - } - - if ( (0 == strcmp (method, MHD_HTTP_METHOD_GET)) || - (0 == strcmp (method, MHD_HTTP_METHOD_HEAD)) ) - { - /* find out which page to serve */ - i=0; - while ( (pages[i].url != NULL) && - (0 != strcmp (pages[i].url, url)) ) - i++; - ret = pages[i].handler (pages[i].handler_cls, - pages[i].mime, - session, connection); - if (ret != MHD_YES) - fprintf (stderr, "Failed to create page for `%s'\n", - url); - return ret; - } - /* unsupported HTTP method */ - response = MHD_create_response_from_buffer (strlen (METHOD_ERROR), - (void *) METHOD_ERROR, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, - MHD_HTTP_METHOD_NOT_ACCEPTABLE, - response); - MHD_destroy_response (response); - return ret; -} - - -/** - * Callback called upon completion of a request. - * Decrements session reference counter. - * - * @param cls not used - * @param connection connection that completed - * @param con_cls session handle - * @param toe status code - */ -static void -request_completed_callback (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct Request *request = *con_cls; - - if (NULL == request) - return; - if (NULL != request->session) - request->session->rc--; - if (NULL != request->pp) - MHD_destroy_post_processor (request->pp); - free (request); -} - - -/** - * Clean up handles of sessions that have been idle for - * too long. - */ -static void -expire_sessions () -{ - struct Session *pos; - struct Session *prev; - struct Session *next; - time_t now; - - now = time (NULL); - prev = NULL; - pos = sessions; - while (NULL != pos) - { - next = pos->next; - if (now - pos->start > 60 * 60) - { - /* expire sessions after 1h */ - if (NULL == prev) - sessions = pos->next; - else - prev->next = next; - free (pos); - } - else - prev = pos; - pos = next; - } -} - - -/** - * Call with the port number as the only argument. - * Never terminates (other than by signals, such as CTRL-C). - */ -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - struct timeval tv; - struct timeval *tvp; - fd_set rs; - fd_set ws; - fd_set es; - int max; - MHD_UNSIGNED_LONG_LONG mhd_timeout; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - /* initialize PRNG */ - srand ((unsigned int) time (NULL)); - d = MHD_start_daemon (MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, - &create_response, NULL, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 15, - MHD_OPTION_NOTIFY_COMPLETED, &request_completed_callback, NULL, - MHD_OPTION_END); - if (NULL == d) - return 1; - while (1) - { - expire_sessions (); - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - break; /* fatal internal error */ - if (MHD_get_timeout (d, &mhd_timeout) == MHD_YES) - { - tv.tv_sec = mhd_timeout / 1000; - tv.tv_usec = (mhd_timeout - (tv.tv_sec * 1000)) * 1000; - tvp = &tv; - } - else - tvp = NULL; - if (-1 == select (max + 1, &rs, &ws, &es, tvp)) - { - if (EINTR != errno) - fprintf (stderr, - "Aborting due to error during select: %s\n", - strerror (errno)); - break; - } - MHD_run (d); - } - MHD_stop_daemon (d); - return 0; -} - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/simplepost.c b/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/simplepost.c deleted file mode 100644 index c623cba2..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/simplepost.c +++ /dev/null @@ -1,193 +0,0 @@ -/* Feel free to use this example code in any way - you see fit (Public Domain) */ - -#include -#ifndef _WIN32 -#include -#include -#else -#include -#endif -#include -#include -#include -#include - -#define PORT 8888 -#define POSTBUFFERSIZE 512 -#define MAXNAMESIZE 20 -#define MAXANSWERSIZE 512 - -#define GET 0 -#define POST 1 - -struct connection_info_struct -{ - int connectiontype; - char *answerstring; - struct MHD_PostProcessor *postprocessor; -}; - -const char *askpage = "\ - What's your name, Sir?
\ - \ - \ - "; - -const char *greetingpage = - "

Welcome, %s!

"; - -const char *errorpage = - "This doesn't seem to be right."; - - -static int -send_page (struct MHD_Connection *connection, const char *page) -{ - int ret; - struct MHD_Response *response; - - - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - if (!response) - return MHD_NO; - - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - - return ret; -} - - -static int -iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, - const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, uint64_t off, - size_t size) -{ - struct connection_info_struct *con_info = coninfo_cls; - - if (0 == strcmp (key, "name")) - { - if ((size > 0) && (size <= MAXNAMESIZE)) - { - char *answerstring; - answerstring = malloc (MAXANSWERSIZE); - if (!answerstring) - return MHD_NO; - - snprintf (answerstring, MAXANSWERSIZE, greetingpage, data); - con_info->answerstring = answerstring; - } - else - con_info->answerstring = NULL; - - return MHD_NO; - } - - return MHD_YES; -} - -static void -request_completed (void *cls, struct MHD_Connection *connection, - void **con_cls, enum MHD_RequestTerminationCode toe) -{ - struct connection_info_struct *con_info = *con_cls; - - if (NULL == con_info) - return; - - if (con_info->connectiontype == POST) - { - MHD_destroy_post_processor (con_info->postprocessor); - if (con_info->answerstring) - free (con_info->answerstring); - } - - free (con_info); - *con_cls = NULL; -} - - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - if (NULL == *con_cls) - { - struct connection_info_struct *con_info; - - con_info = malloc (sizeof (struct connection_info_struct)); - if (NULL == con_info) - return MHD_NO; - con_info->answerstring = NULL; - - if (0 == strcmp (method, "POST")) - { - con_info->postprocessor = - MHD_create_post_processor (connection, POSTBUFFERSIZE, - iterate_post, (void *) con_info); - - if (NULL == con_info->postprocessor) - { - free (con_info); - return MHD_NO; - } - - con_info->connectiontype = POST; - } - else - con_info->connectiontype = GET; - - *con_cls = (void *) con_info; - - return MHD_YES; - } - - if (0 == strcmp (method, "GET")) - { - return send_page (connection, askpage); - } - - if (0 == strcmp (method, "POST")) - { - struct connection_info_struct *con_info = *con_cls; - - if (*upload_data_size != 0) - { - MHD_post_process (con_info->postprocessor, upload_data, - *upload_data_size); - *upload_data_size = 0; - - return MHD_YES; - } - else if (NULL != con_info->answerstring) - return send_page (connection, con_info->answerstring); - } - - return send_page (connection, errorpage); -} - -int -main () -{ - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_NOTIFY_COMPLETED, request_completed, - NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - - (void) getchar (); - - MHD_stop_daemon (daemon); - - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/tlsauthentication.c b/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/tlsauthentication.c deleted file mode 100644 index 4d616b6f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/examples/tlsauthentication.c +++ /dev/null @@ -1,271 +0,0 @@ -/* Feel free to use this example code in any way - you see fit (Public Domain) */ - -#include -#ifndef _WIN32 -#include -#include -#else -#include -#endif -#include -#include -#include -#include - -#define PORT 8888 - -#define REALM "\"Maintenance\"" -#define USER "a legitimate user" -#define PASSWORD "and his password" - -#define SERVERKEYFILE "server.key" -#define SERVERCERTFILE "server.pem" - - -static char * -string_to_base64 (const char *message) -{ - const char *lookup = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - unsigned long l; - int i; - char *tmp; - size_t length = strlen (message); - - tmp = malloc (length * 2); - if (NULL == tmp) - return tmp; - - tmp[0] = 0; - - for (i = 0; i < length; i += 3) - { - l = (((unsigned long) message[i]) << 16) - | (((i + 1) < length) ? (((unsigned long) message[i + 1]) << 8) : 0) - | (((i + 2) < length) ? ((unsigned long) message[i + 2]) : 0); - - - strncat (tmp, &lookup[(l >> 18) & 0x3F], 1); - strncat (tmp, &lookup[(l >> 12) & 0x3F], 1); - - if (i + 1 < length) - strncat (tmp, &lookup[(l >> 6) & 0x3F], 1); - if (i + 2 < length) - strncat (tmp, &lookup[l & 0x3F], 1); - } - - if (length % 3) - strncat (tmp, "===", 3 - length % 3); - - return tmp; -} - - -static long -get_file_size (const char *filename) -{ - FILE *fp; - - fp = fopen (filename, "rb"); - if (fp) - { - long size; - - if ((0 != fseek (fp, 0, SEEK_END)) || (-1 == (size = ftell (fp)))) - size = 0; - - fclose (fp); - - return size; - } - else - return 0; -} - -static char * -load_file (const char *filename) -{ - FILE *fp; - char *buffer; - long size; - - size = get_file_size (filename); - if (size == 0) - return NULL; - - fp = fopen (filename, "rb"); - if (!fp) - return NULL; - - buffer = malloc (size); - if (!buffer) - { - fclose (fp); - return NULL; - } - - if (size != fread (buffer, 1, size, fp)) - { - free (buffer); - buffer = NULL; - } - - fclose (fp); - return buffer; -} - -static int -ask_for_authentication (struct MHD_Connection *connection, const char *realm) -{ - int ret; - struct MHD_Response *response; - char *headervalue; - const char *strbase = "Basic realm="; - - response = MHD_create_response_from_buffer (0, NULL, - MHD_RESPMEM_PERSISTENT); - if (!response) - return MHD_NO; - - headervalue = malloc (strlen (strbase) + strlen (realm) + 1); - if (!headervalue) - return MHD_NO; - - strcpy (headervalue, strbase); - strcat (headervalue, realm); - - ret = MHD_add_response_header (response, "WWW-Authenticate", headervalue); - free (headervalue); - if (!ret) - { - MHD_destroy_response (response); - return MHD_NO; - } - - ret = MHD_queue_response (connection, MHD_HTTP_UNAUTHORIZED, response); - - MHD_destroy_response (response); - - return ret; -} - -static int -is_authenticated (struct MHD_Connection *connection, - const char *username, const char *password) -{ - const char *headervalue; - char *expected_b64, *expected; - const char *strbase = "Basic "; - int authenticated; - - headervalue = - MHD_lookup_connection_value (connection, MHD_HEADER_KIND, - "Authorization"); - if (NULL == headervalue) - return 0; - if (0 != strncmp (headervalue, strbase, strlen (strbase))) - return 0; - - expected = malloc (strlen (username) + 1 + strlen (password) + 1); - if (NULL == expected) - return 0; - - strcpy (expected, username); - strcat (expected, ":"); - strcat (expected, password); - - expected_b64 = string_to_base64 (expected); - free (expected); - if (NULL == expected_b64) - return 0; - - authenticated = - (strcmp (headervalue + strlen (strbase), expected_b64) == 0); - - free (expected_b64); - - return authenticated; -} - - -static int -secret_page (struct MHD_Connection *connection) -{ - int ret; - struct MHD_Response *response; - const char *page = "A secret."; - - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - if (!response) - return MHD_NO; - - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - - return ret; -} - - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - if (0 != strcmp (method, "GET")) - return MHD_NO; - if (NULL == *con_cls) - { - *con_cls = connection; - return MHD_YES; - } - - if (!is_authenticated (connection, USER, PASSWORD)) - return ask_for_authentication (connection, REALM); - - return secret_page (connection); -} - - -int -main () -{ - struct MHD_Daemon *daemon; - char *key_pem; - char *cert_pem; - - key_pem = load_file (SERVERKEYFILE); - cert_pem = load_file (SERVERCERTFILE); - - if ((key_pem == NULL) || (cert_pem == NULL)) - { - printf ("The key/certificate files could not be read.\n"); - return 1; - } - - daemon = - MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, PORT, NULL, - NULL, &answer_to_connection, NULL, - MHD_OPTION_HTTPS_MEM_KEY, key_pem, - MHD_OPTION_HTTPS_MEM_CERT, cert_pem, MHD_OPTION_END); - if (NULL == daemon) - { - printf ("%s\n", cert_pem); - - free (key_pem); - free (cert_pem); - - return 1; - } - - (void) getchar (); - - MHD_stop_daemon (daemon); - free (key_pem); - free (cert_pem); - - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/fdl-1.3.texi b/src/hos_libhttpserver/src/libmicrohttpd/doc/fdl-1.3.texi deleted file mode 100644 index 8805f1a4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/fdl-1.3.texi +++ /dev/null @@ -1,506 +0,0 @@ -@c The GNU Free Documentation License. -@center Version 1.3, 3 November 2008 - -@c This file is intended to be included within another document, -@c hence no sectioning command or @node. - -@display -Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. -@uref{http://fsf.org/} - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. -@end display - -@enumerate 0 -@item -PREAMBLE - -The purpose of this License is to make a manual, textbook, or other -functional and useful document @dfn{free} in the sense of freedom: to -assure everyone the effective freedom to copy and redistribute it, -with or without modifying it, either commercially or noncommercially. -Secondarily, this License preserves for the author and publisher a way -to get credit for their work, while not being considered responsible -for modifications made by others. - -This License is a kind of ``copyleft'', which means that derivative -works of the document must themselves be free in the same sense. It -complements the GNU General Public License, which is a copyleft -license designed for free software. - -We have designed this License in order to use it for manuals for free -software, because free software needs free documentation: a free -program should come with manuals providing the same freedoms that the -software does. But this License is not limited to software manuals; -it can be used for any textual work, regardless of subject matter or -whether it is published as a printed book. We recommend this License -principally for works whose purpose is instruction or reference. - -@item -APPLICABILITY AND DEFINITIONS - -This License applies to any manual or other work, in any medium, that -contains a notice placed by the copyright holder saying it can be -distributed under the terms of this License. Such a notice grants a -world-wide, royalty-free license, unlimited in duration, to use that -work under the conditions stated herein. The ``Document'', below, -refers to any such manual or work. Any member of the public is a -licensee, and is addressed as ``you''. You accept the license if you -copy, modify or distribute the work in a way requiring permission -under copyright law. - -A ``Modified Version'' of the Document means any work containing the -Document or a portion of it, either copied verbatim, or with -modifications and/or translated into another language. - -A ``Secondary Section'' is a named appendix or a front-matter section -of the Document that deals exclusively with the relationship of the -publishers or authors of the Document to the Document's overall -subject (or to related matters) and contains nothing that could fall -directly within that overall subject. (Thus, if the Document is in -part a textbook of mathematics, a Secondary Section may not explain -any mathematics.) The relationship could be a matter of historical -connection with the subject or with related matters, or of legal, -commercial, philosophical, ethical or political position regarding -them. - -The ``Invariant Sections'' are certain Secondary Sections whose titles -are designated, as being those of Invariant Sections, in the notice -that says that the Document is released under this License. If a -section does not fit the above definition of Secondary then it is not -allowed to be designated as Invariant. The Document may contain zero -Invariant Sections. If the Document does not identify any Invariant -Sections then there are none. - -The ``Cover Texts'' are certain short passages of text that are listed, -as Front-Cover Texts or Back-Cover Texts, in the notice that says that -the Document is released under this License. A Front-Cover Text may -be at most 5 words, and a Back-Cover Text may be at most 25 words. - -A ``Transparent'' copy of the Document means a machine-readable copy, -represented in a format whose specification is available to the -general public, that is suitable for revising the document -straightforwardly with generic text editors or (for images composed of -pixels) generic paint programs or (for drawings) some widely available -drawing editor, and that is suitable for input to text formatters or -for automatic translation to a variety of formats suitable for input -to text formatters. A copy made in an otherwise Transparent file -format whose markup, or absence of markup, has been arranged to thwart -or discourage subsequent modification by readers is not Transparent. -An image format is not Transparent if used for any substantial amount -of text. A copy that is not ``Transparent'' is called ``Opaque''. - -Examples of suitable formats for Transparent copies include plain -@sc{ascii} without markup, Texinfo input format, La@TeX{} input -format, @acronym{SGML} or @acronym{XML} using a publicly available -@acronym{DTD}, and standard-conforming simple @acronym{HTML}, -PostScript or @acronym{PDF} designed for human modification. Examples -of transparent image formats include @acronym{PNG}, @acronym{XCF} and -@acronym{JPG}. Opaque formats include proprietary formats that can be -read and edited only by proprietary word processors, @acronym{SGML} or -@acronym{XML} for which the @acronym{DTD} and/or processing tools are -not generally available, and the machine-generated @acronym{HTML}, -PostScript or @acronym{PDF} produced by some word processors for -output purposes only. - -The ``Title Page'' means, for a printed book, the title page itself, -plus such following pages as are needed to hold, legibly, the material -this License requires to appear in the title page. For works in -formats which do not have any title page as such, ``Title Page'' means -the text near the most prominent appearance of the work's title, -preceding the beginning of the body of the text. - -The ``publisher'' means any person or entity that distributes copies -of the Document to the public. - -A section ``Entitled XYZ'' means a named subunit of the Document whose -title either is precisely XYZ or contains XYZ in parentheses following -text that translates XYZ in another language. (Here XYZ stands for a -specific section name mentioned below, such as ``Acknowledgements'', -``Dedications'', ``Endorsements'', or ``History''.) To ``Preserve the Title'' -of such a section when you modify the Document means that it remains a -section ``Entitled XYZ'' according to this definition. - -The Document may include Warranty Disclaimers next to the notice which -states that this License applies to the Document. These Warranty -Disclaimers are considered to be included by reference in this -License, but only as regards disclaiming warranties: any other -implication that these Warranty Disclaimers may have is void and has -no effect on the meaning of this License. - -@item -VERBATIM COPYING - -You may copy and distribute the Document in any medium, either -commercially or noncommercially, provided that this License, the -copyright notices, and the license notice saying this License applies -to the Document are reproduced in all copies, and that you add no other -conditions whatsoever to those of this License. You may not use -technical measures to obstruct or control the reading or further -copying of the copies you make or distribute. However, you may accept -compensation in exchange for copies. If you distribute a large enough -number of copies you must also follow the conditions in section 3. - -You may also lend copies, under the same conditions stated above, and -you may publicly display copies. - -@item -COPYING IN QUANTITY - -If you publish printed copies (or copies in media that commonly have -printed covers) of the Document, numbering more than 100, and the -Document's license notice requires Cover Texts, you must enclose the -copies in covers that carry, clearly and legibly, all these Cover -Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on -the back cover. Both covers must also clearly and legibly identify -you as the publisher of these copies. The front cover must present -the full title with all words of the title equally prominent and -visible. You may add other material on the covers in addition. -Copying with changes limited to the covers, as long as they preserve -the title of the Document and satisfy these conditions, can be treated -as verbatim copying in other respects. - -If the required texts for either cover are too voluminous to fit -legibly, you should put the first ones listed (as many as fit -reasonably) on the actual cover, and continue the rest onto adjacent -pages. - -If you publish or distribute Opaque copies of the Document numbering -more than 100, you must either include a machine-readable Transparent -copy along with each Opaque copy, or state in or with each Opaque copy -a computer-network location from which the general network-using -public has access to download using public-standard network protocols -a complete Transparent copy of the Document, free of added material. -If you use the latter option, you must take reasonably prudent steps, -when you begin distribution of Opaque copies in quantity, to ensure -that this Transparent copy will remain thus accessible at the stated -location until at least one year after the last time you distribute an -Opaque copy (directly or through your agents or retailers) of that -edition to the public. - -It is requested, but not required, that you contact the authors of the -Document well before redistributing any large number of copies, to give -them a chance to provide you with an updated version of the Document. - -@item -MODIFICATIONS - -You may copy and distribute a Modified Version of the Document under -the conditions of sections 2 and 3 above, provided that you release -the Modified Version under precisely this License, with the Modified -Version filling the role of the Document, thus licensing distribution -and modification of the Modified Version to whoever possesses a copy -of it. In addition, you must do these things in the Modified Version: - -@enumerate A -@item -Use in the Title Page (and on the covers, if any) a title distinct -from that of the Document, and from those of previous versions -(which should, if there were any, be listed in the History section -of the Document). You may use the same title as a previous version -if the original publisher of that version gives permission. - -@item -List on the Title Page, as authors, one or more persons or entities -responsible for authorship of the modifications in the Modified -Version, together with at least five of the principal authors of the -Document (all of its principal authors, if it has fewer than five), -unless they release you from this requirement. - -@item -State on the Title page the name of the publisher of the -Modified Version, as the publisher. - -@item -Preserve all the copyright notices of the Document. - -@item -Add an appropriate copyright notice for your modifications -adjacent to the other copyright notices. - -@item -Include, immediately after the copyright notices, a license notice -giving the public permission to use the Modified Version under the -terms of this License, in the form shown in the Addendum below. - -@item -Preserve in that license notice the full lists of Invariant Sections -and required Cover Texts given in the Document's license notice. - -@item -Include an unaltered copy of this License. - -@item -Preserve the section Entitled ``History'', Preserve its Title, and add -to it an item stating at least the title, year, new authors, and -publisher of the Modified Version as given on the Title Page. If -there is no section Entitled ``History'' in the Document, create one -stating the title, year, authors, and publisher of the Document as -given on its Title Page, then add an item describing the Modified -Version as stated in the previous sentence. - -@item -Preserve the network location, if any, given in the Document for -public access to a Transparent copy of the Document, and likewise -the network locations given in the Document for previous versions -it was based on. These may be placed in the ``History'' section. -You may omit a network location for a work that was published at -least four years before the Document itself, or if the original -publisher of the version it refers to gives permission. - -@item -For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve -the Title of the section, and preserve in the section all the -substance and tone of each of the contributor acknowledgements and/or -dedications given therein. - -@item -Preserve all the Invariant Sections of the Document, -unaltered in their text and in their titles. Section numbers -or the equivalent are not considered part of the section titles. - -@item -Delete any section Entitled ``Endorsements''. Such a section -may not be included in the Modified Version. - -@item -Do not retitle any existing section to be Entitled ``Endorsements'' or -to conflict in title with any Invariant Section. - -@item -Preserve any Warranty Disclaimers. -@end enumerate - -If the Modified Version includes new front-matter sections or -appendices that qualify as Secondary Sections and contain no material -copied from the Document, you may at your option designate some or all -of these sections as invariant. To do this, add their titles to the -list of Invariant Sections in the Modified Version's license notice. -These titles must be distinct from any other section titles. - -You may add a section Entitled ``Endorsements'', provided it contains -nothing but endorsements of your Modified Version by various -parties---for example, statements of peer review or that the text has -been approved by an organization as the authoritative definition of a -standard. - -You may add a passage of up to five words as a Front-Cover Text, and a -passage of up to 25 words as a Back-Cover Text, to the end of the list -of Cover Texts in the Modified Version. Only one passage of -Front-Cover Text and one of Back-Cover Text may be added by (or -through arrangements made by) any one entity. If the Document already -includes a cover text for the same cover, previously added by you or -by arrangement made by the same entity you are acting on behalf of, -you may not add another; but you may replace the old one, on explicit -permission from the previous publisher that added the old one. - -The author(s) and publisher(s) of the Document do not by this License -give permission to use their names for publicity for or to assert or -imply endorsement of any Modified Version. - -@item -COMBINING DOCUMENTS - -You may combine the Document with other documents released under this -License, under the terms defined in section 4 above for modified -versions, provided that you include in the combination all of the -Invariant Sections of all of the original documents, unmodified, and -list them all as Invariant Sections of your combined work in its -license notice, and that you preserve all their Warranty Disclaimers. - -The combined work need only contain one copy of this License, and -multiple identical Invariant Sections may be replaced with a single -copy. If there are multiple Invariant Sections with the same name but -different contents, make the title of each such section unique by -adding at the end of it, in parentheses, the name of the original -author or publisher of that section if known, or else a unique number. -Make the same adjustment to the section titles in the list of -Invariant Sections in the license notice of the combined work. - -In the combination, you must combine any sections Entitled ``History'' -in the various original documents, forming one section Entitled -``History''; likewise combine any sections Entitled ``Acknowledgements'', -and any sections Entitled ``Dedications''. You must delete all -sections Entitled ``Endorsements.'' - -@item -COLLECTIONS OF DOCUMENTS - -You may make a collection consisting of the Document and other documents -released under this License, and replace the individual copies of this -License in the various documents with a single copy that is included in -the collection, provided that you follow the rules of this License for -verbatim copying of each of the documents in all other respects. - -You may extract a single document from such a collection, and distribute -it individually under this License, provided you insert a copy of this -License into the extracted document, and follow this License in all -other respects regarding verbatim copying of that document. - -@item -AGGREGATION WITH INDEPENDENT WORKS - -A compilation of the Document or its derivatives with other separate -and independent documents or works, in or on a volume of a storage or -distribution medium, is called an ``aggregate'' if the copyright -resulting from the compilation is not used to limit the legal rights -of the compilation's users beyond what the individual works permit. -When the Document is included in an aggregate, this License does not -apply to the other works in the aggregate which are not themselves -derivative works of the Document. - -If the Cover Text requirement of section 3 is applicable to these -copies of the Document, then if the Document is less than one half of -the entire aggregate, the Document's Cover Texts may be placed on -covers that bracket the Document within the aggregate, or the -electronic equivalent of covers if the Document is in electronic form. -Otherwise they must appear on printed covers that bracket the whole -aggregate. - -@item -TRANSLATION - -Translation is considered a kind of modification, so you may -distribute translations of the Document under the terms of section 4. -Replacing Invariant Sections with translations requires special -permission from their copyright holders, but you may include -translations of some or all Invariant Sections in addition to the -original versions of these Invariant Sections. You may include a -translation of this License, and all the license notices in the -Document, and any Warranty Disclaimers, provided that you also include -the original English version of this License and the original versions -of those notices and disclaimers. In case of a disagreement between -the translation and the original version of this License or a notice -or disclaimer, the original version will prevail. - -If a section in the Document is Entitled ``Acknowledgements'', -``Dedications'', or ``History'', the requirement (section 4) to Preserve -its Title (section 1) will typically require changing the actual -title. - -@item -TERMINATION - -You may not copy, modify, sublicense, or distribute the Document -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense, or distribute it is void, and -will automatically terminate your rights under this License. - -However, if you cease all violation of this License, then your license -from a particular copyright holder is reinstated (a) provisionally, -unless and until the copyright holder explicitly and finally -terminates your license, and (b) permanently, if the copyright holder -fails to notify you of the violation by some reasonable means prior to -60 days after the cessation. - -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, receipt of a copy of some or all of the same material does -not give you any rights to use it. - -@item -FUTURE REVISIONS OF THIS LICENSE - -The Free Software Foundation may publish new, revised versions -of the GNU Free Documentation License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. See -@uref{http://www.gnu.org/copyleft/}. - -Each version of the License is given a distinguishing version number. -If the Document specifies that a particular numbered version of this -License ``or any later version'' applies to it, you have the option of -following the terms and conditions either of that specified version or -of any later version that has been published (not as a draft) by the -Free Software Foundation. If the Document does not specify a version -number of this License, you may choose any version ever published (not -as a draft) by the Free Software Foundation. If the Document -specifies that a proxy can decide which future versions of this -License can be used, that proxy's public statement of acceptance of a -version permanently authorizes you to choose that version for the -Document. - -@item -RELICENSING - -``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any -World Wide Web server that publishes copyrightable works and also -provides prominent facilities for anybody to edit those works. A -public wiki that anybody can edit is an example of such a server. A -``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the -site means any set of copyrightable works thus published on the MMC -site. - -``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0 -license published by Creative Commons Corporation, a not-for-profit -corporation with a principal place of business in San Francisco, -California, as well as future copyleft versions of that license -published by that same organization. - -``Incorporate'' means to publish or republish a Document, in whole or -in part, as part of another Document. - -An MMC is ``eligible for relicensing'' if it is licensed under this -License, and if all works that were first published under this License -somewhere other than this MMC, and subsequently incorporated in whole -or in part into the MMC, (1) had no cover texts or invariant sections, -and (2) were thus incorporated prior to November 1, 2008. - -The operator of an MMC Site may republish an MMC contained in the site -under CC-BY-SA on the same site at any time before August 1, 2009, -provided the MMC is eligible for relicensing. - -@end enumerate - -@page -@heading ADDENDUM: How to use this License for your documents - -To use this License in a document you have written, include a copy of -the License in the document and put the following copyright and -license notices just after the title page: - -@smallexample -@group - Copyright (C) @var{year} @var{your name}. - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.3 - or any later version published by the Free Software Foundation; - with no Invariant Sections, no Front-Cover Texts, and no Back-Cover - Texts. A copy of the license is included in the section entitled ``GNU - Free Documentation License''. -@end group -@end smallexample - -If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, -replace the ``with@dots{}Texts.'' line with this: - -@smallexample -@group - with the Invariant Sections being @var{list their titles}, with - the Front-Cover Texts being @var{list}, and with the Back-Cover Texts - being @var{list}. -@end group -@end smallexample - -If you have Invariant Sections without Cover Texts, or some other -combination of the three, merge those two alternatives to suit the -situation. - -If your document contains nontrivial examples of program code, we -recommend releasing these examples in parallel under your choice of -free software license, such as the GNU General Public License, -to permit their use in free software. - -@c Local Variables: -@c ispell-local-pdict: "ispell-dict" -@c End: - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/lgpl.texi b/src/hos_libhttpserver/src/libmicrohttpd/doc/lgpl.texi deleted file mode 100644 index ab03d6cc..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/lgpl.texi +++ /dev/null @@ -1,549 +0,0 @@ -@c The GNU Lesser General Public License. -@center Version 2.1, February 1999 - -@c This file is intended to be included within another document, -@c hence no sectioning command or @node. - -@display -Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts -as the successor of the GNU Library Public License, version 2, hence the -version number 2.1.] -@end display - -@subheading Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software---to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software---typically libraries---of the Free -Software Foundation and other authors who decide to use it. You can use -it too, but we suggest you first think carefully about whether this -license or the ordinary General Public License is the better strategy to -use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of it -in new free programs; and that you are informed that you can do these -things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the @dfn{Lesser} General Public License because it -does @emph{Less} to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -``work based on the library'' and a ``work that uses the library''. The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - -@subheading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -@enumerate 0 -@item -This License Agreement applies to any software library or other program -which contains a notice placed by the copyright holder or other -authorized party saying it may be distributed under the terms of this -Lesser General Public License (also called ``this License''). Each -licensee is addressed as ``you''. - - A ``library'' means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The ``Library'', below, refers to any such software library or work -which has been distributed under these terms. A ``work based on the -Library'' means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term ``modification''.) - - ``Source code'' for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - -@item -You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - -@item -You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - -@enumerate a -@item -The modified work must itself be a software library. - -@item -You must cause the files modified to carry prominent notices -stating that you changed the files and the date of any change. - -@item -You must cause the whole of the work to be licensed at no -charge to all third parties under the terms of this License. - -@item -If a facility in the modified Library refers to a function or a -table of data to be supplied by an application program that uses -the facility, other than as an argument passed when the facility -is invoked, then you must make a good faith effort to ensure that, -in the event an application does not supply such function or -table, the facility still operates, and performs whatever part of -its purpose remains meaningful. - -(For example, a function in a library to compute square roots has -a purpose that is entirely well-defined independent of the -application. Therefore, Subsection 2d requires that any -application-supplied function or table used by this function must -be optional: if the application does not supply it, the square -root function must still compute square roots.) -@end enumerate - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - -@item -You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - -@item -You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - -@item -A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a ``work that uses the Library''. Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a ``work that uses the Library'' with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a ``work that uses the -library''. The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a ``work that uses the Library'' uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - -@item -As an exception to the Sections above, you may also combine or -link a ``work that uses the Library'' with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - -@enumerate a -@item -Accompany the work with the complete corresponding -machine-readable source code for the Library including whatever -changes were used in the work (which must be distributed under -Sections 1 and 2 above); and, if the work is an executable linked -with the Library, with the complete machine-readable ``work that -uses the Library'', as object code and/or source code, so that the -user can modify the Library and then relink to produce a modified -executable containing the modified Library. (It is understood -that the user who changes the contents of definitions files in the -Library will not necessarily be able to recompile the application -to use the modified definitions.) - -@item -Use a suitable shared library mechanism for linking with the Library. A -suitable mechanism is one that (1) uses at run time a copy of the -library already present on the user's computer system, rather than -copying library functions into the executable, and (2) will operate -properly with a modified version of the library, if the user installs -one, as long as the modified version is interface-compatible with the -version that the work was made with. - -@item -Accompany the work with a written offer, valid for at -least three years, to give the same user the materials -specified in Subsection 6a, above, for a charge no more -than the cost of performing this distribution. - -@item -If distribution of the work is made by offering access to copy -from a designated place, offer equivalent access to copy the above -specified materials from the same place. - -@item -Verify that the user has already received a copy of these -materials or that you have already sent this user a copy. -@end enumerate - - For an executable, the required form of the ``work that uses the -Library'' must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies the -executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - -@item -You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - -@enumerate a -@item -Accompany the combined library with a copy of the same work -based on the Library, uncombined with any other library -facilities. This must be distributed under the terms of the -Sections above. - -@item -Give prominent notice with the combined library of the fact -that part of it is a work based on the Library, and explaining -where to find the accompanying uncombined form of the same work. -@end enumerate - -@item -You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - -@item -You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - -@item -Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - -@item -If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - -@item -If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - -@item -The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -``any later version'', you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - -@item -If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - -@center @b{NO WARRANTY} - -@item -BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY ``AS IS'' WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -@item -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. -@end enumerate - -@subheading END OF TERMS AND CONDITIONS - -@page -@subheading How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -``copyright'' line and a pointer to where the full notice is found. - -@smallexample -@var{one line to give the library's name and an idea of what it does.} -Copyright (C) @var{year} @var{name of author} - -This library is free software; you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or (at -your option) any later version. - -This library 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 -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -USA. -@end smallexample - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a ``copyright disclaimer'' for the library, if -necessary. Here is a sample; alter the names: - -@smallexample -Yoyodyne, Inc., hereby disclaims all copyright interest in the library -`Frob' (a library for tweaking knobs) written by James Random Hacker. - -@var{signature of Ty Coon}, 1 April 1990 -Ty Coon, President of Vice -@end smallexample - -That's all there is to it! diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd-tutorial.info b/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd-tutorial.info deleted file mode 100644 index 79632a40..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd-tutorial.info +++ /dev/null @@ -1,4231 +0,0 @@ -This is libmicrohttpd-tutorial.info, produced by makeinfo version 4.13 -from libmicrohttpd-tutorial.texi. - -INFO-DIR-SECTION Software libraries -START-INFO-DIR-ENTRY -* libmicrohttpdtutorial: (libmicrohttpd). A tutorial for GNU libmicrohttpd. -END-INFO-DIR-ENTRY - - This tutorial documents GNU libmicrohttpd version 0.9.23, last -updated 17 November 2013. - - Copyright (c) 2008 Sebastian Gerhardt. - - Copyright (c) 2010, 2011, 2012, 2013 Christian Grothoff. - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, and - no Back-Cover Texts. A copy of the license is included in the - section entitled "GNU Free Documentation License". - - -File: libmicrohttpd-tutorial.info, Node: Top, Next: Introduction, Up: (dir) - -A Tutorial for GNU libmicrohttpd -******************************** - -This tutorial documents GNU libmicrohttpd version 0.9.23, last updated -17 November 2013. - - Copyright (c) 2008 Sebastian Gerhardt. - - Copyright (c) 2010, 2011, 2012, 2013 Christian Grothoff. - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, and - no Back-Cover Texts. A copy of the license is included in the - section entitled "GNU Free Documentation License". - -* Menu: - -* Introduction:: -* Hello browser example:: -* Exploring requests:: -* Response headers:: -* Supporting basic authentication:: -* Processing POST data:: -* Improved processing of POST data:: -* Session management:: -* Adding a layer of security:: -* Bibliography:: -* License text:: -* Example programs:: - - -File: libmicrohttpd-tutorial.info, Node: Introduction, Next: Hello browser example, Prev: Top, Up: Top - -1 Introduction -************** - -This tutorial is for developers who want to learn how they can add HTTP -serving capabilities to their applications with the _GNU libmicrohttpd_ -library, abbreviated _MHD_. The reader will learn how to implement -basic HTTP functions from simple executable sample programs that -implement various features. - - The text is supposed to be a supplement to the API reference manual -of _GNU libmicrohttpd_ and for that reason does not explain many of the -parameters. Therefore, the reader should always consult the manual to -find the exact meaning of the functions used in the tutorial. -Furthermore, the reader is encouraged to study the relevant _RFCs_, -which document the HTTP standard. - - _GNU libmicrohttpd_ is assumed to be already installed. This -tutorial is written for version 0.9.23. At the time being, this -tutorial has only been tested on _GNU/Linux_ machines even though -efforts were made not to rely on anything that would prevent the -samples from being built on similar systems. - -1.1 History -=========== - -This tutorial was originally written by Sebastian Gerhardt for MHD -0.4.0. It was slighly polished and updated to MHD 0.9.0 by Christian -Grothoff. - - -File: libmicrohttpd-tutorial.info, Node: Hello browser example, Next: Exploring requests, Prev: Introduction, Up: Top - -2 Hello browser example -*********************** - -The most basic task for a HTTP server is to deliver a static text -message to any client connecting to it. Given that this is also easy -to implement, it is an excellent problem to start with. - - For now, the particular URI the client asks for shall have no effect -on the message that will be returned. In addition, the server shall end -the connection after the message has been sent so that the client will -know there is nothing more to expect. - - The C program `hellobrowser.c', which is to be found in the examples -section, does just that. If you are very eager, you can compile and -start it right away but it is advisable to type the lines in by -yourself as they will be discussed and explained in detail. - - After the necessary includes and the definition of the port which -our server should listen on -#include -#include -#include -#include - -#define PORT 8888 - -the desired behaviour of our server when HTTP request arrive has to be -implemented. We already have agreed that it should not care about the -particular details of the request, such as who is requesting what. The -server will respond merely with the same small HTML page to every -request. - - The function we are going to write now will be called by _GNU -libmicrohttpd_ every time an appropriate request comes in. While the -name of this callback function is arbitrary, its parameter list has to -follow a certain layout. So please, ignore the lot of parameters for -now, they will be explained at the point they are needed. We have to -use only one of them, `struct MHD_Connection *connection', for the -minimalistic functionality we want to archive at the moment. - - This parameter is set by the _libmicrohttpd_ daemon and holds the -necessary information to relate the call with a certain connection. -Keep in mind that a server might have to satisfy hundreds of concurrent -connections and we have to make sure that the correct data is sent to -the destined client. Therefore, this variable is a means to refer to a -particular connection if we ask the daemon to sent the reply. - - Talking about the reply, it is defined as a string right after the -function header -int answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, - const char *method, const char *version, - const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - const char *page = "Hello, browser!"; - -HTTP is a rather strict protocol and the client would certainly -consider it "inappropriate" if we just sent the answer string "as is". -Instead, it has to be wrapped with additional information stored in -so-called headers and footers. Most of the work in this area is done -by the library for us--we just have to ask. Our reply string packed in -the necessary layers will be called a "response". To obtain such a -response we hand our data (the reply-string) and its size over to the -`MHD_create_response_from_buffer' function. The last two parameters -basically tell _MHD_ that we do not want it to dispose the message data -for us when it has been sent and there also needs no internal copy to -be done because the _constant_ string won't change anyway. - - struct MHD_Response *response; - int ret; - - response = MHD_create_response_from_buffer (strlen (page), - (void*) page, MHD_RESPMEM_PERSISTENT); - -Now that the the response has been laced up, it is ready for delivery -and can be queued for sending. This is done by passing it to another -_GNU libmicrohttpd_ function. As all our work was done in the scope of -one function, the recipient is without doubt the one associated with the -local variable `connection' and consequently this variable is given to -the queue function. Every HTTP response is accompanied by a status -code, here "OK", so that the client knows this response is the intended -result of his request and not due to some error or malfunction. - - Finally, the packet is destroyed and the return value from the queue -returned, already being set at this point to either MHD_YES or MHD_NO -in case of success or failure. - - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - - return ret; -} - -With the primary task of our server implemented, we can start the -actual server daemon which will listen on `PORT' for connections. This -is done in the main function. -int main () -{ - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, MHD_OPTION_END); - if (NULL == daemon) return 1; - -The first parameter is one of three possible modes of operation. Here -we want the daemon to run in a separate thread and to manage all -incoming connections in the same thread. This means that while -producing the response for one connection, the other connections will -be put on hold. In this example, where the reply is already known and -therefore the request is served quickly, this poses no problem. - - We will allow all clients to connect regardless of their name or -location, therefore we do not check them on connection and set the -forth and fifth parameter to NULL. - - Parameter six is the address of the function we want to be called -whenever a new connection has been established. Our -`answer_to_connection' knows best what the client wants and needs no -additional information (which could be passed via the next parameter) -so the next parameter is NULL. Likewise, we do not need to pass extra -options to the daemon so we just write the MHD_OPTION_END as the last -parameter. - - As the server daemon runs in the background in its own thread, the -execution flow in our main function will contine right after the call. -Because of this, we must delay the execution flow in the main thread or -else the program will terminate prematurely. We let it pause in a -processing-time friendly manner by waiting for the enter key to be -pressed. In the end, we stop the daemon so it can do its cleanup tasks. - getchar (); - - MHD_stop_daemon (daemon); - return 0; -} - -The first example is now complete. - - Compile it with -cc hellobrowser.c -o hellobrowser -I$PATH_TO_LIBMHD_INCLUDES - -L$PATH_TO_LIBMHD_LIBS -lmicrohttpd - with the two paths set accordingly and run it. - - Now open your favorite Internet browser and go to the address -`http://localhost:8888/', provided that 8888 is the port you chose. If -everything works as expected, the browser will present the message of -the static HTML page it got from our minimal server. - -Remarks -======= - -To keep this first example as small as possible, some drastic shortcuts -were taken and are to be discussed now. - - Firstly, there is no distinction made between the kinds of requests -a client could send. We implied that the client sends a GET request, -that means, that he actually asked for some data. Even when it is not -intended to accept POST requests, a good server should at least -recognize that this request does not constitute a legal request and -answer with an error code. This can be easily implemented by checking -if the parameter `method' equals the string "GET" and returning a -`MHD_NO' if not so. - - Secondly, the above practice of queuing a response upon the first -call of the callback function brings with it some limitations. This is -because the content of the message body will not be received if a -response is queued in the first iteration. Furthermore, the connection -will be closed right after the response has been transferred then. -This is typically not what you want as it disables HTTP pipelining. -The correct approach is to simply not queue a message on the first -callback unless there is an error. The `void**' argument to the -callback provides a location for storing information about the history -of the connection; for the first call, the pointer will point to NULL. -A simplistic way to differenciate the first call from others is to check -if the pointer is NULL and set it to a non-NULL value during the first -call. - - Both of these issues you will find addressed in the official -`minimal_example.c' residing in the `src/examples' directory of the -_MHD_ package. The source code of this program should look very -familiar to you by now and easy to understand. - - For our example, the `must_copy' and `must_free' parameter at the -response construction function could be set to `MHD_NO'. In the usual -case, responses cannot be sent immediately after being queued. For -example, there might be other data on the system that needs to be sent -with a higher priority. Nevertheless, the queue function will return -successfully--raising the problem that the data we have pointed to may -be invalid by the time it is about being sent. This is not an issue -here because we can expect the `page' string, which is a constant -_string literal_ here, to be static. That means it will be present and -unchanged for as long as the program runs. For dynamic data, one could -choose to either have _MHD_ free the memory `page' points to itself -when it is not longer needed or, alternatively, have the library to -make and manage its own copy of it. - -Exercises -========= - - * While the server is running, use a program like `telnet' or - `netcat' to connect to it. Try to form a valid HTTP 1.1 request - yourself like GET /dontcare HTTP/1.1 - Host: itsme - - and see what the server returns to you. - - * Also, try other requests, like POST, and see how our server does - not mind and why. How far in malforming a request can you go - before the builtin functionality of _MHD_ intervenes and an - altered response is sent? Make sure you read about the status - codes in the _RFC_. - - * Add the option `MHD_USE_PEDANTIC_CHECKS' to the start function of - the daemon in `main'. Mind the special format of the parameter - list here which is described in the manual. How indulgent is the - server now to your input? - - * Let the main function take a string as the first command line - argument and pass `argv[1]' to the `MHD_start_daemon' function as - the sixth parameter. The address of this string will be passed to - the callback function via the `cls' variable. Decorate the text - given at the command line when the server is started with proper - HTML tags and send it as the response instead of the former static - string. - - * _Demanding:_ Write a separate function returning a string - containing some useful information, for example, the time. Pass - the function's address as the sixth parameter and evaluate this - function on every request anew in `answer_to_connection'. Remember - to free the memory of the string every time after satisfying the - request. - - - -File: libmicrohttpd-tutorial.info, Node: Exploring requests, Next: Response headers, Prev: Hello browser example, Up: Top - -3 Exploring requests -******************** - -This chapter will deal with the information which the client sends to -the server at every request. We are going to examine the most useful -fields of such an request and print them out in a readable manner. This -could be useful for logging facilities. - - The starting point is the _hellobrowser_ program with the former -response removed. - - This time, we just want to collect information in the callback -function, thus we will just return MHD_NO after we have probed the -request. This way, the connection is closed without much ado by the -server. - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, - const char *method, const char *version, - const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - ... - return MHD_NO; -} - The ellipsis marks the position where the following instructions shall -be inserted. - - We begin with the most obvious information available to the server, -the request line. You should already have noted that a request consists -of a command (or "HTTP method") and a URI (e.g. a filename). It also -contains a string for the version of the protocol which can be found in -`version'. To call it a "new request" is justified because we return -only `MHD_NO', thus ensuring the function will not be called again for -this connection. -printf ("New %s request for %s using version %s\n", method, url, version); - The rest of the information is a bit more hidden. Nevertheless, there -is lot of it sent from common Internet browsers. It is stored in -"key-value" pairs and we want to list what we find in the header. As -there is no mandatory set of keys a client has to send, each key-value -pair is printed out one by one until there are no more left. We do this -by writing a separate function which will be called for each pair just -like the above function is called for each HTTP request. It can then -print out the content of this pair. -int print_out_key (void *cls, enum MHD_ValueKind kind, - const char *key, const char *value) -{ - printf ("%s: %s\n", key, value); - return MHD_YES; -} - To start the iteration process that calls our new function for every -key, the line -MHD_get_connection_values (connection, MHD_HEADER_KIND, &print_out_key, NULL); - needs to be inserted in the connection callback function too. The -second parameter tells the function that we are only interested in keys -from the general HTTP header of the request. Our iterating function -`print_out_key' does not rely on any additional information to fulfill -its duties so the last parameter can be NULL. - - All in all, this constitutes the complete `logging.c' program for -this chapter which can be found in the `examples' section. - - Connecting with any modern Internet browser should yield a handful -of keys. You should try to interpret them with the aid of _RFC 2616_. -Especially worth mentioning is the "Host" key which is often used to -serve several different websites hosted under one single IP address but -reachable by different domain names (this is called virtual hosting). - -Conclusion -========== - -The introduced capabilities to itemize the content of a simple GET -request--especially the URI--should already allow the server to satisfy -clients' requests for small specific resources (e.g. files) or even -induce alteration of server state. However, the latter is not -recommended as the GET method (including its header data) is by -convention considered a "safe" operation, which should not change the -server's state in a significant way. By convention, GET operations can -thus be performed by crawlers and other automatic software. Naturally -actions like searching for a passed string are fine. - - Of course, no transmission can occur while the return value is still -set to `MHD_NO' in the callback function. - -Exercises -========= - - * By parsing the `url' string and delivering responses accordingly, - implement a small server for "virtual" files. When asked for - `/index.htm{l}', let the response consist of a HTML page - containing a link to `/another.html' page which is also to be - created "on the fly" in case of being requested. If neither of - these two pages are requested, `MHD_HTTP_NOT_FOUND' shall be - returned accompanied by an informative message. - - * A very interesting information has still been ignored by our - logger--the client's IP address. Implement a callback function static int on_client_connect (void *cls, - const struct sockaddr *addr, - socklen_t addrlen) - that prints out the IP address in an appropriate format. You - might want to use the POSIX function `inet_ntoa' but bear in mind - that `addr' is actually just a structure containing other - substructures and is _not_ the variable this function expects. - Make sure to return `MHD_YES' so that the library knows the client - is allowed to connect (and to then process the request). If one - wanted to limit access basing on IP addresses, this would be the - place to do it. The address of your `on_client_connect' function - must be passed as the third parameter to the `MHD_start_daemon' - call. - - - -File: libmicrohttpd-tutorial.info, Node: Response headers, Next: Supporting basic authentication, Prev: Exploring requests, Up: Top - -4 Response headers -****************** - -Now that we are able to inspect the incoming request in great detail, -this chapter discusses the means to enrich the outgoing responses -likewise. - - As you have learned in the _Hello, Browser_ chapter, some obligatory -header fields are added and set automatically for simple responses by -the library itself but if more advanced features are desired, -additional fields have to be created. One of the possible fields is -the content type field and an example will be developed around it. -This will lead to an application capable of correctly serving different -types of files. - - When we responded with HTML page packed in the static string -previously, the client had no choice but guessing about how to handle -the response, because the server had not told him. What if we had sent -a picture or a sound file? Would the message have been understood or -merely been displayed as an endless stream of random characters in the -browser? This is what the mime content types are for. The header of -the response is extended by certain information about how the data is -to be interpreted. - - To introduce the concept, a picture of the format _PNG_ will be sent -to the client and labeled accordingly with `image/png'. Once again, we -can base the new example on the `hellobrowser' program. - -#define FILENAME "picture.png" -#define MIMETYPE "image/png" - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, - const char *method, const char *version, - const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - unsigned char *buffer = NULL; - struct MHD_Response *response; - We want the program to open the file for reading and determine its -size: - int fd; - int ret; - struct stat sbuf; - - if (0 != strcmp (method, "GET")) - return MHD_NO; - if ( (-1 == (fd = open (FILENAME, O_RDONLY))) || - (0 != fstat (fd, &sbuf)) ) - { - /* error accessing file */ - /* ... (see below) */ - } - /* ... (see below) */ - When dealing with files, there is a lot that could go wrong on the -server side and if so, the client should be informed with -`MHD_HTTP_INTERNAL_SERVER_ERROR'. - - /* error accessing file */ - if (fd != -1) close (fd); - const char *errorstr = - "An internal server error has occured!\ - "; - response = - MHD_create_response_from_buffer (strlen (errorstr), - (void *) errorstr, - MHD_RESPMEM_PERSISTENT); - if (response) - { - ret = - MHD_queue_response (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - response); - MHD_destroy_response (response); - - return MHD_YES; - } - else - return MHD_NO; - if (!ret) - { - const char *errorstr = "An internal server error has occured!\ - "; - - if (buffer) free(buffer); - - response = MHD_create_response_from_buffer (strlen(errorstr), (void*) errorstr, - MHD_RESPMEM_PERSISTENT); - - if (response) - { - ret = MHD_queue_response (connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - response); - MHD_destroy_response (response); - - return MHD_YES; - } - else return MHD_NO; - } - Note that we nevertheless have to create a response object even for -sending a simple error code. Otherwise, the connection would just be -closed without comment, leaving the client curious about what has -happened. - - But in the case of success a response will be constructed directly -from the file descriptor: - - /* error accessing file */ - /* ... (see above) */ - } - - response = - MHD_create_response_from_fd_at_offset (sbuf.st_size, fd, 0); - MHD_add_response_header (response, "Content-Type", MIMETYPE); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - Note that the response object will take care of closing the file -desciptor for us. - - Up to this point, there was little new. The actual novelty is that -we enhance the header with the meta data about the content. Aware of -the field's name we want to add, it is as easy as that: -MHD_add_response_header(response, "Content-Type", MIMETYPE); - We do not have to append a colon expected by the protocol behind the -first field--_GNU libhttpdmicro_ will take care of this. - - The function finishes with the well-known lines - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - The complete program `responseheaders.c' is in the `examples' section -as usual. Find a _PNG_ file you like and save it to the directory the -example is run from under the name `picture.png'. You should find the -image displayed on your browser if everything worked well. - -Remarks -======= - -The include file of the _MHD_ library comes with the header types -mentioned in _RFC 2616_ already defined as macros. Thus, we could have -written `MHD_HTTP_HEADER_CONTENT_TYPE' instead of `"Content-Type"' as -well. However, one is not limited to these standard headers and could -add custom response headers without violating the protocol. Whether, -and how, the client would react to these custom header is up to the -receiver. Likewise, the client is allowed to send custom request -headers to the server as well, opening up yet more possibilities how -client and server could communicate with each other. - - The method of creating the response from a file on disk only works -for static content. Serving dynamically created responses will be a -topic of a future chapter. - -Exercises -========= - - * Remember that the original program was written under a few - assumptions--a static response using a local file being one of - them. In order to simulate a very large or hard to reach file that - cannot be provided instantly, postpone the queuing in the callback - with the `sleep' function for 30 seconds _if_ the file `/big.png' - is requested (but deliver the same as above). A request for - `/picture.png' should provide just the same but without any - artificial delays. - - Now start two instances of your browser (or even use two machines) - and see how the second client is put on hold while the first waits - for his request on the slow file to be fulfilled. - - Finally, change the sourcecode to use - `MHD_USE_THREAD_PER_CONNECTION' when the daemon is started and try - again. - - * Did you succeed in implementing the clock exercise yet? This time, - let the server save the program's start time `t' and implement a - response simulating a countdown that reaches 0 at `t+60'. - Returning a message saying on which point the countdown is, the - response should ultimately be to reply "Done" if the program has - been running long enough, - - An unofficial, but widely understood, response header line is - `Refresh: DELAY; url=URL' with the uppercase words substituted to - tell the client it should request the given resource after the - given delay again. Improve your program in that the browser (any - modern browser should work) automatically reconnects and asks for - the status again every 5 seconds or so. The URL would have to be - composed so that it begins with "http://", followed by the _URI_ - the server is reachable from the client's point of view. - - Maybe you want also to visualize the countdown as a status bar by - creating a `
' consisting of one row and `n' columns whose - fields contain small images of either a red or a green light. - - - -File: libmicrohttpd-tutorial.info, Node: Supporting basic authentication, Next: Processing POST data, Prev: Response headers, Up: Top - -5 Supporting basic authentication -********************************* - -With the small exception of IP address based access control, requests -from all connecting clients where served equally until now. This -chapter discusses a first method of client's authentication and its -limits. - - A very simple approach feasible with the means already discussed -would be to expect the password in the _URI_ string before granting -access to the secured areas. The password could be separated from the -actual resource identifier by a certain character, thus the request -line might look like -GET /picture.png?mypassword - In the rare situation where the client is customized enough and the -connection occurs through secured lines (e.g., a embedded device -directly attached to another via wire) and where the ability to embedd -a password in the URI or to pass on a URI with a password are desired, -this can be a reasonable choice. - - But when it is assumed that the user connecting does so with an -ordinary Internet browser, this implementation brings some problems -about. For example, the URI including the password stays in the address -field or at least in the history of the browser for anybody near enough -to see. It will also be inconvenient to add the password manually to -any new URI when the browser does not know how to compose this -automatically. - - At least the convenience issue can be addressed by employing the -simplest built-in password facilities of HTTP compliant browsers, hence -we want to start there. It will however turn out to have still severe -weaknesses in terms of security which need consideration. - - Before we will start implementing _Basic Authentication_ as -described in _RFC 2617_, we should finally abandon the bad practice of -responding every request the first time our callback is called for a -given connection. This is becoming more important now because the -client and the server will have to talk in a more bi-directional way -than before to - - But how can we tell whether the callback has been called before for -the particular connection? Initially, the pointer this parameter -references is set by _MHD_ in the callback. But it will also be -"remembered" on the next call (for the same connection). Thus, we will -generate no response until the parameter is non-null--implying the -callback was called before at least once. We do not need to share -information between different calls of the callback, so we can set the -parameter to any adress that is assured to be not null. The pointer to -the `connection' structure will be pointing to a legal address, so we -take this. - - The first time `answer_to_connection' is called, we will not even -look at the headers. - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, const char *version, - const char *upload_data, size_t *upload_data_size, - void **con_cls) -{ - if (0 != strcmp(method, "GET")) return MHD_NO; - if (NULL == *con_cls) {*con_cls = connection; return MHD_YES;} - - ... - /* else respond accordingly */ - ... -} - Note how we lop off the connection on the first condition (no "GET" -request), but return asking for more on the other one with `MHD_YES'. -With this minor change, we can proceed to implement the actual -authentication process. - -Request for authentication -========================== - -Let us assume we had only files not intended to be handed out without -the correct username/password, so every "GET" request will be -challenged. _RFC 2617_ describes how the server shall ask for -authentication by adding a _WWW-Authenticate_ response header with the -name of the _realm_ protected. MHD can generate and queue such a -failure response for you using the `MHD_queue_basic_auth_fail_response' -API. The only thing you need to do is construct a response with the -error page to be shown to the user if he aborts basic authentication. -But first, you should check if the proper credentials were already -supplied using the `MHD_basic_auth_get_username_password' call. - - Your code would then look like this: -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - char *user; - char *pass; - int fail; - struct MHD_Response *response; - - if (0 != strcmp (method, MHD_HTTP_METHOD_GET)) - return MHD_NO; - if (NULL == *con_cls) - { - *con_cls = connection; - return MHD_YES; - } - pass = NULL; - user = MHD_basic_auth_get_username_password (connection, &pass); - fail = ( (user == NULL) || - (0 != strcmp (user, "root")) || - (0 != strcmp (pass, "pa$$w0rd") ) ); - if (user != NULL) free (user); - if (pass != NULL) free (pass); - if (fail) - { - const char *page = "Go away."; - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_basic_auth_fail_response (connection, - "my realm", - response); - } - else - { - const char *page = "A secret."; - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - } - MHD_destroy_response (response); - return ret; -} - - See the `examples' directory for the complete example file. - -Remarks -======= - -For a proper server, the conditional statements leading to a return of -`MHD_NO' should yield a response with a more precise status code -instead of silently closing the connection. For example, failures of -memory allocation are best reported as _internal server error_ and -unexpected authentication methods as _400 bad request_. - -Exercises -========= - - * Make the server respond to wrong credentials (but otherwise - well-formed requests) with the recommended _401 unauthorized_ - status code. If the client still does not authenticate correctly - within the same connection, close it and store the client's IP - address for a certain time. (It is OK to check for expiration not - until the main thread wakes up again on the next connection.) If - the client fails authenticating three times during this period, - add it to another list for which the `AcceptPolicyCallback' - function denies connection (temporally). - - * With the network utility `netcat' connect and log the response of - a "GET" request as you did in the exercise of the first example, - this time to a file. Now stop the server and let _netcat_ listen - on the same port the server used to listen on and have it fake - being the proper server by giving the file's content as the - response (e.g. `cat log | nc -l -p 8888'). Pretending to think - your were connecting to the actual server, browse to the - eavesdropper and give the correct credentials. - - Copy and paste the encoded string you see in `netcat''s output to - some of the Base64 decode tools available online and see how both - the user's name and password could be completely restored. - - - -File: libmicrohttpd-tutorial.info, Node: Processing POST data, Next: Improved processing of POST data, Prev: Supporting basic authentication, Up: Top - -6 Processing POST data -********************** - -The previous chapters already have demonstrated a variety of -possibilities to send information to the HTTP server, but it is not -recommended that the _GET_ method is used to alter the way the server -operates. To induce changes on the server, the _POST_ method is -preferred over and is much more powerful than _GET_ and will be -introduced in this chapter. - - We are going to write an application that asks for the visitor's -name and, after the user has posted it, composes an individual response -text. Even though it was not mandatory to use the _POST_ method here, -as there is no permanent change caused by the POST, it is an -illustrative example on how to share data between different functions -for the same connection. Furthermore, the reader should be able to -extend it easily. - -GET request -=========== - -When the first _GET_ request arrives, the server shall respond with a -HTML page containing an edit field for the name. - -const char* askpage = "\ - What's your name, Sir?
\ - \ - \ - "; - The `action' entry is the _URI_ to be called by the browser when -posting, and the `name' will be used later to be sure it is the -editbox's content that has been posted. - - We also prepare the answer page, where the name is to be filled in -later, and an error page as the response for anything but proper _GET_ -and _POST_ requests: - -const char* greatingpage="

Welcome, %s!

"; - -const char* errorpage="This doesn't seem to be right."; - Whenever we need to send a page, we use an extra function `int -send_page(struct MHD_Connection *connection, const char* page)' for -this, which does not contain anything new and whose implementation is -therefore not discussed further in the tutorial. - -POST request -============ - -Posted data can be of arbitrary and considerable size; for example, if -a user uploads a big image to the server. Similar to the case of the -header fields, there may also be different streams of posted data, such -as one containing the text of an editbox and another the state of a -button. Likewise, we will have to register an iterator function that -is going to be called maybe several times not only if there are -different POSTs but also if one POST has only been received partly yet -and needs processing before another chunk can be received. - - Such an iterator function is called by a _postprocessor_, which must -be created upon arriving of the post request. We want the iterator -function to read the first post data which is tagged `name' and to -create an individual greeting string based on the template and the name. -But in order to pass this string to other functions and still be able -to differentiate different connections, we must first define a -structure to share the information, holding the most import entries. - -struct connection_info_struct -{ - int connectiontype; - char *answerstring; - struct MHD_PostProcessor *postprocessor; -}; - With these information available to the iterator function, it is able -to fulfill its task. Once it has composed the greeting string, it -returns `MHD_NO' to inform the post processor that it does not need to -be called again. Note that this function does not handle processing of -data for the same `key'. If we were to expect that the name will be -posted in several chunks, we had to expand the namestring dynamically -as additional parts of it with the same `key' came in. But in this -example, the name is assumed to fit entirely inside one single packet. - -static int -iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, - const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, - uint64_t off, size_t size) -{ - struct connection_info_struct *con_info = coninfo_cls; - - if (0 == strcmp (key, "name")) - { - if ((size > 0) && (size <= MAXNAMESIZE)) - { - char *answerstring; - answerstring = malloc (MAXANSWERSIZE); - if (!answerstring) return MHD_NO; - - snprintf (answerstring, MAXANSWERSIZE, greatingpage, data); - con_info->answerstring = answerstring; - } - else con_info->answerstring = NULL; - - return MHD_NO; - } - - return MHD_YES; -} - Once a connection has been established, it can be terminated for many -reasons. As these reasons include unexpected events, we have to -register another function that cleans up any resources that might have -been allocated for that connection by us, namely the post processor and -the greetings string. This cleanup function must take into account that -it will also be called for finished requests other than _POST_ requests. - -void request_completed (void *cls, struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct connection_info_struct *con_info = *con_cls; - - if (NULL == con_info) return; - if (con_info->connectiontype == POST) - { - MHD_destroy_post_processor (con_info->postprocessor); - if (con_info->answerstring) free (con_info->answerstring); - } - - free (con_info); - *con_cls = NULL; -} - _GNU libmicrohttpd_ is informed that it shall call the above function -when the daemon is started in the main function. - -... -daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &request_completed, NULL, - MHD_OPTION_END); -... - -Request handling -================ - -With all other functions prepared, we can now discuss the actual -request handling. - - On the first iteration for a new request, we start by allocating a -new instance of a `struct connection_info_struct' structure, which will -store all necessary information for later iterations and other -functions. - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, - const char *method, const char *version, - const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - if(NULL == *con_cls) - { - struct connection_info_struct *con_info; - - con_info = malloc (sizeof (struct connection_info_struct)); - if (NULL == con_info) return MHD_NO; - con_info->answerstring = NULL; - If the new request is a _POST_, the postprocessor must be created now. -In addition, the type of the request is stored for convenience. - if (0 == strcmp (method, "POST")) - { - con_info->postprocessor - = MHD_create_post_processor (connection, POSTBUFFERSIZE, - iterate_post, (void*) con_info); - - if (NULL == con_info->postprocessor) - { - free (con_info); - return MHD_NO; - } - con_info->connectiontype = POST; - } - else con_info->connectiontype = GET; - The address of our structure will both serve as the indicator for -successive iterations and to remember the particular details about the -connection. - *con_cls = (void*) con_info; - return MHD_YES; - } - The rest of the function will not be executed on the first iteration. -A _GET_ request is easily satisfied by sending the question form. - if (0 == strcmp (method, "GET")) - { - return send_page (connection, askpage); - } - In case of _POST_, we invoke the post processor for as long as data -keeps incoming, setting `*upload_data_size' to zero in order to -indicate that we have processed--or at least have considered--all of it. - if (0 == strcmp (method, "POST")) - { - struct connection_info_struct *con_info = *con_cls; - - if (*upload_data_size != 0) - { - MHD_post_process (con_info->postprocessor, upload_data, - *upload_data_size); - *upload_data_size = 0; - - return MHD_YES; - } - else if (NULL != con_info->answerstring) - return send_page (connection, con_info->answerstring); - } - Finally, if they are neither _GET_ nor _POST_ requests, the error page -is returned. - return send_page(connection, errorpage); -} - These were the important parts of the program `simplepost.c'. - - -File: libmicrohttpd-tutorial.info, Node: Improved processing of POST data, Next: Session management, Prev: Processing POST data, Up: Top - -7 Improved processing of POST data -********************************** - -The previous chapter introduced a way to upload data to the server, but -the developed example program has some shortcomings, such as not being -able to handle larger chunks of data. In this chapter, we are going to -discuss a more advanced server program that allows clients to upload a -file in order to have it stored on the server's filesystem. The server -shall also watch and limit the number of clients concurrently -uploading, responding with a proper busy message if necessary. - -Prepared answers -================ - -We choose to operate the server with the `SELECT_INTERNALLY' method. -This makes it easier to synchronize the global states at the cost of -possible delays for other connections if the processing of a request is -too slow. One of these variables that needs to be shared for all -connections is the total number of clients that are uploading. - -#define MAXCLIENTS 2 -static unsigned int nr_of_uploading_clients = 0; - If there are too many clients uploading, we want the server to respond -to all requests with a busy message. -const char* busypage = - "This server is busy, please try again later."; - Otherwise, the server will send a _form_ that informs the user of the -current number of uploading clients, and ask her to pick a file on her -local filesystem which is to be uploaded. -const char* askpage = "\n\ - Upload a file, please!
\n\ - There are %u clients uploading at the moment.
\n\ - \n\ - \n\ - \n\ - "; - If the upload has succeeded, the server will respond with a message -saying so. -const char* completepage = "The upload has been completed."; - We want the server to report internal errors, such as memory shortage -or file access problems, adequately. -const char* servererrorpage - = "An internal server error has occured."; -const char* fileexistspage - = "This file already exists."; - It would be tolerable to send all these responses undifferentiated -with a `200 HTTP_OK' status code but in order to improve the `HTTP' -conformance of our server a bit, we extend the `send_page' function so -that it accepts individual status codes. - -static int -send_page (struct MHD_Connection *connection, - const char* page, int status_code) -{ - int ret; - struct MHD_Response *response; - - response = MHD_create_response_from_buffer (strlen (page), (void*) page, - MHD_RESPMEM_MUST_COPY); - if (!response) return MHD_NO; - - ret = MHD_queue_response (connection, status_code, response); - MHD_destroy_response (response); - - return ret; -} - Note how we ask _MHD_ to make its own copy of the message data. The -reason behind this will become clear later. - -Connection cycle -================ - -The decision whether the server is busy or not is made right at the -beginning of the connection. To do that at this stage is especially -important for _POST_ requests because if no response is queued at this -point, and `MHD_YES' returned, _MHD_ will not sent any queued messages -until a postprocessor has been created and the post iterator is called -at least once. - -static int -answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, - const char *method, const char *version, - const char *upload_data, - size_t *upload_data_size, void **con_cls) -{ - if (NULL == *con_cls) - { - struct connection_info_struct *con_info; - - if (nr_of_uploading_clients >= MAXCLIENTS) - return send_page(connection, busypage, MHD_HTTP_SERVICE_UNAVAILABLE); - If the server is not busy, the `connection_info' structure is -initialized as usual, with the addition of a filepointer for each -connection. - - con_info = malloc (sizeof (struct connection_info_struct)); - if (NULL == con_info) return MHD_NO; - con_info->fp = 0; - - if (0 == strcmp (method, "POST")) - { - ... - } - else con_info->connectiontype = GET; - - *con_cls = (void*) con_info; - - return MHD_YES; - } - For _POST_ requests, the postprocessor is created and we register a -new uploading client. From this point on, there are many possible -places for errors to occur that make it necessary to interrupt the -uploading process. We need a means of having the proper response -message ready at all times. Therefore, the `connection_info' structure -is extended to hold the most current response message so that whenever -a response is sent, the client will get the most informative message. -Here, the structure is initialized to "no error". - if (0 == strcmp (method, "POST")) - { - con_info->postprocessor - = MHD_create_post_processor (connection, POSTBUFFERSIZE, - iterate_post, (void*) con_info); - - if (NULL == con_info->postprocessor) - { - free (con_info); - return MHD_NO; - } - - nr_of_uploading_clients++; - - con_info->connectiontype = POST; - con_info->answercode = MHD_HTTP_OK; - con_info->answerstring = completepage; - } - else con_info->connectiontype = GET; - If the connection handler is called for the second time, _GET_ -requests will be answered with the _form_. We can keep the buffer under -function scope, because we asked _MHD_ to make its own copy of it for -as long as it is needed. - if (0 == strcmp (method, "GET")) - { - int ret; - char buffer[1024]; - - sprintf (buffer, askpage, nr_of_uploading_clients); - return send_page (connection, buffer, MHD_HTTP_OK); - } - The rest of the `answer_to_connection' function is very similar to the -`simplepost.c' example, except the more flexible content of the -responses. The _POST_ data is processed until there is none left and -the execution falls through to return an error page if the connection -constituted no expected request method. - if (0 == strcmp (method, "POST")) - { - struct connection_info_struct *con_info = *con_cls; - - if (0 != *upload_data_size) - { - MHD_post_process (con_info->postprocessor, - upload_data, *upload_data_size); - *upload_data_size = 0; - - return MHD_YES; - } - else - return send_page (connection, con_info->answerstring, - con_info->answercode); - } - - return send_page(connection, errorpage, MHD_HTTP_BAD_REQUEST); -} - -Storing to data -=============== - -Unlike the `simplepost.c' example, here it is to be expected that post -iterator will be called several times now. This means that for any -given connection (there might be several concurrent of them) the posted -data has to be written to the correct file. That is why we store a file -handle in every `connection_info', so that the it is preserved between -successive iterations. -static int -iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, - const char *key, - const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, - uint64_t off, size_t size) -{ - struct connection_info_struct *con_info = coninfo_cls; - Because the following actions depend heavily on correct file -processing, which might be error prone, we default to reporting -internal errors in case anything will go wrong. - -con_info->answerstring = servererrorpage; -con_info->answercode = MHD_HTTP_INTERNAL_SERVER_ERROR; - In the "askpage" _form_, we told the client to label its post data -with the "file" key. Anything else would be an error. - - if (0 != strcmp (key, "file")) return MHD_NO; - If the iterator is called for the first time, no file will have been -opened yet. The `filename' string contains the name of the file -(without any paths) the user selected on his system. We want to take -this as the name the file will be stored on the server and make sure no -file of that name exists (or is being uploaded) before we create one -(note that the code below technically contains a race between the two -"fopen" calls, but we will overlook this for portability sake). - if (!con_info->fp) - { - if (NULL != (fp = fopen (filename, "rb")) ) - { - fclose (fp); - con_info->answerstring = fileexistspage; - con_info->answercode = MHD_HTTP_FORBIDDEN; - return MHD_NO; - } - - con_info->fp = fopen (filename, "ab"); - if (!con_info->fp) return MHD_NO; - } - Occasionally, the iterator function will be called even when there are -0 new bytes to process. The server only needs to write data to the file -if there is some. -if (size > 0) - { - if (!fwrite (data, size, sizeof(char), con_info->fp)) - return MHD_NO; - } - If this point has been reached, everything worked well for this -iteration and the response can be set to success again. If the upload -has finished, this iterator function will not be called again. - con_info->answerstring = completepage; - con_info->answercode = MHD_HTTP_OK; - - return MHD_YES; -} - The new client was registered when the postprocessor was created. -Likewise, we unregister the client on destroying the postprocessor when -the request is completed. -void request_completed (void *cls, struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct connection_info_struct *con_info = *con_cls; - - if (NULL == con_info) return; - - if (con_info->connectiontype == POST) - { - if (NULL != con_info->postprocessor) - { - MHD_destroy_post_processor (con_info->postprocessor); - nr_of_uploading_clients--; - } - - if (con_info->fp) fclose (con_info->fp); - } - - free (con_info); - *con_cls = NULL; -} - This is essentially the whole example `largepost.c'. - -Remarks -======= - -Now that the clients are able to create files on the server, security -aspects are becoming even more important than before. Aside from proper -client authentication, the server should always make sure explicitly -that no files will be created outside of a dedicated upload directory. -In particular, filenames must be checked to not contain strings like -"../". - - -File: libmicrohttpd-tutorial.info, Node: Session management, Next: Adding a layer of security, Prev: Improved processing of POST data, Up: Top - -8 Session management -******************** - -This chapter discusses how one should manage sessions, that is, share -state between multiple HTTP requests from the same user. We use a -simple example where the user submits multiple forms and the server is -supposed to accumulate state from all of these forms. Naturally, as -this is a network protocol, our session mechanism must support having -many users with many concurrent sessions at the same time. - - In order to track users, we use a simple session cookie. A session -cookie expires when the user closes the browser. Changing from session -cookies to persistent cookies only requires adding an expiration time -to the cookie. The server creates a fresh session cookie whenever a -request without a cookie is received, or if the supplied session cookie -is not known to the server. - -Looking up the cookie -===================== - -Since MHD parses the HTTP cookie header for us, looking up an existing -cookie is straightforward: - -FIXME. - - Here, FIXME is the name we chose for our session cookie. - -Setting the cookie header -========================= - -MHD requires the user to provide the full cookie format string in order -to set cookies. In order to generate a unique cookie, our example -creates a random 64-character text string to be used as the value of -the cookie: - -FIXME. - - Given this cookie value, we can then set the cookie header in our -HTTP response as follows: - -FIXME. - -Remark: Session expiration -========================== - -It is of course possible that clients stop their interaction with the -server at any time. In order to avoid using too much storage, the -server must thus discard inactive sessions at some point. Our example -implements this by discarding inactive sessions after a certain amount -of time. Alternatively, the implementation may limit the total number -of active sessions. Which bounds are used for idle sessions or the -total number of sessions obviously depends largely on the type of the -application and available server resources. - -Example code -============ - -A sample application implementing a website with multiple forms (which -are dynamically created using values from previous POST requests from -the same session) is available as the example `sessions.c'. - - Note that the example uses a simple, $O(n)$ linked list traversal to -look up sessions and to expire old sessions. Using a hash table and a -heap would be more appropriate if a large number of concurrent sessions -is expected. - -Remarks -======= - -Naturally, it is quite conceivable to store session data in a database -instead of in memory. Still, having mechanisms to expire data -associated with long-time idle sessions (where the business process has -still not finished) is likely a good idea. - - -File: libmicrohttpd-tutorial.info, Node: Adding a layer of security, Next: Bibliography, Prev: Session management, Up: Top - -9 Adding a layer of security -**************************** - -We left the basic authentication chapter with the unsatisfactory -conclusion that any traffic, including the credentials, could be -intercepted by anyone between the browser client and the server. -Protecting the data while it is sent over unsecured lines will be the -goal of this chapter. - - Since version 0.4, the _MHD_ library includes support for encrypting -the traffic by employing SSL/TSL. If _GNU libmicrohttpd_ has been -configured to support these, encryption and decryption can be applied -transparently on the data being sent, with only minimal changes to the -actual source code of the example. - -Preparation -=========== - -First, a private key for the server will be generated. With this key, -the server will later be able to authenticate itself to the -client--preventing anyone else from stealing the password by faking its -identity. The _OpenSSL_ suite, which is available on many operating -systems, can generate such a key. For the scope of this tutorial, we -will be content with a 1024 bit key: -> openssl genrsa -out server.key 1024 - In addition to the key, a certificate describing the server in human -readable tokens is also needed. This certificate will be attested with -our aforementioned key. In this way, we obtain a self-signed -certificate, valid for one year. - -> openssl req -days 365 -out server.pem -new -x509 -key server.key - To avoid unnecessary error messages in the browser, the certificate -needs to have a name that matches the _URI_, for example, "localhost" -or the domain. If you plan to have a publicly reachable server, you -will need to ask a trusted third party, called _Certificate Authority_, -or _CA_, to attest the certificate for you. This way, any visitor can -make sure the server's identity is real. - - Whether the server's certificate is signed by us or a third party, -once it has been accepted by the client, both sides will be -communicating over encrypted channels. From this point on, it is the -client's turn to authenticate itself. But this has already been -implemented in the basic authentication scheme. - -Changing the source code -======================== - -We merely have to extend the server program so that it loads the two -files into memory, - -int -main () -{ - struct MHD_Daemon *daemon; - char *key_pem; - char *cert_pem; - - key_pem = load_file (SERVERKEYFILE); - cert_pem = load_file (SERVERCERTFILE); - - if ((key_pem == NULL) || (cert_pem == NULL)) - { - printf ("The key/certificate files could not be read.\n"); - return 1; - } - and then we point the _MHD_ daemon to it upon initalization. - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, - PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_HTTPS_MEM_KEY, key_pem, - MHD_OPTION_HTTPS_MEM_CERT, cert_pem, - MHD_OPTION_END); - - if (NULL == daemon) - { - printf ("%s\n", cert_pem); - - free (key_pem); - free (cert_pem); - - return 1; - } - The rest consists of little new besides some additional memory -cleanups. - - getchar (); - - MHD_stop_daemon (daemon); - free (key_pem); - free (cert_pem); - - return 0; -} - The rather unexciting file loader can be found in the complete example -`tlsauthentication.c'. - -Remarks -======= - - * While the standard _HTTP_ port is 80, it is 443 for _HTTPS_. The - common internet browsers assume standard _HTTP_ if they are asked - to access other ports than these. Therefore, you will have to type - `https://localhost:8888' explicitly when you test the example, or - the browser will not know how to handle the answer properly. - - * The remaining weak point is the question how the server will be - trusted initially. Either a _CA_ signs the certificate or the - client obtains the key over secure means. Anyway, the clients have - to be aware (or configured) that they should not accept - certificates of unknown origin. - - * The introduced method of certificates makes it mandatory to set an - expiration date--making it less feasible to hardcode certificates - in embedded devices. - - * The cryptographic facilities consume memory space and computing - time. For this reason, websites usually consists both of - uncritically _HTTP_ parts and secured _HTTPS_. - - -Client authentication -===================== - -You can also use MHD to authenticate the client via SSL/TLS certificates -(as an alternative to using the password-based Basic or Digest -authentication). To do this, you will need to link your application -against _gnutls_. Next, when you start the MHD daemon, you must -specify the root CA that you're willing to trust: - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, - PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_HTTPS_MEM_KEY, key_pem, - MHD_OPTION_HTTPS_MEM_CERT, cert_pem, - MHD_OPTION_HTTPS_MEM_TRUST, root_ca_pem, - MHD_OPTION_END); - - With this, you can then obtain client certificates for each session. -In order to obtain the identity of the client, you first need to obtain -the raw GnuTLS session handle from _MHD_ using -`MHD_get_connection_info'. - -#include -#include - -gnutls_session_t tls_session; -union MHD_ConnectionInfo *ci; - -ci = MHD_get_connection_info (connection, - MHD_CONNECTION_INFO_GNUTLS_SESSION); -tls_session = ci->tls_session; - - You can then extract the client certificate: - -/** - * Get the client's certificate - * - * @param tls_session the TLS session - * @return NULL if no valid client certificate could be found, a pointer - * to the certificate if found - */ -static gnutls_x509_crt_t -get_client_certificate (gnutls_session_t tls_session) -{ - unsigned int listsize; - const gnutls_datum_t * pcert; - gnutls_certificate_status_t client_cert_status; - gnutls_x509_crt_t client_cert; - - if (tls_session == NULL) - return NULL; - if (gnutls_certificate_verify_peers2(tls_session, - &client_cert_status)) - return NULL; - pcert = gnutls_certificate_get_peers(tls_session, - &listsize); - if ( (pcert == NULL) || - (listsize == 0)) - { - fprintf (stderr, - "Failed to retrieve client certificate chain\n"); - return NULL; - } - if (gnutls_x509_crt_init(&client_cert)) - { - fprintf (stderr, - "Failed to initialize client certificate\n"); - return NULL; - } - /* Note that by passing values between 0 and listsize here, you - can get access to the CA's certs */ - if (gnutls_x509_crt_import(client_cert, - &pcert[0], - GNUTLS_X509_FMT_DER)) - { - fprintf (stderr, - "Failed to import client certificate\n"); - gnutls_x509_crt_deinit(client_cert); - return NULL; - } - return client_cert; -} - - Using the client certificate, you can then get the client's -distinguished name and alternative names: - -/** - * Get the distinguished name from the client's certificate - * - * @param client_cert the client certificate - * @return NULL if no dn or certificate could be found, a pointer - * to the dn if found - */ -char * -cert_auth_get_dn(gnutls_x509_crt_c client_cert) -{ - char* buf; - size_t lbuf; - - lbuf = 0; - gnutls_x509_crt_get_dn(client_cert, NULL, &lbuf); - buf = malloc(lbuf); - if (buf == NULL) - { - fprintf (stderr, - "Failed to allocate memory for certificate dn\n"); - return NULL; - } - gnutls_x509_crt_get_dn(client_cert, buf, &lbuf); - return buf; -} - - -/** - * Get the alternative name of specified type from the client's certificate - * - * @param client_cert the client certificate - * @param nametype The requested name type - * @param index The position of the alternative name if multiple names are - * matching the requested type, 0 for the first matching name - * @return NULL if no matching alternative name could be found, a pointer - * to the alternative name if found - */ -char * -MHD_cert_auth_get_alt_name(gnutls_x509_crt_t client_cert, - int nametype, - unsigned int index) -{ - char* buf; - size_t lbuf; - unsigned int seq; - unsigned int subseq; - unsigned int type; - int result; - - subseq = 0; - for (seq=0;;seq++) - { - lbuf = 0; - result = gnutls_x509_crt_get_subject_alt_name2(client_cert, seq, NULL, &lbuf, - &type, NULL); - if (result == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) - return NULL; - if (nametype != (int) type) - continue; - if (subseq == index) - break; - subseq++; - } - buf = malloc(lbuf); - if (buf == NULL) - { - fprintf (stderr, - "Failed to allocate memory for certificate alt name\n"); - return NULL; - } - result = gnutls_x509_crt_get_subject_alt_name2(client_cert, - seq, - buf, - &lbuf, - NULL, NULL); - if (result != nametype) - { - fprintf (stderr, - "Unexpected return value from gnutls: %d\n", - result); - free (buf); - return NULL; - } - return buf; -} - - Finally, you should release the memory associated with the client -certificate: - -gnutls_x509_crt_deinit (client_cert); - -Using TLS Server Name Indication (SNI) -====================================== - -SNI enables hosting multiple domains under one IP address with TLS. So -SNI is the TLS-equivalent of virtual hosting. To use SNI with MHD, you -need at least GnuTLS 3.0. The main change compared to the simple -hosting of one domain is that you need to provide a callback instead of -the key and certificate. For example, when you start the MHD daemon, -you could do this: - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, - PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_HTTPS_CERT_CALLBACK, &sni_callback, - MHD_OPTION_END); - Here, `sni_callback' is the name of a function that you will have to -implement to retrieve the X.509 certificate for an incoming connection. -The callback has type `gnutls_certificate_retrieve_function2' and is -documented in the GnuTLS API for the -`gnutls_certificate_set_retrieve_function2' as follows: - - -- Function Pointer: int *gnutls_certificate_retrieve_function2 - (gnutls_session_t, const gnutls_datum_t* req_ca_dn, int - nreqs, const gnutls_pk_algorithm_t* pk_algos, int - pk_algos_length, gnutls_pcert_st** pcert, unsigned int - *pcert_length, gnutls_privkey_t * pkey) - REQ_CA_CERT - is only used in X.509 certificates. Contains a list with the - CA names that the server considers trusted. Normally we - should send a certificate that is signed by one of these CAs. - These names are DER encoded. To get a more meaningful value - use the function `gnutls_x509_rdn_get()'. - - PK_ALGOS - contains a list with server’s acceptable signature - algorithms. The certificate returned should support the - server’s given algorithms. - - PCERT - should contain a single certificate and public or a list of - them. - - PCERT_LENGTH - is the size of the previous list. - - PKEY - is the private key. - - A possible implementation of this callback would look like this: - -struct Hosts -{ - struct Hosts *next; - const char *hostname; - gnutls_pcert_st pcrt; - gnutls_privkey_t key; -}; - -static struct Hosts *hosts; - -int -sni_callback (gnutls_session_t session, - const gnutls_datum_t* req_ca_dn, - int nreqs, - const gnutls_pk_algorithm_t* pk_algos, - int pk_algos_length, - gnutls_pcert_st** pcert, - unsigned int *pcert_length, - gnutls_privkey_t * pkey) -{ - char name[256]; - size_t name_len; - struct Hosts *host; - unsigned int type; - - name_len = sizeof (name); - if (GNUTLS_E_SUCCESS != - gnutls_server_name_get (session, - name, - &name_len, - &type, - 0 /* index */)) - return -1; - for (host = hosts; NULL != host; host = host->next) - if (0 == strncmp (name, host->hostname, name_len)) - break; - if (NULL == host) - { - fprintf (stderr, - "Need certificate for %.*s\n", - (int) name_len, - name); - return -1; - } - fprintf (stderr, - "Returning certificate for %.*s\n", - (int) name_len, - name); - *pkey = host->key; - *pcert_length = 1; - *pcert = &host->pcrt; - return 0; -} - - Note that MHD cannot offer passing a closure or any other additional -information to this callback, as the GnuTLS API unfortunately does not -permit this at this point. - - The `hosts' list can be initialized by loading the private keys and -X.509 certificats from disk as follows: - -static void -load_keys(const char *hostname, - const char *CERT_FILE, - const char *KEY_FILE) -{ - int ret; - gnutls_datum_t data; - struct Hosts *host; - - host = malloc (sizeof (struct Hosts)); - host->hostname = hostname; - host->next = hosts; - hosts = host; - - ret = gnutls_load_file (CERT_FILE, &data); - if (ret < 0) - { - fprintf (stderr, - "*** Error loading certificate file %s.\n", - CERT_FILE); - exit(1); - } - ret = - gnutls_pcert_import_x509_raw (&host->pcrt, &data, GNUTLS_X509_FMT_PEM, - 0); - if (ret < 0) - { - fprintf(stderr, - "*** Error loading certificate file: %s\n", - gnutls_strerror (ret)); - exit(1); - } - gnutls_free (data.data); - - ret = gnutls_load_file (KEY_FILE, &data); - if (ret < 0) - { - fprintf (stderr, - "*** Error loading key file %s.\n", - KEY_FILE); - exit(1); - } - - gnutls_privkey_init (&host->key); - ret = - gnutls_privkey_import_x509_raw (host->key, - &data, GNUTLS_X509_FMT_PEM, - NULL, 0); - if (ret < 0) - { - fprintf (stderr, - "*** Error loading key file: %s\n", - gnutls_strerror (ret)); - exit(1); - } - gnutls_free (data.data); -} - - The code above was largely lifted from GnuTLS. You can find other -methods for initializing certificates and keys in the GnuTLS manual and -source code. - - -File: libmicrohttpd-tutorial.info, Node: Bibliography, Next: License text, Prev: Adding a layer of security, Up: Top - -Appendix A Bibliography -*********************** - -API reference -============= - - * The _GNU libmicrohttpd_ manual by Marco Maggi and Christian - Grothoff 2008 `http://gnunet.org/libmicrohttpd/microhttpd.html' - - * All referenced RFCs can be found on the website of _The Internet - Engineering Task Force_ `http://www.ietf.org/' - - * _RFC 2616_: Fielding, R., Gettys, J., Mogul, J., Frystyk, H., and - T. Berners-Lee, "Hypertext Transfer Protocol - HTTP/1.1", RFC - 2016, January 1997. - - * _RFC 2617_: Franks, J., Hallam-Baker, P., Hostetler, J., Lawrence, - S., Leach, P., Luotonen, A., and L. Stewart, "HTTP Authentication: - Basic and Digest Access Authentication", RFC 2617, June 1999. - - * A well-structured _HTML_ reference can be found on - `http://www.echoecho.com/html.htm' - - For those readers understanding German or French, there is an - excellent document both for learning _HTML_ and for reference, - whose English version unfortunately has been discontinued. - `http://de.selfhtml.org/' and `http://fr.selfhtml.org/' - - - -File: libmicrohttpd-tutorial.info, Node: License text, Next: Example programs, Prev: Bibliography, Up: Top - -Appendix B GNU Free Documentation License -***************************************** - - Version 1.3, 3 November 2008 - - Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. - `http://fsf.org/' - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - 0. PREAMBLE - - The purpose of this License is to make a manual, textbook, or other - functional and useful document "free" in the sense of freedom: to - assure everyone the effective freedom to copy and redistribute it, - with or without modifying it, either commercially or - noncommercially. Secondarily, this License preserves for the - author and publisher a way to get credit for their work, while not - being considered responsible for modifications made by others. - - This License is a kind of "copyleft", which means that derivative - works of the document must themselves be free in the same sense. - It complements the GNU General Public License, which is a copyleft - license designed for free software. - - We have designed this License in order to use it for manuals for - free software, because free software needs free documentation: a - free program should come with manuals providing the same freedoms - that the software does. But this License is not limited to - software manuals; it can be used for any textual work, regardless - of subject matter or whether it is published as a printed book. - We recommend this License principally for works whose purpose is - instruction or reference. - - 1. APPLICABILITY AND DEFINITIONS - - This License applies to any manual or other work, in any medium, - that contains a notice placed by the copyright holder saying it - can be distributed under the terms of this License. Such a notice - grants a world-wide, royalty-free license, unlimited in duration, - to use that work under the conditions stated herein. The - "Document", below, refers to any such manual or work. Any member - of the public is a licensee, and is addressed as "you". You - accept the license if you copy, modify or distribute the work in a - way requiring permission under copyright law. - - A "Modified Version" of the Document means any work containing the - Document or a portion of it, either copied verbatim, or with - modifications and/or translated into another language. - - A "Secondary Section" is a named appendix or a front-matter section - of the Document that deals exclusively with the relationship of the - publishers or authors of the Document to the Document's overall - subject (or to related matters) and contains nothing that could - fall directly within that overall subject. (Thus, if the Document - is in part a textbook of mathematics, a Secondary Section may not - explain any mathematics.) The relationship could be a matter of - historical connection with the subject or with related matters, or - of legal, commercial, philosophical, ethical or political position - regarding them. - - The "Invariant Sections" are certain Secondary Sections whose - titles are designated, as being those of Invariant Sections, in - the notice that says that the Document is released under this - License. If a section does not fit the above definition of - Secondary then it is not allowed to be designated as Invariant. - The Document may contain zero Invariant Sections. If the Document - does not identify any Invariant Sections then there are none. - - The "Cover Texts" are certain short passages of text that are - listed, as Front-Cover Texts or Back-Cover Texts, in the notice - that says that the Document is released under this License. A - Front-Cover Text may be at most 5 words, and a Back-Cover Text may - be at most 25 words. - - A "Transparent" copy of the Document means a machine-readable copy, - represented in a format whose specification is available to the - general public, that is suitable for revising the document - straightforwardly with generic text editors or (for images - composed of pixels) generic paint programs or (for drawings) some - widely available drawing editor, and that is suitable for input to - text formatters or for automatic translation to a variety of - formats suitable for input to text formatters. A copy made in an - otherwise Transparent file format whose markup, or absence of - markup, has been arranged to thwart or discourage subsequent - modification by readers is not Transparent. An image format is - not Transparent if used for any substantial amount of text. A - copy that is not "Transparent" is called "Opaque". - - Examples of suitable formats for Transparent copies include plain - ASCII without markup, Texinfo input format, LaTeX input format, - SGML or XML using a publicly available DTD, and - standard-conforming simple HTML, PostScript or PDF designed for - human modification. Examples of transparent image formats include - PNG, XCF and JPG. Opaque formats include proprietary formats that - can be read and edited only by proprietary word processors, SGML or - XML for which the DTD and/or processing tools are not generally - available, and the machine-generated HTML, PostScript or PDF - produced by some word processors for output purposes only. - - The "Title Page" means, for a printed book, the title page itself, - plus such following pages as are needed to hold, legibly, the - material this License requires to appear in the title page. For - works in formats which do not have any title page as such, "Title - Page" means the text near the most prominent appearance of the - work's title, preceding the beginning of the body of the text. - - The "publisher" means any person or entity that distributes copies - of the Document to the public. - - A section "Entitled XYZ" means a named subunit of the Document - whose title either is precisely XYZ or contains XYZ in parentheses - following text that translates XYZ in another language. (Here XYZ - stands for a specific section name mentioned below, such as - "Acknowledgements", "Dedications", "Endorsements", or "History".) - To "Preserve the Title" of such a section when you modify the - Document means that it remains a section "Entitled XYZ" according - to this definition. - - The Document may include Warranty Disclaimers next to the notice - which states that this License applies to the Document. These - Warranty Disclaimers are considered to be included by reference in - this License, but only as regards disclaiming warranties: any other - implication that these Warranty Disclaimers may have is void and - has no effect on the meaning of this License. - - 2. VERBATIM COPYING - - You may copy and distribute the Document in any medium, either - commercially or noncommercially, provided that this License, the - copyright notices, and the license notice saying this License - applies to the Document are reproduced in all copies, and that you - add no other conditions whatsoever to those of this License. You - may not use technical measures to obstruct or control the reading - or further copying of the copies you make or distribute. However, - you may accept compensation in exchange for copies. If you - distribute a large enough number of copies you must also follow - the conditions in section 3. - - You may also lend copies, under the same conditions stated above, - and you may publicly display copies. - - 3. COPYING IN QUANTITY - - If you publish printed copies (or copies in media that commonly - have printed covers) of the Document, numbering more than 100, and - the Document's license notice requires Cover Texts, you must - enclose the copies in covers that carry, clearly and legibly, all - these Cover Texts: Front-Cover Texts on the front cover, and - Back-Cover Texts on the back cover. Both covers must also clearly - and legibly identify you as the publisher of these copies. The - front cover must present the full title with all words of the - title equally prominent and visible. You may add other material - on the covers in addition. Copying with changes limited to the - covers, as long as they preserve the title of the Document and - satisfy these conditions, can be treated as verbatim copying in - other respects. - - If the required texts for either cover are too voluminous to fit - legibly, you should put the first ones listed (as many as fit - reasonably) on the actual cover, and continue the rest onto - adjacent pages. - - If you publish or distribute Opaque copies of the Document - numbering more than 100, you must either include a - machine-readable Transparent copy along with each Opaque copy, or - state in or with each Opaque copy a computer-network location from - which the general network-using public has access to download - using public-standard network protocols a complete Transparent - copy of the Document, free of added material. If you use the - latter option, you must take reasonably prudent steps, when you - begin distribution of Opaque copies in quantity, to ensure that - this Transparent copy will remain thus accessible at the stated - location until at least one year after the last time you - distribute an Opaque copy (directly or through your agents or - retailers) of that edition to the public. - - It is requested, but not required, that you contact the authors of - the Document well before redistributing any large number of - copies, to give them a chance to provide you with an updated - version of the Document. - - 4. MODIFICATIONS - - You may copy and distribute a Modified Version of the Document - under the conditions of sections 2 and 3 above, provided that you - release the Modified Version under precisely this License, with - the Modified Version filling the role of the Document, thus - licensing distribution and modification of the Modified Version to - whoever possesses a copy of it. In addition, you must do these - things in the Modified Version: - - A. Use in the Title Page (and on the covers, if any) a title - distinct from that of the Document, and from those of - previous versions (which should, if there were any, be listed - in the History section of the Document). You may use the - same title as a previous version if the original publisher of - that version gives permission. - - B. List on the Title Page, as authors, one or more persons or - entities responsible for authorship of the modifications in - the Modified Version, together with at least five of the - principal authors of the Document (all of its principal - authors, if it has fewer than five), unless they release you - from this requirement. - - C. State on the Title page the name of the publisher of the - Modified Version, as the publisher. - - D. Preserve all the copyright notices of the Document. - - E. Add an appropriate copyright notice for your modifications - adjacent to the other copyright notices. - - F. Include, immediately after the copyright notices, a license - notice giving the public permission to use the Modified - Version under the terms of this License, in the form shown in - the Addendum below. - - G. Preserve in that license notice the full lists of Invariant - Sections and required Cover Texts given in the Document's - license notice. - - H. Include an unaltered copy of this License. - - I. Preserve the section Entitled "History", Preserve its Title, - and add to it an item stating at least the title, year, new - authors, and publisher of the Modified Version as given on - the Title Page. If there is no section Entitled "History" in - the Document, create one stating the title, year, authors, - and publisher of the Document as given on its Title Page, - then add an item describing the Modified Version as stated in - the previous sentence. - - J. Preserve the network location, if any, given in the Document - for public access to a Transparent copy of the Document, and - likewise the network locations given in the Document for - previous versions it was based on. These may be placed in - the "History" section. You may omit a network location for a - work that was published at least four years before the - Document itself, or if the original publisher of the version - it refers to gives permission. - - K. For any section Entitled "Acknowledgements" or "Dedications", - Preserve the Title of the section, and preserve in the - section all the substance and tone of each of the contributor - acknowledgements and/or dedications given therein. - - L. Preserve all the Invariant Sections of the Document, - unaltered in their text and in their titles. Section numbers - or the equivalent are not considered part of the section - titles. - - M. Delete any section Entitled "Endorsements". Such a section - may not be included in the Modified Version. - - N. Do not retitle any existing section to be Entitled - "Endorsements" or to conflict in title with any Invariant - Section. - - O. Preserve any Warranty Disclaimers. - - If the Modified Version includes new front-matter sections or - appendices that qualify as Secondary Sections and contain no - material copied from the Document, you may at your option - designate some or all of these sections as invariant. To do this, - add their titles to the list of Invariant Sections in the Modified - Version's license notice. These titles must be distinct from any - other section titles. - - You may add a section Entitled "Endorsements", provided it contains - nothing but endorsements of your Modified Version by various - parties--for example, statements of peer review or that the text - has been approved by an organization as the authoritative - definition of a standard. - - You may add a passage of up to five words as a Front-Cover Text, - and a passage of up to 25 words as a Back-Cover Text, to the end - of the list of Cover Texts in the Modified Version. Only one - passage of Front-Cover Text and one of Back-Cover Text may be - added by (or through arrangements made by) any one entity. If the - Document already includes a cover text for the same cover, - previously added by you or by arrangement made by the same entity - you are acting on behalf of, you may not add another; but you may - replace the old one, on explicit permission from the previous - publisher that added the old one. - - The author(s) and publisher(s) of the Document do not by this - License give permission to use their names for publicity for or to - assert or imply endorsement of any Modified Version. - - 5. COMBINING DOCUMENTS - - You may combine the Document with other documents released under - this License, under the terms defined in section 4 above for - modified versions, provided that you include in the combination - all of the Invariant Sections of all of the original documents, - unmodified, and list them all as Invariant Sections of your - combined work in its license notice, and that you preserve all - their Warranty Disclaimers. - - The combined work need only contain one copy of this License, and - multiple identical Invariant Sections may be replaced with a single - copy. If there are multiple Invariant Sections with the same name - but different contents, make the title of each such section unique - by adding at the end of it, in parentheses, the name of the - original author or publisher of that section if known, or else a - unique number. Make the same adjustment to the section titles in - the list of Invariant Sections in the license notice of the - combined work. - - In the combination, you must combine any sections Entitled - "History" in the various original documents, forming one section - Entitled "History"; likewise combine any sections Entitled - "Acknowledgements", and any sections Entitled "Dedications". You - must delete all sections Entitled "Endorsements." - - 6. COLLECTIONS OF DOCUMENTS - - You may make a collection consisting of the Document and other - documents released under this License, and replace the individual - copies of this License in the various documents with a single copy - that is included in the collection, provided that you follow the - rules of this License for verbatim copying of each of the - documents in all other respects. - - You may extract a single document from such a collection, and - distribute it individually under this License, provided you insert - a copy of this License into the extracted document, and follow - this License in all other respects regarding verbatim copying of - that document. - - 7. AGGREGATION WITH INDEPENDENT WORKS - - A compilation of the Document or its derivatives with other - separate and independent documents or works, in or on a volume of - a storage or distribution medium, is called an "aggregate" if the - copyright resulting from the compilation is not used to limit the - legal rights of the compilation's users beyond what the individual - works permit. When the Document is included in an aggregate, this - License does not apply to the other works in the aggregate which - are not themselves derivative works of the Document. - - If the Cover Text requirement of section 3 is applicable to these - copies of the Document, then if the Document is less than one half - of the entire aggregate, the Document's Cover Texts may be placed - on covers that bracket the Document within the aggregate, or the - electronic equivalent of covers if the Document is in electronic - form. Otherwise they must appear on printed covers that bracket - the whole aggregate. - - 8. TRANSLATION - - Translation is considered a kind of modification, so you may - distribute translations of the Document under the terms of section - 4. Replacing Invariant Sections with translations requires special - permission from their copyright holders, but you may include - translations of some or all Invariant Sections in addition to the - original versions of these Invariant Sections. You may include a - translation of this License, and all the license notices in the - Document, and any Warranty Disclaimers, provided that you also - include the original English version of this License and the - original versions of those notices and disclaimers. In case of a - disagreement between the translation and the original version of - this License or a notice or disclaimer, the original version will - prevail. - - If a section in the Document is Entitled "Acknowledgements", - "Dedications", or "History", the requirement (section 4) to - Preserve its Title (section 1) will typically require changing the - actual title. - - 9. TERMINATION - - You may not copy, modify, sublicense, or distribute the Document - except as expressly provided under this License. Any attempt - otherwise to copy, modify, sublicense, or distribute it is void, - and will automatically terminate your rights under this License. - - However, if you cease all violation of this License, then your - license from a particular copyright holder is reinstated (a) - provisionally, unless and until the copyright holder explicitly - and finally terminates your license, and (b) permanently, if the - copyright holder fails to notify you of the violation by some - reasonable means prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is - reinstated permanently if the copyright holder notifies you of the - violation by some reasonable means, this is the first time you have - received notice of violation of this License (for any work) from - that copyright holder, and you cure the violation prior to 30 days - after your receipt of the notice. - - Termination of your rights under this section does not terminate - the licenses of parties who have received copies or rights from - you under this License. If your rights have been terminated and - not permanently reinstated, receipt of a copy of some or all of - the same material does not give you any rights to use it. - - 10. FUTURE REVISIONS OF THIS LICENSE - - The Free Software Foundation may publish new, revised versions of - the GNU Free Documentation License from time to time. Such new - versions will be similar in spirit to the present version, but may - differ in detail to address new problems or concerns. See - `http://www.gnu.org/copyleft/'. - - Each version of the License is given a distinguishing version - number. If the Document specifies that a particular numbered - version of this License "or any later version" applies to it, you - have the option of following the terms and conditions either of - that specified version or of any later version that has been - published (not as a draft) by the Free Software Foundation. If - the Document does not specify a version number of this License, - you may choose any version ever published (not as a draft) by the - Free Software Foundation. If the Document specifies that a proxy - can decide which future versions of this License can be used, that - proxy's public statement of acceptance of a version permanently - authorizes you to choose that version for the Document. - - 11. RELICENSING - - "Massive Multiauthor Collaboration Site" (or "MMC Site") means any - World Wide Web server that publishes copyrightable works and also - provides prominent facilities for anybody to edit those works. A - public wiki that anybody can edit is an example of such a server. - A "Massive Multiauthor Collaboration" (or "MMC") contained in the - site means any set of copyrightable works thus published on the MMC - site. - - "CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 - license published by Creative Commons Corporation, a not-for-profit - corporation with a principal place of business in San Francisco, - California, as well as future copyleft versions of that license - published by that same organization. - - "Incorporate" means to publish or republish a Document, in whole or - in part, as part of another Document. - - An MMC is "eligible for relicensing" if it is licensed under this - License, and if all works that were first published under this - License somewhere other than this MMC, and subsequently - incorporated in whole or in part into the MMC, (1) had no cover - texts or invariant sections, and (2) were thus incorporated prior - to November 1, 2008. - - The operator of an MMC Site may republish an MMC contained in the - site under CC-BY-SA on the same site at any time before August 1, - 2009, provided the MMC is eligible for relicensing. - - -ADDENDUM: How to use this License for your documents -==================================================== - -To use this License in a document you have written, include a copy of -the License in the document and put the following copyright and license -notices just after the title page: - - Copyright (C) YEAR YOUR NAME. - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.3 - or any later version published by the Free Software Foundation; - with no Invariant Sections, no Front-Cover Texts, and no Back-Cover - Texts. A copy of the license is included in the section entitled ``GNU - Free Documentation License''. - - If you have Invariant Sections, Front-Cover Texts and Back-Cover -Texts, replace the "with...Texts." line with this: - - with the Invariant Sections being LIST THEIR TITLES, with - the Front-Cover Texts being LIST, and with the Back-Cover Texts - being LIST. - - If you have Invariant Sections without Cover Texts, or some other -combination of the three, merge those two alternatives to suit the -situation. - - If your document contains nontrivial examples of program code, we -recommend releasing these examples in parallel under your choice of -free software license, such as the GNU General Public License, to -permit their use in free software. - - -File: libmicrohttpd-tutorial.info, Node: Example programs, Prev: License text, Up: Top - -Appendix C Example programs -*************************** - -* Menu: - -* hellobrowser.c:: -* logging.c:: -* responseheaders.c:: -* basicauthentication.c:: -* simplepost.c:: -* largepost.c:: -* sessions.c:: -* tlsauthentication.c:: - - -File: libmicrohttpd-tutorial.info, Node: hellobrowser.c, Next: logging.c, Up: Example programs - -C.1 hellobrowser.c -================== - - /* Feel free to use this example code in any way - you see fit (Public Domain) */ - - #include - #ifndef _WIN32 - #include - #include - #else - #include - #endif - #include - #include - #include - - #define PORT 8888 - - static int - answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) - { - const char *page = "Hello, browser!"; - struct MHD_Response *response; - int ret; - - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - - return ret; - } - - - int - main () - { - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - - (void) getchar (); - - MHD_stop_daemon (daemon); - return 0; - } - - -File: libmicrohttpd-tutorial.info, Node: logging.c, Next: responseheaders.c, Prev: hellobrowser.c, Up: Example programs - -C.2 logging.c -============= - - /* Feel free to use this example code in any way - you see fit (Public Domain) */ - - #include - #ifndef _WIN32 - #include - #include - #else - #include - #endif - #include - #include - - #define PORT 8888 - - - static int - print_out_key (void *cls, enum MHD_ValueKind kind, const char *key, - const char *value) - { - printf ("%s: %s\n", key, value); - return MHD_YES; - } - - - static int - answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) - { - printf ("New %s request for %s using version %s\n", method, url, version); - - MHD_get_connection_values (connection, MHD_HEADER_KIND, print_out_key, - NULL); - - return MHD_NO; - } - - - int - main () - { - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - - (void) getchar (); - - MHD_stop_daemon (daemon); - return 0; - } - - -File: libmicrohttpd-tutorial.info, Node: responseheaders.c, Next: basicauthentication.c, Prev: logging.c, Up: Example programs - -C.3 responseheaders.c -===================== - - /* Feel free to use this example code in any way - you see fit (Public Domain) */ - - #include - #ifndef _WIN32 - #include - #include - #else - #include - #endif - #include - #include - #include - #include - #include - #include - - #define PORT 8888 - #define FILENAME "picture.png" - #define MIMETYPE "image/png" - - static int - answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) - { - struct MHD_Response *response; - int fd; - int ret; - struct stat sbuf; - - if (0 != strcmp (method, "GET")) - return MHD_NO; - - if ( (-1 == (fd = open (FILENAME, O_RDONLY))) || - (0 != fstat (fd, &sbuf)) ) - { - /* error accessing file */ - if (fd != -1) - (void) close (fd); - const char *errorstr = - "An internal server error has occured!\ - "; - response = - MHD_create_response_from_buffer (strlen (errorstr), - (void *) errorstr, - MHD_RESPMEM_PERSISTENT); - if (NULL != response) - { - ret = - MHD_queue_response (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, - response); - MHD_destroy_response (response); - - return ret; - } - else - return MHD_NO; - } - response = - MHD_create_response_from_fd_at_offset (sbuf.st_size, fd, 0); - MHD_add_response_header (response, "Content-Type", MIMETYPE); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - - return ret; - } - - - int - main () - { - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - - (void) getchar (); - - MHD_stop_daemon (daemon); - - return 0; - } - - -File: libmicrohttpd-tutorial.info, Node: basicauthentication.c, Next: simplepost.c, Prev: responseheaders.c, Up: Example programs - -C.4 basicauthentication.c -========================= - - /* Feel free to use this example code in any way - you see fit (Public Domain) */ - - #include - #ifndef _WIN32 - #include - #include - #else - #include - #endif - #include - #include - #include - #include - #include - - #define PORT 8888 - - - static int - answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) - { - char *user; - char *pass; - int fail; - int ret; - struct MHD_Response *response; - - if (0 != strcmp (method, "GET")) - return MHD_NO; - if (NULL == *con_cls) - { - *con_cls = connection; - return MHD_YES; - } - pass = NULL; - user = MHD_basic_auth_get_username_password (connection, &pass); - fail = ( (user == NULL) || - (0 != strcmp (user, "root")) || - (0 != strcmp (pass, "pa$$w0rd") ) ); - if (user != NULL) free (user); - if (pass != NULL) free (pass); - if (fail) - { - const char *page = "Go away."; - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_basic_auth_fail_response (connection, - "my realm", - response); - } - else - { - const char *page = "A secret."; - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - } - MHD_destroy_response (response); - return ret; - } - - - int - main () - { - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - - (void) getchar (); - - MHD_stop_daemon (daemon); - return 0; - } - - -File: libmicrohttpd-tutorial.info, Node: simplepost.c, Next: largepost.c, Prev: basicauthentication.c, Up: Example programs - -C.5 simplepost.c -================ - - /* Feel free to use this example code in any way - you see fit (Public Domain) */ - - #include - #ifndef _WIN32 - #include - #include - #else - #include - #endif - #include - #include - #include - #include - - #define PORT 8888 - #define POSTBUFFERSIZE 512 - #define MAXNAMESIZE 20 - #define MAXANSWERSIZE 512 - - #define GET 0 - #define POST 1 - - struct connection_info_struct - { - int connectiontype; - char *answerstring; - struct MHD_PostProcessor *postprocessor; - }; - - const char *askpage = "\ - What's your name, Sir?
\ -
\ - \ - "; - - const char *greetingpage = - "

Welcome, %s!

"; - - const char *errorpage = - "This doesn't seem to be right."; - - - static int - send_page (struct MHD_Connection *connection, const char *page) - { - int ret; - struct MHD_Response *response; - - - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - if (!response) - return MHD_NO; - - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - - return ret; - } - - - static int - iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, - const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, uint64_t off, - size_t size) - { - struct connection_info_struct *con_info = coninfo_cls; - - if (0 == strcmp (key, "name")) - { - if ((size > 0) && (size <= MAXNAMESIZE)) - { - char *answerstring; - answerstring = malloc (MAXANSWERSIZE); - if (!answerstring) - return MHD_NO; - - snprintf (answerstring, MAXANSWERSIZE, greetingpage, data); - con_info->answerstring = answerstring; - } - else - con_info->answerstring = NULL; - - return MHD_NO; - } - - return MHD_YES; - } - - static void - request_completed (void *cls, struct MHD_Connection *connection, - void **con_cls, enum MHD_RequestTerminationCode toe) - { - struct connection_info_struct *con_info = *con_cls; - - if (NULL == con_info) - return; - - if (con_info->connectiontype == POST) - { - MHD_destroy_post_processor (con_info->postprocessor); - if (con_info->answerstring) - free (con_info->answerstring); - } - - free (con_info); - *con_cls = NULL; - } - - - static int - answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) - { - if (NULL == *con_cls) - { - struct connection_info_struct *con_info; - - con_info = malloc (sizeof (struct connection_info_struct)); - if (NULL == con_info) - return MHD_NO; - con_info->answerstring = NULL; - - if (0 == strcmp (method, "POST")) - { - con_info->postprocessor = - MHD_create_post_processor (connection, POSTBUFFERSIZE, - iterate_post, (void *) con_info); - - if (NULL == con_info->postprocessor) - { - free (con_info); - return MHD_NO; - } - - con_info->connectiontype = POST; - } - else - con_info->connectiontype = GET; - - *con_cls = (void *) con_info; - - return MHD_YES; - } - - if (0 == strcmp (method, "GET")) - { - return send_page (connection, askpage); - } - - if (0 == strcmp (method, "POST")) - { - struct connection_info_struct *con_info = *con_cls; - - if (*upload_data_size != 0) - { - MHD_post_process (con_info->postprocessor, upload_data, - *upload_data_size); - *upload_data_size = 0; - - return MHD_YES; - } - else if (NULL != con_info->answerstring) - return send_page (connection, con_info->answerstring); - } - - return send_page (connection, errorpage); - } - - int - main () - { - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_NOTIFY_COMPLETED, request_completed, - NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - - (void) getchar (); - - MHD_stop_daemon (daemon); - - return 0; - } - - -File: libmicrohttpd-tutorial.info, Node: largepost.c, Next: sessions.c, Prev: simplepost.c, Up: Example programs - -C.6 largepost.c -=============== - - /* Feel free to use this example code in any way - you see fit (Public Domain) */ - - #include - #ifndef _WIN32 - #include - #include - #else - #include - #endif - #include - #include - #include - #include - - #define PORT 8888 - #define POSTBUFFERSIZE 512 - #define MAXCLIENTS 2 - - #define GET 0 - #define POST 1 - - static unsigned int nr_of_uploading_clients = 0; - - struct connection_info_struct - { - int connectiontype; - struct MHD_PostProcessor *postprocessor; - FILE *fp; - const char *answerstring; - int answercode; - }; - - const char *askpage = "\n\ - Upload a file, please!
\n\ - There are %u clients uploading at the moment.
\n\ -
\n\ - \n\ - \n\ - "; - - const char *busypage = - "This server is busy, please try again later."; - - const char *completepage = - "The upload has been completed."; - - const char *errorpage = - "This doesn't seem to be right."; - const char *servererrorpage = - "An internal server error has occured."; - const char *fileexistspage = - "This file already exists."; - - - static int - send_page (struct MHD_Connection *connection, const char *page, - int status_code) - { - int ret; - struct MHD_Response *response; - - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_MUST_COPY); - if (!response) - return MHD_NO; - MHD_add_response_header (response, MHD_HTTP_HEADER_CONTENT_TYPE, "text/html"); - ret = MHD_queue_response (connection, status_code, response); - MHD_destroy_response (response); - - return ret; - } - - - static int - iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, - const char *filename, const char *content_type, - const char *transfer_encoding, const char *data, uint64_t off, - size_t size) - { - struct connection_info_struct *con_info = coninfo_cls; - FILE *fp; - - con_info->answerstring = servererrorpage; - con_info->answercode = MHD_HTTP_INTERNAL_SERVER_ERROR; - - if (0 != strcmp (key, "file")) - return MHD_NO; - - if (!con_info->fp) - { - if (NULL != (fp = fopen (filename, "rb"))) - { - fclose (fp); - con_info->answerstring = fileexistspage; - con_info->answercode = MHD_HTTP_FORBIDDEN; - return MHD_NO; - } - - con_info->fp = fopen (filename, "ab"); - if (!con_info->fp) - return MHD_NO; - } - - if (size > 0) - { - if (!fwrite (data, size, sizeof (char), con_info->fp)) - return MHD_NO; - } - - con_info->answerstring = completepage; - con_info->answercode = MHD_HTTP_OK; - - return MHD_YES; - } - - - static void - request_completed (void *cls, struct MHD_Connection *connection, - void **con_cls, enum MHD_RequestTerminationCode toe) - { - struct connection_info_struct *con_info = *con_cls; - - if (NULL == con_info) - return; - - if (con_info->connectiontype == POST) - { - if (NULL != con_info->postprocessor) - { - MHD_destroy_post_processor (con_info->postprocessor); - nr_of_uploading_clients--; - } - - if (con_info->fp) - fclose (con_info->fp); - } - - free (con_info); - *con_cls = NULL; - } - - - static int - answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) - { - if (NULL == *con_cls) - { - struct connection_info_struct *con_info; - - if (nr_of_uploading_clients >= MAXCLIENTS) - return send_page (connection, busypage, MHD_HTTP_SERVICE_UNAVAILABLE); - - con_info = malloc (sizeof (struct connection_info_struct)); - if (NULL == con_info) - return MHD_NO; - - con_info->fp = NULL; - - if (0 == strcmp (method, "POST")) - { - con_info->postprocessor = - MHD_create_post_processor (connection, POSTBUFFERSIZE, - iterate_post, (void *) con_info); - - if (NULL == con_info->postprocessor) - { - free (con_info); - return MHD_NO; - } - - nr_of_uploading_clients++; - - con_info->connectiontype = POST; - con_info->answercode = MHD_HTTP_OK; - con_info->answerstring = completepage; - } - else - con_info->connectiontype = GET; - - *con_cls = (void *) con_info; - - return MHD_YES; - } - - if (0 == strcmp (method, "GET")) - { - char buffer[1024]; - - snprintf (buffer, sizeof (buffer), askpage, nr_of_uploading_clients); - return send_page (connection, buffer, MHD_HTTP_OK); - } - - if (0 == strcmp (method, "POST")) - { - struct connection_info_struct *con_info = *con_cls; - - if (0 != *upload_data_size) - { - MHD_post_process (con_info->postprocessor, upload_data, - *upload_data_size); - *upload_data_size = 0; - - return MHD_YES; - } - else - { - if (NULL != con_info->fp) - { - fclose (con_info->fp); - con_info->fp = NULL; - } - /* Now it is safe to open and inspect the file before calling send_page with a response */ - return send_page (connection, con_info->answerstring, - con_info->answercode); - } - - } - - return send_page (connection, errorpage, MHD_HTTP_BAD_REQUEST); - } - - - int - main () - { - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, - &answer_to_connection, NULL, - MHD_OPTION_NOTIFY_COMPLETED, request_completed, - NULL, MHD_OPTION_END); - if (NULL == daemon) - return 1; - (void) getchar (); - MHD_stop_daemon (daemon); - return 0; - } - - -File: libmicrohttpd-tutorial.info, Node: sessions.c, Next: tlsauthentication.c, Prev: largepost.c, Up: Example programs - -C.7 sessions.c -============== - - /* Feel free to use this example code in any way - you see fit (Public Domain) */ - - /* needed for asprintf */ - #define _GNU_SOURCE - - #include - #include - #include - #include - #include - #include - - #if defined _WIN32 && !defined(__MINGW64_VERSION_MAJOR) - static int - asprintf (char **resultp, const char *format, ...) - { - va_list argptr; - char *result = NULL; - int len = 0; - - if (format == NULL) - return -1; - - va_start (argptr, format); - - len = _vscprintf ((char *) format, argptr); - if (len >= 0) - { - len += 1; - result = (char *) malloc (sizeof (char *) * len); - if (result != NULL) - { - int len2 = _vscprintf ((char *) format, argptr); - if (len2 != len - 1 || len2 <= 0) - { - free (result); - result = NULL; - len = -1; - } - else - { - len = len2; - if (resultp) - *resultp = result; - } - } - } - va_end (argptr); - return len; - } - #endif - - /** - * Invalid method page. - */ - #define METHOD_ERROR "Illegal requestGo away." - - /** - * Invalid URL page. - */ - #define NOT_FOUND_ERROR "Not foundGo away." - - /** - * Front page. (/) - */ - #define MAIN_PAGE "Welcome
What is your name? " - - /** - * Second page. (/2) - */ - #define SECOND_PAGE "Tell me moreprevious %s, what is your job? " - - /** - * Second page (/S) - */ - #define SUBMIT_PAGE "Ready to submit?previous " - - /** - * Last page. - */ - #define LAST_PAGE "Thank youThank you." - - /** - * Name of our cookie. - */ - #define COOKIE_NAME "session" - - - /** - * State we keep for each user/session/browser. - */ - struct Session - { - /** - * We keep all sessions in a linked list. - */ - struct Session *next; - - /** - * Unique ID for this session. - */ - char sid[33]; - - /** - * Reference counter giving the number of connections - * currently using this session. - */ - unsigned int rc; - - /** - * Time when this session was last active. - */ - time_t start; - - /** - * String submitted via form. - */ - char value_1[64]; - - /** - * Another value submitted via form. - */ - char value_2[64]; - - }; - - - /** - * Data kept per request. - */ - struct Request - { - - /** - * Associated session. - */ - struct Session *session; - - /** - * Post processor handling form data (IF this is - * a POST request). - */ - struct MHD_PostProcessor *pp; - - /** - * URL to serve in response to this POST (if this request - * was a 'POST') - */ - const char *post_url; - - }; - - - /** - * Linked list of all active sessions. Yes, O(n) but a - * hash table would be overkill for a simple example... - */ - static struct Session *sessions; - - - - - /** - * Return the session handle for this connection, or - * create one if this is a new user. - */ - static struct Session * - get_session (struct MHD_Connection *connection) - { - struct Session *ret; - const char *cookie; - - cookie = MHD_lookup_connection_value (connection, - MHD_COOKIE_KIND, - COOKIE_NAME); - if (cookie != NULL) - { - /* find existing session */ - ret = sessions; - while (NULL != ret) - { - if (0 == strcmp (cookie, ret->sid)) - break; - ret = ret->next; - } - if (NULL != ret) - { - ret->rc++; - return ret; - } - } - /* create fresh session */ - ret = calloc (1, sizeof (struct Session)); - if (NULL == ret) - { - fprintf (stderr, "calloc error: %s\n", strerror (errno)); - return NULL; - } - /* not a super-secure way to generate a random session ID, - but should do for a simple example... */ - snprintf (ret->sid, - sizeof (ret->sid), - "%X%X%X%X", - (unsigned int) rand (), - (unsigned int) rand (), - (unsigned int) rand (), - (unsigned int) rand ()); - ret->rc++; - ret->start = time (NULL); - ret->next = sessions; - sessions = ret; - return ret; - } - - - /** - * Type of handler that generates a reply. - * - * @param cls content for the page (handler-specific) - * @param mime mime type to use - * @param session session information - * @param connection connection to process - * @param MHD_YES on success, MHD_NO on failure - */ - typedef int (*PageHandler)(const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection); - - - /** - * Entry we generate for each page served. - */ - struct Page - { - /** - * Acceptable URL for this page. - */ - const char *url; - - /** - * Mime type to set for the page. - */ - const char *mime; - - /** - * Handler to call to generate response. - */ - PageHandler handler; - - /** - * Extra argument to handler. - */ - const void *handler_cls; - }; - - - /** - * Add header to response to set a session cookie. - * - * @param session session to use - * @param response response to modify - */ - static void - add_session_cookie (struct Session *session, - struct MHD_Response *response) - { - char cstr[256]; - snprintf (cstr, - sizeof (cstr), - "%s=%s", - COOKIE_NAME, - session->sid); - if (MHD_NO == - MHD_add_response_header (response, - MHD_HTTP_HEADER_SET_COOKIE, - cstr)) - { - fprintf (stderr, - "Failed to set session cookie header!\n"); - } - } - - - /** - * Handler that returns a simple static HTTP page that - * is passed in via 'cls'. - * - * @param cls a 'const char *' with the HTML webpage to return - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ - static int - serve_simple_form (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) - { - int ret; - const char *form = cls; - struct MHD_Response *response; - - /* return static form */ - response = MHD_create_response_from_buffer (strlen (form), - (void *) form, - MHD_RESPMEM_PERSISTENT); - add_session_cookie (session, response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; - } - - - /** - * Handler that adds the 'v1' value to the given HTML code. - * - * @param cls a 'const char *' with the HTML webpage to return - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ - static int - fill_v1_form (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) - { - int ret; - const char *form = cls; - char *reply; - struct MHD_Response *response; - - if (-1 == asprintf (&reply, - form, - session->value_1)) - { - /* oops */ - return MHD_NO; - } - /* return static form */ - response = MHD_create_response_from_buffer (strlen (reply), - (void *) reply, - MHD_RESPMEM_MUST_FREE); - add_session_cookie (session, response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; - } - - - /** - * Handler that adds the 'v1' and 'v2' values to the given HTML code. - * - * @param cls a 'const char *' with the HTML webpage to return - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ - static int - fill_v1_v2_form (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) - { - int ret; - const char *form = cls; - char *reply; - struct MHD_Response *response; - - if (-1 == asprintf (&reply, - form, - session->value_1, - session->value_2)) - { - /* oops */ - return MHD_NO; - } - /* return static form */ - response = MHD_create_response_from_buffer (strlen (reply), - (void *) reply, - MHD_RESPMEM_MUST_FREE); - add_session_cookie (session, response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; - } - - - /** - * Handler used to generate a 404 reply. - * - * @param cls a 'const char *' with the HTML webpage to return - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ - static int - not_found_page (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) - { - int ret; - struct MHD_Response *response; - - /* unsupported HTTP method */ - response = MHD_create_response_from_buffer (strlen (NOT_FOUND_ERROR), - (void *) NOT_FOUND_ERROR, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, - MHD_HTTP_NOT_FOUND, - response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - MHD_destroy_response (response); - return ret; - } - - - /** - * List of all pages served by this HTTP server. - */ - static struct Page pages[] = - { - { "/", "text/html", &fill_v1_form, MAIN_PAGE }, - { "/2", "text/html", &fill_v1_v2_form, SECOND_PAGE }, - { "/S", "text/html", &serve_simple_form, SUBMIT_PAGE }, - { "/F", "text/html", &serve_simple_form, LAST_PAGE }, - { NULL, NULL, ¬_found_page, NULL } /* 404 */ - }; - - - - /** - * Iterator over key-value pairs where the value - * maybe made available in increments and/or may - * not be zero-terminated. Used for processing - * POST data. - * - * @param cls user-specified closure - * @param kind type of the value - * @param key 0-terminated key for the value - * @param filename name of the uploaded file, NULL if not known - * @param content_type mime-type of the data, NULL if not known - * @param transfer_encoding encoding of the data, NULL if not known - * @param data pointer to size bytes of data at the - * specified offset - * @param off offset of data in the overall value - * @param size number of bytes in data available - * @return MHD_YES to continue iterating, - * MHD_NO to abort the iteration - */ - static int - post_iterator (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *data, uint64_t off, size_t size) - { - struct Request *request = cls; - struct Session *session = request->session; - - if (0 == strcmp ("DONE", key)) - { - fprintf (stdout, - "Session `%s' submitted `%s', `%s'\n", - session->sid, - session->value_1, - session->value_2); - return MHD_YES; - } - if (0 == strcmp ("v1", key)) - { - if (size + off > sizeof(session->value_1)) - size = sizeof (session->value_1) - off; - memcpy (&session->value_1[off], - data, - size); - if (size + off < sizeof (session->value_1)) - session->value_1[size+off] = '\0'; - return MHD_YES; - } - if (0 == strcmp ("v2", key)) - { - if (size + off > sizeof(session->value_2)) - size = sizeof (session->value_2) - off; - memcpy (&session->value_2[off], - data, - size); - if (size + off < sizeof (session->value_2)) - session->value_2[size+off] = '\0'; - return MHD_YES; - } - fprintf (stderr, "Unsupported form value `%s'\n", key); - return MHD_YES; - } - - - /** - * Main MHD callback for handling requests. - * - * - * @param cls argument given together with the function - * pointer when the handler was registered with MHD - * @param connection handle to connection which is being processed - * @param url the requested url - * @param method the HTTP method used ("GET", "PUT", etc.) - * @param version the HTTP version string (i.e. "HTTP/1.1") - * @param upload_data the data being uploaded (excluding HEADERS, - * for a POST that fits into memory and that is encoded - * with a supported encoding, the POST data will NOT be - * given in upload_data and is instead available as - * part of MHD_get_connection_values; very large POST - * data *will* be made available incrementally in - * upload_data) - * @param upload_data_size set initially to the size of the - * upload_data provided; the method must update this - * value to the number of bytes NOT processed; - * @param ptr pointer that the callback can set to some - * address and that will be preserved by MHD for future - * calls for this request; since the access handler may - * be called many times (i.e., for a PUT/POST operation - * with plenty of upload data) this allows the application - * to easily associate some request-specific state. - * If necessary, this state can be cleaned up in the - * global "MHD_RequestCompleted" callback (which - * can be set with the MHD_OPTION_NOTIFY_COMPLETED). - * Initially, *con_cls will be NULL. - * @return MHS_YES if the connection was handled successfully, - * MHS_NO if the socket must be closed due to a serios - * error while handling the request - */ - static int - create_response (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, - void **ptr) - { - struct MHD_Response *response; - struct Request *request; - struct Session *session; - int ret; - unsigned int i; - - request = *ptr; - if (NULL == request) - { - request = calloc (1, sizeof (struct Request)); - if (NULL == request) - { - fprintf (stderr, "calloc error: %s\n", strerror (errno)); - return MHD_NO; - } - *ptr = request; - if (0 == strcmp (method, MHD_HTTP_METHOD_POST)) - { - request->pp = MHD_create_post_processor (connection, 1024, - &post_iterator, request); - if (NULL == request->pp) - { - fprintf (stderr, "Failed to setup post processor for `%s'\n", - url); - return MHD_NO; /* internal error */ - } - } - return MHD_YES; - } - if (NULL == request->session) - { - request->session = get_session (connection); - if (NULL == request->session) - { - fprintf (stderr, "Failed to setup session for `%s'\n", - url); - return MHD_NO; /* internal error */ - } - } - session = request->session; - session->start = time (NULL); - if (0 == strcmp (method, MHD_HTTP_METHOD_POST)) - { - /* evaluate POST data */ - MHD_post_process (request->pp, - upload_data, - *upload_data_size); - if (0 != *upload_data_size) - { - *upload_data_size = 0; - return MHD_YES; - } - /* done with POST data, serve response */ - MHD_destroy_post_processor (request->pp); - request->pp = NULL; - method = MHD_HTTP_METHOD_GET; /* fake 'GET' */ - if (NULL != request->post_url) - url = request->post_url; - } - - if ( (0 == strcmp (method, MHD_HTTP_METHOD_GET)) || - (0 == strcmp (method, MHD_HTTP_METHOD_HEAD)) ) - { - /* find out which page to serve */ - i=0; - while ( (pages[i].url != NULL) && - (0 != strcmp (pages[i].url, url)) ) - i++; - ret = pages[i].handler (pages[i].handler_cls, - pages[i].mime, - session, connection); - if (ret != MHD_YES) - fprintf (stderr, "Failed to create page for `%s'\n", - url); - return ret; - } - /* unsupported HTTP method */ - response = MHD_create_response_from_buffer (strlen (METHOD_ERROR), - (void *) METHOD_ERROR, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, - MHD_HTTP_METHOD_NOT_ACCEPTABLE, - response); - MHD_destroy_response (response); - return ret; - } - - - /** - * Callback called upon completion of a request. - * Decrements session reference counter. - * - * @param cls not used - * @param connection connection that completed - * @param con_cls session handle - * @param toe status code - */ - static void - request_completed_callback (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) - { - struct Request *request = *con_cls; - - if (NULL == request) - return; - if (NULL != request->session) - request->session->rc--; - if (NULL != request->pp) - MHD_destroy_post_processor (request->pp); - free (request); - } - - - /** - * Clean up handles of sessions that have been idle for - * too long. - */ - static void - expire_sessions () - { - struct Session *pos; - struct Session *prev; - struct Session *next; - time_t now; - - now = time (NULL); - prev = NULL; - pos = sessions; - while (NULL != pos) - { - next = pos->next; - if (now - pos->start > 60 * 60) - { - /* expire sessions after 1h */ - if (NULL == prev) - sessions = pos->next; - else - prev->next = next; - free (pos); - } - else - prev = pos; - pos = next; - } - } - - - /** - * Call with the port number as the only argument. - * Never terminates (other than by signals, such as CTRL-C). - */ - int - main (int argc, char *const *argv) - { - struct MHD_Daemon *d; - struct timeval tv; - struct timeval *tvp; - fd_set rs; - fd_set ws; - fd_set es; - int max; - MHD_UNSIGNED_LONG_LONG mhd_timeout; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - /* initialize PRNG */ - srand ((unsigned int) time (NULL)); - d = MHD_start_daemon (MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, - &create_response, NULL, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 15, - MHD_OPTION_NOTIFY_COMPLETED, &request_completed_callback, NULL, - MHD_OPTION_END); - if (NULL == d) - return 1; - while (1) - { - expire_sessions (); - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - break; /* fatal internal error */ - if (MHD_get_timeout (d, &mhd_timeout) == MHD_YES) - { - tv.tv_sec = mhd_timeout / 1000; - tv.tv_usec = (mhd_timeout - (tv.tv_sec * 1000)) * 1000; - tvp = &tv; - } - else - tvp = NULL; - if (-1 == select (max + 1, &rs, &ws, &es, tvp)) - { - if (EINTR != errno) - fprintf (stderr, - "Aborting due to error during select: %s\n", - strerror (errno)); - break; - } - MHD_run (d); - } - MHD_stop_daemon (d); - return 0; - } - - -File: libmicrohttpd-tutorial.info, Node: tlsauthentication.c, Prev: sessions.c, Up: Example programs - -C.8 tlsauthentication.c -======================= - - /* Feel free to use this example code in any way - you see fit (Public Domain) */ - - #include - #ifndef _WIN32 - #include - #include - #else - #include - #endif - #include - #include - #include - #include - - #define PORT 8888 - - #define REALM "\"Maintenance\"" - #define USER "a legitimate user" - #define PASSWORD "and his password" - - #define SERVERKEYFILE "server.key" - #define SERVERCERTFILE "server.pem" - - - static char * - string_to_base64 (const char *message) - { - const char *lookup = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - unsigned long l; - int i; - char *tmp; - size_t length = strlen (message); - - tmp = malloc (length * 2); - if (NULL == tmp) - return tmp; - - tmp[0] = 0; - - for (i = 0; i < length; i += 3) - { - l = (((unsigned long) message[i]) << 16) - | (((i + 1) < length) ? (((unsigned long) message[i + 1]) << 8) : 0) - | (((i + 2) < length) ? ((unsigned long) message[i + 2]) : 0); - - - strncat (tmp, &lookup[(l >> 18) & 0x3F], 1); - strncat (tmp, &lookup[(l >> 12) & 0x3F], 1); - - if (i + 1 < length) - strncat (tmp, &lookup[(l >> 6) & 0x3F], 1); - if (i + 2 < length) - strncat (tmp, &lookup[l & 0x3F], 1); - } - - if (length % 3) - strncat (tmp, "===", 3 - length % 3); - - return tmp; - } - - - static long - get_file_size (const char *filename) - { - FILE *fp; - - fp = fopen (filename, "rb"); - if (fp) - { - long size; - - if ((0 != fseek (fp, 0, SEEK_END)) || (-1 == (size = ftell (fp)))) - size = 0; - - fclose (fp); - - return size; - } - else - return 0; - } - - static char * - load_file (const char *filename) - { - FILE *fp; - char *buffer; - long size; - - size = get_file_size (filename); - if (size == 0) - return NULL; - - fp = fopen (filename, "rb"); - if (!fp) - return NULL; - - buffer = malloc (size); - if (!buffer) - { - fclose (fp); - return NULL; - } - - if (size != fread (buffer, 1, size, fp)) - { - free (buffer); - buffer = NULL; - } - - fclose (fp); - return buffer; - } - - static int - ask_for_authentication (struct MHD_Connection *connection, const char *realm) - { - int ret; - struct MHD_Response *response; - char *headervalue; - const char *strbase = "Basic realm="; - - response = MHD_create_response_from_buffer (0, NULL, - MHD_RESPMEM_PERSISTENT); - if (!response) - return MHD_NO; - - headervalue = malloc (strlen (strbase) + strlen (realm) + 1); - if (!headervalue) - return MHD_NO; - - strcpy (headervalue, strbase); - strcat (headervalue, realm); - - ret = MHD_add_response_header (response, "WWW-Authenticate", headervalue); - free (headervalue); - if (!ret) - { - MHD_destroy_response (response); - return MHD_NO; - } - - ret = MHD_queue_response (connection, MHD_HTTP_UNAUTHORIZED, response); - - MHD_destroy_response (response); - - return ret; - } - - static int - is_authenticated (struct MHD_Connection *connection, - const char *username, const char *password) - { - const char *headervalue; - char *expected_b64, *expected; - const char *strbase = "Basic "; - int authenticated; - - headervalue = - MHD_lookup_connection_value (connection, MHD_HEADER_KIND, - "Authorization"); - if (NULL == headervalue) - return 0; - if (0 != strncmp (headervalue, strbase, strlen (strbase))) - return 0; - - expected = malloc (strlen (username) + 1 + strlen (password) + 1); - if (NULL == expected) - return 0; - - strcpy (expected, username); - strcat (expected, ":"); - strcat (expected, password); - - expected_b64 = string_to_base64 (expected); - free (expected); - if (NULL == expected_b64) - return 0; - - authenticated = - (strcmp (headervalue + strlen (strbase), expected_b64) == 0); - - free (expected_b64); - - return authenticated; - } - - - static int - secret_page (struct MHD_Connection *connection) - { - int ret; - struct MHD_Response *response; - const char *page = "A secret."; - - response = - MHD_create_response_from_buffer (strlen (page), (void *) page, - MHD_RESPMEM_PERSISTENT); - if (!response) - return MHD_NO; - - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - - return ret; - } - - - static int - answer_to_connection (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) - { - if (0 != strcmp (method, "GET")) - return MHD_NO; - if (NULL == *con_cls) - { - *con_cls = connection; - return MHD_YES; - } - - if (!is_authenticated (connection, USER, PASSWORD)) - return ask_for_authentication (connection, REALM); - - return secret_page (connection); - } - - - int - main () - { - struct MHD_Daemon *daemon; - char *key_pem; - char *cert_pem; - - key_pem = load_file (SERVERKEYFILE); - cert_pem = load_file (SERVERCERTFILE); - - if ((key_pem == NULL) || (cert_pem == NULL)) - { - printf ("The key/certificate files could not be read.\n"); - return 1; - } - - daemon = - MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, PORT, NULL, - NULL, &answer_to_connection, NULL, - MHD_OPTION_HTTPS_MEM_KEY, key_pem, - MHD_OPTION_HTTPS_MEM_CERT, cert_pem, MHD_OPTION_END); - if (NULL == daemon) - { - printf ("%s\n", cert_pem); - - free (key_pem); - free (cert_pem); - - return 1; - } - - (void) getchar (); - - MHD_stop_daemon (daemon); - free (key_pem); - free (cert_pem); - - return 0; - } - - - -Tag Table: -Node: Top866 -Node: Introduction1917 -Node: Hello browser example3223 -Node: Exploring requests14247 -Node: Response headers19643 -Node: Supporting basic authentication27522 -Node: Processing POST data34913 -Node: Improved processing of POST data43534 -Node: Session management54177 -Node: Adding a layer of security57072 -Node: Bibliography71602 -Node: License text72797 -Node: Example programs97972 -Node: hellobrowser.c98285 -Node: logging.c99828 -Node: responseheaders.c101411 -Node: basicauthentication.c104035 -Node: simplepost.c106574 -Node: largepost.c112254 -Node: sessions.c119619 -Node: tlsauthentication.c141964 - -End Tag Table diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd-tutorial.texi b/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd-tutorial.texi deleted file mode 100644 index 104f00c3..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd-tutorial.texi +++ /dev/null @@ -1,181 +0,0 @@ -\input texinfo @c -*-texinfo-*- -@finalout -@setfilename libmicrohttpd-tutorial.info -@set UPDATED 17 November 2013 -@set UPDATED-MONTH November 2013 -@set EDITION 0.9.23 -@set VERSION 0.9.23 -@settitle A tutorial for GNU libmicrohttpd -@c Unify all the indices into concept index. -@syncodeindex fn cp -@syncodeindex vr cp -@syncodeindex ky cp -@syncodeindex pg cp -@syncodeindex tp cp - -@dircategory Software libraries -@direntry -* libmicrohttpdtutorial: (libmicrohttpd). A tutorial for GNU libmicrohttpd. -@end direntry - -@copying -This tutorial documents GNU libmicrohttpd version @value{VERSION}, last -updated @value{UPDATED}. - -Copyright (c) 2008 Sebastian Gerhardt. - -Copyright (c) 2010, 2011, 2012, 2013 Christian Grothoff. -@quotation -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.3 -or any later version published by the Free Software Foundation; -with no Invariant Sections, no Front-Cover Texts, and no Back-Cover -Texts. A copy of the license is included in the section entitled "GNU -Free Documentation License". -@end quotation -@end copying - -@titlepage -@title A Tutorial for GNU libmicrohttpd -@subtitle Version @value{VERSION} -@subtitle @value{UPDATED} -@author Sebastian Gerhardt (@email{sebgerhardt@@gmx.net}) -@author Christian Grothoff (@email{christian@@grothoff.org}) -@author Matthieu Speder (@email{mspeder@@users.sourceforge.net}) - -@page -@vskip 0pt plus 1filll -@insertcopying -@end titlepage - - - -@contents - -@ifnottex -@node Top -@top A Tutorial for GNU libmicrohttpd -@insertcopying -@end ifnottex - -@menu -* Introduction:: -* Hello browser example:: -* Exploring requests:: -* Response headers:: -* Supporting basic authentication:: -* Processing POST data:: -* Improved processing of POST data:: -* Session management:: -* Adding a layer of security:: -* Bibliography:: -* License text:: -* Example programs:: -@end menu - -@node Introduction -@chapter Introduction -@include chapters/introduction.inc - -@node Hello browser example -@chapter Hello browser example -@include chapters/hellobrowser.inc - -@node Exploring requests -@chapter Exploring requests -@include chapters/exploringrequests.inc - -@node Response headers -@chapter Response headers -@include chapters/responseheaders.inc - -@node Supporting basic authentication -@chapter Supporting basic authentication -@include chapters/basicauthentication.inc - -@node Processing POST data -@chapter Processing POST data -@include chapters/processingpost.inc - -@node Improved processing of POST data -@chapter Improved processing of POST data -@include chapters/largerpost.inc - -@node Session management -@chapter Session management -@include chapters/sessions.inc - -@node Adding a layer of security -@chapter Adding a layer of security -@include chapters/tlsauthentication.inc - -@node Bibliography -@appendix Bibliography -@include chapters/bibliography.inc - -@node License text -@appendix GNU Free Documentation License -@include fdl-1.3.texi - -@node Example programs -@appendix Example programs -@menu -* hellobrowser.c:: -* logging.c:: -* responseheaders.c:: -* basicauthentication.c:: -* simplepost.c:: -* largepost.c:: -* sessions.c:: -* tlsauthentication.c:: -@end menu - -@node hellobrowser.c -@section hellobrowser.c -@smalldisplay -@verbatiminclude examples/hellobrowser.c -@end smalldisplay - -@node logging.c -@section logging.c -@smalldisplay -@verbatiminclude examples/logging.c -@end smalldisplay - -@node responseheaders.c -@section responseheaders.c -@smalldisplay -@verbatiminclude examples/responseheaders.c -@end smalldisplay - -@node basicauthentication.c -@section basicauthentication.c -@smalldisplay -@verbatiminclude examples/basicauthentication.c -@end smalldisplay - -@node simplepost.c -@section simplepost.c -@smalldisplay -@verbatiminclude examples/simplepost.c -@end smalldisplay - -@node largepost.c -@section largepost.c -@smalldisplay -@verbatiminclude examples/largepost.c -@end smalldisplay - -@node sessions.c -@section sessions.c -@smalldisplay -@verbatiminclude examples/sessions.c -@end smalldisplay - -@node tlsauthentication.c -@section tlsauthentication.c -@smalldisplay -@verbatiminclude examples/tlsauthentication.c -@end smalldisplay - -@bye diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd.3 b/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd.3 deleted file mode 100644 index 13fcdcd3..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd.3 +++ /dev/null @@ -1,35 +0,0 @@ -.TH LIBMICROHTTPD "3" "21 Jun 2013 "libmicrohttpd" -.SH "NAME" -GNU libmicrohttpd \- library for embedding HTTP servers -.SH "SYNOPSIS" - - \fB#include - -.SH "DESCRIPTION" -.P -GNU libmicrohttpd (short MHD) allows applications to easily integrate the functionality of a simple HTTP server. MHD is a GNU package. -.P -The details of the API are described in comments in the header file, a detailed reference documentation, a tutorial, and in brief on the MHD webpage. -.P -.SH "SEE ALSO" -\fBcurl\fP(1), \fBlibcurl\fP(3) - -.SH "LEGAL NOTICE" -libmicrohttpd is released under both the LGPL Version 2.1 or higher and the GNU GPL with eCos extension. For details on both licenses please read the respective appendix in the manual. - -.SH "FILES" -.TP -microhttpd.h -libmicrohttpd include file -.TP -libmicrohttpd.so -libmicrohttpd library - -.SH "REPORTING BUGS" -Report bugs by using mantis . - -.SH "AUTHORS" -GNU libmicrohttpd was originally designed by Christian Grothoff and Chris GauthierDickey . The original implementation was done by Daniel Pittman and Christian Grothoff. SSL/TLS support was added by Sagie Amir using code from GnuTLS. See the AUTHORS file in the distribution for a more detailed list of contributors. - -.SH "AVAILABILITY" -You can obtain the latest version from http://www.gnu.org/software/libmicrohttpd/. diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd.info b/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd.info deleted file mode 100644 index 7db83c7d..00000000 Binary files a/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd.info and /dev/null differ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd.texi b/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd.texi deleted file mode 100644 index 7e13a27a..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/libmicrohttpd.texi +++ /dev/null @@ -1,2824 +0,0 @@ -\input texinfo -@setfilename libmicrohttpd.info -@include version.texi -@settitle The GNU libmicrohttpd Reference Manual -@c Unify all the indices into concept index. -@syncodeindex vr cp -@syncodeindex ky cp -@syncodeindex pg cp -@copying -This manual is for GNU libmicrohttpd -(version @value{VERSION}, @value{UPDATED}), a library for embedding -an HTTP(S) server into C applications. - -Copyright @copyright{} 2007--2013 Christian Grothoff - -@quotation -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.3 -or any later version published by the Free Software Foundation; -with no Invariant Sections, no Front-Cover Texts, and no Back-Cover -Texts. A copy of the license is included in the section entitled "GNU -Free Documentation License". -@end quotation -@end copying - -@dircategory Software libraries -@direntry -* libmicrohttpd: (libmicrohttpd). Embedded HTTP server library. -@end direntry - -@c -@c Titlepage -@c -@titlepage -@title The GNU libmicrohttpd Reference Manual -@subtitle Version @value{VERSION} -@subtitle @value{UPDATED} -@author Marco Maggi (@email{marco.maggi-ipsu@@poste.it}) -@author Christian Grothoff (@email{christian@@grothoff.org}) -@page -@vskip 0pt plus 1filll -@insertcopying -@end titlepage - -@summarycontents -@contents - -@c ------------------------------------------------------------ -@ifnottex -@node Top -@top The GNU libmicrohttpd Library -@insertcopying -@end ifnottex - -@menu -* microhttpd-intro:: Introduction. -* microhttpd-const:: Constants. -* microhttpd-struct:: Structures type definition. -* microhttpd-cb:: Callback functions definition. -* microhttpd-init:: Starting and stopping the server. -* microhttpd-inspect:: Implementing external @code{select}. -* microhttpd-requests:: Handling requests. -* microhttpd-responses:: Building responses to requests. -* microhttpd-flow:: Flow control. -* microhttpd-dauth:: Utilizing Authentication. -* microhttpd-post:: Adding a @code{POST} processor. -* microhttpd-info:: Obtaining and modifying status information. -* microhttpd-util:: Utilities. - -Appendices - -* GNU-LGPL:: The GNU Lesser General Public License says how you - can copy and share almost all of `libmicrohttpd'. -* GNU GPL with eCos Extension:: The GNU General Public License with eCos extension says how you - can copy and share some parts of `libmicrohttpd'. -* GNU-FDL:: The GNU Free Documentation License says how you - can copy and share the documentation of `libmicrohttpd'. - -Indices - -* Concept Index:: Index of concepts and programs. -* Function and Data Index:: Index of functions, variables and data types. -* Type Index:: Index of data types. -@end menu - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-intro -@chapter Introduction - - -@noindent -All symbols defined in the public API start with @code{MHD_}. MHD -is a small HTTP daemon library. As such, it does not have any API -for logging errors (you can only enable or disable logging to stderr). -Also, it may not support all of the HTTP features directly, where -applicable, portions of HTTP may have to be handled by clients of the -library. - -The library is supposed to handle everything that it must handle -(because the API would not allow clients to do this), such as basic -connection management; however, detailed interpretations of headers --- -such as range requests --- and HTTP methods are left to clients. The -library does understand @code{HEAD} and will only send the headers of -the response and not the body, even if the client supplied a body. The -library also understands headers that control connection management -(specifically, @code{Connection: close} and @code{Expect: 100 continue} -are understood and handled automatically). - -MHD understands @code{POST} data and is able to decode certain -formats (at the moment only @code{application/x-www-form-urlencoded} -and @code{multipart/form-data}) using the post processor API. The -data stream of a POST is also provided directly to the main -application, so unsupported encodings could still be processed, just -not conveniently by MHD. - -The header file defines various constants used by the HTTP protocol. -This does not mean that MHD actually interprets all of these values. -The provided constants are exported as a convenience for users of the -library. MHD does not verify that transmitted HTTP headers are -part of the standard specification; users of the library are free to -define their own extensions of the HTTP standard and use those with -MHD. - -All functions are guaranteed to be completely reentrant and -thread-safe. MHD checks for allocation failures and tries to -recover gracefully (for example, by closing the connection). -Additionally, clients can specify resource limits on the overall -number of connections, number of connections per IP address and memory -used per connection to avoid resource exhaustion. - -@section Scope - -MHD is currently used in a wide range of implementations. -Examples based on reports we've received from developers include: -@itemize -@item Embedded HTTP server on a cortex M3 (128 KB code space) -@item Large-scale multimedia server (reportedly serving at the - simulator limit of 7.5 GB/s) -@item Administrative console (via HTTP/HTTPS) for network appliances -@c If you have other interesting examples, please let us know -@end itemize - -@section Thread modes and event loops -@cindex poll -@cindex epoll -@cindex select - -MHD supports four basic thread modes and up to three event loop -styes. - -The four basic thread modes are external (MHD creates no threads, -event loop is fully managed by the application), internal (MHD creates -one thread for all connections), thread pool (MHD creates a thread -pool which is used to process all connections) and -thread-per-connection (MHD creates one listen thread and then one -thread per accepted connection). - -These thread modes are then combined with the event loop styles. -MHD support select, poll and epoll. epoll is only available on -Linux, poll may not be available on some platforms. Note that -it is possible to combine MHD using epoll with an external -select-based event loop. - -The default (if no other option is passed) is ``external select''. -The highest performance can typically be obtained with a thread pool -using @code{epoll}. Apache Benchmark (ab) was used to compare the -performance of @code{select} and @code{epoll} when using a thread pool -and a large number of connections. @ref{fig:performance} shows the -resulting plot from the @code{benchmark.c} example, which measures the -latency between an incoming request and the completion of the -transmission of the response. In this setting, the @code{epoll} -thread pool with four threads was able to handle more than 45,000 -connections per second on loopback (with Apache Benchmark running -three processes on the same machine). -@cindex performance - - -@float Figure,fig:performance -@image{performance_data,400pt,300pt,Data,.png} -@caption{Performance measurements for select vs. epoll (with thread-pool).} -@end float - - -Not all combinations of thread modes and event loop styles are -supported. This is partially to keep the API simple, and partially -because some combinations simply make no sense as others are strictly -superior. Note that the choice of style depends fist of all on the -application logic, and then on the performance requirements. -Applications that perform a blocking operation while handling a -request within the callbacks from MHD must use a thread per -connection. This is typically rather costly. Applications that do -not support threads or that must run on embedded devices without -thread-support must use the external mode. Using @code{epoll} is only -supported on Linux, thus portable applications must at least have a -fallback option available. @ref{tbl:supported} lists the sane -combinations. - -@float Table,tbl:supported -@multitable {@b{thread-per-connection}} {@b{select}} {@b{poll}} {@b{epoll}} -@item @tab @b{select} @tab @b{poll} @tab @b{epoll} -@item @b{external} @tab yes @tab no @tab yes -@item @b{internal} @tab yes @tab yes @tab yes -@item @b{thread pool} @tab yes @tab yes @tab yes -@item @b{thread-per-connection} @tab yes @tab yes @tab no -@end multitable -@caption{Supported combinations of event styles and thread modes.} -@end float - - -@section Compiling GNU libmicrohttpd -@cindex compilation -@cindex embedded systems -@cindex portability - -MHD uses the standard GNU system where the usual build process -involves running -@verbatim -$ ./configure -$ make -$ make install -@end verbatim - -MHD supports various options to be given to configure to tailor the -binary to a specific situation. Note that some of these options will -remove portions of the MHD code that are required for -binary-compatibility. They should only be used on embedded systems -with tight resource constraints and no concerns about library -versioning. Standard distributions including MHD are expected to -always ship with all features enabled, otherwise unexpected -incompatibilities can arise! - -Here is a list of MHD-specific options that can be given to configure -(canonical configure options such as ``--prefix'' are also supported, for a -full list of options run ``./configure --help''): - -@table @code -@item ``--disable-curl'' -disable running testcases using libcurl - -@item ``--disable-largefile'' -disable support for 64-bit files - -@item ``--disable-messages'' -disable logging of error messages (smaller binary size, not so much fun for debugging) - -@item ``--disable-https'' -disable HTTPS support, even if GNUtls is found; this option must be used if eCOS license is desired as an option (in all cases the resulting binary falls under a GNU LGPL-only license) - -@item ``--disable-postprocessor'' -do not include the post processor API (results in binary incompatibility) - -@item ``--disable-dauth'' -do not include the authentication APIs (results in binary incompatibility) - -@item ``--disable-epoll -do not include epoll support, even on Linux (minimally smaller binary size, good for testing portability to non-Linux systems) - -@item ``--enable-coverage'' -set flags for analysis of code-coverage with gcc/gcov (results in slow, large binaries) - -@item ``--with-gcrypt=PATH'' -specifies path to libgcrypt installation - -@item ``--with-gnutls=PATH'' -specifies path to libgnutls installation - - -@end table - -@section Validity of pointers - -MHD will give applications access to its internal data structures -via pointers via arguments and return values from its API. This -creates the question as to how long those pointers are assured to -stay valid. - -Most MHD data structures are associated with the connection of an -HTTP client. Thus, pointers associated with a connection are -typically valid until the connection is finished, at which point -MHD will call the @code{MHD_RequestCompletedCallback} if one is -registered. Applications that have such a callback registered -may assume that keys and values from the -@code{MHD_KeyValueIterator}, return values from -@code{MHD_lookup_connection_value} and the @code{url}, -@code{method} and @code{version} arguments to the -@code{MHD_AccessHandlerCallback} will remain valid until the -respective @code{MHD_RequestCompletedCallback} is invoked. - -In contrast, the @code{upload_data} argument of -@code{MHD_RequestCompletedCallback} as well as all pointers -from the @code{MHD_PostDataIterator} are only valid for the -duration of the callback. - -Pointers returned from @code{MHD_get_response_header} are -valid as long as the response itself is valid. - - -@section Including the microhttpd.h header -@cindex portability -@cindex microhttpd.h - -Ideally, before including "microhttpd.h" you should add the necessary -includes to define the @code{uint64_t}, @code{size_t}, @code{fd_set}, -@code{socklen_t} and @code{struct sockaddr} data types. Which -specific headers are needed may depend on your platform and your build -system might include some tests to provide you with the necessary -conditional operations. For possible suggestions consult -@code{platform.h} and @code{configure.ac} in the MHD distribution. - -Once you have ensured that you manually (!) included the right headers -for your platform before "microhttpd.h", you should also add a line -with @code{#define MHD_PLATFORM_H} which will prevent the -"microhttpd.h" header from trying (and, depending on your platform, -failing) to include the right headers. - -If you do not define MHD_PLATFORM_H, the "microhttpd.h" header will -automatically include headers needed on GNU/Linux systems (possibly -causing problems when porting to other platforms). - -@section SIGPIPE -@cindex signals -MHD does not install a signal handler for SIGPIPE. On platforms -where this is possible (such as GNU/Linux), it disables SIGPIPE for -its I/O operations (by passing MSG_NOSIGNAL). On other platforms, -SIGPIPE signals may be generated from network operations by -MHD and will cause the process to die unless the developer -explicitly installs a signal handler for SIGPIPE. - -Hence portable code using MHD must install a SIGPIPE handler or -explicitly block the SIGPIPE signal. MHD does not do so in order -to avoid messing with other parts of the application that may -need to handle SIGPIPE in a particular way. You can make your application handle SIGPIPE by calling the following function in @code{main}: - -@verbatim -static void -catcher (int sig) -{ -} - -static void -ignore_sigpipe () -{ - struct sigaction oldsig; - struct sigaction sig; - - sig.sa_handler = &catcher; - sigemptyset (&sig.sa_mask); -#ifdef SA_INTERRUPT - sig.sa_flags = SA_INTERRUPT; /* SunOS */ -#else - sig.sa_flags = SA_RESTART; -#endif - if (0 != sigaction (SIGPIPE, &sig, &oldsig)) - fprintf (stderr, - "Failed to install SIGPIPE handler: %s\n", strerror (errno)); -} -@end verbatim - -@section MHD_UNSIGNED_LONG_LONG -@cindex long long -@cindex MHD_LONG_LONG -@cindex IAR -@cindex ARM -@cindex cortex m3 -@cindex embedded systems - -Some platforms do not support @code{long long}. Hence MHD defines a -macro @code{MHD_UNSIGNED LONG_LONG} which will default to -@code{unsigned long long}. For standard desktop operating systems, -this is all you need to know. - -However, if your platform does not support @code{unsigned long long}, -you should change "platform.h" to define @code{MHD_LONG_LONG} and -@code{MHD_UNSIGNED_LONG_LONG} to an appropriate alternative type and -also define @code{MHD_LONG_LONG_PRINTF} and -@code{MHD_UNSIGNED_LONG_LONG_PRINTF} to the corresponding format -string for printing such a data type. Note that the ``signed'' -versions are deprecated. Also, for historical reasons, -@code{MHD_LONG_LONG_PRINTF} is without the percent sign, whereas -@code{MHD_UNSIGNED_LONG_LONG_PRINTF} is with the percent sign. Newly -written code should only use the unsigned versions. However, you need -to define both in "platform.h" if you need to change the definition -for the specific platform. - - -@section Portability to W32 - -libmicrohttpd in general ported well to W32. Most libmicrohttpd features -are supported. W32 do not support some functions, like epoll and -corresponding MHD features are not available on W32. - - -@section Portability to z/OS - -To compile MHD on z/OS, extract the archive and run - -@verbatim -iconv -f UTF-8 -t IBM-1047 contrib/ascebc > /tmp/ascebc.sh -chmod +x /tmp/ascebc.sh -for n in `find * -type f` -do - /tmp/ascebc.sh $n -done -@end verbatim -to convert all source files to EBCDIC. Note that you must run -@code{configure} from the directory where the configure script is -located. Otherwise, configure will fail to find the -@code{contrib/xcc} script (which is a wrapper around the z/OS c89 -compiler). - - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-const -@chapter Constants - - -@deftp {Enumeration} MHD_FLAG -Options for the MHD daemon. - -Note that if neither @code{MHD_USE_THREAD_PER_CONNECTION} nor -@code{MHD_USE_SELECT_INTERNALLY} is used, the client wants control over -the process and will call the appropriate microhttpd callbacks. - -Starting the daemon may also fail if a particular option is not -implemented or not supported on the target platform (i.e. no support for -@acronym{SSL}, threads or IPv6). SSL support generally depends on -options given during MHD compilation. Threaded operations -(including @code{MHD_USE_SELECT_INTERNALLY}) are not supported on -Symbian. - -@table @code -@item MHD_NO_FLAG -No options selected. - -@item MHD_USE_DEBUG -@cindex debugging -Run in debug mode. If this flag is used, the library should print error -messages and warnings to stderr. Note that for this -run-time option to have any effect, MHD needs to be -compiled with messages enabled. This is done by default except you ran -configure with the @code{--disable-messages} flag set. - -@item MHD_USE_SSL -@cindex TLS -@cindex SSL -Run in HTTPS-mode. If you specify @code{MHD_USE_SSL} and MHD was -compiled without SSL support, @code{MHD_start_daemon} will return -NULL. - -@item MHD_USE_THREAD_PER_CONNECTION -Run using one thread per connection. - -@item MHD_USE_SELECT_INTERNALLY -Run using an internal thread doing @code{SELECT}. - -@item MHD_USE_IPv6 -@cindex IPv6 -Run using the IPv6 protocol (otherwise, MHD will just support IPv4). -If you specify @code{MHD_USE_IPV6} and the local platform does not -support it, @code{MHD_start_daemon} will return NULL. - -If you want MHD to support IPv4 and IPv6 using a single socket, pass -MHD_USE_DUAL_STACK, otherwise, if you only pass this option, MHD will -try to bind to IPv6-only (resulting in no IPv4 support). - -@item MHD_USE_DUAL_STACK -@cindex IPv6 -Use a single socket for IPv4 and IPv6. Note that this will mean -that IPv4 addresses are returned by MHD in the IPv6-mapped format -(the 'struct sockaddr_in6' format will be used for IPv4 and IPv6). - -@item MHD_USE_PEDANTIC_CHECKS -Be pedantic about the protocol (as opposed to as tolerant as possible). -Specifically, at the moment, this flag causes MHD to reject HTTP -1.1 connections without a @code{Host} header. This is required by the -standard, but of course in violation of the ``be as liberal as possible -in what you accept'' norm. It is recommended to turn this @strong{ON} -if you are testing clients against MHD, and @strong{OFF} in -production. - -@item MHD_USE_POLL -@cindex FD_SETSIZE -@cindex poll -@cindex select -Use poll instead of select. This allows sockets with descriptors -@code{>= FD_SETSIZE}. This option currently only works in conjunction -with @code{MHD_USE_THREAD_PER_CONNECTION} or -@code{MHD_USE_INTERNAL_SELECT} (at this point). If you specify -@code{MHD_USE_POLL} and the local platform does not support it, -@code{MHD_start_daemon} will return NULL. - -@item MHD_USE_EPOLL_LINUX_ONLY -@cindex FD_SETSIZE -@cindex epoll -@cindex select -Use epoll instead of poll or select. This allows sockets with -descriptors @code{>= FD_SETSIZE}. This option is only available on -Linux systems and only works in conjunction with -@code{MHD_USE_THREAD_PER_CONNECTION} (at this point). If you specify -@code{MHD_USE_EPOLL_LINUX_ONLY} and the local platform does not -support it, @code{MHD_start_daemon} will return NULL. Using epoll -instead of select or poll can in some situations result in significantly -higher performance as the system call has fundamentally lower complexity -(O(1) for epoll vs. O(n) for select/poll where n is the number of -open connections). - -@item MHD_SUPPRESS_DATE_NO_CLOCK -@cindex date -@cindex clock -@cindex embedded systems -Suppress (automatically) adding the 'Date:' header to HTTP responses. -This option should ONLY be used on systems that do not have a clock -and that DO provide other mechanisms for cache control. See also -RFC 2616, section 14.18 (exception 3). - - -@item MHD_USE_NO_LISTEN_SOCKET -@cindex listen -@cindex proxy -@cindex embedded systems -Run the HTTP server without any listen socket. This option only makes -sense if @code{MHD_add_connection} is going to be used exclusively to -connect HTTP clients to the HTTP server. This option is incompatible -with using a thread pool; if it is used, -@code{MHD_OPTION_THREAD_POOL_SIZE} is ignored. - -@item MHD_USE_PIPE_FOR_SHUTDOWN -@cindex quiesce -Force MHD to use a signal pipe to notify the event loop (of threads) -of our shutdown. This is required if an appliction uses -@code{MHD_USE_INTERNAL_SELECT} or @code{MHD_USE_THREAD_PER_CONNECTION} -and then performs @code{MHD_quiesce_daemon} (which eliminates our -ability to signal termination via the listen socket). In these modes, -@code{MHD_quiesce_daemon} will fail if this option was not set. Also, -use of this option is automatic (as in, you do not even have to -specify it), if @code{MHD_USE_NO_LISTEN_SOCKET} is specified. In -"external" select mode, this option is always simply ignored. - -@item MHD_USE_SUSPEND_RESUME -Enables using @code{MHD_suspend_connection} and -@code{MHD_resume_connection}, as performing these calls requires some -additional pipes to be created, and code not using these calls should -not pay the cost. - -@item MHD_USE_TCP_FASTOPEN -@cindex listen -Enable TCP_FASTOPEN on the listen socket. TCP_FASTOPEN is currently -supported on Linux >= 3.6. On other systems using this option with -cause @code{MHD_start_daemon} to fail. - -@end table -@end deftp - - -@deftp {Enumeration} MHD_OPTION -MHD options. Passed in the varargs portion of -@code{MHD_start_daemon()}. - -@table @code -@item MHD_OPTION_END -No more options / last option. This is used to terminate the VARARGs -list. - -@item MHD_OPTION_CONNECTION_MEMORY_LIMIT -@cindex memory, limiting memory utilization -Maximum memory size per connection (followed by a @code{size_t}). The -default is 32 kB (32*1024 bytes) as defined by the internal constant -@code{MHD_POOL_SIZE_DEFAULT}. Values above 128k are unlikely to -result in much benefit, as half of the memory will be typically used -for IO, and TCP buffers are unlikely to support window sizes above 64k -on most systems. - -@item MHD_OPTION_CONNECTION_MEMORY_INCREMENT -@cindex memory -Increment to use for growing the read buffer (followed by a -@code{size_t}). The default is 1024 (bytes). Increasing this value -will make MHD use memory for reading more aggressively, which can -reduce the number of @code{recvfrom} calls but may increase the number -of @code{sendto} calls. The given value must fit within -MHD_OPTION_CONNECTION_MEMORY_LIMIT. - -@item MHD_OPTION_CONNECTION_LIMIT -@cindex connection, limiting number of connections -Maximum number of concurrent connections to accept (followed by an -@code{unsigned int}). The default is @code{FD_SETSIZE - 4} (the -maximum number of file descriptors supported by @code{select} minus -four for @code{stdin}, @code{stdout}, @code{stderr} and the server -socket). In other words, the default is as large as possible. - -Note that if you set a low connection limit, you can easily get into -trouble with browsers doing request pipelining. For example, if your -connection limit is ``1'', a browser may open a first connection to -access your ``index.html'' file, keep it open but use a second -connection to retrieve CSS files, images and the like. In fact, modern -browsers are typically by default configured for up to 15 parallel -connections to a single server. If this happens, MHD will refuse to -even accept the second connection until the first connection is -closed --- which does not happen until timeout. As a result, the -browser will fail to render the page and seem to hang. If you expect -your server to operate close to the connection limit, you should -first consider using a lower timeout value and also possibly add -a ``Connection: close'' header to your response to ensure that -request pipelining is not used and connections are closed immediately -after the request has completed: -@example -MHD_add_response_header (response, - MHD_HTTP_HEADER_CONNECTION, - "close"); -@end example - -@item MHD_OPTION_CONNECTION_TIMEOUT -@cindex timeout -After how many seconds of inactivity should a connection automatically -be timed out? (followed by an @code{unsigned int}; use zero for no -timeout). The default is zero (no timeout). - -@item MHD_OPTION_NOTIFY_COMPLETED -Register a function that should be called whenever a request has been -completed (this can be used for application-specific clean up). -Requests that have never been presented to the application (via -@code{MHD_AccessHandlerCallback()}) will not result in -notifications. - -This option should be followed by @strong{TWO} pointers. First a -pointer to a function of type @code{MHD_RequestCompletedCallback()} -and second a pointer to a closure to pass to the request completed -callback. The second pointer maybe @code{NULL}. - -@item MHD_OPTION_NOTIFY_CONNECTION -Register a function that should be called when the TCP connection to a -client is opened or closed. Note that -@code{MHD_OPTION_NOTIFY_COMPLETED} and the @code{con_cls} argument to -the @code{MHD_AccessHandlerCallback} are per HTTP request (and there -can be multiple HTTP requests per TCP connection). The registered -callback is called twice per TCP connection, with -@code{MHD_CONNECTION_NOTIFY_STARTED} and -@code{MHD_CONNECTION_NOTIFY_CLOSED} respectively. An additional -argument can be used to store TCP connection specific information, -which can be retrieved using @code{MHD_CONNECTION_INFO_SOCKET_CONTEXT} -during the lifetime of the TCP connection. The respective location is -not the same as the HTTP-request-specific @code{con_cls} from the -@code{MHD_AccessHandlerCallback}. - -This option should be followed by @strong{TWO} pointers. First a -pointer to a function of type @code{MHD_NotifyConnectionCallback()} -and second a pointer to a closure to pass to the request completed -callback. The second pointer maybe @code{NULL}. - -@item MHD_OPTION_PER_IP_CONNECTION_LIMIT -Limit on the number of (concurrent) connections made to the -server from the same IP address. Can be used to prevent one -IP from taking over all of the allowed connections. If the -same IP tries to establish more than the specified number of -connections, they will be immediately rejected. The option -should be followed by an @code{unsigned int}. The default is -zero, which means no limit on the number of connections -from the same IP address. - -@item MHD_OPTION_SOCK_ADDR -@cindex bind, restricting bind -Bind daemon to the supplied socket address. This option should be followed by a -@code{struct sockaddr *}. If @code{MHD_USE_IPv6} is specified, -the @code{struct sockaddr*} should point to a @code{struct sockaddr_in6}, -otherwise to a @code{struct sockaddr_in}. If this option is not specified, -the daemon will listen to incoming connections from anywhere. If you use this -option, the 'port' argument from @code{MHD_start_daemon} is ignored and the port -from the given @code{struct sockaddr *} will be used instead. - -@item MHD_OPTION_URI_LOG_CALLBACK -@cindex debugging -@cindex logging -@cindex query string -Specify a function that should be called before parsing the URI from -the client. The specified callback function can be used for processing -the URI (including the options) before it is parsed. The URI after -parsing will no longer contain the options, which maybe inconvenient for -logging. This option should be followed by two arguments, the first -one must be of the form -@example - void * my_logger(void * cls, const char * uri, struct MHD_Connection *con) -@end example -where the return value will be passed as -@code{*con_cls} in calls to the @code{MHD_AccessHandlerCallback} -when this request is processed later; returning a -value of @code{NULL} has no special significance; (however, -note that if you return non-@code{NULL}, you can no longer -rely on the first call to the access handler having -@code{NULL == *con_cls} on entry) -@code{cls} will be set to the second argument following -MHD_OPTION_URI_LOG_CALLBACK. Finally, @code{uri} will -be the 0-terminated URI of the request. - -Note that during the time of this call, most of the connection's state -is not initialized (as we have not yet parsed he headers). However, -information about the connecting client (IP, socket) is available. - -@item MHD_OPTION_HTTPS_MEM_KEY -@cindex SSL -@cindex TLS -Memory pointer to the private key to be used by the -HTTPS daemon. This option should be followed by an -"const char*" argument. -This should be used in conjunction with 'MHD_OPTION_HTTPS_MEM_CERT'. - -@item MHD_OPTION_HTTPS_KEY_PASSWORD -@cindex SSL -@cindex TLS -Memory pointer to the password that decrypts the -private key to be used by the HTTPS daemon. -This option should be followed by an -"const char*" argument. -This should be used in conjunction with 'MHD_OPTION_HTTPS_MEM_KEY'. - -The password (or passphrase) is only used immediately during -@code{MHD_start_daemon()}. Thus, the application may want to -erase it from memory afterwards for additional security. - -@item MHD_OPTION_HTTPS_MEM_CERT -@cindex SSL -@cindex TLS -Memory pointer to the certificate to be used by the -HTTPS daemon. This option should be followed by an -"const char*" argument. -This should be used in conjunction with 'MHD_OPTION_HTTPS_MEM_KEY'. - -@item MHD_OPTION_HTTPS_MEM_TRUST -@cindex SSL -@cindex TLS -Memory pointer to the CA certificate to be used by the -HTTPS daemon to authenticate and trust clients certificates. -This option should be followed by an "const char*" argument. -The presence of this option activates the request of certificate -to the client. The request to the client is marked optional, and -it is the responsibility of the server to check the presence -of the certificate if needed. -Note that most browsers will only present a client certificate -only if they have one matching the specified CA, not sending -any certificate otherwise. - -@item MHD_OPTION_HTTPS_CRED_TYPE -@cindex SSL -@cindex TLS -Daemon credentials type. Either certificate or anonymous, -this option should be followed by one of the values listed in -"enum gnutls_credentials_type_t". - -@item MHD_OPTION_HTTPS_PRIORITIES -@cindex SSL -@cindex TLS -@cindex cipher -SSL/TLS protocol version and ciphers. -This option must be followed by an "const char *" argument -specifying the SSL/TLS protocol versions and ciphers that -are acceptable for the application. The string is passed -unchanged to gnutls_priority_init. If this option is not -specified, ``NORMAL'' is used. - -@item MHD_OPTION_HTTPS_CERT_CALLBACK -@cindex SSL -@cindex TLS -@cindex SNI -Use a callback to determine which X.509 certificate should be used for -a given HTTPS connection. This option should be followed by a -argument of type "gnutls_certificate_retrieve_function2 *". This -option provides an alternative to MHD_OPTION_HTTPS_MEM_KEY and -MHD_OPTION_HTTPS_MEM_CERT. You must use this version if multiple -domains are to be hosted at the same IP address using TLS's Server -Name Indication (SNI) extension. In this case, the callback is -expected to select the correct certificate based on the SNI -information provided. The callback is expected to access the SNI data -using gnutls_server_name_get(). Using this option requires GnuTLS 3.0 -or higher. - -@item MHD_OPTION_DIGEST_AUTH_RANDOM -@cindex digest auth -@cindex random -Digest Authentication nonce's seed. - -This option should be followed by two arguments. First an integer of -type "size_t" which specifies the size of the buffer pointed to by the -second argument in bytes. Note that the application must ensure that -the buffer of the second argument remains allocated and unmodified -while the daemon is running. For security, you SHOULD provide a fresh -random nonce when using MHD with Digest Authentication. - -@item MHD_OPTION_NONCE_NC_SIZE -@cindex digest auth -@cindex replay attack - -Size of an array of nonce and nonce counter map. This option must be -followed by an "unsigned int" argument that have the size (number of -elements) of a map of a nonce and a nonce-counter. If this option -is not specified, a default value of 4 will be used (which might be -too small for servers handling many requests). If you do not use -digest authentication at all, you can specify a value of zero to -save some memory. - -You should calculate the value of NC_SIZE based on the number of -connections per second multiplied by your expected session duration -plus a factor of about two for hash table collisions. For example, if -you expect 100 digest-authenticated connections per second and the -average user to stay on your site for 5 minutes, then you likely need -a value of about 60000. On the other hand, if you can only expect -only 10 digest-authenticated connections per second, tolerate browsers -getting a fresh nonce for each request and expect a HTTP request -latency of 250 ms, then a value of about 5 should be fine. - - -@item MHD_OPTION_LISTEN_SOCKET -@cindex systemd -Listen socket to use. Pass a listen socket for MHD to use -(systemd-style). If this option is used, MHD will not open its own -listen socket(s). The argument passed must be of type "int" and refer -to an existing socket that has been bound to a port and is listening. - -@item MHD_OPTION_EXTERNAL_LOGGER -@cindex logging -Use the given function for logging error messages. -This option must be followed by two arguments; the -first must be a pointer to a function -of type 'void fun(void * arg, const char * fmt, va_list ap)' -and the second a pointer of type 'void*' which will -be passed as the "arg" argument to "fun". - -Note that MHD will not generate any log messages without -the MHD_USE_DEBUG flag set and if MHD was compiled -with the "--disable-messages" flag. - -@item MHD_OPTION_THREAD_POOL_SIZE -@cindex performance -Number (unsigned int) of threads in thread pool. Enable -thread pooling by setting this value to to something -greater than 1. Currently, thread model must be -MHD_USE_SELECT_INTERNALLY if thread pooling is enabled -(@code{MHD_start_daemon} returns @code{NULL} for an unsupported thread -model). - -@item MHD_OPTION_ARRAY -@cindex options -@cindex foreign-function interface -This option can be used for initializing MHD using options from an -array. A common use for this is writing an FFI for MHD. The actual -options given are in an array of 'struct MHD_OptionItem', so this -option requires a single argument of type 'struct MHD_OptionItem'. -The array must be terminated with an entry @code{MHD_OPTION_END}. - -An example for code using MHD_OPTION_ARRAY is: -@example -struct MHD_OptionItem ops[] = @{ - @{ MHD_OPTION_CONNECTION_LIMIT, 100, NULL @}, - @{ MHD_OPTION_CONNECTION_TIMEOUT, 10, NULL @}, - @{ MHD_OPTION_END, 0, NULL @} -@}; -d = MHD_start_daemon(0, 8080, NULL, NULL, dh, NULL, - MHD_OPTION_ARRAY, ops, - MHD_OPTION_END); -@end example -For options that expect a single pointer argument, the -second member of the @code{struct MHD_OptionItem} is ignored. -For options that expect two pointer arguments, the first -argument must be cast to @code{intptr_t}. - -@item MHD_OPTION_UNESCAPE_CALLBACK -@cindex internationalization -@cindex escaping - -Specify a function that should be called for unescaping escape -sequences in URIs and URI arguments. Note that this function will NOT -be used by the MHD_PostProcessor. If this option is not specified, -the default method will be used which decodes escape sequences of the -form "%HH". This option should be followed by two arguments, the -first one must be of the form - -@example - size_t my_unescaper(void * cls, struct MHD_Connection *c, char *s) -@end example - -where the return value must be @code{strlen(s)} and @code{s} should be -updated. Note that the unescape function must not lengthen @code{s} -(the result must be shorter than the input and still be 0-terminated). -@code{cls} will be set to the second argument following -MHD_OPTION_UNESCAPE_CALLBACK. - - -@item MHD_OPTION_THREAD_STACK_SIZE -@cindex stack -@cindex thread -@cindex pthread -@cindex embedded systems -Maximum stack size for threads created by MHD. This option must be -followed by a @code{size_t}). Not specifying this option or using -a value of zero means using the system default (which is likely to -differ based on your platform). - -@item MHD_OPTION_TCP_FASTQUEUE_QUEUE_SIZE -@cindex listen -When the flag @code{MHD_USE_TCP_FASTOPEN} is used, this option sets the -connection handshake queue size for the TCP FASTOPEN connections. Note -that a TCP FASTOPEN connection handshake occupies more resources than a -TCP handshake as the SYN packets also contain DATA which is kept in the -associate state until handshake is completed. If this option is not -given the queue size is set to a default value of 10. This option must -be followed by a @code{unsigned int}. - -@item MHD_OPTION_HTTPS_MEM_DHPARAMS -@cindex TLS -@cindex SSL -@cindex DH -Memory pointer for the Diffie-Hellman parameters (dh.pem) to be used -by the HTTPS daemon for key exchange. This option must be followed by -a @code{const char *} argument. The argument would be a zero-terminated -string with a PEM encoded PKCS3 DH parameters structure suitable -for passing to @code{gnutls_dh_parms_import_pkcs3}. - -@item MHD_OPTION_LISTENING_ADDRESS_REUSE -@cindex bind, restricting bind -@cindex reusing listening address -This option must be followed by a @code{unsigned int} argument. -If this option is present and true (nonzero) parameter is given, allow reusing -the address:port of the listening socket (using @code{SO_REUSEPORT} on most -platforms, and @code{SO_REUSEADDR} on Windows). If a false (zero) parameter is -given, disallow reusing the the address:port of the listening socket (this -usually requires no special action, but @code{SO_EXCLUSIVEADDRUSE} is needed on -Windows). If this option is not present, default behaviour is undefined -(currently, @code{SO_REUSEADDR} is used on all platforms, which disallows -address:port reusing with the exception of Windows). - -@end table -@end deftp - - -@deftp {C Struct} MHD_OptionItem -Entry in an MHD_OPTION_ARRAY. See the @code{MHD_OPTION_ARRAY} option -argument for its use. - -The @code{option} member is used to specify which option is specified -in the array. The other members specify the respective argument. - -Note that for options taking only a single pointer, the -@code{ptr_value} member should be set. For options taking two pointer -arguments, the first pointer must be cast to @code{intptr_t} and both -the @code{value} and the @code{ptr_value} members should be used to -pass the two pointers. -@end deftp - - -@deftp {Enumeration} MHD_ValueKind -The @code{MHD_ValueKind} specifies the source of the key-value pairs in -the HTTP protocol. - -@table @code -@item MHD_RESPONSE_HEADER_KIND -Response header. - -@item MHD_HEADER_KIND -HTTP header. - -@item MHD_COOKIE_KIND -@cindex cookie -Cookies. Note that the original HTTP header containing the cookie(s) -will still be available and intact. - -@item MHD_POSTDATA_KIND -@cindex POST method -@code{POST} data. This is available only if a content encoding -supported by MHD is used (currently only @acronym{URL} encoding), and -only if the posted content fits within the available memory pool. Note -that in that case, the upload data given to the -@code{MHD_AccessHandlerCallback()} will be empty (since it has -already been processed). - -@item MHD_GET_ARGUMENT_KIND -@code{GET} (URI) arguments. - -@item MHD_FOOTER_KIND -HTTP footer (only for http 1.1 chunked encodings). - -@end table -@end deftp - - -@deftp {Enumeration} MHD_RequestTerminationCode -The @code{MHD_RequestTerminationCode} specifies reasons why a request -has been terminated (or completed). - -@table @code -@item MHD_REQUEST_TERMINATED_COMPLETED_OK -We finished sending the response. - -@item MHD_REQUEST_TERMINATED_WITH_ERROR -Error handling the connection (resources exhausted, other side closed -connection, application error accepting request, etc.) - -@item MHD_REQUEST_TERMINATED_TIMEOUT_REACHED -No activity on the connection for the number of seconds specified using -@code{MHD_OPTION_CONNECTION_TIMEOUT}. - -@item MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN -We had to close the session since MHD was being shut down. -@end table -@end deftp - - -@deftp {Enumeration} MHD_ResponseMemoryMode -The @code{MHD_ResponeMemoryMode} specifies how MHD should treat -the memory buffer given for the response in -@code{MHD_create_response_from_buffer}. - -@table @code -@item MHD_RESPMEM_PERSISTENT -Buffer is a persistent (static/global) buffer that won't change -for at least the lifetime of the response, MHD should just use -it, not free it, not copy it, just keep an alias to it. - -@item MHD_RESPMEM_MUST_FREE -Buffer is heap-allocated with @code{malloc} (or equivalent) and -should be freed by MHD after processing the response has -concluded (response reference counter reaches zero). - -@item MHD_RESPMEM_MUST_COPY -Buffer is in transient memory, but not on the heap (for example, -on the stack or non-malloc allocated) and only valid during the -call to @code{MHD_create_response_from_buffer}. MHD must make its -own private copy of the data for processing. - -@end table -@end deftp - - -@deftp {Enumeration} MHD_ResponseFlags -Response-specific flags. Passed as an argument to -@code{MHD_set_response_options()}. - -@table @code -@item MHD_RF_NONE -No special handling. - -@item MHD_RF_HTTP_VERSION_1_0_ONLY -Only respond in conservative HTTP 1.0-mode. In particular, -do not (automatically) sent "Connection" headers and always -close the connection after generating the response. - -@end table -@end deftp - - -@deftp {Enumeration} MHD_ResponseOptions -Response-specific options. Passed in the varargs portion of -@code{MHD_set_response_options()}. - -@table @code -@item MHD_RO_END -No more options / last option. This is used to terminate the VARARGs -list. -@end table -@end deftp - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-struct -@chapter Structures type definition - - -@deftp {C Struct} MHD_Daemon -Handle for the daemon (listening on a socket for HTTP traffic). -@end deftp - - -@deftp {C Struct} MHD_Connection -Handle for a connection / HTTP request. With HTTP/1.1, multiple -requests can be run over the same connection. However, MHD will only -show one request per TCP connection to the client at any given time. -@end deftp - - -@deftp {C Struct} MHD_Response -Handle for a response. -@end deftp - - -@deftp {C Struct} MHD_PostProcessor -@cindex POST method -Handle for @code{POST} processing. -@end deftp - - -@deftp {C Union} MHD_ConnectionInfo -Information about a connection. -@end deftp - - -@deftp {C Union} MHD_DaemonInfo -Information about an MHD daemon. -@end deftp - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-cb -@chapter Callback functions definition - - -@deftypefn {Function Pointer} int {*MHD_AcceptPolicyCallback} (void *cls, const struct sockaddr * addr, socklen_t addrlen) -Invoked in the context of a connection to allow or deny a client to -connect. This callback return @code{MHD_YES} if connection is allowed, -@code{MHD_NO} if not. - -@table @var -@item cls -custom value selected at callback registration time; -@item addr -address information from the client; -@item addrlen -length of the address information. -@end table -@end deftypefn - - -@deftypefn {Function Pointer} int {*MHD_AccessHandlerCallback} (void *cls, struct MHD_Connection * connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) -Invoked in the context of a connection to answer a request from the -client. This callback must call MHD functions (example: the -@code{MHD_Response} ones) to provide content to give back to the client -and return an HTTP status code (i.e. @code{200} for OK, @code{404}, -etc.). - -@ref{microhttpd-post}, for details on how to code this callback. - -Must return @code{MHD_YES} if the connection was handled successfully, -@code{MHD_NO} if the socket must be closed due to a serious error while -handling the request - -@table @var -@item cls -custom value selected at callback registration time; - -@item url -the URL requested by the client; - -@item method -the HTTP method used by the client (@code{GET}, @code{PUT}, -@code{DELETE}, @code{POST}, etc.); - -@item version -the HTTP version string (i.e. @code{HTTP/1.1}); - -@item upload_data -the data being uploaded (excluding headers): -@cindex POST method -@cindex PUT method - -@code{POST} data @strong{will} be made available -incrementally in @var{upload_data}; even if @code{POST} -data is available, the first time the callback is -invoked there won't be upload data, as this is done -just after MHD parses the headers. If supported by -the client and the HTTP version, the application can -at this point queue an error response to possibly -avoid the upload entirely. If no response is generated, -MHD will (if required) automatically send a 100 CONTINUE -reply to the client. - -Afterwards, POST data will be passed to the callback -to be processed incrementally by the application. The -application may return @code{MHD_NO} to forcefully -terminate the TCP connection without generating a -proper HTTP response. Once all of the upload data has -been provided to the application, the application -will be called again with 0 bytes of upload data. -At this point, a response should be queued to complete -the handling of the request. - -@item upload_data_size -set initially to the size of the @var{upload_data} provided; this -callback must update this value to the number of bytes @strong{NOT} -processed; unless external select is used, the callback maybe -required to process at least some data. If the callback fails to -process data in multi-threaded or internal-select mode and if the -read-buffer is already at the maximum size that MHD is willing to -use for reading (about half of the maximum amount of memory allowed -for the connection), then MHD will abort handling the connection -and return an internal server error to the client. In order to -avoid this, clients must be able to process upload data incrementally -and reduce the value of @code{upload_data_size}. - -@item con_cls -reference to a pointer, initially set to @code{NULL}, that this callback can -set to some address and that will be preserved by MHD for future -calls for this request; - -since the access handler may be called many times (i.e., for a -@code{PUT}/@code{POST} operation with plenty of upload data) this allows -the application to easily associate some request-specific state; - -if necessary, this state can be cleaned up in the global -@code{MHD_RequestCompletedCallback} (which can be set with the -@code{MHD_OPTION_NOTIFY_COMPLETED}). -@end table -@end deftypefn - - -@deftypefn {Function Pointer} void {*MHD_RequestCompletedCallback} (void *cls, struct MHD_Connectionconnection, void **con_cls, enum MHD_RequestTerminationCode toe) -Signature of the callback used by MHD to notify the application about -completed requests. - -@table @var -@item cls -custom value selected at callback registration time; - -@item connection -connection handle; - -@item con_cls -value as set by the last call to the -@code{MHD_AccessHandlerCallback}; - -@item toe -reason for request termination see @code{MHD_OPTION_NOTIFY_COMPLETED}. -@end table -@end deftypefn - - -@deftypefn {Function Pointer} int {*MHD_KeyValueIterator} (void *cls, enum MHD_ValueKind kind, const char *key, const char *value) -Iterator over key-value pairs. This iterator can be used to iterate -over all of the cookies, headers, or @code{POST}-data fields of a -request, and also to iterate over the headers that have been added to a -response. - -@table @var -@item cls -custom value specified when iteration was triggered; - -@item kind -kind of the header we are looking at - -@item key -key for the value, can be an empty string - -@item value -value corresponding value, can be NULL - -@end table - -Return @code{MHD_YES} to continue iterating, @code{MHD_NO} to abort the -iteration. -@end deftypefn - - -@deftypefn {Function Pointer} int {*MHD_ContentReaderCallback} (void *cls, uint64_t pos, char *buf, size_t max) -Callback used by MHD in order to obtain content. The callback has to -copy at most @var{max} bytes of content into @var{buf}. The total -number of bytes that has been placed into @var{buf} should be returned. - -Note that returning zero will cause MHD to try again. -Thus, returning zero should only be used in conjunction -with @code{MHD_suspend_connection()} to avoid busy waiting. - -While usually the callback simply returns the number of bytes written -into @var{buf}, there are two special return value: - -@code{MHD_CONTENT_READER_END_OF_STREAM} (-1) should be returned -for the regular end of transmission (with chunked encoding, MHD will then -terminate the chunk and send any HTTP footers that might be -present; without chunked encoding and given an unknown -response size, MHD will simply close the connection; note -that while returning @code{MHD_CONTENT_READER_END_OF_STREAM} is not technically -legal if a response size was specified, MHD accepts this -and treats it just as @code{MHD_CONTENT_READER_END_WITH_ERROR}. - -@code{MHD_CONTENT_READER_END_WITH_ERROR} (-2) is used to indicate a server -error generating the response; this will cause MHD to simply -close the connection immediately. If a response size was -given or if chunked encoding is in use, this will indicate -an error to the client. Note, however, that if the client -does not know a response size and chunked encoding is not in -use, then clients will not be able to tell the difference between -@code{MHD_CONTENT_READER_END_WITH_ERROR} and -@code{MHD_CONTENT_READER_END_OF_STREAM}. -This is not a limitation of MHD but rather of the HTTP protocol. - -@table @var -@item cls -custom value selected at callback registration time; - -@item pos -position in the datastream to access; note that if an -@code{MHD_Response} object is re-used, it is possible for the same -content reader to be queried multiple times for the same data; however, -if an @code{MHD_Response} is not re-used, MHD guarantees that -@var{pos} will be the sum of all non-negative return values obtained -from the content reader so far. -@end table - -Return @code{-1} on error (MHD will no longer try to read content and -instead close the connection with the client). -@end deftypefn - - -@deftypefn {Function Pointer} void {*MHD_ContentReaderFreeCallback} (void *cls) -This method is called by MHD if we are done with a content reader. -It should be used to free resources associated with the content reader. -@end deftypefn - - -@deftypefn {Function Pointer} int {*MHD_PostDataIterator} (void *cls, enum MHD_ValueKind kind, const char *key, const char *filename, const char *content_type, const char *transfer_encoding, const char *data, uint64_t off, size_t size) -Iterator over key-value pairs where the value maybe made available in -increments and/or may not be zero-terminated. Used for processing -@code{POST} data. - -@table @var -@item cls -custom value selected at callback registration time; - -@item kind -type of the value; - -@item key -zero-terminated key for the value; - -@item filename -name of the uploaded file, @code{NULL} if not known; - -@item content_type -mime-type of the data, @code{NULL} if not known; - -@item transfer_encoding -encoding of the data, @code{NULL} if not known; - -@item data -pointer to size bytes of data at the specified offset; - -@item off -offset of data in the overall value; - -@item size -number of bytes in data available. -@end table - -Return @code{MHD_YES} to continue iterating, @code{MHD_NO} to abort the -iteration. -@end deftypefn - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-init -@chapter Starting and stopping the server - -@deftypefun {void} MHD_set_panic_func (MHD_PanicCallback cb, void *cls) -Set a handler for fatal errors. - -@table @var -@item cb -function to call if MHD encounters a fatal internal error. If no handler was set explicitly, MHD will call @code{abort}. - -@item cls -closure argument for cb; the other arguments are the name of the source file, line number and a string describing the nature of the fatal error (which can be @code{NULL}) -@end table -@end deftypefun - -@deftypefun {struct MHD_Daemon *} MHD_start_daemon (unsigned int flags, unsigned short port, MHD_AcceptPolicyCallback apc, void *apc_cls, MHD_AccessHandlerCallback dh, void *dh_cls, ...) -Start a webserver on the given port. - -@table @var -@item flags -OR-ed combination of @code{MHD_FLAG} values; - -@item port -port to bind to; - -@item apc -callback to call to check which clients will be allowed to connect; you -can pass @code{NULL} in which case connections from any @acronym{IP} will be -accepted; - -@item apc_cls -extra argument to @var{apc}; - -@item dh -default handler for all URIs; - -@item dh_cls -extra argument to @var{dh}. -@end table - -Additional arguments are a list of options (type-value pairs, -terminated with @code{MHD_OPTION_END}). It is mandatory to use -@code{MHD_OPTION_END} as last argument, even when there are no -additional arguments. - -Return @code{NULL} on error, handle to daemon on success. -@end deftypefun - - -@deftypefun int MHD_quiesce_daemon (struct MHD_Daemon *daemon) -@cindex quiesce -Stop accepting connections from the listening socket. Allows clients -to continue processing, but stops accepting new connections. Note -that the caller is responsible for closing the returned socket; -however, if MHD is run using threads (anything but external select -mode), it must not be closed until AFTER @code{MHD_stop_daemon} has -been called (as it is theoretically possible that an existing thread -is still using it). - -This function is useful in the special case that a listen socket -is to be migrated to another process (i.e. a newer version of the -HTTP server) while existing connections should continue to be -processed until they are finished. - -Return @code{-1} on error (daemon not listening), the handle to the -listen socket otherwise. - -@end deftypefun - - -@deftypefun void MHD_stop_daemon (struct MHD_Daemon *daemon) -Shutdown an HTTP daemon. -@end deftypefun - - -@deftypefun int MHD_run (struct MHD_Daemon *daemon) -Run webserver operations (without blocking unless in client callbacks). -This method should be called by clients in combination with -@code{MHD_get_fdset()} if the client-controlled @code{select}-method is used. -@cindex select -@cindex poll - -This function will work for external @code{poll} and @code{select} mode. -However, if using external @code{select} mode, you may want to -instead use @code{MHD_run_from_select}, as it is more efficient. - -@table @var -@item daemon -daemon to process connections of -@end table - -Return @code{MHD_YES} on success, @code{MHD_NO} if this daemon was not -started with the right options for this call. -@end deftypefun - - -@deftypefun int MHD_run_from_select (struct MHD_Daemon *daemon, const fd_set *read_fd_set, const fd_set *write_fd_set, const fd_set *except_fd_set) -Run webserver operations given sets of ready socket handles. -@cindex select - -This method should be called by clients in combination with -@code{MHD_get_fdset} if the client-controlled (external) -select method is used. - -You can use this function instead of @code{MHD_run} if you called -@code{select} on the result from @code{MHD_get_fdset}. File descriptors in -the sets that are not controlled by MHD will be ignored. Calling -this function instead of @code{MHD_run} is more efficient as MHD will -not have to call @code{select} again to determine which operations are -ready. - -@table @var -@item daemon -daemon to process connections of -@item read_fd_set -set of descriptors that must be ready for reading without blocking -@item write_fd_set -set of descriptors that must be ready for writing without blocking -@item except_fd_set -ignored, can be NULL -@end table - -Return @code{MHD_YES} on success, @code{MHD_NO} on serious internal -errors. - -@end deftypefun - - - -@deftypefun void MHD_add_connection (struct MHD_Daemon *daemon, int client_socket, const struct sockaddr *addr, socklen_t addrlen) -Add another client connection to the set of connections -managed by MHD. This API is usually not needed (since -MHD will accept inbound connections on the server socket). -Use this API in special cases, for example if your HTTP -server is behind NAT and needs to connect out to the -HTTP client, or if you are building a proxy. - -If you use this API in conjunction with a internal select or a thread -pool, you must set the option @code{MHD_USE_PIPE_FOR_SHUTDOWN} to -ensure that the freshly added connection is immediately processed by -MHD. - -The given client socket will be managed (and closed!) by MHD after -this call and must no longer be used directly by the application -afterwards. - -@table @var -@item daemon -daemon that manages the connection -@item client_socket -socket to manage (MHD will expect to receive an HTTP request from this socket next). -@item addr -IP address of the client -@item addrlen -number of bytes in addr -@end table - -This function will return @code{MHD_YES} on success, -@code{MHD_NO} if this daemon could -not handle the connection (i.e. malloc failed, etc). -The socket will be closed in any case; 'errno' is set -to indicate further details about the error. -@end deftypefun - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ----------------------------------------------------------- -@node microhttpd-inspect -@chapter Implementing external @code{select} - - -@deftypefun int MHD_get_fdset (struct MHD_Daemon *daemon, fd_set * read_fd_set, fd_set * write_fd_set, fd_set * except_fd_set, int *max_fd) -Obtain the @code{select()} sets for this daemon. The daemon's socket -is added to @var{read_fd_set}. The list of currently existent -connections is scanned and their file descriptors added to the correct -set. - -After the call completed successfully: the variable referenced by -@var{max_fd} references the file descriptor with highest integer -identifier. The variable must be set to zero before invoking this -function. - -Return @code{MHD_YES} on success, @code{MHD_NO} if: the arguments are -invalid (example: @code{NULL} pointers); this daemon was not started with -the right options for this call. -@end deftypefun - - -@deftypefun int MHD_get_timeout (struct MHD_Daemon *daemon, unsigned long long *timeout) -@cindex timeout -Obtain timeout value for select for this daemon (only needed if -connection timeout is used). The returned value is how many -milliseconds @code{select} should at most block, not the timeout value -set for connections. This function must not be called if the -@code{MHD_USE_THREAD_PER_CONNECTION} mode is in use (since then it is -not meaningful to ask for a timeout, after all, there is concurrenct -activity). The function must also not be called by user-code if -@code{MHD_USE_INTERNAL_SELECT} is in use. In the latter case, the -behavior is undefined. - -@table @var -@item daemon -which daemon to obtain the timeout from. -@item timeout -will be set to the timeout (in milliseconds). -@end table - -Return @code{MHD_YES} on success, @code{MHD_NO} if timeouts are not used -(or no connections exist that would necessiate the use of a timeout -right now). -@end deftypefun - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ----------------------------------------------------------- -@node microhttpd-requests -@chapter Handling requests - - -@deftypefun int MHD_get_connection_values (struct MHD_Connection *connection, enum MHD_ValueKind kind, MHD_KeyValueIterator iterator, void *iterator_cls) -Get all the headers matching @var{kind} from the request. - -The @var{iterator} callback is invoked once for each header, with -@var{iterator_cls} as first argument. After version 0.9.19, the -headers are iterated in the same order as they were received from -the network; previous versions iterated over the headers in reverse -order. - -@code{MHD_get_connection_values} returns the number of entries -iterated over; this can be less than the number of headers if, while -iterating, @var{iterator} returns @code{MHD_NO}. - -@var{iterator} can be @code{NULL}: in this case this function just counts -and returns the number of headers. - -In the case of @code{MHD_GET_ARGUMENT_KIND}, the @var{value} argument -will be @code{NULL} if the URL contained a key without an equals operator. -For example, for a HTTP request to the URL ``http://foo/bar?key'', the -@var{value} argument is @code{NULL}; in contrast, a HTTP request to the URL -``http://foo/bar?key='', the @var{value} argument is the empty string. -The normal case is that the URL contains ``http://foo/bar?key=value'' -in which case @var{value} would be the string ``value'' and @var{key} -would contain the string ``key''. -@end deftypefun - - -@deftypefun int MHD_set_connection_value (struct MHD_Connection *connection, enum MHD_ValueKind kind, const char * key, const char * value) -This function can be used to append an entry to -the list of HTTP headers of a connection (so that the -@code{MHD_get_connection_values function} will return -them -- and the MHD PostProcessor will also -see them). This maybe required in certain -situations (see Mantis #1399) where (broken) -HTTP implementations fail to supply values needed -by the post processor (or other parts of the -application). - -This function MUST only be called from within -the MHD_AccessHandlerCallback (otherwise, access -maybe improperly synchronized). Furthermore, -the client must guarantee that the key and -value arguments are 0-terminated strings that -are NOT freed until the connection is closed. -(The easiest way to do this is by passing only -arguments to permanently allocated strings.). - -@var{connection} is the connection for which -the entry for @var{key} of the given @var{kind} -should be set to the given @var{value}. - -The function returns @code{MHD_NO} if the operation -could not be performed due to insufficient memory -and @code{MHD_YES} on success. -@end deftypefun - - -@deftypefun {const char *} MHD_lookup_connection_value (struct MHD_Connection *connection, enum MHD_ValueKind kind, const char *key) -Get a particular header value. If multiple values match the -@var{kind}, return one of them (the ``first'', whatever that means). -@var{key} must reference a zero-terminated ASCII-coded string -representing the header to look for: it is compared against the -headers using @code{strcasecmp()}, so case is ignored. A value of -@code{NULL} for @var{key} can be used to lookup 'trailing' values without a -key, for example if a URI is of the form -``http://example.com/?trailer'', a @var{key} of @code{NULL} can be used to -access ``tailer" The function returns @code{NULL} if no matching item -was found. -@end deftypefun - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-responses -@chapter Building responses to requests - - -@noindent -Response objects handling by MHD is asynchronous with respect to the -application execution flow. Instances of the @code{MHD_Response} -structure are not associated to a daemon and neither to a client -connection: they are managed with reference counting. - -In the simplest case: we allocate a new @code{MHD_Response} structure -for each response, we use it once and finally we destroy it. - -MHD allows more efficient resources usages. - -Example: we allocate a new @code{MHD_Response} structure for each -response @strong{kind}, we use it every time we have to give that -response and we finally destroy it only when the daemon shuts down. - -@menu -* microhttpd-response enqueue:: Enqueuing a response. -* microhttpd-response create:: Creating a response object. -* microhttpd-response headers:: Adding headers to a response. -* microhttpd-response options:: Setting response options. -* microhttpd-response inspect:: Inspecting a response object. -@end menu - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-response enqueue -@section Enqueuing a response - - -@deftypefun int MHD_queue_response (struct MHD_Connection *connection, unsigned int status_code, struct MHD_Response *response) -Queue a response to be transmitted to the client as soon as possible -but only after MHD_AccessHandlerCallback returns. This function -checks that it is legal to queue a response at this time for the -given connection. It also increments the internal reference -counter for the response object (the counter will be decremented -automatically once the response has been transmitted). - -@table @var -@item connection -the connection identifying the client; - -@item status_code -HTTP status code (i.e. @code{200} for OK); - -@item response -response to transmit. -@end table - -Return @code{MHD_YES} on success or if message has been queued. Return -@code{MHD_NO}: if arguments are invalid (example: @code{NULL} pointer); on -error (i.e. reply already sent). -@end deftypefun - - -@deftypefun void MHD_destroy_response (struct MHD_Response *response) -Destroy a response object and associated resources (decrement the -reference counter). Note that MHD may keep some of the resources -around if the response is still in the queue for some clients, so the -memory may not necessarily be freed immediately. -@end deftypefun - - -An explanation of reference counting@footnote{Note to readers acquainted -to the Tcl API: reference counting on @code{MHD_Connection} -structures is handled in the same way as Tcl handles @code{Tcl_Obj} -structures through @code{Tcl_IncrRefCount()} and -@code{Tcl_DecrRefCount()}.}: - -@enumerate -@item -a @code{MHD_Response} object is allocated: - -@example -struct MHD_Response * response = MHD_create_response_from_buffer(...); -/* here: reference counter = 1 */ -@end example - -@item -the @code{MHD_Response} object is enqueued in a @code{MHD_Connection}: - -@example -MHD_queue_response(connection, , response); -/* here: reference counter = 2 */ -@end example - -@item -the creator of the response object discharges responsibility for it: - -@example -MHD_destroy_response(response); -/* here: reference counter = 1 */ -@end example - -@item -the daemon handles the connection sending the response's data to the -client then decrements the reference counter by calling -@code{MHD_destroy_response()}: the counter's value drops to zero and -the @code{MHD_Response} object is released. -@end enumerate - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-response create -@section Creating a response object - - -@deftypefun {struct MHD_Response *} MHD_create_response_from_callback (uint64_t size, size_t block_size, MHD_ContentReaderCallback crc, void *crc_cls, MHD_ContentReaderFreeCallback crfc) -Create a response object. The response object can be extended with -header information and then it can be used any number of times. - -@table @var -@item size -size of the data portion of the response, @code{-1} for unknown; - -@item block_size -preferred block size for querying @var{crc} (advisory only, MHD may -still call @var{crc} using smaller chunks); this is essentially the -buffer size used for @acronym{IO}, clients should pick a value that is -appropriate for @acronym{IO} and memory performance requirements; - -@item crc -callback to use to obtain response data; - -@item crc_cls -extra argument to @var{crc}; - -@item crfc -callback to call to free @var{crc_cls} resources. -@end table - -Return @code{NULL} on error (i.e. invalid arguments, out of memory). -@end deftypefun - - - -@deftypefun {struct MHD_Response *} MHD_create_response_from_fd (uint64_t size, int fd) -Create a response object. The response object can be extended with -header information and then it can be used any number of times. - -@table @var -@item size -size of the data portion of the response (should be smaller or equal to the -size of the file) - -@item fd -file descriptor referring to a file on disk with the data; will be -closed when response is destroyed; note that 'fd' must be an actual -file descriptor (not a pipe or socket) since MHD might use 'sendfile' -or 'seek' on it. The descriptor should be in blocking-IO mode. -@end table - -Return @code{NULL} on error (i.e. invalid arguments, out of memory). -@end deftypefun - - -@deftypefun {struct MHD_Response *} MHD_create_response_from_fd_at_offset (size_t size, int fd, off_t offset) -Create a response object. The response object can be extended with -header information and then it can be used any number of times. -Note that you need to be a bit careful about @code{off_t} when -writing this code. Depending on your platform, MHD is likely -to have been compiled with support for 64-bit files. When you -compile your own application, you must make sure that @code{off_t} -is also a 64-bit value. If not, your compiler may pass a 32-bit -value as @code{off_t}, which will result in 32-bits of garbage. - -If you use the autotools, use the @code{AC_SYS_LARGEFILE} autoconf -macro and make sure to include the generated @file{config.h} file -before @file{microhttpd.h} to avoid problems. If you do not have a -build system and only want to run on a GNU/Linux system, you could -also use -@verbatim -#define _FILE_OFFSET_BITS 64 -#include -#include -#include -#include -@end verbatim -to ensure 64-bit @code{off_t}. Note that if your operating system -does not support 64-bit files, MHD will be compiled with a 32-bit -@code{off_t} (in which case the above would be wrong). - -@table @var -@item size -size of the data portion of the response (number of bytes to transmit from the -file starting at offset). - -@item fd -file descriptor referring to a file on disk with the data; will be -closed when response is destroyed; note that 'fd' must be an actual -file descriptor (not a pipe or socket) since MHD might use 'sendfile' -or 'seek' on it. The descriptor should be in blocking-IO mode. - -@item offset -offset to start reading from in the file -@end table - -Return @code{NULL} on error (i.e. invalid arguments, out of memory). -@end deftypefun - - -@deftypefun {struct MHD_Response *} MHD_create_response_from_buffer (size_t size, void *data, enum MHD_ResponseMemoryMode mode) -Create a response object. The response object can be extended with -header information and then it can be used any number of times. - -@table @var -@item size -size of the data portion of the response; - -@item buffer -the data itself; - -@item mode -memory management options for buffer; use -MHD_RESPMEM_PERSISTENT if the buffer is static/global memory, -use MHD_RESPMEM_MUST_FREE if the buffer is heap-allocated and -should be freed by MHD and MHD_RESPMEM_MUST_COPY if the -buffer is in transient memory (i.e. on the stack) and must -be copied by MHD; -@end table - -Return @code{NULL} on error (i.e. invalid arguments, out of memory). -@end deftypefun - - -@deftypefun {struct MHD_Response *} MHD_create_response_from_data (size_t size, void *data, int must_free, int must_copy) -Create a response object. The response object can be extended with -header information and then it can be used any number of times. -This function is deprecated, use @code{MHD_create_response_from_buffer} instead. - -@table @var -@item size -size of the data portion of the response; - -@item data -the data itself; - -@item must_free -if true: MHD should free data when done; - -@item must_copy -if true: MHD allocates a block of memory and use it to make a copy of -@var{data} embedded in the returned @code{MHD_Response} structure; -handling of the embedded memory is responsibility of MHD; @var{data} -can be released anytime after this call returns. -@end table - -Return @code{NULL} on error (i.e. invalid arguments, out of memory). -@end deftypefun - - -Example: create a response from a statically allocated string: - -@example -const char * data = "

Error!

"; - -struct MHD_Connection * connection = ...; -struct MHD_Response * response; - -response = MHD_create_response_from_buffer (strlen(data), data, - MHD_RESPMEM_PERSISTENT); -MHD_queue_response(connection, 404, response); -MHD_destroy_response(response); -@end example - - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-response headers -@section Adding headers to a response - - -@deftypefun int MHD_add_response_header (struct MHD_Response *response, const char *header, const char *content) -Add a header line to the response. The strings referenced by -@var{header} and @var{content} must be zero-terminated and they are -duplicated into memory blocks embedded in @var{response}. - -Notice that the strings must not hold newlines, carriage returns or tab -chars. - -Return @code{MHD_NO} on error (i.e. invalid header or content format or -memory allocation error). -@end deftypefun - - -@deftypefun int MHD_add_response_footer (struct MHD_Response *response, const char *footer, const char *content) -Add a footer line to the response. The strings referenced by -@var{footer} and @var{content} must be zero-terminated and they are -duplicated into memory blocks embedded in @var{response}. - -Notice that the strings must not hold newlines, carriage returns or tab -chars. You can add response footers at any time before signalling the -end of the response to MHD (not just before calling 'MHD_queue_response'). -Footers are useful for adding cryptographic checksums to the reply or to -signal errors encountered during data generation. This call was introduced -in MHD 0.9.3. - -Return @code{MHD_NO} on error (i.e. invalid header or content format or -memory allocation error). -@end deftypefun - - - -@deftypefun int MHD_del_response_header (struct MHD_Response *response, const char *header, const char *content) -Delete a header (or footer) line from the response. Return @code{MHD_NO} on error -(arguments are invalid or no such header known). -@end deftypefun - - -@c ------------------------------------------------------------ -@node microhttpd-response options -@section Setting response options - - -@deftypefun int MHD_set_response_options (struct MHD_Response *response, enum MHD_ResponseFlags flags, ...) -Set special flags and options for a response. - -Calling this functions sets the given flags and options for the response. - -@table @var -@item response -which response should be modified; - -@item flags -flags to set for the response; - -@end table - -Additional arguments are a list of options (type-value pairs, -terminated with @code{MHD_RO_END}). It is mandatory to use -@code{MHD_RO_END} as last argument, even when there are no -additional arguments. - -Return @code{MHD_NO} on error, @code{MHD_YES} on success. -@end deftypefun - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-response inspect -@section Inspecting a response object - - -@deftypefun int MHD_get_response_headers (struct MHD_Response *response, MHD_KeyValueIterator iterator, void *iterator_cls) -Get all of the headers added to a response. - -Invoke the @var{iterator} callback for each header in the response, -using @var{iterator_cls} as first argument. Return number of entries -iterated over. @var{iterator} can be @code{NULL}: in this case the function -just counts headers. - -@var{iterator} should not modify the its key and value arguments, unless -we know what we are doing. -@end deftypefun - - -@deftypefun {const char *} MHD_get_response_header (struct MHD_Response *response, const char *key) -Find and return a pointer to the value of a particular header from the -response. @var{key} must reference a zero-terminated string -representing the header to look for. The search is case sensitive. -Return @code{NULL} if header does not exist or @var{key} is @code{NULL}. - -We should not modify the value, unless we know what we are doing. -@end deftypefun - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-flow -@chapter Flow control. - -@noindent -Sometimes it may be possible that clients upload data faster -than an application can process it, or that an application -needs an extended period of time to generate a response. -If @code{MHD_USE_THREAD_PER_CONNECTION} is used, applications -can simply deal with this by performing their logic within the -thread and thus effectively blocking connection processing -by MHD. In all other modes, blocking logic must not be -placed within the callbacks invoked by MHD as this would also -block processing of other requests, as a single thread may be -responsible for tens of thousands of connections. - -Instead, applications using thread modes other than -@code{MHD_USE_THREAD_PER_CONNECTION} should use the -following functions to perform flow control. - -@deftypefun int MHD_suspend_connection (struct MHD_Connection *connection) -Suspend handling of network data for a given connection. This can -be used to dequeue a connection from MHD's event loop (external -select, internal select or thread pool; not applicable to -thread-per-connection!) for a while. - -If you use this API in conjunction with a internal select or a -thread pool, you must set the option @code{MHD_USE_SUSPEND_RESUME} to -ensure that a resumed connection is immediately processed by MHD. - -Suspended connections continue to count against the total number of -connections allowed (per daemon, as well as per IP, if such limits -are set). Suspended connections will NOT time out; timeouts will -restart when the connection handling is resumed. While a -connection is suspended, MHD will not detect disconnects by the -client. - -The only safe time to suspend a connection is from the -@code{MHD_AccessHandlerCallback}. - -Finally, it is an API violation to call @code{MHD_stop_daemon} while -having suspended connections (this will at least create memory and -socket leaks or lead to undefined behavior). You must explicitly -resume all connections before stopping the daemon. - -@table @var -@item connection -the connection to suspend -@end table -@end deftypefun - -@deftypefun int MHD_resume_connection (struct MHD_Connection *connection) -Resume handling of network data for suspended connection. It is safe -to resume a suspended connection at any time. Calling this function -on a connection that was not previously suspended will result in -undefined behavior. - -@table @var -@item connection -the connection to resume -@end table -@end deftypefun - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-dauth -@chapter Utilizing Authentication - -@noindent -MHD support three types of client authentication. - -Basic authentication uses a simple authentication method based -on BASE64 algorithm. Username and password are exchanged in clear -between the client and the server, so this method must only be used -for non-sensitive content or when the session is protected with https. -When using basic authentication MHD will have access to the clear -password, possibly allowing to create a chained authentication -toward an external authentication server. - -Digest authentication uses a one-way authentication method based -on MD5 hash algorithm. Only the hash will transit over the network, -hence protecting the user password. The nonce will prevent replay -attacks. This method is appropriate for general use, especially -when https is not used to encrypt the session. - -Client certificate authentication uses a X.509 certificate from -the client. This is the strongest authentication mechanism but it -requires the use of HTTPS. Client certificate authentication can -be used simultaneously with Basic or Digest Authentication in order -to provide a two levels authentication (like for instance separate -machine and user authentication). A code example for using -client certificates is presented in the MHD tutorial. - -@menu -* microhttpd-dauth basic:: Using Basic Authentication. -* microhttpd-dauth digest:: Using Digest Authentication. -@end menu - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-dauth basic -@section Using Basic Authentication - -@deftypefun {char *} MHD_basic_auth_get_username_password (struct MHD_Connection *connection, char** password) -Get the username and password from the basic authorization header sent by the client. -Return @code{NULL} if no username could be found, a pointer to the username if found. -If returned value is not @code{NULL}, the value must be @code{free()}'ed. - -@var{password} reference a buffer to store the password. It can be @code{NULL}. -If returned value is not @code{NULL}, the value must be @code{free()}'ed. -@end deftypefun - -@deftypefun {int} MHD_queue_basic_auth_fail_response (struct MHD_Connection *connection, const char *realm, struct MHD_Response *response) -Queues a response to request basic authentication from the client. -Return @code{MHD_YES} if successful, otherwise @code{MHD_NO}. - -@var{realm} must reference to a zero-terminated string representing the realm. - -@var{response} a response structure to specify what shall be presented to the -client with a 401 HTTP status. -@end deftypefun - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-dauth digest -@section Using Digest Authentication - -@deftypefun {char *} MHD_digest_auth_get_username (struct MHD_Connection *connection) -Find and return a pointer to the username value from the request header. -Return @code{NULL} if the value is not found or header does not exist. -If returned value is not @code{NULL}, the value must be @code{free()}'ed. -@end deftypefun - -@deftypefun int MHD_digest_auth_check (struct MHD_Connection *connection, const char *realm, const char *username, const char *password, unsigned int nonce_timeout) -Checks if the provided values in the WWW-Authenticate header are valid -and sound according to RFC2716. If valid return @code{MHD_YES}, otherwise return @code{MHD_NO}. - -@var{realm} must reference to a zero-terminated string representing the realm. - -@var{username} must reference to a zero-terminated string representing the username, -it is usually the returned value from MHD_digest_auth_get_username. - -@var{password} must reference to a zero-terminated string representing the password, -most probably it will be the result of a lookup of the username against a local database. - -@var{nonce_timeout} is the amount of time in seconds for a nonce to be invalid. -Most of the time it is sound to specify 300 seconds as its values. -@end deftypefun - -@deftypefun int MHD_queue_auth_fail_response (struct MHD_Connection *connection, const char *realm, const char *opaque, struct MHD_Response *response, int signal_stale) -Queues a response to request authentication from the client, -return @code{MHD_YES} if successful, otherwise @code{MHD_NO}. - -@var{realm} must reference to a zero-terminated string representing the realm. - -@var{opaque} must reference to a zero-terminated string representing a value -that gets passed to the client and expected to be passed again to the server -as-is. This value can be a hexadecimal or base64 string. - -@var{response} a response structure to specify what shall be presented to the -client with a 401 HTTP status. - -@var{signal_stale} a value that signals "stale=true" in the response header to -indicate the invalidity of the nonce and no need to ask for authentication -parameters and only a new nonce gets generated. @code{MHD_YES} to generate a new -nonce, @code{MHD_NO} to ask for authentication parameters. -@end deftypefun - -Example: handling digest authentication requests and responses. - -@example -#define PAGE "libmicrohttpd demoAccess granted" -#define DENIED "libmicrohttpd demoAccess denied" -#define OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4" - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -@{ - struct MHD_Response *response; - char *username; - const char *password = "testpass"; - const char *realm = "test@@example.com"; - int ret; - - username = MHD_digest_auth_get_username(connection); - if (username == NULL) - @{ - response = MHD_create_response_from_buffer(strlen (DENIED), - DENIED, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_auth_fail_response(connection, realm, - OPAQUE, - response, - MHD_NO); - MHD_destroy_response(response); - return ret; - @} - ret = MHD_digest_auth_check(connection, realm, - username, - password, - 300); - free(username); - if ( (ret == MHD_INVALID_NONCE) || - (ret == MHD_NO) ) - @{ - response = MHD_create_response_from_buffer(strlen (DENIED), - DENIED, - MHD_RESPMEM_PERSISTENT); - if (NULL == response) - return MHD_NO; - ret = MHD_queue_auth_fail_response(connection, realm, - OPAQUE, - response, - (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO); - MHD_destroy_response(response); - return ret; - @} - response = MHD_create_response_from_buffer (strlen(PAGE), PAGE, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response(connection, MHD_HTTP_OK, response); - MHD_destroy_response(response); - return ret; -@} -@end example - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-post -@chapter Adding a @code{POST} processor -@cindex POST method - -@menu -* microhttpd-post api:: Programming interface for the - @code{POST} processor. -@end menu - - -@noindent -MHD provides the post processor API to make it easier for applications to -parse the data of a client's @code{POST} request: the -@code{MHD_AccessHandlerCallback} will be invoked multiple times to -process data as it arrives; at each invocation a new chunk of data must -be processed. The arguments @var{upload_data} and @var{upload_data_size} -are used to reference the chunk of data. - -When @code{MHD_AccessHandlerCallback} is invoked for a new connection: -its @code{*@var{con_cls}} argument is set to @code{NULL}. When @code{POST} -data comes in the upload buffer it is @strong{mandatory} to use the -@var{con_cls} to store a reference to per-connection data. The fact -that the pointer was initially @code{NULL} can be used to detect that -this is a new request. - -One method to detect that a new connection was established is -to set @code{*con_cls} to an unused integer: - -@example -int -access_handler (void *cls, - struct MHD_Connection * connection, - const char *url, - const char *method, const char *version, - const char *upload_data, size_t *upload_data_size, - void **con_cls) -@{ - static int old_connection_marker; - int new_connection = (NULL == *con_cls); - - if (new_connection) - @{ - /* new connection with POST */ - *con_cls = &old_connection_marker; - @} - - ... -@} -@end example - -@noindent -In contrast to the previous example, for @code{POST} requests in particular, -it is more common to use the value of @code{*con_cls} to keep track of -actual state used during processing, such as the post processor (or a -struct containing a post processor): - -@example -int -access_handler (void *cls, - struct MHD_Connection * connection, - const char *url, - const char *method, const char *version, - const char *upload_data, size_t *upload_data_size, - void **con_cls) -@{ - struct MHD_PostProcessor * pp = *con_cls; - - if (pp == NULL) - @{ - pp = MHD_create_post_processor(connection, ...); - *con_cls = pp; - return MHD_YES; - @} - if (*upload_data_size) - @{ - MHD_post_process(pp, upload_data, *upload_data_size); - *upload_data_size = 0; - return MHD_YES; - @} - else - @{ - MHD_destroy_post_processor(pp); - return MHD_queue_response(...); - @} -@} -@end example - -Note that the callback from @code{MHD_OPTION_NOTIFY_COMPLETED} -should be used to destroy the post processor. This cannot be -done inside of the access handler since the connection may not -always terminate normally. - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-post api -@section Programming interface for the @code{POST} processor -@cindex POST method - -@deftypefun {struct MHD_PostProcessor *} MHD_create_post_processor (struct MHD_Connection *connection, size_t buffer_size, MHD_PostDataIterator iterator, void *iterator_cls) -Create a PostProcessor. A PostProcessor can be used to (incrementally) -parse the data portion of a @code{POST} request. - -@table @var -@item connection -the connection on which the @code{POST} is happening (used to determine -the @code{POST} format); - -@item buffer_size -maximum number of bytes to use for internal buffering (used only for the -parsing, specifically the parsing of the keys). A tiny value (256-1024) -should be sufficient; do @strong{NOT} use a value smaller than 256; -for good performance, use 32k or 64k (i.e. 65536). - -@item iterator -iterator to be called with the parsed data; must @strong{NOT} be -@code{NULL}; - -@item iterator_cls -custom value to be used as first argument to @var{iterator}. -@end table - -Return @code{NULL} on error (out of memory, unsupported encoding), otherwise -a PP handle. -@end deftypefun - - -@deftypefun int MHD_post_process (struct MHD_PostProcessor *pp, const char *post_data, size_t post_data_len) -Parse and process @code{POST} data. Call this function when @code{POST} -data is available (usually during an @code{MHD_AccessHandlerCallback}) -with the @var{upload_data} and @var{upload_data_size}. Whenever -possible, this will then cause calls to the -@code{MHD_IncrementalKeyValueIterator}. - -@table @var -@item pp -the post processor; - -@item post_data -@var{post_data_len} bytes of @code{POST} data; - -@item post_data_len -length of @var{post_data}. -@end table - -Return @code{MHD_YES} on success, @code{MHD_NO} on error -(out-of-memory, iterator aborted, parse error). -@end deftypefun - - -@deftypefun int MHD_destroy_post_processor (struct MHD_PostProcessor *pp) -Release PostProcessor resources. After this function is being called, -the PostProcessor is guaranteed to no longer call its iterator. There -is no special call to the iterator to indicate the end of the post processing -stream. After destroying the PostProcessor, the programmer should -perform any necessary work to complete the processing of the iterator. - -Return @code{MHD_YES} if processing completed nicely, @code{MHD_NO} -if there were spurious characters or formatting problems with -the post request. It is common to ignore the return value -of this function. - - -@end deftypefun - - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-info -@chapter Obtaining and modifying status information. - - -@menu -* microhttpd-info daemon:: State information about an MHD daemon -* microhttpd-info conn:: State information about a connection -* microhttpd-option conn:: Modify per-connection options -@end menu - - -@c ------------------------------------------------------------ -@node microhttpd-info daemon -@section Obtaining state information about an MHD daemon - -@deftypefun {const union MHD_DaemonInfo *} MHD_get_daemon_info (struct MHD_Daemon *daemon, enum MHD_DaemonInfoType infoType, ...) -Obtain information about the given daemon. This function -is currently not fully implemented. - -@table @var -@item daemon -the daemon about which information is desired; - -@item infoType -type of information that is desired - -@item ... -additional arguments about the desired information (depending on -infoType) -@end table - -Returns a union with the respective member (depending on -infoType) set to the desired information), or @code{NULL} -in case the desired information is not available or -applicable. -@end deftypefun - - -@deftp {Enumeration} MHD_DaemonInfoType -Values of this enum are used to specify what -information about a daemon is desired. -@table @code -@item MHD_DAEMON_INFO_KEY_SIZE -Request information about the key size for a particular cipher -algorithm. The cipher algorithm should be passed as an extra argument -(of type 'enum MHD_GNUTLS_CipherAlgorithm'). No longer supported, -using this value will cause @code{MHD_get_daemon_info} to return NULL. - -@item MHD_DAEMON_INFO_MAC_KEY_SIZE -Request information about the key size for a particular cipher -algorithm. The cipher algorithm should be passed as an extra argument -(of type 'enum MHD_GNUTLS_HashAlgorithm'). No longer supported, -using this value will cause @code{MHD_get_daemon_info} to return NULL. - -@item MHD_DAEMON_INFO_LISTEN_FD -@cindex listen -Request the file-descriptor number that MHD is using to listen to the -server socket. This can be useful if no port -was specified and a client needs to learn what port -is actually being used by MHD. -No extra arguments should be passed. - -@item MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY -@cindex epoll -Request the file-descriptor number that MHD is using for epoll. If -the build is not supporting epoll, NULL is returned; if we are using a -thread pool or this daemon was not started with -@code{MHD_USE_EPOLL_LINUX_ONLY}, (a pointer to) -1 is returned. If we are -using @code{MHD_USE_SELECT_INTERNALLY} or are in 'external' select mode, the -internal epoll FD is returned. This function must be used in external -select mode with epoll to obtain the FD to call epoll on. No extra -arguments should be passed. - -@item MHD_DAEMON_INFO_CURRENT_CONNECTIONS -@cindex connection, limiting number of connections -Request the number of current connections handled by the daemon. No -extra arguments should be passed and a pointer to a @code{union -MHD_DaemonInfo} value is returned, with the @code{num_connections} -member of type @code{unsigned int} set to the number of active -connections. - -Note that in multi-threaded or internal-select mode, the real number of current -connections may already be different when @code{MHD_get_daemon_info} returns. -The number of current connections can be used (even in multi-threaded and -internal-select mode) after @code{MHD_quiesce_daemon} to detect whether all -connections have been handled. - -@end table -@end deftp - - - -@c ------------------------------------------------------------ -@node microhttpd-info conn -@section Obtaining state information about a connection - - -@deftypefun {const union MHD_ConnectionInfo *} MHD_get_connection_info (struct MHD_Connection *daemon, enum MHD_ConnectionInfoType infoType, ...) -Obtain information about the given connection. - -@table @var -@item connection -the connection about which information is desired; - -@item infoType -type of information that is desired - -@item ... -additional arguments about the desired information (depending on -infoType) -@end table - -Returns a union with the respective member (depending on -infoType) set to the desired information), or @code{NULL} -in case the desired information is not available or -applicable. -@end deftypefun - -@deftp {Enumeration} MHD_ConnectionInfoType -Values of this enum are used to specify what information about a -connection is desired. - -@table @code - -@item MHD_CONNECTION_INFO_CIPHER_ALGO -What cipher algorithm is being used (HTTPS connections only). -Takes no extra arguments. -@code{NULL} is returned for non-HTTPS connections. - -@item MHD_CONNECTION_INFO_PROTOCOL, -Takes no extra arguments. Allows finding out the TLS/SSL protocol used -(HTTPS connections only). -@code{NULL} is returned for non-HTTPS connections. - -@item MHD_CONNECTION_INFO_CLIENT_ADDRESS -Returns information about the address of the client. Returns -essentially a @code{struct sockaddr **} (since the API returns -a @code{union MHD_ConnectionInfo *} and that union contains -a @code{struct sockaddr *}). - -@item MHD_CONNECTION_INFO_GNUTLS_SESSION, -Takes no extra arguments. Allows access to the underlying GNUtls session, -including access to the underlying GNUtls client certificate -(HTTPS connections only). Takes no extra arguments. -@code{NULL} is returned for non-HTTPS connections. - -@item MHD_CONNECTION_INFO_GNUTLS_CLIENT_CERT, -Dysfunctional (never implemented, deprecated). Use -MHD_CONNECTION_INFO_GNUTLS_SESSION to get the @code{gnutls_session_t} -and then call @code{gnutls_certificate_get_peers()}. - -@item MHD_CONNECTION_INFO_DAEMON -Returns information about @code{struct MHD_Daemon} which manages -this connection. - -@item MHD_CONNECTION_INFO_CONNECTION_FD -Returns the file descriptor (usually a TCP socket) associated with -this connection (in the ``connect-fd'' member of the returned struct). -Note that manipulating the descriptor directly can have problematic -consequences (as in, break HTTP). Applications might use this access -to manipulate TCP options, for example to set the ``TCP-NODELAY'' -option for COMET-like applications. Note that MHD will set TCP-CORK -after sending the HTTP header and clear it after finishing the footers -automatically (if the platform supports it). As the connection -callbacks are invoked in between, those might be used to set different -values for TCP-CORK and TCP-NODELAY in the meantime. - -@item MHD_CONNECTION_INFO_SOCKET_CONTEXT -Returns the client-specific pointer to a @code{void *} that was -(possibly) set during a @code{MHD_NotifyConnectionCallback} when the -socket was first accepted. Note that this is NOT the same as the -@code{con_cls} argument of the @code{MHD_AccessHandlerCallback}. The -@code{con_cls} is fresh for each HTTP request, while the -@code{socket_context} is fresh for each socket. - -@end table -@end deftp - - - -@c ------------------------------------------------------------ -@node microhttpd-option conn -@section Setting custom options for an individual connection -@cindex timeout - - - -@deftypefun {int} MHD_set_connection_option (struct MHD_Connection *daemon, enum MHD_CONNECTION_OPTION option, ...) -Set a custom option for the given connection. - -@table @var -@item connection -the connection for which an option should be set or modified; - -@item option -option to set - -@item ... -additional arguments for the option (depending on option) -@end table - -Returns @code{MHD_YES} on success, @code{MHD_NO} for errors -(i.e. option argument invalid or option unknown). -@end deftypefun - - -@deftp {Enumeration} MHD_CONNECTION_OPTION -Values of this enum are used to specify which option for a -connection should be changed. - -@table @code - -@item MHD_CONNECTION_OPTION_TIMEOUT -Set a custom timeout for the given connection. Specified -as the number of seconds, given as an @code{unsigned int}. Use -zero for no timeout. - -@end table -@end deftp - - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -@c ------------------------------------------------------------ -@node microhttpd-util -@chapter Utility functions. - - -@menu -* microhttpd-util feature:: Test supported MHD features -* microhttpd-util unescape:: Unescape strings -@end menu - - -@c ------------------------------------------------------------ -@node microhttpd-util feature -@section Testing for supported MHD features - - -@deftp {Enumeration} MHD_FEATURE -Values of this enum are used to specify what -information about a daemon is desired. -@table @code -@item MHD_FEATURE_MESSAGES -Get whether messages are supported. If supported then in debug -mode messages can be printed to stderr or to external logger. - -@item MHD_FEATURE_SSL -Get whether HTTPS is supported. If supported then flag -MHD_USE_SSL and options MHD_OPTION_HTTPS_MEM_KEY, -MHD_OPTION_HTTPS_MEM_CERT, MHD_OPTION_HTTPS_MEM_TRUST, -MHD_OPTION_HTTPS_MEM_DHPARAMS, MHD_OPTION_HTTPS_CRED_TYPE, -MHD_OPTION_HTTPS_PRIORITIES can be used. - -@item MHD_FEATURE_HTTPS_CERT_CALLBACK -Get whether option #MHD_OPTION_HTTPS_CERT_CALLBACK is -supported. - -@item MHD_FEATURE_IPv6 -Get whether IPv6 is supported. If supported then flag -MHD_USE_IPv6 can be used. - -@item MHD_FEATURE_IPv6_ONLY -Get whether IPv6 without IPv4 is supported. If not supported -then IPv4 is always enabled in IPv6 sockets and -flag MHD_USE_DUAL_STACK if always used when MHD_USE_IPv6 is -specified. - -@item MHD_FEATURE_POLL -Get whether @code{poll()} is supported. If supported then flag -MHD_USE_POLL can be used. - -@item MHD_FEATURE_EPOLL -Get whether @code{epoll()} is supported. If supported then Flags -MHD_USE_EPOLL_LINUX_ONLY and -MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY can be used. - -@item MHD_FEATURE_SHUTDOWN_LISTEN_SOCKET -Get whether shutdown on listen socket to signal other -threads is supported. If not supported flag -MHD_USE_PIPE_FOR_SHUTDOWN is automatically forced. - -@item MHD_FEATURE_SOCKETPAIR -Get whether a @code{socketpair()} is used internally instead of -a @code{pipe()} to signal other threads. - -@item MHD_FEATURE_TCP_FASTOPEN -Get whether TCP Fast Open is supported. If supported then -flag MHD_USE_TCP_FASTOPEN and option -MHD_OPTION_TCP_FASTOPEN_QUEUE_SIZE can be used. - -@item MHD_FEATURE_BASIC_AUTH -Get whether HTTP Basic authorization is supported. If supported -then functions @code{MHD_basic_auth_get_username_password()} and -@code{MHD_queue_basic_auth_fail_response()} can be used. - -@item MHD_FEATURE_DIGEST_AUTH -Get whether HTTP Digest authorization is supported. If -supported then options MHD_OPTION_DIGEST_AUTH_RANDOM, -MHD_OPTION_NONCE_NC_SIZE and functions @code{MHD_digest_auth_check()}, -can be used. - -@item MHD_FEATURE_POSTPROCESSOR -Get whether postprocessor is supported. If supported then -functions @code{MHD_create_post_processor()}, -@code{MHD_post_process()}, @code{MHD_destroy_post_processor()} -can be used. - -@end table -@end deftp - - - -@deftypefun {int} MHD_is_feature_supported (enum MHD_FEATURE feature) -Get information about supported MHD features. Indicate that MHD was -compiled with or without support for particular feature. Some features -require additional support by the kernel. However, kernel support is not -checked by this function. - -@table @var -@item feature -type of requested information -@end table - -Returns @code{MHD_YES} if the feature is supported, -and @code{MHD_NO} if not. -@end deftypefun - - -@c ------------------------------------------------------------ -@node microhttpd-util unescape -@section Unescape strings - -@deftypefun {size_t} MHD_http_unescape (char *val) -Process escape sequences ('%HH') Updates val in place; the result -should be UTF-8 encoded and cannot be larger than the input. The -result must also still be 0-terminated. - -@table @var -@item val -value to unescape (modified in the process), must be -a 0-terminated UTF-8 string. -@end table - -Returns length of the resulting val (@code{strlen(val)} may be -shorter afterwards due to elimination of escape sequences). - -@end deftypefun - - - - -@c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - - -@c ********************************************************** -@c ******************* Appendices ************************* -@c ********************************************************** - -@node GNU-LGPL -@unnumbered GNU-LGPL -@cindex license -@include lgpl.texi - -@node GNU GPL with eCos Extension -@unnumbered GNU GPL with eCos Extension -@cindex license -@include ecos.texi - -@node GNU-FDL -@unnumbered GNU-FDL -@cindex license -@include fdl-1.3.texi - -@node Concept Index -@unnumbered Concept Index - -@printindex cp - -@node Function and Data Index -@unnumbered Function and Data Index - -@printindex fn - -@node Type Index -@unnumbered Type Index - -@printindex tp - -@bye diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/mdate-sh b/src/hos_libhttpserver/src/libmicrohttpd/doc/mdate-sh deleted file mode 100755 index b3719cf7..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/mdate-sh +++ /dev/null @@ -1,224 +0,0 @@ -#!/bin/sh -# Get modification time of a file or directory and pretty-print it. - -scriptversion=2010-08-21.06; # UTC - -# Copyright (C) 1995-2013 Free Software Foundation, Inc. -# written by Ulrich Drepper , June 1995 -# -# 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, 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, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -fi - -case $1 in - '') - echo "$0: No file. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: mdate-sh [--help] [--version] FILE - -Pretty-print the modification day of FILE, in the format: -1 January 1970 - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "mdate-sh $scriptversion" - exit $? - ;; -esac - -error () -{ - echo "$0: $1" >&2 - exit 1 -} - - -# Prevent date giving response in another language. -LANG=C -export LANG -LC_ALL=C -export LC_ALL -LC_TIME=C -export LC_TIME - -# GNU ls changes its time format in response to the TIME_STYLE -# variable. Since we cannot assume 'unset' works, revert this -# variable to its documented default. -if test "${TIME_STYLE+set}" = set; then - TIME_STYLE=posix-long-iso - export TIME_STYLE -fi - -save_arg1=$1 - -# Find out how to get the extended ls output of a file or directory. -if ls -L /dev/null 1>/dev/null 2>&1; then - ls_command='ls -L -l -d' -else - ls_command='ls -l -d' -fi -# Avoid user/group names that might have spaces, when possible. -if ls -n /dev/null 1>/dev/null 2>&1; then - ls_command="$ls_command -n" -fi - -# A 'ls -l' line looks as follows on OS/2. -# drwxrwx--- 0 Aug 11 2001 foo -# This differs from Unix, which adds ownership information. -# drwxrwx--- 2 root root 4096 Aug 11 2001 foo -# -# To find the date, we split the line on spaces and iterate on words -# until we find a month. This cannot work with files whose owner is a -# user named "Jan", or "Feb", etc. However, it's unlikely that '/' -# will be owned by a user whose name is a month. So we first look at -# the extended ls output of the root directory to decide how many -# words should be skipped to get the date. - -# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below. -set x`$ls_command /` - -# Find which argument is the month. -month= -command= -until test $month -do - test $# -gt 0 || error "failed parsing '$ls_command /' output" - shift - # Add another shift to the command. - command="$command shift;" - case $1 in - Jan) month=January; nummonth=1;; - Feb) month=February; nummonth=2;; - Mar) month=March; nummonth=3;; - Apr) month=April; nummonth=4;; - May) month=May; nummonth=5;; - Jun) month=June; nummonth=6;; - Jul) month=July; nummonth=7;; - Aug) month=August; nummonth=8;; - Sep) month=September; nummonth=9;; - Oct) month=October; nummonth=10;; - Nov) month=November; nummonth=11;; - Dec) month=December; nummonth=12;; - esac -done - -test -n "$month" || error "failed parsing '$ls_command /' output" - -# Get the extended ls output of the file or directory. -set dummy x`eval "$ls_command \"\\\$save_arg1\""` - -# Remove all preceding arguments -eval $command - -# Because of the dummy argument above, month is in $2. -# -# On a POSIX system, we should have -# -# $# = 5 -# $1 = file size -# $2 = month -# $3 = day -# $4 = year or time -# $5 = filename -# -# On Darwin 7.7.0 and 7.6.0, we have -# -# $# = 4 -# $1 = day -# $2 = month -# $3 = year or time -# $4 = filename - -# Get the month. -case $2 in - Jan) month=January; nummonth=1;; - Feb) month=February; nummonth=2;; - Mar) month=March; nummonth=3;; - Apr) month=April; nummonth=4;; - May) month=May; nummonth=5;; - Jun) month=June; nummonth=6;; - Jul) month=July; nummonth=7;; - Aug) month=August; nummonth=8;; - Sep) month=September; nummonth=9;; - Oct) month=October; nummonth=10;; - Nov) month=November; nummonth=11;; - Dec) month=December; nummonth=12;; -esac - -case $3 in - ???*) day=$1;; - *) day=$3; shift;; -esac - -# Here we have to deal with the problem that the ls output gives either -# the time of day or the year. -case $3 in - *:*) set `date`; eval year=\$$# - case $2 in - Jan) nummonthtod=1;; - Feb) nummonthtod=2;; - Mar) nummonthtod=3;; - Apr) nummonthtod=4;; - May) nummonthtod=5;; - Jun) nummonthtod=6;; - Jul) nummonthtod=7;; - Aug) nummonthtod=8;; - Sep) nummonthtod=9;; - Oct) nummonthtod=10;; - Nov) nummonthtod=11;; - Dec) nummonthtod=12;; - esac - # For the first six month of the year the time notation can also - # be used for files modified in the last year. - if (expr $nummonth \> $nummonthtod) > /dev/null; - then - year=`expr $year - 1` - fi;; - *) year=$3;; -esac - -# The result. -echo $day $month $year - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/performance_data.eps b/src/hos_libhttpserver/src/libmicrohttpd/doc/performance_data.eps deleted file mode 100644 index 7da198d2..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/performance_data.eps +++ /dev/null @@ -1,8468 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Creator: (ImageMagick) -%%Title: (performance_data.eps) -%%CreationDate: (2014-02-19T07:16:22+01:00) -%%BoundingBox: -0 -0 640 480 -%%HiResBoundingBox: 0 0 640 480 -%%DocumentData: Clean7Bit -%%LanguageLevel: 1 -%%Pages: 1 -%%EndComments - -%%BeginDefaults -%%EndDefaults - -%%BeginProlog -% -% Display a color image. The image is displayed in color on -% Postscript viewers or printers that support color, otherwise -% it is displayed as grayscale. -% -/DirectClassPacket -{ - % - % Get a DirectClass packet. - % - % Parameters: - % red. - % green. - % blue. - % length: number of pixels minus one of this color (optional). - % - currentfile color_packet readhexstring pop pop - compression 0 eq - { - /number_pixels 3 def - } - { - currentfile byte readhexstring pop 0 get - /number_pixels exch 1 add 3 mul def - } ifelse - 0 3 number_pixels 1 sub - { - pixels exch color_packet putinterval - } for - pixels 0 number_pixels getinterval -} bind def - -/DirectClassImage -{ - % - % Display a DirectClass image. - % - systemdict /colorimage known - { - columns rows 8 - [ - columns 0 0 - rows neg 0 rows - ] - { DirectClassPacket } false 3 colorimage - } - { - % - % No colorimage operator; convert to grayscale. - % - columns rows 8 - [ - columns 0 0 - rows neg 0 rows - ] - { GrayDirectClassPacket } image - } ifelse -} bind def - -/GrayDirectClassPacket -{ - % - % Get a DirectClass packet; convert to grayscale. - % - % Parameters: - % red - % green - % blue - % length: number of pixels minus one of this color (optional). - % - currentfile color_packet readhexstring pop pop - color_packet 0 get 0.299 mul - color_packet 1 get 0.587 mul add - color_packet 2 get 0.114 mul add - cvi - /gray_packet exch def - compression 0 eq - { - /number_pixels 1 def - } - { - currentfile byte readhexstring pop 0 get - /number_pixels exch 1 add def - } ifelse - 0 1 number_pixels 1 sub - { - pixels exch gray_packet put - } for - pixels 0 number_pixels getinterval -} bind def - -/GrayPseudoClassPacket -{ - % - % Get a PseudoClass packet; convert to grayscale. - % - % Parameters: - % index: index into the colormap. - % length: number of pixels minus one of this color (optional). - % - currentfile byte readhexstring pop 0 get - /offset exch 3 mul def - /color_packet colormap offset 3 getinterval def - color_packet 0 get 0.299 mul - color_packet 1 get 0.587 mul add - color_packet 2 get 0.114 mul add - cvi - /gray_packet exch def - compression 0 eq - { - /number_pixels 1 def - } - { - currentfile byte readhexstring pop 0 get - /number_pixels exch 1 add def - } ifelse - 0 1 number_pixels 1 sub - { - pixels exch gray_packet put - } for - pixels 0 number_pixels getinterval -} bind def - -/PseudoClassPacket -{ - % - % Get a PseudoClass packet. - % - % Parameters: - % index: index into the colormap. - % length: number of pixels minus one of this color (optional). - % - currentfile byte readhexstring pop 0 get - /offset exch 3 mul def - /color_packet colormap offset 3 getinterval def - compression 0 eq - { - /number_pixels 3 def - } - { - currentfile byte readhexstring pop 0 get - /number_pixels exch 1 add 3 mul def - } ifelse - 0 3 number_pixels 1 sub - { - pixels exch color_packet putinterval - } for - pixels 0 number_pixels getinterval -} bind def - -/PseudoClassImage -{ - % - % Display a PseudoClass image. - % - % Parameters: - % class: 0-PseudoClass or 1-Grayscale. - % - currentfile buffer readline pop - token pop /class exch def pop - class 0 gt - { - currentfile buffer readline pop - token pop /depth exch def pop - /grays columns 8 add depth sub depth mul 8 idiv string def - columns rows depth - [ - columns 0 0 - rows neg 0 rows - ] - { currentfile grays readhexstring pop } image - } - { - % - % Parameters: - % colors: number of colors in the colormap. - % colormap: red, green, blue color packets. - % - currentfile buffer readline pop - token pop /colors exch def pop - /colors colors 3 mul def - /colormap colors string def - currentfile colormap readhexstring pop pop - systemdict /colorimage known - { - columns rows 8 - [ - columns 0 0 - rows neg 0 rows - ] - { PseudoClassPacket } false 3 colorimage - } - { - % - % No colorimage operator; convert to grayscale. - % - columns rows 8 - [ - columns 0 0 - rows neg 0 rows - ] - { GrayPseudoClassPacket } image - } ifelse - } ifelse -} bind def - -/DisplayImage -{ - % - % Display a DirectClass or PseudoClass image. - % - % Parameters: - % x & y translation. - % x & y scale. - % label pointsize. - % image label. - % image columns & rows. - % class: 0-DirectClass or 1-PseudoClass. - % compression: 0-none or 1-RunlengthEncoded. - % hex color packets. - % - gsave - /buffer 512 string def - /byte 1 string def - /color_packet 3 string def - /pixels 768 string def - - currentfile buffer readline pop - token pop /x exch def - token pop /y exch def pop - x y translate - currentfile buffer readline pop - token pop /x exch def - token pop /y exch def pop - currentfile buffer readline pop - token pop /pointsize exch def pop - /Times-Roman findfont pointsize scalefont setfont - x y scale - currentfile buffer readline pop - token pop /columns exch def - token pop /rows exch def pop - currentfile buffer readline pop - token pop /class exch def pop - currentfile buffer readline pop - token pop /compression exch def pop - class 0 gt { PseudoClassImage } { DirectClassImage } ifelse - grestore -} bind def -%%EndProlog -%%Page: 1 1 -%%PageBoundingBox: 0 0 640 480 -userdict begin -DisplayImage -0 0 -640 480 -12 -640 480 -1 -0 -0 -102 -FFFFFF -000000 -A0A0A0 -FF0000 -00C000 -0080FF -C000FF -00EEEE -C04000 -C8C800 -4169E1 -FFC020 -008040 -C080FF -306080 -8B0000 -408000 -FF80FF -7FFFD4 -A52A2A -FFFF00 -40E0D0 -000000 -1A1A1A -333333 -4D4D4D -666666 -7F7F7F -999999 -B3B3B3 -C0C0C0 -CCCCCC -E5E5E5 -FFFFFF -F03232 -90EE90 -ADD8E6 -F055F0 -E0FFFF -EEDD82 -FFB6C1 -AFEEEE -FFD700 -00FF00 -006400 -00FF7F -228B22 -2E8B57 -0000FF -00008B -191970 -000080 -0000CD -87CEEB -00FFFF -FF00FF -00CED1 -FF1493 -FF7F50 -F08080 -FF4500 -FA8072 -E9967A -F0E68C -BDB76B -B8860B -F5F5DC -A08020 -FFA500 -EE82EE -9400D3 -DDA0DD -905040 -556B2F -801400 -801414 -804014 -804080 -8060C0 -8060FF -808000 -FF8040 -FFA040 -FFA060 -FFA070 -FFC0C0 -FFFF80 -FFFFC0 -CDB79E -F0FFF0 -A0B6CD -C1FFC1 -CDC0B0 -7CFF40 -A0FF20 -BEBEBE -BFBFBF -5F5F5F -1F1F1F -DFDFDF -9F9F9F -3F3F3F -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001010101010101010100010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000606101010000000000006361010161630000000000636101016163000000 -0063610101616300000000000000000000000000000000000000000000000000606101010000 -0000000000636101016163000000006361010161630000000063610101616300000000636101 -0161630000000063610101616300000000006361010161630000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000161000000000000006101 -0000010000000000000000010000000101010162651B63000000000100000000000000000000 -0000000000000001000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000010000000001010101010101010000 -0000000000000060650162616300000000010101010101000000006361010161630000000000 -00631B6562016261600000000000606162016265640000000000006361620101626160000001 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000621B6301000000000000621B63631B620000000000621B63631B6200000000621B63631B -6200000000000000000000000000000000000000000000000000621B63010000000000000062 -1B63631B6200000000621B63631B6200000000621B63631B6200000000621B63631B62000000 -00621B63631B620000000000621B63631B620000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000162630000000000636501000001000000 -0000000000010000000100000063601B62640000000100000000000000000000000000000000 -0001000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000010000000000000000000000000000000000 -000000000000000000000000000000000001000000000000000000001B610000000000000000 -606264636364650000000001000000000000000000621B63631B620000000000606261606300 -631B621B00000000656463006360651B00000000646264630063646501000001000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000001 -00000000001B610000000061640000001B6100000000616400001B6100000000616400000000 -0000000000000000000000000000000000000000000000010000000000001B61000000006164 -00001B6100000000616400001B6100000000616400001B6100000000616400001B6100000000 -61640000001B6100000000616400000100000000000000000000000000000000000000000000 -000000000000000000000000000000011B610000000000616401000001000000000000000001 -0000000100000000000060626300000100000000000000000000000000000000000100000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000062600000000000000000656400000000 -64640000000100000000000000001B6100000000616400000064626000000000000000656100 -000000000000000063010000006362630000000000001B000001000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000001000000000001001B620162640000000001006162010000606501 -626400000000006065016264000000000000000000010000000000636101621B000000010061 -6201656300000000000000000000000000000000636162016264000000000001000000000065 -6000000000606500000065600000000060650000656000000000606500000000000000000000 -00000001001B6201626400000000000000010000000000006560000000006065000065600000 -0000606500006560000000006065000065600000000060650000656000000000606500000065 -60000000006065000001000000000000006362000000000000006260001B6201016560000000 -0000000000000000000163626300000063620001000001000000000000000001000000010000 -00000000001B6100000100000000001B62010165600000000000000100000000010061620165 -630000000060650162640000000001001B6201626400000000636162016264000001001B6201 -626400000001006162621B00006162016100000000636101621B000000000100616201000001 -0000000060626400010000000000000000000060650101656000000001001B62016264000000 -0000000000010000000000000000006065000000000000000000016300000000636500000001 -0000000000000000656000000000606500006362600060650101656001006260000000000000 -0000636200000061640000000000000000000001000000000000000001000001010101010101 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000001000000000001611B630060626400000001616400000063626400606260000000 -63626400606260000000000000000000000000000062640063611B0000016164636364626300 -0000000000000000000000000063621B63006061000000000001000000000062630000000063 -620000006263000000006362000062630000000063620000000000000000000000000001611B -6300606264000000000000010000000000006263000000006362000062630000000063620000 -6263000000006362000062630000000063620000626300000000636200000062630000000063 -62000000000000000000000061640000000000646500611B6300636065000000000000000000 -0000000100611B0000001B1B0001000001000000000000000001000000010000000000000063 -6200000000000000611B63006360650000000000000000000000016164636364626300006362 -640060626000000001611B6300606264000063621B63006061000001611B6300606264000001 -61646363651B61646363656400000062640063611B0000000161640000000001000000606260 -0000000000000000000000006062646363646260000001611B63006062640000000000000001 -0000000000000000006564000000000000000000016300000000636200000001620162616300 -0000626300000000636200001B610060626463636401010064610000000000000060651B0000 -0062630000000000000000000001000000000000000001000000000000001B62000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000011B000000006065000000011B00000000611B0000006065000000611B00000060 -6500000000000000000000000000000000000063620000011B000000001B6100000000000000 -00000000000000611B0000000000000000000001000000000001000000000000010000000100 -0000000000010000010000000000000100000000000000000000000000011B00000000606500 -0000000000010000000000000100000000000001000001000000000000010000010000000000 -0001000001000000000000010000010000000000000100000001000000000000010000000000 -0000000000006062000000000062600001000000000000000000000000000000000000010063 -6200000062630001000001010101010101010101000000010000000000000000010000000000 -0000010000000000000000000000000000000000011B000000001B610000611B000000606500 -0000011B0000000060650000611B00000000000000011B000000006065000001640000006001 -640000006065000000000000006362000000011B000000000001000064656300000000000000 -00000000000061640000000064610000011B0000000060650000000000000001000000000000 -00006362000000000000000000006564000000006401000000656000631B6260000001000000 -0000000100006260006564000000006401006362000000000101010165000000000100000000 -0000000000000001010101010101010101000000000000646263000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000001 -6300000000636200000001630000000062630000006362000000626300000063620000000000 -0000000000000000001B62010101010000016300000000636200000000000000000000000000 -0062630000000000000000000001000000000001000000000000010000000100000000000001 -0000010000000000000100000000000000000000000000016300000000636200000000000001 -0000000000000100000000000001000001000000000000010000010000000000000100000100 -0000000000010000010000000000000100000001000000000000010000000000000000000000 -0065640000001B65000065616300000000000000000000000000000000010000656400646100 -0001000001000000000000000001000000010000000000000000010000000000000065616300 -0000000000000000000000000000016300000000636200006263000000636200000001630000 -0000636200006263000000000000000163000000006362000001630000000001630000000001 -0000001B62010101010000000163000000000001001B61000000000000000000000000000000 -62630000000063620000016300000000636200000000000000010000000000000000611B0000 -0000000000000000606264636364620100000000000000006465000001000000000000010000 -01000001630000000063010000010000000000006364621B0000000100000000000101010100 -0001000000000000000001000000000060626300000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000001000000000000 -0100000001000000000001010101010101000000010101010101010000000000000000000000 -0000616560000000010000010000000000000100000000000000000101010100000100000000 -0000000000000001000000000062630000000063620000006263000000006362000062630000 -0000636200000000000000010101010000010000000000000100000000000001000000000000 -6263000000006362000062630000000063620000626300000000636200006263000000006362 -0000626300000000636200000062630000000063620000000000000000000000006062000000 -6264000063610162616000000000000000000000000000010000606200626000000100000100 -0000000000000001000000010000000000000063620000000000000063610162616000000000 -0000000000000000010000000000000100000101010101010100000001000000000000010000 -0100000000000000000100000000000001000001000000000001000000000001000061656000 -0000010000000100000000000001006263000000000000000000000000000000010000000000 -0001000001000000000000010000000000000001000000000000006362630000000001010101 -0000006065010165646200000000000000006301000062630000000063620000010000016300 -0000006301006362000000000000000060620000006263000000000000000100000100000000 -0000000001000000006062600000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000001000000000000010000000100 -0000000062630000000000000000626300000000000000000000000000000000000062630000 -0063010000016300000000636200000000000000000000000000006263000000000000000000 -0001000000000065600000000060650000006560000000006065000065600000000060650000 -0000000000000000000000010000000000000100000000000001000000000000656000000000 -6065000065600000000060650000656000000000606500006560000000006065000065600000 -00006065000000656000000000606500000000000000000000000000651B001B620000000000 -006364656100000000000000000000000001000000621B620000000100000100000000000000 -000100000001000000000000001B610000000000000000000063646561000000000000000000 -0000016300000000636200006263000000000000000001000000000000010000626300000000 -0000000100000000000001000001000000000001000000000001000062630000006301000000 -0100000000000001006462630000000000000000000000000000626300000000636200000100 -0000000000010000000000000001000000000000001B61000000000000000000000000000000 -0000606100000000000000006301000065600000000060650000626000656400000000640100 -646100000000000000000001000000611B000000000000000100000100000000000000000100 -0000636260000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000001000000000000010000000100000000006164 -0000000000000000616400000000000000000000000000000000000062630000001B01000001 -1B000000001B610000000000000000000000000000611B000000000000000000000100000000 -001B610000000061640000001B6100000000616400001B610000000061640000000000000000 -00000000000100000000000001000000000000010000000000001B6100000000616400001B61 -00000000616400001B6100000000616400001B6100000000616400001B610000000061640000 -001B610000000061640000000000000000000000000064016301640000000000000000630100 -0000000000000000000000010000006401640000000100000100000000000000000100000001 -00000000000063626300000000000000000000000063010000000000000000000000011B0000 -00001B6100006164000000000000000001000000000000010000611B00000000000000010000 -0000000001000001000000000001000000000001000062630000001B01000000010000000000 -0001000060626000000000000000000000000000616400000000646100000100000000000001 -0000000000000001000000000000006263000000000000000000000000000000000065600000 -000000000000646500001B6100000000616400001B6100606264636364620160626300000000 -0000000060620000006362630000000000000100000100000000000000000100006362640000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000001000000000000010000000100000000006362646300606500 -00006362646300606500000000000000000000000000616163631B6101000001616463636462 -63000000000000000000000000000063621B63006061000000000001000000000000621B6363 -1B620000000000621B63631B6200000000621B63631B62000000000000000000000000000001 -000000000000010000000000000100000000000000621B63631B6200000000621B63631B6200 -000000621B63631B6200000000621B63631B6200000000621B63631B620000000000621B6363 -1B620000000000000000000000000000006262620000000065646300631B6500000100000000 -000000000001000000000000000000010000010000000000000000010000000100000063601B -6264000000000000000065646300631B65000000000000000000000001616463636462630000 -636264630060650000000100000000000001000063621B630060610000010000000000000100 -00010000000000010000000000010000616163631B6101000000010000000000000100000060 -6264000000000000000000000000606264636364626000000100000000000001000000000000 -000100000000000064650000000000000000000000000065600063616100000065646300631B -6260000000621B63631B62000000636260006065010165600165630000006560630063646260 -0000000064621B630000631B010000010000000000000000010000621B000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000001000000000000010000000100000000000060650101656000000000606501 -0165600000000000000000000000000063616201610001000001006162016563000000000000 -0000000000000000000063616201656400000101010101010100000063610101616300000000 -0063610101616300000000636101016163000000000000000000000000000001000000000000 -0100000001010101010101000000006361010161630000000063610101616300000000636101 -0161630000000063610101616300000000636101016163000000000063610101616300000000 -00000000000000000000006401640000000060616201621B0000000100000000000000000001 -000000000000000000010000010000000000000000010000000101010162651B630000000000 -0000000060616201621B00000000000000000000000001006162016563000000006065010165 -6000000001000000000000010000006361620165640000010000000000000100000100000000 -000100000000000100006361620161000100000001000000000000010000000063621B000000 -0000000000000000006465010165600000000100000000000001000000000000000100000000 -0000656000000000000000000000000000646201626400000000606162016261630000000063 -6101016163000000006462600000000000000000000000006061620162616000000000000060 -6162010162616300000100000000000000000100000101010101010100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000060626160630063606165000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -1B65620101651B63000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000606101010000000000000000000000 -0000000000000000000000000000000000006361010161630000000000646201626400000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000621B63010000000000000000000000000000000000 -000000000000000000000000621B63631B620000000061616300606500000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -00000000001B6100000000616400006065000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000006065016264000000000000000000010000000000000065 -6000000000606500006160000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000636264006062600000000000000000010000000000000062630000000063 -6200006264650101656000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000611B00000060650000000000000000010000000000000001000000000000010000016264 -6363646260000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000062630000 -0063620000000000000000010000000000000001000000000000010000016400000000646500 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000001010101010101000000 -0001010101010101010100000062630000000063620000626300000000630100000000000000 -0000000000000000000101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000062630000000000000000000000000001 -0000000000000065600000000060650000656300000000630100000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000010000000000000000000100000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000010000 -0000000000000100000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000010000000000000000000100000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0100000000000000000100000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000100000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000061640000000000000000000000000001000000000000 -001B610000000061640000646400000000646500000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000010000000000000000000100000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000010000000000000000 -0100000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000010000000000000000000100000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000010000000000 -0000000100000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000100000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000010000000000636264630060650000000000000000010000000000000000621B6363 -1B62000000006564636364626000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000101010101 -0101000000606501016560000000000000000001000000000000000063610101616300000000 -6361620165600000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010101000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000016263000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000101 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -6465000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001006564000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001006362630000000001000060 -6501016560000000000000000000606501626400000000010061620165630000000000606501 -0165600000010000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000100001B610000000001006062646363646260 -0000000000000063626400606260000000016164636364626300000060626463636462600001 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000656000000001006164000000006461000000000000 -00611B0000006065000000011B000000001B6100000061640000000064610001000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000636200000001006263000000006362000000000000006263000000 -6362000000016300000000636200000062630000000063620001000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000001B1B000001000100000000000001000000000000000101010101010100000001 -0000000000000100000001000000000000010001000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000030303030303030000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0065630001006263000000006362000000000000006263000000000000000001630000000063 -6200000062630000000063620001000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000030000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000006065000100 -61640000000064610000000000000061640000000000000000011B000000001B610000006164 -0000000064610001000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000030000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000010000000000001B640100606264636364 -6260000000000000006362646300606500000001616463636462630000006062646363646260 -0001000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000030000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000650100006465010165600000000000 -0000000060650101656000000001006162016563000000000064650101656000000100000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000101010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010101000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000004000000000004000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000040000000400000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000400040000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0004000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000006200000000006301630000 -0000006201000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000040004000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000006164000000006401640000000064650100 -0000010000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000004000000040000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000606100000000611B610000000061640000000001000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000400000400000400000400000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000006200000000626362000000636200010000010101010100000001001B -6201626400000000000000000060650162640000000001006162016563000000006065010165 -6000000001000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000004000000040004000000000004000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000001B64000063650065630000646100010000000100000000000001611B630060626400 -0000000000006362640060626000000001616463636462630000606264636364626000000100 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000400000000000400000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000040004000000040000000400000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000006065 -00006461001B6400006560000100000001000000000000011B00000000606500000000000000 -611B0000006065000000011B000000001B610000616400000000646100000100000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000400 -0000040000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0400000000000400040000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000062630061640060 -6100636200000100000001000000000000016300000000636200000000000000626300000063 -6200000001630000000063620000626300000000636200000100000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000004000400000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000004000400000000 -0004000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000001B1B006263006362001B1B0000 -0100000001000000000000010000000000000100000000000000010101010101010000000100 -0000000000010000010000000000000100000100000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000400000004000000040004000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000063656362000000626362630000010000000100 -0000000000010000000000000100000000000000626300000000000000000163000000006362 -0000626300000000636200000100000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000004000400000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000040000000000040004000000040000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000651B61000000611B65000000010000000100000000000001 -000000000000010000000000000061640000000000000000011B000000001B61000061640000 -0000646100000100000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000400000004000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000400000000000400000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000064016400000064011B000000010000006264000000000001000000000000 -0100000000000000636264630060650000000161646363646263000060626463636462600000 -0100000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000040000000000040000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000630163000000630163000000010000006062010100000001000000000000010000000000 -0000006065010165600000000100616201656300000000646501016560000000010000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000040000000000040000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010101000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000400000004000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001010100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000040000 -0000000400000000000000000004000400000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000400000004000000 -0000000000000000040000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000004000400000000000000000000 -0004000400000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000040000000000000000000000040000000400 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000004000400000000000000000004000000000004000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000400000004000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000004 -0000000000040000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000040000000000040000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000400000004000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000606101 -0100000000000063610101616300000000636101016163000000006361010161630000000000 -6361010161630000000063610101616300000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000004000400000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000621B63010000000000 -00621B63631B6200000000621B63631B6200000000621B63631B620000000000621B63631B62 -00000000621B63631B6200000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000040000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000100000000001B6100000000 -616400001B6100000000616400001B610000000061640000001B6100000000616400001B6100 -0000006164000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000400 -0400000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000656000000000606500006560 -0000000060650000656000000000606500000065600000000060650000656000000000606500 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000040000000400000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000626300000000636200006263000000006362 -0000626300000000636200000062630000000063620000626300000000636200000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000004000000000004000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000010000000000000100000100000000000001000001000000 -0000000100000001000000000000010000010000000000000100000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000400000000000400000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000010000000000000100000100000000000001000001000000000000010000 -0001000000000000010000010000000000000100000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000004000000040000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000626300000000636200006263000000006362000062630000000063620000006263000000 -0063620000626300000000636200000000000000000000000000000000010101010100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000040004000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010101010100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000065600000 -0000606500006560000000006065000065600000000060650000006560000000006065000065 -6000000000606500000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000004000000000004 -0000000000000000000000000000000000000000000000000000000000000000000004040000 -0000040000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000100000000001B610000000061640000 -1B6100000000616400001B610000000061640000001B6100000000616400001B610000000061 -6400000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040000000400000000000000 -0000000000000000000000000000000000000000000000000000000004040400000400000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000621B63631B6200000000621B63631B -6200000000621B63631B620000000000621B63631B6200000000621B63631B62000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000400040000000000000000000000000000 -0000000000000000000000000000000000000400000400000404040000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001010101010101000000636101016163000000006361010161630000000063 -6101016163000000000063610101616300000000636101016163000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000004000000000000000000000000000000000000000000 -0000000000000000000000000004040000040004040000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000400040000000000000000000000000000000000000000000004000000 -0000040000000000040004000400040000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001010100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000040000000400000000000000000000000000000000000000000000040000000400000000 -0000000400040000000400000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000101010000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000621B6300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004000000000404000000 -0004000000000000000000000000000000000000000000000400040000000000000004000400 -0000000004000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000063610161600000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000040000000400000000000000000000 -0000000000000000000000000000000000000004000000000000000400000004000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000631B626564000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000400040000000000000000000000000000000000 -0000000000000000000000000400040000000000040000000000040000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000006465621B63000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000004000000000000000000000000000000000000000000000000 -0000000000040000000400000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000001B0101610000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000400040000000000000000000000000000000000000000000000000000000400 -0000000004000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000063 -1B626560001B6100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000004 -0000000400000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000636162616300000063 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000400000000000400 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000006065621B63000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000004000000000004000004000000 -0000040000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000006564000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000040000000400000000040000000400000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000400040000000000000400040000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000006461000000000061640000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000004000000000000000004000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000626000 -0000000060650000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010101 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000400040000000000000400040000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001010100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000004000000 -0400000000040000000400000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000626300000000006362000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000400000000000400000400 -0000000004000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000611B00000000001B61000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -000000000000000000000063621B6300631B6263000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000006361620162616300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000400 -0000000004000000000000000000000000000000000004000000000004000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000004000000040000 -0000000000000000000000000000000000040000000400040000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000646562010101010100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040004000000000000000000 -0000000000000000000000000400040004000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000064626063000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000400000000000400000000000000000000 -0000000000000004000400000004000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000062600000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000040004000000040000000000000000000000000004000000 -0400040000000400000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000004000000040004000000000000000000000000000000040004000400040004 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0062630000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0400000000000400000000000000000000000000000000000400040000000400000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000001B1B000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000004 -0004000000000000000004000000000004000004000000040004000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000611B6300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000400000004000000 -0000000000040000000400000400040004000000040000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000101010101010101010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000040000000000040000000000000000 -0400040000040000000400000000000400000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000400000400 -0000000004000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040004000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000004000000040000000000000400000000000400 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000006065 -6201000065600000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000400000000000400000000000004000000040000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000646260630100006065 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000040000000000040000040004000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000626000000100000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000400000004000000000400000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000100006301000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0004000400000000040004000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000656400000100006465000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000004000000 -0004000000040004000000000004000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -000000000060621B630163646263000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000400000000000400040000040000000000 -0400040000000400000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -6361620162616300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0101000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000400000000 -0004000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000004000000040000000400000000000000040000040004 -0400000400000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000101010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004000000040000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000040004000000000004000000000000000400000404000004000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000040004000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000040400000000040000000000000000000004040404000400000400000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000400000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000004 -0404000004000000000000000000000004040004040000040000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000030003030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000040004000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000400000404040000 -0000000400000004000404000404040404000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000303030303030303000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000004000000040000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000040000000004040000000000000400 -0000040400000404000404000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000030303 -0303030303030303030000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000646200000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000040000 -0000000400000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000400040000000000000004000404040004 -0004040004040004000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000003030303030303030303 -0303030300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001010101010101 -0101626000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000040000000400000000000000040000000400000404000004 -0400000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000303030303030303030303030303030300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000004000000000004000000000004040400040004040000040004040000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000030303030303030303030303030303030303000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000400000404000004040000000400000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000003030303030303030303030303030303030303030000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000001B620101010101010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000040004000404040404000400040004000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0303030303030303030303030303030303030303030300000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000001B61630100631B61000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000060610101000000000000636101016163 -0000000063610101616300000000636101016163000000000063610101616300000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000040000040400000004000000040000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000030303030303 -0303030000000000030303030303030300000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000006263000100000064610000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000621B6301000000000000621B63631B6200000000621B -63631B6200000000621B63631B620000000000621B63631B6200000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000040404 -0400000400000000000400000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000003030303030303030000000000 -0000000003030303030303000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0100000000620000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000100000000001B6100000000616400001B6100000000616400 -001B610000000061640000001B61000000006164000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000040400000400000400 -0000040404000000040404000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000303030303030300000000000000000000000303 -0303030303030000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000616400626000006362 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000065600000000060650000656000000000606500006560000000 -0060650000006560000000006065000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000004040004000004000004000400040404 -0004040404000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000303030303030300000000000000000000000003030303030303 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -00000000000000000000000000000000000000000000006362001B6563636161000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000062630000000063620000626300000000636200006263000000006362000000 -6263000000006362000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000004000000040000000004040004000404040404040000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000030303030303030000000000000000000000000000030303030303030300000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000006162626163000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0001000000000000010000010000000000000100000100000000000001000000010000000000 -0001000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000400000000000400000000040400040404040404000004000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000303 -0303030303000000000000000000000000000000000303030303030300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000100000000 -0000010000010000000000000100000100000000000001000000010000000000000100000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000040404040404040404000400000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000303030303030300 -0000000000000000000000000000000303030303030303000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000006263000000006362000062 -6300000000636200006263000000006362000000626300000000636200000000000000000000 -0000000000010101010100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000004000004040404040404040000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000030303030303030000000000000000 -0000000000000000000003030303030303030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001010101010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000006560000000006065000065600000000060 -6500006560000000006065000000656000000000606500000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0400000404040404040004040400040000000000000000000000000000000000000000000000 -0000000000000000000000000000000003030303030303000000000000000000000000000000 -0000000000030303030303030000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000001B6100000000616400001B6100000000616400001B6100 -00000061640000001B6100000000616400000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000004040000 -0404000400040404000000000000000000000000000000000000000000000000000000000000 -0000000000000000000003030303030303000000000000000000000000000000000000000003 -0303030303030300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000001010101010101010101010100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000001000000000000621B63631B6200000000621B63631B6200000000621B63631B620000 -000000621B63631B620000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000404000000000404000400 -0400000000000000000000000000000000000000000000000000000000000000000000000000 -0000000303030303030300000000000000000000000000000000000000000000030303030303 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010101010101 -0100000063610101616300000000636101016163000000006361010161630000000000636101 -0161630000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000400040004000400040000 -0004000000000000000000000000000000000000000000000000000000000000000003030303 -0303030300000000000000000000000000000000000000000000030303030303030300000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000400040004000400040004000000 -0000000000000000000000000000000000000000000000000000000000000303030300000000 -0000000000000000000000000000000000000000000303030303030300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001010100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000040004040404040004040404000000000000000000 -0000000000000000000000000000000000000000000003030303030303000000000000000000 -0000000000000000000000000000000303030303030303000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010101000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000004000000040404040404040400000000000000000000000000000000 -0000000000000000000000000000000303030303030303000000000000000000000000000000 -0000000000000000000003030303030303000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000004000404040404040000040000000000000000000000000000000000000000 -0000000000000000000303030303030300000000000000000000000000000000000000000000 -0000000003030303030303030000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0400040004040404040004000000000000000000000000000000000000000000000000000000 -0000030303030303030000000000000000000000000000000000000000000000000000000003 -0303030303030000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000004000400040404 -0404040400000000000000000000000000000000000000000000000000000000000003030303 -0303030000000000000000000000000000000000000000000000000000000000030303030303 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000064656201010101010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040004040404040404040400 -0400000000000000000000000000000000000000000000000000000303030303030303000000 -0000000000000000000000000000000000000000000000000000030303030303030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000006462606300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000404000400000404040404000000040000 -0000000000000000000000000000000000000000000303030303030300000000000000000000 -0000000000000000000000000000000000000000000303030303030300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000006260000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000040004000400040004000400000000000000 -0000000000000000000000000000000303030303030300000000000000000000000000000000 -0000000000000000000000000000000303030303030300000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000004000404040404000404040400000000000000000000000000 -0000000000000000000003030303000000000000000000000000000000000000000000000000 -0000000000000000000303030303030303000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000626300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000004040404040404040000000000000000000000000000000000000000 -0000030303030303030000000000000000000000000000000000000000000000000000000000 -0000000003030303030303030000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -00000000000000000000000000000000000000000000001B1B00000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000400040404040404000004000000000000000000000000000000000000000003030303 -0303030000000000000000000000000000000000000000000000000000000000000000000303 -0303030303030000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000611B630000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000004000400 -0404040404000400000000000000000000000000000000000000000303030303030300000000 -0000000000000000000000000000000000000000000000000000000000000003030303030303 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010101010101010101000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010101000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000040004040404040404 -0000040000000000000000000000000000000000000303030303030300000000000000000000 -0000000000000000000000000000000000000000000000000003030303030303030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000101 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000004000404040404040404040404000004 -0000000000000000000000000000030303030303030000000000000000000000000000000000 -0000000000000000000000000000000000000000030303030303030000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000040400040000040404040400040404040000000000 -0000000000000000030303030303030000000000000000000000000000000000000000000000 -0000000000000000000000000000030303030303030000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000004040404040404040404000000000000000000000000 -0003030303030303000000000000000000000000000000000000000000000000000000000000 -0000000000000000030303030303030300000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000606562010000656000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000400000404040404040400000000000000000000000000000000030303 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000303030303030300000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000064626063010000606500000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000040404040404040000040000000000000000000000030303030303030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000030303 -0303030300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000062600000010000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000404 -0004040404040404000400000000000000000000000003030300000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000303030303030300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000010000630100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000400040404040404 -0404040000000000000000000000030303030303030000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000303030303030300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0065640000010000646500000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000004040404040404040404040004 -0000000000000003030303030303000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000003030303030303000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000060621B6301 -6364626300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000004000000000404040004000404040000000000 -0003030303030303000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000003030303030303000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000063616201626163000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000040004040400040404000000000000030303030303 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000003030303030303000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000004000400040404040400000400000000000003030300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0003030303030303030000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000006000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000040004000404040000040400000000030303030303030000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000003030303 -0303030000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000006265600000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0400040404040404040004000000000303030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000003030303030303030000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000064626564000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000004000404040004 -0404000400040403030303030303000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000030303030303030000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -1B62626400000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040404000004040404000404 -0404030303030303000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000030303030303030000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000001B016264 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000404040404040404040403030300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000030303030303030300000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000636201000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000040400040404040404040403030303030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000303030303030300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000001B016264000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000040004000404040404040304030303000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0303030303030300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000646265640000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000400040404040404030403040403030000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000030303030303 -0303000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000006462656000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0004040404040404040304040404000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000030303030303030300000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000062 -6160000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000404040404 -0004040404040404000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000303030303030300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000063000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000040400040304040404 -0400000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000303030303030303000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000040004030404040404030004000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000003030303030303000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000001010001010101010101010100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001010100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000400040404040404000404000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000003030303030303000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000101010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000004040404040404040400040400000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000303 -0303030303030000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000003040404030404040404040400000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000303030303030303 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0303030403030404040404040004000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000003030303030303000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000101010101 -0101010162640000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000003030304 -0400040404000400000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000303030000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000611B6300631B61636062 -6400000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000003030303030404030404040404 -0000040000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000003030303030303030000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000006164000000000064610064650000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000003030400040404040404000404040400 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000030303030303030000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000006263000000000063620063010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000003030303030304040400040404040404040400000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000030303030303030000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000163000000000063010000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000003030303030303040004000404040404040000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000003030303 -0303030000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000006564000000000064650060650000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000303000000000400000404040404000004000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000003030303030303030000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -000000000000000000000000000000000000000000000000000000000000000000000060621B -6300631B62630065640000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000030303030303 -0300000000040404040404000404000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000030303030303030000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000006361620162616300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000606101010000000000006361010161630000000063610101 -6163000000006361010161630000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000030303030303030000000404 -0404040404040400040000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000030303030303030000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000621B6301000000000000621B63631B6200000000621B63631B6200000000 -621B63631B620000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000303030000000000000404040404040404 -0404040400000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000303030303030300000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000100000000001B6100000000616400001B6100000000616400001B610000000061 -6400000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000003030303030303000000000004040000040404040404000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000303030303030300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000656000000000606500006560000000006065000065600000000060650000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000303030303030300000000000000000004040404040400040004000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0303030303030300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000062 -6300000000636200006263000000006362000062630000000063620000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000030303000000000000000000000404000404040404000404000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000030303030303 -0303000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000001000000000000 -0100000100000000000001000001000000000000010000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000030303030303 -0300000000000000040400040404040400040404040000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000303030303030300000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000001000000000000010000010000 -0000000001000001000000000000010000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000003030303030303000000000000 -0000000004040400040404040404040000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000303030303030300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000062630000000063620000626300000000636200 -0062630000000063620000000000000000000000000000000001010101010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000303030000000000000000000000000404 -0004000404040404000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000303030303030303000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001010101010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000062000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000065600000000060650000656000000000606500006560000000 -0060650000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000303030303030303000000000000000000000000040004040404 -0400000404000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000003030303030303030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000061640000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000100000000001B6100000000616400001B6100000000616400001B61000000006164000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000303030303030300000000000000000000000004000404040404040404040404 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000003030303030303030000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000611B63000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000621B63631B6200000000621B63631B6200000000621B63631B6200000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000030303000000000000000000000000000000040404040404040404040400000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000303 -0303030303030000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001010101010101010100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000101010101010100000063610101 -6163000000006361010161630000000063610101616300000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000003030303030303 -0000000000000000000000000000000404040404040404040404000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000003030303030303 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000303030000000000000000 -0000000000000000000004000004040404040404040400000000000000000000000000000000 -0000000000000000000000000000000000000000000000000003030303030303030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000101010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000030303000000000000000000000000000000 -0000000000000404040404040404040400000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000030303030303030000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010101000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000060616201626160000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000303030303030303000000000000000000000000000000000004 -0404040404040404040400000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000030303030303030300000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000006062646300636462600000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000003030303000000000000000000000000000000000000000000040404040404 -0404040004040000000000000000000000000000000000000000000000000000000000000000 -0000000000000000030303030303030300000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000006564000000000064650000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000003 -0303030303030000000000000000000000000000000000000000000404040404040400040404 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000030303030303030300000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000163000000000063010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000003030303030303 -0000000000000000000000000000000000000000040404040404040404040400000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000003 -0303000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000016300 -0000000063010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000303030303030300000000000000 -0000000000000000000000000000000404040404040404040004040400000000000000000000 -0000000000000000000000000000000000000000000000000000000000030303030303030300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000656400000000006465 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000030303000000000000000000000000000000 -0000000000000000000004040400040404040404040000000000000000000000000000000000 -0000000000000000000000000000000000000000000000030303030303030300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000646264630063646260000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000303030303030300000000000000000000000000000000000000 -0000000004040004040404040404040404000000000000000000000000000000000000000000 -0000000000000000000000000000000000030303030303030300000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000006061620162616000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000030303030303030000000000000000000000000000000000000000000000000000 -0404040404040404040400000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000030303030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0300030300000000000000000000000000000000000000000000000000000004040400040404 -0404040004000000000000000000000000000000000000000000000000000000000000000000 -0000000000000303030303030303030000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000030003030000 -0000000000000000000000000000000000000000000000000000040004040404040404040404 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0303030303030303030000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000003030303000000000000000000 -0000000000000000000000000000000000000000000404040404040404040404000000000000 -0000000000000000000000000000000000000000000000000000000000000000030303030303 -0303030000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000062600001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001010100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000030303030303030000000000000000000000000000 -0000000000000000000000000000000000040404040404040400040000000000000000000000 -0000000000000000000000000000000000000000000000000000000303030303030303000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000101010000000000000000000000000000000000 -0000000000000000000000000000000000000000000064620101010101010101010100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000030303030303030000000000000000000000000000000000000000 -0000000000000000000004040404040404040404040400000000000000000000000000000000 -0000000000000000000000000000000000000000000003030303030303000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000003030303030303030300000000000000000000000000000000000000000000000000 -0000000000000004040404040404040404000000000000000000000000000000000000000000 -0000000000000000000000000000000003030303030303030000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000003 -0003030300000000000000000000000000000000000000000000000000000000000000000000 -0404040404040404040404040400000000000000000000000000000000000000000000000000 -0000000000000000000003030303030303030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000003030303030000 -0000000000000000000000000000000000000000000000000000000000000000040404000404 -0404040404040400000000000000000000000000000000000000000000000000000000000000 -0000000000030303030303030000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000303030303030300000000000000 -0000000000000000000000000000000000000000000000000000000400040404040404040404 -0400000000000000000000000000000000000000000000000000000000000000000000000003 -0303030303030300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000003030303030303000000000000000000000000000000 -0000000000000000000000000000000000000000000004040404040404040404040000000000 -0000000000000000000000000000000000000000000000000000000000000003030303030303 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000030303030303030000000000000000000000000000000000000000 -0000000000000000000000000000000404040404040404040404000000000000000000000000 -0000000000000000000000000000000000000000000000000000030303030303030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000030303030300000000000000000000000000000000000000000000000000000000 -0000000000000000000000040404040404040404040004000000000000000000000000000000 -0000000000000000000000000000000000000000030303030303030300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000030303 -0303030300000000000000000000000000000000000000000000000000000000000000000000 -0000000000040404040404040404040400040404000000000000000000000000000000000000 -0000000000000000000000000000030303030303030300000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000006065000000610165000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000003030303030303030300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0400040404040404040404040400000000000000000000000000000000000000000000000000 -0000000000000000030303030303030300000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000656000006465631B1B0000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000303030300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000404040404 -0404040404040404000000000000000000000000000000000000000000000000000000000000 -0000000303030303030303000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000016300 -0061640063620000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000303030300000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004000404040404040404 -0404040000000000000000000000000000000000000000000000000000000000000000030303 -0303030303000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000006263000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000303030303030300000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000040404040404040404040404000000 -0000000000000000000000000000000000000000000000000000000000030303030303030303 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000626300630100006362000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000003030303030303000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000004000404040404040404040404040000000000000000 -0000000000000000000000000000000000000000000000000303030303030303000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -00000000000000000000000000000000001B1B00616100006461000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000030303 -0303000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000040404040404040404040404040004000000000000000000000000 -0000000000000000000000000000000000000303030303030303030000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000006101656300006560000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000003030303030303000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000040404040404040404040404000404000000000000000000000000000000000000 -0000000000000000000000000003030303030303000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000303030303030303000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000004 -0404040404040404040404040400000000000000000000000000000000000000000000000000 -0000000000000303030303030303030000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000030303030303030000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000404040404 -0404040404040004000000000000000000000000000000000000000000000000000000000000 -0303030303030303030300000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000303030303000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040000040404040404040404 -0404040000000000000000000000000000000000000000000000000000000000000303030303 -0303030303000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0303030303030303000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000040404040404040404040404000000 -0000000000000000000000000000000000000000000000000000000003030303030303030300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000646200000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000030000000003030303 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000004040404040404040400040000000000000000 -0000000000000000000000000000000000000000000003030303030303030000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010101010101010101626000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000030003000003030300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000404040404040404040404040000000000000000000000000000 -0000000000000000000000000000000000030303030303030303000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000030303030303030303000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000404040004040404040404000400000000000000000000000000000000000000 -0000000000000000000003030303030303030303000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0060650000006101650000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001010100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000030303030303030303000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0004000404040404040400040400000000000000000000000000000000000000000000000000 -0000000303030303030303030303030000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010101000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000006560000064 -65631B1B00000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000003030303030303000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000004040404 -0404040404040400040000000000000000000000000000000000000000000000000000000000 -0303030303030303030300000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000163000061640063620000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000003030303 -0303030303030303000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004000404040404040404 -0004000000000000000000000000000000000000000000000000000000000000030303030303 -0303030300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000062630000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000030303030303030300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000004040404040404040404040000 -0000000000000000000000000000000000000000000000000000030303030303030303030303 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000006263006301000063620000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000300 -0000000000000000000000000000000000000000000303030303030303030300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000404000404040404040404040400000000000000 -0000000000000000000000000000000000000000000303030303030303030303030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000001B1B006161000064610000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000300000000000000 -0000000000000000000000000000030003030303030303030303000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000400040404040404040404040400000000000000000000000000 -0000000000000000000000000000000003030303030303030303030300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000061016563000065600000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000300000000000000000300000000 -0000000000000000030303030303030003000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000004040404040404040404040000040000000000000000000000000000000000 -0000000000000000000303030303030303030303030303000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000303030303030300000000000303000300000300000300 -0003030303030303000003000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0404040004040404040404040004000000000000000000000000000000000000000000000000 -0000000000030303030303030303030303030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000003000000000300000300000300030303000300000300000303030303030303 -0000000003000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000040404 -0404040404000404000000000000000000000000000000000000000000000000000000000303 -0303030303030303030303030300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0003000000000300000300000303030303030300000300000303030303030303030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004040404040404040404 -0404000000000000000000000000000000000000000000000000000000000003030303030303 -0303030303030303000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000006065620100006560000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000300030000 -0303030303030303030303030303030303030303030303030300000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000040404040404040404040400000000 -0000000000000000000000000000000000000000000000000000030303030303030303030303 -0303000300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000646260630100006065000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000006061010100000000000063610101616300000000636101016163000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000030303030303030300000003030303 -0303030303030300030303030303030303030300000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000040404040404040404040404000400000000000000 -0000000000000000000000000000000000000000000303030303030303030303030000030300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000626000000100000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -621B6301000000000000621B63631B6200000000621B63631B62000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000030000000000000000000000000000030003000300030300000003030003030003030300 -0300030303030303030303030000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000400040404040404040404040000000000000000000000000000 -0000000000000000000000000000000003030303030303030303030300030300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000100006301000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000001B6100000000616400001B610000000061640000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000003000000 -0003000000000000000000030003030303030303030303030303030003000303030303030303 -0303030300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000004000404040404040404040004000400000000000000000000000000000000 -0000000000000000000000030303030303030303030303030303030000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000065640000010000 -6465000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000656000 -0000006065000065600000000060650000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000300000000000003000000000300000000 -0300030303030303030303030300000003030303030303000000000303000300000303030000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000040404040404040404040400040000000000000000000000000000000000000000000000 -0000000000030303030303030303030303030303030300000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000060621B63016364626300000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000626300000000636200 -0062630000000063620000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000300000003030303030303000300000000030000030003 -0003000303030303030303000003000000000000000303000300000003000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000040404 -0404040404040404040400000000000000000000000000000000000000000000000000000303 -0303030303030303030303030303030300000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000636162016261630000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000010000000000000100000100000000 -0000010000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000300000003000003000303030303030300030000030003000300000003 -0300000003000003000000000303030303030300000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004040404040404040404 -0404040000000000000000000000000000000000000000000000000000000000030303030303 -0303030303030303030300000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000010000000000000100000100000000000001000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0303030303030303000003000003000300030303030303030303030300000000030000000000 -0003000000000000000300000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000004040404040404040404040400040400 -0000000000000000000000000000000000000000000000000000000303030303030303030303 -0303030300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000626300000000636200006263000000006362000000000000000000 -0000000000000001010101010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000030000 -0003000003000003000300000000030000030000000000000000030000000000000000000000 -0000000300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000404040404040404040404040004000400000000 -0000000000000000000000000000000000000000000303030303030303030303030303030303 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000101010101000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001010101010101010100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000656000000000606500006560000000006065000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000030303030303030303 -0303030303000300030000030000000000000000000000000000000000000000000000030000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000404040404040404040404040400040000000000000000000000 -0000000000000000000000000000000003030303030303030303030303030000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -631B610000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000100000000001B -6100000000616400001B61000000006164000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000030000000300000000000300000000 -0300030000030000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000404040404040404040404040404000004000000000000000000000000000000 -0000000000000000000000000303030303030303030303030300000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000001B1B0000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000621B63631B62 -00000000621B63631B6200000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000300000000000300000000030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0404040404040404040404040404000400000000000000000000000000000000000000000000 -0000000000000303030303030303030303030303030000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000063620000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001010101010101000000636101016163000000006361 -0101616300000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000300000000000300030303030303030000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000400040404 -0404040404040404040000000000000000000000000000000000000000000000000000000000 -0003030303030303030303030303030000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000030000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004040404040404040404 -0404040404000000000000000000000000000000000000000000000000000000030303030303 -0303030303030303030000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000060620000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000101010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000030000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000004040004040404040404040404040404 -0404000000000000000000000000000000000000000000000000000303030303030303030303 -0303030300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001010100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000636062640000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000003000000000000000000 -0000000000000000030000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000400000404040404040404040404040404040000000000 -0000000000000000000000000000000000000000000303030303030303030303030303000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010101 -0101016564000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000003000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000404040404040404040404040404000000000000000000000000 -0000000000000000000000000000000303030303030303030303030303030000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000003000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000404040404040404040404040404040000040000000000000000000000000000 -0000000000000000000003030303030303030303030303000003000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000003030303030303000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0004040404040404040404040404040004000000000000000000000000000000000000000000 -0000000000000303030303030303030303030303000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000003000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000040000040404 -0404040404040404040400000400000000000000000000000000000000000000000000000303 -0303030303030303030303030303000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010101010101010101010101000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004040404040404040404 -0404040400040400000000000000000000000000000000000000000000000000000303030303 -0303030303030303030303000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000611B6300631B6100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000004040404040404040404040404040404 -0404000000000000000000000000000000000000000000000000000303030303030303030303 -0303000003000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000061 -6400000000001B61000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000004000004040404040404040404040404040000000004 -0000000000000000000000000000000000000303030303030303030303030303030303030300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000062630000000000 -6362000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000004040404040404040404040404040400040404000000000000 -0000000000000000000000000000000300000003030303030303030303030300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001630000000000630100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000404000404040404040404040404040404040400000000000000000000000000 -0000000000000000000300000003030303030303030303030303030300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000065640000000000646500000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000004 -0400040404040404040404040404040404040400000000000000000000000000000000000000 -0000000300000003030303030303030303030300000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000063621B6300631B626300000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001010100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000404040404 -0404040404040404040404040404000000000000000000000000000000000000000000000000 -0000000303030303030303030300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0101010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000636162016261630000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040404040404040404040404 -0404040404040404000400000000000000000000000000000000000000000000000003030303 -0303030303030300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000404040404040404040404040404 -0404040000000400000000000000000000000000000000000000000003030303030303030303 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000404040404040404040404040404040404040404 -0000000000000000000000000000000000000000000303030303030303030303030300000300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000040004040404040404040404040404040404040400040000000000 -0000000000000000000000000000000000030303030303030303030303030300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000060656201000065600000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000404040404040404040404040404040404040004000004000000000000000000 -0000000000000000000000030303030303030303030303030300000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000006462606301000060650000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000040404040404040404040404040404040400000400000000000000000000000000000000 -0000000003030303030303030303030303030303030300000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000006260000001000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000040404 -0404040404040404040404040404040000000000000000000000000000000000000000000003 -0303030303030303030303030300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000001000063010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000040404040404040404 -0404040404040404040404000000000000000000000000000000000000000003030303030303 -0303030303030303030300000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000656400 -0001000064650000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000004040404040404040404040404040404 -0404040400000000000000000000000000000000000000000000030303030303030303030303 -0303030300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -000000000000000000000000000000000000000000000000000000000060621B630163646263 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000040004040404040404040404040404040404040004 -0000000000040000000000000000000000000003030303030303030303030303030303030000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000006361620162616300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000004000004040404040404040404040404040404000400040000000400 -0000000000000000000000000000030303030303030303030303030303030303030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000400040404040404040404040404040404040400000400040400000000000000 -0000000000000000030303030303030303030303030303030000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000004 -0000040404040404040404040404040404040404040004040004000000000000000000000000 -0000030303030303030303030303030303030300000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000620000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000404040404 -0404040404040404040404040404040404040400000000000000000000000000000003030303 -0303030303030303030303030000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000061 -6400000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004040004040404040404 -0404040404040404040400040400000000000000000000000000000000000003030303030303 -0303030303030300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000611B63000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000004040404040404040404040404040404 -0404040404000004000000000000000000000000000000030303030303030303030303030303 -0303030000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001010101010101010100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000400000404040404040404040404040404040404040004 -0000000000000000000000000000000003030303030303030303030303030303030303000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000040404040404040404040404040404040404040404040400000000 -0000000000000000000000000003030303030303030303030303030303000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000004040000040400040404040404040404040404040404040400000000000000000000 -0000000000000003030303030303030303030303030303000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000040400 -0000000404040404040404040404040404040404000400000000000000000000000000000000 -0003030303030303030303030303030303030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000404 -0004040404040404040404040400040000000000000000000000000000000000000003030303 -0303030303030303030303030300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000040400000404040404 -0404040404040404000404000000000004000000000000000000000303030303030303030303 -0303030303030303000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000003000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040404040404040404040404 -0404040400040000000400000000000000000000000303030303030303030303030303030303 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000003000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000004000004040404040404040404040404040000 -0400040000000000000000000000000000000303030303030303030303030300000300000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000030000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000101010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000400040404040404040404040404000000000400000000 -0000000000000000000000000303030303030303030303030303000300000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000003000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010101000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000630000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000303030303030300000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000004040404040404040404040404040400040004000000000000000000 -0000000000030303030303030303030303030303030303030000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000003000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0060000001000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000300000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000404040404040404040404040404040400040404040000000004000000000303 -0303030303030303030303030303030303030300000000000000000000000000000000000000 -0000000000000000000000000000000000000003030303030303000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000101610163 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000300000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000004 -0404040404040404040404040404040400040404040000000400000000000000000303030303 -0303030303030300030303030000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000003000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000060610101626501630000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000404040404040404 -0404040404040404040004000400000400040000000000000000030303030303030303030303 -0303030303030303030000000000000000000000000000000000000000000000000000000000 -0000000000000000000003000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000163641B01016261000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000404040404040404040404040404 -0404000400040000000004000000000000000000000303030303030303030303030303030303 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0003030303030303000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000006164630100000001636461000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000004040404040404040404040404040404000400 -0404040400040004000000000000000000030303000303030303030003030303000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000006162010161646301000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000004040404040404040404040404040404040004000404000000 -0400000000000000000000030303030303030303030303030303030303000000000000000000 -0000000000000000000000000000000000000000000000000000000000000300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000630165620101616463000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000004040404040404040404040404040404040400040404040004000400000000 -0000000000000300000303030303030003030303030300030000000000030000000000000000 -0000000000000000000000000000000000000000000000000300000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100006301616201000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0004040404040404040404040404040404040004040000000400000000000000000000000000 -0303030303030303030303030303030303030000000000030000000000000000000000000000 -0000000000000000000000000000000303030303030300000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000100 -0060000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000040004040404 -0404040404040404040404040404040404040004000400000000000000000000000000030303 -0303030303030303030303030000000300030000000000000000000000000000000000000000 -0000000000000000000000000300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000630000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000006061010100000000 -0000636101016163000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004000404040404040404 -0404040404040400040404000000040000000000000000000000000303030303030303030303 -0303030303030303030303030303030000000000000000000000000000000000000000000000 -0000000000000300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000621B6301000000000000621B6363 -1B62000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000400040404040404040404040404040404 -0404040404040004000400000000000000000000000000030303030303030303030303030303 -0000000300030000000000000000000000000000000000000000000000000000000000000000 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000001B61000000006164000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000004040404040404040404040404040404040404040000 -0400000000000000000000000000000303030303030303030303030303030303030303030303 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000006560000000006065000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000404040404040404040404040404040404040404040004000400000000 -0000000000000000000000000303030303030303030303030303000000030003000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000006263000000006362000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000040404040404040404040404040404040400000404040400000000000000 -0000000303030303030303030303030303030303030000030000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000100000000000001000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0004040404040404040404040404040404040404040004040000000000000000000000000000 -0303030303030303030303030300030000030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000100000000000001000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000400040404 -0404040404040404040404040004040404000000000000000000000000000000030303030303 -0303030303030303030000030003030000000300000000000000000000000000000300000000 -0000000000000000030000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000626300 -0000006362000000000000000000000000000000000101010101000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040004040404040404040404 -0404040004040400040400000000000000000000000000030303030303030303030303030303 -0303030303030003030000000300000000000000000000000000000300000000000000000000 -0000030000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000101010101000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000656000000000606500 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000004040404040400040004000004 -0004040404000000000000000000000000000000030303030303030303030303030303000003 -0003030000000300000000000000000000000000000300000000000000000000000003000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000100000000001B6100000000616400000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000404040404040404000000040400040404000404 -0000000000000000000000030303030303030303030303030303030303030303030303030303 -0303030300000000000000000303030303030300000000000003030303030303000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000001000000000000621B63631B620000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000040404040404040404040404040404040404040004040400040004 -0000000000000000030303030303030303040303030303040303030303000000030000000000 -0000000000000000000300000000000300000000000003000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010101010101010000006361010161630000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000004040404040404040404040404040404000404040004000400000000000000 -0000030003030303030303030403030304000303030303000000030000000000000000000000 -0000000300000000000300000000000003000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0404040404040404040404040400040404040404000400040000000000000000000003000303 -0303030303030304030403000303030303000000030000000000000000000000000000030000 -0000000300000000000003000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010101000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000004000404040404 -0404040404040404040404040404040404000000040000000000000303030303030403030304 -0304040303040303030303030303000000000000000000030000000003030000030303030303 -0300000000000000000000000000000000000000000003000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001010100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000040004040404040404040404 -0404040404040404040400040004000000000000000003030303030304030303040403040400 -0303030303000300000000000000000000030000000003030000000000030000000000000000 -0000000000000000000000000000000003000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000404040404040404040404040404040404 -0404040004000400000000000000000003030303030303040304040403040400030303030300 -0300000000000000000000030000000003030000000000030000000000000000000000000000 -0000000000000000000003000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000040404040404040404040404000404040404040404040004 -0004000000000003030303030303030303030404030304030304030303030303030303030000 -0000030303030303030303030303030000030000000000000000000000000000000000000000 -0003030303030303000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000300000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000404040404040404040404040404040404040404040404040004000000 -0000000003030000030303040304030403040300030303030300030300000000000000000003 -0000000003030003000000030000000000000300000000000000000000000000000000000300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000300000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000040004040404040404040404040404040404040404040400000400000000000000000303 -0000030304030303040303030400030303030300030300000000000000000003000000000303 -0003000000030000000000000300000000000000000000000000000000000300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000400040404 -0404040404040404040404040404040404040400040004000000000000000303000003040303 -0304030403030304030303030300030300000000000000000003000000000303000300000003 -0000000000000300000000000000000000000000000000000300000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000030303030303 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000040404040404 -0404040404040404040404000004000000000000000000000003030303030303030303030303 -0303030303030303030303030300000000000000000000000303030303030303030303030303 -0303030300000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000030000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000004040404040404040404040404 -0404040404040400040000000000000000000000000003030303030303030303030003030303 -0300030300000000000000000000000000000000000300000003000000000000030000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000030000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000004000404040404040404040404040404040404040404 -0404000404000004000000000004000003040303030304040303030304040303030003030300 -0300000300000300000000030003000303000003030000000000030000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000040404040404040404040404040404040404040404040404040400 -0000040000000400000003030403030304040403030404030303030003030300030000030000 -0300000000030003000303000003030000000000030000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000400040404040404040404040404040404040404040404000000000000040004 -0000000003030304030403030404040403030303030000030300030000030000030000000003 -0003000303000000030000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000101010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0004000004040404040404040404040404040400040400000000000000000400000303030303 -0303040303030304040303030303030303030303030303030303030303030303030303030303 -0303030303030000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010101000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000040004040404 -0404040404040404040404040404040404000000000000040004000000000303030403040303 -0404040403030303030000030300030000030000030000000003000300030300000003000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000004000004040404040404040404 -0404040404040404040004040000000004000000040000000303040303030404040303040403 -0303030000030300030000030000030000000003000300030300000003000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000404000404040404040404040404040404040404 -0404040404040400000400000000000400040404040403040404040403040404030303030303 -0300030303030000030300030003030303030303030303030300030303000000000000000000 -0000000000000003000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000040004000404040404040404040404040404040404040404 -0000040004000000040000000404030404040404040304040403030303030303030003030303 -0000000300030000030303000303030303030300030303000000000000000000000000000000 -0003000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000400040004040404040404040404040404040404040404000400000004 -0004000000000304040404040404040404040303030303030303030003030303000000030003 -0000030303000303030303030300030303000000000000000000000000000000000300000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000004000400040400040404040404040404040404040000040000000000040000030303 -0303040403040403040404030303030303030303030303030303030303030303030303030303 -0303030303030303030303030303000000000000000000000303030303030300000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000040004 -0004040404040404040404040404040404040404000400000004000400000000030404040404 -0404040404040303030303030303030003030303000000030003000003030300030303030303 -0300030303000000000000000000000000000000000300000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004000400040404040404 -0404040404040404040404040404000004000400000004000000040403040404040404030404 -0403030303030303030003030303000000030003000003030300030303030303030003030300 -0000000000000000000000000000000300000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000400040004040404040404040404040404 -0404040404040404040000040000000000040004040304040304040404040304040403030303 -0303030003030303000000030003000003030300030303030303030003030300000000000000 -0000000000000000000300000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000400040404040404040404040404040404040404040404 -0404040000040404000003040404040404040304040404040304040403040303030303030303 -0303000003030003030303030303030303030303030303030300000303000000000000000000 -0000000000000000030000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000004000404040404040404040404040404040404040404040404000000 -0404000004040000040404040404040404030404040304030303030303030303030300000303 -0003030303030303030303030303030303030300000303000000000000000000000000000000 -0000030000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000040004040404040404040404040404040404040404040000040004000404040400 -0000000404040404040404040404030403030303030303030303030300000303000303030303 -0303030303030303030303030300000303000000000000000000000000000000000003000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0400040404040404040404040404040404040404000000000400000304040303030303030404 -0404040304040403040303030303030303030303030303030303030303030303030303030303 -0303030303030303030303030303000000000000000000000003030303030303000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000004000404040404 -0404040404040404040404040404040000040004000404040400000000040404040404040404 -0404030403030303030303030303030300000303000303030303030303030303030303030303 -0300000303000000000000000000000000000000000003000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000400040404040404040404040404 -0404040404040404040404000000040400000404000004040404040404040403040404030403 -0303030303030303030300000303000303030303030303030303030303030303030000030300 -0000000000000000000000000000000003000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000040004040404040404040404040404040404040404 -0404040404000004040400000304040404040404030404040404030404040304030303030303 -0303030300000303000303030303030303030303030303030303030000030300000000000000 -0000000000000000000003000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000004040004040404040404 -0404040404040404040404040404040404040404040404040404040403040404040403040404 -0403030303030303030303030303030303030303030303030303030303030303030303030303 -0300030303000000030003000303030000000300000000000000000000030000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000040400040404000404040404040404 -0404040404040404040404040404040404000404040404040404040404040404030303030303 -0303030303030303030303030303030303030303030303030303030303030303030003030300 -0000030003000303030000000300000000000000000000030000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000404040404040404040404040404040404040404 -0404040404040404040400000004040404040404040404040403030303030303030303030303 -0303030303030303030303030303030303030303030303030303030003030300000003000300 -0303030000000300000000000000000000030000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010101 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000004040004040400040404040404040404040004040404040404 -0404040000000003040404040403040404040303030303030303030303030303030303030303 -0303030303030303030303030303030303030303030303030303030303030303030303030303 -0303030300000000030303030303030000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001010100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000404040404040404040404040404040404040404040404040404040404040000 -0004040404040404040404040403030303030303030303030303030303030303030303030303 -0303030303030303030303030303030003030300000003000300030303000000030000000000 -0000000000030000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000004 -0400040404000404040404040404040404040404040404040404040404040400040404040404 -0404040404040404030303030303030303030303030303030303030303030303030303030303 -0303030303030303030003030300000003000300030303000000030000000000000000000003 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000404000404040404 -0404040404040404040404040404040404040404040404040404040404040304040404040304 -0404040303030303030303030303030303030303030303030303030303030303030303030303 -0303030003030300000003000300030303000000030000000000000000000003000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000606101010000000000000000000000 -0000000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000621B63010000000000000000000000000000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000040400 -0404000404040404040404040404040404040404040404040404040404040404040404040404 -0404040404040404040303040303030303040303030303030303030303030303030303030303 -0303030303030303030303030303030303000303030000030303030303000000000303030300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000100000000000000000000000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000010000000000000000000100 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000000000000000 -0000000000000000000100000000000000000100000000000000000000000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000010404000404040404 -0401040404040404040404040404040404040404040404040404040404040404040404040404 -0404030304030403030304030303030303030303030303030303030303030303030303030303 -0303030303030303030303000303030000030303030303000000000303030300000000000000 -0000000000000000000000000100000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000000000000000000000000000000000100000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000100000000000000000000000000000000000000000000000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000000000000000000000000000010000000000000000000100000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000000000000000000000000000 -0000000100000000000000000100000000000000000000000000000000000000000000000000 -0000000100000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000010004040404040404040404040404 -0404040404040404040404040404040404040404040404040404040404040404040403040303 -0304030403030303030303030303030303030303030303030303030303030303030303030303 -0303030303000303030000030303030303000000000303030300000000000000000000000000 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000000000000000000000000000000000100000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010101010101010101 -0101010101010101010101010101010101010101010101010101010101010100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000004040404040404040404040404040404040404040404040404 -0404040404040404040404040404040404040404040403040303030403040303030303030303 -0303030303030303030303030303030303030303030303030303030303030300030303000003 -0303030303000000000303030300000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000404000404040404040004040404040404040404040404040404040404040404 -0404040404040404040404040404040403030403040303030403030303030303030303030303 -0303030303030303030303030303030303030303030303030300030303000003030303030300 -0000000303030300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000004 -0400040400040404040404040404040404040404040404040404040404040404040404040404 -0404040404040404040404030304030303030304030303030303030303030303030303030303 -0303030303030303030303030303030303030300030303000003030303030300000000030303 -0300000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000101010101 -0101000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000606101010000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000606101010000000000006361010161630000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000606101 -0100000000000063610101616300000000636101016163000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000060610101000000000000636101016163000000006361010161 -6300000000636101016163000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000060610101000000000000 -6361010161630000000063610101616300000000636101016163000000000063610101616300 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000006061010100000000000063610101616300000000636101016163000000006361 -0101616300000000006361010161630000000063610101616300000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000062 -1B63010000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000621B6301000000000000621B63631B620000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000621B63010000000000 -00621B63631B6200000000621B63631B62000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000621B6301000000000000621B63631B6200000000621B63631B620000000062 -1B63631B62000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000621B6301000000000000621B63631B62 -00000000621B63631B6200000000621B63631B620000000000621B63631B6200000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -621B6301000000000000621B63631B6200000000621B63631B6200000000621B63631B620000 -000000621B63631B6200000000621B63631B6200000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000100000000001B6100000000616400000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000100000000001B6100000000 -616400001B610000000061640000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000100000000001B6100000000616400001B6100000000616400001B61000000006164 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000100000000001B6100000000616400001B6100 -000000616400001B610000000061640000001B61000000006164000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000001B6100000000616400001B6100000000616400001B610000000061640000001B610000 -0000616400001B61000000006164000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000656000000000606500000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000000000656000000000606500006560 -0000000060650000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000065600000000060650000656000000000606500006560000000006065000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000065600000000060650000656000000000606500 -0065600000000060650000006560000000006065000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000656000 -0000006065000065600000000060650000656000000000606500000065600000000060650000 -6560000000006065000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000001000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000626300000000636200000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000000000626300000000636200006263000000006362 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000006263 -0000000063620000626300000000636200006263000000006362000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001000000000062630000000063620000626300000000636200006263000000 -0063620000006263000000006362000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010000000000626300000000636200 -0062630000000063620000626300000000636200000062630000000063620000626300000000 -6362000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000001000000000001 -0000000000000100000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000010000000000010000000000000100000100000000000001000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000100000000000001 -0000010000000000000100000100000000000001000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000001000000000000010000010000000000000100000100000000000001000000 -0100000000000001000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000010000000000010000000000000100000100000000 -0000010000010000000000000100000001000000000000010000010000000000000100000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000001000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000001000000000000 -0100000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000010000000000010000000000000100000100000000000001000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000100000000000001000001000000 -0000000100000100000000000001000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000100000000 -0001000000000000010000010000000000000100000100000000000001000000010000000000 -0001000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000010000000000010000000000000100000100000000000001000001 -0000000000000100000001000000000000010000010000000000000100000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000001000000000062630000000063620000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -0000626300000000636200006263000000006362000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000006263000000006362000062630000000063620000 -6263000000006362000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000100000000006263000000 -0063620000626300000000636200006263000000006362000000626300000000636200000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000010000000000626300000000636200006263000000006362000062630000000063 -6200000062630000000063620000626300000000636200000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000100 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000001000000000065600000000060650000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000001000000000065600000 -0000606500006560000000006065000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000006560000000006065000065600000000060650000656000000000 -6065000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000100000000006560000000006065000065 -6000000000606500006560000000006065000000656000000000606500000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000001 -0000000000656000000000606500006560000000006065000065600000000060650000006560 -0000000060650000656000000000606500000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000100000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000100000000001B610000000061640000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000100000000001B610000000061640000 -1B61000000006164000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0100000000001B6100000000616400001B6100000000616400001B6100000000616400000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000100000000001B6100000000616400001B610000000061 -6400001B610000000061640000001B6100000000616400000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000100000000001B -6100000000616400001B6100000000616400001B610000000061640000001B61000000006164 -00001B6100000000616400000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0001000000000000621B63631B62000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001000000000000621B63631B6200000000621B63631B -6200000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -00621B63631B6200000000621B63631B6200000000621B63631B620000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000001000000000000621B63631B6200000000621B63631B6200000000621B -63631B620000000000621B63631B620000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000001000000000000621B63631B62 -00000000621B63631B6200000000621B63631B620000000000621B63631B6200000000621B63 -631B620000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000101010101010100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000101010101010100 -0000636101016163000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000001010101010101000000636101016163000000006361010161630000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000010101010101010000006361010161 -6300000000636101016163000000006361010161630000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0101010101010100000063610101616300000000636101016163000000006361010161630000 -0000006361010161630000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000001010101010101000000636101016163000000006361 -0101616300000000636101016163000000000063610101616300000000636101016163000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000100000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000063016100000000000000000000000000000000000001000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000100000000000000000000006101630000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000100000000000000000000000000010000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000061620000000000000000000000000000000000000001000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000010000 -0000000000000000000062610000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000100000000000000000000000000010000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -6301600000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000010000000000000000 -0000000060016300000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000100000000636101621B00000001010101010000006065016264000000000100 -1B62016264000000006361620162640065600000000000636200000000000000646500000000 -01006162621B0000616201610000000001000000006361620162640000010061620100006065 -01016560000000001B6201016560000000606501626400000000006361620162640000606501 -01656000000001001B620162640000000063650162610001000000001B620101656000000065 -6400000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -010000000062640063611B0000000100000000006362640060626000000001611B6300606264 -000063621B630060610064650000000000611B00000000000000656400000000016164636365 -1B6164636365640000000100000063621B630060610000016164000000606264636364626000 -00611B630063606500006362640060626000000063621B630060610060626463636462600000 -01611B6300606264000063626463631B6101000000611B630063606500000064610000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000010000000000 -0000006362000000010000000000611B0000006065000000011B0000000060650000611B0000 -0000000000626300000063016300000000000000626300000000016400000060016400000060 -6500000001000000611B00000000000000011B00000000616400000000646100000100000000 -00000000611B0000006065000000611B00000000000061640000000064610000011B00000000 -60650000611B000000001B010000000100000000000000000063620000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000001000000001B620101010100 -000001000000000062630000006362000000016300000000636200006263000000000000001B -610000001B610000000000000000010000000000016300000000016300000000010000000100 -0000626300000000000000016300000000626300000000636200006561630000000000006263 -0000006362000000626300000000000062630000000063620000016300000000636200006263 -0000000063010000006561630000000000000000010000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000010000006165600000000100000001000000 -0000010101010101010000000100000000000001000001000000000000000063626300006260 -0000000000000000010000000000010000000000010000000000010000000100000001000000 -0000000000010000000000010000000000000100006361016261600000000101010101010100 -0000010000000000000001000000000000010000010000000000000100000100000000000001 -0000006361016261600000000000010000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000010000006263000000630100000001000000000062630000 -0000000000000100000000000001000062630000000000000000611B00646500000000000000 -0000626300000000010000000000010000000000010000000100000062630000000000000001 -0000000000626300000000636200000000006364656100006263000000000000000062630000 -0000000062630000000063620000010000000000000100006263000000006301000000000000 -6364656100000063620000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000100000062630000001B0100000001000000000061640000000000000000 -01000000000000010000611B0000000000000000636200656400000000000000000061640000 -00000100000000000100000000000100000001000000611B0000000000000001000000000061 -64000000006461000000000000006301000061640000000000000000611B0000000000006164 -000000006461000001000000000000010000611B000000001B01000000000000000063010000 -0064610000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -000001000000616163631B610100000062640000000063626463006065000000010000000000 -0001000063621B6300606100000000651B620000000000000000000064650000000001000000 -0000010000000000010000000100000063621B63006061000001000000000060626463636462 -60000065646300631B6500006362646300606500000063621B63006061006062646363646260 -000001000000000000010000636264636364610100000065646300631B650000006564000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000001000000 -6361620161000100000060620101000000606501016560000000010000000000000100000063 -61620165640000000060011B0000000000000000000063016000000001000000000001000000 -0000010000000100000000636162016564000001000000000000646501016560000000606162 -01621B0000000060650101656000000000636162016564000064650101656000000001000000 -000000010000006365016261000100000060616201621B000000600163000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000001630000000000000000000000616200000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000626100000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000631B6100 -0000000000000000000000630161000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000061016300000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000101610000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000 - -end -%%PageTrailer -%%Trailer -%%EOF diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/performance_data.png b/src/hos_libhttpserver/src/libmicrohttpd/doc/performance_data.png deleted file mode 100644 index 0e447c24..00000000 Binary files a/src/hos_libhttpserver/src/libmicrohttpd/doc/performance_data.png and /dev/null differ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/stamp-vti b/src/hos_libhttpserver/src/libmicrohttpd/doc/stamp-vti deleted file mode 100644 index c8c24ba0..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/stamp-vti +++ /dev/null @@ -1,4 +0,0 @@ -@set UPDATED 3 April 2015 -@set UPDATED-MONTH April 2015 -@set EDITION 0.9.42 -@set VERSION 0.9.42 diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/texinfo.tex b/src/hos_libhttpserver/src/libmicrohttpd/doc/texinfo.tex deleted file mode 100644 index 85f184cc..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/texinfo.tex +++ /dev/null @@ -1,10079 +0,0 @@ -% texinfo.tex -- TeX macros to handle Texinfo files. -% -% Load plain if necessary, i.e., if running under initex. -\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi -% -\def\texinfoversion{2013-02-01.11} -% -% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, -% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. -% -% This texinfo.tex file 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 3 of the -% License, or (at your option) any later version. -% -% This texinfo.tex file 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, see . -% -% As a special exception, when this file is read by TeX when processing -% a Texinfo source document, you may use the result without -% restriction. This Exception is an additional permission under section 7 -% of the GNU General Public License, version 3 ("GPLv3"). -% -% Please try the latest version of texinfo.tex before submitting bug -% reports; you can get the latest version from: -% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or -% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or -% http://www.gnu.org/software/texinfo/ (the Texinfo home page) -% The texinfo.tex in any given distribution could well be out -% of date, so if that's what you're using, please check. -% -% Send bug reports to bug-texinfo@gnu.org. Please include including a -% complete document in each bug report with which we can reproduce the -% problem. Patches are, of course, greatly appreciated. -% -% To process a Texinfo manual with TeX, it's most reliable to use the -% texi2dvi shell script that comes with the distribution. For a simple -% manual foo.texi, however, you can get away with this: -% tex foo.texi -% texindex foo.?? -% tex foo.texi -% tex foo.texi -% dvips foo.dvi -o # or whatever; this makes foo.ps. -% The extra TeX runs get the cross-reference information correct. -% Sometimes one run after texindex suffices, and sometimes you need more -% than two; texi2dvi does it as many times as necessary. -% -% It is possible to adapt texinfo.tex for other languages, to some -% extent. You can get the existing language-specific files from the -% full Texinfo distribution. -% -% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. - - -\message{Loading texinfo [version \texinfoversion]:} - -% If in a .fmt file, print the version number -% and turn on active characters that we couldn't do earlier because -% they might have appeared in the input file name. -\everyjob{\message{[Texinfo version \texinfoversion]}% - \catcode`+=\active \catcode`\_=\active} - -\chardef\other=12 - -% We never want plain's \outer definition of \+ in Texinfo. -% For @tex, we can use \tabalign. -\let\+ = \relax - -% Save some plain tex macros whose names we will redefine. -\let\ptexb=\b -\let\ptexbullet=\bullet -\let\ptexc=\c -\let\ptexcomma=\, -\let\ptexdot=\. -\let\ptexdots=\dots -\let\ptexend=\end -\let\ptexequiv=\equiv -\let\ptexexclam=\! -\let\ptexfootnote=\footnote -\let\ptexgtr=> -\let\ptexhat=^ -\let\ptexi=\i -\let\ptexindent=\indent -\let\ptexinsert=\insert -\let\ptexlbrace=\{ -\let\ptexless=< -\let\ptexnewwrite\newwrite -\let\ptexnoindent=\noindent -\let\ptexplus=+ -\let\ptexraggedright=\raggedright -\let\ptexrbrace=\} -\let\ptexslash=\/ -\let\ptexstar=\* -\let\ptext=\t -\let\ptextop=\top -{\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode - -% If this character appears in an error message or help string, it -% starts a new line in the output. -\newlinechar = `^^J - -% Use TeX 3.0's \inputlineno to get the line number, for better error -% messages, but if we're using an old version of TeX, don't do anything. -% -\ifx\inputlineno\thisisundefined - \let\linenumber = \empty % Pre-3.0. -\else - \def\linenumber{l.\the\inputlineno:\space} -\fi - -% Set up fixed words for English if not already set. -\ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi -\ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi -\ifx\putworderror\undefined \gdef\putworderror{error}\fi -\ifx\putwordfile\undefined \gdef\putwordfile{file}\fi -\ifx\putwordin\undefined \gdef\putwordin{in}\fi -\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi -\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi -\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi -\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi -\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi -\ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi -\ifx\putwordof\undefined \gdef\putwordof{of}\fi -\ifx\putwordon\undefined \gdef\putwordon{on}\fi -\ifx\putwordpage\undefined \gdef\putwordpage{page}\fi -\ifx\putwordsection\undefined \gdef\putwordsection{section}\fi -\ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi -\ifx\putwordsee\undefined \gdef\putwordsee{see}\fi -\ifx\putwordSee\undefined \gdef\putwordSee{See}\fi -\ifx\putwordShortTOC\undefined \gdef\putwordShortTOC{Short Contents}\fi -\ifx\putwordTOC\undefined \gdef\putwordTOC{Table of Contents}\fi -% -\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi -\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi -\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi -\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi -\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi -\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi -\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi -\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi -\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi -\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi -\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi -\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi -% -\ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi -\ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi -\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi -\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi -\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi - -% Since the category of space is not known, we have to be careful. -\chardef\spacecat = 10 -\def\spaceisspace{\catcode`\ =\spacecat} - -% sometimes characters are active, so we need control sequences. -\chardef\ampChar = `\& -\chardef\colonChar = `\: -\chardef\commaChar = `\, -\chardef\dashChar = `\- -\chardef\dotChar = `\. -\chardef\exclamChar= `\! -\chardef\hashChar = `\# -\chardef\lquoteChar= `\` -\chardef\questChar = `\? -\chardef\rquoteChar= `\' -\chardef\semiChar = `\; -\chardef\slashChar = `\/ -\chardef\underChar = `\_ - -% Ignore a token. -% -\def\gobble#1{} - -% The following is used inside several \edef's. -\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname} - -% Hyphenation fixes. -\hyphenation{ - Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script - ap-pen-dix bit-map bit-maps - data-base data-bases eshell fall-ing half-way long-est man-u-script - man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm - par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces - spell-ing spell-ings - stand-alone strong-est time-stamp time-stamps which-ever white-space - wide-spread wrap-around -} - -% Margin to add to right of even pages, to left of odd pages. -\newdimen\bindingoffset -\newdimen\normaloffset -\newdimen\pagewidth \newdimen\pageheight - -% For a final copy, take out the rectangles -% that mark overfull boxes (in case you have decided -% that the text looks ok even though it passes the margin). -% -\def\finalout{\overfullrule=0pt } - -% Sometimes it is convenient to have everything in the transcript file -% and nothing on the terminal. We don't just call \tracingall here, -% since that produces some useless output on the terminal. We also make -% some effort to order the tracing commands to reduce output in the log -% file; cf. trace.sty in LaTeX. -% -\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}% -\def\loggingall{% - \tracingstats2 - \tracingpages1 - \tracinglostchars2 % 2 gives us more in etex - \tracingparagraphs1 - \tracingoutput1 - \tracingmacros2 - \tracingrestores1 - \showboxbreadth\maxdimen \showboxdepth\maxdimen - \ifx\eTeXversion\thisisundefined\else % etex gives us more logging - \tracingscantokens1 - \tracingifs1 - \tracinggroups1 - \tracingnesting2 - \tracingassigns1 - \fi - \tracingcommands3 % 3 gives us more in etex - \errorcontextlines16 -}% - -% @errormsg{MSG}. Do the index-like expansions on MSG, but if things -% aren't perfect, it's not the end of the world, being an error message, -% after all. -% -\def\errormsg{\begingroup \indexnofonts \doerrormsg} -\def\doerrormsg#1{\errmessage{#1}} - -% add check for \lastpenalty to plain's definitions. If the last thing -% we did was a \nobreak, we don't want to insert more space. -% -\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount - \removelastskip\penalty-50\smallskip\fi\fi} -\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount - \removelastskip\penalty-100\medskip\fi\fi} -\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount - \removelastskip\penalty-200\bigskip\fi\fi} - -% Do @cropmarks to get crop marks. -% -\newif\ifcropmarks -\let\cropmarks = \cropmarkstrue -% -% Dimensions to add cropmarks at corners. -% Added by P. A. MacKay, 12 Nov. 1986 -% -\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines -\newdimen\cornerlong \cornerlong=1pc -\newdimen\cornerthick \cornerthick=.3pt -\newdimen\topandbottommargin \topandbottommargin=.75in - -% Output a mark which sets \thischapter, \thissection and \thiscolor. -% We dump everything together because we only have one kind of mark. -% This works because we only use \botmark / \topmark, not \firstmark. -% -% A mark contains a subexpression of the \ifcase ... \fi construct. -% \get*marks macros below extract the needed part using \ifcase. -% -% Another complication is to let the user choose whether \thischapter -% (\thissection) refers to the chapter (section) in effect at the top -% of a page, or that at the bottom of a page. The solution is -% described on page 260 of The TeXbook. It involves outputting two -% marks for the sectioning macros, one before the section break, and -% one after. I won't pretend I can describe this better than DEK... -\def\domark{% - \toks0=\expandafter{\lastchapterdefs}% - \toks2=\expandafter{\lastsectiondefs}% - \toks4=\expandafter{\prevchapterdefs}% - \toks6=\expandafter{\prevsectiondefs}% - \toks8=\expandafter{\lastcolordefs}% - \mark{% - \the\toks0 \the\toks2 - \noexpand\or \the\toks4 \the\toks6 - \noexpand\else \the\toks8 - }% -} -% \topmark doesn't work for the very first chapter (after the title -% page or the contents), so we use \firstmark there -- this gets us -% the mark with the chapter defs, unless the user sneaks in, e.g., -% @setcolor (or @url, or @link, etc.) between @contents and the very -% first @chapter. -\def\gettopheadingmarks{% - \ifcase0\topmark\fi - \ifx\thischapter\empty \ifcase0\firstmark\fi \fi -} -\def\getbottomheadingmarks{\ifcase1\botmark\fi} -\def\getcolormarks{\ifcase2\topmark\fi} - -% Avoid "undefined control sequence" errors. -\def\lastchapterdefs{} -\def\lastsectiondefs{} -\def\prevchapterdefs{} -\def\prevsectiondefs{} -\def\lastcolordefs{} - -% Main output routine. -\chardef\PAGE = 255 -\output = {\onepageout{\pagecontents\PAGE}} - -\newbox\headlinebox -\newbox\footlinebox - -% \onepageout takes a vbox as an argument. Note that \pagecontents -% does insertions, but you have to call it yourself. -\def\onepageout#1{% - \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi - % - \ifodd\pageno \advance\hoffset by \bindingoffset - \else \advance\hoffset by -\bindingoffset\fi - % - % Do this outside of the \shipout so @code etc. will be expanded in - % the headline as they should be, not taken literally (outputting ''code). - \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi - \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}% - \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi - \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}% - % - {% - % Have to do this stuff outside the \shipout because we want it to - % take effect in \write's, yet the group defined by the \vbox ends - % before the \shipout runs. - % - \indexdummies % don't expand commands in the output. - \normalturnoffactive % \ in index entries must not stay \, e.g., if - % the page break happens to be in the middle of an example. - % We don't want .vr (or whatever) entries like this: - % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}} - % "\acronym" won't work when it's read back in; - % it needs to be - % {\code {{\tt \backslashcurfont }acronym} - \shipout\vbox{% - % Do this early so pdf references go to the beginning of the page. - \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi - % - \ifcropmarks \vbox to \outervsize\bgroup - \hsize = \outerhsize - \vskip-\topandbottommargin - \vtop to0pt{% - \line{\ewtop\hfil\ewtop}% - \nointerlineskip - \line{% - \vbox{\moveleft\cornerthick\nstop}% - \hfill - \vbox{\moveright\cornerthick\nstop}% - }% - \vss}% - \vskip\topandbottommargin - \line\bgroup - \hfil % center the page within the outer (page) hsize. - \ifodd\pageno\hskip\bindingoffset\fi - \vbox\bgroup - \fi - % - \unvbox\headlinebox - \pagebody{#1}% - \ifdim\ht\footlinebox > 0pt - % Only leave this space if the footline is nonempty. - % (We lessened \vsize for it in \oddfootingyyy.) - % The \baselineskip=24pt in plain's \makefootline has no effect. - \vskip 24pt - \unvbox\footlinebox - \fi - % - \ifcropmarks - \egroup % end of \vbox\bgroup - \hfil\egroup % end of (centering) \line\bgroup - \vskip\topandbottommargin plus1fill minus1fill - \boxmaxdepth = \cornerthick - \vbox to0pt{\vss - \line{% - \vbox{\moveleft\cornerthick\nsbot}% - \hfill - \vbox{\moveright\cornerthick\nsbot}% - }% - \nointerlineskip - \line{\ewbot\hfil\ewbot}% - }% - \egroup % \vbox from first cropmarks clause - \fi - }% end of \shipout\vbox - }% end of group with \indexdummies - \advancepageno - \ifnum\outputpenalty>-20000 \else\dosupereject\fi -} - -\newinsert\margin \dimen\margin=\maxdimen - -\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}} -{\catcode`\@ =11 -\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi -% marginal hacks, juha@viisa.uucp (Juha Takala) -\ifvoid\margin\else % marginal info is present - \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi -\dimen@=\dp#1\relax \unvbox#1\relax -\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi -\ifr@ggedbottom \kern-\dimen@ \vfil \fi} -} - -% Here are the rules for the cropmarks. Note that they are -% offset so that the space between them is truly \outerhsize or \outervsize -% (P. A. MacKay, 12 November, 1986) -% -\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong} -\def\nstop{\vbox - {\hrule height\cornerthick depth\cornerlong width\cornerthick}} -\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong} -\def\nsbot{\vbox - {\hrule height\cornerlong depth\cornerthick width\cornerthick}} - -% Parse an argument, then pass it to #1. The argument is the rest of -% the input line (except we remove a trailing comment). #1 should be a -% macro which expects an ordinary undelimited TeX argument. -% -\def\parsearg{\parseargusing{}} -\def\parseargusing#1#2{% - \def\argtorun{#2}% - \begingroup - \obeylines - \spaceisspace - #1% - \parseargline\empty% Insert the \empty token, see \finishparsearg below. -} - -{\obeylines % - \gdef\parseargline#1^^M{% - \endgroup % End of the group started in \parsearg. - \argremovecomment #1\comment\ArgTerm% - }% -} - -% First remove any @comment, then any @c comment. -\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} -\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} - -% Each occurrence of `\^^M' or `\^^M' is replaced by a single space. -% -% \argremovec might leave us with trailing space, e.g., -% @end itemize @c foo -% This space token undergoes the same procedure and is eventually removed -% by \finishparsearg. -% -\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M} -\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M} -\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% - \def\temp{#3}% - \ifx\temp\empty - % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp: - \let\temp\finishparsearg - \else - \let\temp\argcheckspaces - \fi - % Put the space token in: - \temp#1 #3\ArgTerm -} - -% If a _delimited_ argument is enclosed in braces, they get stripped; so -% to get _exactly_ the rest of the line, we had to prevent such situation. -% We prepended an \empty token at the very beginning and we expand it now, -% just before passing the control to \argtorun. -% (Similarly, we have to think about #3 of \argcheckspacesY above: it is -% either the null string, or it ends with \^^M---thus there is no danger -% that a pair of braces would be stripped. -% -% But first, we have to remove the trailing space token. -% -\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}} - -% \parseargdef\foo{...} -% is roughly equivalent to -% \def\foo{\parsearg\Xfoo} -% \def\Xfoo#1{...} -% -% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my -% favourite TeX trick. --kasal, 16nov03 - -\def\parseargdef#1{% - \expandafter \doparseargdef \csname\string#1\endcsname #1% -} -\def\doparseargdef#1#2{% - \def#2{\parsearg#1}% - \def#1##1% -} - -% Several utility definitions with active space: -{ - \obeyspaces - \gdef\obeyedspace{ } - - % Make each space character in the input produce a normal interword - % space in the output. Don't allow a line break at this space, as this - % is used only in environments like @example, where each line of input - % should produce a line of output anyway. - % - \gdef\sepspaces{\obeyspaces\let =\tie} - - % If an index command is used in an @example environment, any spaces - % therein should become regular spaces in the raw index file, not the - % expansion of \tie (\leavevmode \penalty \@M \ ). - \gdef\unsepspaces{\let =\space} -} - - -\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next} - -% Define the framework for environments in texinfo.tex. It's used like this: -% -% \envdef\foo{...} -% \def\Efoo{...} -% -% It's the responsibility of \envdef to insert \begingroup before the -% actual body; @end closes the group after calling \Efoo. \envdef also -% defines \thisenv, so the current environment is known; @end checks -% whether the environment name matches. The \checkenv macro can also be -% used to check whether the current environment is the one expected. -% -% Non-false conditionals (@iftex, @ifset) don't fit into this, so they -% are not treated as environments; they don't open a group. (The -% implementation of @end takes care not to call \endgroup in this -% special case.) - - -% At run-time, environments start with this: -\def\startenvironment#1{\begingroup\def\thisenv{#1}} -% initialize -\let\thisenv\empty - -% ... but they get defined via ``\envdef\foo{...}'': -\long\def\envdef#1#2{\def#1{\startenvironment#1#2}} -\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} - -% Check whether we're in the right environment: -\def\checkenv#1{% - \def\temp{#1}% - \ifx\thisenv\temp - \else - \badenverr - \fi -} - -% Environment mismatch, #1 expected: -\def\badenverr{% - \errhelp = \EMsimple - \errmessage{This command can appear only \inenvironment\temp, - not \inenvironment\thisenv}% -} -\def\inenvironment#1{% - \ifx#1\empty - outside of any environment% - \else - in environment \expandafter\string#1% - \fi -} - -% @end foo executes the definition of \Efoo. -% But first, it executes a specialized version of \checkenv -% -\parseargdef\end{% - \if 1\csname iscond.#1\endcsname - \else - % The general wording of \badenverr may not be ideal. - \expandafter\checkenv\csname#1\endcsname - \csname E#1\endcsname - \endgroup - \fi -} - -\newhelp\EMsimple{Press RETURN to continue.} - - -% Be sure we're in horizontal mode when doing a tie, since we make space -% equivalent to this in @example-like environments. Otherwise, a space -% at the beginning of a line will start with \penalty -- and -% since \penalty is valid in vertical mode, we'd end up putting the -% penalty on the vertical list instead of in the new paragraph. -{\catcode`@ = 11 - % Avoid using \@M directly, because that causes trouble - % if the definition is written into an index file. - \global\let\tiepenalty = \@M - \gdef\tie{\leavevmode\penalty\tiepenalty\ } -} - -% @: forces normal size whitespace following. -\def\:{\spacefactor=1000 } - -% @* forces a line break. -\def\*{\unskip\hfil\break\hbox{}\ignorespaces} - -% @/ allows a line break. -\let\/=\allowbreak - -% @. is an end-of-sentence period. -\def\.{.\spacefactor=\endofsentencespacefactor\space} - -% @! is an end-of-sentence bang. -\def\!{!\spacefactor=\endofsentencespacefactor\space} - -% @? is an end-of-sentence query. -\def\?{?\spacefactor=\endofsentencespacefactor\space} - -% @frenchspacing on|off says whether to put extra space after punctuation. -% -\def\onword{on} -\def\offword{off} -% -\parseargdef\frenchspacing{% - \def\temp{#1}% - \ifx\temp\onword \plainfrenchspacing - \else\ifx\temp\offword \plainnonfrenchspacing - \else - \errhelp = \EMsimple - \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% - \fi\fi -} - -% @w prevents a word break. Without the \leavevmode, @w at the -% beginning of a paragraph, when TeX is still in vertical mode, would -% produce a whole line of output instead of starting the paragraph. -\def\w#1{\leavevmode\hbox{#1}} - -% @group ... @end group forces ... to be all on one page, by enclosing -% it in a TeX vbox. We use \vtop instead of \vbox to construct the box -% to keep its height that of a normal line. According to the rules for -% \topskip (p.114 of the TeXbook), the glue inserted is -% max (\topskip - \ht (first item), 0). If that height is large, -% therefore, no glue is inserted, and the space between the headline and -% the text is small, which looks bad. -% -% Another complication is that the group might be very large. This can -% cause the glue on the previous page to be unduly stretched, because it -% does not have much material. In this case, it's better to add an -% explicit \vfill so that the extra space is at the bottom. The -% threshold for doing this is if the group is more than \vfilllimit -% percent of a page (\vfilllimit can be changed inside of @tex). -% -\newbox\groupbox -\def\vfilllimit{0.7} -% -\envdef\group{% - \ifnum\catcode`\^^M=\active \else - \errhelp = \groupinvalidhelp - \errmessage{@group invalid in context where filling is enabled}% - \fi - \startsavinginserts - % - \setbox\groupbox = \vtop\bgroup - % Do @comment since we are called inside an environment such as - % @example, where each end-of-line in the input causes an - % end-of-line in the output. We don't want the end-of-line after - % the `@group' to put extra space in the output. Since @group - % should appear on a line by itself (according to the Texinfo - % manual), we don't worry about eating any user text. - \comment -} -% -% The \vtop produces a box with normal height and large depth; thus, TeX puts -% \baselineskip glue before it, and (when the next line of text is done) -% \lineskip glue after it. Thus, space below is not quite equal to space -% above. But it's pretty close. -\def\Egroup{% - % To get correct interline space between the last line of the group - % and the first line afterwards, we have to propagate \prevdepth. - \endgraf % Not \par, as it may have been set to \lisppar. - \global\dimen1 = \prevdepth - \egroup % End the \vtop. - % \dimen0 is the vertical size of the group's box. - \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox - % \dimen2 is how much space is left on the page (more or less). - \dimen2 = \pageheight \advance\dimen2 by -\pagetotal - % if the group doesn't fit on the current page, and it's a big big - % group, force a page break. - \ifdim \dimen0 > \dimen2 - \ifdim \pagetotal < \vfilllimit\pageheight - \page - \fi - \fi - \box\groupbox - \prevdepth = \dimen1 - \checkinserts -} -% -% TeX puts in an \escapechar (i.e., `@') at the beginning of the help -% message, so this ends up printing `@group can only ...'. -% -\newhelp\groupinvalidhelp{% -group can only be used in environments such as @example,^^J% -where each line of input produces a line of output.} - -% @need space-in-mils -% forces a page break if there is not space-in-mils remaining. - -\newdimen\mil \mil=0.001in - -\parseargdef\need{% - % Ensure vertical mode, so we don't make a big box in the middle of a - % paragraph. - \par - % - % If the @need value is less than one line space, it's useless. - \dimen0 = #1\mil - \dimen2 = \ht\strutbox - \advance\dimen2 by \dp\strutbox - \ifdim\dimen0 > \dimen2 - % - % Do a \strut just to make the height of this box be normal, so the - % normal leading is inserted relative to the preceding line. - % And a page break here is fine. - \vtop to #1\mil{\strut\vfil}% - % - % TeX does not even consider page breaks if a penalty added to the - % main vertical list is 10000 or more. But in order to see if the - % empty box we just added fits on the page, we must make it consider - % page breaks. On the other hand, we don't want to actually break the - % page after the empty box. So we use a penalty of 9999. - % - % There is an extremely small chance that TeX will actually break the - % page at this \penalty, if there are no other feasible breakpoints in - % sight. (If the user is using lots of big @group commands, which - % almost-but-not-quite fill up a page, TeX will have a hard time doing - % good page breaking, for example.) However, I could not construct an - % example where a page broke at this \penalty; if it happens in a real - % document, then we can reconsider our strategy. - \penalty9999 - % - % Back up by the size of the box, whether we did a page break or not. - \kern -#1\mil - % - % Do not allow a page break right after this kern. - \nobreak - \fi -} - -% @br forces paragraph break (and is undocumented). - -\let\br = \par - -% @page forces the start of a new page. -% -\def\page{\par\vfill\supereject} - -% @exdent text.... -% outputs text on separate line in roman font, starting at standard page margin - -% This records the amount of indent in the innermost environment. -% That's how much \exdent should take out. -\newskip\exdentamount - -% This defn is used inside fill environments such as @defun. -\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break} - -% This defn is used inside nofill environments such as @example. -\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount - \leftline{\hskip\leftskip{\rm#1}}}} - -% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current -% paragraph. For more general purposes, use the \margin insertion -% class. WHICH is `l' or `r'. Not documented, written for gawk manual. -% -\newskip\inmarginspacing \inmarginspacing=1cm -\def\strutdepth{\dp\strutbox} -% -\def\doinmargin#1#2{\strut\vadjust{% - \nobreak - \kern-\strutdepth - \vtop to \strutdepth{% - \baselineskip=\strutdepth - \vss - % if you have multiple lines of stuff to put here, you'll need to - % make the vbox yourself of the appropriate size. - \ifx#1l% - \llap{\ignorespaces #2\hskip\inmarginspacing}% - \else - \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}% - \fi - \null - }% -}} -\def\inleftmargin{\doinmargin l} -\def\inrightmargin{\doinmargin r} -% -% @inmargin{TEXT [, RIGHT-TEXT]} -% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right; -% else use TEXT for both). -% -\def\inmargin#1{\parseinmargin #1,,\finish} -\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing. - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \def\lefttext{#1}% have both texts - \def\righttext{#2}% - \else - \def\lefttext{#1}% have only one text - \def\righttext{#1}% - \fi - % - \ifodd\pageno - \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin - \else - \def\temp{\inleftmargin\lefttext}% - \fi - \temp -} - -% @| inserts a changebar to the left of the current line. It should -% surround any changed text. This approach does *not* work if the -% change spans more than two lines of output. To handle that, we would -% have adopt a much more difficult approach (putting marks into the main -% vertical list for the beginning and end of each change). This command -% is not documented, not supported, and doesn't work. -% -\def\|{% - % \vadjust can only be used in horizontal mode. - \leavevmode - % - % Append this vertical mode material after the current line in the output. - \vadjust{% - % We want to insert a rule with the height and depth of the current - % leading; that is exactly what \strutbox is supposed to record. - \vskip-\baselineskip - % - % \vadjust-items are inserted at the left edge of the type. So - % the \llap here moves out into the left-hand margin. - \llap{% - % - % For a thicker or thinner bar, change the `1pt'. - \vrule height\baselineskip width1pt - % - % This is the space between the bar and the text. - \hskip 12pt - }% - }% -} - -% @include FILE -- \input text of FILE. -% -\def\include{\parseargusing\filenamecatcodes\includezzz} -\def\includezzz#1{% - \pushthisfilestack - \def\thisfile{#1}% - {% - \makevalueexpandable % we want to expand any @value in FILE. - \turnoffactive % and allow special characters in the expansion - \indexnofonts % Allow `@@' and other weird things in file names. - \wlog{texinfo.tex: doing @include of #1^^J}% - \edef\temp{\noexpand\input #1 }% - % - % This trickery is to read FILE outside of a group, in case it makes - % definitions, etc. - \expandafter - }\temp - \popthisfilestack -} -\def\filenamecatcodes{% - \catcode`\\=\other - \catcode`~=\other - \catcode`^=\other - \catcode`_=\other - \catcode`|=\other - \catcode`<=\other - \catcode`>=\other - \catcode`+=\other - \catcode`-=\other - \catcode`\`=\other - \catcode`\'=\other -} - -\def\pushthisfilestack{% - \expandafter\pushthisfilestackX\popthisfilestack\StackTerm -} -\def\pushthisfilestackX{% - \expandafter\pushthisfilestackY\thisfile\StackTerm -} -\def\pushthisfilestackY #1\StackTerm #2\StackTerm {% - \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}% -} - -\def\popthisfilestack{\errthisfilestackempty} -\def\errthisfilestackempty{\errmessage{Internal error: - the stack of filenames is empty.}} -% -\def\thisfile{} - -% @center line -% outputs that line, centered. -% -\parseargdef\center{% - \ifhmode - \let\centersub\centerH - \else - \let\centersub\centerV - \fi - \centersub{\hfil \ignorespaces#1\unskip \hfil}% - \let\centersub\relax % don't let the definition persist, just in case -} -\def\centerH#1{{% - \hfil\break - \advance\hsize by -\leftskip - \advance\hsize by -\rightskip - \line{#1}% - \break -}} -% -\newcount\centerpenalty -\def\centerV#1{% - % The idea here is the same as in \startdefun, \cartouche, etc.: if - % @center is the first thing after a section heading, we need to wipe - % out the negative parskip inserted by \sectionheading, but still - % prevent a page break here. - \centerpenalty = \lastpenalty - \ifnum\centerpenalty>10000 \vskip\parskip \fi - \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi - \line{\kern\leftskip #1\kern\rightskip}% -} - -% @sp n outputs n lines of vertical space -% -\parseargdef\sp{\vskip #1\baselineskip} - -% @comment ...line which is ignored... -% @c is the same as @comment -% @ignore ... @end ignore is another way to write a comment -% -\def\comment{\begingroup \catcode`\^^M=\other% -\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other% -\commentxxx} -{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}} -% -\let\c=\comment - -% @paragraphindent NCHARS -% We'll use ems for NCHARS, close enough. -% NCHARS can also be the word `asis' or `none'. -% We cannot feasibly implement @paragraphindent asis, though. -% -\def\asisword{asis} % no translation, these are keywords -\def\noneword{none} -% -\parseargdef\paragraphindent{% - \def\temp{#1}% - \ifx\temp\asisword - \else - \ifx\temp\noneword - \defaultparindent = 0pt - \else - \defaultparindent = #1em - \fi - \fi - \parindent = \defaultparindent -} - -% @exampleindent NCHARS -% We'll use ems for NCHARS like @paragraphindent. -% It seems @exampleindent asis isn't necessary, but -% I preserve it to make it similar to @paragraphindent. -\parseargdef\exampleindent{% - \def\temp{#1}% - \ifx\temp\asisword - \else - \ifx\temp\noneword - \lispnarrowing = 0pt - \else - \lispnarrowing = #1em - \fi - \fi -} - -% @firstparagraphindent WORD -% If WORD is `none', then suppress indentation of the first paragraph -% after a section heading. If WORD is `insert', then do indent at such -% paragraphs. -% -% The paragraph indentation is suppressed or not by calling -% \suppressfirstparagraphindent, which the sectioning commands do. -% We switch the definition of this back and forth according to WORD. -% By default, we suppress indentation. -% -\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent} -\def\insertword{insert} -% -\parseargdef\firstparagraphindent{% - \def\temp{#1}% - \ifx\temp\noneword - \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent - \else\ifx\temp\insertword - \let\suppressfirstparagraphindent = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @firstparagraphindent option `\temp'}% - \fi\fi -} - -% Here is how we actually suppress indentation. Redefine \everypar to -% \kern backwards by \parindent, and then reset itself to empty. -% -% We also make \indent itself not actually do anything until the next -% paragraph. -% -\gdef\dosuppressfirstparagraphindent{% - \gdef\indent{% - \restorefirstparagraphindent - \indent - }% - \gdef\noindent{% - \restorefirstparagraphindent - \noindent - }% - \global\everypar = {% - \kern -\parindent - \restorefirstparagraphindent - }% -} - -\gdef\restorefirstparagraphindent{% - \global \let \indent = \ptexindent - \global \let \noindent = \ptexnoindent - \global \everypar = {}% -} - - -% @refill is a no-op. -\let\refill=\relax - -% If working on a large document in chapters, it is convenient to -% be able to disable indexing, cross-referencing, and contents, for test runs. -% This is done with @novalidate (before @setfilename). -% -\newif\iflinks \linkstrue % by default we want the aux files. -\let\novalidate = \linksfalse - -% @setfilename is done at the beginning of every texinfo file. -% So open here the files we need to have open while reading the input. -% This makes it possible to make a .fmt file for texinfo. -\def\setfilename{% - \fixbackslash % Turn off hack to swallow `\input texinfo'. - \iflinks - \tryauxfile - % Open the new aux file. TeX will close it automatically at exit. - \immediate\openout\auxfile=\jobname.aux - \fi % \openindices needs to do some work in any case. - \openindices - \let\setfilename=\comment % Ignore extra @setfilename cmds. - % - % If texinfo.cnf is present on the system, read it. - % Useful for site-wide @afourpaper, etc. - \openin 1 texinfo.cnf - \ifeof 1 \else \input texinfo.cnf \fi - \closein 1 - % - \comment % Ignore the actual filename. -} - -% Called from \setfilename. -% -\def\openindices{% - \newindex{cp}% - \newcodeindex{fn}% - \newcodeindex{vr}% - \newcodeindex{tp}% - \newcodeindex{ky}% - \newcodeindex{pg}% -} - -% @bye. -\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} - - -\message{pdf,} -% adobe `portable' document format -\newcount\tempnum -\newcount\lnkcount -\newtoks\filename -\newcount\filenamelength -\newcount\pgn -\newtoks\toksA -\newtoks\toksB -\newtoks\toksC -\newtoks\toksD -\newbox\boxA -\newcount\countA -\newif\ifpdf -\newif\ifpdfmakepagedest - -% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 -% can be set). So we test for \relax and 0 as well as being undefined. -\ifx\pdfoutput\thisisundefined -\else - \ifx\pdfoutput\relax - \else - \ifcase\pdfoutput - \else - \pdftrue - \fi - \fi -\fi - -% PDF uses PostScript string constants for the names of xref targets, -% for display in the outlines, and in other places. Thus, we have to -% double any backslashes. Otherwise, a name like "\node" will be -% interpreted as a newline (\n), followed by o, d, e. Not good. -% -% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and -% related messages. The final outcome is that it is up to the TeX user -% to double the backslashes and otherwise make the string valid, so -% that's what we do. pdftex 1.30.0 (ca.2005) introduced a primitive to -% do this reliably, so we use it. - -% #1 is a control sequence in which to do the replacements, -% which we \xdef. -\def\txiescapepdf#1{% - \ifx\pdfescapestring\thisisundefined - % No primitive available; should we give a warning or log? - % Many times it won't matter. - \else - % The expandable \pdfescapestring primitive escapes parentheses, - % backslashes, and other special chars. - \xdef#1{\pdfescapestring{#1}}% - \fi -} - -\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images -with PDF output, and none of those formats could be found. (.eps cannot -be supported due to the design of the PDF format; use regular TeX (DVI -output) for that.)} - -\ifpdf - % - % Color manipulation macros based on pdfcolor.tex, - % except using rgb instead of cmyk; the latter is said to render as a - % very dark gray on-screen and a very dark halftone in print, instead - % of actual black. - \def\rgbDarkRed{0.50 0.09 0.12} - \def\rgbBlack{0 0 0} - % - % k sets the color for filling (usual text, etc.); - % K sets the color for stroking (thin rules, e.g., normal _'s). - \def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}} - % - % Set color, and create a mark which defines \thiscolor accordingly, - % so that \makeheadline knows which color to restore. - \def\setcolor#1{% - \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}% - \domark - \pdfsetcolor{#1}% - } - % - \def\maincolor{\rgbBlack} - \pdfsetcolor{\maincolor} - \edef\thiscolor{\maincolor} - \def\lastcolordefs{} - % - \def\makefootline{% - \baselineskip24pt - \line{\pdfsetcolor{\maincolor}\the\footline}% - } - % - \def\makeheadline{% - \vbox to 0pt{% - \vskip-22.5pt - \line{% - \vbox to8.5pt{}% - % Extract \thiscolor definition from the marks. - \getcolormarks - % Typeset the headline with \maincolor, then restore the color. - \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}% - }% - \vss - }% - \nointerlineskip - } - % - % - \pdfcatalog{/PageMode /UseOutlines} - % - % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). - \def\dopdfimage#1#2#3{% - \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% - \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% - % - % pdftex (and the PDF format) support .pdf, .png, .jpg (among - % others). Let's try in that order, PDF first since if - % someone has a scalable image, presumably better to use that than a - % bitmap. - \let\pdfimgext=\empty - \begingroup - \openin 1 #1.pdf \ifeof 1 - \openin 1 #1.PDF \ifeof 1 - \openin 1 #1.png \ifeof 1 - \openin 1 #1.jpg \ifeof 1 - \openin 1 #1.jpeg \ifeof 1 - \openin 1 #1.JPG \ifeof 1 - \errhelp = \nopdfimagehelp - \errmessage{Could not find image file #1 for pdf}% - \else \gdef\pdfimgext{JPG}% - \fi - \else \gdef\pdfimgext{jpeg}% - \fi - \else \gdef\pdfimgext{jpg}% - \fi - \else \gdef\pdfimgext{png}% - \fi - \else \gdef\pdfimgext{PDF}% - \fi - \else \gdef\pdfimgext{pdf}% - \fi - \closein 1 - \endgroup - % - % without \immediate, ancient pdftex seg faults when the same image is - % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.) - \ifnum\pdftexversion < 14 - \immediate\pdfimage - \else - \immediate\pdfximage - \fi - \ifdim \wd0 >0pt width \pdfimagewidth \fi - \ifdim \wd2 >0pt height \pdfimageheight \fi - \ifnum\pdftexversion<13 - #1.\pdfimgext - \else - {#1.\pdfimgext}% - \fi - \ifnum\pdftexversion < 14 \else - \pdfrefximage \pdflastximage - \fi} - % - \def\pdfmkdest#1{{% - % We have to set dummies so commands such as @code, and characters - % such as \, aren't expanded when present in a section title. - \indexnofonts - \turnoffactive - \makevalueexpandable - \def\pdfdestname{#1}% - \txiescapepdf\pdfdestname - \safewhatsit{\pdfdest name{\pdfdestname} xyz}% - }} - % - % used to mark target names; must be expandable. - \def\pdfmkpgn#1{#1} - % - % by default, use a color that is dark enough to print on paper as - % nearly black, but still distinguishable for online viewing. - \def\urlcolor{\rgbDarkRed} - \def\linkcolor{\rgbDarkRed} - \def\endlink{\setcolor{\maincolor}\pdfendlink} - % - % Adding outlines to PDF; macros for calculating structure of outlines - % come from Petr Olsak - \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% - \else \csname#1\endcsname \fi} - \def\advancenumber#1{\tempnum=\expnumber{#1}\relax - \advance\tempnum by 1 - \expandafter\xdef\csname#1\endcsname{\the\tempnum}} - % - % #1 is the section text, which is what will be displayed in the - % outline by the pdf viewer. #2 is the pdf expression for the number - % of subentries (or empty, for subsubsections). #3 is the node text, - % which might be empty if this toc entry had no corresponding node. - % #4 is the page number - % - \def\dopdfoutline#1#2#3#4{% - % Generate a link to the node text if that exists; else, use the - % page number. We could generate a destination for the section - % text in the case where a section has no node, but it doesn't - % seem worth the trouble, since most documents are normally structured. - \edef\pdfoutlinedest{#3}% - \ifx\pdfoutlinedest\empty - \def\pdfoutlinedest{#4}% - \else - \txiescapepdf\pdfoutlinedest - \fi - % - % Also escape PDF chars in the display string. - \edef\pdfoutlinetext{#1}% - \txiescapepdf\pdfoutlinetext - % - \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% - } - % - \def\pdfmakeoutlines{% - \begingroup - % Read toc silently, to get counts of subentries for \pdfoutline. - \def\partentry##1##2##3##4{}% ignore parts in the outlines - \def\numchapentry##1##2##3##4{% - \def\thischapnum{##2}% - \def\thissecnum{0}% - \def\thissubsecnum{0}% - }% - \def\numsecentry##1##2##3##4{% - \advancenumber{chap\thischapnum}% - \def\thissecnum{##2}% - \def\thissubsecnum{0}% - }% - \def\numsubsecentry##1##2##3##4{% - \advancenumber{sec\thissecnum}% - \def\thissubsecnum{##2}% - }% - \def\numsubsubsecentry##1##2##3##4{% - \advancenumber{subsec\thissubsecnum}% - }% - \def\thischapnum{0}% - \def\thissecnum{0}% - \def\thissubsecnum{0}% - % - % use \def rather than \let here because we redefine \chapentry et - % al. a second time, below. - \def\appentry{\numchapentry}% - \def\appsecentry{\numsecentry}% - \def\appsubsecentry{\numsubsecentry}% - \def\appsubsubsecentry{\numsubsubsecentry}% - \def\unnchapentry{\numchapentry}% - \def\unnsecentry{\numsecentry}% - \def\unnsubsecentry{\numsubsecentry}% - \def\unnsubsubsecentry{\numsubsubsecentry}% - \readdatafile{toc}% - % - % Read toc second time, this time actually producing the outlines. - % The `-' means take the \expnumber as the absolute number of - % subentries, which we calculated on our first read of the .toc above. - % - % We use the node names as the destinations. - \def\numchapentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% - \def\numsecentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}% - \def\numsubsecentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}% - \def\numsubsubsecentry##1##2##3##4{% count is always zero - \dopdfoutline{##1}{}{##3}{##4}}% - % - % PDF outlines are displayed using system fonts, instead of - % document fonts. Therefore we cannot use special characters, - % since the encoding is unknown. For example, the eogonek from - % Latin 2 (0xea) gets translated to a | character. Info from - % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100. - % - % TODO this right, we have to translate 8-bit characters to - % their "best" equivalent, based on the @documentencoding. Too - % much work for too little return. Just use the ASCII equivalents - % we use for the index sort strings. - % - \indexnofonts - \setupdatafile - % We can have normal brace characters in the PDF outlines, unlike - % Texinfo index files. So set that up. - \def\{{\lbracecharliteral}% - \def\}{\rbracecharliteral}% - \catcode`\\=\active \otherbackslash - \input \tocreadfilename - \endgroup - } - {\catcode`[=1 \catcode`]=2 - \catcode`{=\other \catcode`}=\other - \gdef\lbracecharliteral[{]% - \gdef\rbracecharliteral[}]% - ] - % - \def\skipspaces#1{\def\PP{#1}\def\D{|}% - \ifx\PP\D\let\nextsp\relax - \else\let\nextsp\skipspaces - \addtokens{\filename}{\PP}% - \advance\filenamelength by 1 - \fi - \nextsp} - \def\getfilename#1{% - \filenamelength=0 - % If we don't expand the argument now, \skipspaces will get - % snagged on things like "@value{foo}". - \edef\temp{#1}% - \expandafter\skipspaces\temp|\relax - } - \ifnum\pdftexversion < 14 - \let \startlink \pdfannotlink - \else - \let \startlink \pdfstartlink - \fi - % make a live url in pdf output. - \def\pdfurl#1{% - \begingroup - % it seems we really need yet another set of dummies; have not - % tried to figure out what each command should do in the context - % of @url. for now, just make @/ a no-op, that's the only one - % people have actually reported a problem with. - % - \normalturnoffactive - \def\@{@}% - \let\/=\empty - \makevalueexpandable - % do we want to go so far as to use \indexnofonts instead of just - % special-casing \var here? - \def\var##1{##1}% - % - \leavevmode\setcolor{\urlcolor}% - \startlink attr{/Border [0 0 0]}% - user{/Subtype /Link /A << /S /URI /URI (#1) >>}% - \endgroup} - \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} - \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} - \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} - \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}} - \def\maketoks{% - \expandafter\poptoks\the\toksA|ENDTOKS|\relax - \ifx\first0\adn0 - \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3 - \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6 - \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 - \else - \ifnum0=\countA\else\makelink\fi - \ifx\first.\let\next=\done\else - \let\next=\maketoks - \addtokens{\toksB}{\the\toksD} - \ifx\first,\addtokens{\toksB}{\space}\fi - \fi - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \next} - \def\makelink{\addtokens{\toksB}% - {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} - \def\pdflink#1{% - \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} - \setcolor{\linkcolor}#1\endlink} - \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} -\else - % non-pdf mode - \let\pdfmkdest = \gobble - \let\pdfurl = \gobble - \let\endlink = \relax - \let\setcolor = \gobble - \let\pdfsetcolor = \gobble - \let\pdfmakeoutlines = \relax -\fi % \ifx\pdfoutput - - -\message{fonts,} - -% Change the current font style to #1, remembering it in \curfontstyle. -% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in -% italics, not bold italics. -% -\def\setfontstyle#1{% - \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. - \csname ten#1\endcsname % change the current font -} - -% Select #1 fonts with the current style. -% -\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname} - -\def\rm{\fam=0 \setfontstyle{rm}} -\def\it{\fam=\itfam \setfontstyle{it}} -\def\sl{\fam=\slfam \setfontstyle{sl}} -\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} -\def\tt{\fam=\ttfam \setfontstyle{tt}} - -% Unfortunately, we have to override this for titles and the like, since -% in those cases "rm" is bold. Sigh. -\def\rmisbold{\rm\def\curfontstyle{bf}} - -% Texinfo sort of supports the sans serif font style, which plain TeX does not. -% So we set up a \sf. -\newfam\sffam -\def\sf{\fam=\sffam \setfontstyle{sf}} -\let\li = \sf % Sometimes we call it \li, not \sf. - -% We don't need math for this font style. -\def\ttsl{\setfontstyle{ttsl}} - - -% Set the baselineskip to #1, and the lineskip and strut size -% correspondingly. There is no deep meaning behind these magic numbers -% used as factors; they just match (closely enough) what Knuth defined. -% -\def\lineskipfactor{.08333} -\def\strutheightpercent{.70833} -\def\strutdepthpercent {.29167} -% -% can get a sort of poor man's double spacing by redefining this. -\def\baselinefactor{1} -% -\newdimen\textleading -\def\setleading#1{% - \dimen0 = #1\relax - \normalbaselineskip = \baselinefactor\dimen0 - \normallineskip = \lineskipfactor\normalbaselineskip - \normalbaselines - \setbox\strutbox =\hbox{% - \vrule width0pt height\strutheightpercent\baselineskip - depth \strutdepthpercent \baselineskip - }% -} - -% PDF CMaps. See also LaTeX's t1.cmap. -% -% do nothing with this by default. -\expandafter\let\csname cmapOT1\endcsname\gobble -\expandafter\let\csname cmapOT1IT\endcsname\gobble -\expandafter\let\csname cmapOT1TT\endcsname\gobble - -% if we are producing pdf, and we have \pdffontattr, then define cmaps. -% (\pdffontattr was introduced many years ago, but people still run -% older pdftex's; it's easy to conditionalize, so we do.) -\ifpdf \ifx\pdffontattr\thisisundefined \else - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1-0) -%%Title: (TeX-OT1-0 TeX OT1 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1) -/Supplement 0 ->> def -/CMapName /TeX-OT1-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -8 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<23> <26> <0023> -<28> <3B> <0028> -<3F> <5B> <003F> -<5D> <5E> <005D> -<61> <7A> <0061> -<7B> <7C> <2013> -endbfrange -40 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <00660066> -<0C> <00660069> -<0D> <0066006C> -<0E> <006600660069> -<0F> <00660066006C> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<21> <0021> -<22> <201D> -<27> <2019> -<3C> <00A1> -<3D> <003D> -<3E> <00BF> -<5C> <201C> -<5F> <02D9> -<60> <2018> -<7D> <02DD> -<7E> <007E> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -% -% \cmapOT1IT - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1IT-0) -%%Title: (TeX-OT1IT-0 TeX OT1IT 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1IT) -/Supplement 0 ->> def -/CMapName /TeX-OT1IT-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -8 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<25> <26> <0025> -<28> <3B> <0028> -<3F> <5B> <003F> -<5D> <5E> <005D> -<61> <7A> <0061> -<7B> <7C> <2013> -endbfrange -42 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <00660066> -<0C> <00660069> -<0D> <0066006C> -<0E> <006600660069> -<0F> <00660066006C> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<21> <0021> -<22> <201D> -<23> <0023> -<24> <00A3> -<27> <2019> -<3C> <00A1> -<3D> <003D> -<3E> <00BF> -<5C> <201C> -<5F> <02D9> -<60> <2018> -<7D> <02DD> -<7E> <007E> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1IT\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -% -% \cmapOT1TT - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1TT-0) -%%Title: (TeX-OT1TT-0 TeX OT1TT 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1TT) -/Supplement 0 ->> def -/CMapName /TeX-OT1TT-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -5 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<21> <26> <0021> -<28> <5F> <0028> -<61> <7E> <0061> -endbfrange -32 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <2191> -<0C> <2193> -<0D> <0027> -<0E> <00A1> -<0F> <00BF> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<20> <2423> -<27> <2019> -<60> <2018> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1TT\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -\fi\fi - - -% Set the font macro #1 to the font named \fontprefix#2. -% #3 is the font's design size, #4 is a scale factor, #5 is the CMap -% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit). -% Example: -% #1 = \textrm -% #2 = \rmshape -% #3 = 10 -% #4 = \mainmagstep -% #5 = OT1 -% -\def\setfont#1#2#3#4#5{% - \font#1=\fontprefix#2#3 scaled #4 - \csname cmap#5\endcsname#1% -} -% This is what gets called when #5 of \setfont is empty. -\let\cmap\gobble -% -% (end of cmaps) - -% Use cm as the default font prefix. -% To specify the font prefix, you must define \fontprefix -% before you read in texinfo.tex. -\ifx\fontprefix\thisisundefined -\def\fontprefix{cm} -\fi -% Support font families that don't use the same naming scheme as CM. -\def\rmshape{r} -\def\rmbshape{bx} % where the normal face is bold -\def\bfshape{b} -\def\bxshape{bx} -\def\ttshape{tt} -\def\ttbshape{tt} -\def\ttslshape{sltt} -\def\itshape{ti} -\def\itbshape{bxti} -\def\slshape{sl} -\def\slbshape{bxsl} -\def\sfshape{ss} -\def\sfbshape{ss} -\def\scshape{csc} -\def\scbshape{csc} - -% Definitions for a main text size of 11pt. (The default in Texinfo.) -% -\def\definetextfontsizexi{% -% Text fonts (11.2pt, magstep1). -\def\textnominalsize{11pt} -\edef\mainmagstep{\magstephalf} -\setfont\textrm\rmshape{10}{\mainmagstep}{OT1} -\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} -\setfont\textbf\bfshape{10}{\mainmagstep}{OT1} -\setfont\textit\itshape{10}{\mainmagstep}{OT1IT} -\setfont\textsl\slshape{10}{\mainmagstep}{OT1} -\setfont\textsf\sfshape{10}{\mainmagstep}{OT1} -\setfont\textsc\scshape{10}{\mainmagstep}{OT1} -\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} -\font\texti=cmmi10 scaled \mainmagstep -\font\textsy=cmsy10 scaled \mainmagstep -\def\textecsize{1095} - -% A few fonts for @defun names and args. -\setfont\defbf\bfshape{10}{\magstep1}{OT1} -\setfont\deftt\ttshape{10}{\magstep1}{OT1TT} -\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} - -% Fonts for indices, footnotes, small examples (9pt). -\def\smallnominalsize{9pt} -\setfont\smallrm\rmshape{9}{1000}{OT1} -\setfont\smalltt\ttshape{9}{1000}{OT1TT} -\setfont\smallbf\bfshape{10}{900}{OT1} -\setfont\smallit\itshape{9}{1000}{OT1IT} -\setfont\smallsl\slshape{9}{1000}{OT1} -\setfont\smallsf\sfshape{9}{1000}{OT1} -\setfont\smallsc\scshape{10}{900}{OT1} -\setfont\smallttsl\ttslshape{10}{900}{OT1TT} -\font\smalli=cmmi9 -\font\smallsy=cmsy9 -\def\smallecsize{0900} - -% Fonts for small examples (8pt). -\def\smallernominalsize{8pt} -\setfont\smallerrm\rmshape{8}{1000}{OT1} -\setfont\smallertt\ttshape{8}{1000}{OT1TT} -\setfont\smallerbf\bfshape{10}{800}{OT1} -\setfont\smallerit\itshape{8}{1000}{OT1IT} -\setfont\smallersl\slshape{8}{1000}{OT1} -\setfont\smallersf\sfshape{8}{1000}{OT1} -\setfont\smallersc\scshape{10}{800}{OT1} -\setfont\smallerttsl\ttslshape{10}{800}{OT1TT} -\font\smalleri=cmmi8 -\font\smallersy=cmsy8 -\def\smallerecsize{0800} - -% Fonts for title page (20.4pt): -\def\titlenominalsize{20pt} -\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -\setfont\titleit\itbshape{10}{\magstep4}{OT1IT} -\setfont\titlesl\slbshape{10}{\magstep4}{OT1} -\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} -\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} -\setfont\titlesf\sfbshape{17}{\magstep1}{OT1} -\let\titlebf=\titlerm -\setfont\titlesc\scbshape{10}{\magstep4}{OT1} -\font\titlei=cmmi12 scaled \magstep3 -\font\titlesy=cmsy10 scaled \magstep4 -\def\titleecsize{2074} - -% Chapter (and unnumbered) fonts (17.28pt). -\def\chapnominalsize{17pt} -\setfont\chaprm\rmbshape{12}{\magstep2}{OT1} -\setfont\chapit\itbshape{10}{\magstep3}{OT1IT} -\setfont\chapsl\slbshape{10}{\magstep3}{OT1} -\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT} -\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT} -\setfont\chapsf\sfbshape{17}{1000}{OT1} -\let\chapbf=\chaprm -\setfont\chapsc\scbshape{10}{\magstep3}{OT1} -\font\chapi=cmmi12 scaled \magstep2 -\font\chapsy=cmsy10 scaled \magstep3 -\def\chapecsize{1728} - -% Section fonts (14.4pt). -\def\secnominalsize{14pt} -\setfont\secrm\rmbshape{12}{\magstep1}{OT1} -\setfont\secit\itbshape{10}{\magstep2}{OT1IT} -\setfont\secsl\slbshape{10}{\magstep2}{OT1} -\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT} -\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT} -\setfont\secsf\sfbshape{12}{\magstep1}{OT1} -\let\secbf\secrm -\setfont\secsc\scbshape{10}{\magstep2}{OT1} -\font\seci=cmmi12 scaled \magstep1 -\font\secsy=cmsy10 scaled \magstep2 -\def\sececsize{1440} - -% Subsection fonts (13.15pt). -\def\ssecnominalsize{13pt} -\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1} -\setfont\ssecit\itbshape{10}{1315}{OT1IT} -\setfont\ssecsl\slbshape{10}{1315}{OT1} -\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT} -\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT} -\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1} -\let\ssecbf\ssecrm -\setfont\ssecsc\scbshape{10}{1315}{OT1} -\font\sseci=cmmi12 scaled \magstephalf -\font\ssecsy=cmsy10 scaled 1315 -\def\ssececsize{1200} - -% Reduced fonts for @acro in text (10pt). -\def\reducednominalsize{10pt} -\setfont\reducedrm\rmshape{10}{1000}{OT1} -\setfont\reducedtt\ttshape{10}{1000}{OT1TT} -\setfont\reducedbf\bfshape{10}{1000}{OT1} -\setfont\reducedit\itshape{10}{1000}{OT1IT} -\setfont\reducedsl\slshape{10}{1000}{OT1} -\setfont\reducedsf\sfshape{10}{1000}{OT1} -\setfont\reducedsc\scshape{10}{1000}{OT1} -\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT} -\font\reducedi=cmmi10 -\font\reducedsy=cmsy10 -\def\reducedecsize{1000} - -\textleading = 13.2pt % line spacing for 11pt CM -\textfonts % reset the current fonts -\rm -} % end of 11pt text font size definitions, \definetextfontsizexi - - -% Definitions to make the main text be 10pt Computer Modern, with -% section, chapter, etc., sizes following suit. This is for the GNU -% Press printing of the Emacs 22 manual. Maybe other manuals in the -% future. Used with @smallbook, which sets the leading to 12pt. -% -\def\definetextfontsizex{% -% Text fonts (10pt). -\def\textnominalsize{10pt} -\edef\mainmagstep{1000} -\setfont\textrm\rmshape{10}{\mainmagstep}{OT1} -\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} -\setfont\textbf\bfshape{10}{\mainmagstep}{OT1} -\setfont\textit\itshape{10}{\mainmagstep}{OT1IT} -\setfont\textsl\slshape{10}{\mainmagstep}{OT1} -\setfont\textsf\sfshape{10}{\mainmagstep}{OT1} -\setfont\textsc\scshape{10}{\mainmagstep}{OT1} -\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} -\font\texti=cmmi10 scaled \mainmagstep -\font\textsy=cmsy10 scaled \mainmagstep -\def\textecsize{1000} - -% A few fonts for @defun names and args. -\setfont\defbf\bfshape{10}{\magstephalf}{OT1} -\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} -\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} - -% Fonts for indices, footnotes, small examples (9pt). -\def\smallnominalsize{9pt} -\setfont\smallrm\rmshape{9}{1000}{OT1} -\setfont\smalltt\ttshape{9}{1000}{OT1TT} -\setfont\smallbf\bfshape{10}{900}{OT1} -\setfont\smallit\itshape{9}{1000}{OT1IT} -\setfont\smallsl\slshape{9}{1000}{OT1} -\setfont\smallsf\sfshape{9}{1000}{OT1} -\setfont\smallsc\scshape{10}{900}{OT1} -\setfont\smallttsl\ttslshape{10}{900}{OT1TT} -\font\smalli=cmmi9 -\font\smallsy=cmsy9 -\def\smallecsize{0900} - -% Fonts for small examples (8pt). -\def\smallernominalsize{8pt} -\setfont\smallerrm\rmshape{8}{1000}{OT1} -\setfont\smallertt\ttshape{8}{1000}{OT1TT} -\setfont\smallerbf\bfshape{10}{800}{OT1} -\setfont\smallerit\itshape{8}{1000}{OT1IT} -\setfont\smallersl\slshape{8}{1000}{OT1} -\setfont\smallersf\sfshape{8}{1000}{OT1} -\setfont\smallersc\scshape{10}{800}{OT1} -\setfont\smallerttsl\ttslshape{10}{800}{OT1TT} -\font\smalleri=cmmi8 -\font\smallersy=cmsy8 -\def\smallerecsize{0800} - -% Fonts for title page (20.4pt): -\def\titlenominalsize{20pt} -\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -\setfont\titleit\itbshape{10}{\magstep4}{OT1IT} -\setfont\titlesl\slbshape{10}{\magstep4}{OT1} -\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} -\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} -\setfont\titlesf\sfbshape{17}{\magstep1}{OT1} -\let\titlebf=\titlerm -\setfont\titlesc\scbshape{10}{\magstep4}{OT1} -\font\titlei=cmmi12 scaled \magstep3 -\font\titlesy=cmsy10 scaled \magstep4 -\def\titleecsize{2074} - -% Chapter fonts (14.4pt). -\def\chapnominalsize{14pt} -\setfont\chaprm\rmbshape{12}{\magstep1}{OT1} -\setfont\chapit\itbshape{10}{\magstep2}{OT1IT} -\setfont\chapsl\slbshape{10}{\magstep2}{OT1} -\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT} -\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT} -\setfont\chapsf\sfbshape{12}{\magstep1}{OT1} -\let\chapbf\chaprm -\setfont\chapsc\scbshape{10}{\magstep2}{OT1} -\font\chapi=cmmi12 scaled \magstep1 -\font\chapsy=cmsy10 scaled \magstep2 -\def\chapecsize{1440} - -% Section fonts (12pt). -\def\secnominalsize{12pt} -\setfont\secrm\rmbshape{12}{1000}{OT1} -\setfont\secit\itbshape{10}{\magstep1}{OT1IT} -\setfont\secsl\slbshape{10}{\magstep1}{OT1} -\setfont\sectt\ttbshape{12}{1000}{OT1TT} -\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT} -\setfont\secsf\sfbshape{12}{1000}{OT1} -\let\secbf\secrm -\setfont\secsc\scbshape{10}{\magstep1}{OT1} -\font\seci=cmmi12 -\font\secsy=cmsy10 scaled \magstep1 -\def\sececsize{1200} - -% Subsection fonts (10pt). -\def\ssecnominalsize{10pt} -\setfont\ssecrm\rmbshape{10}{1000}{OT1} -\setfont\ssecit\itbshape{10}{1000}{OT1IT} -\setfont\ssecsl\slbshape{10}{1000}{OT1} -\setfont\ssectt\ttbshape{10}{1000}{OT1TT} -\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT} -\setfont\ssecsf\sfbshape{10}{1000}{OT1} -\let\ssecbf\ssecrm -\setfont\ssecsc\scbshape{10}{1000}{OT1} -\font\sseci=cmmi10 -\font\ssecsy=cmsy10 -\def\ssececsize{1000} - -% Reduced fonts for @acro in text (9pt). -\def\reducednominalsize{9pt} -\setfont\reducedrm\rmshape{9}{1000}{OT1} -\setfont\reducedtt\ttshape{9}{1000}{OT1TT} -\setfont\reducedbf\bfshape{10}{900}{OT1} -\setfont\reducedit\itshape{9}{1000}{OT1IT} -\setfont\reducedsl\slshape{9}{1000}{OT1} -\setfont\reducedsf\sfshape{9}{1000}{OT1} -\setfont\reducedsc\scshape{10}{900}{OT1} -\setfont\reducedttsl\ttslshape{10}{900}{OT1TT} -\font\reducedi=cmmi9 -\font\reducedsy=cmsy9 -\def\reducedecsize{0900} - -\divide\parskip by 2 % reduce space between paragraphs -\textleading = 12pt % line spacing for 10pt CM -\textfonts % reset the current fonts -\rm -} % end of 10pt text font size definitions, \definetextfontsizex - - -% We provide the user-level command -% @fonttextsize 10 -% (or 11) to redefine the text font size. pt is assumed. -% -\def\xiword{11} -\def\xword{10} -\def\xwordpt{10pt} -% -\parseargdef\fonttextsize{% - \def\textsizearg{#1}% - %\wlog{doing @fonttextsize \textsizearg}% - % - % Set \globaldefs so that documents can use this inside @tex, since - % makeinfo 4.8 does not support it, but we need it nonetheless. - % - \begingroup \globaldefs=1 - \ifx\textsizearg\xword \definetextfontsizex - \else \ifx\textsizearg\xiword \definetextfontsizexi - \else - \errhelp=\EMsimple - \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'} - \fi\fi - \endgroup -} - - -% In order for the font changes to affect most math symbols and letters, -% we have to define the \textfont of the standard families. Since -% texinfo doesn't allow for producing subscripts and superscripts except -% in the main text, we don't bother to reset \scriptfont and -% \scriptscriptfont (which would also require loading a lot more fonts). -% -\def\resetmathfonts{% - \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy - \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf - \textfont\ttfam=\tentt \textfont\sffam=\tensf -} - -% The font-changing commands redefine the meanings of \tenSTYLE, instead -% of just \STYLE. We do this because \STYLE needs to also set the -% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire -% \tenSTYLE to set the current font. -% -% Each font-changing command also sets the names \lsize (one size lower) -% and \lllsize (three sizes lower). These relative commands are used in -% the LaTeX logo and acronyms. -% -% This all needs generalizing, badly. -% -\def\textfonts{% - \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl - \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc - \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy - \let\tenttsl=\textttsl - \def\curfontsize{text}% - \def\lsize{reduced}\def\lllsize{smaller}% - \resetmathfonts \setleading{\textleading}} -\def\titlefonts{% - \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl - \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc - \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy - \let\tenttsl=\titlettsl - \def\curfontsize{title}% - \def\lsize{chap}\def\lllsize{subsec}% - \resetmathfonts \setleading{27pt}} -\def\titlefont#1{{\titlefonts\rmisbold #1}} -\def\chapfonts{% - \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl - \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc - \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy - \let\tenttsl=\chapttsl - \def\curfontsize{chap}% - \def\lsize{sec}\def\lllsize{text}% - \resetmathfonts \setleading{19pt}} -\def\secfonts{% - \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl - \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc - \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy - \let\tenttsl=\secttsl - \def\curfontsize{sec}% - \def\lsize{subsec}\def\lllsize{reduced}% - \resetmathfonts \setleading{16pt}} -\def\subsecfonts{% - \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl - \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc - \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy - \let\tenttsl=\ssecttsl - \def\curfontsize{ssec}% - \def\lsize{text}\def\lllsize{small}% - \resetmathfonts \setleading{15pt}} -\let\subsubsecfonts = \subsecfonts -\def\reducedfonts{% - \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl - \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc - \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy - \let\tenttsl=\reducedttsl - \def\curfontsize{reduced}% - \def\lsize{small}\def\lllsize{smaller}% - \resetmathfonts \setleading{10.5pt}} -\def\smallfonts{% - \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl - \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc - \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy - \let\tenttsl=\smallttsl - \def\curfontsize{small}% - \def\lsize{smaller}\def\lllsize{smaller}% - \resetmathfonts \setleading{10.5pt}} -\def\smallerfonts{% - \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl - \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc - \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy - \let\tenttsl=\smallerttsl - \def\curfontsize{smaller}% - \def\lsize{smaller}\def\lllsize{smaller}% - \resetmathfonts \setleading{9.5pt}} - -% Fonts for short table of contents. -\setfont\shortcontrm\rmshape{12}{1000}{OT1} -\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 -\setfont\shortcontsl\slshape{12}{1000}{OT1} -\setfont\shortconttt\ttshape{12}{1000}{OT1TT} - -% Define these just so they can be easily changed for other fonts. -\def\angleleft{$\langle$} -\def\angleright{$\rangle$} - -% Set the fonts to use with the @small... environments. -\let\smallexamplefonts = \smallfonts - -% About \smallexamplefonts. If we use \smallfonts (9pt), @smallexample -% can fit this many characters: -% 8.5x11=86 smallbook=72 a4=90 a5=69 -% If we use \scriptfonts (8pt), then we can fit this many characters: -% 8.5x11=90+ smallbook=80 a4=90+ a5=77 -% For me, subjectively, the few extra characters that fit aren't worth -% the additional smallness of 8pt. So I'm making the default 9pt. -% -% By the way, for comparison, here's what fits with @example (10pt): -% 8.5x11=71 smallbook=60 a4=75 a5=58 -% --karl, 24jan03. - -% Set up the default fonts, so we can use them for creating boxes. -% -\definetextfontsizexi - - -\message{markup,} - -% Check if we are currently using a typewriter font. Since all the -% Computer Modern typewriter fonts have zero interword stretch (and -% shrink), and it is reasonable to expect all typewriter fonts to have -% this property, we can check that font parameter. -% -\def\ifmonospace{\ifdim\fontdimen3\font=0pt } - -% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will -% define and register \INITMACRO to be called on markup style changes. -% \INITMACRO can check \currentmarkupstyle for the innermost -% style and the set of \ifmarkupSTYLE switches for all styles -% currently in effect. -\newif\ifmarkupvar -\newif\ifmarkupsamp -\newif\ifmarkupkey -%\newif\ifmarkupfile % @file == @samp. -%\newif\ifmarkupoption % @option == @samp. -\newif\ifmarkupcode -\newif\ifmarkupkbd -%\newif\ifmarkupenv % @env == @code. -%\newif\ifmarkupcommand % @command == @code. -\newif\ifmarkuptex % @tex (and part of @math, for now). -\newif\ifmarkupexample -\newif\ifmarkupverb -\newif\ifmarkupverbatim - -\let\currentmarkupstyle\empty - -\def\setupmarkupstyle#1{% - \csname markup#1true\endcsname - \def\currentmarkupstyle{#1}% - \markupstylesetup -} - -\let\markupstylesetup\empty - -\def\defmarkupstylesetup#1{% - \expandafter\def\expandafter\markupstylesetup - \expandafter{\markupstylesetup #1}% - \def#1% -} - -% Markup style setup for left and right quotes. -\defmarkupstylesetup\markupsetuplq{% - \expandafter\let\expandafter \temp - \csname markupsetuplq\currentmarkupstyle\endcsname - \ifx\temp\relax \markupsetuplqdefault \else \temp \fi -} - -\defmarkupstylesetup\markupsetuprq{% - \expandafter\let\expandafter \temp - \csname markupsetuprq\currentmarkupstyle\endcsname - \ifx\temp\relax \markupsetuprqdefault \else \temp \fi -} - -{ -\catcode`\'=\active -\catcode`\`=\active - -\gdef\markupsetuplqdefault{\let`\lq} -\gdef\markupsetuprqdefault{\let'\rq} - -\gdef\markupsetcodequoteleft{\let`\codequoteleft} -\gdef\markupsetcodequoteright{\let'\codequoteright} -} - -\let\markupsetuplqcode \markupsetcodequoteleft -\let\markupsetuprqcode \markupsetcodequoteright -% -\let\markupsetuplqexample \markupsetcodequoteleft -\let\markupsetuprqexample \markupsetcodequoteright -% -\let\markupsetuplqkbd \markupsetcodequoteleft -\let\markupsetuprqkbd \markupsetcodequoteright -% -\let\markupsetuplqsamp \markupsetcodequoteleft -\let\markupsetuprqsamp \markupsetcodequoteright -% -\let\markupsetuplqverb \markupsetcodequoteleft -\let\markupsetuprqverb \markupsetcodequoteright -% -\let\markupsetuplqverbatim \markupsetcodequoteleft -\let\markupsetuprqverbatim \markupsetcodequoteright - -% Allow an option to not use regular directed right quote/apostrophe -% (char 0x27), but instead the undirected quote from cmtt (char 0x0d). -% The undirected quote is ugly, so don't make it the default, but it -% works for pasting with more pdf viewers (at least evince), the -% lilypond developers report. xpdf does work with the regular 0x27. -% -\def\codequoteright{% - \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax - \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax - '% - \else \char'15 \fi - \else \char'15 \fi -} -% -% and a similar option for the left quote char vs. a grave accent. -% Modern fonts display ASCII 0x60 as a grave accent, so some people like -% the code environments to do likewise. -% -\def\codequoteleft{% - \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax - \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax - % [Knuth] pp. 380,381,391 - % \relax disables Spanish ligatures ?` and !` of \tt font. - \relax`% - \else \char'22 \fi - \else \char'22 \fi -} - -% Commands to set the quote options. -% -\parseargdef\codequoteundirected{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETtxicodequoteundirected\endcsname - = t% - \else\ifx\temp\offword - \expandafter\let\csname SETtxicodequoteundirected\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% - \fi\fi -} -% -\parseargdef\codequotebacktick{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETtxicodequotebacktick\endcsname - = t% - \else\ifx\temp\offword - \expandafter\let\csname SETtxicodequotebacktick\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}% - \fi\fi -} - -% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. -\def\noligaturesquoteleft{\relax\lq} - -% Count depth in font-changes, for error checks -\newcount\fontdepth \fontdepth=0 - -% Font commands. - -% #1 is the font command (\sl or \it), #2 is the text to slant. -% If we are in a monospaced environment, however, 1) always use \ttsl, -% and 2) do not add an italic correction. -\def\dosmartslant#1#2{% - \ifusingtt - {{\ttsl #2}\let\next=\relax}% - {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% - \next -} -\def\smartslanted{\dosmartslant\sl} -\def\smartitalic{\dosmartslant\it} - -% Output an italic correction unless \next (presumed to be the following -% character) is such as not to need one. -\def\smartitaliccorrection{% - \ifx\next,% - \else\ifx\next-% - \else\ifx\next.% - \else\ptexslash - \fi\fi\fi - \aftersmartic -} - -% Unconditional use \ttsl, and no ic. @var is set to this for defuns. -\def\ttslanted#1{{\ttsl #1}} - -% @cite is like \smartslanted except unconditionally use \sl. We never want -% ttsl for book titles, do we? -\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection} - -\def\aftersmartic{} -\def\var#1{% - \let\saveaftersmartic = \aftersmartic - \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}% - \smartslanted{#1}% -} - -\let\i=\smartitalic -\let\slanted=\smartslanted -\let\dfn=\smartslanted -\let\emph=\smartitalic - -% Explicit font changes: @r, @sc, undocumented @ii. -\def\r#1{{\rm #1}} % roman font -\def\sc#1{{\smallcaps#1}} % smallcaps font -\def\ii#1{{\it #1}} % italic font - -% @b, explicit bold. Also @strong. -\def\b#1{{\bf #1}} -\let\strong=\b - -% @sansserif, explicit sans. -\def\sansserif#1{{\sf #1}} - -% We can't just use \exhyphenpenalty, because that only has effect at -% the end of a paragraph. Restore normal hyphenation at the end of the -% group within which \nohyphenation is presumably called. -% -\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation} -\def\restorehyphenation{\hyphenchar\font = `- } - -% Set sfcode to normal for the chars that usually have another value. -% Can't use plain's \frenchspacing because it uses the `\x notation, and -% sometimes \x has an active definition that messes things up. -% -\catcode`@=11 - \def\plainfrenchspacing{% - \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m - \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m - \def\endofsentencespacefactor{1000}% for @. and friends - } - \def\plainnonfrenchspacing{% - \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 - \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 - \def\endofsentencespacefactor{3000}% for @. and friends - } -\catcode`@=\other -\def\endofsentencespacefactor{3000}% default - -% @t, explicit typewriter. -\def\t#1{% - {\tt \rawbackslash \plainfrenchspacing #1}% - \null -} - -% @samp. -\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} - -% @indicateurl is \samp, that is, with quotes. -\let\indicateurl=\samp - -% @code (and similar) prints in typewriter, but with spaces the same -% size as normal in the surrounding text, without hyphenation, etc. -% This is a subroutine for that. -\def\tclose#1{% - {% - % Change normal interword space to be same as for the current font. - \spaceskip = \fontdimen2\font - % - % Switch to typewriter. - \tt - % - % But `\ ' produces the large typewriter interword space. - \def\ {{\spaceskip = 0pt{} }}% - % - % Turn off hyphenation. - \nohyphenation - % - \rawbackslash - \plainfrenchspacing - #1% - }% - \null % reset spacefactor to 1000 -} - -% We *must* turn on hyphenation at `-' and `_' in @code. -% Otherwise, it is too hard to avoid overfull hboxes -% in the Emacs manual, the Library manual, etc. -% -% Unfortunately, TeX uses one parameter (\hyphenchar) to control -% both hyphenation at - and hyphenation within words. -% We must therefore turn them both off (\tclose does that) -% and arrange explicitly to hyphenate at a dash. -% -- rms. -{ - \catcode`\-=\active \catcode`\_=\active - \catcode`\'=\active \catcode`\`=\active - \global\let'=\rq \global\let`=\lq % default definitions - % - \global\def\code{\begingroup - \setupmarkupstyle{code}% - % The following should really be moved into \setupmarkupstyle handlers. - \catcode\dashChar=\active \catcode\underChar=\active - \ifallowcodebreaks - \let-\codedash - \let_\codeunder - \else - \let-\normaldash - \let_\realunder - \fi - \codex - } -} - -\def\codex #1{\tclose{#1}\endgroup} - -\def\normaldash{-} -\def\codedash{-\discretionary{}{}{}} -\def\codeunder{% - % this is all so @math{@code{var_name}+1} can work. In math mode, _ - % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.) - % will therefore expand the active definition of _, which is us - % (inside @code that is), therefore an endless loop. - \ifusingtt{\ifmmode - \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_. - \else\normalunderscore \fi - \discretionary{}{}{}}% - {\_}% -} - -% An additional complication: the above will allow breaks after, e.g., -% each of the four underscores in __typeof__. This is bad. -% @allowcodebreaks provides a document-level way to turn breaking at - -% and _ on and off. -% -\newif\ifallowcodebreaks \allowcodebreakstrue - -\def\keywordtrue{true} -\def\keywordfalse{false} - -\parseargdef\allowcodebreaks{% - \def\txiarg{#1}% - \ifx\txiarg\keywordtrue - \allowcodebreakstrue - \else\ifx\txiarg\keywordfalse - \allowcodebreaksfalse - \else - \errhelp = \EMsimple - \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}% - \fi\fi -} - -% For @command, @env, @file, @option quotes seem unnecessary, -% so use \code rather than \samp. -\let\command=\code -\let\env=\code -\let\file=\code -\let\option=\code - -% @uref (abbreviation for `urlref') takes an optional (comma-separated) -% second argument specifying the text to display and an optional third -% arg as text to display instead of (rather than in addition to) the url -% itself. First (mandatory) arg is the url. -% (This \urefnobreak definition isn't used now, leaving it for a while -% for comparison.) -\def\urefnobreak#1{\dourefnobreak #1,,,\finish} -\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup - \unsepspaces - \pdfurl{#1}% - \setbox0 = \hbox{\ignorespaces #3}% - \ifdim\wd0 > 0pt - \unhbox0 % third arg given, show only that - \else - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \ifpdf - \unhbox0 % PDF: 2nd arg given, show only it - \else - \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url - \fi - \else - \code{#1}% only url given, so show it - \fi - \fi - \endlink -\endgroup} - -% This \urefbreak definition is the active one. -\def\urefbreak{\begingroup \urefcatcodes \dourefbreak} -\let\uref=\urefbreak -\def\dourefbreak#1{\urefbreakfinish #1,,,\finish} -\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example - \unsepspaces - \pdfurl{#1}% - \setbox0 = \hbox{\ignorespaces #3}% - \ifdim\wd0 > 0pt - \unhbox0 % third arg given, show only that - \else - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \ifpdf - \unhbox0 % PDF: 2nd arg given, show only it - \else - \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url - \fi - \else - \urefcode{#1}% only url given, so show it - \fi - \fi - \endlink -\endgroup} - -% Allow line breaks around only a few characters (only). -\def\urefcatcodes{% - \catcode\ampChar=\active \catcode\dotChar=\active - \catcode\hashChar=\active \catcode\questChar=\active - \catcode\slashChar=\active -} -{ - \urefcatcodes - % - \global\def\urefcode{\begingroup - \setupmarkupstyle{code}% - \urefcatcodes - \let&\urefcodeamp - \let.\urefcodedot - \let#\urefcodehash - \let?\urefcodequest - \let/\urefcodeslash - \codex - } - % - % By default, they are just regular characters. - \global\def&{\normalamp} - \global\def.{\normaldot} - \global\def#{\normalhash} - \global\def?{\normalquest} - \global\def/{\normalslash} -} - -% we put a little stretch before and after the breakable chars, to help -% line breaking of long url's. The unequal skips make look better in -% cmtt at least, especially for dots. -\def\urefprestretch{\urefprebreak \hskip0pt plus.13em } -\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em } -% -\def\urefcodeamp{\urefprestretch \&\urefpoststretch} -\def\urefcodedot{\urefprestretch .\urefpoststretch} -\def\urefcodehash{\urefprestretch \#\urefpoststretch} -\def\urefcodequest{\urefprestretch ?\urefpoststretch} -\def\urefcodeslash{\futurelet\next\urefcodeslashfinish} -{ - \catcode`\/=\active - \global\def\urefcodeslashfinish{% - \urefprestretch \slashChar - % Allow line break only after the final / in a sequence of - % slashes, to avoid line break between the slashes in http://. - \ifx\next/\else \urefpoststretch \fi - } -} - -% One more complication: by default we'll break after the special -% characters, but some people like to break before the special chars, so -% allow that. Also allow no breaking at all, for manual control. -% -\parseargdef\urefbreakstyle{% - \def\txiarg{#1}% - \ifx\txiarg\wordnone - \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak} - \else\ifx\txiarg\wordbefore - \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak} - \else\ifx\txiarg\wordafter - \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak} - \else - \errhelp = \EMsimple - \errmessage{Unknown @urefbreakstyle setting `\txiarg'}% - \fi\fi\fi -} -\def\wordafter{after} -\def\wordbefore{before} -\def\wordnone{none} - -\urefbreakstyle after - -% @url synonym for @uref, since that's how everyone uses it. -% -\let\url=\uref - -% rms does not like angle brackets --karl, 17may97. -% So now @email is just like @uref, unless we are pdf. -% -%\def\email#1{\angleleft{\tt #1}\angleright} -\ifpdf - \def\email#1{\doemail#1,,\finish} - \def\doemail#1,#2,#3\finish{\begingroup - \unsepspaces - \pdfurl{mailto:#1}% - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi - \endlink - \endgroup} -\else - \let\email=\uref -\fi - -% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), -% `example' (@kbd uses ttsl only inside of @example and friends), -% or `code' (@kbd uses normal tty font always). -\parseargdef\kbdinputstyle{% - \def\txiarg{#1}% - \ifx\txiarg\worddistinct - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% - \else\ifx\txiarg\wordexample - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% - \else\ifx\txiarg\wordcode - \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% - \else - \errhelp = \EMsimple - \errmessage{Unknown @kbdinputstyle setting `\txiarg'}% - \fi\fi\fi -} -\def\worddistinct{distinct} -\def\wordexample{example} -\def\wordcode{code} - -% Default is `distinct'. -\kbdinputstyle distinct - -% @kbd is like @code, except that if the argument is just one @key command, -% then @kbd has no effect. -\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}} - -\def\xkey{\key} -\def\kbdsub#1#2#3\par{% - \def\one{#1}\def\three{#3}\def\threex{??}% - \ifx\one\xkey\ifx\threex\three \key{#2}% - \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi - \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi -} - -% definition of @key that produces a lozenge. Doesn't adjust to text size. -%\setfont\keyrm\rmshape{8}{1000}{OT1} -%\font\keysy=cmsy9 -%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% -% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% -% \vbox{\hrule\kern-0.4pt -% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% -% \kern-0.4pt\hrule}% -% \kern-.06em\raise0.4pt\hbox{\angleright}}}} - -% definition of @key with no lozenge. If the current font is already -% monospace, don't change it; that way, we respect @kbdinputstyle. But -% if it isn't monospace, then use \tt. -% -\def\key#1{{\setupmarkupstyle{key}% - \nohyphenation - \ifmonospace\else\tt\fi - #1}\null} - -% @clicksequence{File @click{} Open ...} -\def\clicksequence#1{\begingroup #1\endgroup} - -% @clickstyle @arrow (by default) -\parseargdef\clickstyle{\def\click{#1}} -\def\click{\arrow} - -% Typeset a dimension, e.g., `in' or `pt'. The only reason for the -% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. -% -\def\dmn#1{\thinspace #1} - -% @l was never documented to mean ``switch to the Lisp font'', -% and it is not used as such in any manual I can find. We need it for -% Polish suppressed-l. --karl, 22sep96. -%\def\l#1{{\li #1}\null} - -% @acronym for "FBI", "NATO", and the like. -% We print this one point size smaller, since it's intended for -% all-uppercase. -% -\def\acronym#1{\doacronym #1,,\finish} -\def\doacronym#1,#2,#3\finish{% - {\selectfonts\lsize #1}% - \def\temp{#2}% - \ifx\temp\empty \else - \space ({\unsepspaces \ignorespaces \temp \unskip})% - \fi - \null % reset \spacefactor=1000 -} - -% @abbr for "Comput. J." and the like. -% No font change, but don't do end-of-sentence spacing. -% -\def\abbr#1{\doabbr #1,,\finish} -\def\doabbr#1,#2,#3\finish{% - {\plainfrenchspacing #1}% - \def\temp{#2}% - \ifx\temp\empty \else - \space ({\unsepspaces \ignorespaces \temp \unskip})% - \fi - \null % reset \spacefactor=1000 -} - -% @asis just yields its argument. Used with @table, for example. -% -\def\asis#1{#1} - -% @math outputs its argument in math mode. -% -% One complication: _ usually means subscripts, but it could also mean -% an actual _ character, as in @math{@var{some_variable} + 1}. So make -% _ active, and distinguish by seeing if the current family is \slfam, -% which is what @var uses. -{ - \catcode`\_ = \active - \gdef\mathunderscore{% - \catcode`\_=\active - \def_{\ifnum\fam=\slfam \_\else\sb\fi}% - } -} -% Another complication: we want \\ (and @\) to output a math (or tt) \. -% FYI, plain.tex uses \\ as a temporary control sequence (for no -% particular reason), but this is not advertised and we don't care. -% -% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\. -\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} -% -\def\math{% - \tex - \mathunderscore - \let\\ = \mathbackslash - \mathactive - % make the texinfo accent commands work in math mode - \let\"=\ddot - \let\'=\acute - \let\==\bar - \let\^=\hat - \let\`=\grave - \let\u=\breve - \let\v=\check - \let\~=\tilde - \let\dotaccent=\dot - $\finishmath -} -\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. - -% Some active characters (such as <) are spaced differently in math. -% We have to reset their definitions in case the @math was an argument -% to a command which sets the catcodes (such as @item or @section). -% -{ - \catcode`^ = \active - \catcode`< = \active - \catcode`> = \active - \catcode`+ = \active - \catcode`' = \active - \gdef\mathactive{% - \let^ = \ptexhat - \let< = \ptexless - \let> = \ptexgtr - \let+ = \ptexplus - \let' = \ptexquoteright - } -} - -% ctrl is no longer a Texinfo command, but leave this definition for fun. -\def\ctrl #1{{\tt \rawbackslash \hat}#1} - -% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. -% Ignore unless FMTNAME == tex; then it is like @iftex and @tex, -% except specified as a normal braced arg, so no newlines to worry about. -% -\def\outfmtnametex{tex} -% -\long\def\inlinefmt#1{\doinlinefmt #1,\finish} -\long\def\doinlinefmt#1,#2,\finish{% - \def\inlinefmtname{#1}% - \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi -} -% For raw, must switch into @tex before parsing the argument, to avoid -% setting catcodes prematurely. Doing it this way means that, for -% example, @inlineraw{html, foo{bar} gets a parse error instead of being -% ignored. But this isn't important because if people want a literal -% *right* brace they would have to use a command anyway, so they may as -% well use a command to get a left brace too. We could re-use the -% delimiter character idea from \verb, but it seems like overkill. -% -\long\def\inlineraw{\tex \doinlineraw} -\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish} -\def\doinlinerawtwo#1,#2,\finish{% - \def\inlinerawname{#1}% - \ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi - \endgroup % close group opened by \tex. -} - - -\message{glyphs,} -% and logos. - -% @@ prints an @, as does @atchar{}. -\def\@{\char64 } -\let\atchar=\@ - -% @{ @} @lbracechar{} @rbracechar{} all generate brace characters. -% Unless we're in typewriter, use \ecfont because the CM text fonts do -% not have braces, and we don't want to switch into math. -\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}} -\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}} -\let\{=\mylbrace \let\lbracechar=\{ -\let\}=\myrbrace \let\rbracechar=\} -\begingroup - % Definitions to produce \{ and \} commands for indices, - % and @{ and @} for the aux/toc files. - \catcode`\{ = \other \catcode`\} = \other - \catcode`\[ = 1 \catcode`\] = 2 - \catcode`\! = 0 \catcode`\\ = \other - !gdef!lbracecmd[\{]% - !gdef!rbracecmd[\}]% - !gdef!lbraceatcmd[@{]% - !gdef!rbraceatcmd[@}]% -!endgroup - -% @comma{} to avoid , parsing problems. -\let\comma = , - -% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent -% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H. -\let\, = \ptexc -\let\dotaccent = \ptexdot -\def\ringaccent#1{{\accent23 #1}} -\let\tieaccent = \ptext -\let\ubaraccent = \ptexb -\let\udotaccent = \d - -% Other special characters: @questiondown @exclamdown @ordf @ordm -% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. -\def\questiondown{?`} -\def\exclamdown{!`} -\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} -\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} - -% Dotless i and dotless j, used for accents. -\def\imacro{i} -\def\jmacro{j} -\def\dotless#1{% - \def\temp{#1}% - \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi - \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi - \else \errmessage{@dotless can be used only with i or j}% - \fi\fi -} - -% The \TeX{} logo, as in plain, but resetting the spacing so that a -% period following counts as ending a sentence. (Idea found in latex.) -% -\edef\TeX{\TeX \spacefactor=1000 } - -% @LaTeX{} logo. Not quite the same results as the definition in -% latex.ltx, since we use a different font for the raised A; it's most -% convenient for us to use an explicitly smaller font, rather than using -% the \scriptstyle font (since we don't reset \scriptstyle and -% \scriptscriptstyle). -% -\def\LaTeX{% - L\kern-.36em - {\setbox0=\hbox{T}% - \vbox to \ht0{\hbox{% - \ifx\textnominalsize\xwordpt - % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX. - % Revert to plain's \scriptsize, which is 7pt. - \count255=\the\fam $\fam\count255 \scriptstyle A$% - \else - % For 11pt, we can use our lllsize. - \selectfonts\lllsize A% - \fi - }% - \vss - }}% - \kern-.15em - \TeX -} - -% Some math mode symbols. -\def\bullet{$\ptexbullet$} -\def\geq{\ifmmode \ge\else $\ge$\fi} -\def\leq{\ifmmode \le\else $\le$\fi} -\def\minus{\ifmmode -\else $-$\fi} - -% @dots{} outputs an ellipsis using the current font. -% We do .5em per period so that it has the same spacing in the cm -% typewriter fonts as three actual period characters; on the other hand, -% in other typewriter fonts three periods are wider than 1.5em. So do -% whichever is larger. -% -\def\dots{% - \leavevmode - \setbox0=\hbox{...}% get width of three periods - \ifdim\wd0 > 1.5em - \dimen0 = \wd0 - \else - \dimen0 = 1.5em - \fi - \hbox to \dimen0{% - \hskip 0pt plus.25fil - .\hskip 0pt plus1fil - .\hskip 0pt plus1fil - .\hskip 0pt plus.5fil - }% -} - -% @enddots{} is an end-of-sentence ellipsis. -% -\def\enddots{% - \dots - \spacefactor=\endofsentencespacefactor -} - -% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. -% -% Since these characters are used in examples, they should be an even number of -% \tt widths. Each \tt character is 1en, so two makes it 1em. -% -\def\point{$\star$} -\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} -\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} -\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} -\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} -\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} - -% The @error{} command. -% Adapted from the TeXbook's \boxit. -% -\newbox\errorbox -% -{\tentt \global\dimen0 = 3em}% Width of the box. -\dimen2 = .55pt % Thickness of rules -% The text. (`r' is open on the right, `e' somewhat less so on the left.) -\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt} -% -\setbox\errorbox=\hbox to \dimen0{\hfil - \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. - \advance\hsize by -2\dimen2 % Rules. - \vbox{% - \hrule height\dimen2 - \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. - \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. - \kern3pt\vrule width\dimen2}% Space to right. - \hrule height\dimen2} - \hfil} -% -\def\error{\leavevmode\lower.7ex\copy\errorbox} - -% @pounds{} is a sterling sign, which Knuth put in the CM italic font. -% -\def\pounds{{\it\$}} - -% @euro{} comes from a separate font, depending on the current style. -% We use the free feym* fonts from the eurosym package by Henrik -% Theiling, which support regular, slanted, bold and bold slanted (and -% "outlined" (blackboard board, sort of) versions, which we don't need). -% It is available from http://www.ctan.org/tex-archive/fonts/eurosym. -% -% Although only regular is the truly official Euro symbol, we ignore -% that. The Euro is designed to be slightly taller than the regular -% font height. -% -% feymr - regular -% feymo - slanted -% feybr - bold -% feybo - bold slanted -% -% There is no good (free) typewriter version, to my knowledge. -% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide. -% Hmm. -% -% Also doesn't work in math. Do we need to do math with euro symbols? -% Hope not. -% -% -\def\euro{{\eurofont e}} -\def\eurofont{% - % We set the font at each command, rather than predefining it in - % \textfonts and the other font-switching commands, so that - % installations which never need the symbol don't have to have the - % font installed. - % - % There is only one designed size (nominal 10pt), so we always scale - % that to the current nominal size. - % - % By the way, simply using "at 1em" works for cmr10 and the like, but - % does not work for cmbx10 and other extended/shrunken fonts. - % - \def\eurosize{\csname\curfontsize nominalsize\endcsname}% - % - \ifx\curfontstyle\bfstylename - % bold: - \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize - \else - % regular: - \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize - \fi - \thiseurofont -} - -% Glyphs from the EC fonts. We don't use \let for the aliases, because -% sometimes we redefine the original macro, and the alias should reflect -% the redefinition. -% -% Use LaTeX names for the Icelandic letters. -\def\DH{{\ecfont \char"D0}} % Eth -\def\dh{{\ecfont \char"F0}} % eth -\def\TH{{\ecfont \char"DE}} % Thorn -\def\th{{\ecfont \char"FE}} % thorn -% -\def\guillemetleft{{\ecfont \char"13}} -\def\guillemotleft{\guillemetleft} -\def\guillemetright{{\ecfont \char"14}} -\def\guillemotright{\guillemetright} -\def\guilsinglleft{{\ecfont \char"0E}} -\def\guilsinglright{{\ecfont \char"0F}} -\def\quotedblbase{{\ecfont \char"12}} -\def\quotesinglbase{{\ecfont \char"0D}} -% -% This positioning is not perfect (see the ogonek LaTeX package), but -% we have the precomposed glyphs for the most common cases. We put the -% tests to use those glyphs in the single \ogonek macro so we have fewer -% dummy definitions to worry about for index entries, etc. -% -% ogonek is also used with other letters in Lithuanian (IOU), but using -% the precomposed glyphs for those is not so easy since they aren't in -% the same EC font. -\def\ogonek#1{{% - \def\temp{#1}% - \ifx\temp\macrocharA\Aogonek - \else\ifx\temp\macrochara\aogonek - \else\ifx\temp\macrocharE\Eogonek - \else\ifx\temp\macrochare\eogonek - \else - \ecfont \setbox0=\hbox{#1}% - \ifdim\ht0=1ex\accent"0C #1% - \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}% - \fi - \fi\fi\fi\fi - }% -} -\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A} -\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a} -\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} -\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} -% -% Use the ec* fonts (cm-super in outline format) for non-CM glyphs. -\def\ecfont{% - % We can't distinguish serif/sans and italic/slanted, but this - % is used for crude hacks anyway (like adding French and German - % quotes to documents typeset with CM, where we lose kerning), so - % hopefully nobody will notice/care. - \edef\ecsize{\csname\curfontsize ecsize\endcsname}% - \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% - \ifmonospace - % typewriter: - \font\thisecfont = ectt\ecsize \space at \nominalsize - \else - \ifx\curfontstyle\bfstylename - % bold: - \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize - \else - % regular: - \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize - \fi - \fi - \thisecfont -} - -% @registeredsymbol - R in a circle. The font for the R should really -% be smaller yet, but lllsize is the best we can do for now. -% Adapted from the plain.tex definition of \copyright. -% -\def\registeredsymbol{% - $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}% - \hfil\crcr\Orb}}% - }$% -} - -% @textdegree - the normal degrees sign. -% -\def\textdegree{$^\circ$} - -% Laurent Siebenmann reports \Orb undefined with: -% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 -% so we'll define it if necessary. -% -\ifx\Orb\thisisundefined -\def\Orb{\mathhexbox20D} -\fi - -% Quotes. -\chardef\quotedblleft="5C -\chardef\quotedblright=`\" -\chardef\quoteleft=`\` -\chardef\quoteright=`\' - - -\message{page headings,} - -\newskip\titlepagetopglue \titlepagetopglue = 1.5in -\newskip\titlepagebottomglue \titlepagebottomglue = 2pc - -% First the title page. Must do @settitle before @titlepage. -\newif\ifseenauthor -\newif\iffinishedtitlepage - -% Do an implicit @contents or @shortcontents after @end titlepage if the -% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage. -% -\newif\ifsetcontentsaftertitlepage - \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue -\newif\ifsetshortcontentsaftertitlepage - \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue - -\parseargdef\shorttitlepage{% - \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% - \endgroup\page\hbox{}\page} - -\envdef\titlepage{% - % Open one extra group, as we want to close it in the middle of \Etitlepage. - \begingroup - \parindent=0pt \textfonts - % Leave some space at the very top of the page. - \vglue\titlepagetopglue - % No rule at page bottom unless we print one at the top with @title. - \finishedtitlepagetrue - % - % Most title ``pages'' are actually two pages long, with space - % at the top of the second. We don't want the ragged left on the second. - \let\oldpage = \page - \def\page{% - \iffinishedtitlepage\else - \finishtitlepage - \fi - \let\page = \oldpage - \page - \null - }% -} - -\def\Etitlepage{% - \iffinishedtitlepage\else - \finishtitlepage - \fi - % It is important to do the page break before ending the group, - % because the headline and footline are only empty inside the group. - % If we use the new definition of \page, we always get a blank page - % after the title page, which we certainly don't want. - \oldpage - \endgroup - % - % Need this before the \...aftertitlepage checks so that if they are - % in effect the toc pages will come out with page numbers. - \HEADINGSon - % - % If they want short, they certainly want long too. - \ifsetshortcontentsaftertitlepage - \shortcontents - \contents - \global\let\shortcontents = \relax - \global\let\contents = \relax - \fi - % - \ifsetcontentsaftertitlepage - \contents - \global\let\contents = \relax - \global\let\shortcontents = \relax - \fi -} - -\def\finishtitlepage{% - \vskip4pt \hrule height 2pt width \hsize - \vskip\titlepagebottomglue - \finishedtitlepagetrue -} - -% Settings used for typesetting titles: no hyphenation, no indentation, -% don't worry much about spacing, ragged right. This should be used -% inside a \vbox, and fonts need to be set appropriately first. Because -% it is always used for titles, nothing else, we call \rmisbold. \par -% should be specified before the end of the \vbox, since a vbox is a group. -% -\def\raggedtitlesettings{% - \rmisbold - \hyphenpenalty=10000 - \parindent=0pt - \tolerance=5000 - \ptexraggedright -} - -% Macros to be used within @titlepage: - -\let\subtitlerm=\tenrm -\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} - -\parseargdef\title{% - \checkenv\titlepage - \vbox{\titlefonts \raggedtitlesettings #1\par}% - % print a rule at the page bottom also. - \finishedtitlepagefalse - \vskip4pt \hrule height 4pt width \hsize \vskip4pt -} - -\parseargdef\subtitle{% - \checkenv\titlepage - {\subtitlefont \rightline{#1}}% -} - -% @author should come last, but may come many times. -% It can also be used inside @quotation. -% -\parseargdef\author{% - \def\temp{\quotation}% - \ifx\thisenv\temp - \def\quotationauthor{#1}% printed in \Equotation. - \else - \checkenv\titlepage - \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi - {\secfonts\rmisbold \leftline{#1}}% - \fi -} - - -% Set up page headings and footings. - -\let\thispage=\folio - -\newtoks\evenheadline % headline on even pages -\newtoks\oddheadline % headline on odd pages -\newtoks\evenfootline % footline on even pages -\newtoks\oddfootline % footline on odd pages - -% Now make TeX use those variables -\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline - \else \the\evenheadline \fi}} -\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline - \else \the\evenfootline \fi}\HEADINGShook} -\let\HEADINGShook=\relax - -% Commands to set those variables. -% For example, this is what @headings on does -% @evenheading @thistitle|@thispage|@thischapter -% @oddheading @thischapter|@thispage|@thistitle -% @evenfooting @thisfile|| -% @oddfooting ||@thisfile - - -\def\evenheading{\parsearg\evenheadingxxx} -\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish} -\def\evenheadingyyy #1\|#2\|#3\|#4\finish{% -\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\def\oddheading{\parsearg\oddheadingxxx} -\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish} -\def\oddheadingyyy #1\|#2\|#3\|#4\finish{% -\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}% - -\def\evenfooting{\parsearg\evenfootingxxx} -\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish} -\def\evenfootingyyy #1\|#2\|#3\|#4\finish{% -\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\def\oddfooting{\parsearg\oddfootingxxx} -\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish} -\def\oddfootingyyy #1\|#2\|#3\|#4\finish{% - \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}% - % - % Leave some space for the footline. Hopefully ok to assume - % @evenfooting will not be used by itself. - \global\advance\pageheight by -12pt - \global\advance\vsize by -12pt -} - -\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}} - -% @evenheadingmarks top \thischapter <- chapter at the top of a page -% @evenheadingmarks bottom \thischapter <- chapter at the bottom of a page -% -% The same set of arguments for: -% -% @oddheadingmarks -% @evenfootingmarks -% @oddfootingmarks -% @everyheadingmarks -% @everyfootingmarks - -\def\evenheadingmarks{\headingmarks{even}{heading}} -\def\oddheadingmarks{\headingmarks{odd}{heading}} -\def\evenfootingmarks{\headingmarks{even}{footing}} -\def\oddfootingmarks{\headingmarks{odd}{footing}} -\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1} - \headingmarks{odd}{heading}{#1} } -\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1} - \headingmarks{odd}{footing}{#1} } -% #1 = even/odd, #2 = heading/footing, #3 = top/bottom. -\def\headingmarks#1#2#3 {% - \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname - \global\expandafter\let\csname get#1#2marks\endcsname \temp -} - -\everyheadingmarks bottom -\everyfootingmarks bottom - -% @headings double turns headings on for double-sided printing. -% @headings single turns headings on for single-sided printing. -% @headings off turns them off. -% @headings on same as @headings double, retained for compatibility. -% @headings after turns on double-sided headings after this page. -% @headings doubleafter turns on double-sided headings after this page. -% @headings singleafter turns on single-sided headings after this page. -% By default, they are off at the start of a document, -% and turned `on' after @end titlepage. - -\def\headings #1 {\csname HEADINGS#1\endcsname} - -\def\headingsoff{% non-global headings elimination - \evenheadline={\hfil}\evenfootline={\hfil}% - \oddheadline={\hfil}\oddfootline={\hfil}% -} - -\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting -\HEADINGSoff % it's the default - -% When we turn headings on, set the page number to 1. -% For double-sided printing, put current file name in lower left corner, -% chapter name on inside top of right hand pages, document -% title on inside top of left hand pages, and page numbers on outside top -% edge of all pages. -\def\HEADINGSdouble{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chapoddpage -} -\let\contentsalignmacro = \chappager - -% For single-sided printing, chapter title goes across top left of page, -% page number on top right. -\def\HEADINGSsingle{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapter\hfil\folio}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chappager -} -\def\HEADINGSon{\HEADINGSdouble} - -\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex} -\let\HEADINGSdoubleafter=\HEADINGSafter -\def\HEADINGSdoublex{% -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chapoddpage -} - -\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex} -\def\HEADINGSsinglex{% -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapter\hfil\folio}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chappager -} - -% Subroutines used in generating headings -% This produces Day Month Year style of output. -% Only define if not already defined, in case a txi-??.tex file has set -% up a different format (e.g., txi-cs.tex does this). -\ifx\today\thisisundefined -\def\today{% - \number\day\space - \ifcase\month - \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr - \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug - \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec - \fi - \space\number\year} -\fi - -% @settitle line... specifies the title of the document, for headings. -% It generates no output of its own. -\def\thistitle{\putwordNoTitle} -\def\settitle{\parsearg{\gdef\thistitle}} - - -\message{tables,} -% Tables -- @table, @ftable, @vtable, @item(x). - -% default indentation of table text -\newdimen\tableindent \tableindent=.8in -% default indentation of @itemize and @enumerate text -\newdimen\itemindent \itemindent=.3in -% margin between end of table item and start of table text. -\newdimen\itemmargin \itemmargin=.1in - -% used internally for \itemindent minus \itemmargin -\newdimen\itemmax - -% Note @table, @ftable, and @vtable define @item, @itemx, etc., with -% these defs. -% They also define \itemindex -% to index the item name in whatever manner is desired (perhaps none). - -\newif\ifitemxneedsnegativevskip - -\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi} - -\def\internalBitem{\smallbreak \parsearg\itemzzz} -\def\internalBitemx{\itemxpar \parsearg\itemzzz} - -\def\itemzzz #1{\begingroup % - \advance\hsize by -\rightskip - \advance\hsize by -\tableindent - \setbox0=\hbox{\itemindicate{#1}}% - \itemindex{#1}% - \nobreak % This prevents a break before @itemx. - % - % If the item text does not fit in the space we have, put it on a line - % by itself, and do not allow a page break either before or after that - % line. We do not start a paragraph here because then if the next - % command is, e.g., @kindex, the whatsit would get put into the - % horizontal list on a line by itself, resulting in extra blank space. - \ifdim \wd0>\itemmax - % - % Make this a paragraph so we get the \parskip glue and wrapping, - % but leave it ragged-right. - \begingroup - \advance\leftskip by-\tableindent - \advance\hsize by\tableindent - \advance\rightskip by0pt plus1fil\relax - \leavevmode\unhbox0\par - \endgroup - % - % We're going to be starting a paragraph, but we don't want the - % \parskip glue -- logically it's part of the @item we just started. - \nobreak \vskip-\parskip - % - % Stop a page break at the \parskip glue coming up. However, if - % what follows is an environment such as @example, there will be no - % \parskip glue; then the negative vskip we just inserted would - % cause the example and the item to crash together. So we use this - % bizarre value of 10001 as a signal to \aboveenvbreak to insert - % \parskip glue after all. Section titles are handled this way also. - % - \penalty 10001 - \endgroup - \itemxneedsnegativevskipfalse - \else - % The item text fits into the space. Start a paragraph, so that the - % following text (if any) will end up on the same line. - \noindent - % Do this with kerns and \unhbox so that if there is a footnote in - % the item text, it can migrate to the main vertical list and - % eventually be printed. - \nobreak\kern-\tableindent - \dimen0 = \itemmax \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0 - \unhbox0 - \nobreak\kern\dimen0 - \endgroup - \itemxneedsnegativevskiptrue - \fi -} - -\def\item{\errmessage{@item while not in a list environment}} -\def\itemx{\errmessage{@itemx while not in a list environment}} - -% @table, @ftable, @vtable. -\envdef\table{% - \let\itemindex\gobble - \tablecheck{table}% -} -\envdef\ftable{% - \def\itemindex ##1{\doind {fn}{\code{##1}}}% - \tablecheck{ftable}% -} -\envdef\vtable{% - \def\itemindex ##1{\doind {vr}{\code{##1}}}% - \tablecheck{vtable}% -} -\def\tablecheck#1{% - \ifnum \the\catcode`\^^M=\active - \endgroup - \errmessage{This command won't work in this context; perhaps the problem is - that we are \inenvironment\thisenv}% - \def\next{\doignore{#1}}% - \else - \let\next\tablex - \fi - \next -} -\def\tablex#1{% - \def\itemindicate{#1}% - \parsearg\tabley -} -\def\tabley#1{% - {% - \makevalueexpandable - \edef\temp{\noexpand\tablez #1\space\space\space}% - \expandafter - }\temp \endtablez -} -\def\tablez #1 #2 #3 #4\endtablez{% - \aboveenvbreak - \ifnum 0#1>0 \advance \leftskip by #1\mil \fi - \ifnum 0#2>0 \tableindent=#2\mil \fi - \ifnum 0#3>0 \advance \rightskip by #3\mil \fi - \itemmax=\tableindent - \advance \itemmax by -\itemmargin - \advance \leftskip by \tableindent - \exdentamount=\tableindent - \parindent = 0pt - \parskip = \smallskipamount - \ifdim \parskip=0pt \parskip=2pt \fi - \let\item = \internalBitem - \let\itemx = \internalBitemx -} -\def\Etable{\endgraf\afterenvbreak} -\let\Eftable\Etable -\let\Evtable\Etable -\let\Eitemize\Etable -\let\Eenumerate\Etable - -% This is the counter used by @enumerate, which is really @itemize - -\newcount \itemno - -\envdef\itemize{\parsearg\doitemize} - -\def\doitemize#1{% - \aboveenvbreak - \itemmax=\itemindent - \advance\itemmax by -\itemmargin - \advance\leftskip by \itemindent - \exdentamount=\itemindent - \parindent=0pt - \parskip=\smallskipamount - \ifdim\parskip=0pt \parskip=2pt \fi - % - % Try typesetting the item mark that if the document erroneously says - % something like @itemize @samp (intending @table), there's an error - % right away at the @itemize. It's not the best error message in the - % world, but it's better than leaving it to the @item. This means if - % the user wants an empty mark, they have to say @w{} not just @w. - \def\itemcontents{#1}% - \setbox0 = \hbox{\itemcontents}% - % - % @itemize with no arg is equivalent to @itemize @bullet. - \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi - % - \let\item=\itemizeitem -} - -% Definition of @item while inside @itemize and @enumerate. -% -\def\itemizeitem{% - \advance\itemno by 1 % for enumerations - {\let\par=\endgraf \smallbreak}% reasonable place to break - {% - % If the document has an @itemize directly after a section title, a - % \nobreak will be last on the list, and \sectionheading will have - % done a \vskip-\parskip. In that case, we don't want to zero - % parskip, or the item text will crash with the heading. On the - % other hand, when there is normal text preceding the item (as there - % usually is), we do want to zero parskip, or there would be too much - % space. In that case, we won't have a \nobreak before. At least - % that's the theory. - \ifnum\lastpenalty<10000 \parskip=0in \fi - \noindent - \hbox to 0pt{\hss \itemcontents \kern\itemmargin}% - % - \vadjust{\penalty 1200}}% not good to break after first line of item. - \flushcr -} - -% \splitoff TOKENS\endmark defines \first to be the first token in -% TOKENS, and \rest to be the remainder. -% -\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}% - -% Allow an optional argument of an uppercase letter, lowercase letter, -% or number, to specify the first label in the enumerated list. No -% argument is the same as `1'. -% -\envparseargdef\enumerate{\enumeratey #1 \endenumeratey} -\def\enumeratey #1 #2\endenumeratey{% - % If we were given no argument, pretend we were given `1'. - \def\thearg{#1}% - \ifx\thearg\empty \def\thearg{1}\fi - % - % Detect if the argument is a single token. If so, it might be a - % letter. Otherwise, the only valid thing it can be is a number. - % (We will always have one token, because of the test we just made. - % This is a good thing, since \splitoff doesn't work given nothing at - % all -- the first parameter is undelimited.) - \expandafter\splitoff\thearg\endmark - \ifx\rest\empty - % Only one token in the argument. It could still be anything. - % A ``lowercase letter'' is one whose \lccode is nonzero. - % An ``uppercase letter'' is one whose \lccode is both nonzero, and - % not equal to itself. - % Otherwise, we assume it's a number. - % - % We need the \relax at the end of the \ifnum lines to stop TeX from - % continuing to look for a . - % - \ifnum\lccode\expandafter`\thearg=0\relax - \numericenumerate % a number (we hope) - \else - % It's a letter. - \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax - \lowercaseenumerate % lowercase letter - \else - \uppercaseenumerate % uppercase letter - \fi - \fi - \else - % Multiple tokens in the argument. We hope it's a number. - \numericenumerate - \fi -} - -% An @enumerate whose labels are integers. The starting integer is -% given in \thearg. -% -\def\numericenumerate{% - \itemno = \thearg - \startenumeration{\the\itemno}% -} - -% The starting (lowercase) letter is in \thearg. -\def\lowercaseenumerate{% - \itemno = \expandafter`\thearg - \startenumeration{% - % Be sure we're not beyond the end of the alphabet. - \ifnum\itemno=0 - \errmessage{No more lowercase letters in @enumerate; get a bigger - alphabet}% - \fi - \char\lccode\itemno - }% -} - -% The starting (uppercase) letter is in \thearg. -\def\uppercaseenumerate{% - \itemno = \expandafter`\thearg - \startenumeration{% - % Be sure we're not beyond the end of the alphabet. - \ifnum\itemno=0 - \errmessage{No more uppercase letters in @enumerate; get a bigger - alphabet} - \fi - \char\uccode\itemno - }% -} - -% Call \doitemize, adding a period to the first argument and supplying the -% common last two arguments. Also subtract one from the initial value in -% \itemno, since @item increments \itemno. -% -\def\startenumeration#1{% - \advance\itemno by -1 - \doitemize{#1.}\flushcr -} - -% @alphaenumerate and @capsenumerate are abbreviations for giving an arg -% to @enumerate. -% -\def\alphaenumerate{\enumerate{a}} -\def\capsenumerate{\enumerate{A}} -\def\Ealphaenumerate{\Eenumerate} -\def\Ecapsenumerate{\Eenumerate} - - -% @multitable macros -% Amy Hendrickson, 8/18/94, 3/6/96 -% -% @multitable ... @end multitable will make as many columns as desired. -% Contents of each column will wrap at width given in preamble. Width -% can be specified either with sample text given in a template line, -% or in percent of \hsize, the current width of text on page. - -% Table can continue over pages but will only break between lines. - -% To make preamble: -% -% Either define widths of columns in terms of percent of \hsize: -% @multitable @columnfractions .25 .3 .45 -% @item ... -% -% Numbers following @columnfractions are the percent of the total -% current hsize to be used for each column. You may use as many -% columns as desired. - - -% Or use a template: -% @multitable {Column 1 template} {Column 2 template} {Column 3 template} -% @item ... -% using the widest term desired in each column. - -% Each new table line starts with @item, each subsequent new column -% starts with @tab. Empty columns may be produced by supplying @tab's -% with nothing between them for as many times as empty columns are needed, -% ie, @tab@tab@tab will produce two empty columns. - -% @item, @tab do not need to be on their own lines, but it will not hurt -% if they are. - -% Sample multitable: - -% @multitable {Column 1 template} {Column 2 template} {Column 3 template} -% @item first col stuff @tab second col stuff @tab third col -% @item -% first col stuff -% @tab -% second col stuff -% @tab -% third col -% @item first col stuff @tab second col stuff -% @tab Many paragraphs of text may be used in any column. -% -% They will wrap at the width determined by the template. -% @item@tab@tab This will be in third column. -% @end multitable - -% Default dimensions may be reset by user. -% @multitableparskip is vertical space between paragraphs in table. -% @multitableparindent is paragraph indent in table. -% @multitablecolmargin is horizontal space to be left between columns. -% @multitablelinespace is space to leave between table items, baseline -% to baseline. -% 0pt means it depends on current normal line spacing. -% -\newskip\multitableparskip -\newskip\multitableparindent -\newdimen\multitablecolspace -\newskip\multitablelinespace -\multitableparskip=0pt -\multitableparindent=6pt -\multitablecolspace=12pt -\multitablelinespace=0pt - -% Macros used to set up halign preamble: -% -\let\endsetuptable\relax -\def\xendsetuptable{\endsetuptable} -\let\columnfractions\relax -\def\xcolumnfractions{\columnfractions} -\newif\ifsetpercent - -% #1 is the @columnfraction, usually a decimal number like .5, but might -% be just 1. We just use it, whatever it is. -% -\def\pickupwholefraction#1 {% - \global\advance\colcount by 1 - \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}% - \setuptable -} - -\newcount\colcount -\def\setuptable#1{% - \def\firstarg{#1}% - \ifx\firstarg\xendsetuptable - \let\go = \relax - \else - \ifx\firstarg\xcolumnfractions - \global\setpercenttrue - \else - \ifsetpercent - \let\go\pickupwholefraction - \else - \global\advance\colcount by 1 - \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a - % separator; typically that is always in the input, anyway. - \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}% - \fi - \fi - \ifx\go\pickupwholefraction - % Put the argument back for the \pickupwholefraction call, so - % we'll always have a period there to be parsed. - \def\go{\pickupwholefraction#1}% - \else - \let\go = \setuptable - \fi% - \fi - \go -} - -% multitable-only commands. -% -% @headitem starts a heading row, which we typeset in bold. -% Assignments have to be global since we are inside the implicit group -% of an alignment entry. \everycr resets \everytab so we don't have to -% undo it ourselves. -\def\headitemfont{\b}% for people to use in the template row; not changeable -\def\headitem{% - \checkenv\multitable - \crcr - \global\everytab={\bf}% can't use \headitemfont since the parsing differs - \the\everytab % for the first item -}% -% -% A \tab used to include \hskip1sp. But then the space in a template -% line is not enough. That is bad. So let's go back to just `&' until -% we again encounter the problem the 1sp was intended to solve. -% --karl, nathan@acm.org, 20apr99. -\def\tab{\checkenv\multitable &\the\everytab}% - -% @multitable ... @end multitable definitions: -% -\newtoks\everytab % insert after every tab. -% -\envdef\multitable{% - \vskip\parskip - \startsavinginserts - % - % @item within a multitable starts a normal row. - % We use \def instead of \let so that if one of the multitable entries - % contains an @itemize, we don't choke on the \item (seen as \crcr aka - % \endtemplate) expanding \doitemize. - \def\item{\crcr}% - % - \tolerance=9500 - \hbadness=9500 - \setmultitablespacing - \parskip=\multitableparskip - \parindent=\multitableparindent - \overfullrule=0pt - \global\colcount=0 - % - \everycr = {% - \noalign{% - \global\everytab={}% - \global\colcount=0 % Reset the column counter. - % Check for saved footnotes, etc. - \checkinserts - % Keeps underfull box messages off when table breaks over pages. - %\filbreak - % Maybe so, but it also creates really weird page breaks when the - % table breaks over pages. Wouldn't \vfil be better? Wait until the - % problem manifests itself, so it can be fixed for real --karl. - }% - }% - % - \parsearg\domultitable -} -\def\domultitable#1{% - % To parse everything between @multitable and @item: - \setuptable#1 \endsetuptable - % - % This preamble sets up a generic column definition, which will - % be used as many times as user calls for columns. - % \vtop will set a single line and will also let text wrap and - % continue for many paragraphs if desired. - \halign\bgroup &% - \global\advance\colcount by 1 - \multistrut - \vtop{% - % Use the current \colcount to find the correct column width: - \hsize=\expandafter\csname col\the\colcount\endcsname - % - % In order to keep entries from bumping into each other - % we will add a \leftskip of \multitablecolspace to all columns after - % the first one. - % - % If a template has been used, we will add \multitablecolspace - % to the width of each template entry. - % - % If the user has set preamble in terms of percent of \hsize we will - % use that dimension as the width of the column, and the \leftskip - % will keep entries from bumping into each other. Table will start at - % left margin and final column will justify at right margin. - % - % Make sure we don't inherit \rightskip from the outer environment. - \rightskip=0pt - \ifnum\colcount=1 - % The first column will be indented with the surrounding text. - \advance\hsize by\leftskip - \else - \ifsetpercent \else - % If user has not set preamble in terms of percent of \hsize - % we will advance \hsize by \multitablecolspace. - \advance\hsize by \multitablecolspace - \fi - % In either case we will make \leftskip=\multitablecolspace: - \leftskip=\multitablecolspace - \fi - % Ignoring space at the beginning and end avoids an occasional spurious - % blank line, when TeX decides to break the line at the space before the - % box from the multistrut, so the strut ends up on a line by itself. - % For example: - % @multitable @columnfractions .11 .89 - % @item @code{#} - % @tab Legal holiday which is valid in major parts of the whole country. - % Is automatically provided with highlighting sequences respectively - % marking characters. - \noindent\ignorespaces##\unskip\multistrut - }\cr -} -\def\Emultitable{% - \crcr - \egroup % end the \halign - \global\setpercentfalse -} - -\def\setmultitablespacing{% - \def\multistrut{\strut}% just use the standard line spacing - % - % Compute \multitablelinespace (if not defined by user) for use in - % \multitableparskip calculation. We used define \multistrut based on - % this, but (ironically) that caused the spacing to be off. - % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. -\ifdim\multitablelinespace=0pt -\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip -\global\advance\multitablelinespace by-\ht0 -\fi -% Test to see if parskip is larger than space between lines of -% table. If not, do nothing. -% If so, set to same dimension as multitablelinespace. -\ifdim\multitableparskip>\multitablelinespace -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller - % than skip between lines in the table. -\fi% -\ifdim\multitableparskip=0pt -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller - % than skip between lines in the table. -\fi} - - -\message{conditionals,} - -% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext, -% @ifnotxml always succeed. They currently do nothing; we don't -% attempt to check whether the conditionals are properly nested. But we -% have to remember that they are conditionals, so that @end doesn't -% attempt to close an environment group. -% -\def\makecond#1{% - \expandafter\let\csname #1\endcsname = \relax - \expandafter\let\csname iscond.#1\endcsname = 1 -} -\makecond{iftex} -\makecond{ifnotdocbook} -\makecond{ifnothtml} -\makecond{ifnotinfo} -\makecond{ifnotplaintext} -\makecond{ifnotxml} - -% Ignore @ignore, @ifhtml, @ifinfo, and the like. -% -\def\direntry{\doignore{direntry}} -\def\documentdescription{\doignore{documentdescription}} -\def\docbook{\doignore{docbook}} -\def\html{\doignore{html}} -\def\ifdocbook{\doignore{ifdocbook}} -\def\ifhtml{\doignore{ifhtml}} -\def\ifinfo{\doignore{ifinfo}} -\def\ifnottex{\doignore{ifnottex}} -\def\ifplaintext{\doignore{ifplaintext}} -\def\ifxml{\doignore{ifxml}} -\def\ignore{\doignore{ignore}} -\def\menu{\doignore{menu}} -\def\xml{\doignore{xml}} - -% Ignore text until a line `@end #1', keeping track of nested conditionals. -% -% A count to remember the depth of nesting. -\newcount\doignorecount - -\def\doignore#1{\begingroup - % Scan in ``verbatim'' mode: - \obeylines - \catcode`\@ = \other - \catcode`\{ = \other - \catcode`\} = \other - % - % Make sure that spaces turn into tokens that match what \doignoretext wants. - \spaceisspace - % - % Count number of #1's that we've seen. - \doignorecount = 0 - % - % Swallow text until we reach the matching `@end #1'. - \dodoignore{#1}% -} - -{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source. - \obeylines % - % - \gdef\dodoignore#1{% - % #1 contains the command name as a string, e.g., `ifinfo'. - % - % Define a command to find the next `@end #1'. - \long\def\doignoretext##1^^M@end #1{% - \doignoretextyyy##1^^M@#1\_STOP_}% - % - % And this command to find another #1 command, at the beginning of a - % line. (Otherwise, we would consider a line `@c @ifset', for - % example, to count as an @ifset for nesting.) - \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}% - % - % And now expand that command. - \doignoretext ^^M% - }% -} - -\def\doignoreyyy#1{% - \def\temp{#1}% - \ifx\temp\empty % Nothing found. - \let\next\doignoretextzzz - \else % Found a nested condition, ... - \advance\doignorecount by 1 - \let\next\doignoretextyyy % ..., look for another. - % If we're here, #1 ends with ^^M\ifinfo (for example). - \fi - \next #1% the token \_STOP_ is present just after this macro. -} - -% We have to swallow the remaining "\_STOP_". -% -\def\doignoretextzzz#1{% - \ifnum\doignorecount = 0 % We have just found the outermost @end. - \let\next\enddoignore - \else % Still inside a nested condition. - \advance\doignorecount by -1 - \let\next\doignoretext % Look for the next @end. - \fi - \next -} - -% Finish off ignored text. -{ \obeylines% - % Ignore anything after the last `@end #1'; this matters in verbatim - % environments, where otherwise the newline after an ignored conditional - % would result in a blank line in the output. - \gdef\enddoignore#1^^M{\endgroup\ignorespaces}% -} - - -% @set VAR sets the variable VAR to an empty value. -% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. -% -% Since we want to separate VAR from REST-OF-LINE (which might be -% empty), we can't just use \parsearg; we have to insert a space of our -% own to delimit the rest of the line, and then take it out again if we -% didn't need it. -% We rely on the fact that \parsearg sets \catcode`\ =10. -% -\parseargdef\set{\setyyy#1 \endsetyyy} -\def\setyyy#1 #2\endsetyyy{% - {% - \makevalueexpandable - \def\temp{#2}% - \edef\next{\gdef\makecsname{SET#1}}% - \ifx\temp\empty - \next{}% - \else - \setzzz#2\endsetzzz - \fi - }% -} -% Remove the trailing space \setxxx inserted. -\def\setzzz#1 \endsetzzz{\next{#1}} - -% @clear VAR clears (i.e., unsets) the variable VAR. -% -\parseargdef\clear{% - {% - \makevalueexpandable - \global\expandafter\let\csname SET#1\endcsname=\relax - }% -} - -% @value{foo} gets the text saved in variable foo. -\def\value{\begingroup\makevalueexpandable\valuexxx} -\def\valuexxx#1{\expandablevalue{#1}\endgroup} -{ - \catcode`\- = \active \catcode`\_ = \active - % - \gdef\makevalueexpandable{% - \let\value = \expandablevalue - % We don't want these characters active, ... - \catcode`\-=\other \catcode`\_=\other - % ..., but we might end up with active ones in the argument if - % we're called from @code, as @code{@value{foo-bar_}}, though. - % So \let them to their normal equivalents. - \let-\normaldash \let_\normalunderscore - } -} - -% We have this subroutine so that we can handle at least some @value's -% properly in indexes (we call \makevalueexpandable in \indexdummies). -% The command has to be fully expandable (if the variable is set), since -% the result winds up in the index file. This means that if the -% variable's value contains other Texinfo commands, it's almost certain -% it will fail (although perhaps we could fix that with sufficient work -% to do a one-level expansion on the result, instead of complete). -% -\def\expandablevalue#1{% - \expandafter\ifx\csname SET#1\endcsname\relax - {[No value for ``#1'']}% - \message{Variable `#1', used in @value, is not set.}% - \else - \csname SET#1\endcsname - \fi -} - -% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined -% with @set. -% -% To get special treatment of `@end ifset,' call \makeond and the redefine. -% -\makecond{ifset} -\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}} -\def\doifset#1#2{% - {% - \makevalueexpandable - \let\next=\empty - \expandafter\ifx\csname SET#2\endcsname\relax - #1% If not set, redefine \next. - \fi - \expandafter - }\next -} -\def\ifsetfail{\doignore{ifset}} - -% @ifclear VAR ... @end executes the `...' iff VAR has never been -% defined with @set, or has been undefined with @clear. -% -% The `\else' inside the `\doifset' parameter is a trick to reuse the -% above code: if the variable is not set, do nothing, if it is set, -% then redefine \next to \ifclearfail. -% -\makecond{ifclear} -\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}} -\def\ifclearfail{\doignore{ifclear}} - -% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written -% without the @) is in fact defined. We can only feasibly check at the -% TeX level, so something like `mathcode' is going to considered -% defined even though it is not a Texinfo command. -% -\makecond{ifcommanddefined} -\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} -% -\def\doifcmddefined#1#2{{% - \makevalueexpandable - \let\next=\empty - \expandafter\ifx\csname #2\endcsname\relax - #1% If not defined, \let\next as above. - \fi - \expandafter - }\next -} -\def\ifcmddefinedfail{\doignore{ifcommanddefined}} - -% @ifcommandnotdefined CMD ... handled similar to @ifclear above. -\makecond{ifcommandnotdefined} -\def\ifcommandnotdefined{% - \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}} -\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}} - -% Set the `txicommandconditionals' variable, so documents have a way to -% test if the @ifcommand...defined conditionals are available. -\set txicommandconditionals - -% @dircategory CATEGORY -- specify a category of the dir file -% which this file should belong to. Ignore this in TeX. -\let\dircategory=\comment - -% @defininfoenclose. -\let\definfoenclose=\comment - - -\message{indexing,} -% Index generation facilities - -% Define \newwrite to be identical to plain tex's \newwrite -% except not \outer, so it can be used within macros and \if's. -\edef\newwrite{\makecsname{ptexnewwrite}} - -% \newindex {foo} defines an index named foo. -% It automatically defines \fooindex such that -% \fooindex ...rest of line... puts an entry in the index foo. -% It also defines \fooindfile to be the number of the output channel for -% the file that accumulates this index. The file's extension is foo. -% The name of an index should be no more than 2 characters long -% for the sake of vms. -% -\def\newindex#1{% - \iflinks - \expandafter\newwrite \csname#1indfile\endcsname - \openout \csname#1indfile\endcsname \jobname.#1 % Open the file - \fi - \expandafter\xdef\csname#1index\endcsname{% % Define @#1index - \noexpand\doindex{#1}} -} - -% @defindex foo == \newindex{foo} -% -\def\defindex{\parsearg\newindex} - -% Define @defcodeindex, like @defindex except put all entries in @code. -% -\def\defcodeindex{\parsearg\newcodeindex} -% -\def\newcodeindex#1{% - \iflinks - \expandafter\newwrite \csname#1indfile\endcsname - \openout \csname#1indfile\endcsname \jobname.#1 - \fi - \expandafter\xdef\csname#1index\endcsname{% - \noexpand\docodeindex{#1}}% -} - - -% @synindex foo bar makes index foo feed into index bar. -% Do this instead of @defindex foo if you don't want it as a separate index. -% -% @syncodeindex foo bar similar, but put all entries made for index foo -% inside @code. -% -\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}} -\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}} - -% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo), -% #3 the target index (bar). -\def\dosynindex#1#2#3{% - % Only do \closeout if we haven't already done it, else we'll end up - % closing the target index. - \expandafter \ifx\csname donesynindex#2\endcsname \relax - % The \closeout helps reduce unnecessary open files; the limit on the - % Acorn RISC OS is a mere 16 files. - \expandafter\closeout\csname#2indfile\endcsname - \expandafter\let\csname donesynindex#2\endcsname = 1 - \fi - % redefine \fooindfile: - \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname - \expandafter\let\csname#2indfile\endcsname=\temp - % redefine \fooindex: - \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}% -} - -% Define \doindex, the driver for all \fooindex macros. -% Argument #1 is generated by the calling \fooindex macro, -% and it is "foo", the name of the index. - -% \doindex just uses \parsearg; it calls \doind for the actual work. -% This is because \doind is more useful to call from other macros. - -% There is also \dosubind {index}{topic}{subtopic} -% which makes an entry in a two-level index such as the operation index. - -\def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer} -\def\singleindexer #1{\doind{\indexname}{#1}} - -% like the previous two, but they put @code around the argument. -\def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer} -\def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}} - -% Take care of Texinfo commands that can appear in an index entry. -% Since there are some commands we want to expand, and others we don't, -% we have to laboriously prevent expansion for those that we don't. -% -\def\indexdummies{% - \escapechar = `\\ % use backslash in output files. - \def\@{@}% change to @@ when we switch to @ as escape char in index files. - \def\ {\realbackslash\space }% - % - % Need these unexpandable (because we define \tt as a dummy) - % definitions when @{ or @} appear in index entry text. Also, more - % complicated, when \tex is in effect and \{ is a \delimiter again. - % We can't use \lbracecmd and \rbracecmd because texindex assumes - % braces and backslashes are used only as delimiters. Perhaps we - % should define @lbrace and @rbrace commands a la @comma. - \def\{{{\tt\char123}}% - \def\}{{\tt\char125}}% - % - % I don't entirely understand this, but when an index entry is - % generated from a macro call, the \endinput which \scanmacro inserts - % causes processing to be prematurely terminated. This is, - % apparently, because \indexsorttmp is fully expanded, and \endinput - % is an expandable command. The redefinition below makes \endinput - % disappear altogether for that purpose -- although logging shows that - % processing continues to some further point. On the other hand, it - % seems \endinput does not hurt in the printed index arg, since that - % is still getting written without apparent harm. - % - % Sample source (mac-idx3.tex, reported by Graham Percival to - % help-texinfo, 22may06): - % @macro funindex {WORD} - % @findex xyz - % @end macro - % ... - % @funindex commtest - % - % The above is not enough to reproduce the bug, but it gives the flavor. - % - % Sample whatsit resulting: - % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} - % - % So: - \let\endinput = \empty - % - % Do the redefinitions. - \commondummies -} - -% For the aux and toc files, @ is the escape character. So we want to -% redefine everything using @ as the escape character (instead of -% \realbackslash, still used for index files). When everything uses @, -% this will be simpler. -% -\def\atdummies{% - \def\@{@@}% - \def\ {@ }% - \let\{ = \lbraceatcmd - \let\} = \rbraceatcmd - % - % Do the redefinitions. - \commondummies - \otherbackslash -} - -% Called from \indexdummies and \atdummies. -% -\def\commondummies{% - % - % \definedummyword defines \#1 as \string\#1\space, thus effectively - % preventing its expansion. This is used only for control words, - % not control letters, because the \space would be incorrect for - % control characters, but is needed to separate the control word - % from whatever follows. - % - % For control letters, we have \definedummyletter, which omits the - % space. - % - % These can be used both for control words that take an argument and - % those that do not. If it is followed by {arg} in the input, then - % that will dutifully get written to the index (or wherever). - % - \def\definedummyword ##1{\def##1{\string##1\space}}% - \def\definedummyletter##1{\def##1{\string##1}}% - \let\definedummyaccent\definedummyletter - % - \commondummiesnofonts - % - \definedummyletter\_% - \definedummyletter\-% - % - % Non-English letters. - \definedummyword\AA - \definedummyword\AE - \definedummyword\DH - \definedummyword\L - \definedummyword\O - \definedummyword\OE - \definedummyword\TH - \definedummyword\aa - \definedummyword\ae - \definedummyword\dh - \definedummyword\exclamdown - \definedummyword\l - \definedummyword\o - \definedummyword\oe - \definedummyword\ordf - \definedummyword\ordm - \definedummyword\questiondown - \definedummyword\ss - \definedummyword\th - % - % Although these internal commands shouldn't show up, sometimes they do. - \definedummyword\bf - \definedummyword\gtr - \definedummyword\hat - \definedummyword\less - \definedummyword\sf - \definedummyword\sl - \definedummyword\tclose - \definedummyword\tt - % - \definedummyword\LaTeX - \definedummyword\TeX - % - % Assorted special characters. - \definedummyword\arrow - \definedummyword\bullet - \definedummyword\comma - \definedummyword\copyright - \definedummyword\registeredsymbol - \definedummyword\dots - \definedummyword\enddots - \definedummyword\entrybreak - \definedummyword\equiv - \definedummyword\error - \definedummyword\euro - \definedummyword\expansion - \definedummyword\geq - \definedummyword\guillemetleft - \definedummyword\guillemetright - \definedummyword\guilsinglleft - \definedummyword\guilsinglright - \definedummyword\lbracechar - \definedummyword\leq - \definedummyword\minus - \definedummyword\ogonek - \definedummyword\pounds - \definedummyword\point - \definedummyword\print - \definedummyword\quotedblbase - \definedummyword\quotedblleft - \definedummyword\quotedblright - \definedummyword\quoteleft - \definedummyword\quoteright - \definedummyword\quotesinglbase - \definedummyword\rbracechar - \definedummyword\result - \definedummyword\textdegree - % - % We want to disable all macros so that they are not expanded by \write. - \macrolist - % - \normalturnoffactive - % - % Handle some cases of @value -- where it does not contain any - % (non-fully-expandable) commands. - \makevalueexpandable -} - -% \commondummiesnofonts: common to \commondummies and \indexnofonts. -% -\def\commondummiesnofonts{% - % Control letters and accents. - \definedummyletter\!% - \definedummyaccent\"% - \definedummyaccent\'% - \definedummyletter\*% - \definedummyaccent\,% - \definedummyletter\.% - \definedummyletter\/% - \definedummyletter\:% - \definedummyaccent\=% - \definedummyletter\?% - \definedummyaccent\^% - \definedummyaccent\`% - \definedummyaccent\~% - \definedummyword\u - \definedummyword\v - \definedummyword\H - \definedummyword\dotaccent - \definedummyword\ogonek - \definedummyword\ringaccent - \definedummyword\tieaccent - \definedummyword\ubaraccent - \definedummyword\udotaccent - \definedummyword\dotless - % - % Texinfo font commands. - \definedummyword\b - \definedummyword\i - \definedummyword\r - \definedummyword\sansserif - \definedummyword\sc - \definedummyword\slanted - \definedummyword\t - % - % Commands that take arguments. - \definedummyword\abbr - \definedummyword\acronym - \definedummyword\anchor - \definedummyword\cite - \definedummyword\code - \definedummyword\command - \definedummyword\dfn - \definedummyword\dmn - \definedummyword\email - \definedummyword\emph - \definedummyword\env - \definedummyword\file - \definedummyword\image - \definedummyword\indicateurl - \definedummyword\inforef - \definedummyword\kbd - \definedummyword\key - \definedummyword\math - \definedummyword\option - \definedummyword\pxref - \definedummyword\ref - \definedummyword\samp - \definedummyword\strong - \definedummyword\tie - \definedummyword\uref - \definedummyword\url - \definedummyword\var - \definedummyword\verb - \definedummyword\w - \definedummyword\xref -} - -% \indexnofonts is used when outputting the strings to sort the index -% by, and when constructing control sequence names. It eliminates all -% control sequences and just writes whatever the best ASCII sort string -% would be for a given command (usually its argument). -% -\def\indexnofonts{% - % Accent commands should become @asis. - \def\definedummyaccent##1{\let##1\asis}% - % We can just ignore other control letters. - \def\definedummyletter##1{\let##1\empty}% - % All control words become @asis by default; overrides below. - \let\definedummyword\definedummyaccent - % - \commondummiesnofonts - % - % Don't no-op \tt, since it isn't a user-level command - % and is used in the definitions of the active chars like <, >, |, etc. - % Likewise with the other plain tex font commands. - %\let\tt=\asis - % - \def\ { }% - \def\@{@}% - \def\_{\normalunderscore}% - \def\-{}% @- shouldn't affect sorting - % - % Unfortunately, texindex is not prepared to handle braces in the - % content at all. So for index sorting, we map @{ and @} to strings - % starting with |, since that ASCII character is between ASCII { and }. - \def\{{|a}% - \def\lbracechar{|a}% - % - \def\}{|b}% - \def\rbracechar{|b}% - % - % Non-English letters. - \def\AA{AA}% - \def\AE{AE}% - \def\DH{DZZ}% - \def\L{L}% - \def\OE{OE}% - \def\O{O}% - \def\TH{ZZZ}% - \def\aa{aa}% - \def\ae{ae}% - \def\dh{dzz}% - \def\exclamdown{!}% - \def\l{l}% - \def\oe{oe}% - \def\ordf{a}% - \def\ordm{o}% - \def\o{o}% - \def\questiondown{?}% - \def\ss{ss}% - \def\th{zzz}% - % - \def\LaTeX{LaTeX}% - \def\TeX{TeX}% - % - % Assorted special characters. - % (The following {} will end up in the sort string, but that's ok.) - \def\arrow{->}% - \def\bullet{bullet}% - \def\comma{,}% - \def\copyright{copyright}% - \def\dots{...}% - \def\enddots{...}% - \def\equiv{==}% - \def\error{error}% - \def\euro{euro}% - \def\expansion{==>}% - \def\geq{>=}% - \def\guillemetleft{<<}% - \def\guillemetright{>>}% - \def\guilsinglleft{<}% - \def\guilsinglright{>}% - \def\leq{<=}% - \def\minus{-}% - \def\point{.}% - \def\pounds{pounds}% - \def\print{-|}% - \def\quotedblbase{"}% - \def\quotedblleft{"}% - \def\quotedblright{"}% - \def\quoteleft{`}% - \def\quoteright{'}% - \def\quotesinglbase{,}% - \def\registeredsymbol{R}% - \def\result{=>}% - \def\textdegree{o}% - % - \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax - \else \indexlquoteignore \fi - % - % We need to get rid of all macros, leaving only the arguments (if present). - % Of course this is not nearly correct, but it is the best we can do for now. - % makeinfo does not expand macros in the argument to @deffn, which ends up - % writing an index entry, and texindex isn't prepared for an index sort entry - % that starts with \. - % - % Since macro invocations are followed by braces, we can just redefine them - % to take a single TeX argument. The case of a macro invocation that - % goes to end-of-line is not handled. - % - \macrolist -} - -% Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us -% ignore left quotes in the sort term. -{\catcode`\`=\active - \gdef\indexlquoteignore{\let`=\empty}} - -\let\indexbackslash=0 %overridden during \printindex. -\let\SETmarginindex=\relax % put index entries in margin (undocumented)? - -% Most index entries go through here, but \dosubind is the general case. -% #1 is the index name, #2 is the entry text. -\def\doind#1#2{\dosubind{#1}{#2}{}} - -% Workhorse for all \fooindexes. -% #1 is name of index, #2 is stuff to put there, #3 is subentry -- -% empty if called from \doind, as we usually are (the main exception -% is with most defuns, which call us directly). -% -\def\dosubind#1#2#3{% - \iflinks - {% - % Store the main index entry text (including the third arg). - \toks0 = {#2}% - % If third arg is present, precede it with a space. - \def\thirdarg{#3}% - \ifx\thirdarg\empty \else - \toks0 = \expandafter{\the\toks0 \space #3}% - \fi - % - \edef\writeto{\csname#1indfile\endcsname}% - % - \safewhatsit\dosubindwrite - }% - \fi -} - -% Write the entry in \toks0 to the index file: -% -\def\dosubindwrite{% - % Put the index entry in the margin if desired. - \ifx\SETmarginindex\relax\else - \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}% - \fi - % - % Remember, we are within a group. - \indexdummies % Must do this here, since \bf, etc expand at this stage - \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now - % so it will be output as is; and it will print as backslash. - % - % Process the index entry with all font commands turned off, to - % get the string to sort by. - {\indexnofonts - \edef\temp{\the\toks0}% need full expansion - \xdef\indexsorttmp{\temp}% - }% - % - % Set up the complete index entry, with both the sort key and - % the original text, including any font commands. We write - % three arguments to \entry to the .?? file (four in the - % subentry case), texindex reduces to two when writing the .??s - % sorted result. - \edef\temp{% - \write\writeto{% - \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}% - }% - \temp -} - -% Take care of unwanted page breaks/skips around a whatsit: -% -% If a skip is the last thing on the list now, preserve it -% by backing up by \lastskip, doing the \write, then inserting -% the skip again. Otherwise, the whatsit generated by the -% \write or \pdfdest will make \lastskip zero. The result is that -% sequences like this: -% @end defun -% @tindex whatever -% @defun ... -% will have extra space inserted, because the \medbreak in the -% start of the @defun won't see the skip inserted by the @end of -% the previous defun. -% -% But don't do any of this if we're not in vertical mode. We -% don't want to do a \vskip and prematurely end a paragraph. -% -% Avoid page breaks due to these extra skips, too. -% -% But wait, there is a catch there: -% We'll have to check whether \lastskip is zero skip. \ifdim is not -% sufficient for this purpose, as it ignores stretch and shrink parts -% of the skip. The only way seems to be to check the textual -% representation of the skip. -% -% The following is almost like \def\zeroskipmacro{0.0pt} except that -% the ``p'' and ``t'' characters have catcode \other, not 11 (letter). -% -\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname} -% -\newskip\whatsitskip -\newcount\whatsitpenalty -% -% ..., ready, GO: -% -\def\safewhatsit#1{\ifhmode - #1% - \else - % \lastskip and \lastpenalty cannot both be nonzero simultaneously. - \whatsitskip = \lastskip - \edef\lastskipmacro{\the\lastskip}% - \whatsitpenalty = \lastpenalty - % - % If \lastskip is nonzero, that means the last item was a - % skip. And since a skip is discardable, that means this - % -\whatsitskip glue we're inserting is preceded by a - % non-discardable item, therefore it is not a potential - % breakpoint, therefore no \nobreak needed. - \ifx\lastskipmacro\zeroskipmacro - \else - \vskip-\whatsitskip - \fi - % - #1% - % - \ifx\lastskipmacro\zeroskipmacro - % If \lastskip was zero, perhaps the last item was a penalty, and - % perhaps it was >=10000, e.g., a \nobreak. In that case, we want - % to re-insert the same penalty (values >10000 are used for various - % signals); since we just inserted a non-discardable item, any - % following glue (such as a \parskip) would be a breakpoint. For example: - % @deffn deffn-whatever - % @vindex index-whatever - % Description. - % would allow a break between the index-whatever whatsit - % and the "Description." paragraph. - \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi - \else - % On the other hand, if we had a nonzero \lastskip, - % this make-up glue would be preceded by a non-discardable item - % (the whatsit from the \write), so we must insert a \nobreak. - \nobreak\vskip\whatsitskip - \fi -\fi} - -% The index entry written in the file actually looks like -% \entry {sortstring}{page}{topic} -% or -% \entry {sortstring}{page}{topic}{subtopic} -% The texindex program reads in these files and writes files -% containing these kinds of lines: -% \initial {c} -% before the first topic whose initial is c -% \entry {topic}{pagelist} -% for a topic that is used without subtopics -% \primary {topic} -% for the beginning of a topic that is used with subtopics -% \secondary {subtopic}{pagelist} -% for each subtopic. - -% Define the user-accessible indexing commands -% @findex, @vindex, @kindex, @cindex. - -\def\findex {\fnindex} -\def\kindex {\kyindex} -\def\cindex {\cpindex} -\def\vindex {\vrindex} -\def\tindex {\tpindex} -\def\pindex {\pgindex} - -\def\cindexsub {\begingroup\obeylines\cindexsub} -{\obeylines % -\gdef\cindexsub "#1" #2^^M{\endgroup % -\dosubind{cp}{#2}{#1}}} - -% Define the macros used in formatting output of the sorted index material. - -% @printindex causes a particular index (the ??s file) to get printed. -% It does not print any chapter heading (usually an @unnumbered). -% -\parseargdef\printindex{\begingroup - \dobreak \chapheadingskip{10000}% - % - \smallfonts \rm - \tolerance = 9500 - \plainfrenchspacing - \everypar = {}% don't want the \kern\-parindent from indentation suppression. - % - % See if the index file exists and is nonempty. - % Change catcode of @ here so that if the index file contains - % \initial {@} - % as its first line, TeX doesn't complain about mismatched braces - % (because it thinks @} is a control sequence). - \catcode`\@ = 11 - \openin 1 \jobname.#1s - \ifeof 1 - % \enddoublecolumns gets confused if there is no text in the index, - % and it loses the chapter title and the aux file entries for the - % index. The easiest way to prevent this problem is to make sure - % there is some text. - \putwordIndexNonexistent - \else - % - % If the index file exists but is empty, then \openin leaves \ifeof - % false. We have to make TeX try to read something from the file, so - % it can discover if there is anything in it. - \read 1 to \temp - \ifeof 1 - \putwordIndexIsEmpty - \else - % Index files are almost Texinfo source, but we use \ as the escape - % character. It would be better to use @, but that's too big a change - % to make right now. - \def\indexbackslash{\backslashcurfont}% - \catcode`\\ = 0 - \escapechar = `\\ - \begindoublecolumns - \input \jobname.#1s - \enddoublecolumns - \fi - \fi - \closein 1 -\endgroup} - -% These macros are used by the sorted index file itself. -% Change them to control the appearance of the index. - -\def\initial#1{{% - % Some minor font changes for the special characters. - \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt - % - % Remove any glue we may have, we'll be inserting our own. - \removelastskip - % - % We like breaks before the index initials, so insert a bonus. - \nobreak - \vskip 0pt plus 3\baselineskip - \penalty 0 - \vskip 0pt plus -3\baselineskip - % - % Typeset the initial. Making this add up to a whole number of - % baselineskips increases the chance of the dots lining up from column - % to column. It still won't often be perfect, because of the stretch - % we need before each entry, but it's better. - % - % No shrink because it confuses \balancecolumns. - \vskip 1.67\baselineskip plus .5\baselineskip - \leftline{\secbf #1}% - % Do our best not to break after the initial. - \nobreak - \vskip .33\baselineskip plus .1\baselineskip -}} - -% \entry typesets a paragraph consisting of the text (#1), dot leaders, and -% then page number (#2) flushed to the right margin. It is used for index -% and table of contents entries. The paragraph is indented by \leftskip. -% -% A straightforward implementation would start like this: -% \def\entry#1#2{... -% But this freezes the catcodes in the argument, and can cause problems to -% @code, which sets - active. This problem was fixed by a kludge--- -% ``-'' was active throughout whole index, but this isn't really right. -% The right solution is to prevent \entry from swallowing the whole text. -% --kasal, 21nov03 -\def\entry{% - \begingroup - % - % Start a new paragraph if necessary, so our assignments below can't - % affect previous text. - \par - % - % Do not fill out the last line with white space. - \parfillskip = 0in - % - % No extra space above this paragraph. - \parskip = 0in - % - % Do not prefer a separate line ending with a hyphen to fewer lines. - \finalhyphendemerits = 0 - % - % \hangindent is only relevant when the entry text and page number - % don't both fit on one line. In that case, bob suggests starting the - % dots pretty far over on the line. Unfortunately, a large - % indentation looks wrong when the entry text itself is broken across - % lines. So we use a small indentation and put up with long leaders. - % - % \hangafter is reset to 1 (which is the value we want) at the start - % of each paragraph, so we need not do anything with that. - \hangindent = 2em - % - % When the entry text needs to be broken, just fill out the first line - % with blank space. - \rightskip = 0pt plus1fil - % - % A bit of stretch before each entry for the benefit of balancing - % columns. - \vskip 0pt plus1pt - % - % When reading the text of entry, convert explicit line breaks - % from @* into spaces. The user might give these in long section - % titles, for instance. - \def\*{\unskip\space\ignorespaces}% - \def\entrybreak{\hfil\break}% - % - % Swallow the left brace of the text (first parameter): - \afterassignment\doentry - \let\temp = -} -\def\entrybreak{\unskip\space\ignorespaces}% -\def\doentry{% - \bgroup % Instead of the swallowed brace. - \noindent - \aftergroup\finishentry - % And now comes the text of the entry. -} -\def\finishentry#1{% - % #1 is the page number. - % - % The following is kludged to not output a line of dots in the index if - % there are no page numbers. The next person who breaks this will be - % cursed by a Unix daemon. - \setbox\boxA = \hbox{#1}% - \ifdim\wd\boxA = 0pt - \ % - \else - % - % If we must, put the page number on a line of its own, and fill out - % this line with blank space. (The \hfil is overwhelmed with the - % fill leaders glue in \indexdotfill if the page number does fit.) - \hfil\penalty50 - \null\nobreak\indexdotfill % Have leaders before the page number. - % - % The `\ ' here is removed by the implicit \unskip that TeX does as - % part of (the primitive) \par. Without it, a spurious underfull - % \hbox ensues. - \ifpdf - \pdfgettoks#1.% - \ \the\toksA - \else - \ #1% - \fi - \fi - \par - \endgroup -} - -% Like plain.tex's \dotfill, except uses up at least 1 em. -\def\indexdotfill{\cleaders - \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill} - -\def\primary #1{\line{#1\hfil}} - -\newskip\secondaryindent \secondaryindent=0.5cm -\def\secondary#1#2{{% - \parfillskip=0in - \parskip=0in - \hangindent=1in - \hangafter=1 - \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill - \ifpdf - \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. - \else - #2 - \fi - \par -}} - -% Define two-column mode, which we use to typeset indexes. -% Adapted from the TeXbook, page 416, which is to say, -% the manmac.tex format used to print the TeXbook itself. -\catcode`\@=11 - -\newbox\partialpage -\newdimen\doublecolumnhsize - -\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns - % Grab any single-column material above us. - \output = {% - % - % Here is a possibility not foreseen in manmac: if we accumulate a - % whole lot of material, we might end up calling this \output - % routine twice in a row (see the doublecol-lose test, which is - % essentially a couple of indexes with @setchapternewpage off). In - % that case we just ship out what is in \partialpage with the normal - % output routine. Generally, \partialpage will be empty when this - % runs and this will be a no-op. See the indexspread.tex test case. - \ifvoid\partialpage \else - \onepageout{\pagecontents\partialpage}% - \fi - % - \global\setbox\partialpage = \vbox{% - % Unvbox the main output page. - \unvbox\PAGE - \kern-\topskip \kern\baselineskip - }% - }% - \eject % run that output routine to set \partialpage - % - % Use the double-column output routine for subsequent pages. - \output = {\doublecolumnout}% - % - % Change the page size parameters. We could do this once outside this - % routine, in each of @smallbook, @afourpaper, and the default 8.5x11 - % format, but then we repeat the same computation. Repeating a couple - % of assignments once per index is clearly meaningless for the - % execution time, so we may as well do it in one place. - % - % First we halve the line length, less a little for the gutter between - % the columns. We compute the gutter based on the line length, so it - % changes automatically with the paper format. The magic constant - % below is chosen so that the gutter has the same value (well, +-<1pt) - % as it did when we hard-coded it. - % - % We put the result in a separate register, \doublecolumhsize, so we - % can restore it in \pagesofar, after \hsize itself has (potentially) - % been clobbered. - % - \doublecolumnhsize = \hsize - \advance\doublecolumnhsize by -.04154\hsize - \divide\doublecolumnhsize by 2 - \hsize = \doublecolumnhsize - % - % Double the \vsize as well. (We don't need a separate register here, - % since nobody clobbers \vsize.) - \vsize = 2\vsize -} - -% The double-column output routine for all double-column pages except -% the last. -% -\def\doublecolumnout{% - \splittopskip=\topskip \splitmaxdepth=\maxdepth - % Get the available space for the double columns -- the normal - % (undoubled) page height minus any material left over from the - % previous page. - \dimen@ = \vsize - \divide\dimen@ by 2 - \advance\dimen@ by -\ht\partialpage - % - % box0 will be the left-hand column, box2 the right. - \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@ - \onepageout\pagesofar - \unvbox255 - \penalty\outputpenalty -} -% -% Re-output the contents of the output page -- any previous material, -% followed by the two boxes we just split, in box0 and box2. -\def\pagesofar{% - \unvbox\partialpage - % - \hsize = \doublecolumnhsize - \wd0=\hsize \wd2=\hsize - \hbox to\pagewidth{\box0\hfil\box2}% -} -% -% All done with double columns. -\def\enddoublecolumns{% - % The following penalty ensures that the page builder is exercised - % _before_ we change the output routine. This is necessary in the - % following situation: - % - % The last section of the index consists only of a single entry. - % Before this section, \pagetotal is less than \pagegoal, so no - % break occurs before the last section starts. However, the last - % section, consisting of \initial and the single \entry, does not - % fit on the page and has to be broken off. Without the following - % penalty the page builder will not be exercised until \eject - % below, and by that time we'll already have changed the output - % routine to the \balancecolumns version, so the next-to-last - % double-column page will be processed with \balancecolumns, which - % is wrong: The two columns will go to the main vertical list, with - % the broken-off section in the recent contributions. As soon as - % the output routine finishes, TeX starts reconsidering the page - % break. The two columns and the broken-off section both fit on the - % page, because the two columns now take up only half of the page - % goal. When TeX sees \eject from below which follows the final - % section, it invokes the new output routine that we've set after - % \balancecolumns below; \onepageout will try to fit the two columns - % and the final section into the vbox of \pageheight (see - % \pagebody), causing an overfull box. - % - % Note that glue won't work here, because glue does not exercise the - % page builder, unlike penalties (see The TeXbook, pp. 280-281). - \penalty0 - % - \output = {% - % Split the last of the double-column material. Leave it on the - % current page, no automatic page break. - \balancecolumns - % - % If we end up splitting too much material for the current page, - % though, there will be another page break right after this \output - % invocation ends. Having called \balancecolumns once, we do not - % want to call it again. Therefore, reset \output to its normal - % definition right away. (We hope \balancecolumns will never be - % called on to balance too much material, but if it is, this makes - % the output somewhat more palatable.) - \global\output = {\onepageout{\pagecontents\PAGE}}% - }% - \eject - \endgroup % started in \begindoublecolumns - % - % \pagegoal was set to the doubled \vsize above, since we restarted - % the current page. We're now back to normal single-column - % typesetting, so reset \pagegoal to the normal \vsize (after the - % \endgroup where \vsize got restored). - \pagegoal = \vsize -} -% -% Called at the end of the double column material. -\def\balancecolumns{% - \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120. - \dimen@ = \ht0 - \advance\dimen@ by \topskip - \advance\dimen@ by-\baselineskip - \divide\dimen@ by 2 % target to split to - %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}% - \splittopskip = \topskip - % Loop until we get a decent breakpoint. - {% - \vbadness = 10000 - \loop - \global\setbox3 = \copy0 - \global\setbox1 = \vsplit3 to \dimen@ - \ifdim\ht3>\dimen@ - \global\advance\dimen@ by 1pt - \repeat - }% - %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}% - \setbox0=\vbox to\dimen@{\unvbox1}% - \setbox2=\vbox to\dimen@{\unvbox3}% - % - \pagesofar -} -\catcode`\@ = \other - - -\message{sectioning,} -% Chapters, sections, etc. - -% Let's start with @part. -\outer\parseargdef\part{\partzzz{#1}} -\def\partzzz#1{% - \chapoddpage - \null - \vskip.3\vsize % move it down on the page a bit - \begingroup - \noindent \titlefonts\rmisbold #1\par % the text - \let\lastnode=\empty % no node to associate with - \writetocentry{part}{#1}{}% but put it in the toc - \headingsoff % no headline or footline on the part page - \chapoddpage - \endgroup -} - -% \unnumberedno is an oxymoron. But we count the unnumbered -% sections so that we can refer to them unambiguously in the pdf -% outlines by their "section number". We avoid collisions with chapter -% numbers by starting them at 10000. (If a document ever has 10000 -% chapters, we're in trouble anyway, I'm sure.) -\newcount\unnumberedno \unnumberedno = 10000 -\newcount\chapno -\newcount\secno \secno=0 -\newcount\subsecno \subsecno=0 -\newcount\subsubsecno \subsubsecno=0 - -% This counter is funny since it counts through charcodes of letters A, B, ... -\newcount\appendixno \appendixno = `\@ -% -% \def\appendixletter{\char\the\appendixno} -% We do the following ugly conditional instead of the above simple -% construct for the sake of pdftex, which needs the actual -% letter in the expansion, not just typeset. -% -\def\appendixletter{% - \ifnum\appendixno=`A A% - \else\ifnum\appendixno=`B B% - \else\ifnum\appendixno=`C C% - \else\ifnum\appendixno=`D D% - \else\ifnum\appendixno=`E E% - \else\ifnum\appendixno=`F F% - \else\ifnum\appendixno=`G G% - \else\ifnum\appendixno=`H H% - \else\ifnum\appendixno=`I I% - \else\ifnum\appendixno=`J J% - \else\ifnum\appendixno=`K K% - \else\ifnum\appendixno=`L L% - \else\ifnum\appendixno=`M M% - \else\ifnum\appendixno=`N N% - \else\ifnum\appendixno=`O O% - \else\ifnum\appendixno=`P P% - \else\ifnum\appendixno=`Q Q% - \else\ifnum\appendixno=`R R% - \else\ifnum\appendixno=`S S% - \else\ifnum\appendixno=`T T% - \else\ifnum\appendixno=`U U% - \else\ifnum\appendixno=`V V% - \else\ifnum\appendixno=`W W% - \else\ifnum\appendixno=`X X% - \else\ifnum\appendixno=`Y Y% - \else\ifnum\appendixno=`Z Z% - % The \the is necessary, despite appearances, because \appendixletter is - % expanded while writing the .toc file. \char\appendixno is not - % expandable, thus it is written literally, thus all appendixes come out - % with the same letter (or @) in the toc without it. - \else\char\the\appendixno - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} - -% Each @chapter defines these (using marks) as the number+name, number -% and name of the chapter. Page headings and footings can use -% these. @section does likewise. -\def\thischapter{} -\def\thischapternum{} -\def\thischaptername{} -\def\thissection{} -\def\thissectionnum{} -\def\thissectionname{} - -\newcount\absseclevel % used to calculate proper heading level -\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count - -% @raisesections: treat @section as chapter, @subsection as section, etc. -\def\raisesections{\global\advance\secbase by -1} -\let\up=\raisesections % original BFox name - -% @lowersections: treat @chapter as section, @section as subsection, etc. -\def\lowersections{\global\advance\secbase by 1} -\let\down=\lowersections % original BFox name - -% we only have subsub. -\chardef\maxseclevel = 3 -% -% A numbered section within an unnumbered changes to unnumbered too. -% To achieve this, remember the "biggest" unnum. sec. we are currently in: -\chardef\unnlevel = \maxseclevel -% -% Trace whether the current chapter is an appendix or not: -% \chapheadtype is "N" or "A", unnumbered chapters are ignored. -\def\chapheadtype{N} - -% Choose a heading macro -% #1 is heading type -% #2 is heading level -% #3 is text for heading -\def\genhead#1#2#3{% - % Compute the abs. sec. level: - \absseclevel=#2 - \advance\absseclevel by \secbase - % Make sure \absseclevel doesn't fall outside the range: - \ifnum \absseclevel < 0 - \absseclevel = 0 - \else - \ifnum \absseclevel > 3 - \absseclevel = 3 - \fi - \fi - % The heading type: - \def\headtype{#1}% - \if \headtype U% - \ifnum \absseclevel < \unnlevel - \chardef\unnlevel = \absseclevel - \fi - \else - % Check for appendix sections: - \ifnum \absseclevel = 0 - \edef\chapheadtype{\headtype}% - \else - \if \headtype A\if \chapheadtype N% - \errmessage{@appendix... within a non-appendix chapter}% - \fi\fi - \fi - % Check for numbered within unnumbered: - \ifnum \absseclevel > \unnlevel - \def\headtype{U}% - \else - \chardef\unnlevel = 3 - \fi - \fi - % Now print the heading: - \if \headtype U% - \ifcase\absseclevel - \unnumberedzzz{#3}% - \or \unnumberedseczzz{#3}% - \or \unnumberedsubseczzz{#3}% - \or \unnumberedsubsubseczzz{#3}% - \fi - \else - \if \headtype A% - \ifcase\absseclevel - \appendixzzz{#3}% - \or \appendixsectionzzz{#3}% - \or \appendixsubseczzz{#3}% - \or \appendixsubsubseczzz{#3}% - \fi - \else - \ifcase\absseclevel - \chapterzzz{#3}% - \or \seczzz{#3}% - \or \numberedsubseczzz{#3}% - \or \numberedsubsubseczzz{#3}% - \fi - \fi - \fi - \suppressfirstparagraphindent -} - -% an interface: -\def\numhead{\genhead N} -\def\apphead{\genhead A} -\def\unnmhead{\genhead U} - -% @chapter, @appendix, @unnumbered. Increment top-level counter, reset -% all lower-level sectioning counters to zero. -% -% Also set \chaplevelprefix, which we prepend to @float sequence numbers -% (e.g., figures), q.v. By default (before any chapter), that is empty. -\let\chaplevelprefix = \empty -% -\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz -\def\chapterzzz#1{% - % section resetting is \global in case the chapter is in a group, such - % as an @include file. - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\chapno by 1 - % - % Used for \float. - \gdef\chaplevelprefix{\the\chapno.}% - \resetallfloatnos - % - % \putwordChapter can contain complex things in translations. - \toks0=\expandafter{\putwordChapter}% - \message{\the\toks0 \space \the\chapno}% - % - % Write the actual heading. - \chapmacro{#1}{Ynumbered}{\the\chapno}% - % - % So @section and the like are numbered underneath this chapter. - \global\let\section = \numberedsec - \global\let\subsection = \numberedsubsec - \global\let\subsubsection = \numberedsubsubsec -} - -\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz -% -\def\appendixzzz#1{% - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\appendixno by 1 - \gdef\chaplevelprefix{\appendixletter.}% - \resetallfloatnos - % - % \putwordAppendix can contain complex things in translations. - \toks0=\expandafter{\putwordAppendix}% - \message{\the\toks0 \space \appendixletter}% - % - \chapmacro{#1}{Yappendix}{\appendixletter}% - % - \global\let\section = \appendixsec - \global\let\subsection = \appendixsubsec - \global\let\subsubsection = \appendixsubsubsec -} - -% normally unnmhead0 calls unnumberedzzz: -\outer\parseargdef\unnumbered{\unnmhead0{#1}} -\def\unnumberedzzz#1{% - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\unnumberedno by 1 - % - % Since an unnumbered has no number, no prefix for figures. - \global\let\chaplevelprefix = \empty - \resetallfloatnos - % - % This used to be simply \message{#1}, but TeX fully expands the - % argument to \message. Therefore, if #1 contained @-commands, TeX - % expanded them. For example, in `@unnumbered The @cite{Book}', TeX - % expanded @cite (which turns out to cause errors because \cite is meant - % to be executed, not expanded). - % - % Anyway, we don't want the fully-expanded definition of @cite to appear - % as a result of the \message, we just want `@cite' itself. We use - % \the to achieve this: TeX expands \the only once, - % simply yielding the contents of . (We also do this for - % the toc entries.) - \toks0 = {#1}% - \message{(\the\toks0)}% - % - \chapmacro{#1}{Ynothing}{\the\unnumberedno}% - % - \global\let\section = \unnumberedsec - \global\let\subsection = \unnumberedsubsec - \global\let\subsubsection = \unnumberedsubsubsec -} - -% @centerchap is like @unnumbered, but the heading is centered. -\outer\parseargdef\centerchap{% - % Well, we could do the following in a group, but that would break - % an assumption that \chapmacro is called at the outermost level. - % Thus we are safer this way: --kasal, 24feb04 - \let\centerparametersmaybe = \centerparameters - \unnmhead0{#1}% - \let\centerparametersmaybe = \relax -} - -% @top is like @unnumbered. -\let\top\unnumbered - -% Sections. -% -\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz -\def\seczzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}% -} - -% normally calls appendixsectionzzz: -\outer\parseargdef\appendixsection{\apphead1{#1}} -\def\appendixsectionzzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}% -} -\let\appendixsec\appendixsection - -% normally calls unnumberedseczzz: -\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} -\def\unnumberedseczzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% -} - -% Subsections. -% -% normally calls numberedsubseczzz: -\outer\parseargdef\numberedsubsec{\numhead2{#1}} -\def\numberedsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}% -} - -% normally calls appendixsubseczzz: -\outer\parseargdef\appendixsubsec{\apphead2{#1}} -\def\appendixsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Yappendix}% - {\appendixletter.\the\secno.\the\subsecno}% -} - -% normally calls unnumberedsubseczzz: -\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} -\def\unnumberedsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Ynothing}% - {\the\unnumberedno.\the\secno.\the\subsecno}% -} - -% Subsubsections. -% -% normally numberedsubsubseczzz: -\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} -\def\numberedsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Ynumbered}% - {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -% normally appendixsubsubseczzz: -\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} -\def\appendixsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Yappendix}% - {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -% normally unnumberedsubsubseczzz: -\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} -\def\unnumberedsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Ynothing}% - {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -% These macros control what the section commands do, according -% to what kind of chapter we are in (ordinary, appendix, or unnumbered). -% Define them by default for a numbered chapter. -\let\section = \numberedsec -\let\subsection = \numberedsubsec -\let\subsubsection = \numberedsubsubsec - -% Define @majorheading, @heading and @subheading - -\def\majorheading{% - {\advance\chapheadingskip by 10pt \chapbreak }% - \parsearg\chapheadingzzz -} - -\def\chapheading{\chapbreak \parsearg\chapheadingzzz} -\def\chapheadingzzz#1{% - \vbox{\chapfonts \raggedtitlesettings #1\par}% - \nobreak\bigskip \nobreak - \suppressfirstparagraphindent -} - -% @heading, @subheading, @subsubheading. -\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} -\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} -\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} - -% These macros generate a chapter, section, etc. heading only -% (including whitespace, linebreaking, etc. around it), -% given all the information in convenient, parsed form. - -% Args are the skip and penalty (usually negative) -\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi} - -% Parameter controlling skip before chapter headings (if needed) -\newskip\chapheadingskip - -% Define plain chapter starts, and page on/off switching for it. -\def\chapbreak{\dobreak \chapheadingskip {-4000}} -\def\chappager{\par\vfill\supereject} -% Because \domark is called before \chapoddpage, the filler page will -% get the headings for the next chapter, which is wrong. But we don't -% care -- we just disable all headings on the filler page. -\def\chapoddpage{% - \chappager - \ifodd\pageno \else - \begingroup - \headingsoff - \null - \chappager - \endgroup - \fi -} - -\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} - -\def\CHAPPAGoff{% -\global\let\contentsalignmacro = \chappager -\global\let\pchapsepmacro=\chapbreak -\global\let\pagealignmacro=\chappager} - -\def\CHAPPAGon{% -\global\let\contentsalignmacro = \chappager -\global\let\pchapsepmacro=\chappager -\global\let\pagealignmacro=\chappager -\global\def\HEADINGSon{\HEADINGSsingle}} - -\def\CHAPPAGodd{% -\global\let\contentsalignmacro = \chapoddpage -\global\let\pchapsepmacro=\chapoddpage -\global\let\pagealignmacro=\chapoddpage -\global\def\HEADINGSon{\HEADINGSdouble}} - -\CHAPPAGon - -% Chapter opening. -% -% #1 is the text, #2 is the section type (Ynumbered, Ynothing, -% Yappendix, Yomitfromtoc), #3 the chapter number. -% -% To test against our argument. -\def\Ynothingkeyword{Ynothing} -\def\Yomitfromtockeyword{Yomitfromtoc} -\def\Yappendixkeyword{Yappendix} -% -\def\chapmacro#1#2#3{% - % Insert the first mark before the heading break (see notes for \domark). - \let\prevchapterdefs=\lastchapterdefs - \let\prevsectiondefs=\lastsectiondefs - \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}% - \gdef\thissection{}}% - % - \def\temptype{#2}% - \ifx\temptype\Ynothingkeyword - \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% - \gdef\thischapter{\thischaptername}}% - \else\ifx\temptype\Yomitfromtockeyword - \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% - \gdef\thischapter{}}% - \else\ifx\temptype\Yappendixkeyword - \toks0={#1}% - \xdef\lastchapterdefs{% - \gdef\noexpand\thischaptername{\the\toks0}% - \gdef\noexpand\thischapternum{\appendixletter}% - % \noexpand\putwordAppendix avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thischapter{\noexpand\putwordAppendix{} - \noexpand\thischapternum: - \noexpand\thischaptername}% - }% - \else - \toks0={#1}% - \xdef\lastchapterdefs{% - \gdef\noexpand\thischaptername{\the\toks0}% - \gdef\noexpand\thischapternum{\the\chapno}% - % \noexpand\putwordChapter avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thischapter{\noexpand\putwordChapter{} - \noexpand\thischapternum: - \noexpand\thischaptername}% - }% - \fi\fi\fi - % - % Output the mark. Pass it through \safewhatsit, to take care of - % the preceding space. - \safewhatsit\domark - % - % Insert the chapter heading break. - \pchapsepmacro - % - % Now the second mark, after the heading break. No break points - % between here and the heading. - \let\prevchapterdefs=\lastchapterdefs - \let\prevsectiondefs=\lastsectiondefs - \domark - % - {% - \chapfonts \rmisbold - % - % Have to define \lastsection before calling \donoderef, because the - % xref code eventually uses it. On the other hand, it has to be called - % after \pchapsepmacro, or the headline will change too soon. - \gdef\lastsection{#1}% - % - % Only insert the separating space if we have a chapter/appendix - % number, and don't print the unnumbered ``number''. - \ifx\temptype\Ynothingkeyword - \setbox0 = \hbox{}% - \def\toctype{unnchap}% - \else\ifx\temptype\Yomitfromtockeyword - \setbox0 = \hbox{}% contents like unnumbered, but no toc entry - \def\toctype{omit}% - \else\ifx\temptype\Yappendixkeyword - \setbox0 = \hbox{\putwordAppendix{} #3\enspace}% - \def\toctype{app}% - \else - \setbox0 = \hbox{#3\enspace}% - \def\toctype{numchap}% - \fi\fi\fi - % - % Write the toc entry for this chapter. Must come before the - % \donoderef, because we include the current node name in the toc - % entry, and \donoderef resets it to empty. - \writetocentry{\toctype}{#1}{#3}% - % - % For pdftex, we have to write out the node definition (aka, make - % the pdfdest) after any page break, but before the actual text has - % been typeset. If the destination for the pdf outline is after the - % text, then jumping from the outline may wind up with the text not - % being visible, for instance under high magnification. - \donoderef{#2}% - % - % Typeset the actual heading. - \nobreak % Avoid page breaks at the interline glue. - \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe - \unhbox0 #1\par}% - }% - \nobreak\bigskip % no page break after a chapter title - \nobreak -} - -% @centerchap -- centered and unnumbered. -\let\centerparametersmaybe = \relax -\def\centerparameters{% - \advance\rightskip by 3\rightskip - \leftskip = \rightskip - \parfillskip = 0pt -} - - -% I don't think this chapter style is supported any more, so I'm not -% updating it with the new noderef stuff. We'll see. --karl, 11aug03. -% -\def\setchapterstyle #1 {\csname CHAPF#1\endcsname} -% -\def\unnchfopen #1{% - \chapoddpage - \vbox{\chapfonts \raggedtitlesettings #1\par}% - \nobreak\bigskip\nobreak -} -\def\chfopen #1#2{\chapoddpage {\chapfonts -\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% -\par\penalty 5000 % -} -\def\centerchfopen #1{% - \chapoddpage - \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}% - \nobreak\bigskip \nobreak -} -\def\CHAPFopen{% - \global\let\chapmacro=\chfopen - \global\let\centerchapmacro=\centerchfopen} - - -% Section titles. These macros combine the section number parts and -% call the generic \sectionheading to do the printing. -% -\newskip\secheadingskip -\def\secheadingbreak{\dobreak \secheadingskip{-1000}} - -% Subsection titles. -\newskip\subsecheadingskip -\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}} - -% Subsubsection titles. -\def\subsubsecheadingskip{\subsecheadingskip} -\def\subsubsecheadingbreak{\subsecheadingbreak} - - -% Print any size, any type, section title. -% -% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is -% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the -% section number. -% -\def\seckeyword{sec} -% -\def\sectionheading#1#2#3#4{% - {% - \checkenv{}% should not be in an environment. - % - % Switch to the right set of fonts. - \csname #2fonts\endcsname \rmisbold - % - \def\sectionlevel{#2}% - \def\temptype{#3}% - % - % Insert first mark before the heading break (see notes for \domark). - \let\prevsectiondefs=\lastsectiondefs - \ifx\temptype\Ynothingkeyword - \ifx\sectionlevel\seckeyword - \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}% - \gdef\thissection{\thissectionname}}% - \fi - \else\ifx\temptype\Yomitfromtockeyword - % Don't redefine \thissection. - \else\ifx\temptype\Yappendixkeyword - \ifx\sectionlevel\seckeyword - \toks0={#1}% - \xdef\lastsectiondefs{% - \gdef\noexpand\thissectionname{\the\toks0}% - \gdef\noexpand\thissectionnum{#4}% - % \noexpand\putwordSection avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thissection{\noexpand\putwordSection{} - \noexpand\thissectionnum: - \noexpand\thissectionname}% - }% - \fi - \else - \ifx\sectionlevel\seckeyword - \toks0={#1}% - \xdef\lastsectiondefs{% - \gdef\noexpand\thissectionname{\the\toks0}% - \gdef\noexpand\thissectionnum{#4}% - % \noexpand\putwordSection avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thissection{\noexpand\putwordSection{} - \noexpand\thissectionnum: - \noexpand\thissectionname}% - }% - \fi - \fi\fi\fi - % - % Go into vertical mode. Usually we'll already be there, but we - % don't want the following whatsit to end up in a preceding paragraph - % if the document didn't happen to have a blank line. - \par - % - % Output the mark. Pass it through \safewhatsit, to take care of - % the preceding space. - \safewhatsit\domark - % - % Insert space above the heading. - \csname #2headingbreak\endcsname - % - % Now the second mark, after the heading break. No break points - % between here and the heading. - \let\prevsectiondefs=\lastsectiondefs - \domark - % - % Only insert the space after the number if we have a section number. - \ifx\temptype\Ynothingkeyword - \setbox0 = \hbox{}% - \def\toctype{unn}% - \gdef\lastsection{#1}% - \else\ifx\temptype\Yomitfromtockeyword - % for @headings -- no section number, don't include in toc, - % and don't redefine \lastsection. - \setbox0 = \hbox{}% - \def\toctype{omit}% - \let\sectionlevel=\empty - \else\ifx\temptype\Yappendixkeyword - \setbox0 = \hbox{#4\enspace}% - \def\toctype{app}% - \gdef\lastsection{#1}% - \else - \setbox0 = \hbox{#4\enspace}% - \def\toctype{num}% - \gdef\lastsection{#1}% - \fi\fi\fi - % - % Write the toc entry (before \donoderef). See comments in \chapmacro. - \writetocentry{\toctype\sectionlevel}{#1}{#4}% - % - % Write the node reference (= pdf destination for pdftex). - % Again, see comments in \chapmacro. - \donoderef{#3}% - % - % Interline glue will be inserted when the vbox is completed. - % That glue will be a valid breakpoint for the page, since it'll be - % preceded by a whatsit (usually from the \donoderef, or from the - % \writetocentry if there was no node). We don't want to allow that - % break, since then the whatsits could end up on page n while the - % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000. - \nobreak - % - % Output the actual section heading. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright - \hangindent=\wd0 % zero if no section number - \unhbox0 #1}% - }% - % Add extra space after the heading -- half of whatever came above it. - % Don't allow stretch, though. - \kern .5 \csname #2headingskip\endcsname - % - % Do not let the kern be a potential breakpoint, as it would be if it - % was followed by glue. - \nobreak - % - % We'll almost certainly start a paragraph next, so don't let that - % glue accumulate. (Not a breakpoint because it's preceded by a - % discardable item.) However, when a paragraph is not started next - % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out - % or the negative glue will cause weirdly wrong output, typically - % obscuring the section heading with something else. - \vskip-\parskip - % - % This is so the last item on the main vertical list is a known - % \penalty > 10000, so \startdefun, etc., can recognize the situation - % and do the needful. - \penalty 10001 -} - - -\message{toc,} -% Table of contents. -\newwrite\tocfile - -% Write an entry to the toc file, opening it if necessary. -% Called from @chapter, etc. -% -% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno} -% We append the current node name (if any) and page number as additional -% arguments for the \{chap,sec,...}entry macros which will eventually -% read this. The node name is used in the pdf outlines as the -% destination to jump to. -% -% We open the .toc file for writing here instead of at @setfilename (or -% any other fixed time) so that @contents can be anywhere in the document. -% But if #1 is `omit', then we don't do anything. This is used for the -% table of contents chapter openings themselves. -% -\newif\iftocfileopened -\def\omitkeyword{omit}% -% -\def\writetocentry#1#2#3{% - \edef\writetoctype{#1}% - \ifx\writetoctype\omitkeyword \else - \iftocfileopened\else - \immediate\openout\tocfile = \jobname.toc - \global\tocfileopenedtrue - \fi - % - \iflinks - {\atdummies - \edef\temp{% - \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}% - \temp - }% - \fi - \fi - % - % Tell \shipout to create a pdf destination on each page, if we're - % writing pdf. These are used in the table of contents. We can't - % just write one on every page because the title pages are numbered - % 1 and 2 (the page numbers aren't printed), and so are the first - % two pages of the document. Thus, we'd have two destinations named - % `1', and two named `2'. - \ifpdf \global\pdfmakepagedesttrue \fi -} - - -% These characters do not print properly in the Computer Modern roman -% fonts, so we must take special care. This is more or less redundant -% with the Texinfo input format setup at the end of this file. -% -\def\activecatcodes{% - \catcode`\"=\active - \catcode`\$=\active - \catcode`\<=\active - \catcode`\>=\active - \catcode`\\=\active - \catcode`\^=\active - \catcode`\_=\active - \catcode`\|=\active - \catcode`\~=\active -} - - -% Read the toc file, which is essentially Texinfo input. -\def\readtocfile{% - \setupdatafile - \activecatcodes - \input \tocreadfilename -} - -\newskip\contentsrightmargin \contentsrightmargin=1in -\newcount\savepageno -\newcount\lastnegativepageno \lastnegativepageno = -1 - -% Prepare to read what we've written to \tocfile. -% -\def\startcontents#1{% - % If @setchapternewpage on, and @headings double, the contents should - % start on an odd page, unlike chapters. Thus, we maintain - % \contentsalignmacro in parallel with \pagealignmacro. - % From: Torbjorn Granlund - \contentsalignmacro - \immediate\closeout\tocfile - % - % Don't need to put `Contents' or `Short Contents' in the headline. - % It is abundantly clear what they are. - \chapmacro{#1}{Yomitfromtoc}{}% - % - \savepageno = \pageno - \begingroup % Set up to handle contents files properly. - \raggedbottom % Worry more about breakpoints than the bottom. - \advance\hsize by -\contentsrightmargin % Don't use the full line length. - % - % Roman numerals for page numbers. - \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi -} - -% redefined for the two-volume lispref. We always output on -% \jobname.toc even if this is redefined. -% -\def\tocreadfilename{\jobname.toc} - -% Normal (long) toc. -% -\def\contents{% - \startcontents{\putwordTOC}% - \openin 1 \tocreadfilename\space - \ifeof 1 \else - \readtocfile - \fi - \vfill \eject - \contentsalignmacro % in case @setchapternewpage odd is in effect - \ifeof 1 \else - \pdfmakeoutlines - \fi - \closein 1 - \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno -} - -% And just the chapters. -\def\summarycontents{% - \startcontents{\putwordShortTOC}% - % - \let\partentry = \shortpartentry - \let\numchapentry = \shortchapentry - \let\appentry = \shortchapentry - \let\unnchapentry = \shortunnchapentry - % We want a true roman here for the page numbers. - \secfonts - \let\rm=\shortcontrm \let\bf=\shortcontbf - \let\sl=\shortcontsl \let\tt=\shortconttt - \rm - \hyphenpenalty = 10000 - \advance\baselineskip by 1pt % Open it up a little. - \def\numsecentry##1##2##3##4{} - \let\appsecentry = \numsecentry - \let\unnsecentry = \numsecentry - \let\numsubsecentry = \numsecentry - \let\appsubsecentry = \numsecentry - \let\unnsubsecentry = \numsecentry - \let\numsubsubsecentry = \numsecentry - \let\appsubsubsecentry = \numsecentry - \let\unnsubsubsecentry = \numsecentry - \openin 1 \tocreadfilename\space - \ifeof 1 \else - \readtocfile - \fi - \closein 1 - \vfill \eject - \contentsalignmacro % in case @setchapternewpage odd is in effect - \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno -} -\let\shortcontents = \summarycontents - -% Typeset the label for a chapter or appendix for the short contents. -% The arg is, e.g., `A' for an appendix, or `3' for a chapter. -% -\def\shortchaplabel#1{% - % This space should be enough, since a single number is .5em, and the - % widest letter (M) is 1em, at least in the Computer Modern fonts. - % But use \hss just in case. - % (This space doesn't include the extra space that gets added after - % the label; that gets put in by \shortchapentry above.) - % - % We'd like to right-justify chapter numbers, but that looks strange - % with appendix letters. And right-justifying numbers and - % left-justifying letters looks strange when there is less than 10 - % chapters. Have to read the whole toc once to know how many chapters - % there are before deciding ... - \hbox to 1em{#1\hss}% -} - -% These macros generate individual entries in the table of contents. -% The first argument is the chapter or section name. -% The last argument is the page number. -% The arguments in between are the chapter number, section number, ... - -% Parts, in the main contents. Replace the part number, which doesn't -% exist, with an empty box. Let's hope all the numbers have the same width. -% Also ignore the page number, which is conventionally not printed. -\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} -\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}} -% -% Parts, in the short toc. -\def\shortpartentry#1#2#3#4{% - \penalty-300 - \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip - \shortchapentry{{\bf #1}}{\numeralbox}{}{}% -} - -% Chapters, in the main contents. -\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}} -% -% Chapters, in the short toc. -% See comments in \dochapentry re vbox and related settings. -\def\shortchapentry#1#2#3#4{% - \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}% -} - -% Appendices, in the main contents. -% Need the word Appendix, and a fixed-size box. -% -\def\appendixbox#1{% - % We use M since it's probably the widest letter. - \setbox0 = \hbox{\putwordAppendix{} M}% - \hbox to \wd0{\putwordAppendix{} #1\hss}} -% -\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}} - -% Unnumbered chapters. -\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}} -\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}} - -% Sections. -\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}} -\let\appsecentry=\numsecentry -\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}} - -% Subsections. -\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}} -\let\appsubsecentry=\numsubsecentry -\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}} - -% And subsubsections. -\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}} -\let\appsubsubsecentry=\numsubsubsecentry -\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}} - -% This parameter controls the indentation of the various levels. -% Same as \defaultparindent. -\newdimen\tocindent \tocindent = 15pt - -% Now for the actual typesetting. In all these, #1 is the text and #2 is the -% page number. -% -% If the toc has to be broken over pages, we want it to be at chapters -% if at all possible; hence the \penalty. -\def\dochapentry#1#2{% - \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip - \begingroup - \chapentryfonts - \tocentry{#1}{\dopageno\bgroup#2\egroup}% - \endgroup - \nobreak\vskip .25\baselineskip plus.1\baselineskip -} - -\def\dosecentry#1#2{\begingroup - \secentryfonts \leftskip=\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -\def\dosubsecentry#1#2{\begingroup - \subsecentryfonts \leftskip=2\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -\def\dosubsubsecentry#1#2{\begingroup - \subsubsecentryfonts \leftskip=3\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -% We use the same \entry macro as for the index entries. -\let\tocentry = \entry - -% Space between chapter (or whatever) number and the title. -\def\labelspace{\hskip1em \relax} - -\def\dopageno#1{{\rm #1}} -\def\doshortpageno#1{{\rm #1}} - -\def\chapentryfonts{\secfonts \rm} -\def\secentryfonts{\textfonts} -\def\subsecentryfonts{\textfonts} -\def\subsubsecentryfonts{\textfonts} - - -\message{environments,} -% @foo ... @end foo. - -% @tex ... @end tex escapes into raw TeX temporarily. -% One exception: @ is still an escape character, so that @end tex works. -% But \@ or @@ will get a plain @ character. - -\envdef\tex{% - \setupmarkupstyle{tex}% - \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 - \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 - \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie - \catcode `\%=14 - \catcode `\+=\other - \catcode `\"=\other - \catcode `\|=\other - \catcode `\<=\other - \catcode `\>=\other - \catcode`\`=\other - \catcode`\'=\other - \escapechar=`\\ - % - % ' is active in math mode (mathcode"8000). So reset it, and all our - % other math active characters (just in case), to plain's definitions. - \mathactive - % - \let\b=\ptexb - \let\bullet=\ptexbullet - \let\c=\ptexc - \let\,=\ptexcomma - \let\.=\ptexdot - \let\dots=\ptexdots - \let\equiv=\ptexequiv - \let\!=\ptexexclam - \let\i=\ptexi - \let\indent=\ptexindent - \let\noindent=\ptexnoindent - \let\{=\ptexlbrace - \let\+=\tabalign - \let\}=\ptexrbrace - \let\/=\ptexslash - \let\*=\ptexstar - \let\t=\ptext - \expandafter \let\csname top\endcsname=\ptextop % outer - \let\frenchspacing=\plainfrenchspacing - % - \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% - \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}% - \def\@{@}% -} -% There is no need to define \Etex. - -% Define @lisp ... @end lisp. -% @lisp environment forms a group so it can rebind things, -% including the definition of @end lisp (which normally is erroneous). - -% Amount to narrow the margins by for @lisp. -\newskip\lispnarrowing \lispnarrowing=0.4in - -% This is the definition that ^^M gets inside @lisp, @example, and other -% such environments. \null is better than a space, since it doesn't -% have any width. -\def\lisppar{\null\endgraf} - -% This space is always present above and below environments. -\newskip\envskipamount \envskipamount = 0pt - -% Make spacing and below environment symmetrical. We use \parskip here -% to help in doing that, since in @example-like environments \parskip -% is reset to zero; thus the \afterenvbreak inserts no space -- but the -% start of the next paragraph will insert \parskip. -% -\def\aboveenvbreak{{% - % =10000 instead of <10000 because of a special case in \itemzzz and - % \sectionheading, q.v. - \ifnum \lastpenalty=10000 \else - \advance\envskipamount by \parskip - \endgraf - \ifdim\lastskip<\envskipamount - \removelastskip - % it's not a good place to break if the last penalty was \nobreak - % or better ... - \ifnum\lastpenalty<10000 \penalty-50 \fi - \vskip\envskipamount - \fi - \fi -}} - -\let\afterenvbreak = \aboveenvbreak - -% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will -% also clear it, so that its embedded environments do the narrowing again. -\let\nonarrowing=\relax - -% @cartouche ... @end cartouche: draw rectangle w/rounded corners around -% environment contents. -\font\circle=lcircle10 -\newdimen\circthick -\newdimen\cartouter\newdimen\cartinner -\newskip\normbskip\newskip\normpskip\newskip\normlskip -\circthick=\fontdimen8\circle -% -\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth -\def\ctr{{\hskip 6pt\circle\char'010}} -\def\cbl{{\circle\char'012\hskip -6pt}} -\def\cbr{{\hskip 6pt\circle\char'011}} -\def\carttop{\hbox to \cartouter{\hskip\lskip - \ctl\leaders\hrule height\circthick\hfil\ctr - \hskip\rskip}} -\def\cartbot{\hbox to \cartouter{\hskip\lskip - \cbl\leaders\hrule height\circthick\hfil\cbr - \hskip\rskip}} -% -\newskip\lskip\newskip\rskip - -\envdef\cartouche{% - \ifhmode\par\fi % can't be in the midst of a paragraph. - \startsavinginserts - \lskip=\leftskip \rskip=\rightskip - \leftskip=0pt\rightskip=0pt % we want these *outside*. - \cartinner=\hsize \advance\cartinner by-\lskip - \advance\cartinner by-\rskip - \cartouter=\hsize - \advance\cartouter by 18.4pt % allow for 3pt kerns on either - % side, and for 6pt waste from - % each corner char, and rule thickness - \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip - % Flag to tell @lisp, etc., not to narrow margin. - \let\nonarrowing = t% - % - % If this cartouche directly follows a sectioning command, we need the - % \parskip glue (backspaced over by default) or the cartouche can - % collide with the section heading. - \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi - % - \vbox\bgroup - \baselineskip=0pt\parskip=0pt\lineskip=0pt - \carttop - \hbox\bgroup - \hskip\lskip - \vrule\kern3pt - \vbox\bgroup - \kern3pt - \hsize=\cartinner - \baselineskip=\normbskip - \lineskip=\normlskip - \parskip=\normpskip - \vskip -\parskip - \comment % For explanation, see the end of def\group. -} -\def\Ecartouche{% - \ifhmode\par\fi - \kern3pt - \egroup - \kern3pt\vrule - \hskip\rskip - \egroup - \cartbot - \egroup - \checkinserts -} - - -% This macro is called at the beginning of all the @example variants, -% inside a group. -\newdimen\nonfillparindent -\def\nonfillstart{% - \aboveenvbreak - \hfuzz = 12pt % Don't be fussy - \sepspaces % Make spaces be word-separators rather than space tokens. - \let\par = \lisppar % don't ignore blank lines - \obeylines % each line of input is a line of output - \parskip = 0pt - % Turn off paragraph indentation but redefine \indent to emulate - % the normal \indent. - \nonfillparindent=\parindent - \parindent = 0pt - \let\indent\nonfillindent - % - \emergencystretch = 0pt % don't try to avoid overfull boxes - \ifx\nonarrowing\relax - \advance \leftskip by \lispnarrowing - \exdentamount=\lispnarrowing - \else - \let\nonarrowing = \relax - \fi - \let\exdent=\nofillexdent -} - -\begingroup -\obeyspaces -% We want to swallow spaces (but not other tokens) after the fake -% @indent in our nonfill-environments, where spaces are normally -% active and set to @tie, resulting in them not being ignored after -% @indent. -\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}% -\gdef\nonfillindentcheck{% -\ifx\temp % -\expandafter\nonfillindentgobble% -\else% -\leavevmode\nonfillindentbox% -\fi% -}% -\endgroup -\def\nonfillindentgobble#1{\nonfillindent} -\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}} - -% If you want all examples etc. small: @set dispenvsize small. -% If you want even small examples the full size: @set dispenvsize nosmall. -% This affects the following displayed environments: -% @example, @display, @format, @lisp -% -\def\smallword{small} -\def\nosmallword{nosmall} -\let\SETdispenvsize\relax -\def\setnormaldispenv{% - \ifx\SETdispenvsize\smallword - % end paragraph for sake of leading, in case document has no blank - % line. This is redundant with what happens in \aboveenvbreak, but - % we need to do it before changing the fonts, and it's inconvenient - % to change the fonts afterward. - \ifnum \lastpenalty=10000 \else \endgraf \fi - \smallexamplefonts \rm - \fi -} -\def\setsmalldispenv{% - \ifx\SETdispenvsize\nosmallword - \else - \ifnum \lastpenalty=10000 \else \endgraf \fi - \smallexamplefonts \rm - \fi -} - -% We often define two environments, @foo and @smallfoo. -% Let's do it in one command. #1 is the env name, #2 the definition. -\def\makedispenvdef#1#2{% - \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}% - \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}% - \expandafter\let\csname E#1\endcsname \afterenvbreak - \expandafter\let\csname Esmall#1\endcsname \afterenvbreak -} - -% Define two environment synonyms (#1 and #2) for an environment. -\def\maketwodispenvdef#1#2#3{% - \makedispenvdef{#1}{#3}% - \makedispenvdef{#2}{#3}% -} -% -% @lisp: indented, narrowed, typewriter font; -% @example: same as @lisp. -% -% @smallexample and @smalllisp: use smaller fonts. -% Originally contributed by Pavel@xerox. -% -\maketwodispenvdef{lisp}{example}{% - \nonfillstart - \tt\setupmarkupstyle{example}% - \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. - \gobble % eat return -} -% @display/@smalldisplay: same as @lisp except keep current font. -% -\makedispenvdef{display}{% - \nonfillstart - \gobble -} - -% @format/@smallformat: same as @display except don't narrow margins. -% -\makedispenvdef{format}{% - \let\nonarrowing = t% - \nonfillstart - \gobble -} - -% @flushleft: same as @format, but doesn't obey \SETdispenvsize. -\envdef\flushleft{% - \let\nonarrowing = t% - \nonfillstart - \gobble -} -\let\Eflushleft = \afterenvbreak - -% @flushright. -% -\envdef\flushright{% - \let\nonarrowing = t% - \nonfillstart - \advance\leftskip by 0pt plus 1fill\relax - \gobble -} -\let\Eflushright = \afterenvbreak - - -% @raggedright does more-or-less normal line breaking but no right -% justification. From plain.tex. -\envdef\raggedright{% - \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax -} -\let\Eraggedright\par - -\envdef\raggedleft{% - \parindent=0pt \leftskip0pt plus2em - \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt - \hbadness=10000 % Last line will usually be underfull, so turn off - % badness reporting. -} -\let\Eraggedleft\par - -\envdef\raggedcenter{% - \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em - \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt - \hbadness=10000 % Last line will usually be underfull, so turn off - % badness reporting. -} -\let\Eraggedcenter\par - - -% @quotation does normal linebreaking (hence we can't use \nonfillstart) -% and narrows the margins. We keep \parskip nonzero in general, since -% we're doing normal filling. So, when using \aboveenvbreak and -% \afterenvbreak, temporarily make \parskip 0. -% -\makedispenvdef{quotation}{\quotationstart} -% -\def\quotationstart{% - \indentedblockstart % same as \indentedblock, but increase right margin too. - \ifx\nonarrowing\relax - \advance\rightskip by \lispnarrowing - \fi - \parsearg\quotationlabel -} - -% We have retained a nonzero parskip for the environment, since we're -% doing normal filling. -% -\def\Equotation{% - \par - \ifx\quotationauthor\thisisundefined\else - % indent a bit. - \leftline{\kern 2\leftskip \sl ---\quotationauthor}% - \fi - {\parskip=0pt \afterenvbreak}% -} -\def\Esmallquotation{\Equotation} - -% If we're given an argument, typeset it in bold with a colon after. -\def\quotationlabel#1{% - \def\temp{#1}% - \ifx\temp\empty \else - {\bf #1: }% - \fi -} - -% @indentedblock is like @quotation, but indents only on the left and -% has no optional argument. -% -\makedispenvdef{indentedblock}{\indentedblockstart} -% -\def\indentedblockstart{% - {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip - \parindent=0pt - % - % @cartouche defines \nonarrowing to inhibit narrowing at next level down. - \ifx\nonarrowing\relax - \advance\leftskip by \lispnarrowing - \exdentamount = \lispnarrowing - \else - \let\nonarrowing = \relax - \fi -} - -% Keep a nonzero parskip for the environment, since we're doing normal filling. -% -\def\Eindentedblock{% - \par - {\parskip=0pt \afterenvbreak}% -} -\def\Esmallindentedblock{\Eindentedblock} - - -% LaTeX-like @verbatim...@end verbatim and @verb{...} -% If we want to allow any as delimiter, -% we need the curly braces so that makeinfo sees the @verb command, eg: -% `@verbx...x' would look like the '@verbx' command. --janneke@gnu.org -% -% [Knuth]: Donald Ervin Knuth, 1996. The TeXbook. -% -% [Knuth] p.344; only we need to do the other characters Texinfo sets -% active too. Otherwise, they get lost as the first character on a -% verbatim line. -\def\dospecials{% - \do\ \do\\\do\{\do\}\do\$\do\&% - \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~% - \do\<\do\>\do\|\do\@\do+\do\"% - % Don't do the quotes -- if we do, @set txicodequoteundirected and - % @set txicodequotebacktick will not have effect on @verb and - % @verbatim, and ?` and !` ligatures won't get disabled. - %\do\`\do\'% -} -% -% [Knuth] p. 380 -\def\uncatcodespecials{% - \def\do##1{\catcode`##1=\other}\dospecials} -% -% Setup for the @verb command. -% -% Eight spaces for a tab -\begingroup - \catcode`\^^I=\active - \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }} -\endgroup -% -\def\setupverb{% - \tt % easiest (and conventionally used) font for verbatim - \def\par{\leavevmode\endgraf}% - \setupmarkupstyle{verb}% - \tabeightspaces - % Respect line breaks, - % print special symbols as themselves, and - % make each space count - % must do in this order: - \obeylines \uncatcodespecials \sepspaces -} - -% Setup for the @verbatim environment -% -% Real tab expansion. -\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount -% -% We typeset each line of the verbatim in an \hbox, so we can handle -% tabs. The \global is in case the verbatim line starts with an accent, -% or some other command that starts with a begin-group. Otherwise, the -% entire \verbbox would disappear at the corresponding end-group, before -% it is typeset. Meanwhile, we can't have nested verbatim commands -% (can we?), so the \global won't be overwriting itself. -\newbox\verbbox -\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup} -% -\begingroup - \catcode`\^^I=\active - \gdef\tabexpand{% - \catcode`\^^I=\active - \def^^I{\leavevmode\egroup - \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab - \divide\dimen\verbbox by\tabw - \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw - \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw - \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox - }% - } -\endgroup - -% start the verbatim environment. -\def\setupverbatim{% - \let\nonarrowing = t% - \nonfillstart - \tt % easiest (and conventionally used) font for verbatim - % The \leavevmode here is for blank lines. Otherwise, we would - % never \starttabox and the \egroup would end verbatim mode. - \def\par{\leavevmode\egroup\box\verbbox\endgraf}% - \tabexpand - \setupmarkupstyle{verbatim}% - % Respect line breaks, - % print special symbols as themselves, and - % make each space count. - % Must do in this order: - \obeylines \uncatcodespecials \sepspaces - \everypar{\starttabbox}% -} - -% Do the @verb magic: verbatim text is quoted by unique -% delimiter characters. Before first delimiter expect a -% right brace, after last delimiter expect closing brace: -% -% \def\doverb'{'#1'}'{#1} -% -% [Knuth] p. 382; only eat outer {} -\begingroup - \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other - \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next] -\endgroup -% -\def\verb{\begingroup\setupverb\doverb} -% -% -% Do the @verbatim magic: define the macro \doverbatim so that -% the (first) argument ends when '@end verbatim' is reached, ie: -% -% \def\doverbatim#1@end verbatim{#1} -% -% For Texinfo it's a lot easier than for LaTeX, -% because texinfo's \verbatim doesn't stop at '\end{verbatim}': -% we need not redefine '\', '{' and '}'. -% -% Inspired by LaTeX's verbatim command set [latex.ltx] -% -\begingroup - \catcode`\ =\active - \obeylines % - % ignore everything up to the first ^^M, that's the newline at the end - % of the @verbatim input line itself. Otherwise we get an extra blank - % line in the output. - \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}% - % We really want {...\end verbatim} in the body of the macro, but - % without the active space; thus we have to use \xdef and \gobble. -\endgroup -% -\envdef\verbatim{% - \setupverbatim\doverbatim -} -\let\Everbatim = \afterenvbreak - - -% @verbatiminclude FILE - insert text of file in verbatim environment. -% -\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude} -% -\def\doverbatiminclude#1{% - {% - \makevalueexpandable - \setupverbatim - \indexnofonts % Allow `@@' and other weird things in file names. - \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% - \input #1 - \afterenvbreak - }% -} - -% @copying ... @end copying. -% Save the text away for @insertcopying later. -% -% We save the uninterpreted tokens, rather than creating a box. -% Saving the text in a box would be much easier, but then all the -% typesetting commands (@smallbook, font changes, etc.) have to be done -% beforehand -- and a) we want @copying to be done first in the source -% file; b) letting users define the frontmatter in as flexible order as -% possible is very desirable. -% -\def\copying{\checkenv{}\begingroup\scanargctxt\docopying} -\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} -% -\def\insertcopying{% - \begingroup - \parindent = 0pt % paragraph indentation looks wrong on title page - \scanexp\copyingtext - \endgroup -} - - -\message{defuns,} -% @defun etc. - -\newskip\defbodyindent \defbodyindent=.4in -\newskip\defargsindent \defargsindent=50pt -\newskip\deflastargmargin \deflastargmargin=18pt -\newcount\defunpenalty - -% Start the processing of @deffn: -\def\startdefun{% - \ifnum\lastpenalty<10000 - \medbreak - \defunpenalty=10003 % Will keep this @deffn together with the - % following @def command, see below. - \else - % If there are two @def commands in a row, we'll have a \nobreak, - % which is there to keep the function description together with its - % header. But if there's nothing but headers, we need to allow a - % break somewhere. Check specifically for penalty 10002, inserted - % by \printdefunline, instead of 10000, since the sectioning - % commands also insert a nobreak penalty, and we don't want to allow - % a break between a section heading and a defun. - % - % As a further refinement, we avoid "club" headers by signalling - % with penalty of 10003 after the very first @deffn in the - % sequence (see above), and penalty of 10002 after any following - % @def command. - \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi - % - % Similarly, after a section heading, do not allow a break. - % But do insert the glue. - \medskip % preceded by discardable penalty, so not a breakpoint - \fi - % - \parindent=0in - \advance\leftskip by \defbodyindent - \exdentamount=\defbodyindent -} - -\def\dodefunx#1{% - % First, check whether we are in the right environment: - \checkenv#1% - % - % As above, allow line break if we have multiple x headers in a row. - % It's not a great place, though. - \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi - % - % And now, it's time to reuse the body of the original defun: - \expandafter\gobbledefun#1% -} -\def\gobbledefun#1\startdefun{} - -% \printdefunline \deffnheader{text} -% -\def\printdefunline#1#2{% - \begingroup - % call \deffnheader: - #1#2 \endheader - % common ending: - \interlinepenalty = 10000 - \advance\rightskip by 0pt plus 1fil\relax - \endgraf - \nobreak\vskip -\parskip - \penalty\defunpenalty % signal to \startdefun and \dodefunx - % Some of the @defun-type tags do not enable magic parentheses, - % rendering the following check redundant. But we don't optimize. - \checkparencounts - \endgroup -} - -\def\Edefun{\endgraf\medbreak} - -% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; -% the only thing remaining is to define \deffnheader. -% -\def\makedefun#1{% - \expandafter\let\csname E#1\endcsname = \Edefun - \edef\temp{\noexpand\domakedefun - \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}% - \temp -} - -% \domakedefun \deffn \deffnx \deffnheader -% -% Define \deffn and \deffnx, without parameters. -% \deffnheader has to be defined explicitly. -% -\def\domakedefun#1#2#3{% - \envdef#1{% - \startdefun - \doingtypefnfalse % distinguish typed functions from all else - \parseargusing\activeparens{\printdefunline#3}% - }% - \def#2{\dodefunx#1}% - \def#3% -} - -\newif\ifdoingtypefn % doing typed function? -\newif\ifrettypeownline % typeset return type on its own line? - -% @deftypefnnewline on|off says whether the return type of typed functions -% are printed on their own line. This affects @deftypefn, @deftypefun, -% @deftypeop, and @deftypemethod. -% -\parseargdef\deftypefnnewline{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETtxideftypefnnl\endcsname - = \empty - \else\ifx\temp\offword - \expandafter\let\csname SETtxideftypefnnl\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @txideftypefnnl value `\temp', - must be on|off}% - \fi\fi -} - -% Untyped functions: - -% @deffn category name args -\makedefun{deffn}{\deffngeneral{}} - -% @deffn category class name args -\makedefun{defop}#1 {\defopon{#1\ \putwordon}} - -% \defopon {category on}class name args -\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } - -% \deffngeneral {subind}category name args -% -\def\deffngeneral#1#2 #3 #4\endheader{% - % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}. - \dosubind{fn}{\code{#3}}{#1}% - \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% -} - -% Typed functions: - -% @deftypefn category type name args -\makedefun{deftypefn}{\deftypefngeneral{}} - -% @deftypeop category class type name args -\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}} - -% \deftypeopon {category on}class type name args -\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } - -% \deftypefngeneral {subind}category type name args -% -\def\deftypefngeneral#1#2 #3 #4 #5\endheader{% - \dosubind{fn}{\code{#4}}{#1}% - \doingtypefntrue - \defname{#2}{#3}{#4}\defunargs{#5\unskip}% -} - -% Typed variables: - -% @deftypevr category type var args -\makedefun{deftypevr}{\deftypecvgeneral{}} - -% @deftypecv category class type var args -\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}} - -% \deftypecvof {category of}class type var args -\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} } - -% \deftypecvgeneral {subind}category type var args -% -\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{% - \dosubind{vr}{\code{#4}}{#1}% - \defname{#2}{#3}{#4}\defunargs{#5\unskip}% -} - -% Untyped variables: - -% @defvr category var args -\makedefun{defvr}#1 {\deftypevrheader{#1} {} } - -% @defcv category class var args -\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}} - -% \defcvof {category of}class var args -\def\defcvof#1#2 {\deftypecvof{#1}#2 {} } - -% Types: - -% @deftp category name args -\makedefun{deftp}#1 #2 #3\endheader{% - \doind{tp}{\code{#2}}% - \defname{#1}{}{#2}\defunargs{#3\unskip}% -} - -% Remaining @defun-like shortcuts: -\makedefun{defun}{\deffnheader{\putwordDeffunc} } -\makedefun{defmac}{\deffnheader{\putwordDefmac} } -\makedefun{defspec}{\deffnheader{\putwordDefspec} } -\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} } -\makedefun{defvar}{\defvrheader{\putwordDefvar} } -\makedefun{defopt}{\defvrheader{\putwordDefopt} } -\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} } -\makedefun{defmethod}{\defopon\putwordMethodon} -\makedefun{deftypemethod}{\deftypeopon\putwordMethodon} -\makedefun{defivar}{\defcvof\putwordInstanceVariableof} -\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof} - -% \defname, which formats the name of the @def (not the args). -% #1 is the category, such as "Function". -% #2 is the return type, if any. -% #3 is the function name. -% -% We are followed by (but not passed) the arguments, if any. -% -\def\defname#1#2#3{% - \par - % Get the values of \leftskip and \rightskip as they were outside the @def... - \advance\leftskip by -\defbodyindent - % - % Determine if we are typesetting the return type of a typed function - % on a line by itself. - \rettypeownlinefalse - \ifdoingtypefn % doing a typed function specifically? - % then check user option for putting return type on its own line: - \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else - \rettypeownlinetrue - \fi - \fi - % - % How we'll format the category name. Putting it in brackets helps - % distinguish it from the body text that may end up on the next line - % just below it. - \def\temp{#1}% - \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi} - % - % Figure out line sizes for the paragraph shape. We'll always have at - % least two. - \tempnum = 2 - % - % The first line needs space for \box0; but if \rightskip is nonzero, - % we need only space for the part of \box0 which exceeds it: - \dimen0=\hsize \advance\dimen0 by -\wd0 \advance\dimen0 by \rightskip - % - % If doing a return type on its own line, we'll have another line. - \ifrettypeownline - \advance\tempnum by 1 - \def\maybeshapeline{0in \hsize}% - \else - \def\maybeshapeline{}% - \fi - % - % The continuations: - \dimen2=\hsize \advance\dimen2 by -\defargsindent - % - % The final paragraph shape: - \parshape \tempnum 0in \dimen0 \maybeshapeline \defargsindent \dimen2 - % - % Put the category name at the right margin. - \noindent - \hbox to 0pt{% - \hfil\box0 \kern-\hsize - % \hsize has to be shortened this way: - \kern\leftskip - % Intentionally do not respect \rightskip, since we need the space. - }% - % - % Allow all lines to be underfull without complaint: - \tolerance=10000 \hbadness=10000 - \exdentamount=\defbodyindent - {% - % defun fonts. We use typewriter by default (used to be bold) because: - % . we're printing identifiers, they should be in tt in principle. - % . in languages with many accents, such as Czech or French, it's - % common to leave accents off identifiers. The result looks ok in - % tt, but exceedingly strange in rm. - % . we don't want -- and --- to be treated as ligatures. - % . this still does not fix the ?` and !` ligatures, but so far no - % one has made identifiers using them :). - \df \tt - \def\temp{#2}% text of the return type - \ifx\temp\empty\else - \tclose{\temp}% typeset the return type - \ifrettypeownline - % put return type on its own line; prohibit line break following: - \hfil\vadjust{\nobreak}\break - \else - \space % type on same line, so just followed by a space - \fi - \fi % no return type - #3% output function name - }% - {\rm\enskip}% hskip 0.5 em of \tenrm - % - \boldbrax - % arguments will be output next, if any. -} - -% Print arguments in slanted roman (not ttsl), inconsistently with using -% tt for the name. This is because literal text is sometimes needed in -% the argument list (groff manual), and ttsl and tt are not very -% distinguishable. Prevent hyphenation at `-' chars. -% -\def\defunargs#1{% - % use sl by default (not ttsl), - % tt for the names. - \df \sl \hyphenchar\font=0 - % - % On the other hand, if an argument has two dashes (for instance), we - % want a way to get ttsl. We used to recommend @var for that, so - % leave the code in, but it's strange for @var to lead to typewriter. - % Nowadays we recommend @code, since the difference between a ttsl hyphen - % and a tt hyphen is pretty tiny. @code also disables ?` !`. - \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% - #1% - \sl\hyphenchar\font=45 -} - -% We want ()&[] to print specially on the defun line. -% -\def\activeparens{% - \catcode`\(=\active \catcode`\)=\active - \catcode`\[=\active \catcode`\]=\active - \catcode`\&=\active -} - -% Make control sequences which act like normal parenthesis chars. -\let\lparen = ( \let\rparen = ) - -% Be sure that we always have a definition for `(', etc. For example, -% if the fn name has parens in it, \boldbrax will not be in effect yet, -% so TeX would otherwise complain about undefined control sequence. -{ - \activeparens - \global\let(=\lparen \global\let)=\rparen - \global\let[=\lbrack \global\let]=\rbrack - \global\let& = \& - - \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} - \gdef\magicamp{\let&=\amprm} -} - -\newcount\parencount - -% If we encounter &foo, then turn on ()-hacking afterwards -\newif\ifampseen -\def\amprm#1 {\ampseentrue{\bf\ }} - -\def\parenfont{% - \ifampseen - % At the first level, print parens in roman, - % otherwise use the default font. - \ifnum \parencount=1 \rm \fi - \else - % The \sf parens (in \boldbrax) actually are a little bolder than - % the contained text. This is especially needed for [ and ] . - \sf - \fi -} -\def\infirstlevel#1{% - \ifampseen - \ifnum\parencount=1 - #1% - \fi - \fi -} -\def\bfafterword#1 {#1 \bf} - -\def\opnr{% - \global\advance\parencount by 1 - {\parenfont(}% - \infirstlevel \bfafterword -} -\def\clnr{% - {\parenfont)}% - \infirstlevel \sl - \global\advance\parencount by -1 -} - -\newcount\brackcount -\def\lbrb{% - \global\advance\brackcount by 1 - {\bf[}% -} -\def\rbrb{% - {\bf]}% - \global\advance\brackcount by -1 -} - -\def\checkparencounts{% - \ifnum\parencount=0 \else \badparencount \fi - \ifnum\brackcount=0 \else \badbrackcount \fi -} -% these should not use \errmessage; the glibc manual, at least, actually -% has such constructs (when documenting function pointers). -\def\badparencount{% - \message{Warning: unbalanced parentheses in @def...}% - \global\parencount=0 -} -\def\badbrackcount{% - \message{Warning: unbalanced square brackets in @def...}% - \global\brackcount=0 -} - - -\message{macros,} -% @macro. - -% To do this right we need a feature of e-TeX, \scantokens, -% which we arrange to emulate with a temporary file in ordinary TeX. -\ifx\eTeXversion\thisisundefined - \newwrite\macscribble - \def\scantokens#1{% - \toks0={#1}% - \immediate\openout\macscribble=\jobname.tmp - \immediate\write\macscribble{\the\toks0}% - \immediate\closeout\macscribble - \input \jobname.tmp - } -\fi - -\def\scanmacro#1{\begingroup - \newlinechar`\^^M - \let\xeatspaces\eatspaces - % - % Undo catcode changes of \startcontents and \doprintindex - % When called from @insertcopying or (short)caption, we need active - % backslash to get it printed correctly. Previously, we had - % \catcode`\\=\other instead. We'll see whether a problem appears - % with macro expansion. --kasal, 19aug04 - \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ - % - % ... and for \example: - \spaceisspace - % - % The \empty here causes a following catcode 5 newline to be eaten as - % part of reading whitespace after a control sequence. It does not - % eat a catcode 13 newline. There's no good way to handle the two - % cases (untried: maybe e-TeX's \everyeof could help, though plain TeX - % would then have different behavior). See the Macro Details node in - % the manual for the workaround we recommend for macros and - % line-oriented commands. - % - \scantokens{#1\empty}% -\endgroup} - -\def\scanexp#1{% - \edef\temp{\noexpand\scanmacro{#1}}% - \temp -} - -\newcount\paramno % Count of parameters -\newtoks\macname % Macro name -\newif\ifrecursive % Is it recursive? - -% List of all defined macros in the form -% \definedummyword\macro1\definedummyword\macro2... -% Currently is also contains all @aliases; the list can be split -% if there is a need. -\def\macrolist{} - -% Add the macro to \macrolist -\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname} -\def\addtomacrolistxxx#1{% - \toks0 = \expandafter{\macrolist\definedummyword#1}% - \xdef\macrolist{\the\toks0}% -} - -% Utility routines. -% This does \let #1 = #2, with \csnames; that is, -% \let \csname#1\endcsname = \csname#2\endcsname -% (except of course we have to play expansion games). -% -\def\cslet#1#2{% - \expandafter\let - \csname#1\expandafter\endcsname - \csname#2\endcsname -} - -% Trim leading and trailing spaces off a string. -% Concepts from aro-bend problem 15 (see CTAN). -{\catcode`\@=11 -\gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }} -\gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@} -\gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @} -\def\unbrace#1{#1} -\unbrace{\gdef\trim@@@ #1 } #2@{#1} -} - -% Trim a single trailing ^^M off a string. -{\catcode`\^^M=\other \catcode`\Q=3% -\gdef\eatcr #1{\eatcra #1Q^^MQ}% -\gdef\eatcra#1^^MQ{\eatcrb#1Q}% -\gdef\eatcrb#1Q#2Q{#1}% -} - -% Macro bodies are absorbed as an argument in a context where -% all characters are catcode 10, 11 or 12, except \ which is active -% (as in normal texinfo). It is necessary to change the definition of \ -% to recognize macro arguments; this is the job of \mbodybackslash. -% -% Non-ASCII encodings make 8-bit characters active, so un-activate -% them to avoid their expansion. Must do this non-globally, to -% confine the change to the current group. -% -% It's necessary to have hard CRs when the macro is executed. This is -% done by making ^^M (\endlinechar) catcode 12 when reading the macro -% body, and then making it the \newlinechar in \scanmacro. -% -\def\scanctxt{% used as subroutine - \catcode`\"=\other - \catcode`\+=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\@=\other - \catcode`\^=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\~=\other - \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi -} - -\def\scanargctxt{% used for copying and captions, not macros. - \scanctxt - \catcode`\\=\other - \catcode`\^^M=\other -} - -\def\macrobodyctxt{% used for @macro definitions - \scanctxt - \catcode`\{=\other - \catcode`\}=\other - \catcode`\^^M=\other - \usembodybackslash -} - -\def\macroargctxt{% used when scanning invocations - \scanctxt - \catcode`\\=0 -} -% why catcode 0 for \ in the above? To recognize \\ \{ \} as "escapes" -% for the single characters \ { }. Thus, we end up with the "commands" -% that would be written @\ @{ @} in a Texinfo document. -% -% We already have @{ and @}. For @\, we define it here, and only for -% this purpose, to produce a typewriter backslash (so, the @\ that we -% define for @math can't be used with @macro calls): -% -\def\\{\normalbackslash}% -% -% We would like to do this for \, too, since that is what makeinfo does. -% But it is not possible, because Texinfo already has a command @, for a -% cedilla accent. Documents must use @comma{} instead. -% -% \anythingelse will almost certainly be an error of some kind. - - -% \mbodybackslash is the definition of \ in @macro bodies. -% It maps \foo\ => \csname macarg.foo\endcsname => #N -% where N is the macro parameter number. -% We define \csname macarg.\endcsname to be \realbackslash, so -% \\ in macro replacement text gets you a backslash. -% -{\catcode`@=0 @catcode`@\=@active - @gdef@usembodybackslash{@let\=@mbodybackslash} - @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname} -} -\expandafter\def\csname macarg.\endcsname{\realbackslash} - -\def\margbackslash#1{\char`\#1 } - -\def\macro{\recursivefalse\parsearg\macroxxx} -\def\rmacro{\recursivetrue\parsearg\macroxxx} - -\def\macroxxx#1{% - \getargs{#1}% now \macname is the macname and \argl the arglist - \ifx\argl\empty % no arguments - \paramno=0\relax - \else - \expandafter\parsemargdef \argl;% - \if\paramno>256\relax - \ifx\eTeXversion\thisisundefined - \errhelp = \EMsimple - \errmessage{You need eTeX to compile a file with macros with more than 256 arguments} - \fi - \fi - \fi - \if1\csname ismacro.\the\macname\endcsname - \message{Warning: redefining \the\macname}% - \else - \expandafter\ifx\csname \the\macname\endcsname \relax - \else \errmessage{Macro name \the\macname\space already defined}\fi - \global\cslet{macsave.\the\macname}{\the\macname}% - \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% - \addtomacrolist{\the\macname}% - \fi - \begingroup \macrobodyctxt - \ifrecursive \expandafter\parsermacbody - \else \expandafter\parsemacbody - \fi} - -\parseargdef\unmacro{% - \if1\csname ismacro.#1\endcsname - \global\cslet{#1}{macsave.#1}% - \global\expandafter\let \csname ismacro.#1\endcsname=0% - % Remove the macro name from \macrolist: - \begingroup - \expandafter\let\csname#1\endcsname \relax - \let\definedummyword\unmacrodo - \xdef\macrolist{\macrolist}% - \endgroup - \else - \errmessage{Macro #1 not defined}% - \fi -} - -% Called by \do from \dounmacro on each macro. The idea is to omit any -% macro definitions that have been changed to \relax. -% -\def\unmacrodo#1{% - \ifx #1\relax - % remove this - \else - \noexpand\definedummyword \noexpand#1% - \fi -} - -% This makes use of the obscure feature that if the last token of a -% is #, then the preceding argument is delimited by -% an opening brace, and that opening brace is not consumed. -\def\getargs#1{\getargsxxx#1{}} -\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} -\def\getmacname#1 #2\relax{\macname={#1}} -\def\getmacargs#1{\def\argl{#1}} - -% For macro processing make @ a letter so that we can make Texinfo private macro names. -\edef\texiatcatcode{\the\catcode`\@} -\catcode `@=11\relax - -% Parse the optional {params} list. Set up \paramno and \paramlist -% so \defmacro knows what to do. Define \macarg.BLAH for each BLAH -% in the params list to some hook where the argument si to be expanded. If -% there are less than 10 arguments that hook is to be replaced by ##N where N -% is the position in that list, that is to say the macro arguments are to be -% defined `a la TeX in the macro body. -% -% That gets used by \mbodybackslash (above). -% -% We need to get `macro parameter char #' into several definitions. -% The technique used is stolen from LaTeX: let \hash be something -% unexpandable, insert that wherever you need a #, and then redefine -% it to # just before using the token list produced. -% -% The same technique is used to protect \eatspaces till just before -% the macro is used. -% -% If there are 10 or more arguments, a different technique is used, where the -% hook remains in the body, and when macro is to be expanded the body is -% processed again to replace the arguments. -% -% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the -% argument N value and then \edef the body (nothing else will expand because of -% the catcode regime underwhich the body was input). -% -% If you compile with TeX (not eTeX), and you have macros with 10 or more -% arguments, you need that no macro has more than 256 arguments, otherwise an -% error is produced. -\def\parsemargdef#1;{% - \paramno=0\def\paramlist{}% - \let\hash\relax - \let\xeatspaces\relax - \parsemargdefxxx#1,;,% - % In case that there are 10 or more arguments we parse again the arguments - % list to set new definitions for the \macarg.BLAH macros corresponding to - % each BLAH argument. It was anyhow needed to parse already once this list - % in order to count the arguments, and as macros with at most 9 arguments - % are by far more frequent than macro with 10 or more arguments, defining - % twice the \macarg.BLAH macros does not cost too much processing power. - \ifnum\paramno<10\relax\else - \paramno0\relax - \parsemmanyargdef@@#1,;,% 10 or more arguments - \fi -} -\def\parsemargdefxxx#1,{% - \if#1;\let\next=\relax - \else \let\next=\parsemargdefxxx - \advance\paramno by 1 - \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname - {\xeatspaces{\hash\the\paramno}}% - \edef\paramlist{\paramlist\hash\the\paramno,}% - \fi\next} - -\def\parsemmanyargdef@@#1,{% - \if#1;\let\next=\relax - \else - \let\next=\parsemmanyargdef@@ - \edef\tempb{\eatspaces{#1}}% - \expandafter\def\expandafter\tempa - \expandafter{\csname macarg.\tempb\endcsname}% - % Note that we need some extra \noexpand\noexpand, this is because we - % don't want \the to be expanded in the \parsermacbody as it uses an - % \xdef . - \expandafter\edef\tempa - {\noexpand\noexpand\noexpand\the\toks\the\paramno}% - \advance\paramno by 1\relax - \fi\next} - -% These two commands read recursive and nonrecursive macro bodies. -% (They're different since rec and nonrec macros end differently.) -% - -\catcode `\@\texiatcatcode -\long\def\parsemacbody#1@end macro% -{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% -\long\def\parsermacbody#1@end rmacro% -{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% -\catcode `\@=11\relax - -\let\endargs@\relax -\let\nil@\relax -\def\nilm@{\nil@}% -\long\def\nillm@{\nil@}% - -% This macro is expanded during the Texinfo macro expansion, not during its -% definition. It gets all the arguments values and assigns them to macros -% macarg.ARGNAME -% -% #1 is the macro name -% #2 is the list of argument names -% #3 is the list of argument values -\def\getargvals@#1#2#3{% - \def\macargdeflist@{}% - \def\saveparamlist@{#2}% Need to keep a copy for parameter expansion. - \def\paramlist{#2,\nil@}% - \def\macroname{#1}% - \begingroup - \macroargctxt - \def\argvaluelist{#3,\nil@}% - \def\@tempa{#3}% - \ifx\@tempa\empty - \setemptyargvalues@ - \else - \getargvals@@ - \fi -} - -% -\def\getargvals@@{% - \ifx\paramlist\nilm@ - % Some sanity check needed here that \argvaluelist is also empty. - \ifx\argvaluelist\nillm@ - \else - \errhelp = \EMsimple - \errmessage{Too many arguments in macro `\macroname'!}% - \fi - \let\next\macargexpandinbody@ - \else - \ifx\argvaluelist\nillm@ - % No more arguments values passed to macro. Set remaining named-arg - % macros to empty. - \let\next\setemptyargvalues@ - \else - % pop current arg name into \@tempb - \def\@tempa##1{\pop@{\@tempb}{\paramlist}##1\endargs@}% - \expandafter\@tempa\expandafter{\paramlist}% - % pop current argument value into \@tempc - \def\@tempa##1{\longpop@{\@tempc}{\argvaluelist}##1\endargs@}% - \expandafter\@tempa\expandafter{\argvaluelist}% - % Here \@tempb is the current arg name and \@tempc is the current arg value. - % First place the new argument macro definition into \@tempd - \expandafter\macname\expandafter{\@tempc}% - \expandafter\let\csname macarg.\@tempb\endcsname\relax - \expandafter\def\expandafter\@tempe\expandafter{% - \csname macarg.\@tempb\endcsname}% - \edef\@tempd{\long\def\@tempe{\the\macname}}% - \push@\@tempd\macargdeflist@ - \let\next\getargvals@@ - \fi - \fi - \next -} - -\def\push@#1#2{% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter#2% - \expandafter\expandafter\expandafter{% - \expandafter#1#2}% -} - -% Replace arguments by their values in the macro body, and place the result -% in macro \@tempa -\def\macvalstoargs@{% - % To do this we use the property that token registers that are \the'ed - % within an \edef expand only once. So we are going to place all argument - % values into respective token registers. - % - % First we save the token context, and initialize argument numbering. - \begingroup - \paramno0\relax - % Then, for each argument number #N, we place the corresponding argument - % value into a new token list register \toks#N - \expandafter\putargsintokens@\saveparamlist@,;,% - % Then, we expand the body so that argument are replaced by their - % values. The trick for values not to be expanded themselves is that they - % are within tokens and that tokens expand only once in an \edef . - \edef\@tempc{\csname mac.\macroname .body\endcsname}% - % Now we restore the token stack pointer to free the token list registers - % which we have used, but we make sure that expanded body is saved after - % group. - \expandafter - \endgroup - \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% - } - -\def\macargexpandinbody@{% - %% Define the named-macro outside of this group and then close this group. - \expandafter - \endgroup - \macargdeflist@ - % First the replace in body the macro arguments by their values, the result - % is in \@tempa . - \macvalstoargs@ - % Then we point at the \norecurse or \gobble (for recursive) macro value - % with \@tempb . - \expandafter\let\expandafter\@tempb\csname mac.\macroname .recurse\endcsname - % Depending on whether it is recursive or not, we need some tailing - % \egroup . - \ifx\@tempb\gobble - \let\@tempc\relax - \else - \let\@tempc\egroup - \fi - % And now we do the real job: - \edef\@tempd{\noexpand\@tempb{\macroname}\noexpand\scanmacro{\@tempa}\@tempc}% - \@tempd -} - -\def\putargsintokens@#1,{% - \if#1;\let\next\relax - \else - \let\next\putargsintokens@ - % First we allocate the new token list register, and give it a temporary - % alias \@tempb . - \toksdef\@tempb\the\paramno - % Then we place the argument value into that token list register. - \expandafter\let\expandafter\@tempa\csname macarg.#1\endcsname - \expandafter\@tempb\expandafter{\@tempa}% - \advance\paramno by 1\relax - \fi - \next -} - -% Save the token stack pointer into macro #1 -\def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}} -% Restore the token stack pointer from number in macro #1 -\def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax} -% newtoks that can be used non \outer . -\def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi} - -% Tailing missing arguments are set to empty -\def\setemptyargvalues@{% - \ifx\paramlist\nilm@ - \let\next\macargexpandinbody@ - \else - \expandafter\setemptyargvaluesparser@\paramlist\endargs@ - \let\next\setemptyargvalues@ - \fi - \next -} - -\def\setemptyargvaluesparser@#1,#2\endargs@{% - \expandafter\def\expandafter\@tempa\expandafter{% - \expandafter\def\csname macarg.#1\endcsname{}}% - \push@\@tempa\macargdeflist@ - \def\paramlist{#2}% -} - -% #1 is the element target macro -% #2 is the list macro -% #3,#4\endargs@ is the list value -\def\pop@#1#2#3,#4\endargs@{% - \def#1{#3}% - \def#2{#4}% -} -\long\def\longpop@#1#2#3,#4\endargs@{% - \long\def#1{#3}% - \long\def#2{#4}% -} - -% This defines a Texinfo @macro. There are eight cases: recursive and -% nonrecursive macros of zero, one, up to nine, and many arguments. -% Much magic with \expandafter here. -% \xdef is used so that macro definitions will survive the file -% they're defined in; @include reads the file inside a group. -% -\def\defmacro{% - \let\hash=##% convert placeholders to macro parameter chars - \ifrecursive - \ifcase\paramno - % 0 - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\scanmacro{\temp}}% - \or % 1 - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \noexpand\braceorline - \expandafter\noexpand\csname\the\macname xxx\endcsname}% - \expandafter\xdef\csname\the\macname xxx\endcsname##1{% - \egroup\noexpand\scanmacro{\temp}}% - \else - \ifnum\paramno<10\relax % at most 9 - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \noexpand\csname\the\macname xx\endcsname}% - \expandafter\xdef\csname\the\macname xx\endcsname##1{% - \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter - \csname\the\macname xxx\endcsname - \paramlist{\egroup\noexpand\scanmacro{\temp}}% - \else % 10 or more - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\getargvals@{\the\macname}{\argl}% - }% - \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp - \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble - \fi - \fi - \else - \ifcase\paramno - % 0 - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\norecurse{\the\macname}% - \noexpand\scanmacro{\temp}\egroup}% - \or % 1 - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \noexpand\braceorline - \expandafter\noexpand\csname\the\macname xxx\endcsname}% - \expandafter\xdef\csname\the\macname xxx\endcsname##1{% - \egroup - \noexpand\norecurse{\the\macname}% - \noexpand\scanmacro{\temp}\egroup}% - \else % at most 9 - \ifnum\paramno<10\relax - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \expandafter\noexpand\csname\the\macname xx\endcsname}% - \expandafter\xdef\csname\the\macname xx\endcsname##1{% - \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter - \csname\the\macname xxx\endcsname - \paramlist{% - \egroup - \noexpand\norecurse{\the\macname}% - \noexpand\scanmacro{\temp}\egroup}% - \else % 10 or more: - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\getargvals@{\the\macname}{\argl}% - }% - \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp - \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse - \fi - \fi - \fi} - -\catcode `\@\texiatcatcode\relax - -\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}} - -% \braceorline decides whether the next nonwhitespace character is a -% {. If so it reads up to the closing }, if not, it reads the whole -% line. Whatever was read is then fed to the next control sequence -% as an argument (by \parsebrace or \parsearg). -% -\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} -\def\braceorlinexxx{% - \ifx\nchar\bgroup\else - \expandafter\parsearg - \fi \macnamexxx} - - -% @alias. -% We need some trickery to remove the optional spaces around the equal -% sign. Make them active and then expand them all to nothing. -% -\def\alias{\parseargusing\obeyspaces\aliasxxx} -\def\aliasxxx #1{\aliasyyy#1\relax} -\def\aliasyyy #1=#2\relax{% - {% - \expandafter\let\obeyedspace=\empty - \addtomacrolist{#1}% - \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}% - }% - \next -} - - -\message{cross references,} - -\newwrite\auxfile -\newif\ifhavexrefs % True if xref values are known. -\newif\ifwarnedxrefs % True if we warned once that they aren't known. - -% @inforef is relatively simple. -\def\inforef #1{\inforefzzz #1,,,,**} -\def\inforefzzz #1,#2,#3,#4**{% - \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, - node \samp{\ignorespaces#1{}}} - -% @node's only job in TeX is to define \lastnode, which is used in -% cross-references. The @node line might or might not have commas, and -% might or might not have spaces before the first comma, like: -% @node foo , bar , ... -% We don't want such trailing spaces in the node name. -% -\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse} -% -% also remove a trailing comma, in case of something like this: -% @node Help-Cross, , , Cross-refs -\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse} -\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}} - -\let\nwnode=\node -\let\lastnode=\empty - -% Write a cross-reference definition for the current node. #1 is the -% type (Ynumbered, Yappendix, Ynothing). -% -\def\donoderef#1{% - \ifx\lastnode\empty\else - \setref{\lastnode}{#1}% - \global\let\lastnode=\empty - \fi -} - -% @anchor{NAME} -- define xref target at arbitrary point. -% -\newcount\savesfregister -% -\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} -\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} -\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} - -% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an -% anchor), which consists of three parts: -% 1) NAME-title - the current sectioning name taken from \lastsection, -% or the anchor name. -% 2) NAME-snt - section number and type, passed as the SNT arg, or -% empty for anchors. -% 3) NAME-pg - the page number. -% -% This is called from \donoderef, \anchor, and \dofloat. In the case of -% floats, there is an additional part, which is not written here: -% 4) NAME-lof - the text as it should appear in a @listoffloats. -% -\def\setref#1#2{% - \pdfmkdest{#1}% - \iflinks - {% - \atdummies % preserve commands, but don't expand them - \edef\writexrdef##1##2{% - \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef - ##1}{##2}}% these are parameters of \writexrdef - }% - \toks0 = \expandafter{\lastsection}% - \immediate \writexrdef{title}{\the\toks0 }% - \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. - \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout - }% - \fi -} - -% @xrefautosectiontitle on|off says whether @section(ing) names are used -% automatically in xrefs, if the third arg is not explicitly specified. -% This was provided as a "secret" @set xref-automatic-section-title -% variable, now it's official. -% -\parseargdef\xrefautomaticsectiontitle{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETxref-automatic-section-title\endcsname - = \empty - \else\ifx\temp\offword - \expandafter\let\csname SETxref-automatic-section-title\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @xrefautomaticsectiontitle value `\temp', - must be on|off}% - \fi\fi -} - -% -% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is -% the node name, #2 the name of the Info cross-reference, #3 the printed -% node name, #4 the name of the Info file, #5 the name of the printed -% manual. All but the node name can be omitted. -% -\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]} -\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]} -\def\ref#1{\xrefX[#1,,,,,,,]} -% -\newbox\toprefbox -\newbox\printedrefnamebox -\newbox\infofilenamebox -\newbox\printedmanualbox -% -\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup - \unsepspaces - % - % Get args without leading/trailing spaces. - \def\printedrefname{\ignorespaces #3}% - \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}% - % - \def\infofilename{\ignorespaces #4}% - \setbox\infofilenamebox = \hbox{\infofilename\unskip}% - % - \def\printedmanual{\ignorespaces #5}% - \setbox\printedmanualbox = \hbox{\printedmanual\unskip}% - % - % If the printed reference name (arg #3) was not explicitly given in - % the @xref, figure out what we want to use. - \ifdim \wd\printedrefnamebox = 0pt - % No printed node name was explicitly given. - \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax - % Not auto section-title: use node name inside the square brackets. - \def\printedrefname{\ignorespaces #1}% - \else - % Auto section-title: use chapter/section title inside - % the square brackets if we have it. - \ifdim \wd\printedmanualbox > 0pt - % It is in another manual, so we don't have it; use node name. - \def\printedrefname{\ignorespaces #1}% - \else - \ifhavexrefs - % We (should) know the real title if we have the xref values. - \def\printedrefname{\refx{#1-title}{}}% - \else - % Otherwise just copy the Info node name. - \def\printedrefname{\ignorespaces #1}% - \fi% - \fi - \fi - \fi - % - % Make link in pdf output. - \ifpdf - {\indexnofonts - \turnoffactive - \makevalueexpandable - % This expands tokens, so do it after making catcode changes, so _ - % etc. don't get their TeX definitions. This ignores all spaces in - % #4, including (wrongly) those in the middle of the filename. - \getfilename{#4}% - % - % This (wrongly) does not take account of leading or trailing - % spaces in #1, which should be ignored. - \edef\pdfxrefdest{#1}% - \ifx\pdfxrefdest\empty - \def\pdfxrefdest{Top}% no empty targets - \else - \txiescapepdf\pdfxrefdest % escape PDF special chars - \fi - % - \leavevmode - \startlink attr{/Border [0 0 0]}% - \ifnum\filenamelength>0 - goto file{\the\filename.pdf} name{\pdfxrefdest}% - \else - goto name{\pdfmkpgn{\pdfxrefdest}}% - \fi - }% - \setcolor{\linkcolor}% - \fi - % - % Float references are printed completely differently: "Figure 1.2" - % instead of "[somenode], p.3". We distinguish them by the - % LABEL-title being set to a magic string. - {% - % Have to otherify everything special to allow the \csname to - % include an _ in the xref name, etc. - \indexnofonts - \turnoffactive - \expandafter\global\expandafter\let\expandafter\Xthisreftitle - \csname XR#1-title\endcsname - }% - \iffloat\Xthisreftitle - % If the user specified the print name (third arg) to the ref, - % print it instead of our usual "Figure 1.2". - \ifdim\wd\printedrefnamebox = 0pt - \refx{#1-snt}{}% - \else - \printedrefname - \fi - % - % If the user also gave the printed manual name (fifth arg), append - % "in MANUALNAME". - \ifdim \wd\printedmanualbox > 0pt - \space \putwordin{} \cite{\printedmanual}% - \fi - \else - % node/anchor (non-float) references. - % - % If we use \unhbox to print the node names, TeX does not insert - % empty discretionaries after hyphens, which means that it will not - % find a line break at a hyphen in a node names. Since some manuals - % are best written with fairly long node names, containing hyphens, - % this is a loss. Therefore, we give the text of the node name - % again, so it is as if TeX is seeing it for the first time. - % - \ifdim \wd\printedmanualbox > 0pt - % Cross-manual reference with a printed manual name. - % - \crossmanualxref{\cite{\printedmanual\unskip}}% - % - \else\ifdim \wd\infofilenamebox > 0pt - % Cross-manual reference with only an info filename (arg 4), no - % printed manual name (arg 5). This is essentially the same as - % the case above; we output the filename, since we have nothing else. - % - \crossmanualxref{\code{\infofilename\unskip}}% - % - \else - % Reference within this manual. - % - % _ (for example) has to be the character _ for the purposes of the - % control sequence corresponding to the node, but it has to expand - % into the usual \leavevmode...\vrule stuff for purposes of - % printing. So we \turnoffactive for the \refx-snt, back on for the - % printing, back off for the \refx-pg. - {\turnoffactive - % Only output a following space if the -snt ref is nonempty; for - % @unnumbered and @anchor, it won't be. - \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% - \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi - }% - % output the `[mynode]' via the macro below so it can be overridden. - \xrefprintnodename\printedrefname - % - % But we always want a comma and a space: - ,\space - % - % output the `page 3'. - \turnoffactive \putwordpage\tie\refx{#1-pg}{}% - \fi\fi - \fi - \endlink -\endgroup} - -% Output a cross-manual xref to #1. Used just above (twice). -% -% Only include the text "Section ``foo'' in" if the foo is neither -% missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply -% "see The Foo Manual", the idea being to refer to the whole manual. -% -% But, this being TeX, we can't easily compare our node name against the -% string "Top" while ignoring the possible spaces before and after in -% the input. By adding the arbitrary 7sp below, we make it much less -% likely that a real node name would have the same width as "Top" (e.g., -% in a monospaced font). Hopefully it will never happen in practice. -% -% For the same basic reason, we retypeset the "Top" at every -% reference, since the current font is indeterminate. -% -\def\crossmanualxref#1{% - \setbox\toprefbox = \hbox{Top\kern7sp}% - \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}% - \ifdim \wd2 > 7sp % nonempty? - \ifdim \wd2 = \wd\toprefbox \else % same as Top? - \putwordSection{} ``\printedrefname'' \putwordin{}\space - \fi - \fi - #1% -} - -% This macro is called from \xrefX for the `[nodename]' part of xref -% output. It's a separate macro only so it can be changed more easily, -% since square brackets don't work well in some documents. Particularly -% one that Bob is working on :). -% -\def\xrefprintnodename#1{[#1]} - -% Things referred to by \setref. -% -\def\Ynothing{} -\def\Yomitfromtoc{} -\def\Ynumbered{% - \ifnum\secno=0 - \putwordChapter@tie \the\chapno - \else \ifnum\subsecno=0 - \putwordSection@tie \the\chapno.\the\secno - \else \ifnum\subsubsecno=0 - \putwordSection@tie \the\chapno.\the\secno.\the\subsecno - \else - \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno - \fi\fi\fi -} -\def\Yappendix{% - \ifnum\secno=0 - \putwordAppendix@tie @char\the\appendixno{}% - \else \ifnum\subsecno=0 - \putwordSection@tie @char\the\appendixno.\the\secno - \else \ifnum\subsubsecno=0 - \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno - \else - \putwordSection@tie - @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno - \fi\fi\fi -} - -% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME. -% If its value is nonempty, SUFFIX is output afterward. -% -\def\refx#1#2{% - {% - \indexnofonts - \otherbackslash - \expandafter\global\expandafter\let\expandafter\thisrefX - \csname XR#1\endcsname - }% - \ifx\thisrefX\relax - % If not defined, say something at least. - \angleleft un\-de\-fined\angleright - \iflinks - \ifhavexrefs - {\toks0 = {#1}% avoid expansion of possibly-complex value - \message{\linenumber Undefined cross reference `\the\toks0'.}}% - \else - \ifwarnedxrefs\else - \global\warnedxrefstrue - \message{Cross reference values unknown; you must run TeX again.}% - \fi - \fi - \fi - \else - % It's defined, so just use it. - \thisrefX - \fi - #2% Output the suffix in any case. -} - -% This is the macro invoked by entries in the aux file. Usually it's -% just a \def (we prepend XR to the control sequence name to avoid -% collisions). But if this is a float type, we have more work to do. -% -\def\xrdef#1#2{% - {% The node name might contain 8-bit characters, which in our current - % implementation are changed to commands like @'e. Don't let these - % mess up the control sequence name. - \indexnofonts - \turnoffactive - \xdef\safexrefname{#1}% - }% - % - \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref - % - % Was that xref control sequence that we just defined for a float? - \expandafter\iffloat\csname XR\safexrefname\endcsname - % it was a float, and we have the (safe) float type in \iffloattype. - \expandafter\let\expandafter\floatlist - \csname floatlist\iffloattype\endcsname - % - % Is this the first time we've seen this float type? - \expandafter\ifx\floatlist\relax - \toks0 = {\do}% yes, so just \do - \else - % had it before, so preserve previous elements in list. - \toks0 = \expandafter{\floatlist\do}% - \fi - % - % Remember this xref in the control sequence \floatlistFLOATTYPE, - % for later use in \listoffloats. - \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0 - {\safexrefname}}% - \fi -} - -% Read the last existing aux file, if any. No error if none exists. -% -\def\tryauxfile{% - \openin 1 \jobname.aux - \ifeof 1 \else - \readdatafile{aux}% - \global\havexrefstrue - \fi - \closein 1 -} - -\def\setupdatafile{% - \catcode`\^^@=\other - \catcode`\^^A=\other - \catcode`\^^B=\other - \catcode`\^^C=\other - \catcode`\^^D=\other - \catcode`\^^E=\other - \catcode`\^^F=\other - \catcode`\^^G=\other - \catcode`\^^H=\other - \catcode`\^^K=\other - \catcode`\^^L=\other - \catcode`\^^N=\other - \catcode`\^^P=\other - \catcode`\^^Q=\other - \catcode`\^^R=\other - \catcode`\^^S=\other - \catcode`\^^T=\other - \catcode`\^^U=\other - \catcode`\^^V=\other - \catcode`\^^W=\other - \catcode`\^^X=\other - \catcode`\^^Z=\other - \catcode`\^^[=\other - \catcode`\^^\=\other - \catcode`\^^]=\other - \catcode`\^^^=\other - \catcode`\^^_=\other - % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc. - % in xref tags, i.e., node names. But since ^^e4 notation isn't - % supported in the main text, it doesn't seem desirable. Furthermore, - % that is not enough: for node names that actually contain a ^ - % character, we would end up writing a line like this: 'xrdef {'hat - % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first - % argument, and \hat is not an expandable control sequence. It could - % all be worked out, but why? Either we support ^^ or we don't. - % - % The other change necessary for this was to define \auxhat: - % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter - % and then to call \auxhat in \setq. - % - \catcode`\^=\other - % - % Special characters. Should be turned off anyway, but... - \catcode`\~=\other - \catcode`\[=\other - \catcode`\]=\other - \catcode`\"=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\$=\other - \catcode`\#=\other - \catcode`\&=\other - \catcode`\%=\other - \catcode`+=\other % avoid \+ for paranoia even though we've turned it off - % - % This is to support \ in node names and titles, since the \ - % characters end up in a \csname. It's easier than - % leaving it active and making its active definition an actual \ - % character. What I don't understand is why it works in the *value* - % of the xrdef. Seems like it should be a catcode12 \, and that - % should not typeset properly. But it works, so I'm moving on for - % now. --karl, 15jan04. - \catcode`\\=\other - % - % Make the characters 128-255 be printing characters. - {% - \count1=128 - \def\loop{% - \catcode\count1=\other - \advance\count1 by 1 - \ifnum \count1<256 \loop \fi - }% - }% - % - % @ is our escape character in .aux files, and we need braces. - \catcode`\{=1 - \catcode`\}=2 - \catcode`\@=0 -} - -\def\readdatafile#1{% -\begingroup - \setupdatafile - \input\jobname.#1 -\endgroup} - - -\message{insertions,} -% including footnotes. - -\newcount \footnoteno - -% The trailing space in the following definition for supereject is -% vital for proper filling; pages come out unaligned when you do a -% pagealignmacro call if that space before the closing brace is -% removed. (Generally, numeric constants should always be followed by a -% space to prevent strange expansion errors.) -\def\supereject{\par\penalty -20000\footnoteno =0 } - -% @footnotestyle is meaningful for Info output only. -\let\footnotestyle=\comment - -{\catcode `\@=11 -% -% Auto-number footnotes. Otherwise like plain. -\gdef\footnote{% - \let\indent=\ptexindent - \let\noindent=\ptexnoindent - \global\advance\footnoteno by \@ne - \edef\thisfootno{$^{\the\footnoteno}$}% - % - % In case the footnote comes at the end of a sentence, preserve the - % extra spacing after we do the footnote number. - \let\@sf\empty - \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi - % - % Remove inadvertent blank space before typesetting the footnote number. - \unskip - \thisfootno\@sf - \dofootnote -}% - -% Don't bother with the trickery in plain.tex to not require the -% footnote text as a parameter. Our footnotes don't need to be so general. -% -% Oh yes, they do; otherwise, @ifset (and anything else that uses -% \parseargline) fails inside footnotes because the tokens are fixed when -% the footnote is read. --karl, 16nov96. -% -\gdef\dofootnote{% - \insert\footins\bgroup - % We want to typeset this text as a normal paragraph, even if the - % footnote reference occurs in (for example) a display environment. - % So reset some parameters. - \hsize=\pagewidth - \interlinepenalty\interfootnotelinepenalty - \splittopskip\ht\strutbox % top baseline for broken footnotes - \splitmaxdepth\dp\strutbox - \floatingpenalty\@MM - \leftskip\z@skip - \rightskip\z@skip - \spaceskip\z@skip - \xspaceskip\z@skip - \parindent\defaultparindent - % - \smallfonts \rm - % - % Because we use hanging indentation in footnotes, a @noindent appears - % to exdent this text, so make it be a no-op. makeinfo does not use - % hanging indentation so @noindent can still be needed within footnote - % text after an @example or the like (not that this is good style). - \let\noindent = \relax - % - % Hang the footnote text off the number. Use \everypar in case the - % footnote extends for more than one paragraph. - \everypar = {\hang}% - \textindent{\thisfootno}% - % - % Don't crash into the line above the footnote text. Since this - % expands into a box, it must come within the paragraph, lest it - % provide a place where TeX can split the footnote. - \footstrut - % - % Invoke rest of plain TeX footnote routine. - \futurelet\next\fo@t -} -}%end \catcode `\@=11 - -% In case a @footnote appears in a vbox, save the footnote text and create -% the real \insert just after the vbox finished. Otherwise, the insertion -% would be lost. -% Similarly, if a @footnote appears inside an alignment, save the footnote -% text to a box and make the \insert when a row of the table is finished. -% And the same can be done for other insert classes. --kasal, 16nov03. - -% Replace the \insert primitive by a cheating macro. -% Deeper inside, just make sure that the saved insertions are not spilled -% out prematurely. -% -\def\startsavinginserts{% - \ifx \insert\ptexinsert - \let\insert\saveinsert - \else - \let\checkinserts\relax - \fi -} - -% This \insert replacement works for both \insert\footins{foo} and -% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}. -% -\def\saveinsert#1{% - \edef\next{\noexpand\savetobox \makeSAVEname#1}% - \afterassignment\next - % swallow the left brace - \let\temp = -} -\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}} -\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1} - -\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi} - -\def\placesaveins#1{% - \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname - {\box#1}% -} - -% eat @SAVE -- beware, all of them have catcode \other: -{ - \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials % ;-) - \gdef\gobblesave @SAVE{} -} - -% initialization: -\def\newsaveins #1{% - \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}% - \next -} -\def\newsaveinsX #1{% - \csname newbox\endcsname #1% - \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts - \checksaveins #1}% -} - -% initialize: -\let\checkinserts\empty -\newsaveins\footins -\newsaveins\margin - - -% @image. We use the macros from epsf.tex to support this. -% If epsf.tex is not installed and @image is used, we complain. -% -% Check for and read epsf.tex up front. If we read it only at @image -% time, we might be inside a group, and then its definitions would get -% undone and the next image would fail. -\openin 1 = epsf.tex -\ifeof 1 \else - % Do not bother showing banner with epsf.tex v2.7k (available in - % doc/epsf.tex and on ctan). - \def\epsfannounce{\toks0 = }% - \input epsf.tex -\fi -\closein 1 -% -% We will only complain once about lack of epsf.tex. -\newif\ifwarnednoepsf -\newhelp\noepsfhelp{epsf.tex must be installed for images to - work. It is also included in the Texinfo distribution, or you can get - it from ftp://tug.org/tex/epsf.tex.} -% -\def\image#1{% - \ifx\epsfbox\thisisundefined - \ifwarnednoepsf \else - \errhelp = \noepsfhelp - \errmessage{epsf.tex not found, images will be ignored}% - \global\warnednoepsftrue - \fi - \else - \imagexxx #1,,,,,\finish - \fi -} -% -% Arguments to @image: -% #1 is (mandatory) image filename; we tack on .eps extension. -% #2 is (optional) width, #3 is (optional) height. -% #4 is (ignored optional) html alt text. -% #5 is (ignored optional) extension. -% #6 is just the usual extra ignored arg for parsing stuff. -\newif\ifimagevmode -\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup - \catcode`\^^M = 5 % in case we're inside an example - \normalturnoffactive % allow _ et al. in names - % If the image is by itself, center it. - \ifvmode - \imagevmodetrue - \else \ifx\centersub\centerV - % for @center @image, we need a vbox so we can have our vertical space - \imagevmodetrue - \vbox\bgroup % vbox has better behavior than vtop herev - \fi\fi - % - \ifimagevmode - \nobreak\medskip - % Usually we'll have text after the image which will insert - % \parskip glue, so insert it here too to equalize the space - % above and below. - \nobreak\vskip\parskip - \nobreak - \fi - % - % Leave vertical mode so that indentation from an enclosing - % environment such as @quotation is respected. - % However, if we're at the top level, we don't want the - % normal paragraph indentation. - % On the other hand, if we are in the case of @center @image, we don't - % want to start a paragraph, which will create a hsize-width box and - % eradicate the centering. - \ifx\centersub\centerV\else \noindent \fi - % - % Output the image. - \ifpdf - \dopdfimage{#1}{#2}{#3}% - \else - % \epsfbox itself resets \epsf?size at each figure. - \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi - \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi - \epsfbox{#1.eps}% - \fi - % - \ifimagevmode - \medskip % space after a standalone image - \fi - \ifx\centersub\centerV \egroup \fi -\endgroup} - - -% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables, -% etc. We don't actually implement floating yet, we always include the -% float "here". But it seemed the best name for the future. -% -\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish} - -% There may be a space before second and/or third parameter; delete it. -\def\eatcommaspace#1, {#1,} - -% #1 is the optional FLOATTYPE, the text label for this float, typically -% "Figure", "Table", "Example", etc. Can't contain commas. If omitted, -% this float will not be numbered and cannot be referred to. -% -% #2 is the optional xref label. Also must be present for the float to -% be referable. -% -% #3 is the optional positioning argument; for now, it is ignored. It -% will somehow specify the positions allowed to float to (here, top, bottom). -% -% We keep a separate counter for each FLOATTYPE, which we reset at each -% chapter-level command. -\let\resetallfloatnos=\empty -% -\def\dofloat#1,#2,#3,#4\finish{% - \let\thiscaption=\empty - \let\thisshortcaption=\empty - % - % don't lose footnotes inside @float. - % - % BEWARE: when the floats start float, we have to issue warning whenever an - % insert appears inside a float which could possibly float. --kasal, 26may04 - % - \startsavinginserts - % - % We can't be used inside a paragraph. - \par - % - \vtop\bgroup - \def\floattype{#1}% - \def\floatlabel{#2}% - \def\floatloc{#3}% we do nothing with this yet. - % - \ifx\floattype\empty - \let\safefloattype=\empty - \else - {% - % the floattype might have accents or other special characters, - % but we need to use it in a control sequence name. - \indexnofonts - \turnoffactive - \xdef\safefloattype{\floattype}% - }% - \fi - % - % If label is given but no type, we handle that as the empty type. - \ifx\floatlabel\empty \else - % We want each FLOATTYPE to be numbered separately (Figure 1, - % Table 1, Figure 2, ...). (And if no label, no number.) - % - \expandafter\getfloatno\csname\safefloattype floatno\endcsname - \global\advance\floatno by 1 - % - {% - % This magic value for \lastsection is output by \setref as the - % XREFLABEL-title value. \xrefX uses it to distinguish float - % labels (which have a completely different output format) from - % node and anchor labels. And \xrdef uses it to construct the - % lists of floats. - % - \edef\lastsection{\floatmagic=\safefloattype}% - \setref{\floatlabel}{Yfloat}% - }% - \fi - % - % start with \parskip glue, I guess. - \vskip\parskip - % - % Don't suppress indentation if a float happens to start a section. - \restorefirstparagraphindent -} - -% we have these possibilities: -% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap -% @float Foo,lbl & no caption: Foo 1.1 -% @float Foo & @caption{Cap}: Foo: Cap -% @float Foo & no caption: Foo -% @float ,lbl & Caption{Cap}: 1.1: Cap -% @float ,lbl & no caption: 1.1 -% @float & @caption{Cap}: Cap -% @float & no caption: -% -\def\Efloat{% - \let\floatident = \empty - % - % In all cases, if we have a float type, it comes first. - \ifx\floattype\empty \else \def\floatident{\floattype}\fi - % - % If we have an xref label, the number comes next. - \ifx\floatlabel\empty \else - \ifx\floattype\empty \else % if also had float type, need tie first. - \appendtomacro\floatident{\tie}% - \fi - % the number. - \appendtomacro\floatident{\chaplevelprefix\the\floatno}% - \fi - % - % Start the printed caption with what we've constructed in - % \floatident, but keep it separate; we need \floatident again. - \let\captionline = \floatident - % - \ifx\thiscaption\empty \else - \ifx\floatident\empty \else - \appendtomacro\captionline{: }% had ident, so need a colon between - \fi - % - % caption text. - \appendtomacro\captionline{\scanexp\thiscaption}% - \fi - % - % If we have anything to print, print it, with space before. - % Eventually this needs to become an \insert. - \ifx\captionline\empty \else - \vskip.5\parskip - \captionline - % - % Space below caption. - \vskip\parskip - \fi - % - % If have an xref label, write the list of floats info. Do this - % after the caption, to avoid chance of it being a breakpoint. - \ifx\floatlabel\empty \else - % Write the text that goes in the lof to the aux file as - % \floatlabel-lof. Besides \floatident, we include the short - % caption if specified, else the full caption if specified, else nothing. - {% - \atdummies - % - % since we read the caption text in the macro world, where ^^M - % is turned into a normal character, we have to scan it back, so - % we don't write the literal three characters "^^M" into the aux file. - \scanexp{% - \xdef\noexpand\gtemp{% - \ifx\thisshortcaption\empty - \thiscaption - \else - \thisshortcaption - \fi - }% - }% - \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident - \ifx\gtemp\empty \else : \gtemp \fi}}% - }% - \fi - \egroup % end of \vtop - % - % place the captured inserts - % - % BEWARE: when the floats start floating, we have to issue warning - % whenever an insert appears inside a float which could possibly - % float. --kasal, 26may04 - % - \checkinserts -} - -% Append the tokens #2 to the definition of macro #1, not expanding either. -% -\def\appendtomacro#1#2{% - \expandafter\def\expandafter#1\expandafter{#1#2}% -} - -% @caption, @shortcaption -% -\def\caption{\docaption\thiscaption} -\def\shortcaption{\docaption\thisshortcaption} -\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption} -\def\defcaption#1#2{\egroup \def#1{#2}} - -% The parameter is the control sequence identifying the counter we are -% going to use. Create it if it doesn't exist and assign it to \floatno. -\def\getfloatno#1{% - \ifx#1\relax - % Haven't seen this figure type before. - \csname newcount\endcsname #1% - % - % Remember to reset this floatno at the next chap. - \expandafter\gdef\expandafter\resetallfloatnos - \expandafter{\resetallfloatnos #1=0 }% - \fi - \let\floatno#1% -} - -% \setref calls this to get the XREFLABEL-snt value. We want an @xref -% to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we -% first read the @float command. -% -\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}% - -% Magic string used for the XREFLABEL-title value, so \xrefX can -% distinguish floats from other xref types. -\def\floatmagic{!!float!!} - -% #1 is the control sequence we are passed; we expand into a conditional -% which is true if #1 represents a float ref. That is, the magic -% \lastsection value which we \setref above. -% -\def\iffloat#1{\expandafter\doiffloat#1==\finish} -% -% #1 is (maybe) the \floatmagic string. If so, #2 will be the -% (safe) float type for this float. We set \iffloattype to #2. -% -\def\doiffloat#1=#2=#3\finish{% - \def\temp{#1}% - \def\iffloattype{#2}% - \ifx\temp\floatmagic -} - -% @listoffloats FLOATTYPE - print a list of floats like a table of contents. -% -\parseargdef\listoffloats{% - \def\floattype{#1}% floattype - {% - % the floattype might have accents or other special characters, - % but we need to use it in a control sequence name. - \indexnofonts - \turnoffactive - \xdef\safefloattype{\floattype}% - }% - % - % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE. - \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax - \ifhavexrefs - % if the user said @listoffloats foo but never @float foo. - \message{\linenumber No `\safefloattype' floats to list.}% - \fi - \else - \begingroup - \leftskip=\tocindent % indent these entries like a toc - \let\do=\listoffloatsdo - \csname floatlist\safefloattype\endcsname - \endgroup - \fi -} - -% This is called on each entry in a list of floats. We're passed the -% xref label, in the form LABEL-title, which is how we save it in the -% aux file. We strip off the -title and look up \XRLABEL-lof, which -% has the text we're supposed to typeset here. -% -% Figures without xref labels will not be included in the list (since -% they won't appear in the aux file). -% -\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish} -\def\listoffloatsdoentry#1-title\finish{{% - % Can't fully expand XR#1-lof because it can contain anything. Just - % pass the control sequence. On the other hand, XR#1-pg is just the - % page number, and we want to fully expand that so we can get a link - % in pdf output. - \toksA = \expandafter{\csname XR#1-lof\endcsname}% - % - % use the same \entry macro we use to generate the TOC and index. - \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}% - \writeentry -}} - - -\message{localization,} - -% For single-language documents, @documentlanguage is usually given very -% early, just after @documentencoding. Single argument is the language -% (de) or locale (de_DE) abbreviation. -% -{ - \catcode`\_ = \active - \globaldefs=1 -\parseargdef\documentlanguage{\begingroup - \let_=\normalunderscore % normal _ character for filenames - \tex % read txi-??.tex file in plain TeX. - % Read the file by the name they passed if it exists. - \openin 1 txi-#1.tex - \ifeof 1 - \documentlanguagetrywithoutunderscore{#1_\finish}% - \else - \globaldefs = 1 % everything in the txi-LL files needs to persist - \input txi-#1.tex - \fi - \closein 1 - \endgroup % end raw TeX -\endgroup} -% -% If they passed de_DE, and txi-de_DE.tex doesn't exist, -% try txi-de.tex. -% -\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{% - \openin 1 txi-#1.tex - \ifeof 1 - \errhelp = \nolanghelp - \errmessage{Cannot read language file txi-#1.tex}% - \else - \globaldefs = 1 % everything in the txi-LL files needs to persist - \input txi-#1.tex - \fi - \closein 1 -} -}% end of special _ catcode -% -\newhelp\nolanghelp{The given language definition file cannot be found or -is empty. Maybe you need to install it? Putting it in the current -directory should work if nowhere else does.} - -% This macro is called from txi-??.tex files; the first argument is the -% \language name to set (without the "\lang@" prefix), the second and -% third args are \{left,right}hyphenmin. -% -% The language names to pass are determined when the format is built. -% See the etex.log file created at that time, e.g., -% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log. -% -% With TeX Live 2008, etex now includes hyphenation patterns for all -% available languages. This means we can support hyphenation in -% Texinfo, at least to some extent. (This still doesn't solve the -% accented characters problem.) -% -\catcode`@=11 -\def\txisetlanguage#1#2#3{% - % do not set the language if the name is undefined in the current TeX. - \expandafter\ifx\csname lang@#1\endcsname \relax - \message{no patterns for #1}% - \else - \global\language = \csname lang@#1\endcsname - \fi - % but there is no harm in adjusting the hyphenmin values regardless. - \global\lefthyphenmin = #2\relax - \global\righthyphenmin = #3\relax -} - -% Helpers for encodings. -% Set the catcode of characters 128 through 255 to the specified number. -% -\def\setnonasciicharscatcode#1{% - \count255=128 - \loop\ifnum\count255<256 - \global\catcode\count255=#1\relax - \advance\count255 by 1 - \repeat -} - -\def\setnonasciicharscatcodenonglobal#1{% - \count255=128 - \loop\ifnum\count255<256 - \catcode\count255=#1\relax - \advance\count255 by 1 - \repeat -} - -% @documentencoding sets the definition of non-ASCII characters -% according to the specified encoding. -% -\parseargdef\documentencoding{% - % Encoding being declared for the document. - \def\declaredencoding{\csname #1.enc\endcsname}% - % - % Supported encodings: names converted to tokens in order to be able - % to compare them with \ifx. - \def\ascii{\csname US-ASCII.enc\endcsname}% - \def\latnine{\csname ISO-8859-15.enc\endcsname}% - \def\latone{\csname ISO-8859-1.enc\endcsname}% - \def\lattwo{\csname ISO-8859-2.enc\endcsname}% - \def\utfeight{\csname UTF-8.enc\endcsname}% - % - \ifx \declaredencoding \ascii - \asciichardefs - % - \else \ifx \declaredencoding \lattwo - \setnonasciicharscatcode\active - \lattwochardefs - % - \else \ifx \declaredencoding \latone - \setnonasciicharscatcode\active - \latonechardefs - % - \else \ifx \declaredencoding \latnine - \setnonasciicharscatcode\active - \latninechardefs - % - \else \ifx \declaredencoding \utfeight - \setnonasciicharscatcode\active - \utfeightchardefs - % - \else - \message{Unknown document encoding #1, ignoring.}% - % - \fi % utfeight - \fi % latnine - \fi % latone - \fi % lattwo - \fi % ascii -} - -% A message to be logged when using a character that isn't available -% the default font encoding (OT1). -% -\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} - -% Take account of \c (plain) vs. \, (Texinfo) difference. -\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} - -% First, make active non-ASCII characters in order for them to be -% correctly categorized when TeX reads the replacement text of -% macros containing the character definitions. -\setnonasciicharscatcode\active -% -% Latin1 (ISO-8859-1) character definitions. -\def\latonechardefs{% - \gdef^^a0{\tie} - \gdef^^a1{\exclamdown} - \gdef^^a2{\missingcharmsg{CENT SIGN}} - \gdef^^a3{{\pounds}} - \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} - \gdef^^a5{\missingcharmsg{YEN SIGN}} - \gdef^^a6{\missingcharmsg{BROKEN BAR}} - \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\copyright} - \gdef^^aa{\ordf} - \gdef^^ab{\guillemetleft} - \gdef^^ac{$\lnot$} - \gdef^^ad{\-} - \gdef^^ae{\registeredsymbol} - \gdef^^af{\={}} - % - \gdef^^b0{\textdegree} - \gdef^^b1{$\pm$} - \gdef^^b2{$^2$} - \gdef^^b3{$^3$} - \gdef^^b4{\'{}} - \gdef^^b5{$\mu$} - \gdef^^b6{\P} - % - \gdef^^b7{$^.$} - \gdef^^b8{\cedilla\ } - \gdef^^b9{$^1$} - \gdef^^ba{\ordm} - % - \gdef^^bb{\guillemetright} - \gdef^^bc{$1\over4$} - \gdef^^bd{$1\over2$} - \gdef^^be{$3\over4$} - \gdef^^bf{\questiondown} - % - \gdef^^c0{\`A} - \gdef^^c1{\'A} - \gdef^^c2{\^A} - \gdef^^c3{\~A} - \gdef^^c4{\"A} - \gdef^^c5{\ringaccent A} - \gdef^^c6{\AE} - \gdef^^c7{\cedilla C} - \gdef^^c8{\`E} - \gdef^^c9{\'E} - \gdef^^ca{\^E} - \gdef^^cb{\"E} - \gdef^^cc{\`I} - \gdef^^cd{\'I} - \gdef^^ce{\^I} - \gdef^^cf{\"I} - % - \gdef^^d0{\DH} - \gdef^^d1{\~N} - \gdef^^d2{\`O} - \gdef^^d3{\'O} - \gdef^^d4{\^O} - \gdef^^d5{\~O} - \gdef^^d6{\"O} - \gdef^^d7{$\times$} - \gdef^^d8{\O} - \gdef^^d9{\`U} - \gdef^^da{\'U} - \gdef^^db{\^U} - \gdef^^dc{\"U} - \gdef^^dd{\'Y} - \gdef^^de{\TH} - \gdef^^df{\ss} - % - \gdef^^e0{\`a} - \gdef^^e1{\'a} - \gdef^^e2{\^a} - \gdef^^e3{\~a} - \gdef^^e4{\"a} - \gdef^^e5{\ringaccent a} - \gdef^^e6{\ae} - \gdef^^e7{\cedilla c} - \gdef^^e8{\`e} - \gdef^^e9{\'e} - \gdef^^ea{\^e} - \gdef^^eb{\"e} - \gdef^^ec{\`{\dotless i}} - \gdef^^ed{\'{\dotless i}} - \gdef^^ee{\^{\dotless i}} - \gdef^^ef{\"{\dotless i}} - % - \gdef^^f0{\dh} - \gdef^^f1{\~n} - \gdef^^f2{\`o} - \gdef^^f3{\'o} - \gdef^^f4{\^o} - \gdef^^f5{\~o} - \gdef^^f6{\"o} - \gdef^^f7{$\div$} - \gdef^^f8{\o} - \gdef^^f9{\`u} - \gdef^^fa{\'u} - \gdef^^fb{\^u} - \gdef^^fc{\"u} - \gdef^^fd{\'y} - \gdef^^fe{\th} - \gdef^^ff{\"y} -} - -% Latin9 (ISO-8859-15) encoding character definitions. -\def\latninechardefs{% - % Encoding is almost identical to Latin1. - \latonechardefs - % - \gdef^^a4{\euro} - \gdef^^a6{\v S} - \gdef^^a8{\v s} - \gdef^^b4{\v Z} - \gdef^^b8{\v z} - \gdef^^bc{\OE} - \gdef^^bd{\oe} - \gdef^^be{\"Y} -} - -% Latin2 (ISO-8859-2) character definitions. -\def\lattwochardefs{% - \gdef^^a0{\tie} - \gdef^^a1{\ogonek{A}} - \gdef^^a2{\u{}} - \gdef^^a3{\L} - \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} - \gdef^^a5{\v L} - \gdef^^a6{\'S} - \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\v S} - \gdef^^aa{\cedilla S} - \gdef^^ab{\v T} - \gdef^^ac{\'Z} - \gdef^^ad{\-} - \gdef^^ae{\v Z} - \gdef^^af{\dotaccent Z} - % - \gdef^^b0{\textdegree} - \gdef^^b1{\ogonek{a}} - \gdef^^b2{\ogonek{ }} - \gdef^^b3{\l} - \gdef^^b4{\'{}} - \gdef^^b5{\v l} - \gdef^^b6{\'s} - \gdef^^b7{\v{}} - \gdef^^b8{\cedilla\ } - \gdef^^b9{\v s} - \gdef^^ba{\cedilla s} - \gdef^^bb{\v t} - \gdef^^bc{\'z} - \gdef^^bd{\H{}} - \gdef^^be{\v z} - \gdef^^bf{\dotaccent z} - % - \gdef^^c0{\'R} - \gdef^^c1{\'A} - \gdef^^c2{\^A} - \gdef^^c3{\u A} - \gdef^^c4{\"A} - \gdef^^c5{\'L} - \gdef^^c6{\'C} - \gdef^^c7{\cedilla C} - \gdef^^c8{\v C} - \gdef^^c9{\'E} - \gdef^^ca{\ogonek{E}} - \gdef^^cb{\"E} - \gdef^^cc{\v E} - \gdef^^cd{\'I} - \gdef^^ce{\^I} - \gdef^^cf{\v D} - % - \gdef^^d0{\DH} - \gdef^^d1{\'N} - \gdef^^d2{\v N} - \gdef^^d3{\'O} - \gdef^^d4{\^O} - \gdef^^d5{\H O} - \gdef^^d6{\"O} - \gdef^^d7{$\times$} - \gdef^^d8{\v R} - \gdef^^d9{\ringaccent U} - \gdef^^da{\'U} - \gdef^^db{\H U} - \gdef^^dc{\"U} - \gdef^^dd{\'Y} - \gdef^^de{\cedilla T} - \gdef^^df{\ss} - % - \gdef^^e0{\'r} - \gdef^^e1{\'a} - \gdef^^e2{\^a} - \gdef^^e3{\u a} - \gdef^^e4{\"a} - \gdef^^e5{\'l} - \gdef^^e6{\'c} - \gdef^^e7{\cedilla c} - \gdef^^e8{\v c} - \gdef^^e9{\'e} - \gdef^^ea{\ogonek{e}} - \gdef^^eb{\"e} - \gdef^^ec{\v e} - \gdef^^ed{\'{\dotless{i}}} - \gdef^^ee{\^{\dotless{i}}} - \gdef^^ef{\v d} - % - \gdef^^f0{\dh} - \gdef^^f1{\'n} - \gdef^^f2{\v n} - \gdef^^f3{\'o} - \gdef^^f4{\^o} - \gdef^^f5{\H o} - \gdef^^f6{\"o} - \gdef^^f7{$\div$} - \gdef^^f8{\v r} - \gdef^^f9{\ringaccent u} - \gdef^^fa{\'u} - \gdef^^fb{\H u} - \gdef^^fc{\"u} - \gdef^^fd{\'y} - \gdef^^fe{\cedilla t} - \gdef^^ff{\dotaccent{}} -} - -% UTF-8 character definitions. -% -% This code to support UTF-8 is based on LaTeX's utf8.def, with some -% changes for Texinfo conventions. It is included here under the GPL by -% permission from Frank Mittelbach and the LaTeX team. -% -\newcount\countUTFx -\newcount\countUTFy -\newcount\countUTFz - -\gdef\UTFviiiTwoOctets#1#2{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\endcsname} -% -\gdef\UTFviiiThreeOctets#1#2#3{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname} -% -\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname} - -\gdef\UTFviiiDefined#1{% - \ifx #1\relax - \message{\linenumber Unicode char \string #1 not defined for Texinfo}% - \else - \expandafter #1% - \fi -} - -\begingroup - \catcode`\~13 - \catcode`\"12 - - \def\UTFviiiLoop{% - \global\catcode\countUTFx\active - \uccode`\~\countUTFx - \uppercase\expandafter{\UTFviiiTmp}% - \advance\countUTFx by 1 - \ifnum\countUTFx < \countUTFy - \expandafter\UTFviiiLoop - \fi} - - \countUTFx = "C2 - \countUTFy = "E0 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiTwoOctets\string~}} - \UTFviiiLoop - - \countUTFx = "E0 - \countUTFy = "F0 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiThreeOctets\string~}} - \UTFviiiLoop - - \countUTFx = "F0 - \countUTFy = "F4 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiFourOctets\string~}} - \UTFviiiLoop -\endgroup - -\begingroup - \catcode`\"=12 - \catcode`\<=12 - \catcode`\.=12 - \catcode`\,=12 - \catcode`\;=12 - \catcode`\!=12 - \catcode`\~=13 - - \gdef\DeclareUnicodeCharacter#1#2{% - \countUTFz = "#1\relax - %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% - \begingroup - \parseXMLCharref - \def\UTFviiiTwoOctets##1##2{% - \csname u8:##1\string ##2\endcsname}% - \def\UTFviiiThreeOctets##1##2##3{% - \csname u8:##1\string ##2\string ##3\endcsname}% - \def\UTFviiiFourOctets##1##2##3##4{% - \csname u8:##1\string ##2\string ##3\string ##4\endcsname}% - \expandafter\expandafter\expandafter\expandafter - \expandafter\expandafter\expandafter - \gdef\UTFviiiTmp{#2}% - \endgroup} - - \gdef\parseXMLCharref{% - \ifnum\countUTFz < "A0\relax - \errhelp = \EMsimple - \errmessage{Cannot define Unicode char value < 00A0}% - \else\ifnum\countUTFz < "800\relax - \parseUTFviiiA,% - \parseUTFviiiB C\UTFviiiTwoOctets.,% - \else\ifnum\countUTFz < "10000\relax - \parseUTFviiiA;% - \parseUTFviiiA,% - \parseUTFviiiB E\UTFviiiThreeOctets.{,;}% - \else - \parseUTFviiiA;% - \parseUTFviiiA,% - \parseUTFviiiA!% - \parseUTFviiiB F\UTFviiiFourOctets.{!,;}% - \fi\fi\fi - } - - \gdef\parseUTFviiiA#1{% - \countUTFx = \countUTFz - \divide\countUTFz by 64 - \countUTFy = \countUTFz - \multiply\countUTFz by 64 - \advance\countUTFx by -\countUTFz - \advance\countUTFx by 128 - \uccode `#1\countUTFx - \countUTFz = \countUTFy} - - \gdef\parseUTFviiiB#1#2#3#4{% - \advance\countUTFz by "#10\relax - \uccode `#3\countUTFz - \uppercase{\gdef\UTFviiiTmp{#2#3#4}}} -\endgroup - -\def\utfeightchardefs{% - \DeclareUnicodeCharacter{00A0}{\tie} - \DeclareUnicodeCharacter{00A1}{\exclamdown} - \DeclareUnicodeCharacter{00A3}{\pounds} - \DeclareUnicodeCharacter{00A8}{\"{ }} - \DeclareUnicodeCharacter{00A9}{\copyright} - \DeclareUnicodeCharacter{00AA}{\ordf} - \DeclareUnicodeCharacter{00AB}{\guillemetleft} - \DeclareUnicodeCharacter{00AD}{\-} - \DeclareUnicodeCharacter{00AE}{\registeredsymbol} - \DeclareUnicodeCharacter{00AF}{\={ }} - - \DeclareUnicodeCharacter{00B0}{\ringaccent{ }} - \DeclareUnicodeCharacter{00B4}{\'{ }} - \DeclareUnicodeCharacter{00B8}{\cedilla{ }} - \DeclareUnicodeCharacter{00BA}{\ordm} - \DeclareUnicodeCharacter{00BB}{\guillemetright} - \DeclareUnicodeCharacter{00BF}{\questiondown} - - \DeclareUnicodeCharacter{00C0}{\`A} - \DeclareUnicodeCharacter{00C1}{\'A} - \DeclareUnicodeCharacter{00C2}{\^A} - \DeclareUnicodeCharacter{00C3}{\~A} - \DeclareUnicodeCharacter{00C4}{\"A} - \DeclareUnicodeCharacter{00C5}{\AA} - \DeclareUnicodeCharacter{00C6}{\AE} - \DeclareUnicodeCharacter{00C7}{\cedilla{C}} - \DeclareUnicodeCharacter{00C8}{\`E} - \DeclareUnicodeCharacter{00C9}{\'E} - \DeclareUnicodeCharacter{00CA}{\^E} - \DeclareUnicodeCharacter{00CB}{\"E} - \DeclareUnicodeCharacter{00CC}{\`I} - \DeclareUnicodeCharacter{00CD}{\'I} - \DeclareUnicodeCharacter{00CE}{\^I} - \DeclareUnicodeCharacter{00CF}{\"I} - - \DeclareUnicodeCharacter{00D0}{\DH} - \DeclareUnicodeCharacter{00D1}{\~N} - \DeclareUnicodeCharacter{00D2}{\`O} - \DeclareUnicodeCharacter{00D3}{\'O} - \DeclareUnicodeCharacter{00D4}{\^O} - \DeclareUnicodeCharacter{00D5}{\~O} - \DeclareUnicodeCharacter{00D6}{\"O} - \DeclareUnicodeCharacter{00D8}{\O} - \DeclareUnicodeCharacter{00D9}{\`U} - \DeclareUnicodeCharacter{00DA}{\'U} - \DeclareUnicodeCharacter{00DB}{\^U} - \DeclareUnicodeCharacter{00DC}{\"U} - \DeclareUnicodeCharacter{00DD}{\'Y} - \DeclareUnicodeCharacter{00DE}{\TH} - \DeclareUnicodeCharacter{00DF}{\ss} - - \DeclareUnicodeCharacter{00E0}{\`a} - \DeclareUnicodeCharacter{00E1}{\'a} - \DeclareUnicodeCharacter{00E2}{\^a} - \DeclareUnicodeCharacter{00E3}{\~a} - \DeclareUnicodeCharacter{00E4}{\"a} - \DeclareUnicodeCharacter{00E5}{\aa} - \DeclareUnicodeCharacter{00E6}{\ae} - \DeclareUnicodeCharacter{00E7}{\cedilla{c}} - \DeclareUnicodeCharacter{00E8}{\`e} - \DeclareUnicodeCharacter{00E9}{\'e} - \DeclareUnicodeCharacter{00EA}{\^e} - \DeclareUnicodeCharacter{00EB}{\"e} - \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}} - \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}} - \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} - \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} - - \DeclareUnicodeCharacter{00F0}{\dh} - \DeclareUnicodeCharacter{00F1}{\~n} - \DeclareUnicodeCharacter{00F2}{\`o} - \DeclareUnicodeCharacter{00F3}{\'o} - \DeclareUnicodeCharacter{00F4}{\^o} - \DeclareUnicodeCharacter{00F5}{\~o} - \DeclareUnicodeCharacter{00F6}{\"o} - \DeclareUnicodeCharacter{00F8}{\o} - \DeclareUnicodeCharacter{00F9}{\`u} - \DeclareUnicodeCharacter{00FA}{\'u} - \DeclareUnicodeCharacter{00FB}{\^u} - \DeclareUnicodeCharacter{00FC}{\"u} - \DeclareUnicodeCharacter{00FD}{\'y} - \DeclareUnicodeCharacter{00FE}{\th} - \DeclareUnicodeCharacter{00FF}{\"y} - - \DeclareUnicodeCharacter{0100}{\=A} - \DeclareUnicodeCharacter{0101}{\=a} - \DeclareUnicodeCharacter{0102}{\u{A}} - \DeclareUnicodeCharacter{0103}{\u{a}} - \DeclareUnicodeCharacter{0104}{\ogonek{A}} - \DeclareUnicodeCharacter{0105}{\ogonek{a}} - \DeclareUnicodeCharacter{0106}{\'C} - \DeclareUnicodeCharacter{0107}{\'c} - \DeclareUnicodeCharacter{0108}{\^C} - \DeclareUnicodeCharacter{0109}{\^c} - \DeclareUnicodeCharacter{0118}{\ogonek{E}} - \DeclareUnicodeCharacter{0119}{\ogonek{e}} - \DeclareUnicodeCharacter{010A}{\dotaccent{C}} - \DeclareUnicodeCharacter{010B}{\dotaccent{c}} - \DeclareUnicodeCharacter{010C}{\v{C}} - \DeclareUnicodeCharacter{010D}{\v{c}} - \DeclareUnicodeCharacter{010E}{\v{D}} - - \DeclareUnicodeCharacter{0112}{\=E} - \DeclareUnicodeCharacter{0113}{\=e} - \DeclareUnicodeCharacter{0114}{\u{E}} - \DeclareUnicodeCharacter{0115}{\u{e}} - \DeclareUnicodeCharacter{0116}{\dotaccent{E}} - \DeclareUnicodeCharacter{0117}{\dotaccent{e}} - \DeclareUnicodeCharacter{011A}{\v{E}} - \DeclareUnicodeCharacter{011B}{\v{e}} - \DeclareUnicodeCharacter{011C}{\^G} - \DeclareUnicodeCharacter{011D}{\^g} - \DeclareUnicodeCharacter{011E}{\u{G}} - \DeclareUnicodeCharacter{011F}{\u{g}} - - \DeclareUnicodeCharacter{0120}{\dotaccent{G}} - \DeclareUnicodeCharacter{0121}{\dotaccent{g}} - \DeclareUnicodeCharacter{0124}{\^H} - \DeclareUnicodeCharacter{0125}{\^h} - \DeclareUnicodeCharacter{0128}{\~I} - \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}} - \DeclareUnicodeCharacter{012A}{\=I} - \DeclareUnicodeCharacter{012B}{\={\dotless{i}}} - \DeclareUnicodeCharacter{012C}{\u{I}} - \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}} - - \DeclareUnicodeCharacter{0130}{\dotaccent{I}} - \DeclareUnicodeCharacter{0131}{\dotless{i}} - \DeclareUnicodeCharacter{0132}{IJ} - \DeclareUnicodeCharacter{0133}{ij} - \DeclareUnicodeCharacter{0134}{\^J} - \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}} - \DeclareUnicodeCharacter{0139}{\'L} - \DeclareUnicodeCharacter{013A}{\'l} - - \DeclareUnicodeCharacter{0141}{\L} - \DeclareUnicodeCharacter{0142}{\l} - \DeclareUnicodeCharacter{0143}{\'N} - \DeclareUnicodeCharacter{0144}{\'n} - \DeclareUnicodeCharacter{0147}{\v{N}} - \DeclareUnicodeCharacter{0148}{\v{n}} - \DeclareUnicodeCharacter{014C}{\=O} - \DeclareUnicodeCharacter{014D}{\=o} - \DeclareUnicodeCharacter{014E}{\u{O}} - \DeclareUnicodeCharacter{014F}{\u{o}} - - \DeclareUnicodeCharacter{0150}{\H{O}} - \DeclareUnicodeCharacter{0151}{\H{o}} - \DeclareUnicodeCharacter{0152}{\OE} - \DeclareUnicodeCharacter{0153}{\oe} - \DeclareUnicodeCharacter{0154}{\'R} - \DeclareUnicodeCharacter{0155}{\'r} - \DeclareUnicodeCharacter{0158}{\v{R}} - \DeclareUnicodeCharacter{0159}{\v{r}} - \DeclareUnicodeCharacter{015A}{\'S} - \DeclareUnicodeCharacter{015B}{\'s} - \DeclareUnicodeCharacter{015C}{\^S} - \DeclareUnicodeCharacter{015D}{\^s} - \DeclareUnicodeCharacter{015E}{\cedilla{S}} - \DeclareUnicodeCharacter{015F}{\cedilla{s}} - - \DeclareUnicodeCharacter{0160}{\v{S}} - \DeclareUnicodeCharacter{0161}{\v{s}} - \DeclareUnicodeCharacter{0162}{\cedilla{t}} - \DeclareUnicodeCharacter{0163}{\cedilla{T}} - \DeclareUnicodeCharacter{0164}{\v{T}} - - \DeclareUnicodeCharacter{0168}{\~U} - \DeclareUnicodeCharacter{0169}{\~u} - \DeclareUnicodeCharacter{016A}{\=U} - \DeclareUnicodeCharacter{016B}{\=u} - \DeclareUnicodeCharacter{016C}{\u{U}} - \DeclareUnicodeCharacter{016D}{\u{u}} - \DeclareUnicodeCharacter{016E}{\ringaccent{U}} - \DeclareUnicodeCharacter{016F}{\ringaccent{u}} - - \DeclareUnicodeCharacter{0170}{\H{U}} - \DeclareUnicodeCharacter{0171}{\H{u}} - \DeclareUnicodeCharacter{0174}{\^W} - \DeclareUnicodeCharacter{0175}{\^w} - \DeclareUnicodeCharacter{0176}{\^Y} - \DeclareUnicodeCharacter{0177}{\^y} - \DeclareUnicodeCharacter{0178}{\"Y} - \DeclareUnicodeCharacter{0179}{\'Z} - \DeclareUnicodeCharacter{017A}{\'z} - \DeclareUnicodeCharacter{017B}{\dotaccent{Z}} - \DeclareUnicodeCharacter{017C}{\dotaccent{z}} - \DeclareUnicodeCharacter{017D}{\v{Z}} - \DeclareUnicodeCharacter{017E}{\v{z}} - - \DeclareUnicodeCharacter{01C4}{D\v{Z}} - \DeclareUnicodeCharacter{01C5}{D\v{z}} - \DeclareUnicodeCharacter{01C6}{d\v{z}} - \DeclareUnicodeCharacter{01C7}{LJ} - \DeclareUnicodeCharacter{01C8}{Lj} - \DeclareUnicodeCharacter{01C9}{lj} - \DeclareUnicodeCharacter{01CA}{NJ} - \DeclareUnicodeCharacter{01CB}{Nj} - \DeclareUnicodeCharacter{01CC}{nj} - \DeclareUnicodeCharacter{01CD}{\v{A}} - \DeclareUnicodeCharacter{01CE}{\v{a}} - \DeclareUnicodeCharacter{01CF}{\v{I}} - - \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}} - \DeclareUnicodeCharacter{01D1}{\v{O}} - \DeclareUnicodeCharacter{01D2}{\v{o}} - \DeclareUnicodeCharacter{01D3}{\v{U}} - \DeclareUnicodeCharacter{01D4}{\v{u}} - - \DeclareUnicodeCharacter{01E2}{\={\AE}} - \DeclareUnicodeCharacter{01E3}{\={\ae}} - \DeclareUnicodeCharacter{01E6}{\v{G}} - \DeclareUnicodeCharacter{01E7}{\v{g}} - \DeclareUnicodeCharacter{01E8}{\v{K}} - \DeclareUnicodeCharacter{01E9}{\v{k}} - - \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}} - \DeclareUnicodeCharacter{01F1}{DZ} - \DeclareUnicodeCharacter{01F2}{Dz} - \DeclareUnicodeCharacter{01F3}{dz} - \DeclareUnicodeCharacter{01F4}{\'G} - \DeclareUnicodeCharacter{01F5}{\'g} - \DeclareUnicodeCharacter{01F8}{\`N} - \DeclareUnicodeCharacter{01F9}{\`n} - \DeclareUnicodeCharacter{01FC}{\'{\AE}} - \DeclareUnicodeCharacter{01FD}{\'{\ae}} - \DeclareUnicodeCharacter{01FE}{\'{\O}} - \DeclareUnicodeCharacter{01FF}{\'{\o}} - - \DeclareUnicodeCharacter{021E}{\v{H}} - \DeclareUnicodeCharacter{021F}{\v{h}} - - \DeclareUnicodeCharacter{0226}{\dotaccent{A}} - \DeclareUnicodeCharacter{0227}{\dotaccent{a}} - \DeclareUnicodeCharacter{0228}{\cedilla{E}} - \DeclareUnicodeCharacter{0229}{\cedilla{e}} - \DeclareUnicodeCharacter{022E}{\dotaccent{O}} - \DeclareUnicodeCharacter{022F}{\dotaccent{o}} - - \DeclareUnicodeCharacter{0232}{\=Y} - \DeclareUnicodeCharacter{0233}{\=y} - \DeclareUnicodeCharacter{0237}{\dotless{j}} - - \DeclareUnicodeCharacter{02DB}{\ogonek{ }} - - \DeclareUnicodeCharacter{1E02}{\dotaccent{B}} - \DeclareUnicodeCharacter{1E03}{\dotaccent{b}} - \DeclareUnicodeCharacter{1E04}{\udotaccent{B}} - \DeclareUnicodeCharacter{1E05}{\udotaccent{b}} - \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}} - \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}} - \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}} - \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}} - \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}} - \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}} - \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}} - \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}} - - \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}} - \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}} - - \DeclareUnicodeCharacter{1E20}{\=G} - \DeclareUnicodeCharacter{1E21}{\=g} - \DeclareUnicodeCharacter{1E22}{\dotaccent{H}} - \DeclareUnicodeCharacter{1E23}{\dotaccent{h}} - \DeclareUnicodeCharacter{1E24}{\udotaccent{H}} - \DeclareUnicodeCharacter{1E25}{\udotaccent{h}} - \DeclareUnicodeCharacter{1E26}{\"H} - \DeclareUnicodeCharacter{1E27}{\"h} - - \DeclareUnicodeCharacter{1E30}{\'K} - \DeclareUnicodeCharacter{1E31}{\'k} - \DeclareUnicodeCharacter{1E32}{\udotaccent{K}} - \DeclareUnicodeCharacter{1E33}{\udotaccent{k}} - \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}} - \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}} - \DeclareUnicodeCharacter{1E36}{\udotaccent{L}} - \DeclareUnicodeCharacter{1E37}{\udotaccent{l}} - \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}} - \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}} - \DeclareUnicodeCharacter{1E3E}{\'M} - \DeclareUnicodeCharacter{1E3F}{\'m} - - \DeclareUnicodeCharacter{1E40}{\dotaccent{M}} - \DeclareUnicodeCharacter{1E41}{\dotaccent{m}} - \DeclareUnicodeCharacter{1E42}{\udotaccent{M}} - \DeclareUnicodeCharacter{1E43}{\udotaccent{m}} - \DeclareUnicodeCharacter{1E44}{\dotaccent{N}} - \DeclareUnicodeCharacter{1E45}{\dotaccent{n}} - \DeclareUnicodeCharacter{1E46}{\udotaccent{N}} - \DeclareUnicodeCharacter{1E47}{\udotaccent{n}} - \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}} - \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}} - - \DeclareUnicodeCharacter{1E54}{\'P} - \DeclareUnicodeCharacter{1E55}{\'p} - \DeclareUnicodeCharacter{1E56}{\dotaccent{P}} - \DeclareUnicodeCharacter{1E57}{\dotaccent{p}} - \DeclareUnicodeCharacter{1E58}{\dotaccent{R}} - \DeclareUnicodeCharacter{1E59}{\dotaccent{r}} - \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}} - \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}} - \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}} - \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}} - - \DeclareUnicodeCharacter{1E60}{\dotaccent{S}} - \DeclareUnicodeCharacter{1E61}{\dotaccent{s}} - \DeclareUnicodeCharacter{1E62}{\udotaccent{S}} - \DeclareUnicodeCharacter{1E63}{\udotaccent{s}} - \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}} - \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}} - \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}} - \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}} - \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}} - \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}} - - \DeclareUnicodeCharacter{1E7C}{\~V} - \DeclareUnicodeCharacter{1E7D}{\~v} - \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}} - \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}} - - \DeclareUnicodeCharacter{1E80}{\`W} - \DeclareUnicodeCharacter{1E81}{\`w} - \DeclareUnicodeCharacter{1E82}{\'W} - \DeclareUnicodeCharacter{1E83}{\'w} - \DeclareUnicodeCharacter{1E84}{\"W} - \DeclareUnicodeCharacter{1E85}{\"w} - \DeclareUnicodeCharacter{1E86}{\dotaccent{W}} - \DeclareUnicodeCharacter{1E87}{\dotaccent{w}} - \DeclareUnicodeCharacter{1E88}{\udotaccent{W}} - \DeclareUnicodeCharacter{1E89}{\udotaccent{w}} - \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}} - \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}} - \DeclareUnicodeCharacter{1E8C}{\"X} - \DeclareUnicodeCharacter{1E8D}{\"x} - \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}} - \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}} - - \DeclareUnicodeCharacter{1E90}{\^Z} - \DeclareUnicodeCharacter{1E91}{\^z} - \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}} - \DeclareUnicodeCharacter{1E93}{\udotaccent{z}} - \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}} - \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}} - \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}} - \DeclareUnicodeCharacter{1E97}{\"t} - \DeclareUnicodeCharacter{1E98}{\ringaccent{w}} - \DeclareUnicodeCharacter{1E99}{\ringaccent{y}} - - \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}} - \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}} - - \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}} - \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}} - \DeclareUnicodeCharacter{1EBC}{\~E} - \DeclareUnicodeCharacter{1EBD}{\~e} - - \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}} - \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}} - \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}} - \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}} - - \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}} - \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}} - - \DeclareUnicodeCharacter{1EF2}{\`Y} - \DeclareUnicodeCharacter{1EF3}{\`y} - \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}} - - \DeclareUnicodeCharacter{1EF8}{\~Y} - \DeclareUnicodeCharacter{1EF9}{\~y} - - \DeclareUnicodeCharacter{2013}{--} - \DeclareUnicodeCharacter{2014}{---} - \DeclareUnicodeCharacter{2018}{\quoteleft} - \DeclareUnicodeCharacter{2019}{\quoteright} - \DeclareUnicodeCharacter{201A}{\quotesinglbase} - \DeclareUnicodeCharacter{201C}{\quotedblleft} - \DeclareUnicodeCharacter{201D}{\quotedblright} - \DeclareUnicodeCharacter{201E}{\quotedblbase} - \DeclareUnicodeCharacter{2022}{\bullet} - \DeclareUnicodeCharacter{2026}{\dots} - \DeclareUnicodeCharacter{2039}{\guilsinglleft} - \DeclareUnicodeCharacter{203A}{\guilsinglright} - \DeclareUnicodeCharacter{20AC}{\euro} - - \DeclareUnicodeCharacter{2192}{\expansion} - \DeclareUnicodeCharacter{21D2}{\result} - - \DeclareUnicodeCharacter{2212}{\minus} - \DeclareUnicodeCharacter{2217}{\point} - \DeclareUnicodeCharacter{2261}{\equiv} -}% end of \utfeightchardefs - - -% US-ASCII character definitions. -\def\asciichardefs{% nothing need be done - \relax -} - -% Make non-ASCII characters printable again for compatibility with -% existing Texinfo documents that may use them, even without declaring a -% document encoding. -% -\setnonasciicharscatcode \other - - -\message{formatting,} - -\newdimen\defaultparindent \defaultparindent = 15pt - -\chapheadingskip = 15pt plus 4pt minus 2pt -\secheadingskip = 12pt plus 3pt minus 2pt -\subsecheadingskip = 9pt plus 2pt minus 2pt - -% Prevent underfull vbox error messages. -\vbadness = 10000 - -% Don't be very finicky about underfull hboxes, either. -\hbadness = 6666 - -% Following George Bush, get rid of widows and orphans. -\widowpenalty=10000 -\clubpenalty=10000 - -% Use TeX 3.0's \emergencystretch to help line breaking, but if we're -% using an old version of TeX, don't do anything. We want the amount of -% stretch added to depend on the line length, hence the dependence on -% \hsize. We call this whenever the paper size is set. -% -\def\setemergencystretch{% - \ifx\emergencystretch\thisisundefined - % Allow us to assign to \emergencystretch anyway. - \def\emergencystretch{\dimen0}% - \else - \emergencystretch = .15\hsize - \fi -} - -% Parameters in order: 1) textheight; 2) textwidth; -% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip; -% 7) physical page height; 8) physical page width. -% -% We also call \setleading{\textleading}, so the caller should define -% \textleading. The caller should also set \parskip. -% -\def\internalpagesizes#1#2#3#4#5#6#7#8{% - \voffset = #3\relax - \topskip = #6\relax - \splittopskip = \topskip - % - \vsize = #1\relax - \advance\vsize by \topskip - \outervsize = \vsize - \advance\outervsize by 2\topandbottommargin - \pageheight = \vsize - % - \hsize = #2\relax - \outerhsize = \hsize - \advance\outerhsize by 0.5in - \pagewidth = \hsize - % - \normaloffset = #4\relax - \bindingoffset = #5\relax - % - \ifpdf - \pdfpageheight #7\relax - \pdfpagewidth #8\relax - % if we don't reset these, they will remain at "1 true in" of - % whatever layout pdftex was dumped with. - \pdfhorigin = 1 true in - \pdfvorigin = 1 true in - \fi - % - \setleading{\textleading} - % - \parindent = \defaultparindent - \setemergencystretch -} - -% @letterpaper (the default). -\def\letterpaper{{\globaldefs = 1 - \parskip = 3pt plus 2pt minus 1pt - \textleading = 13.2pt - % - % If page is nothing but text, make it come out even. - \internalpagesizes{607.2pt}{6in}% that's 46 lines - {\voffset}{.25in}% - {\bindingoffset}{36pt}% - {11in}{8.5in}% -}} - -% Use @smallbook to reset parameters for 7x9.25 trim size. -\def\smallbook{{\globaldefs = 1 - \parskip = 2pt plus 1pt - \textleading = 12pt - % - \internalpagesizes{7.5in}{5in}% - {-.2in}{0in}% - {\bindingoffset}{16pt}% - {9.25in}{7in}% - % - \lispnarrowing = 0.3in - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = .5cm -}} - -% Use @smallerbook to reset parameters for 6x9 trim size. -% (Just testing, parameters still in flux.) -\def\smallerbook{{\globaldefs = 1 - \parskip = 1.5pt plus 1pt - \textleading = 12pt - % - \internalpagesizes{7.4in}{4.8in}% - {-.2in}{-.4in}% - {0pt}{14pt}% - {9in}{6in}% - % - \lispnarrowing = 0.25in - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = .4cm -}} - -% Use @afourpaper to print on European A4 paper. -\def\afourpaper{{\globaldefs = 1 - \parskip = 3pt plus 2pt minus 1pt - \textleading = 13.2pt - % - % Double-side printing via postscript on Laserjet 4050 - % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm. - % To change the settings for a different printer or situation, adjust - % \normaloffset until the front-side and back-side texts align. Then - % do the same for \bindingoffset. You can set these for testing in - % your texinfo source file like this: - % @tex - % \global\normaloffset = -6mm - % \global\bindingoffset = 10mm - % @end tex - \internalpagesizes{673.2pt}{160mm}% that's 51 lines - {\voffset}{\hoffset}% - {\bindingoffset}{44pt}% - {297mm}{210mm}% - % - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = 5mm -}} - -% Use @afivepaper to print on European A5 paper. -% From romildo@urano.iceb.ufop.br, 2 July 2000. -% He also recommends making @example and @lisp be small. -\def\afivepaper{{\globaldefs = 1 - \parskip = 2pt plus 1pt minus 0.1pt - \textleading = 12.5pt - % - \internalpagesizes{160mm}{120mm}% - {\voffset}{\hoffset}% - {\bindingoffset}{8pt}% - {210mm}{148mm}% - % - \lispnarrowing = 0.2in - \tolerance = 800 - \hfuzz = 1.2pt - \contentsrightmargin = 0pt - \defbodyindent = 2mm - \tableindent = 12mm -}} - -% A specific text layout, 24x15cm overall, intended for A4 paper. -\def\afourlatex{{\globaldefs = 1 - \afourpaper - \internalpagesizes{237mm}{150mm}% - {\voffset}{4.6mm}% - {\bindingoffset}{7mm}% - {297mm}{210mm}% - % - % Must explicitly reset to 0 because we call \afourpaper. - \globaldefs = 0 -}} - -% Use @afourwide to print on A4 paper in landscape format. -\def\afourwide{{\globaldefs = 1 - \afourpaper - \internalpagesizes{241mm}{165mm}% - {\voffset}{-2.95mm}% - {\bindingoffset}{7mm}% - {297mm}{210mm}% - \globaldefs = 0 -}} - -% @pagesizes TEXTHEIGHT[,TEXTWIDTH] -% Perhaps we should allow setting the margins, \topskip, \parskip, -% and/or leading, also. Or perhaps we should compute them somehow. -% -\parseargdef\pagesizes{\pagesizesyyy #1,,\finish} -\def\pagesizesyyy#1,#2,#3\finish{{% - \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi - \globaldefs = 1 - % - \parskip = 3pt plus 2pt minus 1pt - \setleading{\textleading}% - % - \dimen0 = #1\relax - \advance\dimen0 by \voffset - % - \dimen2 = \hsize - \advance\dimen2 by \normaloffset - % - \internalpagesizes{#1}{\hsize}% - {\voffset}{\normaloffset}% - {\bindingoffset}{44pt}% - {\dimen0}{\dimen2}% -}} - -% Set default to letter. -% -\letterpaper - - -\message{and turning on texinfo input format.} - -\def^^L{\par} % remove \outer, so ^L can appear in an @comment - -% DEL is a comment character, in case @c does not suffice. -\catcode`\^^? = 14 - -% Define macros to output various characters with catcode for normal text. -\catcode`\"=\other \def\normaldoublequote{"} -\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix -\catcode`\+=\other \def\normalplus{+} -\catcode`\<=\other \def\normalless{<} -\catcode`\>=\other \def\normalgreater{>} -\catcode`\^=\other \def\normalcaret{^} -\catcode`\_=\other \def\normalunderscore{_} -\catcode`\|=\other \def\normalverticalbar{|} -\catcode`\~=\other \def\normaltilde{~} - -% This macro is used to make a character print one way in \tt -% (where it can probably be output as-is), and another way in other fonts, -% where something hairier probably needs to be done. -% -% #1 is what to print if we are indeed using \tt; #2 is what to print -% otherwise. Since all the Computer Modern typewriter fonts have zero -% interword stretch (and shrink), and it is reasonable to expect all -% typewriter fonts to have this, we can check that font parameter. -% -\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} - -% Same as above, but check for italic font. Actually this also catches -% non-italic slanted fonts since it is impossible to distinguish them from -% italic fonts. But since this is only used by $ and it uses \sl anyway -% this is not a problem. -\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} - -% Turn off all special characters except @ -% (and those which the user can use as if they were ordinary). -% Most of these we simply print from the \tt font, but for some, we can -% use math or other variants that look better in normal text. - -\catcode`\"=\active -\def\activedoublequote{{\tt\char34}} -\let"=\activedoublequote -\catcode`\~=\active -\def~{{\tt\char126}} -\chardef\hat=`\^ -\catcode`\^=\active -\def^{{\tt \hat}} - -\catcode`\_=\active -\def_{\ifusingtt\normalunderscore\_} -\let\realunder=_ -% Subroutine for the previous macro. -\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em } - -\catcode`\|=\active -\def|{{\tt\char124}} -\chardef \less=`\< -\catcode`\<=\active -\def<{{\tt \less}} -\chardef \gtr=`\> -\catcode`\>=\active -\def>{{\tt \gtr}} -\catcode`\+=\active -\def+{{\tt \char 43}} -\catcode`\$=\active -\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix - -% If a .fmt file is being used, characters that might appear in a file -% name cannot be active until we have parsed the command line. -% So turn them off again, and have \everyjob (or @setfilename) turn them on. -% \otherifyactive is called near the end of this file. -\def\otherifyactive{\catcode`+=\other \catcode`\_=\other} - -% Used sometimes to turn off (effectively) the active characters even after -% parsing them. -\def\turnoffactive{% - \normalturnoffactive - \otherbackslash -} - -\catcode`\@=0 - -% \backslashcurfont outputs one backslash character in current font, -% as in \char`\\. -\global\chardef\backslashcurfont=`\\ -\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work - -% \realbackslash is an actual character `\' with catcode other, and -% \doublebackslash is two of them (for the pdf outlines). -{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}} - -% In texinfo, backslash is an active character; it prints the backslash -% in fixed width font. -\catcode`\\=\active % @ for escape char from now on. - -% The story here is that in math mode, the \char of \backslashcurfont -% ends up printing the roman \ from the math symbol font (because \char -% in math mode uses the \mathcode, and plain.tex sets -% \mathcode`\\="026E). It seems better for @backslashchar{} to always -% print a typewriter backslash, hence we use an explicit \mathchar, -% which is the decimal equivalent of "715c (class 7, e.g., use \fam; -% ignored family value; char position "5C). We can't use " for the -% usual hex value because it has already been made active. -@def@normalbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}} -@let@backslashchar = @normalbackslash % @backslashchar{} is for user documents. - -% On startup, @fixbackslash assigns: -% @let \ = @normalbackslash -% \rawbackslash defines an active \ to do \backslashcurfont. -% \otherbackslash defines an active \ to be a literal `\' character with -% catcode other. We switch back and forth between these. -@gdef@rawbackslash{@let\=@backslashcurfont} -@gdef@otherbackslash{@let\=@realbackslash} - -% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of -% the literal character `\'. Also revert - to its normal character, in -% case the active - from code has slipped in. -% -{@catcode`- = @active - @gdef@normalturnoffactive{% - @let-=@normaldash - @let"=@normaldoublequote - @let$=@normaldollar %$ font-lock fix - @let+=@normalplus - @let<=@normalless - @let>=@normalgreater - @let\=@normalbackslash - @let^=@normalcaret - @let_=@normalunderscore - @let|=@normalverticalbar - @let~=@normaltilde - @markupsetuplqdefault - @markupsetuprqdefault - @unsepspaces - } -} - -% Make _ and + \other characters, temporarily. -% This is canceled by @fixbackslash. -@otherifyactive - -% If a .fmt file is being used, we don't want the `\input texinfo' to show up. -% That is what \eatinput is for; after that, the `\' should revert to printing -% a backslash. -% -@gdef@eatinput input texinfo{@fixbackslash} -@global@let\ = @eatinput - -% On the other hand, perhaps the file did not have a `\input texinfo'. Then -% the first `\' in the file would cause an error. This macro tries to fix -% that, assuming it is called before the first `\' could plausibly occur. -% Also turn back on active characters that might appear in the input -% file name, in case not using a pre-dumped format. -% -@gdef@fixbackslash{% - @ifx\@eatinput @let\ = @normalbackslash @fi - @catcode`+=@active - @catcode`@_=@active -} - -% Say @foo, not \foo, in error messages. -@escapechar = `@@ - -% These (along with & and #) are made active for url-breaking, so need -% active definitions as the normal characters. -@def@normaldot{.} -@def@normalquest{?} -@def@normalslash{/} - -% These look ok in all fonts, so just make them not special. -% @hashchar{} gets its own user-level command, because of #line. -@catcode`@& = @other @def@normalamp{&} -@catcode`@# = @other @def@normalhash{#} -@catcode`@% = @other @def@normalpercent{%} - -@let @hashchar = @normalhash - -@c Finally, make ` and ' active, so that txicodequoteundirected and -@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we -@c don't make ` and ' active, @code will not get them as active chars. -@c Do this last of all since we use ` in the previous @catcode assignments. -@catcode`@'=@active -@catcode`@`=@active -@markupsetuplqdefault -@markupsetuprqdefault - -@c Local variables: -@c eval: (add-hook 'write-file-hooks 'time-stamp) -@c page-delimiter: "^\\\\message" -@c time-stamp-start: "def\\\\texinfoversion{" -@c time-stamp-format: "%:y-%02m-%02d.%02H" -@c time-stamp-end: "}" -@c End: - -@c vim:sw=2: - -@ignore - arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115 -@end ignore diff --git a/src/hos_libhttpserver/src/libmicrohttpd/doc/version.texi b/src/hos_libhttpserver/src/libmicrohttpd/doc/version.texi deleted file mode 100644 index c8c24ba0..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/doc/version.texi +++ /dev/null @@ -1,4 +0,0 @@ -@set UPDATED 3 April 2015 -@set UPDATED-MONTH April 2015 -@set EDITION 0.9.42 -@set VERSION 0.9.42 diff --git a/src/hos_libhttpserver/src/libmicrohttpd/install-sh b/src/hos_libhttpserver/src/libmicrohttpd/install-sh deleted file mode 100755 index 377bb868..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/install-sh +++ /dev/null @@ -1,527 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2011-11-20.07; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# 'make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call 'install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names problematic for 'test' and other utilities. - case $src in - -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - dst=$dst_arg - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/libmicrohttpd.pc.in b/src/hos_libhttpserver/src/libmicrohttpd/libmicrohttpd.pc.in deleted file mode 100644 index c1e628bb..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/libmicrohttpd.pc.in +++ /dev/null @@ -1,14 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libmicrohttpd -Description: A library for creating an embedded HTTP server -Version: @VERSION@ -Requires: -Requires.private: @MHD_REQ_PRIVATE@ -Conflicts: -Libs: -L${libdir} -lmicrohttpd -Libs.private: @MHD_LIBDEPS_PKGCFG@ -Cflags: -I${includedir} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/libmicrospdy.pc.in b/src/hos_libhttpserver/src/libmicrohttpd/libmicrospdy.pc.in deleted file mode 100644 index fa9062fd..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/libmicrospdy.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libmicrospdy -Description: A library for creating an embedded SPDY server -Version: @VERSION@ -Requires: -Conflicts: -Libs: -L${libdir} -lmicrospdy -Libs.private: @SPDY_LIBDEPS@ -Cflags: -I${includedir} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/ltmain.sh b/src/hos_libhttpserver/src/libmicrohttpd/ltmain.sh deleted file mode 100644 index bffda541..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/ltmain.sh +++ /dev/null @@ -1,9661 +0,0 @@ - -# libtool (GNU libtool) 2.4.2 -# Written by Gordon Matzigkeit , 1996 - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . - -PROGRAM=libtool -PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.11" -TIMESTAMP="" -package_revision=1.3337 - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" -done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL - -$lt_unset CDPATH - - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - - - -: ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" - -dirname="s,/[^/]*$,," -basename="s,^.*/,," - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} - -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} - -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result - -# Make sure we have an absolute path for reexecution: -case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) - progdir=$func_dirname_result - progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" - ;; - *) - save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break - done - IFS="$save_IFS" - test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" - -# Standard options: -opt_dry_run=false -opt_help=false -opt_quiet=false -opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} - -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} - - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} - -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -} - -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} - -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default - - -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} - - -# func_mkdir_p directory-path -# Make sure the entire path to DIRECTORY-PATH is available. -func_mkdir_p () -{ - my_directory_path="$1" - my_dir_list= - - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; - esac - - # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do - # ...make a list in topmost first order. Use a colon delimited - # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" - - # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes - # try to create one of the directories concurrently. Don't - # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : - done - IFS="$save_mkdir_p_IFS" - - # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" - fi -} - - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - - $ECHO "$my_tmpdir" -} - - -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () -{ - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac - - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac -} - - -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac - - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac - - func_quote_for_expand_result="$my_arg" -} - - -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - - -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} - - -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} - -# func_usage -# Echo short help message to standard output and exit. -func_usage () -{ - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? -} - -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. -func_help () -{ - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi -} - -# func_missing_arg argname -# Echo program name prefixed message to standard error and set global -# exit_cmd. -func_missing_arg () -{ - $opt_debug - - func_error "missing argument for $1." - exit_cmd=exit -} - - -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation - -exit_cmd=: - - - - - -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" - -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation - -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation - - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation - - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - -# func_fatal_configuration arg... -# Echo program name prefixed message to standard error, followed by -# a configuration failure hint, and exit. -func_fatal_configuration () -{ - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." -} - - -# func_config -# Display the configuration for all the tags in this script. -func_config () -{ - re_begincf='^# ### BEGIN LIBTOOL' - re_endcf='^# ### END LIBTOOL' - - # Default configuration. - $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - - # Now print the configurations for the tags. - for tagname in $taglist; do - $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" - done - - exit $? -} - -# func_features -# Display the features supported by this script. -func_features () -{ - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - - exit $? -} - -# func_enable_tag tagname -# Verify that TAGNAME is valid, and either flag an error and exit, or -# enable the TAGNAME tag. We also add TAGNAME to the global $taglist -# variable here. -func_enable_tag () -{ - # Global variable: - tagname="$1" - - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac - - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; - *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac -} - -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false - - -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - - $opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } - - - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} - - - - -## ----------- ## -## Main. ## -## ----------- ## - -# func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_lalib_p () -{ - test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -} - -# func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function implements the same check as func_lalib_p without -# resorting to external programs. To this end, it redirects stdin and -# closes it afterwards, without saving the original file descriptor. -# As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. -func_lalib_unsafe_p () -{ - lalib_p=no - if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then - for lalib_p_l in 1 2 3 4 - do - read lalib_p_line - case "$lalib_p_line" in - \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; - esac - done - exec 0<&5 5<&- - fi - test "$lalib_p" = yes -} - -# func_ltwrapper_script_p file -# True iff FILE is a libtool wrapper script -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_script_p () -{ - func_lalib_p "$1" -} - -# func_ltwrapper_executable_p file -# True iff FILE is a libtool wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_executable_p () -{ - func_ltwrapper_exec_suffix= - case $1 in - *.exe) ;; - *) func_ltwrapper_exec_suffix=.exe ;; - esac - $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -} - -# func_ltwrapper_scriptname file -# Assumes file is an ltwrapper_executable -# uses $file to determine the appropriate filename for a -# temporary ltwrapper_script. -func_ltwrapper_scriptname () -{ - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -} - -# func_ltwrapper_p file -# True iff FILE is a libtool wrapper script or wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_p () -{ - func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -} - - -# func_execute_cmds commands fail_cmd -# Execute tilde-delimited COMMANDS. -# If FAIL_CMD is given, eval that upon failure. -# FAIL_CMD may read-access the current command in variable CMD! -func_execute_cmds () -{ - $opt_debug - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs - eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -} - - -# func_source file -# Source FILE, adding directory component if necessary. -# Note that it is not necessary on cygwin/mingw to append a dot to -# FILE even if both FILE and FILE.exe exist: automatic-append-.exe -# behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. -func_source () -{ - $opt_debug - case $1 in - */* | *\\*) . "$1" ;; - *) . "./$1" ;; - esac -} - - -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - $opt_debug - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" -# else -# func_verbose "using $tagname tagged configuration" - fi - ;; - esac - fi -} - - - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () -{ - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi - - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - - $opt_dry_run || { - cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - -# func_mode_compile arg... -func_mode_compile () -{ - $opt_debug - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - pie_flag= - - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" - arg_mode=target - continue - ;; - - -pie | -fpie | -fPIE) - func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. - func_append base_compile " $lastarg" - continue - ;; - - *) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in - arg) - func_fatal_error "you must specify an argument for -Xcompile" - ;; - target) - func_fatal_error "you must specify a target with \`-o'" - ;; - *) - # Get the name of the library object. - test -z "$libobj" && { - func_basename "$srcfile" - libobj="$func_basename_result" - } - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - case $libobj in - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; - esac - - case $libobj in - *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; - *) - func_fatal_error "cannot determine name of library object from \`$libobj'" - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - continue - ;; - - -static) - build_libtool_libs=no - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ - && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." - func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname - - test -z "$base_compile" && \ - func_fatal_help "you must specify a compilation command" - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $ECHO "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code - command="$base_compile $qsrcfile" - fi - - func_mkdir_p "$xdir$objdir" - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ - 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - func_show_eval '$MV "$output_obj" "$lobj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then - suppress_output=' >/dev/null 2>&1' - fi - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code - command="$base_compile $qsrcfile$pie_flag" - else - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then - func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - func_show_eval '$MV "$output_obj" "$obj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - fi - - $opt_dry_run || { - func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - removelist=$lockfile - $RM "$lockfile" - fi - } - - exit $EXIT_SUCCESS -} - -$opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -} - -func_mode_help () -{ - # We need to display help for each of the modes. - case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. - func_help - ;; - - clean) - $ECHO \ -"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - - compile) - $ECHO \ -"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - - execute) - $ECHO \ -"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - - finish) - $ECHO \ -"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - - install) - $ECHO \ -"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The following components of INSTALL-COMMAND are treated specially: - - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - - link) - $ECHO \ -"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - - uninstall) - $ECHO \ -"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - - *) - func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - - echo - $ECHO "Try \`$progname --help' for more information about other modes." -} - -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi - - -# func_mode_execute arg... -func_mode_execute () -{ - $opt_debug - # The first argument is the command name. - cmd="$nonopt" - test -z "$cmd" && \ - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. - for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" - - # Read the libtool library. - dlname= - library_names= - func_source "$file" - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" - continue - fi - - func_dirname "$file" "" "." - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" - fi - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - func_dirname "$file" "" "." - dir="$func_dirname_result" - ;; - - *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then - func_source "$file" - # Transform arg to wrapped name. - file="$progdir/$program" - elif func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - func_source "$func_ltwrapper_scriptname_result" - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - done - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libs= - libdirs= - admincmds= - - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -'"$cmd"'"' - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" - fi - exit $EXIT_SUCCESS -} - -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - -# func_mode_install arg... -func_mode_install () -{ - $opt_debug - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " - arg=$1 - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - no_mode=: - for arg - do - arg2= - if test -n "$dest"; then - func_append files " $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - if $install_cp; then :; else - prev=$arg - fi - ;; - -g | -m | -o) - prev=$arg - ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ - func_fatal_help "you must specify an install program" - - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" - else - func_fatal_help "you must specify a destination" - fi - fi - - # Strip any trailing slash from the destination. - func_stripname '' '/' "$dest" - dest=$func_stripname_result - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" - - # Not a directory, so check to see that there is only one file specified. - set dummy $files; shift - test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - func_fatal_help "\`$destdir' must be an absolute directory name" - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - func_append staticlibs " $file" - ;; - - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" - - library_names= - old_library= - relink_command= - func_source "$file" - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" - func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" - func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' - fi - - # See the names of the shared library. - set dummy $library_names; shift - if test -n "$1"; then - realname="$1" - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) - tstripme="" - ;; - esac - ;; - esac - if test -n "$tstripme" && test -n "$striplib"; then - func_show_eval "$striplib $destdir/$realname" 'exit $?' - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - - # Install the pseudo-library for information purposes. - func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - func_lo2o "$destfile" - staticdest=$func_lo2o_result - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" - ;; - esac - - # Install the libtool object if requested. - test -n "$destfile" && \ - func_show_eval "$install_prog $file $destfile" 'exit $?' - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - func_lo2o "$file" - staticobj=$func_lo2o_result - func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - func_stripname '' '.exe' "$file" - file=$func_stripname_result - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result - else - func_stripname '' '.exe' "$file" - wrapper=$func_stripname_result - fi - ;; - *) - wrapper=$file - ;; - esac - if func_ltwrapper_script_p "$wrapper"; then - notinst_deplibs= - relink_command= - - func_source "$wrapper" - - # Check the variables that should have been set. - test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - func_source "$lib" - fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no - fi - done - - relink_command= - func_source "$wrapper" - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - $opt_dry_run || { - if test "$finalize" = yes; then - tmpdir=`func_mktempdir` - func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" - } - if eval "$relink_command"; then : - else - func_error "error: relink \`$file' with the above command before installing it" - $opt_dry_run || ${RM}r "$tmpdir" - continue - fi - file="$outputname" - else - func_warning "cannot relink \`$file'" - fi - } - else - # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - func_stripname '' '.exe' "$destfile" - destfile=$func_stripname_result - ;; - esac - ;; - esac - func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' - $opt_dry_run || if test -n "$outputname"; then - ${RM}r "$tmpdir" - fi - ;; - esac - done - - for file in $staticlibs; do - func_basename "$file" - name="$func_basename_result" - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. - func_execute_cmds "$old_postinstall_cmds" 'exit $?' - done - - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = install && func_mode_install ${1+"$@"} - - -# func_generate_dlsyms outputname originator pic_p -# Extract symbols from dlprefiles and create ${outputname}S.o with -# a dlpreopen symbol table. -func_generate_dlsyms () -{ - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` - my_dlsyms= - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" - else - func_error "not configured to extract global symbols from dlpreopened files" - fi - fi - - if test -n "$my_dlsyms"; then - case $my_dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" - - func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - - # Parse the name list into a source file. - func_verbose "creating $output_objdir/$my_dlsyms" - - $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" - - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { - eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { - eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } - fi - fi - - for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac - done - - $opt_dry_run || { - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if $GREP -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - $GREP -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - - echo >> "$output_objdir/$my_dlsyms" "\ - -/* The mapping between symbol names and symbols. */ -typedef struct { - const char *name; - void *address; -} lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," - - case $need_lib_prefix in - no) - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - *) - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac - echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_${my_prefix}_LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - } # !$opt_dry_run - - pic_flag_for_symtable= - case "$compile_command " in - *" -static "*) ;; - *) - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; - *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi - ;; - esac - ;; - esac - symtab_cflags= - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; - esac - done - - # Now compile the dynamic symbol file. - func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - - # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' - - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; - *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi -} - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. -func_win32_libid () -{ - $opt_debug - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $ECHO "$win32_libid_type" -} - -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" - fi -} - - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - $opt_debug - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - func_basename "$my_xlib" - my_xlib="$func_basename_result" - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - func_arith $extracted_serial + 1 - extracted_serial=$func_arith_result - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - - func_mkdir_p "$my_xdir" - - case $host in - *-darwin*) - func_verbose "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - $opt_dry_run || { - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` - darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` - if test -n "$darwin_arches"; then - darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ - cd "$darwin_orig_dir" - else - cd $darwin_orig_dir - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - } # !$opt_dry_run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -} - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=${1-no} - - $ECHO "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - generated_by_libtool_version='$macro_version' - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then - thisdir=\`pwd\` - fi - # remove .libs from thisdir - case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $ECHO "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $MKDIR \"\$progdir\" - else - $RM \"\$progdir/\$file\" - fi" - - $ECHO "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi - fi - - $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $RM \"\$progdir/\$program\"; - $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $RM \"\$progdir/\$file\" - fi" - else - $ECHO "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $ECHO "\ - - if test -f \"\$progdir/\$program\"; then" - - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var -" - fi - - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" -} - - -# func_emit_cwrapperexe_src -# emit the source code for a wrapper executable on stdout -# Must ONLY be called from within func_mode_link because -# it depends on a number of variable set therein. -func_emit_cwrapperexe_src () -{ - cat < -#include -#ifdef _MSC_VER -# include -# include -# include -#else -# include -# include -# ifdef __CYGWIN__ -# include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ -#endif - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef S_IXOTH -# define S_IXOTH 0 -#endif -#ifndef S_IXGRP -# define S_IXGRP 0 -#endif - -/* path handling portability macros */ -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# define FOPEN_WB "wb" -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#ifndef FOPEN_WB -# define FOPEN_WB "w" -#endif -#ifndef _O_BINARY -# define _O_BINARY 0 -#endif - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; -#else -static int lt_debug = 0; -#endif - -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - -void *xmalloc (size_t num); -char *xstrdup (const char *string); -const char *base_name (const char *name); -char *find_executable (const char *wrapper); -char *chase_symlinks (const char *pathspec); -int make_executable (const char *path); -int check_executable (const char *path); -char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); -void lt_setenv (const char *name, const char *value); -char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_update_exe_path (const char *name, const char *value); -void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); -EOF - - cat <= 0) - && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) - return 1; - else - return 0; -} - -int -make_executable (const char *path) -{ - int rval = 0; - struct stat st; - - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); - if ((!path) || (!*path)) - return 0; - - if (stat (path, &st) >= 0) - { - rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); - } - return rval; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise - Does not chase symlinks, even on platforms that support them. -*/ -char * -find_executable (const char *wrapper) -{ - int has_slash = 0; - const char *p; - const char *p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char *concat_name; - - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char *path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char *q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR (*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = - XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - return NULL; -} - -char * -chase_symlinks (const char *pathspec) -{ -#ifndef S_ISLNK - return xstrdup (pathspec); -#else - char buf[LT_PATHMAX]; - struct stat s; - char *tmp_pathspec = xstrdup (pathspec); - char *p; - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) - { - has_symlinks = 1; - break; - } - - /* search backwards for last DIR_SEPARATOR */ - p = tmp_pathspec + strlen (tmp_pathspec) - 1; - while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - p--; - if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - { - /* no more DIR_SEPARATORS left */ - break; - } - *p = '\0'; - } - else - { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); - - if (!has_symlinks) - { - return xstrdup (pathspec); - } - - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); -#endif -} - -char * -strendzap (char *str, const char *pat) -{ - size_t len, patlen; - - assert (str != NULL); - assert (pat != NULL); - - len = strlen (str); - patlen = strlen (pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp (str, pat) == 0) - *str = '\0'; - } - return str; -} - -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - -static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, - const char *message, va_list ap) -{ - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *file, int line, const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); -} - -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - -void -lt_setenv (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); - { -#ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ - char *str = xstrdup (value); - setenv (name, str, 1); -#else - int len = strlen (name) + 1 + strlen (value) + 1; - char *str = XMALLOC (char, len); - sprintf (str, "%s=%s", name, value); - if (putenv (str) != EXIT_SUCCESS) - { - XFREE (str); - } -#endif - } -} - -char * -lt_extend_str (const char *orig_value, const char *add, int to_end) -{ - char *new_value; - if (orig_value && *orig_value) - { - int orig_value_len = strlen (orig_value); - int add_len = strlen (add); - new_value = XMALLOC (char, add_len + orig_value_len + 1); - if (to_end) - { - strcpy (new_value, orig_value); - strcpy (new_value + orig_value_len, add); - } - else - { - strcpy (new_value, add); - strcpy (new_value + add_len, orig_value); - } - } - else - { - new_value = xstrdup (add); - } - return new_value; -} - -void -lt_update_exe_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - /* some systems can't cope with a ':'-terminated path #' */ - int len = strlen (new_value); - while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) - { - new_value[len-1] = '\0'; - } - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -void -lt_update_lib_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} -EOF -} -# end: func_emit_cwrapperexe_src - -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - -# func_mode_link arg... -func_mode_link () -{ - $opt_debug - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra - # flag for every libtool invocation. - # allow_undefined=no - - # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not - # even a static library is built. For now, we need to specify - # -no-undefined on the libtool link line when we can be certain - # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes - ;; - *) - allow_undefined=yes - ;; - esac - libtool_args=$nonopt - base_compile="$nonopt $@" - compile_command=$nonopt - finalize_command=$nonopt - - compile_rpath= - finalize_rpath= - compile_shlibpath= - finalize_shlibpath= - convenience= - old_convenience= - deplibs= - old_deplibs= - compiler_flags= - linker_flags= - dllsearchpath= - lib_search_path=`pwd` - inst_prefix_dir= - new_inherited_linker_flags= - - avoid_version=no - bindir= - dlfiles= - dlprefiles= - dlself=no - export_dynamic=no - export_symbols= - export_symbols_regex= - generated= - libobjs= - ltlibs= - module=no - no_install=no - objs= - non_pic_objects= - precious_files_regex= - prefer_static_libs=no - preload=no - prev= - prevarg= - release= - rpath= - xrpath= - perm_rpath= - temp_rpath= - thread_safe=no - vinfo= - vinfo_number=no - weak_libs= - single_module="${wl}-single_module" - func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - break - ;; - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - func_warning "complete static linking is impossible in this configuration" - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - func_append compile_command " @OUTPUT@" - func_append finalize_command " @OUTPUT@" - ;; - esac - - case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - func_append compile_command " @SYMFILE@" - func_append finalize_command " @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - func_append dlfiles " $arg" - else - func_append dlprefiles " $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - framework) - case $host in - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; - esac - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat "$save_arg"` - do -# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - done - else - func_fatal_error "link input file \`$arg' does not exist" - fi - arg=$save_arg - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) func_append xrpath " $arg" ;; - esac - fi - prev= - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - weak) - func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - # See comment for -static flag below, for more details. - func_append compile_command " $link_static_flag" - func_append finalize_command " $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -bindir) - prev=bindir - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - func_fatal_error "more than one -exported-symbols argument is not allowed" - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework) - prev=framework - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - func_append compile_command " $arg" - func_append finalize_command " $arg" - ;; - esac - continue - ;; - - -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; - *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - func_append deplibs " $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; - - -multi_module) - single_module="${wl}-multi_module" - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - func_stripname '-R' '' "$arg" - dir=$func_stripname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - continue - ;; - - -shared) - # The effects of -shared are defined in a previous loop. - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -weak) - prev=weak - continue - ;; - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" - func_append compiler_flags " $arg" - continue - ;; - - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - *.$objext) - # A standard object. - func_append objs " $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - ;; - - *.$libext) - # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else - func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - done # argument parsing loop - - test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - - # Determine the type of output - case $output in - "") - func_fatal_help "you must specify an output file" - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then - case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append libs " $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac - func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - - case $linkmode in - lib) - passes="conv dlpreopen link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - - for pass in $passes; do - # The preopen pass in lib mode reverses $deplibs; put it back here - # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then - ## FIXME: Find the place where the list is rebuilt in the wrong - ## order, and fix it there properly - tmp_deplibs= - for deplib in $deplibs; do - tmp_deplibs="$deplib $tmp_deplibs" - done - deplibs="$tmp_deplibs" - fi - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then - # Collect and forward deplibs of preopened libtool libs - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= - func_resolve_sysroot "$lib" - case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; - esac - done - done - libs="$dlprefiles" - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" - continue - fi - func_stripname '-l' '' "$deplib" - name=$func_stripname_result - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" - fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - # Linking convenience modules into shared libraries is allowed, - # but linking other static libraries is non-portable. - case " $dlpreconveniencelibs " in - *" $deplib "*) ;; - *) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - ;; - esac - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append newdlfiles " $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" - - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - inherited_linker_flags= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - func_source "$lib" - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" - else - func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" - func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" - fi - ;; - esac - func_basename "$lib" - laname="$func_basename_result" - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" - name=$func_stripname_result - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then - func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; - esac - # This is a shared library - - # Warn about portability, can't link against -module's on some - # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" - for dlpremoduletest in $dlprefiles; do - if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" - break - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else - $ECHO "*** Warning: Linking the shared library $output against the loadable module" - fi - $ECHO "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - shift - realname="$1" - shift - libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw* | *cegcc*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - func_basename "$soroot" - soname="$func_basename_result" - func_stripname 'lib' '.dll' "$soname" - newlib=libimp-$func_stripname_result.a - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - func_verbose "extracting exported symbol list from \`$soname'" - func_execute_cmds "$extract_expsyms_cmds" 'exit $?' - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" - func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not - # link against it, someone is ignoring the earlier warnings - if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - elif test -n "$old_library"; then - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - func_fatal_configuration "unsupported hardcode properties" - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) func_stripname '-R' '' "$libdir" - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; - esac;; - *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi - func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - path= - case $deplib in - -L*) path="$deplib" ;; - *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." - dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" - fi - ;; - esac - if $GREP "^installed=no" $deplib > /dev/null; then - case $host in - *-*-darwin*) - depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi - ;; - *) - path="-L$absdir/$objdir" - ;; - esac - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" - - path="-L$absdir" - fi - ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; - esac - ;; - *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" - - test -n "$release" && \ - func_warning "\`-release' is ignored for archives" - - test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - func_append objs "$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" - - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" - fi - fi - - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" - - set dummy $rpath - shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" - - install_libdir="$1" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" - - test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - shift - IFS="$save_ifs" - - test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$1" - number_minor="$2" - number_revision="$3" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; - esac - ;; - no) - current="$1" - revision="$2" - age="$3" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - func_arith $current + 1 - minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current" - ;; - - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - func_arith $current - $age - else - func_arith $current - $age + 1 - fi - major=$func_arith_result - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - func_arith $revision - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) # correct to gnu/linux during the next big refactor - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - ;; - - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - func_append verstring ":${current}.0" - ;; - - qnx) - major=".$current" - versuffix=".$current" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - - *) - func_fatal_configuration "unknown library version type \`$version_type'" - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - fi - - func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$ECHO "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext | *.gcno) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - func_append removelist " $p" - ;; - *) ;; - esac - done - test -n "$removelist" && \ - func_show_eval "${RM}r \$removelist" - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $opt_dry_run || $RM conftest.c - cat > conftest.c </dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | - $GREP " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a file magic. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - for a_deplib in $deplibs; do - case $a_deplib in - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a regex pattern. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi - case $tmp_deplibs in - *[!\ \ ]*) - echo - if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." - else - echo "*** Warning: inter-library dependencies are not known to be supported." - fi - echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - ;; - esac - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - func_append linknames " $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" - fi - - orig_export_symbols= - case $host_os in - cygwin* | mingw* | cegcc*) - if test -n "$export_symbols" && test -z "$export_symbols_regex"; then - # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then - # and it's NOT already a .def file. Must figure out - # which of the given symbols are data symbols and tag - # them as such. So, trigger use of export_symbols_cmds. - # export_symbols gets reassigned inside the "prepare - # the list of exported symbols" if statement, so the - # include_expsyms logic still works. - orig_export_symbols="$export_symbols" - export_symbols= - always_export_symbols=yes - fi - fi - ;; - esac - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do - IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. - func_verbose "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - func_append tmp_deplibs " $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && - test -z "$libobjs"; then - # extract the archives, so we have objects to list. - # TODO: could optimize this to just extract one archive. - whole_archive_flag_spec= - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - func_len " $test_cmds" && - len=$func_len_result && - test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise - # or, if using GNU ld and skipped_export is not :, use a linker - # script. - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - func_basename "$output" - output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - last_robj= - k=1 - - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output - for obj in $save_libobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" - : > $output - set x $save_libobjs - shift - firstobj= - if test "$compiler_needs_object" = yes; then - firstobj="$1 " - shift - fi - for obj - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext - eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - if test "X$objlist" = X || - test "$len" -lt "$max_cmd_len"; then - func_append objlist " $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi - func_append delfiles " $output" - - else - output= - fi - - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - - test -n "$save_libobjs" && - func_verbose "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - if test -n "$export_symbols_regex" && ${skipped_export-false}; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - - if ${skipped_export-false}; then - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - fi - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - fi - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. - eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - func_show_eval '${RM}r "$gentop"' - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" - - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" - - test -n "$release" && \ - func_warning "\`-release' is ignored for objects" - - case $output in - *.lo) - test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" - - libobj=$output - func_lo2o "$libobj" - obj=$func_lo2o_result - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $opt_dry_run || $RM $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - func_execute_cmds "$reload_cmds" 'exit $?' - fi - - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" - - test -n "$release" && \ - func_warning "\`-release' is ignored for programs" - - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - case $host in - *-*-darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - - # template prelinking step - if test -n "$prelink_cmds"; then - func_execute_cmds "$prelink_cmds" 'exit $?' - fi - - wrappers_required=yes - case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' - fi - - exit $exit_status - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Now create the wrapper script. - func_verbose "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. - $opt_dry_run || { - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) func_stripname '' '.exe' "$output" - output=$func_stripname_result ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $RM $cwrappersource $cwrapper - trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - func_emit_cwrapperexe_src > $cwrappersource - - # The wrapper executable is built using the $host compiler, - # because it contains $host paths and files. If cross- - # compiling, it, like the target executable, must be - # executed on the $host or under an emulation environment. - $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource - $STRIP $cwrapper - } - - # Now, create the wrapper script for func_source use: - func_ltwrapper_scriptname $cwrapper - $RM $func_ltwrapper_scriptname_result - trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 - $opt_dry_run || { - # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then - $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else - func_emit_wrapper no > $func_ltwrapper_scriptname_result - fi - } - ;; - * ) - $RM $output - trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - - func_emit_wrapper no > $output - chmod +x $output - ;; - esac - } - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - func_basename "$obj" - $ECHO "$func_basename_result" - done | sort | sort -uc >/dev/null 2>&1); then - : - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - func_basename "$obj" - objbase="$func_basename_result" - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - func_arith $counter + 1 - counter=$func_arith_result - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" - ;; - *) func_append oldobjs " $obj" ;; - esac - done - fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - oldobjs= - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - for obj in $save_oldobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - func_append objlist " $obj" - if test "$len" -lt "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - func_execute_cmds "$cmds" 'exit $?' - done - - test -n "$generated" && \ - func_show_eval "${RM}r$generated" - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - func_verbose "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - # Only create the output if not a dry run. - $opt_dry_run || { - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - func_basename "$deplib" - name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - - for lib in $dlfiles; do - case $lib in - *.la) - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; - *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - *.la) - # Only pass preopened files to the pseudo-archive (for - # eventual linking with the app. that links it) if we - # didn't already link the preopened objects directly into - # the library: - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; - esac - $ECHO > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='$new_inherited_linker_flags' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Names of additional weak libraries provided by this library -weak_library_names='$weak_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $ECHO >> $output "\ -relink_command=\"$relink_command\"" - fi - done - } - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' - ;; - esac - exit $EXIT_SUCCESS -} - -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -# func_mode_uninstall arg... -func_mode_uninstall () -{ - $opt_debug - RM="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; - esac - done - - test -z "$RM" && \ - func_fatal_help "you must specify an RM program" - - rmdirs= - - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" - else - odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" - - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then - case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if { test -L "$file"; } >/dev/null 2>&1 || - { test -h "$file"; } >/dev/null 2>&1 || - test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if func_lalib_p "$file"; then - func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - func_append rmfiles " $odir/$n" - done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" - - case "$opt_mode" in - clean) - case " $library_names " in - *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if func_lalib_p "$file"; then - - # Read the .lo file - func_source $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) - func_stripname '' '.exe' "$file" - file=$func_stripname_result - func_stripname '' '.exe' "$name" - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe - func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. - if func_ltwrapper_p "$file"; then - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename - fi - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - func_show_eval "rmdir $dir >/dev/null 2>&1" - fi - done - - exit $exit_status -} - -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - -test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" -} - -test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" - -if test -n "$exec_cmd"; then - eval exec "$exec_cmd" - exit $EXIT_FAILURE -fi - -exit $exit_status - - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/m4/Makefile.am deleted file mode 100644 index 165d2475..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -# This Makefile.am is in the public domain -EXTRA_DIST = libcurl.m4 diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/m4/Makefile.in deleted file mode 100644 index 0998c05b..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/Makefile.in +++ /dev/null @@ -1,483 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -EXTRA_DIST = libcurl.m4 -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu m4/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_append_compile_flags.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_append_compile_flags.m4 deleted file mode 100644 index dc7b8660..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_append_compile_flags.m4 +++ /dev/null @@ -1,65 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS]) -# -# DESCRIPTION -# -# For every FLAG1, FLAG2 it is checked whether the compiler works with the -# flag. If it does, the flag is added FLAGS-VARIABLE -# -# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. -# CFLAGS) is used. During the check the flag is always added to the -# current language's flags. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# NOTE: This macro depends on the AX_APPEND_FLAG and -# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with -# AX_APPEND_LINK_FLAGS. -# -# LICENSE -# -# Copyright (c) 2011 Maarten Bosmans -# -# 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 3 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, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 4 - -AC_DEFUN([AX_APPEND_COMPILE_FLAGS], -[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) -AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) -for flag in $1; do - AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3]) -done -])dnl AX_APPEND_COMPILE_FLAGS diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_append_flag.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_append_flag.m4 deleted file mode 100644 index 1d38b76f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_append_flag.m4 +++ /dev/null @@ -1,69 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) -# -# DESCRIPTION -# -# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space -# added in between. -# -# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. -# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains -# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly -# FLAG. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# 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 3 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, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 2 - -AC_DEFUN([AX_APPEND_FLAG], -[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX -AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl -AS_VAR_SET_IF(FLAGS, - [case " AS_VAR_GET(FLAGS) " in - *" $1 "*) - AC_RUN_LOG([: FLAGS already contains $1]) - ;; - *) - AC_RUN_LOG([: FLAGS="$FLAGS $1"]) - AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"]) - ;; - esac], - [AS_VAR_SET(FLAGS,["$1"])]) -AS_VAR_POPDEF([FLAGS])dnl -])dnl AX_APPEND_FLAG diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_check_compile_flag.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_check_compile_flag.m4 deleted file mode 100644 index 51df0c09..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_check_compile_flag.m4 +++ /dev/null @@ -1,74 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the current language's compiler -# or gives an error. (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# 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 3 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, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 3 - -AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_COMPILE_FLAGS diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_check_link_flag.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_check_link_flag.m4 deleted file mode 100644 index db899ddd..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_check_link_flag.m4 +++ /dev/null @@ -1,73 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the linker or gives an error. -# (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the linker's default flags -# when the check is done. The check is thus made with the flags: "LDFLAGS -# EXTRA-FLAGS FLAG". This can for example be used to force the linker to -# issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_LINK_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# 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 3 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, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 3 - -AC_DEFUN([AX_CHECK_LINK_FLAG], -[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl -AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [ - ax_check_save_flags=$LDFLAGS - LDFLAGS="$LDFLAGS $4 $1" - AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - LDFLAGS=$ax_check_save_flags]) -AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_LINK_FLAGS diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_check_openssl.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_check_openssl.m4 deleted file mode 100644 index a87c5a6b..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_check_openssl.m4 +++ /dev/null @@ -1,124 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_openssl.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_OPENSSL([action-if-found[, action-if-not-found]]) -# -# DESCRIPTION -# -# Look for OpenSSL in a number of default spots, or in a user-selected -# spot (via --with-openssl). Sets -# -# OPENSSL_INCLUDES to the include directives required -# OPENSSL_LIBS to the -l directives required -# OPENSSL_LDFLAGS to the -L or -R flags required -# -# and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately -# -# This macro sets OPENSSL_INCLUDES such that source files should use the -# openssl/ directory in include directives: -# -# #include -# -# LICENSE -# -# Copyright (c) 2009,2010 Zmanda Inc. -# Copyright (c) 2009,2010 Dustin J. Mitchell -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 8 - -AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL]) -AC_DEFUN([AX_CHECK_OPENSSL], [ - found=false - AC_ARG_WITH([openssl], - [AS_HELP_STRING([--with-openssl=DIR], - [root of the OpenSSL directory])], - [ - case "$withval" in - "" | y | ye | yes | n | no) - AC_MSG_ERROR([Invalid --with-openssl value]) - ;; - *) ssldirs="$withval" - ;; - esac - ], [ - # if pkg-config is installed and openssl has installed a .pc file, - # then use that information and don't search ssldirs - AC_PATH_PROG([PKG_CONFIG], [pkg-config]) - if test x"$PKG_CONFIG" != x""; then - OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null` - if test $? = 0; then - OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null` - OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null` - found=true - fi - fi - - # no such luck; use some default ssldirs - if ! $found; then - ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr" - fi - ] - ) - - - # note that we #include , so the OpenSSL headers have to be in - # an 'openssl' subdirectory - - if ! $found; then - OPENSSL_INCLUDES= - for ssldir in $ssldirs; do - AC_MSG_CHECKING([for openssl/ssl.h in $ssldir]) - if test -f "$ssldir/include/openssl/ssl.h"; then - OPENSSL_INCLUDES="-I$ssldir/include" - OPENSSL_LDFLAGS="-L$ssldir/lib" - OPENSSL_LIBS="-lssl -lcrypto" - found=true - AC_MSG_RESULT([yes]) - break - else - AC_MSG_RESULT([no]) - fi - done - - # if the file wasn't found, well, go ahead and try the link anyway -- maybe - # it will just work! - fi - - # try the preprocessor and linker with our new flags, - # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS - - AC_MSG_CHECKING([whether compiling and linking against OpenSSL works]) - echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \ - "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD - - save_LIBS="$LIBS" - save_LDFLAGS="$LDFLAGS" - save_CPPFLAGS="$CPPFLAGS" - LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS" - LIBS="$OPENSSL_LIBS $LIBS" - CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([#include ], [SSL_new(NULL)])], - [ - AC_MSG_RESULT([yes]) - $1 - ], [ - AC_MSG_RESULT([no]) - $2 - ]) - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - - AC_SUBST([OPENSSL_INCLUDES]) - AC_SUBST([OPENSSL_LIBS]) - AC_SUBST([OPENSSL_LDFLAGS]) -]) diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_count_cpus.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_count_cpus.m4 deleted file mode 100644 index 39b68d32..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_count_cpus.m4 +++ /dev/null @@ -1,66 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_count_cpus.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COUNT_CPUS -# -# DESCRIPTION -# -# Attempt to count the number of processors present on the machine. If the -# detection fails, then a value of 1 is assumed. -# -# The value is placed in the CPU_COUNT variable. -# -# LICENSE -# -# Copyright (c) 2014 Karlson2k (Evgeny Grin) -# Copyright (c) 2012 Brian Aker -# Copyright (c) 2008 Michael Paul Bailey -# Copyright (c) 2008 Christophe Tournayre -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 10 - - AC_DEFUN([AX_COUNT_CPUS],[ - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_PROG_EGREP]) - AC_MSG_CHECKING([the number of available CPUs]) - CPU_COUNT="0" - - AS_CASE([$host_os],[ - *darwin*],[ - AS_IF([test -x /usr/sbin/sysctl],[ - sysctl_a=`/usr/sbin/sysctl -a 2>/dev/null| grep -c hw.cpu` - AS_IF([test sysctl_a],[ - CPU_COUNT=`/usr/sbin/sysctl -n hw.ncpu` - ]) - ])],[ - *linux*],[ - AS_IF([test "x$CPU_COUNT" = "x0" -a -e /proc/cpuinfo],[ - AS_IF([test "x$CPU_COUNT" = "x0" -a -e /proc/cpuinfo],[ - CPU_COUNT=`$EGREP -c '^processor' /proc/cpuinfo` - ]) - ])],[ - *mingw*],[ - AS_IF([test -n "$NUMBER_OF_PROCESSORS"],[ - CPU_COUNT="$NUMBER_OF_PROCESSORS" - ])],[ - *cygwin*],[ - AS_IF([test -n "$NUMBER_OF_PROCESSORS"],[ - CPU_COUNT="$NUMBER_OF_PROCESSORS" - ]) - ]) - - AS_IF([test "x$CPU_COUNT" = "x0"],[ - CPU_COUNT="1" - AC_MSG_RESULT( [unable to detect (assuming 1)] ) - ],[ - AC_MSG_RESULT( $CPU_COUNT ) - ]) - ]) diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_have_epoll.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_have_epoll.m4 deleted file mode 100644 index 07ceb49f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_have_epoll.m4 +++ /dev/null @@ -1,104 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_have_epoll.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_HAVE_EPOLL([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# AX_HAVE_EPOLL_PWAIT([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# DESCRIPTION -# -# This macro determines whether the system supports the epoll I/O event -# interface. A neat usage example would be: -# -# AX_HAVE_EPOLL( -# [AX_CONFIG_FEATURE_ENABLE(epoll)], -# [AX_CONFIG_FEATURE_DISABLE(epoll)]) -# AX_CONFIG_FEATURE( -# [epoll], [This platform supports epoll(7)], -# [HAVE_EPOLL], [This platform supports epoll(7).]) -# -# The epoll interface was added to the Linux kernel in version 2.5.45, and -# the macro verifies that a kernel newer than this is installed. This -# check is somewhat unreliable if doesn't match the -# running kernel, but it is necessary regardless, because glibc comes with -# stubs for the epoll_create(), epoll_wait(), etc. that allow programs to -# compile and link even if the kernel is too old; the problem would then -# be detected only at runtime. -# -# Linux kernel version 2.6.19 adds the epoll_pwait() call in addition to -# epoll_wait(). The availability of that function can be tested with the -# second macro. Generally speaking, it is safe to assume that -# AX_HAVE_EPOLL would succeed if AX_HAVE_EPOLL_PWAIT has, but not the -# other way round. -# -# LICENSE -# -# Copyright (c) 2008 Peter Simons -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 10 - -AC_DEFUN([AX_HAVE_EPOLL], [dnl - ax_have_epoll_cppflags="${CPPFLAGS}" - AC_CHECK_HEADER([linux/version.h], [CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX_VERSION_H"]) - AC_MSG_CHECKING([for Linux epoll(7) interface]) - AC_CACHE_VAL([ax_cv_have_epoll], [dnl - AC_LINK_IFELSE([dnl - AC_LANG_PROGRAM([dnl -#include -#ifdef HAVE_LINUX_VERSION_H -# include -# if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,45) -# error linux kernel version is too old to have epoll -# endif -#endif -], [dnl -int fd, rc; -struct epoll_event ev; -fd = epoll_create(128); -rc = epoll_wait(fd, &ev, 1, 0);])], - [ax_cv_have_epoll=yes], - [ax_cv_have_epoll=no])]) - CPPFLAGS="${ax_have_epoll_cppflags}" - AS_IF([test "${ax_cv_have_epoll}" = "yes"], - [AC_MSG_RESULT([yes]) -$1],[AC_MSG_RESULT([no]) -$2]) -])dnl - -AC_DEFUN([AX_HAVE_EPOLL_PWAIT], [dnl - ax_have_epoll_cppflags="${CPPFLAGS}" - AC_CHECK_HEADER([linux/version.h], - [CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX_VERSION_H"]) - AC_MSG_CHECKING([for Linux epoll(7) interface with signals extension]) - AC_CACHE_VAL([ax_cv_have_epoll_pwait], [dnl - AC_LINK_IFELSE([dnl - AC_LANG_PROGRAM([dnl -#ifdef HAVE_LINUX_VERSION_H -# include -# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -# error linux kernel version is too old to have epoll_pwait -# endif -#endif -#include -#include -], [dnl -int fd, rc; -struct epoll_event ev; -fd = epoll_create(128); -rc = epoll_wait(fd, &ev, 1, 0); -rc = epoll_pwait(fd, &ev, 1, 0, (sigset_t const *)(0));])], - [ax_cv_have_epoll_pwait=yes], - [ax_cv_have_epoll_pwait=no])]) - CPPFLAGS="${ax_have_epoll_cppflags}" - AS_IF([test "${ax_cv_have_epoll_pwait}" = "yes"], - [AC_MSG_RESULT([yes]) -$1],[AC_MSG_RESULT([no]) -$2]) -])dnl diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_pthread.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_pthread.m4 deleted file mode 100644 index d383ad5c..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_pthread.m4 +++ /dev/null @@ -1,332 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pthread.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro figures out how to build C programs using POSIX threads. It -# sets the PTHREAD_LIBS output variable to the threads library and linker -# flags, and the PTHREAD_CFLAGS output variable to any special C compiler -# flags that are needed. (The user can also force certain compiler -# flags/libs to be tested by setting these environment variables.) -# -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also link it with them as well. e.g. you should link with -# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS -# -# If you are only building threads programs, you may wish to use these -# variables in your default LIBS, CFLAGS, and CC: -# -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" -# -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant -# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name -# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -# -# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the -# PTHREAD_PRIO_INHERIT symbol is defined when compiling with -# PTHREAD_CFLAGS. -# -# ACTION-IF-FOUND is a list of shell commands to run if a threads library -# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it -# is not found. If ACTION-IF-FOUND is not specified, the default action -# will define HAVE_PTHREAD. -# -# Please let the authors know if this macro fails on any platform, or if -# you have any other suggestions or comments. This macro was based on work -# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help -# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by -# Alejandro Forero Cuervo to the autoconf macro repository. We are also -# grateful for the helpful feedback of numerous users. -# -# Updated for Autoconf 2.68 by Daniel Richard G. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson -# Copyright (c) 2011 Daniel Richard G. -# -# 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 3 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, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 21 - -AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) -AC_DEFUN([AX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_PUSH([C]) -ax_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes]) - AC_MSG_RESULT([$ax_pthread_ok]) - if test x"$ax_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case ${host_os} in - solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" - ;; - - darwin*) - ax_pthread_flags="-pthread $ax_pthread_flags" - ;; -esac - -# Clang doesn't consider unrecognized options an error unless we specify -# -Werror. We throw in some extra Clang-specific options to ensure that -# this doesn't happen for GCC, which also accepts -Werror. - -AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags]) -save_CFLAGS="$CFLAGS" -ax_pthread_extra_flags="-Werror" -CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])], - [AC_MSG_RESULT([yes])], - [ax_pthread_extra_flags= - AC_MSG_RESULT([no])]) -CFLAGS="$save_CFLAGS" - -if test x"$ax_pthread_ok" = xno; then -for flag in $ax_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include - static void routine(void *a) { a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], - [ax_pthread_ok=yes], - []) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT([$ax_pthread_ok]) - if test "x$ax_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$ax_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], - [int attr = $attr; return attr /* ; */])], - [attr_name=$attr; break], - []) - done - AC_MSG_RESULT([$attr_name]) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name], - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case ${host_os} in - aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; - osf* | hpux*) flag="-D_REENTRANT";; - solaris*) - if test "$GCC" = "yes"; then - flag="-D_REENTRANT" - else - # TODO: What about Clang on Solaris? - flag="-mt -D_REENTRANT" - fi - ;; - esac - AC_MSG_RESULT([$flag]) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], - [ax_cv_PTHREAD_PRIO_INHERIT], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[int i = PTHREAD_PRIO_INHERIT;]])], - [ax_cv_PTHREAD_PRIO_INHERIT=yes], - [ax_cv_PTHREAD_PRIO_INHERIT=no]) - ]) - AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], - [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: compile with *_r variant - if test "x$GCC" != xyes; then - case $host_os in - aix*) - AS_CASE(["x/$CC"], - [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], - [#handle absolute path differently from PATH based program lookup - AS_CASE(["x$CC"], - [x/*], - [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], - [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) - ;; - esac - fi -fi - -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - -AC_SUBST([PTHREAD_LIBS]) -AC_SUBST([PTHREAD_CFLAGS]) -AC_SUBST([PTHREAD_CC]) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$ax_pthread_ok" = xyes; then - ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) - : -else - ax_pthread_ok=no - $2 -fi -AC_LANG_POP -])dnl AX_PTHREAD diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_require_defined.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_require_defined.m4 deleted file mode 100644 index cae11112..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ax_require_defined.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_REQUIRE_DEFINED(MACRO) -# -# DESCRIPTION -# -# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have -# been defined and thus are available for use. This avoids random issues -# where a macro isn't expanded. Instead the configure script emits a -# non-fatal: -# -# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found -# -# It's like AC_REQUIRE except it doesn't expand the required macro. -# -# Here's an example: -# -# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) -# -# LICENSE -# -# Copyright (c) 2014 Mike Frysinger -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 1 - -AC_DEFUN([AX_REQUIRE_DEFINED], [dnl - m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) -])dnl AX_REQUIRE_DEFINED diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/libcurl.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/libcurl.m4 deleted file mode 100644 index 7e0a3c4c..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/libcurl.m4 +++ /dev/null @@ -1,253 +0,0 @@ -# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], -# [ACTION-IF-YES], [ACTION-IF-NO]) -# ---------------------------------------------------------- -# David Shaw May-09-2006 -# -# Checks for libcurl. DEFAULT-ACTION is the string yes or no to -# specify whether to default to --with-libcurl or --without-libcurl. -# If not supplied, DEFAULT-ACTION is yes. MINIMUM-VERSION is the -# minimum version of libcurl to accept. Pass the version as a regular -# version number like 7.10.1. If not supplied, any version is -# accepted. ACTION-IF-YES is a list of shell commands to run if -# libcurl was successfully found and passed the various tests. -# ACTION-IF-NO is a list of shell commands that are run otherwise. -# Note that using --without-libcurl does run ACTION-IF-NO. -# -# This macro #defines HAVE_LIBCURL if a working libcurl setup is -# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary -# values. Other useful defines are LIBCURL_FEATURE_xxx where xxx are -# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy -# where yyy are the various protocols supported by libcurl. Both xxx -# and yyy are capitalized. See the list of AH_TEMPLATEs at the top of -# the macro for the complete list of possible defines. Shell -# variables $libcurl_feature_xxx and $libcurl_protocol_yyy are also -# defined to 'yes' for those features and protocols that were found. -# Note that xxx and yyy keep the same capitalization as in the -# curl-config list (e.g. it's "HTTP" and not "http"). -# -# Users may override the detected values by doing something like: -# LIBCURL="-lcurl" LIBCURL_CPPFLAGS="-I/usr/myinclude" ./configure -# -# For the sake of sanity, this macro assumes that any libcurl that is -# found is after version 7.7.2, the first version that included the -# curl-config script. Note that it is very important for people -# packaging binary versions of libcurl to include this script! -# Without curl-config, we can only guess what protocols are available, -# or use curl_version_info to figure it out at runtime. - -AC_DEFUN([LIBCURL_CHECK_CONFIG], -[ - AH_TEMPLATE([LIBCURL_FEATURE_SSL],[Defined if libcurl supports SSL]) - AH_TEMPLATE([LIBCURL_FEATURE_KRB4],[Defined if libcurl supports KRB4]) - AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6]) - AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz]) - AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS]) - AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN]) - AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI]) - AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM]) - - AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS]) - AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS]) - AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE]) - AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET]) - AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT]) - AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_RTSP],[Defined if libcurl supports RTSP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_POP3],[Defined if libcurl supports POP3]) - AH_TEMPLATE([LIBCURL_PROTOCOL_IMAP],[Defined if libcurl supports IMAP]) - AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP]) - - AC_ARG_WITH(libcurl, - AC_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]), - [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) - - if test "$_libcurl_with" != "no" ; then - - AC_PROG_AWK - - _libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'" - - _libcurl_try_link=yes - - if test -d "$_libcurl_with" ; then - LIBCURL_CPPFLAGS="-I$withval/include" - _libcurl_ldflags="-L$withval/lib" - AC_PATH_PROG([_libcurl_config],[curl-config],[], - ["$withval/bin"]) - else - AC_PATH_PROG([_libcurl_config],[curl-config],[],[$PATH]) - fi - - if test x$_libcurl_config != "x" ; then - AC_CACHE_CHECK([for the version of libcurl], - [libcurl_cv_lib_curl_version], - [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`]) - - _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` - _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse` - - if test $_libcurl_wanted -gt 0 ; then - AC_CACHE_CHECK([for libcurl >= version $2], - [libcurl_cv_lib_version_ok], - [ - if test $_libcurl_version -ge $_libcurl_wanted ; then - libcurl_cv_lib_version_ok=yes - else - libcurl_cv_lib_version_ok=no - fi - ]) - fi - - if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then - if test x"$LIBCURL_CPPFLAGS" = "x" ; then - LIBCURL_CPPFLAGS=`$_libcurl_config --cflags` - fi - if test x"$LIBCURL" = "x" ; then - LIBCURL=`$_libcurl_config --libs` - - # This is so silly, but Apple actually has a bug in their - # curl-config script. Fixed in Tiger, but there are still - # lots of Panther installs around. - case "${host}" in - powerpc-apple-darwin7*) - LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'` - ;; - esac - fi - - # All curl-config scripts support --feature - _libcurl_features=`$_libcurl_config --feature` - - # Is it modern enough to have --protocols? (7.12.4) - if test $_libcurl_version -ge 461828 ; then - _libcurl_protocols=`$_libcurl_config --protocols` - fi - else - _libcurl_try_link=no - fi - - unset _libcurl_wanted - fi - - if test $_libcurl_try_link = yes ; then - - # we didn't find curl-config, so let's see if the user-supplied - # link line (or failing that, "-lcurl") is enough. - LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"} - - AC_CACHE_CHECK([whether libcurl is usable], - [libcurl_cv_lib_curl_usable], - [ - _libcurl_save_cppflags=$CPPFLAGS - CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS" - _libcurl_save_libs=$LIBS - LIBS="$LIBCURL $LIBS" - - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[ -/* Try and use a few common options to force a failure if we are - missing symbols or can't link. */ -int x; -curl_easy_setopt(NULL,CURLOPT_URL,NULL); -x=CURL_ERROR_SIZE; -x=CURLOPT_WRITEFUNCTION; -x=CURLOPT_FILE; -x=CURLOPT_ERRORBUFFER; -x=CURLOPT_STDERR; -x=CURLOPT_VERBOSE; -if (x) ; -]])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no) - - CPPFLAGS=$_libcurl_save_cppflags - LIBS=$_libcurl_save_libs - unset _libcurl_save_cppflags - unset _libcurl_save_libs - ]) - - if test $libcurl_cv_lib_curl_usable = yes ; then - - # Does curl_free() exist in this version of libcurl? - # If not, fake it with free() - - _libcurl_save_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS" - _libcurl_save_libs=$LIBS - LIBS="$LIBS $LIBCURL" - - AC_CHECK_FUNC(curl_free,, - AC_DEFINE(curl_free,free, - [Define curl_free() as free() if our version of curl lacks curl_free.])) - - CPPFLAGS=$_libcurl_save_cppflags - LIBS=$_libcurl_save_libs - unset _libcurl_save_cppflags - unset _libcurl_save_libs - - AC_DEFINE(HAVE_LIBCURL,1, - [Define to 1 if you have a functional curl library.]) - AC_SUBST(LIBCURL_CPPFLAGS) - AC_SUBST(LIBCURL) - - for _libcurl_feature in $_libcurl_features ; do - AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1]) - eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes - done - - if test "x$_libcurl_protocols" = "x" ; then - - # We don't have --protocols, so just assume that all - # protocols are available - _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP" - - test -z "$_libcurl_version" && _libcurl_version=0 - - if test x$libcurl_feature_SSL = xyes ; then - _libcurl_protocols="$_libcurl_protocols HTTPS" - - # FTPS wasn't standards-compliant until version - # 7.11.0 (0x070b00 == 461568) - if test $_libcurl_version -ge 461568; then - _libcurl_protocols="$_libcurl_protocols FTPS" - fi - fi - - # RTSP, IMAP, POP3 and SMTP were added in - # 7.20.0 (0x071400 == 463872) - if test $_libcurl_version -ge 463872; then - _libcurl_protocols="$_libcurl_protocols RTSP IMAP POP3 SMTP" - fi - fi - - for _libcurl_protocol in $_libcurl_protocols ; do - AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1]) - eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes - done - else - unset LIBCURL - unset LIBCURL_CPPFLAGS - fi - fi - - unset _libcurl_try_link - unset _libcurl_version_parse - unset _libcurl_config - unset _libcurl_feature - unset _libcurl_features - unset _libcurl_protocol - unset _libcurl_protocols - unset _libcurl_version - unset _libcurl_ldflags - fi - - if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then - # This is the IF-NO path - ifelse([$4],,:,[$4]) - else - # This is the IF-YES path - ifelse([$3],,:,[$3]) - fi - - unset _libcurl_with -])dnl diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/libgcrypt.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/libgcrypt.m4 deleted file mode 100644 index 75863ba9..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/libgcrypt.m4 +++ /dev/null @@ -1,127 +0,0 @@ -dnl Autoconf macros for libgcrypt -dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. -dnl Copyright (C) 2014 Karlson2k (Evgeny Grin) -dnl -dnl This file is free software; as a special exception the author gives -dnl unlimited permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl -dnl This file is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - -dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, -dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. -dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed -dnl with the API version to also check the API compatibility. Example: -dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed -dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using -dnl this features allows to prevent build against newer versions of libgcrypt -dnl with a changed API. -dnl -dnl Updated by Karlson2k to be more tolerant to host tools variations. -dnl -AC_DEFUN([AM_PATH_LIBGCRYPT], -[ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_PROG_GREP]) - AC_REQUIRE([AC_PROG_SED]) - AC_ARG_WITH(libgcrypt-prefix, - AC_HELP_STRING([--with-libgcrypt-prefix=PFX], - [prefix where LIBGCRYPT is installed (optional)]), - libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") - if test x$libgcrypt_config_prefix != x ; then - if test x${LIBGCRYPT_CONFIG+set} != xset ; then - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config - fi - fi - - AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) - tmp=ifelse([$1], ,1:1.2.0,$1) - if echo "$tmp" | $GREP ':' >/dev/null 2>/dev/null ; then - req_libgcrypt_api=`echo "$tmp" | $SED 's/\(.*\):\(.*\)/\1/'` - min_libgcrypt_version=`echo "$tmp" | $SED 's/\(.*\):\(.*\)/\2/'` - else - req_libgcrypt_api=0 - min_libgcrypt_version="$tmp" - fi - - AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) - ok=no - if test "$LIBGCRYPT_CONFIG" != "no" ; then - req_major=`echo $min_libgcrypt_version | \ - $SED 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_libgcrypt_version | \ - $SED 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - req_micro=`echo $min_libgcrypt_version | \ - $SED 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` - major=`echo $libgcrypt_config_version | \ - $SED 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $libgcrypt_config_version | \ - $SED 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` - micro=`echo $libgcrypt_config_version | \ - $SED 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - if test "$major" -gt "$req_major"; then - ok=yes - else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then - ok=yes - else - if test "$minor" -eq "$req_minor"; then - if test "$micro" -ge "$req_micro"; then - ok=yes - fi - fi - fi - fi - fi - fi - if test $ok = yes; then - AC_MSG_RESULT([yes ($libgcrypt_config_version)]) - else - AC_MSG_RESULT(no) - fi - if test $ok = yes; then - # If we have a recent libgcrypt, we should also check that the - # API is compatible - if test "$req_libgcrypt_api" -gt 0 ; then - tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - AC_MSG_CHECKING([LIBGCRYPT API version]) - if test "$req_libgcrypt_api" -eq "$tmp" ; then - AC_MSG_RESULT([okay]) - else - ok=no - AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) - fi - fi - fi - fi - if test $ok = yes; then - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` - ifelse([$2], , :, [$2]) - libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` - if test x"$libgcrypt_config_host" != xnone ; then - if test x"$libgcrypt_config_host" != x"$host" ; then - AC_MSG_WARN([[ -*** -*** The config script $LIBGCRYPT_CONFIG was -*** built for $libgcrypt_config_host and thus may not match the -*** used host $host. -*** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. -***]]) - fi - fi - else - LIBGCRYPT_CFLAGS="" - LIBGCRYPT_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(LIBGCRYPT_CFLAGS) - AC_SUBST(LIBGCRYPT_LIBS) -]) diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/libtool.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/libtool.m4 deleted file mode 100644 index d7c043f4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/libtool.m4 +++ /dev/null @@ -1,7997 +0,0 @@ -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 57 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - -## ------------------------------------- ## -## Accumulate code for creating libtool. ## -## ------------------------------------- ## - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - -## ------------------------ ## -## FIXME: Eliminate VARNAME ## -## ------------------------ ## - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -_LT_OUTPUT_LIBTOOL_INIT -]) - -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -# ------------------------------------ -# Generate a child script FILE with all initialization necessary to -# reuse the environment learned by the parent script, and make the -# file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this -# macro, additional text can be appended to FILE to form the body of -# the child script. The macro ends with non-zero status if the -# file could not be fully written (such as if the disk is full). -m4_ifdef([AS_INIT_GENERATED], -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -[m4_defun([_LT_GENERATED_FILE_INIT], -[m4_require([AS_PREPARE])]dnl -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -[lt_write_fail=0 -cat >$1 <<_ASEOF || lt_write_fail=1 -#! $SHELL -# Generated by $as_me. -$2 -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$1 <<\_ASEOF || lt_write_fail=1 -AS_SHELL_SANITIZE -_AS_PREPARE -exec AS_MESSAGE_FD>&1 -_ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) - -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2011 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec AS_MESSAGE_LOG_FD>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec AS_MESSAGE_LOG_FD>>config.log -$lt_cl_success || AS_EXIT(1) -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_REPLACE_SHELLFNS - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -m4_ifndef([AC_PROG_GO], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -dnl AC_DEFUN([AC_LIBTOOL_RC], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -# ---------------------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -# Store the results from the different compilers for each TAGNAME. -# Allow to override them for all tags through lt_cv_aix_libpath. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], - [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ - lt_aix_libpath_sed='[ - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }]' - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi],[]) - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -fi -])# _LT_SYS_MODULE_PATH_AIX - - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT - - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Find how we can fake an echo command that does not interpret backslash. -# In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -case "$ECHO" in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac - -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) - -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_WITH_SYSROOT -# ---------------- -AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], -[], [with_sysroot=no]) - -dnl lt_sysroot will always be passed unquoted. We quote it here -dnl in case the user passed a directory name. -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - AC_MSG_RESULT([${with_sysroot}]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; -esac - - AC_MSG_RESULT([${lt_sysroot:-no}]) -_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) - -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac - ;; - powerpc64le-*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - powerpcle-*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK - - -# _LT_PROG_AR -# ----------- -m4_defun([_LT_PROG_AR], -[AC_CHECK_TOOLS(AR, [ar], false) -: ${AR=ar} -: ${AR_FLAGS=cru} -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) - -AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no - AC_COMPILE_IFELSE([AC_LANG_PROGRAM], - [echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi -_LT_DECL([], [archiver_list_spec], [1], - [How to feed a file listing to the archiver]) -])# _LT_PROG_AR - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -_LT_DECL([], [lock_old_archive_extraction], [0], - [Whether to use a lock for old archive extraction]) -])# _LT_CMD_OLD_ARCHIVE - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* -]) - -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[23]].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], - [lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [lt_cv_shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - ]) - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [install_override_mode], [1], - [Permission mode override for installation of shared libraries]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl - -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method = "file_magic"]) -_LT_DECL([], [file_magic_glob], [1], - [How to find potential files when deplibs_check_method = "file_magic"]) -_LT_DECL([], [want_nocaseglob], [1], - [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - -# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# -------------------------------- -# how to determine the name of the shared library -# associated with a specific link library. -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -m4_require([_LT_DECL_DLLTOOL]) -AC_CACHE_CHECK([how to associate runtime and link libraries], -lt_cv_sharedlib_from_linklib_cmd, -[lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac -]) -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - -_LT_DECL([], [sharedlib_from_linklib_cmd], [1], - [Command to associate shared and link libraries]) -])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB - - -# _LT_PATH_MANIFEST_TOOL -# ---------------------- -# locate the manifest tool -m4_defun([_LT_PATH_MANIFEST_TOOL], -[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&AS_MESSAGE_LOG_FD - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL - - -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; - *) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; - esac - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT@&t@_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT@&t@_DLSYM_CONST -#else -# define LT@&t@_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -_LT_DECL([], [nm_file_list_spec], [1], - [Specify filename containing input files for $NM]) -]) # _LT_CMD_GLOBAL_SYMBOLS - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; -esac - -AC_CACHE_CHECK([for $compiler option to produce PIC], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - ;; - esac - ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - esac - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - m4_if($1, [], [ - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - _LT_LINKER_OPTION([if $CC understands -b], - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], - [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], - [C++], [[int foo (void) { return 0; }]], - [Fortran 77], [[ - subroutine foo - end]], - [Fortran], [[ - subroutine foo - end]])])], - [lt_cv_irix_exported_symbol=yes], - [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_CACHE_CHECK([whether -lc should be explicitly linked in], - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - ]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) - ;; - esac - fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [postlink_cmds], [2], - [Commands necessary for finishing linking programs]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi - -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _LT_FUNC_STRIPNAME_CNF -# ---------------------- -# func_stripname_cnf prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# -# This function is identical to the (non-XSI) version of func_stripname, -# except this one can be used by m4 code that may be executed by configure, -# rather than the libtool script. -m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -AC_REQUIRE([_LT_DECL_SED]) -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf -])# _LT_FUNC_STRIPNAME_CNF - -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF -]) - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi - - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - prev= - ;; - - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} - CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes - -AC_LANG_POP -])# _LT_LANG_F77_CONFIG - - -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_LANG_PUSH(Fortran) - -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} - CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GCJ_CONFIG - - -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE - -# Source file extension for Go test sources. -ac_ext=go - -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" - -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) - -# _LT_DECL_DLLTOOL -# ---------------- -# Ensure DLLTOOL variable is set. -m4_defun([_LT_DECL_DLLTOOL], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -AC_SUBST([DLLTOOL]) -]) - -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - -# _LT_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine which file name conversion functions should be used by -# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -# for certain cross-compile configurations and native mingw. -m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_MSG_CHECKING([how to convert $build file names to $host format]) -AC_CACHE_VAL(lt_cv_to_host_file_cmd, -[case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac -]) -to_host_file_cmd=$lt_cv_to_host_file_cmd -AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], - [0], [convert $build file names to $host format])dnl - -AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -[#assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac -]) -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], - [0], [convert $build files to toolchain format])dnl -])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ltoptions.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ltoptions.m4 deleted file mode 100644 index 5d9acd8e..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ltoptions.m4 +++ /dev/null @@ -1,384 +0,0 @@ -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 7 ltoptions.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS - - -## --------------------------------- ## -## Macros to handle LT_INIT options. ## -## --------------------------------- ## - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - - -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - -## ----------------- ## -## LTDL_INIT Options ## -## ----------------- ## - -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ltsugar.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ltsugar.m4 deleted file mode 100644 index 9000a057..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ltsugar.m4 +++ /dev/null @@ -1,123 +0,0 @@ -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/ltversion.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/ltversion.m4 deleted file mode 100644 index 07a8602d..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/ltversion.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# @configure_input@ - -# serial 3337 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) diff --git a/src/hos_libhttpserver/src/libmicrohttpd/m4/lt~obsolete.m4 b/src/hos_libhttpserver/src/libmicrohttpd/m4/lt~obsolete.m4 deleted file mode 100644 index c573da90..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/m4/lt~obsolete.m4 +++ /dev/null @@ -1,98 +0,0 @@ -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 5 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/src/hos_libhttpserver/src/libmicrohttpd/missing b/src/hos_libhttpserver/src/libmicrohttpd/missing deleted file mode 100755 index db98974f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/missing +++ /dev/null @@ -1,215 +0,0 @@ -#! /bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2013-10-28.13; # UTC - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard , 1996. - -# 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, 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, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/src/Makefile.am deleted file mode 100644 index d496c95d..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# This Makefile.am is in the public domain -if HAVE_CURL -curltests = testcurl -if HAVE_ZZUF -if HAVE_SOCAT -zzuftests = testzzuf -endif -endif -endif -if ENABLE_SPDY -if HAVE_OPENSSL -microspdy = microspdy -if HAVE_CURL -microspdy += spdy2http -endif -#if HAVE_SPDYLAY -microspdy += testspdy -#endif -endif -endif - -SUBDIRS = include platform microhttpd $(microspdy) $(curltests) $(zzuftests) . - -if BUILD_EXAMPLES -SUBDIRS += examples -endif - -EXTRA_DIST = \ - datadir/cert-and-key.pem \ - datadir/cert-and-key-for-wireshark.pem \ - datadir/spdy-draft.txt diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/src/Makefile.in deleted file mode 100644 index 8c4db5bf..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/Makefile.in +++ /dev/null @@ -1,678 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@ENABLE_SPDY_TRUE@@HAVE_CURL_TRUE@@HAVE_OPENSSL_TRUE@am__append_1 = spdy2http -@BUILD_EXAMPLES_TRUE@am__append_2 = examples -subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = include platform microhttpd microspdy spdy2http \ - testspdy testcurl testzzuf . examples -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -@HAVE_CURL_TRUE@curltests = testcurl -@HAVE_CURL_TRUE@@HAVE_SOCAT_TRUE@@HAVE_ZZUF_TRUE@zzuftests = testzzuf -#if HAVE_SPDYLAY -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@microspdy = microspdy \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@ $(am__append_1) testspdy -#endif -SUBDIRS = include platform microhttpd $(microspdy) $(curltests) \ - $(zzuftests) . $(am__append_2) -EXTRA_DIST = \ - datadir/cert-and-key.pem \ - datadir/cert-and-key-for-wireshark.pem \ - datadir/spdy-draft.txt - -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/datadir/cert-and-key-for-wireshark.pem b/src/hos_libhttpserver/src/libmicrohttpd/src/datadir/cert-and-key-for-wireshark.pem deleted file mode 100644 index eacd4b40..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/datadir/cert-and-key-for-wireshark.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDc1k7EFEspRcr6PdPmvAd02hBDUG2O5dDkoRK+6tgEBvQxsTxz -50TGwJ8RbSV+qUOnncZBwhnI4i71QSEezMP6I6liRA+fUtdh3cZFvdDpxgU6P15y -5JxfnnDeZJR5O4tfMxN99t34EOEMruZZ0CNYJJgbmIteE0hLI418oUs7cwIDAQAB -AoGAW3WOLXrSHge/pp/QkLCyzdw5/AblONdJCkcDQnp0eEaA/8uNY9sWCtJfjpIL -g0eKs3KOV1GR6DZ0iDIvC1h2mO6pwyrJhRYHKPO9pnx7xpv1T9zYTuVwoMfVjPfO -UCWFedSsSKR76+oP0TrwPDqp3JoMFcAyAqZKMg2JrRUpL3ECQQD92cVSYxSEKwX3 -cHWXVp1mSkuRMR/KX70NC/9XpYr8FEjvtXBTkmp7oG3TaDwd6nhSAodtY+Zkseyj -k5NXM6sNAkEA3rT6opc1YK0pL3uweg+AFP4lRUYrrft1bDELhLmVm9Nf4xEdTnDO -IotiX4GYQ64Bm8J+yxVU204soGynVXbgfwJBALQLCqq+X0TGhvrSpnRqGET+mM4n -u1Z7xMhGJBpz7TmQ4ZIya7K6fA+m3347xbeqHyB7brYlTrlIgIAcITqOCNkCQQDE -3tuJC34mHi0ASqkw3a7t39R2rpdCT733jEuQYrY8b9id061CgDnZE7o8j0VY3uOR -G5gWUp8W1r5gemxaAqJlAkEAwVImBKyKy3oIMsd3WsoqYCMBM+cpX8H2JAEEISPT -Y5zSPZ7kT9JgY2zJwXf3qL+uG1oKZ6f0wn4BYujctTbXwQ== ------END RSA PRIVATE KEY----- diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/datadir/cert-and-key.pem b/src/hos_libhttpserver/src/libmicrohttpd/src/datadir/cert-and-key.pem deleted file mode 100644 index e33608c1..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/datadir/cert-and-key.pem +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDc1k7EFEspRcr6PdPmvAd02hBDUG2O5dDkoRK+6tgEBvQxsTxz -50TGwJ8RbSV+qUOnncZBwhnI4i71QSEezMP6I6liRA+fUtdh3cZFvdDpxgU6P15y -5JxfnnDeZJR5O4tfMxN99t34EOEMruZZ0CNYJJgbmIteE0hLI418oUs7cwIDAQAB -AoGAW3WOLXrSHge/pp/QkLCyzdw5/AblONdJCkcDQnp0eEaA/8uNY9sWCtJfjpIL -g0eKs3KOV1GR6DZ0iDIvC1h2mO6pwyrJhRYHKPO9pnx7xpv1T9zYTuVwoMfVjPfO -UCWFedSsSKR76+oP0TrwPDqp3JoMFcAyAqZKMg2JrRUpL3ECQQD92cVSYxSEKwX3 -cHWXVp1mSkuRMR/KX70NC/9XpYr8FEjvtXBTkmp7oG3TaDwd6nhSAodtY+Zkseyj -k5NXM6sNAkEA3rT6opc1YK0pL3uweg+AFP4lRUYrrft1bDELhLmVm9Nf4xEdTnDO -IotiX4GYQ64Bm8J+yxVU204soGynVXbgfwJBALQLCqq+X0TGhvrSpnRqGET+mM4n -u1Z7xMhGJBpz7TmQ4ZIya7K6fA+m3347xbeqHyB7brYlTrlIgIAcITqOCNkCQQDE -3tuJC34mHi0ASqkw3a7t39R2rpdCT733jEuQYrY8b9id061CgDnZE7o8j0VY3uOR -G5gWUp8W1r5gemxaAqJlAkEAwVImBKyKy3oIMsd3WsoqYCMBM+cpX8H2JAEEISPT -Y5zSPZ7kT9JgY2zJwXf3qL+uG1oKZ6f0wn4BYujctTbXwQ== ------END RSA PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIIDJTCCAo6gAwIBAgIJAIjfJkuxM1pAMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV -BAYTAkJHMQ4wDAYDVQQIEwVTb2ZpYTEOMAwGA1UEBxMFU29maWExCzAJBgNVBAoT -AkFVMQ8wDQYDVQQDEwZBbmRyZXkxHjAcBgkqhkiG9w0BCQEWD3Jvb3RAZ29vZ2xl -LmNvbTAeFw0xMjA5MDgxMTU2MzNaFw0xMzA5MDgxMTU2MzNaMGsxCzAJBgNVBAYT -AkJHMQ4wDAYDVQQIEwVTb2ZpYTEOMAwGA1UEBxMFU29maWExCzAJBgNVBAoTAkFV -MQ8wDQYDVQQDEwZBbmRyZXkxHjAcBgkqhkiG9w0BCQEWD3Jvb3RAZ29vZ2xlLmNv -bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3NZOxBRLKUXK+j3T5rwHdNoQ -Q1BtjuXQ5KESvurYBAb0MbE8c+dExsCfEW0lfqlDp53GQcIZyOIu9UEhHszD+iOp -YkQPn1LXYd3GRb3Q6cYFOj9ecuScX55w3mSUeTuLXzMTffbd+BDhDK7mWdAjWCSY -G5iLXhNISyONfKFLO3MCAwEAAaOB0DCBzTAdBgNVHQ4EFgQUPp4dR3IT0t6bSE3Y -b91MyHJU2+8wgZ0GA1UdIwSBlTCBkoAUPp4dR3IT0t6bSE3Yb91MyHJU2++hb6Rt -MGsxCzAJBgNVBAYTAkJHMQ4wDAYDVQQIEwVTb2ZpYTEOMAwGA1UEBxMFU29maWEx -CzAJBgNVBAoTAkFVMQ8wDQYDVQQDEwZBbmRyZXkxHjAcBgkqhkiG9w0BCQEWD3Jv -b3RAZ29vZ2xlLmNvbYIJAIjfJkuxM1pAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN -AQEFBQADgYEAeBPoIRueOJ+SwpVniE2gmnvogWH9+irJnapDKGZrC/JsTA7ArqRd -EHO1xZxqF+v+v128LmwWAdaazgMUHjR7e7B0xo4Tcp+9+voczc/GBTO0wnp6HT76 -2kUB6rPwwg9bycW8hAJiJJtr3IW5eYMtXDqM4RrbxhA1n2EAaZPVa5s= ------END CERTIFICATE----- diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/datadir/spdy-draft.txt b/src/hos_libhttpserver/src/libmicrohttpd/src/datadir/spdy-draft.txt deleted file mode 100644 index c31648cc..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/datadir/spdy-draft.txt +++ /dev/null @@ -1,2856 +0,0 @@ - - - -Network Working Group M. Belshe -Internet-Draft Twist -Expires: August 4, 2012 R. Peon - Google, Inc - Feb 2012 - - - SPDY Protocol - draft-mbelshe-httpbis-spdy-00 - -Abstract - - This document describes SPDY, a protocol designed for low-latency - transport of content over the World Wide Web. SPDY introduces two - layers of protocol. The lower layer is a general purpose framing - layer which can be used atop a reliable transport (likely TCP) for - multiplexed, prioritized, and compressed data communication of many - concurrent streams. The upper layer of the protocol provides HTTP- - like RFC2616 [RFC2616] semantics for compatibility with existing HTTP - application servers. - -Status of this Memo - - This Internet-Draft is submitted in full conformance with the - provisions of BCP 78 and BCP 79. - - Internet-Drafts are working documents of the Internet Engineering - Task Force (IETF). Note that other groups may also distribute - working documents as Internet-Drafts. The list of current Internet- - Drafts is at http://datatracker.ietf.org/drafts/current/. - - Internet-Drafts are draft documents valid for a maximum of six months - and may be updated, replaced, or obsoleted by other documents at any - time. It is inappropriate to use Internet-Drafts as reference - material or to cite them other than as "work in progress." - - This Internet-Draft will expire on August 4, 2012. - -Copyright Notice - - Copyright (c) 2012 IETF Trust and the persons identified as the - document authors. All rights reserved. - - This document is subject to BCP 78 and the IETF Trust's Legal - Provisions Relating to IETF Documents - (http://trustee.ietf.org/license-info) in effect on the date of - publication of this document. Please review these documents - carefully, as they describe your rights and restrictions with respect - - - -Belshe & Peon Expires August 4, 2012 [Page 1] - -Internet-Draft SPDY Feb 2012 - - - to this document. Code Components extracted from this document must - include Simplified BSD License text as described in Section 4.e of - the Trust Legal Provisions and are provided without warranty as - described in the Simplified BSD License. - - -Table of Contents - - 1. Overview . . . . . . . . . . . . . . . . . . . . . . . . . . . 4 - 1.1. Document Organization . . . . . . . . . . . . . . . . . . 4 - 1.2. Definitions . . . . . . . . . . . . . . . . . . . . . . . 5 - 2. SPDY Framing Layer . . . . . . . . . . . . . . . . . . . . . . 6 - 2.1. Session (Connections) . . . . . . . . . . . . . . . . . . 6 - 2.2. Framing . . . . . . . . . . . . . . . . . . . . . . . . . 6 - 2.2.1. Control frames . . . . . . . . . . . . . . . . . . . . 6 - 2.2.2. Data frames . . . . . . . . . . . . . . . . . . . . . 7 - 2.3. Streams . . . . . . . . . . . . . . . . . . . . . . . . . 8 - 2.3.1. Stream frames . . . . . . . . . . . . . . . . . . . . 9 - 2.3.2. Stream creation . . . . . . . . . . . . . . . . . . . 9 - 2.3.3. Stream priority . . . . . . . . . . . . . . . . . . . 10 - 2.3.4. Stream headers . . . . . . . . . . . . . . . . . . . . 10 - 2.3.5. Stream data exchange . . . . . . . . . . . . . . . . . 10 - 2.3.6. Stream half-close . . . . . . . . . . . . . . . . . . 10 - 2.3.7. Stream close . . . . . . . . . . . . . . . . . . . . . 11 - 2.4. Error Handling . . . . . . . . . . . . . . . . . . . . . . 11 - 2.4.1. Session Error Handling . . . . . . . . . . . . . . . . 11 - 2.4.2. Stream Error Handling . . . . . . . . . . . . . . . . 12 - 2.5. Data flow . . . . . . . . . . . . . . . . . . . . . . . . 12 - 2.6. Control frame types . . . . . . . . . . . . . . . . . . . 12 - 2.6.1. SYN_STREAM . . . . . . . . . . . . . . . . . . . . . . 12 - 2.6.2. SYN_REPLY . . . . . . . . . . . . . . . . . . . . . . 14 - 2.6.3. RST_STREAM . . . . . . . . . . . . . . . . . . . . . . 15 - 2.6.4. SETTINGS . . . . . . . . . . . . . . . . . . . . . . . 16 - 2.6.5. PING . . . . . . . . . . . . . . . . . . . . . . . . . 19 - 2.6.6. GOAWAY . . . . . . . . . . . . . . . . . . . . . . . . 20 - 2.6.7. HEADERS . . . . . . . . . . . . . . . . . . . . . . . 21 - 2.6.8. WINDOW_UPDATE . . . . . . . . . . . . . . . . . . . . 22 - 2.6.9. CREDENTIAL . . . . . . . . . . . . . . . . . . . . . . 24 - 2.6.10. Name/Value Header Block . . . . . . . . . . . . . . . 26 - 3. HTTP Layering over SPDY . . . . . . . . . . . . . . . . . . . 33 - 3.1. Connection Management . . . . . . . . . . . . . . . . . . 33 - 3.1.1. Use of GOAWAY . . . . . . . . . . . . . . . . . . . . 33 - 3.2. HTTP Request/Response . . . . . . . . . . . . . . . . . . 34 - 3.2.1. Request . . . . . . . . . . . . . . . . . . . . . . . 34 - 3.2.2. Response . . . . . . . . . . . . . . . . . . . . . . . 35 - 3.2.3. Authentication . . . . . . . . . . . . . . . . . . . . 36 - 3.3. Server Push Transactions . . . . . . . . . . . . . . . . . 37 - 3.3.1. Server implementation . . . . . . . . . . . . . . . . 38 - - - -Belshe & Peon Expires August 4, 2012 [Page 2] - -Internet-Draft SPDY Feb 2012 - - - 3.3.2. Client implementation . . . . . . . . . . . . . . . . 39 - 4. Design Rationale and Notes . . . . . . . . . . . . . . . . . . 40 - 4.1. Separation of Framing Layer and Application Layer . . . . 40 - 4.2. Error handling - Framing Layer . . . . . . . . . . . . . . 40 - 4.3. One Connection Per Domain . . . . . . . . . . . . . . . . 40 - 4.4. Fixed vs Variable Length Fields . . . . . . . . . . . . . 41 - 4.5. Compression Context(s) . . . . . . . . . . . . . . . . . . 41 - 4.6. Unidirectional streams . . . . . . . . . . . . . . . . . . 42 - 4.7. Data Compression . . . . . . . . . . . . . . . . . . . . . 42 - 4.8. Server Push . . . . . . . . . . . . . . . . . . . . . . . 42 - 5. Security Considerations . . . . . . . . . . . . . . . . . . . 43 - 5.1. Use of Same-origin constraints . . . . . . . . . . . . . . 43 - 5.2. HTTP Headers and SPDY Headers . . . . . . . . . . . . . . 43 - 5.3. Cross-Protocol Attacks . . . . . . . . . . . . . . . . . . 43 - 5.4. Server Push Implicit Headers . . . . . . . . . . . . . . . 43 - 6. Privacy Considerations . . . . . . . . . . . . . . . . . . . . 44 - 6.1. Long Lived Connections . . . . . . . . . . . . . . . . . . 44 - 6.2. SETTINGS frame . . . . . . . . . . . . . . . . . . . . . . 44 - 7. Incompatibilities with SPDY draft #2 . . . . . . . . . . . . . 45 - 8. Requirements Notation . . . . . . . . . . . . . . . . . . . . 46 - 9. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . 47 - 10. Normative References . . . . . . . . . . . . . . . . . . . . . 48 - Appendix A. Changes . . . . . . . . . . . . . . . . . . . . . . . 50 - Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . . 51 - - - - - - - - - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 3] - -Internet-Draft SPDY Feb 2012 - - -1. Overview - - One of the bottlenecks of HTTP implementations is that HTTP relies on - multiple connections for concurrency. This causes several problems, - including additional round trips for connection setup, slow-start - delays, and connection rationing by the client, where it tries to - avoid opening too many connections to any single server. HTTP - pipelining helps some, but only achieves partial multiplexing. In - addition, pipelining has proven non-deployable in existing browsers - due to intermediary interference. - - SPDY adds a framing layer for multiplexing multiple, concurrent - streams across a single TCP connection (or any reliable transport - stream). The framing layer is optimized for HTTP-like request- - response streams, such that applications which run over HTTP today - can work over SPDY with little or no change on behalf of the web - application writer. - - The SPDY session offers four improvements over HTTP: - - Multiplexed requests: There is no limit to the number of requests - that can be issued concurrently over a single SPDY connection. - - Prioritized requests: Clients can request certain resources to be - delivered first. This avoids the problem of congesting the - network channel with non-critical resources when a high-priority - request is pending. - - Compressed headers: Clients today send a significant amount of - redundant data in the form of HTTP headers. Because a single web - page may require 50 or 100 subrequests, this data is significant. - - Server pushed streams: Server Push enables content to be pushed - from servers to clients without a request. - - SPDY attempts to preserve the existing semantics of HTTP. All - features such as cookies, ETags, Vary headers, Content-Encoding - negotiations, etc work as they do with HTTP; SPDY only replaces the - way the data is written to the network. - -1.1. Document Organization - - The SPDY Specification is split into two parts: a framing layer - (Section 2), which multiplexes a TCP connection into independent, - length-prefixed frames, and an HTTP layer (Section 3), which - specifies the mechanism for overlaying HTTP request/response pairs on - top of the framing layer. While some of the framing layer concepts - are isolated from the HTTP layer, building a generic framing layer - - - -Belshe & Peon Expires August 4, 2012 [Page 4] - -Internet-Draft SPDY Feb 2012 - - - has not been a goal. The framing layer is tailored to the needs of - the HTTP protocol and server push. - -1.2. Definitions - - client: The endpoint initiating the SPDY session. - - connection: A transport-level connection between two endpoints. - - endpoint: Either the client or server of a connection. - - frame: A header-prefixed sequence of bytes sent over a SPDY - session. - - server: The endpoint which did not initiate the SPDY session. - - session: A synonym for a connection. - - session error: An error on the SPDY session. - - stream: A bi-directional flow of bytes across a virtual channel - within a SPDY session. - - stream error: An error on an individual SPDY stream. - - - - - - - - - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 5] - -Internet-Draft SPDY Feb 2012 - - -2. SPDY Framing Layer - -2.1. Session (Connections) - - The SPDY framing layer (or "session") runs atop a reliable transport - layer such as TCP [RFC0793]. The client is the TCP connection - initiator. SPDY connections are persistent connections. - - For best performance, it is expected that clients will not close open - connections until the user navigates away from all web pages - referencing a connection, or until the server closes the connection. - Servers are encouraged to leave connections open for as long as - possible, but can terminate idle connections if necessary. When - either endpoint closes the transport-level connection, it MUST first - send a GOAWAY (Section 2.6.6) frame so that the endpoints can - reliably determine if requests finished before the close. - -2.2. Framing - - Once the connection is established, clients and servers exchange - framed messages. There are two types of frames: control frames - (Section 2.2.1) and data frames (Section 2.2.2). Frames always have - a common header which is 8 bytes in length. - - The first bit is a control bit indicating whether a frame is a - control frame or data frame. Control frames carry a version number, - a frame type, flags, and a length. Data frames contain the stream - ID, flags, and the length for the payload carried after the common - header. The simple header is designed to make reading and writing of - frames easy. - - All integer values, including length, version, and type, are in - network byte order. SPDY does not enforce alignment of types in - dynamically sized frames. - -2.2.1. Control frames - - +----------------------------------+ - |C| Version(15bits) | Type(16bits) | - +----------------------------------+ - | Flags (8) | Length (24 bits) | - +----------------------------------+ - | Data | - +----------------------------------+ - - Control bit: The 'C' bit is a single bit indicating if this is a - control message. For control frames this value is always 1. - - - - -Belshe & Peon Expires August 4, 2012 [Page 6] - -Internet-Draft SPDY Feb 2012 - - - Version: The version number of the SPDY protocol. This document - describes SPDY version 3. - - Type: The type of control frame. See Control Frames for the complete - list of control frames. - - Flags: Flags related to this frame. Flags for control frames and - data frames are different. - - Length: An unsigned 24-bit value representing the number of bytes - after the length field. - - Data: data associated with this control frame. The format and length - of this data is controlled by the control frame type. - - Control frame processing requirements: - - Note that full length control frames (16MB) can be large for - implementations running on resource-limited hardware. In such - cases, implementations MAY limit the maximum length frame - supported. However, all implementations MUST be able to receive - control frames of at least 8192 octets in length. - -2.2.2. Data frames - - +----------------------------------+ - |C| Stream-ID (31bits) | - +----------------------------------+ - | Flags (8) | Length (24 bits) | - +----------------------------------+ - | Data | - +----------------------------------+ - - Control bit: For data frames this value is always 0. - - Stream-ID: A 31-bit value identifying the stream. - - Flags: Flags related to this frame. Valid flags are: - - 0x01 = FLAG_FIN - signifies that this frame represents the last - frame to be transmitted on this stream. See Stream Close - (Section 2.3.7) below. - - 0x02 = FLAG_COMPRESS - indicates that the data in this frame has - been compressed. - - Length: An unsigned 24-bit value representing the number of bytes - after the length field. The total size of a data frame is 8 bytes + - - - -Belshe & Peon Expires August 4, 2012 [Page 7] - -Internet-Draft SPDY Feb 2012 - - - length. It is valid to have a zero-length data frame. - - Data: The variable-length data payload; the length was defined in the - length field. - - Data frame processing requirements: - - If an endpoint receives a data frame for a stream-id which is not - open and the endpoint has not sent a GOAWAY (Section 2.6.6) frame, - it MUST send issue a stream error (Section 2.4.2) with the error - code INVALID_STREAM for the stream-id. - - If the endpoint which created the stream receives a data frame - before receiving a SYN_REPLY on that stream, it is a protocol - error, and the recipient MUST issue a stream error (Section 2.4.2) - with the status code PROTOCOL_ERROR for the stream-id. - - Implementors note: If an endpoint receives multiple data frames - for invalid stream-ids, it MAY close the session. - - All SPDY endpoints MUST accept compressed data frames. - Compression of data frames is always done using zlib compression. - Each stream initializes and uses its own compression context - dedicated to use within that stream. Endpoints are encouraged to - use application level compression rather than SPDY stream level - compression. - - Each SPDY stream sending compressed frames creates its own zlib - context for that stream, and these compression contexts MUST be - distinct from the compression contexts used with SYN_STREAM/ - SYN_REPLY/HEADER compression. (Thus, if both endpoints of a - stream are compressing data on the stream, there will be two zlib - contexts, one for sending and one for receiving). - -2.3. Streams - - Streams are independent sequences of bi-directional data divided into - frames with several properties: - - Streams may be created by either the client or server. - - Streams optionally carry a set of name/value header pairs. - - Streams can concurrently send data interleaved with other streams. - - Streams may be cancelled. - - - - - -Belshe & Peon Expires August 4, 2012 [Page 8] - -Internet-Draft SPDY Feb 2012 - - -2.3.1. Stream frames - - SPDY defines 3 control frames to manage the lifecycle of a stream: - - SYN_STREAM - Open a new stream - - SYN_REPLY - Remote acknowledgement of a new, open stream - - RST_STREAM - Close a stream - -2.3.2. Stream creation - - A stream is created by sending a control frame with the type set to - SYN_STREAM (Section 2.6.1). If the server is initiating the stream, - the Stream-ID must be even. If the client is initiating the stream, - the Stream-ID must be odd. 0 is not a valid Stream-ID. Stream-IDs - from each side of the connection must increase monotonically as new - streams are created. E.g. Stream 2 may be created after stream 3, - but stream 7 must not be created after stream 9. Stream IDs do not - wrap: when a client or server cannot create a new stream id without - exceeding a 31 bit value, it MUST NOT create a new stream. - - The stream-id MUST increase with each new stream. If an endpoint - receives a SYN_STREAM with a stream id which is less than any - previously received SYN_STREAM, it MUST issue a session error - (Section 2.4.1) with the status PROTOCOL_ERROR. - - It is a protocol error to send two SYN_STREAMs with the same - stream-id. If a recipient receives a second SYN_STREAM for the same - stream, it MUST issue a stream error (Section 2.4.2) with the status - code PROTOCOL_ERROR. - - Upon receipt of a SYN_STREAM, the recipient can reject the stream by - sending a stream error (Section 2.4.2) with the error code - REFUSED_STREAM. Note, however, that the creating endpoint may have - already sent additional frames for that stream which cannot be - immediately stopped. - - Once the stream is created, the creator may immediately send HEADERS - or DATA frames for that stream, without needing to wait for the - recipient to acknowledge. - -2.3.2.1. Unidirectional streams - - When an endpoint creates a stream with the FLAG_UNIDIRECTIONAL flag - set, it creates a unidirectional stream which the creating endpoint - can use to send frames, but the receiving endpoint cannot. The - receiving endpoint is implicitly already in the half-closed - - - -Belshe & Peon Expires August 4, 2012 [Page 9] - -Internet-Draft SPDY Feb 2012 - - - (Section 2.3.6) state. - -2.3.2.2. Bidirectional streams - - SYN_STREAM frames which do not use the FLAG_UNIDIRECTIONAL flag are - bidirectional streams. Both endpoints can send data on a bi- - directional stream. - -2.3.3. Stream priority - - The creator of a stream assigns a priority for that stream. Priority - is represented as an integer from 0 to 7. 0 represents the highest - priority and 7 represents the lowest priority. - - The sender and recipient SHOULD use best-effort to process streams in - the order of highest priority to lowest priority. - -2.3.4. Stream headers - - Streams carry optional sets of name/value pair headers which carry - metadata about the stream. After the stream has been created, and as - long as the sender is not closed (Section 2.3.7) or half-closed - (Section 2.3.6), each side may send HEADERS frame(s) containing the - header data. Header data can be sent in multiple HEADERS frames, and - HEADERS frames may be interleaved with data frames. - -2.3.5. Stream data exchange - - Once a stream is created, it can be used to send arbitrary amounts of - data. Generally this means that a series of data frames will be sent - on the stream until a frame containing the FLAG_FIN flag is set. The - FLAG_FIN can be set on a SYN_STREAM (Section 2.6.1), SYN_REPLY - (Section 2.6.2), HEADERS (Section 2.6.7) or a DATA (Section 2.2.2) - frame. Once the FLAG_FIN has been sent, the stream is considered to - be half-closed. - -2.3.6. Stream half-close - - When one side of the stream sends a frame with the FLAG_FIN flag set, - the stream is half-closed from that endpoint. The sender of the - FLAG_FIN MUST NOT send further frames on that stream. When both - sides have half-closed, the stream is closed. - - If an endpoint receives a data frame after the stream is half-closed - from the sender (e.g. the endpoint has already received a prior frame - for the stream with the FIN flag set), it MUST send a RST_STREAM to - the sender with the status STREAM_ALREADY_CLOSED. - - - - -Belshe & Peon Expires August 4, 2012 [Page 10] - -Internet-Draft SPDY Feb 2012 - - -2.3.7. Stream close - - There are 3 ways that streams can be terminated: - - Normal termination: Normal stream termination occurs when both - sender and recipient have half-closed the stream by sending a - FLAG_FIN. - - Abrupt termination: Either the client or server can send a - RST_STREAM control frame at any time. A RST_STREAM contains an - error code to indicate the reason for failure. When a RST_STREAM - is sent from the stream originator, it indicates a failure to - complete the stream and that no further data will be sent on the - stream. When a RST_STREAM is sent from the stream recipient, the - sender, upon receipt, should stop sending any data on the stream. - The stream recipient should be aware that there is a race between - data already in transit from the sender and the time the - RST_STREAM is received. See Stream Error Handling (Section 2.4.2) - - TCP connection teardown: If the TCP connection is torn down while - un-closed streams exist, then the endpoint must assume that the - stream was abnormally interrupted and may be incomplete. - - If an endpoint receives a data frame after the stream is closed, it - must send a RST_STREAM to the sender with the status PROTOCOL_ERROR. - -2.4. Error Handling - - The SPDY framing layer has only two types of errors, and they are - always handled consistently. Any reference in this specification to - "issue a session error" refers to Section 2.4.1. Any reference to - "issue a stream error" refers to Section 2.4.2. - -2.4.1. Session Error Handling - - A session error is any error which prevents further processing of the - framing layer or which corrupts the session compression state. When - a session error occurs, the endpoint encountering the error MUST - first send a GOAWAY (Section 2.6.6) frame with the stream id of most - recently received stream from the remote endpoint, and the error code - for why the session is terminating. After sending the GOAWAY frame, - the endpoint MUST close the TCP connection. - - Note that the session compression state is dependent upon both - endpoints always processing all compressed data. If an endpoint - partially processes a frame containing compressed data without - updating compression state properly, future control frames which use - compression will be always be errored. Implementations SHOULD always - - - -Belshe & Peon Expires August 4, 2012 [Page 11] - -Internet-Draft SPDY Feb 2012 - - - try to process compressed data so that errors which could be handled - as stream errors do not become session errors. - - Note that because this GOAWAY is sent during a session error case, it - is possible that the GOAWAY will not be reliably received by the - receiving endpoint. It is a best-effort attempt to communicate with - the remote about why the session is going down. - -2.4.2. Stream Error Handling - - A stream error is an error related to a specific stream-id which does - not affect processing of other streams at the framing layer. Upon a - stream error, the endpoint MUST send a RST_STREAM (Section 2.6.3) - frame which contains the stream id of the stream where the error - occurred and the error status which caused the error. After sending - the RST_STREAM, the stream is closed to the sending endpoint. After - sending the RST_STREAM, if the sender receives any frames other than - a RST_STREAM for that stream id, it will result in sending additional - RST_STREAM frames. An endpoint MUST NOT send a RST_STREAM in - response to an RST_STREAM, as doing so would lead to RST_STREAM - loops. Sending a RST_STREAM does not cause the SPDY session to be - closed. - - If an endpoint has multiple RST_STREAM frames to send in succession - for the same stream-id and the same error code, it MAY coalesce them - into a single RST_STREAM frame. (This can happen if a stream is - closed, but the remote sends multiple data frames. There is no - reason to send a RST_STREAM for each frame in succession). - -2.5. Data flow - - Because TCP provides a single stream of data on which SPDY - multiplexes multiple logical streams, clients and servers must - intelligently interleave data messages for concurrent sessions. - -2.6. Control frame types - -2.6.1. SYN_STREAM - - The SYN_STREAM control frame allows the sender to asynchronously - create a stream between the endpoints. See Stream Creation - (Section 2.3.2) - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 12] - -Internet-Draft SPDY Feb 2012 - - -+------------------------------------+ -|1| version | 1 | -+------------------------------------+ -| Flags (8) | Length (24 bits) | -+------------------------------------+ -|X| Stream-ID (31bits) | -+------------------------------------+ -|X| Associated-To-Stream-ID (31bits) | -+------------------------------------+ -| Pri|Unused | Slot | | -+-------------------+ | -| Number of Name/Value pairs (int32) | <+ -+------------------------------------+ | -| Length of name (int32) | | This section is the "Name/Value -+------------------------------------+ | Header Block", and is compressed. -| Name (string) | | -+------------------------------------+ | -| Length of value (int32) | | -+------------------------------------+ | -| Value (string) | | -+------------------------------------+ | -| (repeats) | <+ - - Flags: Flags related to this frame. Valid flags are: - - 0x01 = FLAG_FIN - marks this frame as the last frame to be - transmitted on this stream and puts the sender in the half-closed - (Section 2.3.6) state. - - 0x02 = FLAG_UNIDIRECTIONAL - a stream created with this flag puts - the recipient in the half-closed (Section 2.3.6) state. - - Length: The length is the number of bytes which follow the length - field in the frame. For SYN_STREAM frames, this is 10 bytes plus the - length of the compressed Name/Value block. - - Stream-ID: The 31-bit identifier for this stream. This stream-id - will be used in frames which are part of this stream. - - Associated-To-Stream-ID: The 31-bit identifier for a stream which - this stream is associated to. If this stream is independent of all - other streams, it should be 0. - - Priority: A 3-bit priority (Section 2.3.3) field. - - Unused: 5 bits of unused space, reserved for future use. - - Slot: An 8 bit unsigned integer specifying the index in the server's - - - -Belshe & Peon Expires August 4, 2012 [Page 13] - -Internet-Draft SPDY Feb 2012 - - - CREDENTIAL vector of the client certificate to be used for this - request. see CREDENTIAL frame (Section 2.6.9). The value 0 means no - client certificate should be associated with this stream. - - Name/Value Header Block: A set of name/value pairs carried as part of - the SYN_STREAM. see Name/Value Header Block (Section 2.6.10). - - If an endpoint receives a SYN_STREAM which is larger than the - implementation supports, it MAY send a RST_STREAM with error code - FRAME_TOO_LARGE. All implementations MUST support the minimum size - limits defined in the Control Frames section (Section 2.2.1). - -2.6.2. SYN_REPLY - - SYN_REPLY indicates the acceptance of a stream creation by the - recipient of a SYN_STREAM frame. - -+------------------------------------+ -|1| version | 2 | -+------------------------------------+ -| Flags (8) | Length (24 bits) | -+------------------------------------+ -|X| Stream-ID (31bits) | -+------------------------------------+ -| Number of Name/Value pairs (int32) | <+ -+------------------------------------+ | -| Length of name (int32) | | This section is the "Name/Value -+------------------------------------+ | Header Block", and is compressed. -| Name (string) | | -+------------------------------------+ | -| Length of value (int32) | | -+------------------------------------+ | -| Value (string) | | -+------------------------------------+ | -| (repeats) | <+ - - Flags: Flags related to this frame. Valid flags are: - - 0x01 = FLAG_FIN - marks this frame as the last frame to be - transmitted on this stream and puts the sender in the half-closed - (Section 2.3.6) state. - - Length: The length is the number of bytes which follow the length - field in the frame. For SYN_REPLY frames, this is 4 bytes plus the - length of the compressed Name/Value block. - - Stream-ID: The 31-bit identifier for this stream. - - - - -Belshe & Peon Expires August 4, 2012 [Page 14] - -Internet-Draft SPDY Feb 2012 - - - If an endpoint receives multiple SYN_REPLY frames for the same active - stream ID, it MUST issue a stream error (Section 2.4.2) with the - error code STREAM_IN_USE. - - Name/Value Header Block: A set of name/value pairs carried as part of - the SYN_STREAM. see Name/Value Header Block (Section 2.6.10). - - If an endpoint receives a SYN_REPLY which is larger than the - implementation supports, it MAY send a RST_STREAM with error code - FRAME_TOO_LARGE. All implementations MUST support the minimum size - limits defined in the Control Frames section (Section 2.2.1). - -2.6.3. RST_STREAM - - The RST_STREAM frame allows for abnormal termination of a stream. - When sent by the creator of a stream, it indicates the creator wishes - to cancel the stream. When sent by the recipient of a stream, it - indicates an error or that the recipient did not want to accept the - stream, so the stream should be closed. - - +----------------------------------+ - |1| version | 3 | - +----------------------------------+ - | Flags (8) | 8 | - +----------------------------------+ - |X| Stream-ID (31bits) | - +----------------------------------+ - | Status code | - +----------------------------------+ - - Flags: Flags related to this frame. RST_STREAM does not define any - flags. This value must be 0. - - Length: An unsigned 24-bit value representing the number of bytes - after the length field. For RST_STREAM control frames, this value is - always 8. - - Stream-ID: The 31-bit identifier for this stream. - - Status code: (32 bits) An indicator for why the stream is being - terminated.The following status codes are defined: - - 1 - PROTOCOL_ERROR. This is a generic error, and should only be - used if a more specific error is not available. - - 2 - INVALID_STREAM. This is returned when a frame is received for - a stream which is not active. - - - - -Belshe & Peon Expires August 4, 2012 [Page 15] - -Internet-Draft SPDY Feb 2012 - - - 3 - REFUSED_STREAM. Indicates that the stream was refused before - any processing has been done on the stream. - - 4 - UNSUPPORTED_VERSION. Indicates that the recipient of a stream - does not support the SPDY version requested. - - 5 - CANCEL. Used by the creator of a stream to indicate that the - stream is no longer needed. - - 6 - INTERNAL_ERROR. This is a generic error which can be used - when the implementation has internally failed, not due to anything - in the protocol. - - 7 - FLOW_CONTROL_ERROR. The endpoint detected that its peer - violated the flow control protocol. - - 8 - STREAM_IN_USE. The endpoint received a SYN_REPLY for a stream - already open. - - 9 - STREAM_ALREADY_CLOSED. The endpoint received a data or - SYN_REPLY frame for a stream which is half closed. - - 10 - INVALID_CREDENTIALS. The server received a request for a - resource whose origin does not have valid credentials in the - client certificate vector. - - 11 - FRAME_TOO_LARGE. The endpoint received a frame which this - implementation could not support. If FRAME_TOO_LARGE is sent for - a SYN_STREAM, HEADERS, or SYN_REPLY frame without fully processing - the compressed portion of those frames, then the compression state - will be out-of-sync with the other endpoint. In this case, - senders of FRAME_TOO_LARGE MUST close the session. - - Note: 0 is not a valid status code for a RST_STREAM. - - After receiving a RST_STREAM on a stream, the recipient must not send - additional frames for that stream, and the stream moves into the - closed state. - -2.6.4. SETTINGS - - A SETTINGS frame contains a set of id/value pairs for communicating - configuration data about how the two endpoints may communicate. - SETTINGS frames can be sent at any time by either endpoint, are - optionally sent, and are fully asynchronous. When the server is the - sender, the sender can request that configuration data be persisted - by the client across SPDY sessions and returned to the server in - future communications. - - - -Belshe & Peon Expires August 4, 2012 [Page 16] - -Internet-Draft SPDY Feb 2012 - - - Persistence of SETTINGS ID/Value pairs is done on a per origin/IP - pair (the "origin" is the set of scheme, host, and port from the URI. - See [RFC6454]). That is, when a client connects to a server, and the - server persists settings within the client, the client SHOULD return - the persisted settings on future connections to the same origin AND - IP address and TCP port. Clients MUST NOT request servers to use the - persistence features of the SETTINGS frames, and servers MUST ignore - persistence related flags sent by a client. - - +----------------------------------+ - |1| version | 4 | - +----------------------------------+ - | Flags (8) | Length (24 bits) | - +----------------------------------+ - | Number of entries | - +----------------------------------+ - | ID/Value Pairs | - | ... | - - Control bit: The control bit is always 1 for this message. - - Version: The SPDY version number. - - Type: The message type for a SETTINGS message is 4. - - Flags: FLAG_SETTINGS_CLEAR_SETTINGS (0x1): When set, the client - should clear any previously persisted SETTINGS ID/Value pairs. If - this frame contains ID/Value pairs with the - FLAG_SETTINGS_PERSIST_VALUE set, then the client will first clear its - existing, persisted settings, and then persist the values with the - flag set which are contained within this frame. Because persistence - is only implemented on the client, this flag can only be used when - the sender is the server. - - Length: An unsigned 24-bit value representing the number of bytes - after the length field. The total size of a SETTINGS frame is 8 - bytes + length. - - Number of entries: A 32-bit value representing the number of ID/value - pairs in this message. - - ID: A 32-bit ID number, comprised of 8 bits of flags and 24 bits of - unique ID. - - ID.flags: - - FLAG_SETTINGS_PERSIST_VALUE (0x1): When set, the sender of this - SETTINGS frame is requesting that the recipient persist the ID/ - - - -Belshe & Peon Expires August 4, 2012 [Page 17] - -Internet-Draft SPDY Feb 2012 - - - Value and return it in future SETTINGS frames sent from the - sender to this recipient. Because persistence is only - implemented on the client, this flag is only sent by the - server. - - FLAG_SETTINGS_PERSISTED (0x2): When set, the sender is - notifying the recipient that this ID/Value pair was previously - sent to the sender by the recipient with the - FLAG_SETTINGS_PERSIST_VALUE, and the sender is returning it. - Because persistence is only implemented on the client, this - flag is only sent by the client. - - Defined IDs: - - 1 - SETTINGS_UPLOAD_BANDWIDTH allows the sender to send its - expected upload bandwidth on this channel. This number is an - estimate. The value should be the integral number of kilobytes - per second that the sender predicts as an expected maximum - upload channel capacity. - - 2 - SETTINGS_DOWNLOAD_BANDWIDTH allows the sender to send its - expected download bandwidth on this channel. This number is an - estimate. The value should be the integral number of kilobytes - per second that the sender predicts as an expected maximum - download channel capacity. - - 3 - SETTINGS_ROUND_TRIP_TIME allows the sender to send its - expected round-trip-time on this channel. The round trip time - is defined as the minimum amount of time to send a control - frame from this client to the remote and receive a response. - The value is represented in milliseconds. - - 4 - SETTINGS_MAX_CONCURRENT_STREAMS allows the sender to inform - the remote endpoint the maximum number of concurrent streams - which it will allow. By default there is no limit. For - implementors it is recommended that this value be no smaller - than 100. - - 5 - SETTINGS_CURRENT_CWND allows the sender to inform the - remote endpoint of the current TCP CWND value. - - 6 - SETTINGS_DOWNLOAD_RETRANS_RATE allows the sender to inform - the remote endpoint the retransmission rate (bytes - retransmitted / total bytes transmitted). - - 7 - SETTINGS_INITIAL_WINDOW_SIZE allows the sender to inform - the remote endpoint the initial window size (in bytes) for new - streams. - - - -Belshe & Peon Expires August 4, 2012 [Page 18] - -Internet-Draft SPDY Feb 2012 - - - 8 - SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE allows the server - to inform the client if the new size of the client certificate - vector. - - Value: A 32-bit value. - - The message is intentionally extensible for future information which - may improve client-server communications. The sender does not need - to send every type of ID/value. It must only send those for which it - has accurate values to convey. When multiple ID/value pairs are - sent, they should be sent in order of lowest id to highest id. A - single SETTINGS frame MUST not contain multiple values for the same - ID. If the recipient of a SETTINGS frame discovers multiple values - for the same ID, it MUST ignore all values except the first one. - - A server may send multiple SETTINGS frames containing different ID/ - Value pairs. When the same ID/Value is sent twice, the most recent - value overrides any previously sent values. If the server sends IDs - 1, 2, and 3 with the FLAG_SETTINGS_PERSIST_VALUE in a first SETTINGS - frame, and then sends IDs 4 and 5 with the - FLAG_SETTINGS_PERSIST_VALUE, when the client returns the persisted - state on its next SETTINGS frame, it SHOULD send all 5 settings (1, - 2, 3, 4, and 5 in this example) to the server. - -2.6.5. PING - - The PING control frame is a mechanism for measuring a minimal round- - trip time from the sender. It can be sent from the client or the - server. Recipients of a PING frame should send an identical frame to - the sender as soon as possible (if there is other pending data - waiting to be sent, PING should take highest priority). Each ping - sent by a sender should use a unique ID. - - +----------------------------------+ - |1| version | 6 | - +----------------------------------+ - | 0 (flags) | 4 (length) | - +----------------------------------| - | 32-bit ID | - +----------------------------------+ - - Control bit: The control bit is always 1 for this message. - - Version: The SPDY version number. - - Type: The message type for a PING message is 6. - - Length: This frame is always 4 bytes long. - - - -Belshe & Peon Expires August 4, 2012 [Page 19] - -Internet-Draft SPDY Feb 2012 - - - ID: A unique ID for this ping, represented as an unsigned 32 bit - value. When the client initiates a ping, it must use an odd numbered - ID. When the server initiates a ping, it must use an even numbered - ping. Use of odd/even IDs is required in order to avoid accidental - looping on PINGs (where each side initiates an identical PING at the - same time). - - Note: If a sender uses all possible PING ids (e.g. has sent all 2^31 - possible IDs), it can wrap and start re-using IDs. - - If a server receives an even numbered PING which it did not initiate, - it must ignore the PING. If a client receives an odd numbered PING - which it did not initiate, it must ignore the PING. - -2.6.6. GOAWAY - - The GOAWAY control frame is a mechanism to tell the remote side of - the connection to stop creating streams on this session. It can be - sent from the client or the server. Once sent, the sender will not - respond to any new SYN_STREAMs on this session. Recipients of a - GOAWAY frame must not send additional streams on this session, - although a new session can be established for new streams. The - purpose of this message is to allow an endpoint to gracefully stop - accepting new streams (perhaps for a reboot or maintenance), while - still finishing processing of previously established streams. - - There is an inherent race condition between an endpoint sending - SYN_STREAMs and the remote sending a GOAWAY message. To deal with - this case, the GOAWAY contains a last-stream-id indicating the - stream-id of the last stream which was created on the sending - endpoint in this session. If the receiver of the GOAWAY sent new - SYN_STREAMs for sessions after this last-stream-id, they were not - processed by the server and the receiver may treat the stream as - though it had never been created at all (hence the receiver may want - to re-create the stream later on a new session). - - Endpoints should always send a GOAWAY message before closing a - connection so that the remote can know whether a stream has been - partially processed or not. (For example, if an HTTP client sends a - POST at the same time that a server closes a connection, the client - cannot know if the server started to process that POST request if the - server does not send a GOAWAY frame to indicate where it stopped - working). - - After sending a GOAWAY message, the sender must ignore all SYN_STREAM - frames for new streams. - - - - - -Belshe & Peon Expires August 4, 2012 [Page 20] - -Internet-Draft SPDY Feb 2012 - - - +----------------------------------+ - |1| version | 7 | - +----------------------------------+ - | 0 (flags) | 8 (length) | - +----------------------------------| - |X| Last-good-stream-ID (31 bits) | - +----------------------------------+ - | Status code | - +----------------------------------+ - - Control bit: The control bit is always 1 for this message. - - Version: The SPDY version number. - - Type: The message type for a GOAWAY message is 7. - - Length: This frame is always 8 bytes long. - - Last-good-stream-Id: The last stream id which was replied to (with - either a SYN_REPLY or RST_STREAM) by the sender of the GOAWAY - message. If no streams were replied to, this value MUST be 0. - - Status: The reason for closing the session. - - 0 - OK. This is a normal session teardown. - - 1 - PROTOCOL_ERROR. This is a generic error, and should only be - used if a more specific error is not available. - - 11 - INTERNAL_ERROR. This is a generic error which can be used - when the implementation has internally failed, not due to anything - in the protocol. - -2.6.7. HEADERS - - The HEADERS frame augments a stream with additional headers. It may - be optionally sent on an existing stream at any time. Specific - application of the headers in this frame is application-dependent. - The name/value header block within this frame is compressed. - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 21] - -Internet-Draft SPDY Feb 2012 - - -+------------------------------------+ -|1| version | 8 | -+------------------------------------+ -| Flags (8) | Length (24 bits) | -+------------------------------------+ -|X| Stream-ID (31bits) | -+------------------------------------+ -| Number of Name/Value pairs (int32) | <+ -+------------------------------------+ | -| Length of name (int32) | | This section is the "Name/Value -+------------------------------------+ | Header Block", and is compressed. -| Name (string) | | -+------------------------------------+ | -| Length of value (int32) | | -+------------------------------------+ | -| Value (string) | | -+------------------------------------+ | -| (repeats) | <+ - - Flags: Flags related to this frame. Valid flags are: - - 0x01 = FLAG_FIN - marks this frame as the last frame to be - transmitted on this stream and puts the sender in the half-closed - (Section 2.3.6) state. - - Length: An unsigned 24 bit value representing the number of bytes - after the length field. The minimum length of the length field is 4 - (when the number of name value pairs is 0). - - Stream-ID: The stream this HEADERS block is associated with. - - Name/Value Header Block: A set of name/value pairs carried as part of - the SYN_STREAM. see Name/Value Header Block (Section 2.6.10). - -2.6.8. WINDOW_UPDATE - - The WINDOW_UPDATE control frame is used to implement per stream flow - control in SPDY. Flow control in SPDY is per hop, that is, only - between the two endpoints of a SPDY connection. If there are one or - more intermediaries between the client and the origin server, flow - control signals are not explicitly forwarded by the intermediaries. - (However, throttling of data transfer by any recipient may have the - effect of indirectly propagating flow control information upstream - back to the original sender.) Flow control only applies to the data - portion of data frames. Recipients must buffer all control frames. - If a recipient fails to buffer an entire control frame, it MUST issue - a stream error (Section 2.4.2) with the status code - FLOW_CONTROL_ERROR for the stream. - - - -Belshe & Peon Expires August 4, 2012 [Page 22] - -Internet-Draft SPDY Feb 2012 - - - Flow control in SPDY is implemented by a data transfer window kept by - the sender of each stream. The data transfer window is a simple - uint32 that indicates how many bytes of data the sender can transmit. - After a stream is created, but before any data frames have been - transmitted, the sender begins with the initial window size. This - window size is a measure of the buffering capability of the - recipient. The sender must not send a data frame with data length - greater than the transfer window size. After sending each data - frame, the sender decrements its transfer window size by the amount - of data transmitted. When the window size becomes less than or equal - to 0, the sender must pause transmitting data frames. At the other - end of the stream, the recipient sends a WINDOW_UPDATE control back - to notify the sender that it has consumed some data and freed up - buffer space to receive more data. - - +----------------------------------+ - |1| version | 9 | - +----------------------------------+ - | 0 (flags) | 8 (length) | - +----------------------------------+ - |X| Stream-ID (31-bits) | - +----------------------------------+ - |X| Delta-Window-Size (31-bits) | - +----------------------------------+ - - Control bit: The control bit is always 1 for this message. - - Version: The SPDY version number. - - Type: The message type for a WINDOW_UPDATE message is 9. - - Length: The length field is always 8 for this frame (there are 8 - bytes after the length field). - - Stream-ID: The stream ID that this WINDOW_UPDATE control frame is - for. - - Delta-Window-Size: The additional number of bytes that the sender can - transmit in addition to existing remaining window size. The legal - range for this field is 1 to 2^31 - 1 (0x7fffffff) bytes. - - The window size as kept by the sender must never exceed 2^31 - (although it can become negative in one special case). If a sender - receives a WINDOW_UPDATE that causes the its window size to exceed - this limit, it must send RST_STREAM with status code - FLOW_CONTROL_ERROR to terminate the stream. - - When a SPDY connection is first established, the default initial - - - -Belshe & Peon Expires August 4, 2012 [Page 23] - -Internet-Draft SPDY Feb 2012 - - - window size for all streams is 64KB. An endpoint can use the - SETTINGS control frame to adjust the initial window size for the - connection. That is, its peer can start out using the 64KB default - initial window size when sending data frames before receiving the - SETTINGS. Because SETTINGS is asynchronous, there may be a race - condition if the recipient wants to decrease the initial window size, - but its peer immediately sends 64KB on the creation of a new - connection, before waiting for the SETTINGS to arrive. This is one - case where the window size kept by the sender will become negative. - Once the sender detects this condition, it must stop sending data - frames and wait for the recipient to catch up. The recipient has two - choices: - - immediately send RST_STREAM with FLOW_CONTROL_ERROR status code. - - allow the head of line blocking (as there is only one stream for - the session and the amount of data in flight is bounded by the - default initial window size), and send WINDOW_UPDATE as it - consumes data. - - In the case of option 2, both sides must compute the window size - based on the initial window size in the SETTINGS. For example, if - the recipient sets the initial window size to be 16KB, and the sender - sends 64KB immediately on connection establishment, the sender will - discover its window size is -48KB on receipt of the SETTINGS. As the - recipient consumes the first 16KB, it must send a WINDOW_UPDATE of - 16KB back to the sender. This interaction continues until the - sender's window size becomes positive again, and it can resume - transmitting data frames. - - After the recipient reads in a data frame with FLAG_FIN that marks - the end of the data stream, it should not send WINDOW_UPDATE frames - as it consumes the last data frame. A sender should ignore all the - WINDOW_UPDATE frames associated with the stream after it send the - last frame for the stream. - - The data frames from the sender and the WINDOW_UPDATE frames from the - recipient are completely asynchronous with respect to each other. - This property allows a recipient to aggressively update the window - size kept by the sender to prevent the stream from stalling. - -2.6.9. CREDENTIAL - - The CREDENTIAL control frame is used by the client to send additional - client certificates to the server. A SPDY client may decide to send - requests for resources from different origins on the same SPDY - session if it decides that that server handles both origins. For - example if the IP address associated with both hostnames matches and - - - -Belshe & Peon Expires August 4, 2012 [Page 24] - -Internet-Draft SPDY Feb 2012 - - - the SSL server certificate presented in the initial handshake is - valid for both hostnames. However, because the SSL connection can - contain at most one client certificate, the client needs a mechanism - to send additional client certificates to the server. - - The server is required to maintain a vector of client certificates - associated with a SPDY session. When the client needs to send a - client certificate to the server, it will send a CREDENTIAL frame - that specifies the index of the slot in which to store the - certificate as well as proof that the client posesses the - corresponding private key. The initial size of this vector must be - 8. If the client provides a client certificate during the first TLS - handshake, the contents of this certificate must be copied into the - first slot (index 1) in the CREDENTIAL vector, though it may be - overwritten by subsequent CREDENTIAL frames. The server must - exclusively use the CREDNETIAL vector when evaluating the client - certificates associated with an origin. The server may change the - size of this vector by sending a SETTINGS frame with the setting - SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE value specified. In the - event that the new size is smaller than the current size, truncation - occurs preserving lower-index slots as possible. - - TLS renegotiation with client authentication is incompatible with - SPDY given the multiplexed nature of SPDY. Specifically, imagine - that the client has 2 requests outstanding to the server for two - different pages (in different tabs). When the renegotiation + client - certificate request comes in, the browser is unable to determine - which resource triggered the client certificate request, in order to - prompt the user accordingly. - - +----------------------------------+ - |1|000000000000001|0000000000001011| - +----------------------------------+ - | flags (8) | Length (24 bits) | - +----------------------------------+ - | Slot (16 bits) | | - +-----------------+ | - | Proof Length (32 bits) | - +----------------------------------+ - | Proof | - +----------------------------------+ <+ - | Certificate Length (32 bits) | | - +----------------------------------+ | Repeated until end of frame - | Certificate | | - +----------------------------------+ <+ - - Slot: The index in the server's client certificate vector where this - certificate should be stored. If there is already a certificate - - - -Belshe & Peon Expires August 4, 2012 [Page 25] - -Internet-Draft SPDY Feb 2012 - - - stored at this index, it will be overwritten. The index is one - based, not zero based; zero is an invalid slot index. - - Proof: Cryptographic proof that the client has possession of the - private key associated with the certificate. The format is a TLS - digitally-signed element - (http://tools.ietf.org/html/rfc5246#section-4.7). The signature - algorithm must be the same as that used in the CertificateVerify - message. However, since the MD5+SHA1 signature type used in TLS 1.0 - connections can not be correctly encoded in a digitally-signed - element, SHA1 must be used when MD5+SHA1 was used in the SSL - connection. The signature is calculated over a 32 byte TLS extractor - value (http://tools.ietf.org/html/rfc5705) with a label of "EXPORTER - SPDY certificate proof" using the empty string as context. ForRSA - certificates the signature would be a PKCS#1 v1.5 signature. For - ECDSA, it would be an ECDSA-Sig-Value - (http://tools.ietf.org/html/rfc5480#appendix-A). For a 1024-bit RSA - key, the CREDENTIAL message would be ~500 bytes. - - Certificate: The certificate chain, starting with the leaf - certificate. Each certificate must be encoded as a 32 bit length, - followed by a DER encoded certificate. The certificate must be of - the same type (RSA, ECDSA, etc) as the client certificate associated - with the SSL connection. - - If the server receives a request for a resource with unacceptable - credential (either missing or invalid), it must reply with a - RST_STREAM frame with the status code INVALID_CREDENTIALS. Upon - receipt of a RST_STREAM frame with INVALID_CREDENTIALS, the client - should initiate a new stream directly to the requested origin and - resend the request. Note, SPDY does not allow the server to request - different client authentication for different resources in the same - origin. - - If the server receives an invalid CREDENTIAL frame, it MUST respond - with a GOAWAY frame and shutdown the session. - -2.6.10. Name/Value Header Block - - The Name/Value Header Block is found in the SYN_STREAM, SYN_REPLY and - HEADERS control frames, and shares a common format: - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 26] - -Internet-Draft SPDY Feb 2012 - - - +------------------------------------+ - | Number of Name/Value pairs (int32) | - +------------------------------------+ - | Length of name (int32) | - +------------------------------------+ - | Name (string) | - +------------------------------------+ - | Length of value (int32) | - +------------------------------------+ - | Value (string) | - +------------------------------------+ - | (repeats) | - - Number of Name/Value pairs: The number of repeating name/value pairs - following this field. - - List of Name/Value pairs: - - Length of Name: a 32-bit value containing the number of octets in - the name field. Note that in practice, this length must not - exceed 2^24, as that is the maximum size of a SPDY frame. - - Name: 0 or more octets, 8-bit sequences of data, excluding 0. - - Length of Value: a 32-bit value containing the number of octets in - the value field. Note that in practice, this length must not - exceed 2^24, as that is the maximum size of a SPDY frame. - - Value: 0 or more octets, 8-bit sequences of data, excluding 0. - - Each header name must have at least one value. Header names are - encoded using the US-ASCII character set [ASCII] and must be all - lower case. The length of each name must be greater than zero. A - recipient of a zero-length name MUST issue a stream error - (Section 2.4.2) with the status code PROTOCOL_ERROR for the - stream-id. - - Duplicate header names are not allowed. To send two identically - named headers, send a header with two values, where the values are - separated by a single NUL (0) byte. A header value can either be - empty (e.g. the length is zero) or it can contain multiple, NUL- - separated values, each with length greater than zero. The value - never starts nor ends with a NUL character. Recipients of illegal - value fields MUST issue a stream error (Section 2.4.2) with the - status code PROTOCOL_ERROR for the stream-id. - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 27] - -Internet-Draft SPDY Feb 2012 - - -2.6.10.1. Compression - - The Name/Value Header Block is a section of the SYN_STREAM, - SYN_REPLY, and HEADERS frames used to carry header meta-data. This - block is always compressed using zlib compression. Within this - specification, any reference to 'zlib' is referring to the ZLIB - Compressed Data Format Specification Version 3.3 as part of RFC1950. - [RFC1950] - - For each HEADERS compression instance, the initial state is - initialized using the following dictionary [UDELCOMPRESSION]: - - const unsigned char SPDY_dictionary_txt[] = { - 0x00, 0x00, 0x00, 0x07, 0x6f, 0x70, 0x74, 0x69, \\ - - - - o p t i - 0x6f, 0x6e, 0x73, 0x00, 0x00, 0x00, 0x04, 0x68, \\ o n s - - - - h - 0x65, 0x61, 0x64, 0x00, 0x00, 0x00, 0x04, 0x70, \\ e a d - - - - p - 0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x03, 0x70, \\ o s t - - - - p - 0x75, 0x74, 0x00, 0x00, 0x00, 0x06, 0x64, 0x65, \\ u t - - - - d e - 0x6c, 0x65, 0x74, 0x65, 0x00, 0x00, 0x00, 0x05, \\ l e t e - - - - - 0x74, 0x72, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00, \\ t r a c e - - - - 0x06, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x00, \\ - a c c e p t - - 0x00, 0x00, 0x0e, 0x61, 0x63, 0x63, 0x65, 0x70, \\ - - - a c c e p - 0x74, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65, \\ t - c h a r s e - 0x74, 0x00, 0x00, 0x00, 0x0f, 0x61, 0x63, 0x63, \\ t - - - - a c c - 0x65, 0x70, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f, \\ e p t - e n c o - 0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x0f, \\ d i n g - - - - - 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x6c, \\ a c c e p t - l - 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x00, \\ a n g u a g e - - 0x00, 0x00, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x70, \\ - - - a c c e p - 0x74, 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73, \\ t - r a n g e s - 0x00, 0x00, 0x00, 0x03, 0x61, 0x67, 0x65, 0x00, \\ - - - - a g e - - 0x00, 0x00, 0x05, 0x61, 0x6c, 0x6c, 0x6f, 0x77, \\ - - - a l l o w - 0x00, 0x00, 0x00, 0x0d, 0x61, 0x75, 0x74, 0x68, \\ - - - - a u t h - 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, \\ o r i z a t i o - 0x6e, 0x00, 0x00, 0x00, 0x0d, 0x63, 0x61, 0x63, \\ n - - - - c a c - 0x68, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, \\ h e - c o n t r - 0x6f, 0x6c, 0x00, 0x00, 0x00, 0x0a, 0x63, 0x6f, \\ o l - - - - c o - 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, \\ n n e c t i o n - 0x00, 0x00, 0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74, \\ - - - - c o n t - 0x65, 0x6e, 0x74, 0x2d, 0x62, 0x61, 0x73, 0x65, \\ e n t - b a s e - 0x00, 0x00, 0x00, 0x10, 0x63, 0x6f, 0x6e, 0x74, \\ - - - - c o n t - 0x65, 0x6e, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f, \\ e n t - e n c o - 0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x10, \\ d i n g - - - - - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, \\ c o n t e n t - - 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, \\ l a n g u a g e - 0x00, 0x00, 0x00, 0x0e, 0x63, 0x6f, 0x6e, 0x74, \\ - - - - c o n t - 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x65, 0x6e, 0x67, \\ e n t - l e n g - 0x74, 0x68, 0x00, 0x00, 0x00, 0x10, 0x63, 0x6f, \\ t h - - - - c o - - - -Belshe & Peon Expires August 4, 2012 [Page 28] - -Internet-Draft SPDY Feb 2012 - - - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x6f, \\ n t e n t - l o - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, \\ c a t i o n - - - 0x00, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, \\ - - c o n t e n - 0x74, 0x2d, 0x6d, 0x64, 0x35, 0x00, 0x00, 0x00, \\ t - m d 5 - - - - 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, \\ - c o n t e n t - 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00, \\ - r a n g e - - - 0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, \\ - - c o n t e n - 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x00, 0x00, \\ t - t y p e - - - 0x00, 0x04, 0x64, 0x61, 0x74, 0x65, 0x00, 0x00, \\ - - d a t e - - - 0x00, 0x04, 0x65, 0x74, 0x61, 0x67, 0x00, 0x00, \\ - - e t a g - - - 0x00, 0x06, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, \\ - - e x p e c t - 0x00, 0x00, 0x00, 0x07, 0x65, 0x78, 0x70, 0x69, \\ - - - - e x p i - 0x72, 0x65, 0x73, 0x00, 0x00, 0x00, 0x04, 0x66, \\ r e s - - - - f - 0x72, 0x6f, 0x6d, 0x00, 0x00, 0x00, 0x04, 0x68, \\ r o m - - - - h - 0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x08, 0x69, \\ o s t - - - - i - 0x66, 0x2d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x00, \\ f - m a t c h - - 0x00, 0x00, 0x11, 0x69, 0x66, 0x2d, 0x6d, 0x6f, \\ - - - i f - m o - 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2d, 0x73, \\ d i f i e d - s - 0x69, 0x6e, 0x63, 0x65, 0x00, 0x00, 0x00, 0x0d, \\ i n c e - - - - - 0x69, 0x66, 0x2d, 0x6e, 0x6f, 0x6e, 0x65, 0x2d, \\ i f - n o n e - - 0x6d, 0x61, 0x74, 0x63, 0x68, 0x00, 0x00, 0x00, \\ m a t c h - - - - 0x08, 0x69, 0x66, 0x2d, 0x72, 0x61, 0x6e, 0x67, \\ - i f - r a n g - 0x65, 0x00, 0x00, 0x00, 0x13, 0x69, 0x66, 0x2d, \\ e - - - - i f - - 0x75, 0x6e, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, \\ u n m o d i f i - 0x65, 0x64, 0x2d, 0x73, 0x69, 0x6e, 0x63, 0x65, \\ e d - s i n c e - 0x00, 0x00, 0x00, 0x0d, 0x6c, 0x61, 0x73, 0x74, \\ - - - - l a s t - 0x2d, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, \\ - m o d i f i e - 0x64, 0x00, 0x00, 0x00, 0x08, 0x6c, 0x6f, 0x63, \\ d - - - - l o c - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, \\ a t i o n - - - - 0x0c, 0x6d, 0x61, 0x78, 0x2d, 0x66, 0x6f, 0x72, \\ - m a x - f o r - 0x77, 0x61, 0x72, 0x64, 0x73, 0x00, 0x00, 0x00, \\ w a r d s - - - - 0x06, 0x70, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x00, \\ - p r a g m a - - 0x00, 0x00, 0x12, 0x70, 0x72, 0x6f, 0x78, 0x79, \\ - - - p r o x y - 0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, \\ - a u t h e n t - 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00, \\ i c a t e - - - - 0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2d, 0x61, \\ - p r o x y - a - 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, \\ u t h o r i z a - 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x05, \\ t i o n - - - - - 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00, 0x00, \\ r a n g e - - - - 0x07, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72, \\ - r e f e r e r - 0x00, 0x00, 0x00, 0x0b, 0x72, 0x65, 0x74, 0x72, \\ - - - - r e t r - 0x79, 0x2d, 0x61, 0x66, 0x74, 0x65, 0x72, 0x00, \\ y - a f t e r - - 0x00, 0x00, 0x06, 0x73, 0x65, 0x72, 0x76, 0x65, \\ - - - s e r v e - 0x72, 0x00, 0x00, 0x00, 0x02, 0x74, 0x65, 0x00, \\ r - - - - t e - - 0x00, 0x00, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, \\ - - - t r a i l - 0x65, 0x72, 0x00, 0x00, 0x00, 0x11, 0x74, 0x72, \\ e r - - - - t r - 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2d, 0x65, \\ a n s f e r - e - 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x00, \\ n c o d i n g - - - - -Belshe & Peon Expires August 4, 2012 [Page 29] - -Internet-Draft SPDY Feb 2012 - - - 0x00, 0x00, 0x07, 0x75, 0x70, 0x67, 0x72, 0x61, \\ - - - u p g r a - 0x64, 0x65, 0x00, 0x00, 0x00, 0x0a, 0x75, 0x73, \\ d e - - - - u s - 0x65, 0x72, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, \\ e r - a g e n t - 0x00, 0x00, 0x00, 0x04, 0x76, 0x61, 0x72, 0x79, \\ - - - - v a r y - 0x00, 0x00, 0x00, 0x03, 0x76, 0x69, 0x61, 0x00, \\ - - - - v i a - - 0x00, 0x00, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69, \\ - - - w a r n i - 0x6e, 0x67, 0x00, 0x00, 0x00, 0x10, 0x77, 0x77, \\ n g - - - - w w - 0x77, 0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, \\ w - a u t h e n - 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00, \\ t i c a t e - - - 0x00, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, \\ - - m e t h o d - 0x00, 0x00, 0x00, 0x03, 0x67, 0x65, 0x74, 0x00, \\ - - - - g e t - - 0x00, 0x00, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, \\ - - - s t a t u - 0x73, 0x00, 0x00, 0x00, 0x06, 0x32, 0x30, 0x30, \\ s - - - - 2 0 0 - 0x20, 0x4f, 0x4b, 0x00, 0x00, 0x00, 0x07, 0x76, \\ - O K - - - - v - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x00, \\ e r s i o n - - - 0x00, 0x08, 0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, \\ - - H T T P - 1 - 0x2e, 0x31, 0x00, 0x00, 0x00, 0x03, 0x75, 0x72, \\ - 1 - - - - u r - 0x6c, 0x00, 0x00, 0x00, 0x06, 0x70, 0x75, 0x62, \\ l - - - - p u b - 0x6c, 0x69, 0x63, 0x00, 0x00, 0x00, 0x0a, 0x73, \\ l i c - - - - s - 0x65, 0x74, 0x2d, 0x63, 0x6f, 0x6f, 0x6b, 0x69, \\ e t - c o o k i - 0x65, 0x00, 0x00, 0x00, 0x0a, 0x6b, 0x65, 0x65, \\ e - - - - k e e - 0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x00, \\ p - a l i v e - - 0x00, 0x00, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, \\ - - - o r i g i - 0x6e, 0x31, 0x30, 0x30, 0x31, 0x30, 0x31, 0x32, \\ n 1 0 0 1 0 1 2 - 0x30, 0x31, 0x32, 0x30, 0x32, 0x32, 0x30, 0x35, \\ 0 1 2 0 2 2 0 5 - 0x32, 0x30, 0x36, 0x33, 0x30, 0x30, 0x33, 0x30, \\ 2 0 6 3 0 0 3 0 - 0x32, 0x33, 0x30, 0x33, 0x33, 0x30, 0x34, 0x33, \\ 2 3 0 3 3 0 4 3 - 0x30, 0x35, 0x33, 0x30, 0x36, 0x33, 0x30, 0x37, \\ 0 5 3 0 6 3 0 7 - 0x34, 0x30, 0x32, 0x34, 0x30, 0x35, 0x34, 0x30, \\ 4 0 2 4 0 5 4 0 - 0x36, 0x34, 0x30, 0x37, 0x34, 0x30, 0x38, 0x34, \\ 6 4 0 7 4 0 8 4 - 0x30, 0x39, 0x34, 0x31, 0x30, 0x34, 0x31, 0x31, \\ 0 9 4 1 0 4 1 1 - 0x34, 0x31, 0x32, 0x34, 0x31, 0x33, 0x34, 0x31, \\ 4 1 2 4 1 3 4 1 - 0x34, 0x34, 0x31, 0x35, 0x34, 0x31, 0x36, 0x34, \\ 4 4 1 5 4 1 6 4 - 0x31, 0x37, 0x35, 0x30, 0x32, 0x35, 0x30, 0x34, \\ 1 7 5 0 2 5 0 4 - 0x35, 0x30, 0x35, 0x32, 0x30, 0x33, 0x20, 0x4e, \\ 5 0 5 2 0 3 - N - 0x6f, 0x6e, 0x2d, 0x41, 0x75, 0x74, 0x68, 0x6f, \\ o n - A u t h o - 0x72, 0x69, 0x74, 0x61, 0x74, 0x69, 0x76, 0x65, \\ r i t a t i v e - 0x20, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, \\ - I n f o r m a - 0x74, 0x69, 0x6f, 0x6e, 0x32, 0x30, 0x34, 0x20, \\ t i o n 2 0 4 - - 0x4e, 0x6f, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x65, \\ N o - C o n t e - 0x6e, 0x74, 0x33, 0x30, 0x31, 0x20, 0x4d, 0x6f, \\ n t 3 0 1 - M o - 0x76, 0x65, 0x64, 0x20, 0x50, 0x65, 0x72, 0x6d, \\ v e d - P e r m - 0x61, 0x6e, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x34, \\ a n e n t l y 4 - 0x30, 0x30, 0x20, 0x42, 0x61, 0x64, 0x20, 0x52, \\ 0 0 - B a d - R - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x34, 0x30, \\ e q u e s t 4 0 - 0x31, 0x20, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, \\ 1 - U n a u t h - 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x64, 0x34, 0x30, \\ o r i z e d 4 0 - 0x33, 0x20, 0x46, 0x6f, 0x72, 0x62, 0x69, 0x64, \\ 3 - F o r b i d - - - -Belshe & Peon Expires August 4, 2012 [Page 30] - -Internet-Draft SPDY Feb 2012 - - - 0x64, 0x65, 0x6e, 0x34, 0x30, 0x34, 0x20, 0x4e, \\ d e n 4 0 4 - N - 0x6f, 0x74, 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, \\ o t - F o u n d - 0x35, 0x30, 0x30, 0x20, 0x49, 0x6e, 0x74, 0x65, \\ 5 0 0 - I n t e - 0x72, 0x6e, 0x61, 0x6c, 0x20, 0x53, 0x65, 0x72, \\ r n a l - S e r - 0x76, 0x65, 0x72, 0x20, 0x45, 0x72, 0x72, 0x6f, \\ v e r - E r r o - 0x72, 0x35, 0x30, 0x31, 0x20, 0x4e, 0x6f, 0x74, \\ r 5 0 1 - N o t - 0x20, 0x49, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, \\ - I m p l e m e - 0x6e, 0x74, 0x65, 0x64, 0x35, 0x30, 0x33, 0x20, \\ n t e d 5 0 3 - - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x20, \\ S e r v i c e - - 0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, \\ U n a v a i l a - 0x62, 0x6c, 0x65, 0x4a, 0x61, 0x6e, 0x20, 0x46, \\ b l e J a n - F - 0x65, 0x62, 0x20, 0x4d, 0x61, 0x72, 0x20, 0x41, \\ e b - M a r - A - 0x70, 0x72, 0x20, 0x4d, 0x61, 0x79, 0x20, 0x4a, \\ p r - M a y - J - 0x75, 0x6e, 0x20, 0x4a, 0x75, 0x6c, 0x20, 0x41, \\ u n - J u l - A - 0x75, 0x67, 0x20, 0x53, 0x65, 0x70, 0x74, 0x20, \\ u g - S e p t - - 0x4f, 0x63, 0x74, 0x20, 0x4e, 0x6f, 0x76, 0x20, \\ O c t - N o v - - 0x44, 0x65, 0x63, 0x20, 0x30, 0x30, 0x3a, 0x30, \\ D e c - 0 0 - 0 - 0x30, 0x3a, 0x30, 0x30, 0x20, 0x4d, 0x6f, 0x6e, \\ 0 - 0 0 - M o n - 0x2c, 0x20, 0x54, 0x75, 0x65, 0x2c, 0x20, 0x57, \\ - - T u e - - W - 0x65, 0x64, 0x2c, 0x20, 0x54, 0x68, 0x75, 0x2c, \\ e d - - T h u - - 0x20, 0x46, 0x72, 0x69, 0x2c, 0x20, 0x53, 0x61, \\ - F r i - - S a - 0x74, 0x2c, 0x20, 0x53, 0x75, 0x6e, 0x2c, 0x20, \\ t - - S u n - - - 0x47, 0x4d, 0x54, 0x63, 0x68, 0x75, 0x6e, 0x6b, \\ G M T c h u n k - 0x65, 0x64, 0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f, \\ e d - t e x t - - 0x68, 0x74, 0x6d, 0x6c, 0x2c, 0x69, 0x6d, 0x61, \\ h t m l - i m a - 0x67, 0x65, 0x2f, 0x70, 0x6e, 0x67, 0x2c, 0x69, \\ g e - p n g - i - 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x6a, 0x70, 0x67, \\ m a g e - j p g - 0x2c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x67, \\ - i m a g e - g - 0x69, 0x66, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69, \\ i f - a p p l i - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78, \\ c a t i o n - x - 0x6d, 0x6c, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69, \\ m l - a p p l i - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78, \\ c a t i o n - x - 0x68, 0x74, 0x6d, 0x6c, 0x2b, 0x78, 0x6d, 0x6c, \\ h t m l - x m l - 0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c, \\ - t e x t - p l - 0x61, 0x69, 0x6e, 0x2c, 0x74, 0x65, 0x78, 0x74, \\ a i n - t e x t - 0x2f, 0x6a, 0x61, 0x76, 0x61, 0x73, 0x63, 0x72, \\ - j a v a s c r - 0x69, 0x70, 0x74, 0x2c, 0x70, 0x75, 0x62, 0x6c, \\ i p t - p u b l - 0x69, 0x63, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, \\ i c p r i v a t - 0x65, 0x6d, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65, \\ e m a x - a g e - 0x3d, 0x67, 0x7a, 0x69, 0x70, 0x2c, 0x64, 0x65, \\ - g z i p - d e - 0x66, 0x6c, 0x61, 0x74, 0x65, 0x2c, 0x73, 0x64, \\ f l a t e - s d - 0x63, 0x68, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65, \\ c h c h a r s e - 0x74, 0x3d, 0x75, 0x74, 0x66, 0x2d, 0x38, 0x63, \\ t - u t f - 8 c - 0x68, 0x61, 0x72, 0x73, 0x65, 0x74, 0x3d, 0x69, \\ h a r s e t - i - 0x73, 0x6f, 0x2d, 0x38, 0x38, 0x35, 0x39, 0x2d, \\ s o - 8 8 5 9 - - 0x31, 0x2c, 0x75, 0x74, 0x66, 0x2d, 0x2c, 0x2a, \\ 1 - u t f - - - - 0x2c, 0x65, 0x6e, 0x71, 0x3d, 0x30, 0x2e \\ - e n q - 0 - - }; - - - -Belshe & Peon Expires August 4, 2012 [Page 31] - -Internet-Draft SPDY Feb 2012 - - - The entire contents of the name/value header block is compressed - using zlib. There is a single zlib stream for all name value pairs - in one direction on a connection. SPDY uses a SYNC_FLUSH between - each compressed frame. - - Implementation notes: the compression engine can be tuned to favor - speed or size. Optimizing for size increases memory use and CPU - consumption. Because header blocks are generally small, implementors - may want to reduce the window-size of the compression engine from the - default 15bits (a 32KB window) to more like 11bits (a 2KB window). - The exact setting is chosen by the compressor, the decompressor will - work with any setting. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 32] - -Internet-Draft SPDY Feb 2012 - - -3. HTTP Layering over SPDY - - SPDY is intended to be as compatible as possible with current web- - based applications. This means that, from the perspective of the - server business logic or application API, the features of HTTP are - unchanged. To achieve this, all of the application request and - response header semantics are preserved, although the syntax of - conveying those semantics has changed. Thus, the rules from the - HTTP/1.1 specification in RFC2616 [RFC2616] apply with the changes in - the sections below. - -3.1. Connection Management - - Clients SHOULD NOT open more than one SPDY session to a given origin - [RFC6454] concurrently. - - Note that it is possible for one SPDY session to be finishing (e.g. a - GOAWAY message has been sent, but not all streams have finished), - while another SPDY session is starting. - -3.1.1. Use of GOAWAY - - SPDY provides a GOAWAY message which can be used when closing a - connection from either the client or server. Without a server GOAWAY - message, HTTP has a race condition where the client sends a request - (a new SYN_STREAM) just as the server is closing the connection, and - the client cannot know if the server received the stream or not. By - using the last-stream-id in the GOAWAY, servers can indicate to the - client if a request was processed or not. - - Note that some servers will choose to send the GOAWAY and immediately - terminate the connection without waiting for active streams to - finish. The client will be able to determine this because SPDY - streams are determinstically closed. This abrupt termination will - force the client to heuristically decide whether to retry the pending - requests. Clients always need to be capable of dealing with this - case because they must deal with accidental connection termination - cases, which are the same as the server never having sent a GOAWAY. - - More sophisticated servers will use GOAWAY to implement a graceful - teardown. They will send the GOAWAY and provide some time for the - active streams to finish before terminating the connection. - - If a SPDY client closes the connection, it should also send a GOAWAY - message. This allows the server to know if any server-push streams - were received by the client. - - If the endpoint closing the connection has not received any - - - -Belshe & Peon Expires August 4, 2012 [Page 33] - -Internet-Draft SPDY Feb 2012 - - - SYN_STREAMs from the remote, the GOAWAY will contain a last-stream-id - of 0. - -3.2. HTTP Request/Response - -3.2.1. Request - - The client initiates a request by sending a SYN_STREAM frame. For - requests which do not contain a body, the SYN_STREAM frame MUST set - the FLAG_FIN, indicating that the client intends to send no further - data on this stream. For requests which do contain a body, the - SYN_STREAM will not contain the FLAG_FIN, and the body will follow - the SYN_STREAM in a series of DATA frames. The last DATA frame will - set the FLAG_FIN to indicate the end of the body. - - The SYN_STREAM Name/Value section will contain all of the HTTP - headers which are associated with an HTTP request. The header block - in SPDY is mostly unchanged from today's HTTP header block, with the - following differences: - - The first line of the request is unfolded into name/value pairs - like other HTTP headers and MUST be present: - - ":method" - the HTTP method for this request (e.g. "GET", - "POST", "HEAD", etc) - - ":path" - the url-path for this url with "/" prefixed. (See - RFC1738 [RFC1738]). For example, for - "http://www.google.com/search?q=dogs" the path would be - "/search?q=dogs". - - ":version" - the HTTP version of this request (e.g. - "HTTP/1.1") - - In addition, the following two name/value pairs must also be - present in every request: - - ":host" - the hostport (See RFC1738 [RFC1738]) portion of the - URL for this request (e.g. "www.google.com:1234"). This header - is the same as the HTTP 'Host' header. - - ":scheme" - the scheme portion of the URL for this request - (e.g. "https")) - - Header names are all lowercase. - - The Connection, Host, Keep-Alive, Proxy-Connection, and Transfer- - Encoding headers are not valid and MUST not be sent. - - - -Belshe & Peon Expires August 4, 2012 [Page 34] - -Internet-Draft SPDY Feb 2012 - - - User-agents MUST support gzip compression. Regardless of the - Accept-Encoding sent by the user-agent, the server may always send - content encoded with gzip or deflate encoding. - - If a server receives a request where the sum of the data frame - payload lengths does not equal the size of the Content-Length - header, the server MUST return a 400 (Bad Request) error. - - POST-specific changes: - - Although POSTs are inherently chunked, POST requests SHOULD - also be accompanied by a Content-Length header. There are two - reasons for this: First, it assists with upload progress meters - for an improved user experience. But second, we know from - early versions of SPDY that failure to send a content length - header is incompatible with many existing HTTP server - implementations. Existing user-agents do not omit the Content- - Length header, and server implementations have come to depend - upon this. - - The user-agent is free to prioritize requests as it sees fit. If the - user-agent cannot make progress without receiving a resource, it - should attempt to raise the priority of that resource. Resources - such as images, SHOULD generally use the lowest priority. - - If a client sends a SYN_STREAM without all of the method, host, path, - scheme, and version headers, the server MUST reply with a HTTP 400 - Bad Request reply. - -3.2.2. Response - - The server responds to a client request with a SYN_REPLY frame. - Symmetric to the client's upload stream, server will send data after - the SYN_REPLY frame via a series of DATA frames, and the last data - frame will contain the FLAG_FIN to indicate successful end-of-stream. - If a response (like a 202 or 204 response) contains no body, the - SYN_REPLY frame may contain the FLAG_FIN flag to indicate no further - data will be sent on the stream. - - The response status line is unfolded into name/value pairs like - other HTTP headers and must be present: - - ":status" - The HTTP response status code (e.g. "200" or "200 - OK") - - ":version" - The HTTP response version (e.g. "HTTP/1.1") - - - - - -Belshe & Peon Expires August 4, 2012 [Page 35] - -Internet-Draft SPDY Feb 2012 - - - All header names must be lowercase. - - The Connection, Keep-Alive, Proxy-Connection, and Transfer- - Encoding headers are not valid and MUST not be sent. - - Responses MAY be accompanied by a Content-Length header for - advisory purposes. (e.g. for UI progress meters) - - If a client receives a response where the sum of the data frame - payload lengths does not equal the size of the Content-Length - header, the client MUST ignore the content length header. - - If a client receives a SYN_REPLY without a status or without a - version header, the client must reply with a RST_STREAM frame - indicating a PROTOCOL ERROR. - -3.2.3. Authentication - - When a client sends a request to an origin server that requires - authentication, the server can reply with a "401 Unauthorized" - response, and include a WWW-Authenticate challenge header that - defines the authentication scheme to be used. The client then - retries the request with an Authorization header appropriate to the - specified authentication scheme. - - There are four options for proxy authentication, Basic, Digest, NTLM - and Negotiate (SPNEGO). The first two options were defined in - RFC2617 [RFC2617], and are stateless. The second two options were - developed by Microsoft and specified in RFC4559 [RFC4559], and are - stateful; otherwise known as multi-round authentication, or - connection authentication. - -3.2.3.1. Stateless Authentication - - Stateless Authentication over SPDY is identical to how it is - performed over HTTP. If multiple SPDY streams are concurrently sent - to a single server, each will authenticate independently, similar to - how two HTTP connections would independently authenticate to a proxy - server. - -3.2.3.2. Stateful Authentication - - Unfortunately, the stateful authentication mechanisms were - implemented and defined in a such a way that directly violates - RFC2617 - they do not include a "realm" as part of the request. This - is problematic in SPDY because it makes it impossible for a client to - disambiguate two concurrent server authentication challenges. - - - - -Belshe & Peon Expires August 4, 2012 [Page 36] - -Internet-Draft SPDY Feb 2012 - - - To deal with this case, SPDY servers using Stateful Authentication - MUST implement one of two changes: - - Servers can add a "realm=" header so that the two - authentication requests can be disambiguated and run concurrently. - Unfortunately, given how these mechanisms work, this is probably - not practical. - - Upon sending the first stateful challenge response, the server - MUST buffer and defer all further frames which are not part of - completing the challenge until the challenge has completed. - Completing the authentication challenge may take multiple round - trips. Once the client receives a "401 Authenticate" response for - a stateful authentication type, it MUST stop sending new requests - to the server until the authentication has completed by receiving - a non-401 response on at least one stream. - -3.3. Server Push Transactions - - SPDY enables a server to send multiple replies to a client for a - single request. The rationale for this feature is that sometimes a - server knows that it will need to send multiple resources in response - to a single request. Without server push features, the client must - first download the primary resource, then discover the secondary - resource(s), and request them. Pushing of resources avoids the - round-trip delay, but also creates a potential race where a server - can be pushing content which a user-agent is in the process of - requesting. The following mechanics attempt to prevent the race - condition while enabling the performance benefit. - - Browsers receiving a pushed response MUST validate that the server is - authorized to push the URL using the browser same-origin [RFC6454] - policy. For example, a SPDY connection to www.foo.com is generally - not permitted to push a response for www.evil.com. - - If the browser accepts a pushed response (e.g. it does not send a - RST_STREAM), the browser MUST attempt to cache the pushed response in - same way that it would cache any other response. This means - validating the response headers and inserting into the disk cache. - - Because pushed responses have no request, they have no request - headers associated with them. At the framing layer, SPDY pushed - streams contain an "associated-stream-id" which indicates the - requested stream for which the pushed stream is related. The pushed - stream inherits all of the headers from the associated-stream-id with - the exception of ":host", ":scheme", and ":path", which are provided - as part of the pushed response stream headers. The browser MUST - store these inherited and implied request headers with the cached - - - -Belshe & Peon Expires August 4, 2012 [Page 37] - -Internet-Draft SPDY Feb 2012 - - - resource. - - Implementation note: With server push, it is theoretically possible - for servers to push unreasonable amounts of content or resources to - the user-agent. Browsers MUST implement throttles to protect against - unreasonable push attacks. - -3.3.1. Server implementation - - When the server intends to push a resource to the user-agent, it - opens a new stream by sending a unidirectional SYN_STREAM. The - SYN_STREAM MUST include an Associated-To-Stream-ID, and MUST set the - FLAG_UNIDIRECTIONAL flag. The SYN_STREAM MUST include headers for - ":scheme", ":host", ":path", which represent the URL for the resource - being pushed. Subsequent headers may follow in HEADERS frames. The - purpose of the association is so that the user-agent can - differentiate which request induced the pushed stream; without it, if - the user-agent had two tabs open to the same page, each pushing - unique content under a fixed URL, the user-agent would not be able to - differentiate the requests. - - The Associated-To-Stream-ID must be the ID of an existing, open - stream. The reason for this restriction is to have a clear endpoint - for pushed content. If the user-agent requested a resource on stream - 11, the server replies on stream 11. It can push any number of - additional streams to the client before sending a FLAG_FIN on stream - 11. However, once the originating stream is closed no further push - streams may be associated with it. The pushed streams do not need to - be closed (FIN set) before the originating stream is closed, they - only need to be created before the originating stream closes. - - It is illegal for a server to push a resource with the Associated-To- - Stream-ID of 0. - - To minimize race conditions with the client, the SYN_STREAM for the - pushed resources MUST be sent prior to sending any content which - could allow the client to discover the pushed resource and request - it. - - The server MUST only push resources which would have been returned - from a GET request. - - Note: If the server does not have all of the Name/Value Response - headers available at the time it issues the HEADERS frame for the - pushed resource, it may later use an additional HEADERS frame to - augment the name/value pairs to be associated with the pushed stream. - The subsequent HEADERS frame(s) must not contain a header for - ':host', ':scheme', or ':path' (e.g. the server can't change the - - - -Belshe & Peon Expires August 4, 2012 [Page 38] - -Internet-Draft SPDY Feb 2012 - - - identity of the resource to be pushed). The HEADERS frame must not - contain duplicate headers with a previously sent HEADERS frame. The - server must send a HEADERS frame including the scheme/host/port - headers before sending any data frames on the stream. - -3.3.2. Client implementation - - When fetching a resource the client has 3 possibilities: - - the resource is not being pushed - - the resource is being pushed, but the data has not yet arrived - - the resource is being pushed, and the data has started to arrive - - When a SYN_STREAM and HEADERS frame which contains an Associated-To- - Stream-ID is received, the client must not issue GET requests for the - resource in the pushed stream, and instead wait for the pushed stream - to arrive. - - If a client receives a server push stream with stream-id 0, it MUST - issue a session error (Section 2.4.1) with the status code - PROTOCOL_ERROR. - - When a client receives a SYN_STREAM from the server without a the - ':host', ':scheme', and ':path' headers in the Name/Value section, it - MUST reply with a RST_STREAM with error code HTTP_PROTOCOL_ERROR. - - To cancel individual server push streams, the client can issue a - stream error (Section 2.4.2) with error code CANCEL. Upon receipt, - the server MUST stop sending on this stream immediately (this is an - Abrupt termination). - - To cancel all server push streams related to a request, the client - may issue a stream error (Section 2.4.2) with error code CANCEL on - the associated-stream-id. By cancelling that stream, the server MUST - immediately stop sending frames for any streams with - in-association-to for the original stream. - - If the server sends a HEADER frame containing duplicate headers with - a previous HEADERS frame for the same stream, the client must issue a - stream error (Section 2.4.2) with error code PROTOCOL ERROR. - - If the server sends a HEADERS frame after sending a data frame for - the same stream, the client MAY ignore the HEADERS frame. Ignoring - the HEADERS frame after a data frame prevents handling of HTTP's - trailing headers - (http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.40). - - - -Belshe & Peon Expires August 4, 2012 [Page 39] - -Internet-Draft SPDY Feb 2012 - - -4. Design Rationale and Notes - - Authors' notes: The notes in this section have no bearing on the SPDY - protocol as specified within this document, and none of these notes - should be considered authoritative about how the protocol works. - However, these notes may prove useful in future debates about how to - resolve protocol ambiguities or how to evolve the protocol going - forward. They may be removed before the final draft. - -4.1. Separation of Framing Layer and Application Layer - - Readers may note that this specification sometimes blends the framing - layer (Section 2) with requirements of a specific application - HTTP - (Section 3). This is reflected in the request/response nature of the - streams, the definition of the HEADERS and compression contexts which - are very similar to HTTP, and other areas as well. - - This blending is intentional - the primary goal of this protocol is - to create a low-latency protocol for use with HTTP. Isolating the - two layers is convenient for description of the protocol and how it - relates to existing HTTP implementations. However, the ability to - reuse the SPDY framing layer is a non goal. - -4.2. Error handling - Framing Layer - - Error handling at the SPDY layer splits errors into two groups: Those - that affect an individual SPDY stream, and those that do not. - - When an error is confined to a single stream, but general framing is - in tact, SPDY attempts to use the RST_STREAM as a mechanism to - invalidate the stream but move forward without aborting the - connection altogether. - - For errors occuring outside of a single stream context, SPDY assumes - the entire session is hosed. In this case, the endpoint detecting - the error should initiate a connection close. - -4.3. One Connection Per Domain - - SPDY attempts to use fewer connections than other protocols have - traditionally used. The rationale for this behavior is because it is - very difficult to provide a consistent level of service (e.g. TCP - slow-start), prioritization, or optimal compression when the client - is connecting to the server through multiple channels. - - Through lab measurements, we have seen consistent latency benefits by - using fewer connections from the client. The overall number of - packets sent by SPDY can be as much as 40% less than HTTP. Handling - - - -Belshe & Peon Expires August 4, 2012 [Page 40] - -Internet-Draft SPDY Feb 2012 - - - large numbers of concurrent connections on the server also does - become a scalability problem, and SPDY reduces this load. - - The use of multiple connections is not without benefit, however. - Because SPDY multiplexes multiple, independent streams onto a single - stream, it creates a potential for head-of-line blocking problems at - the transport level. In tests so far, the negative effects of head- - of-line blocking (especially in the presence of packet loss) is - outweighed by the benefits of compression and prioritization. - -4.4. Fixed vs Variable Length Fields - - SPDY favors use of fixed length 32bit fields in cases where smaller, - variable length encodings could have been used. To some, this seems - like a tragic waste of bandwidth. SPDY choses the simple encoding - for speed and simplicity. - - The goal of SPDY is to reduce latency on the network. The overhead - of SPDY frames is generally quite low. Each data frame is only an 8 - byte overhead for a 1452 byte payload (~0.6%). At the time of this - writing, bandwidth is already plentiful, and there is a strong trend - indicating that bandwidth will continue to increase. With an average - worldwide bandwidth of 1Mbps, and assuming that a variable length - encoding could reduce the overhead by 50%, the latency saved by using - a variable length encoding would be less than 100 nanoseconds. More - interesting are the effects when the larger encodings force a packet - boundary, in which case a round-trip could be induced. However, by - addressing other aspects of SPDY and TCP interactions, we believe - this is completely mitigated. - -4.5. Compression Context(s) - - When isolating the compression contexts used for communicating with - multiple origins, we had a few choices to make. We could have - maintained a map (or list) of compression contexts usable for each - origin. The basic case is easy - each HEADERS frame would need to - identify the context to use for that frame. However, compression - contexts are not cheap, so the lifecycle of each context would need - to be bounded. For proxy servers, where we could churn through many - contexts, this would be a concern. We considered using a static set - of contexts, say 16 of them, which would bound the memory use. We - also considered dynamic contexts, which could be created on the fly, - and would need to be subsequently destroyed. All of these are - complicated, and ultimately we decided that such a mechanism creates - too many problems to solve. - - Alternatively, we've chosen the simple approach, which is to simply - provide a flag for resetting the compression context. For the common - - - -Belshe & Peon Expires August 4, 2012 [Page 41] - -Internet-Draft SPDY Feb 2012 - - - case (no proxy), this fine because most requests are to the same - origin and we never need to reset the context. For cases where we - are using two different origins over a single SPDY session, we simply - reset the compression state between each transition. - -4.6. Unidirectional streams - - Many readers notice that unidirectional streams are both a bit - confusing in concept and also somewhat redundant. If the recipient - of a stream doesn't wish to send data on a stream, it could simply - send a SYN_REPLY with the FLAG_FIN bit set. The FLAG_UNIDIRECTIONAL - is, therefore, not necessary. - - It is true that we don't need the UNIDIRECTIONAL markings. It is - added because it avoids the recipient of pushed streams from needing - to send a set of empty frames (e.g. the SYN_STREAM w/ FLAG_FIN) which - otherwise serve no purpose. - -4.7. Data Compression - - Generic compression of data portion of the streams (as opposed to - compression of the headers) without knowing the content of the stream - is redundant. There is no value in compressing a stream which is - already compressed. Because of this, SPDY does allow data - compression to be optional. We included it because study of existing - websites shows that many sites are not using compression as they - should, and users suffer because of it. We wanted a mechanism where, - at the SPDY layer, site administrators could simply force compression - - it is better to compress twice than to not compress. - - Overall, however, with this feature being optional and sometimes - redundant, it is unclear if it is useful at all. We will likely - remove it from the specification. - -4.8. Server Push - - A subtle but important point is that server push streams must be - declared before the associated stream is closed. The reason for this - is so that proxies have a lifetime for which they can discard - information about previous streams. If a pushed stream could - associate itself with an already-closed stream, then endpoints would - not have a specific lifecycle for when they could disavow knowledge - of the streams which went before. - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 42] - -Internet-Draft SPDY Feb 2012 - - -5. Security Considerations - -5.1. Use of Same-origin constraints - - This specification uses the same-origin policy [RFC6454] in all cases - where verification of content is required. - -5.2. HTTP Headers and SPDY Headers - - At the application level, HTTP uses name/value pairs in its headers. - Because SPDY merges the existing HTTP headers with SPDY headers, - there is a possibility that some HTTP applications already use a - particular header name. To avoid any conflicts, all headers - introduced for layering HTTP over SPDY are prefixed with ":". ":" is - not a valid sequence in HTTP header naming, preventing any possible - conflict. - -5.3. Cross-Protocol Attacks - - By utilizing TLS, we believe that SPDY introduces no new cross- - protocol attacks. TLS encrypts the contents of all transmission - (except the handshake itself), making it difficult for attackers to - control the data which could be used in a cross-protocol attack. - -5.4. Server Push Implicit Headers - - Pushed resources do not have an associated request. In order for - existing HTTP cache control validations (such as the Vary header) to - work, however, all cached resources must have a set of request - headers. For this reason, browsers MUST be careful to inherit - request headers from the associated stream for the push. This - includes the 'Cookie' header. - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 43] - -Internet-Draft SPDY Feb 2012 - - -6. Privacy Considerations - -6.1. Long Lived Connections - - SPDY aims to keep connections open longer between clients and servers - in order to reduce the latency when a user makes a request. The - maintenance of these connections over time could be used to expose - private information. For example, a user using a browser hours after - the previous user stopped using that browser may be able to learn - about what the previous user was doing. This is a problem with HTTP - in its current form as well, however the short lived connections make - it less of a risk. - -6.2. SETTINGS frame - - The SPDY SETTINGS frame allows servers to store out-of-band - transmitted information about the communication between client and - server on the client. Although this is intended only to be used to - reduce latency, renegade servers could use it as a mechanism to store - identifying information about the client in future requests. - - Clients implementing privacy modes, such as Google Chrome's - "incognito mode", may wish to disable client-persisted SETTINGS - storage. - - Clients MUST clear persisted SETTINGS information when clearing the - cookies. - - TODO: Put range maximums on each type of setting to limit - inappropriate uses. - - - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 44] - -Internet-Draft SPDY Feb 2012 - - -7. Incompatibilities with SPDY draft #2 - - Here is a list of the major changes between this draft and draft #2. - - Addition of flow control - - Increased 16 bit length fields in SYN_STREAM and SYN_REPLY to 32 - bits. - - Changed definition of compression for DATA frames - - Updated compression dictionary - - Fixed off-by-one on the compression dictionary for headers - - Increased priority field from 2bits to 3bits. - - Removed NOOP frame - - Split the request "url" into "scheme", "host", and "path" - - Added the requirement that POSTs contain content-length. - - Removed wasted 16bits of unused space from the end of the - SYN_REPLY and HEADERS frames. - - Fixed bug: Priorities were described backward (0 was lowest - instead of highest). - - Fixed bug: Name/Value header counts were duplicated in both the - Name Value header block and also the containing frame. - - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 45] - -Internet-Draft SPDY Feb 2012 - - -8. Requirements Notation - - The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", - "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this - document are to be interpreted as described in RFC 2119 [RFC2119]. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 46] - -Internet-Draft SPDY Feb 2012 - - -9. Acknowledgements - - Many individuals have contributed to the design and evolution of - SPDY: Adam Langley, Wan-Teh Chang, Jim Morrison, Mark Nottingham, - Alyssa Wilk, Costin Manolache, William Chan, Vitaliy Lvin, Joe Chan, - Adam Barth, Ryan Hamilton, Gavin Peters, Kent Alstad, Kevin Lindsay, - Paul Amer, Fan Yang, Jonathan Leighton - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 47] - -Internet-Draft SPDY Feb 2012 - - -10. Normative References - - [RFC0793] Postel, J., "Transmission Control Protocol", STD 7, - RFC 793, September 1981. - - [RFC1738] Berners-Lee, T., Masinter, L., and M. McCahill, "Uniform - Resource Locators (URL)", RFC 1738, December 1994. - - [RFC1950] Deutsch, L. and J-L. Gailly, "ZLIB Compressed Data Format - Specification version 3.3", RFC 1950, May 1996. - - [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate - Requirement Levels", BCP 14, RFC 2119, March 1997. - - [RFC2285] Mandeville, R., "Benchmarking Terminology for LAN - Switching Devices", RFC 2285, February 1998. - - [RFC2616] Fielding, R., Gettys, J., Mogul, J., Frystyk, H., - Masinter, L., Leach, P., and T. Berners-Lee, "Hypertext - Transfer Protocol -- HTTP/1.1", RFC 2616, June 1999. - - [RFC2617] Franks, J., Hallam-Baker, P., Hostetler, J., Lawrence, S., - Leach, P., Luotonen, A., and L. Stewart, "HTTP - Authentication: Basic and Digest Access Authentication", - RFC 2617, June 1999. - - [RFC4559] Jaganathan, K., Zhu, L., and J. Brezak, "SPNEGO-based - Kerberos and NTLM HTTP Authentication in Microsoft - Windows", RFC 4559, June 2006. - - [RFC4366] Blake-Wilson, S., Nystrom, M., Hopwood, D., Mikkelsen, J., - and T. Wright, "Transport Layer Security (TLS) - Extensions", RFC 4366, April 2006. - - [RFC5246] Dierks, T. and E. Rescorla, "The Transport Layer Security - (TLS) Protocol Version 1.2", RFC 5246, August 2008. - - [RFC6454] Barth, A., "The Web Origin Concept", RFC 6454, - December 2011. - - [TLSNPN] Langley, A., "TLS Next Protocol Negotiation", - . - - [ASCII] "US-ASCII. Coded Character Set - 7-Bit American Standard - Code for Information Interchange. Standard ANSI X3.4-1986, - ANSI, 1986.". - - - - -Belshe & Peon Expires August 4, 2012 [Page 48] - -Internet-Draft SPDY Feb 2012 - - - [UDELCOMPRESSION] - Yang, F., Amer, P., and J. Leighton, "A Methodology to - Derive SPDY's Initial Dictionary for Zlib Compression", - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 49] - -Internet-Draft SPDY Feb 2012 - - -Appendix A. Changes - - To be removed by RFC Editor before publication - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 50] - -Internet-Draft SPDY Feb 2012 - - -Authors' Addresses - - Mike Belshe - Twist - - Email: mbelshe@chromium.org - - - Roberto Peon - Google, Inc - - Email: fenix@google.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Belshe & Peon Expires August 4, 2012 [Page 51] - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/Makefile.am deleted file mode 100644 index edc80dc1..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/Makefile.am +++ /dev/null @@ -1,198 +0,0 @@ -# This Makefile.am is in the public domain -SUBDIRS = . - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include \ - -DDATA_DIR=\"$(top_srcdir)/src/datadir/\" - -AM_CFLAGS = @LIBGCRYPT_CFLAGS@ - -CPU_COUNT_DEF = -DCPU_COUNT=$(CPU_COUNT) - -if USE_COVERAGE - AM_CFLAGS += --coverage -endif - -if ENABLE_SPDY -spdyex = \ - spdy_event_loop \ - spdy_fileserver \ - spdy_response_with_callback - -if HAVE_SPDYLAY -spdyex += mhd2spdy -endif -endif - - -# example programs -noinst_PROGRAMS = \ - benchmark \ - benchmark_https \ - chunked_example \ - minimal_example \ - dual_stack_example \ - minimal_example_comet \ - querystring_example \ - fileserver_example \ - fileserver_example_dirs \ - fileserver_example_external_select \ - refuse_post_example \ - $(spdyex) - - -if ENABLE_HTTPS -noinst_PROGRAMS += https_fileserver_example -endif -if HAVE_POSTPROCESSOR -noinst_PROGRAMS += \ - post_example -if HAVE_MAGIC -noinst_PROGRAMS += \ - demo \ - demo_https -endif -endif - -if ENABLE_DAUTH -noinst_PROGRAMS += \ - digest_auth_example -endif - -if ENABLE_BAUTH -noinst_PROGRAMS += \ - authorization_example -endif - -if HAVE_W32 -AM_CFLAGS += -DWINDOWS -endif - -minimal_example_SOURCES = \ - minimal_example.c -minimal_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -chunked_example_SOURCES = \ - chunked_example.c -chunked_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -demo_SOURCES = \ - demo.c -demo_CFLAGS = \ - $(PTHREAD_CFLAGS) $(AM_CFLAGS) -demo_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) -demo_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(PTHREAD_LIBS) -lmagic - -demo_https_SOURCES = \ - demo_https.c -demo_https_CFLAGS = \ - $(PTHREAD_CFLAGS) $(AM_CFLAGS) -demo_https_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) -demo_https_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(PTHREAD_LIBS) -lmagic - -mhd2spdy_SOURCES = \ - mhd2spdy.c \ - mhd2spdy_spdy.c mhd2spdy_spdy.h \ - mhd2spdy_http.c mhd2spdy_http.h \ - mhd2spdy_structures.c mhd2spdy_structures.h -mhd2spdy_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - -lssl -lcrypto -lspdylay - -benchmark_SOURCES = \ - benchmark.c -benchmark_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) -benchmark_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -benchmark_https_SOURCES = \ - benchmark_https.c -benchmark_https_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) -benchmark_https_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -dual_stack_example_SOURCES = \ - dual_stack_example.c -dual_stack_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -post_example_SOURCES = \ - post_example.c -post_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -minimal_example_comet_SOURCES = \ - minimal_example_comet.c -minimal_example_comet_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -authorization_example_SOURCES = \ - authorization_example.c -authorization_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -digest_auth_example_SOURCES = \ - digest_auth_example.c -digest_auth_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -refuse_post_example_SOURCES = \ - refuse_post_example.c -refuse_post_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -querystring_example_SOURCES = \ - querystring_example.c -querystring_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -fileserver_example_SOURCES = \ - fileserver_example.c -fileserver_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -fileserver_example_dirs_SOURCES = \ - fileserver_example_dirs.c -fileserver_example_dirs_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -fileserver_example_external_select_SOURCES = \ - fileserver_example_external_select.c -fileserver_example_external_select_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -https_fileserver_example_SOURCES = \ -https_fileserver_example.c -https_fileserver_example_CPPFLAGS = \ - $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) -https_fileserver_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - - -spdy_event_loop_SOURCES = \ - spdy_event_loop.c -spdy_event_loop_LDADD = \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - -lz - -spdy_fileserver_SOURCES = \ - spdy_fileserver.c -spdy_fileserver_LDADD = \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - -lz - -spdy_response_with_callback_SOURCES = \ - spdy_response_with_callback.c -spdy_response_with_callback_LDADD = \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - -lz diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/Makefile.in deleted file mode 100644 index 5643f963..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/Makefile.in +++ /dev/null @@ -1,1246 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@USE_COVERAGE_TRUE@am__append_1 = --coverage -@ENABLE_SPDY_TRUE@@HAVE_SPDYLAY_TRUE@am__append_2 = mhd2spdy -noinst_PROGRAMS = benchmark$(EXEEXT) benchmark_https$(EXEEXT) \ - chunked_example$(EXEEXT) minimal_example$(EXEEXT) \ - dual_stack_example$(EXEEXT) minimal_example_comet$(EXEEXT) \ - querystring_example$(EXEEXT) fileserver_example$(EXEEXT) \ - fileserver_example_dirs$(EXEEXT) \ - fileserver_example_external_select$(EXEEXT) \ - refuse_post_example$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3) \ - $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ - $(am__EXEEXT_7) -@ENABLE_HTTPS_TRUE@am__append_3 = https_fileserver_example -@HAVE_POSTPROCESSOR_TRUE@am__append_4 = \ -@HAVE_POSTPROCESSOR_TRUE@ post_example - -@HAVE_MAGIC_TRUE@@HAVE_POSTPROCESSOR_TRUE@am__append_5 = \ -@HAVE_MAGIC_TRUE@@HAVE_POSTPROCESSOR_TRUE@ demo \ -@HAVE_MAGIC_TRUE@@HAVE_POSTPROCESSOR_TRUE@ demo_https - -@ENABLE_DAUTH_TRUE@am__append_6 = \ -@ENABLE_DAUTH_TRUE@ digest_auth_example - -@ENABLE_BAUTH_TRUE@am__append_7 = \ -@ENABLE_BAUTH_TRUE@ authorization_example - -@HAVE_W32_TRUE@am__append_8 = -DWINDOWS -subdir = src/examples -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -@ENABLE_SPDY_TRUE@@HAVE_SPDYLAY_TRUE@am__EXEEXT_1 = mhd2spdy$(EXEEXT) -@ENABLE_SPDY_TRUE@am__EXEEXT_2 = spdy_event_loop$(EXEEXT) \ -@ENABLE_SPDY_TRUE@ spdy_fileserver$(EXEEXT) \ -@ENABLE_SPDY_TRUE@ spdy_response_with_callback$(EXEEXT) \ -@ENABLE_SPDY_TRUE@ $(am__EXEEXT_1) -@ENABLE_HTTPS_TRUE@am__EXEEXT_3 = https_fileserver_example$(EXEEXT) -@HAVE_POSTPROCESSOR_TRUE@am__EXEEXT_4 = post_example$(EXEEXT) -@HAVE_MAGIC_TRUE@@HAVE_POSTPROCESSOR_TRUE@am__EXEEXT_5 = \ -@HAVE_MAGIC_TRUE@@HAVE_POSTPROCESSOR_TRUE@ demo$(EXEEXT) \ -@HAVE_MAGIC_TRUE@@HAVE_POSTPROCESSOR_TRUE@ demo_https$(EXEEXT) -@ENABLE_DAUTH_TRUE@am__EXEEXT_6 = digest_auth_example$(EXEEXT) -@ENABLE_BAUTH_TRUE@am__EXEEXT_7 = authorization_example$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) -am_authorization_example_OBJECTS = authorization_example.$(OBJEXT) -authorization_example_OBJECTS = $(am_authorization_example_OBJECTS) -authorization_example_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -am_benchmark_OBJECTS = benchmark-benchmark.$(OBJEXT) -benchmark_OBJECTS = $(am_benchmark_OBJECTS) -benchmark_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_benchmark_https_OBJECTS = \ - benchmark_https-benchmark_https.$(OBJEXT) -benchmark_https_OBJECTS = $(am_benchmark_https_OBJECTS) -benchmark_https_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_chunked_example_OBJECTS = chunked_example.$(OBJEXT) -chunked_example_OBJECTS = $(am_chunked_example_OBJECTS) -chunked_example_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_demo_OBJECTS = demo-demo.$(OBJEXT) -demo_OBJECTS = $(am_demo_OBJECTS) -am__DEPENDENCIES_1 = -demo_DEPENDENCIES = $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) -demo_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(demo_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_demo_https_OBJECTS = demo_https-demo_https.$(OBJEXT) -demo_https_OBJECTS = $(am_demo_https_OBJECTS) -demo_https_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) -demo_https_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(demo_https_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_digest_auth_example_OBJECTS = digest_auth_example.$(OBJEXT) -digest_auth_example_OBJECTS = $(am_digest_auth_example_OBJECTS) -digest_auth_example_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_dual_stack_example_OBJECTS = dual_stack_example.$(OBJEXT) -dual_stack_example_OBJECTS = $(am_dual_stack_example_OBJECTS) -dual_stack_example_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_fileserver_example_OBJECTS = fileserver_example.$(OBJEXT) -fileserver_example_OBJECTS = $(am_fileserver_example_OBJECTS) -fileserver_example_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_fileserver_example_dirs_OBJECTS = \ - fileserver_example_dirs.$(OBJEXT) -fileserver_example_dirs_OBJECTS = \ - $(am_fileserver_example_dirs_OBJECTS) -fileserver_example_dirs_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_fileserver_example_external_select_OBJECTS = \ - fileserver_example_external_select.$(OBJEXT) -fileserver_example_external_select_OBJECTS = \ - $(am_fileserver_example_external_select_OBJECTS) -fileserver_example_external_select_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_https_fileserver_example_OBJECTS = \ - https_fileserver_example-https_fileserver_example.$(OBJEXT) -https_fileserver_example_OBJECTS = \ - $(am_https_fileserver_example_OBJECTS) -https_fileserver_example_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_mhd2spdy_OBJECTS = mhd2spdy.$(OBJEXT) mhd2spdy_spdy.$(OBJEXT) \ - mhd2spdy_http.$(OBJEXT) mhd2spdy_structures.$(OBJEXT) -mhd2spdy_OBJECTS = $(am_mhd2spdy_OBJECTS) -mhd2spdy_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_minimal_example_OBJECTS = minimal_example.$(OBJEXT) -minimal_example_OBJECTS = $(am_minimal_example_OBJECTS) -minimal_example_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_minimal_example_comet_OBJECTS = minimal_example_comet.$(OBJEXT) -minimal_example_comet_OBJECTS = $(am_minimal_example_comet_OBJECTS) -minimal_example_comet_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_post_example_OBJECTS = post_example.$(OBJEXT) -post_example_OBJECTS = $(am_post_example_OBJECTS) -post_example_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_querystring_example_OBJECTS = querystring_example.$(OBJEXT) -querystring_example_OBJECTS = $(am_querystring_example_OBJECTS) -querystring_example_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_refuse_post_example_OBJECTS = refuse_post_example.$(OBJEXT) -refuse_post_example_OBJECTS = $(am_refuse_post_example_OBJECTS) -refuse_post_example_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_spdy_event_loop_OBJECTS = spdy_event_loop.$(OBJEXT) -spdy_event_loop_OBJECTS = $(am_spdy_event_loop_OBJECTS) -spdy_event_loop_DEPENDENCIES = \ - $(top_builddir)/src/microspdy/libmicrospdy.la -am_spdy_fileserver_OBJECTS = spdy_fileserver.$(OBJEXT) -spdy_fileserver_OBJECTS = $(am_spdy_fileserver_OBJECTS) -spdy_fileserver_DEPENDENCIES = \ - $(top_builddir)/src/microspdy/libmicrospdy.la -am_spdy_response_with_callback_OBJECTS = \ - spdy_response_with_callback.$(OBJEXT) -spdy_response_with_callback_OBJECTS = \ - $(am_spdy_response_with_callback_OBJECTS) -spdy_response_with_callback_DEPENDENCIES = \ - $(top_builddir)/src/microspdy/libmicrospdy.la -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(authorization_example_SOURCES) $(benchmark_SOURCES) \ - $(benchmark_https_SOURCES) $(chunked_example_SOURCES) \ - $(demo_SOURCES) $(demo_https_SOURCES) \ - $(digest_auth_example_SOURCES) $(dual_stack_example_SOURCES) \ - $(fileserver_example_SOURCES) \ - $(fileserver_example_dirs_SOURCES) \ - $(fileserver_example_external_select_SOURCES) \ - $(https_fileserver_example_SOURCES) $(mhd2spdy_SOURCES) \ - $(minimal_example_SOURCES) $(minimal_example_comet_SOURCES) \ - $(post_example_SOURCES) $(querystring_example_SOURCES) \ - $(refuse_post_example_SOURCES) $(spdy_event_loop_SOURCES) \ - $(spdy_fileserver_SOURCES) \ - $(spdy_response_with_callback_SOURCES) -DIST_SOURCES = $(authorization_example_SOURCES) $(benchmark_SOURCES) \ - $(benchmark_https_SOURCES) $(chunked_example_SOURCES) \ - $(demo_SOURCES) $(demo_https_SOURCES) \ - $(digest_auth_example_SOURCES) $(dual_stack_example_SOURCES) \ - $(fileserver_example_SOURCES) \ - $(fileserver_example_dirs_SOURCES) \ - $(fileserver_example_external_select_SOURCES) \ - $(https_fileserver_example_SOURCES) $(mhd2spdy_SOURCES) \ - $(minimal_example_SOURCES) $(minimal_example_comet_SOURCES) \ - $(post_example_SOURCES) $(querystring_example_SOURCES) \ - $(refuse_post_example_SOURCES) $(spdy_event_loop_SOURCES) \ - $(spdy_fileserver_SOURCES) \ - $(spdy_response_with_callback_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -SUBDIRS = . -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include \ - -DDATA_DIR=\"$(top_srcdir)/src/datadir/\" - -AM_CFLAGS = @LIBGCRYPT_CFLAGS@ $(am__append_1) $(am__append_8) -CPU_COUNT_DEF = -DCPU_COUNT=$(CPU_COUNT) -@ENABLE_SPDY_TRUE@spdyex = spdy_event_loop spdy_fileserver \ -@ENABLE_SPDY_TRUE@ spdy_response_with_callback $(am__append_2) -minimal_example_SOURCES = \ - minimal_example.c - -minimal_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -chunked_example_SOURCES = \ - chunked_example.c - -chunked_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -demo_SOURCES = \ - demo.c - -demo_CFLAGS = \ - $(PTHREAD_CFLAGS) $(AM_CFLAGS) - -demo_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) - -demo_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(PTHREAD_LIBS) -lmagic - -demo_https_SOURCES = \ - demo_https.c - -demo_https_CFLAGS = \ - $(PTHREAD_CFLAGS) $(AM_CFLAGS) - -demo_https_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) - -demo_https_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(PTHREAD_LIBS) -lmagic - -mhd2spdy_SOURCES = \ - mhd2spdy.c \ - mhd2spdy_spdy.c mhd2spdy_spdy.h \ - mhd2spdy_http.c mhd2spdy_http.h \ - mhd2spdy_structures.c mhd2spdy_structures.h - -mhd2spdy_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - -lssl -lcrypto -lspdylay - -benchmark_SOURCES = \ - benchmark.c - -benchmark_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) - -benchmark_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -benchmark_https_SOURCES = \ - benchmark_https.c - -benchmark_https_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) - -benchmark_https_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -dual_stack_example_SOURCES = \ - dual_stack_example.c - -dual_stack_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -post_example_SOURCES = \ - post_example.c - -post_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -minimal_example_comet_SOURCES = \ - minimal_example_comet.c - -minimal_example_comet_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -authorization_example_SOURCES = \ - authorization_example.c - -authorization_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -digest_auth_example_SOURCES = \ - digest_auth_example.c - -digest_auth_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -refuse_post_example_SOURCES = \ - refuse_post_example.c - -refuse_post_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -querystring_example_SOURCES = \ - querystring_example.c - -querystring_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -fileserver_example_SOURCES = \ - fileserver_example.c - -fileserver_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -fileserver_example_dirs_SOURCES = \ - fileserver_example_dirs.c - -fileserver_example_dirs_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -fileserver_example_external_select_SOURCES = \ - fileserver_example_external_select.c - -fileserver_example_external_select_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -https_fileserver_example_SOURCES = \ -https_fileserver_example.c - -https_fileserver_example_CPPFLAGS = \ - $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) - -https_fileserver_example_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -spdy_event_loop_SOURCES = \ - spdy_event_loop.c - -spdy_event_loop_LDADD = \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - -lz - -spdy_fileserver_SOURCES = \ - spdy_fileserver.c - -spdy_fileserver_LDADD = \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - -lz - -spdy_response_with_callback_SOURCES = \ - spdy_response_with_callback.c - -spdy_response_with_callback_LDADD = \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - -lz - -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/examples/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/examples/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -authorization_example$(EXEEXT): $(authorization_example_OBJECTS) $(authorization_example_DEPENDENCIES) $(EXTRA_authorization_example_DEPENDENCIES) - @rm -f authorization_example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(authorization_example_OBJECTS) $(authorization_example_LDADD) $(LIBS) - -benchmark$(EXEEXT): $(benchmark_OBJECTS) $(benchmark_DEPENDENCIES) $(EXTRA_benchmark_DEPENDENCIES) - @rm -f benchmark$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(benchmark_OBJECTS) $(benchmark_LDADD) $(LIBS) - -benchmark_https$(EXEEXT): $(benchmark_https_OBJECTS) $(benchmark_https_DEPENDENCIES) $(EXTRA_benchmark_https_DEPENDENCIES) - @rm -f benchmark_https$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(benchmark_https_OBJECTS) $(benchmark_https_LDADD) $(LIBS) - -chunked_example$(EXEEXT): $(chunked_example_OBJECTS) $(chunked_example_DEPENDENCIES) $(EXTRA_chunked_example_DEPENDENCIES) - @rm -f chunked_example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(chunked_example_OBJECTS) $(chunked_example_LDADD) $(LIBS) - -demo$(EXEEXT): $(demo_OBJECTS) $(demo_DEPENDENCIES) $(EXTRA_demo_DEPENDENCIES) - @rm -f demo$(EXEEXT) - $(AM_V_CCLD)$(demo_LINK) $(demo_OBJECTS) $(demo_LDADD) $(LIBS) - -demo_https$(EXEEXT): $(demo_https_OBJECTS) $(demo_https_DEPENDENCIES) $(EXTRA_demo_https_DEPENDENCIES) - @rm -f demo_https$(EXEEXT) - $(AM_V_CCLD)$(demo_https_LINK) $(demo_https_OBJECTS) $(demo_https_LDADD) $(LIBS) - -digest_auth_example$(EXEEXT): $(digest_auth_example_OBJECTS) $(digest_auth_example_DEPENDENCIES) $(EXTRA_digest_auth_example_DEPENDENCIES) - @rm -f digest_auth_example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(digest_auth_example_OBJECTS) $(digest_auth_example_LDADD) $(LIBS) - -dual_stack_example$(EXEEXT): $(dual_stack_example_OBJECTS) $(dual_stack_example_DEPENDENCIES) $(EXTRA_dual_stack_example_DEPENDENCIES) - @rm -f dual_stack_example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dual_stack_example_OBJECTS) $(dual_stack_example_LDADD) $(LIBS) - -fileserver_example$(EXEEXT): $(fileserver_example_OBJECTS) $(fileserver_example_DEPENDENCIES) $(EXTRA_fileserver_example_DEPENDENCIES) - @rm -f fileserver_example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fileserver_example_OBJECTS) $(fileserver_example_LDADD) $(LIBS) - -fileserver_example_dirs$(EXEEXT): $(fileserver_example_dirs_OBJECTS) $(fileserver_example_dirs_DEPENDENCIES) $(EXTRA_fileserver_example_dirs_DEPENDENCIES) - @rm -f fileserver_example_dirs$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fileserver_example_dirs_OBJECTS) $(fileserver_example_dirs_LDADD) $(LIBS) - -fileserver_example_external_select$(EXEEXT): $(fileserver_example_external_select_OBJECTS) $(fileserver_example_external_select_DEPENDENCIES) $(EXTRA_fileserver_example_external_select_DEPENDENCIES) - @rm -f fileserver_example_external_select$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fileserver_example_external_select_OBJECTS) $(fileserver_example_external_select_LDADD) $(LIBS) - -https_fileserver_example$(EXEEXT): $(https_fileserver_example_OBJECTS) $(https_fileserver_example_DEPENDENCIES) $(EXTRA_https_fileserver_example_DEPENDENCIES) - @rm -f https_fileserver_example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(https_fileserver_example_OBJECTS) $(https_fileserver_example_LDADD) $(LIBS) - -mhd2spdy$(EXEEXT): $(mhd2spdy_OBJECTS) $(mhd2spdy_DEPENDENCIES) $(EXTRA_mhd2spdy_DEPENDENCIES) - @rm -f mhd2spdy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(mhd2spdy_OBJECTS) $(mhd2spdy_LDADD) $(LIBS) - -minimal_example$(EXEEXT): $(minimal_example_OBJECTS) $(minimal_example_DEPENDENCIES) $(EXTRA_minimal_example_DEPENDENCIES) - @rm -f minimal_example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(minimal_example_OBJECTS) $(minimal_example_LDADD) $(LIBS) - -minimal_example_comet$(EXEEXT): $(minimal_example_comet_OBJECTS) $(minimal_example_comet_DEPENDENCIES) $(EXTRA_minimal_example_comet_DEPENDENCIES) - @rm -f minimal_example_comet$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(minimal_example_comet_OBJECTS) $(minimal_example_comet_LDADD) $(LIBS) - -post_example$(EXEEXT): $(post_example_OBJECTS) $(post_example_DEPENDENCIES) $(EXTRA_post_example_DEPENDENCIES) - @rm -f post_example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(post_example_OBJECTS) $(post_example_LDADD) $(LIBS) - -querystring_example$(EXEEXT): $(querystring_example_OBJECTS) $(querystring_example_DEPENDENCIES) $(EXTRA_querystring_example_DEPENDENCIES) - @rm -f querystring_example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(querystring_example_OBJECTS) $(querystring_example_LDADD) $(LIBS) - -refuse_post_example$(EXEEXT): $(refuse_post_example_OBJECTS) $(refuse_post_example_DEPENDENCIES) $(EXTRA_refuse_post_example_DEPENDENCIES) - @rm -f refuse_post_example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(refuse_post_example_OBJECTS) $(refuse_post_example_LDADD) $(LIBS) - -spdy_event_loop$(EXEEXT): $(spdy_event_loop_OBJECTS) $(spdy_event_loop_DEPENDENCIES) $(EXTRA_spdy_event_loop_DEPENDENCIES) - @rm -f spdy_event_loop$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(spdy_event_loop_OBJECTS) $(spdy_event_loop_LDADD) $(LIBS) - -spdy_fileserver$(EXEEXT): $(spdy_fileserver_OBJECTS) $(spdy_fileserver_DEPENDENCIES) $(EXTRA_spdy_fileserver_DEPENDENCIES) - @rm -f spdy_fileserver$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(spdy_fileserver_OBJECTS) $(spdy_fileserver_LDADD) $(LIBS) - -spdy_response_with_callback$(EXEEXT): $(spdy_response_with_callback_OBJECTS) $(spdy_response_with_callback_DEPENDENCIES) $(EXTRA_spdy_response_with_callback_DEPENDENCIES) - @rm -f spdy_response_with_callback$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(spdy_response_with_callback_OBJECTS) $(spdy_response_with_callback_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authorization_example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/benchmark-benchmark.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/benchmark_https-benchmark_https.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chunked_example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo-demo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo_https-demo_https.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/digest_auth_example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dual_stack_example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileserver_example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileserver_example_dirs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileserver_example_external_select.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/https_fileserver_example-https_fileserver_example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mhd2spdy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mhd2spdy_http.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mhd2spdy_spdy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mhd2spdy_structures.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minimal_example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minimal_example_comet.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/post_example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/querystring_example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refuse_post_example.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spdy_event_loop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spdy_fileserver.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spdy_response_with_callback.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -benchmark-benchmark.o: benchmark.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(benchmark_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT benchmark-benchmark.o -MD -MP -MF $(DEPDIR)/benchmark-benchmark.Tpo -c -o benchmark-benchmark.o `test -f 'benchmark.c' || echo '$(srcdir)/'`benchmark.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/benchmark-benchmark.Tpo $(DEPDIR)/benchmark-benchmark.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='benchmark.c' object='benchmark-benchmark.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(benchmark_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o benchmark-benchmark.o `test -f 'benchmark.c' || echo '$(srcdir)/'`benchmark.c - -benchmark-benchmark.obj: benchmark.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(benchmark_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT benchmark-benchmark.obj -MD -MP -MF $(DEPDIR)/benchmark-benchmark.Tpo -c -o benchmark-benchmark.obj `if test -f 'benchmark.c'; then $(CYGPATH_W) 'benchmark.c'; else $(CYGPATH_W) '$(srcdir)/benchmark.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/benchmark-benchmark.Tpo $(DEPDIR)/benchmark-benchmark.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='benchmark.c' object='benchmark-benchmark.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(benchmark_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o benchmark-benchmark.obj `if test -f 'benchmark.c'; then $(CYGPATH_W) 'benchmark.c'; else $(CYGPATH_W) '$(srcdir)/benchmark.c'; fi` - -benchmark_https-benchmark_https.o: benchmark_https.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(benchmark_https_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT benchmark_https-benchmark_https.o -MD -MP -MF $(DEPDIR)/benchmark_https-benchmark_https.Tpo -c -o benchmark_https-benchmark_https.o `test -f 'benchmark_https.c' || echo '$(srcdir)/'`benchmark_https.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/benchmark_https-benchmark_https.Tpo $(DEPDIR)/benchmark_https-benchmark_https.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='benchmark_https.c' object='benchmark_https-benchmark_https.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(benchmark_https_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o benchmark_https-benchmark_https.o `test -f 'benchmark_https.c' || echo '$(srcdir)/'`benchmark_https.c - -benchmark_https-benchmark_https.obj: benchmark_https.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(benchmark_https_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT benchmark_https-benchmark_https.obj -MD -MP -MF $(DEPDIR)/benchmark_https-benchmark_https.Tpo -c -o benchmark_https-benchmark_https.obj `if test -f 'benchmark_https.c'; then $(CYGPATH_W) 'benchmark_https.c'; else $(CYGPATH_W) '$(srcdir)/benchmark_https.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/benchmark_https-benchmark_https.Tpo $(DEPDIR)/benchmark_https-benchmark_https.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='benchmark_https.c' object='benchmark_https-benchmark_https.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(benchmark_https_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o benchmark_https-benchmark_https.obj `if test -f 'benchmark_https.c'; then $(CYGPATH_W) 'benchmark_https.c'; else $(CYGPATH_W) '$(srcdir)/benchmark_https.c'; fi` - -demo-demo.o: demo.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(demo_CPPFLAGS) $(CPPFLAGS) $(demo_CFLAGS) $(CFLAGS) -MT demo-demo.o -MD -MP -MF $(DEPDIR)/demo-demo.Tpo -c -o demo-demo.o `test -f 'demo.c' || echo '$(srcdir)/'`demo.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/demo-demo.Tpo $(DEPDIR)/demo-demo.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='demo.c' object='demo-demo.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(demo_CPPFLAGS) $(CPPFLAGS) $(demo_CFLAGS) $(CFLAGS) -c -o demo-demo.o `test -f 'demo.c' || echo '$(srcdir)/'`demo.c - -demo-demo.obj: demo.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(demo_CPPFLAGS) $(CPPFLAGS) $(demo_CFLAGS) $(CFLAGS) -MT demo-demo.obj -MD -MP -MF $(DEPDIR)/demo-demo.Tpo -c -o demo-demo.obj `if test -f 'demo.c'; then $(CYGPATH_W) 'demo.c'; else $(CYGPATH_W) '$(srcdir)/demo.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/demo-demo.Tpo $(DEPDIR)/demo-demo.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='demo.c' object='demo-demo.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(demo_CPPFLAGS) $(CPPFLAGS) $(demo_CFLAGS) $(CFLAGS) -c -o demo-demo.obj `if test -f 'demo.c'; then $(CYGPATH_W) 'demo.c'; else $(CYGPATH_W) '$(srcdir)/demo.c'; fi` - -demo_https-demo_https.o: demo_https.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(demo_https_CPPFLAGS) $(CPPFLAGS) $(demo_https_CFLAGS) $(CFLAGS) -MT demo_https-demo_https.o -MD -MP -MF $(DEPDIR)/demo_https-demo_https.Tpo -c -o demo_https-demo_https.o `test -f 'demo_https.c' || echo '$(srcdir)/'`demo_https.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/demo_https-demo_https.Tpo $(DEPDIR)/demo_https-demo_https.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='demo_https.c' object='demo_https-demo_https.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(demo_https_CPPFLAGS) $(CPPFLAGS) $(demo_https_CFLAGS) $(CFLAGS) -c -o demo_https-demo_https.o `test -f 'demo_https.c' || echo '$(srcdir)/'`demo_https.c - -demo_https-demo_https.obj: demo_https.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(demo_https_CPPFLAGS) $(CPPFLAGS) $(demo_https_CFLAGS) $(CFLAGS) -MT demo_https-demo_https.obj -MD -MP -MF $(DEPDIR)/demo_https-demo_https.Tpo -c -o demo_https-demo_https.obj `if test -f 'demo_https.c'; then $(CYGPATH_W) 'demo_https.c'; else $(CYGPATH_W) '$(srcdir)/demo_https.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/demo_https-demo_https.Tpo $(DEPDIR)/demo_https-demo_https.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='demo_https.c' object='demo_https-demo_https.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(demo_https_CPPFLAGS) $(CPPFLAGS) $(demo_https_CFLAGS) $(CFLAGS) -c -o demo_https-demo_https.obj `if test -f 'demo_https.c'; then $(CYGPATH_W) 'demo_https.c'; else $(CYGPATH_W) '$(srcdir)/demo_https.c'; fi` - -https_fileserver_example-https_fileserver_example.o: https_fileserver_example.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(https_fileserver_example_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT https_fileserver_example-https_fileserver_example.o -MD -MP -MF $(DEPDIR)/https_fileserver_example-https_fileserver_example.Tpo -c -o https_fileserver_example-https_fileserver_example.o `test -f 'https_fileserver_example.c' || echo '$(srcdir)/'`https_fileserver_example.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/https_fileserver_example-https_fileserver_example.Tpo $(DEPDIR)/https_fileserver_example-https_fileserver_example.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='https_fileserver_example.c' object='https_fileserver_example-https_fileserver_example.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(https_fileserver_example_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o https_fileserver_example-https_fileserver_example.o `test -f 'https_fileserver_example.c' || echo '$(srcdir)/'`https_fileserver_example.c - -https_fileserver_example-https_fileserver_example.obj: https_fileserver_example.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(https_fileserver_example_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT https_fileserver_example-https_fileserver_example.obj -MD -MP -MF $(DEPDIR)/https_fileserver_example-https_fileserver_example.Tpo -c -o https_fileserver_example-https_fileserver_example.obj `if test -f 'https_fileserver_example.c'; then $(CYGPATH_W) 'https_fileserver_example.c'; else $(CYGPATH_W) '$(srcdir)/https_fileserver_example.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/https_fileserver_example-https_fileserver_example.Tpo $(DEPDIR)/https_fileserver_example-https_fileserver_example.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='https_fileserver_example.c' object='https_fileserver_example-https_fileserver_example.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(https_fileserver_example_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o https_fileserver_example-https_fileserver_example.obj `if test -f 'https_fileserver_example.c'; then $(CYGPATH_W) 'https_fileserver_example.c'; else $(CYGPATH_W) '$(srcdir)/https_fileserver_example.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(PROGRAMS) -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool \ - clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/authorization_example.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/authorization_example.c deleted file mode 100644 index e6e69ad1..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/authorization_example.c +++ /dev/null @@ -1,108 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2008 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file authorization_example.c - * @brief example for how to use libmicrohttpd with HTTP authentication - * @author Christian Grothoff - */ - -#include "platform.h" -#include -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif - -#define PAGE "libmicrohttpd demolibmicrohttpd demo" - -#define DENIED "Access deniedAccess denied" - - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - static int aptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - char *user; - char *pass; - int fail; - - if (0 != strcmp (method, "GET")) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - - /* require: "Aladdin" with password "open sesame" */ - pass = NULL; - user = MHD_basic_auth_get_username_password (connection, &pass); - fail = ( (user == NULL) || (0 != strcmp (user, "Aladdin")) || (0 != strcmp (pass, "open sesame") ) ); - if (fail) - { - response = MHD_create_response_from_buffer (strlen (DENIED), - (void *) DENIED, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_basic_auth_fail_response (connection,"TestRealm",response); - } - else - { - response = MHD_create_response_from_buffer (strlen (me), - (void *) me, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - } - - MHD_destroy_response (response); - return ret; -} - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - - if (argc != 3) - { - printf ("%s PORT SECONDS-TO-RUN\n", argv[0]); - return 1; - } - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); - if (d == NULL) - return 1; - sleep (atoi (argv[2])); - MHD_stop_daemon (d); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/benchmark.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/benchmark.c deleted file mode 100644 index d287b2fe..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/benchmark.c +++ /dev/null @@ -1,159 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2013 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file benchmark.c - * @brief minimal code to benchmark MHD GET performance - * @author Christian Grothoff - */ - -#include "platform.h" -#include - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -#define PAGE "libmicrohttpd demolibmicrohttpd demo" - - -#define SMALL (1024 * 128) - -/** - * Number of threads to run in the thread pool. Should (roughly) match - * the number of cores on your system. - */ -#define NUMBER_OF_THREADS CPU_COUNT - -static unsigned int small_deltas[SMALL]; - -static struct MHD_Response *response; - - - -/** - * Signature of the callback used by MHD to notify the - * application about completed requests. - * - * @param cls client-defined closure - * @param connection connection handle - * @param con_cls value as set by the last call to - * the MHD_AccessHandlerCallback - * @param toe reason for request termination - * @see MHD_OPTION_NOTIFY_COMPLETED - */ -static void -completed_callback (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct timeval *tv = *con_cls; - struct timeval tve; - uint64_t delta; - - if (NULL == tv) - return; - gettimeofday (&tve, NULL); - - delta = 0; - if (tve.tv_usec >= tv->tv_usec) - delta += (tve.tv_sec - tv->tv_sec) * 1000000LL - + (tve.tv_usec - tv->tv_usec); - else - delta += (tve.tv_sec - tv->tv_sec) * 1000000LL - - tv->tv_usec + tve.tv_usec; - if (delta < SMALL) - small_deltas[delta]++; - else - fprintf (stdout, "D: %llu 1\n", (unsigned long long) delta); - free (tv); -} - - -static void * -uri_logger_cb (void *cls, - const char *uri) -{ - struct timeval *tv = malloc (sizeof (struct timeval)); - - if (NULL != tv) - gettimeofday (tv, NULL); - return tv; -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - if (0 != strcmp (method, "GET")) - return MHD_NO; /* unexpected method */ - return MHD_queue_response (connection, MHD_HTTP_OK, response); -} - - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - unsigned int i; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - response = MHD_create_response_from_buffer (strlen (PAGE), - (void *) PAGE, - MHD_RESPMEM_PERSISTENT); -#if 0 - (void) MHD_add_response_header (response, - MHD_HTTP_HEADER_CONNECTION, - "close"); -#endif - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_SUPPRESS_DATE_NO_CLOCK -#if EPOLL_SUPPORT - | MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_EPOLL_TURBO -#endif - , - atoi (argv[1]), - NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120, - MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS, - MHD_OPTION_URI_LOG_CALLBACK, &uri_logger_cb, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_callback, NULL, - MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 1000, - MHD_OPTION_END); - if (d == NULL) - return 1; - (void) getc (stdin); - MHD_stop_daemon (d); - MHD_destroy_response (response); - for (i=0;i - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -#define PAGE "libmicrohttpd demolibmicrohttpd demo" - - -#define SMALL (1024 * 128) - -/** - * Number of threads to run in the thread pool. Should (roughly) match - * the number of cores on your system. - */ -#define NUMBER_OF_THREADS CPU_COUNT - -static unsigned int small_deltas[SMALL]; - -static struct MHD_Response *response; - - - -/** - * Signature of the callback used by MHD to notify the - * application about completed requests. - * - * @param cls client-defined closure - * @param connection connection handle - * @param con_cls value as set by the last call to - * the MHD_AccessHandlerCallback - * @param toe reason for request termination - * @see MHD_OPTION_NOTIFY_COMPLETED - */ -static void -completed_callback (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct timeval *tv = *con_cls; - struct timeval tve; - uint64_t delta; - - if (NULL == tv) - return; - gettimeofday (&tve, NULL); - - delta = 0; - if (tve.tv_usec >= tv->tv_usec) - delta += (tve.tv_sec - tv->tv_sec) * 1000000LL - + (tve.tv_usec - tv->tv_usec); - else - delta += (tve.tv_sec - tv->tv_sec) * 1000000LL - - tv->tv_usec + tve.tv_usec; - if (delta < SMALL) - small_deltas[delta]++; - else - fprintf (stdout, "D: %llu 1\n", (unsigned long long) delta); - free (tv); -} - - -static void * -uri_logger_cb (void *cls, - const char *uri) -{ - struct timeval *tv = malloc (sizeof (struct timeval)); - - if (NULL != tv) - gettimeofday (tv, NULL); - return tv; -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - if (0 != strcmp (method, "GET")) - return MHD_NO; /* unexpected method */ - return MHD_queue_response (connection, MHD_HTTP_OK, response); -} - - -/* test server key */ -const char srv_signed_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n" - "MIIEowIBAAKCAQEAvfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW\n" - "+K03KwEku55QvnUndwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8IL\n" - "q4sw32vo0fbMu5BZF49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ0\n" - "20Q5EAAEseD1YtWCIpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6\n" - "QYGGh1QmHRPAy3CBII6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6x\n" - "yoOl204xuekZOaG9RUPId74Rtmwfi1TLbBzo2wIDAQABAoIBADu09WSICNq5cMe4\n" - "+NKCLlgAT1NiQpLls1gKRbDhKiHU9j8QWNvWWkJWrCya4QdUfLCfeddCMeiQmv3K\n" - "lJMvDs+5OjJSHFoOsGiuW2Ias7IjnIojaJalfBml6frhJ84G27IXmdz6gzOiTIer\n" - "DjeAgcwBaKH5WwIay2TxIaScl7AwHBauQkrLcyb4hTmZuQh6ArVIN6+pzoVuORXM\n" - "bpeNWl2l/HSN3VtUN6aCAKbN/X3o0GavCCMn5Fa85uJFsab4ss/uP+2PusU71+zP\n" - "sBm6p/2IbGvF5k3VPDA7X5YX61sukRjRBihY8xSnNYx1UcoOsX6AiPnbhifD8+xQ\n" - "Tlf8oJUCgYEA0BTfzqNpr9Wxw5/QXaSdw7S/0eP5a0C/nwURvmfSzuTD4equzbEN\n" - "d+dI/s2JMxrdj/I4uoAfUXRGaabevQIjFzC9uyE3LaOyR2zhuvAzX+vVcs6bSXeU\n" - "pKpCAcN+3Z3evMaX2f+z/nfSUAl2i4J2R+/LQAWJW4KwRky/m+cxpfUCgYEA6bN1\n" - "b73bMgM8wpNt6+fcmS+5n0iZihygQ2U2DEud8nZJL4Nrm1dwTnfZfJBnkGj6+0Q0\n" - "cOwj2KS0/wcEdJBP0jucU4v60VMhp75AQeHqidIde0bTViSRo3HWKXHBIFGYoU3T\n" - "LyPyKndbqsOObnsFXHn56Nwhr2HLf6nw4taGQY8CgYBoSW36FLCNbd6QGvLFXBGt\n" - "2lMhEM8az/K58kJ4WXSwOLtr6MD/WjNT2tkcy0puEJLm6BFCd6A6pLn9jaKou/92\n" - "SfltZjJPb3GUlp9zn5tAAeSSi7YMViBrfuFiHObij5LorefBXISLjuYbMwL03MgH\n" - "Ocl2JtA2ywMp2KFXs8GQWQKBgFyIVv5ogQrbZ0pvj31xr9HjqK6d01VxIi+tOmpB\n" - "4ocnOLEcaxX12BzprW55ytfOCVpF1jHD/imAhb3YrHXu0fwe6DXYXfZV4SSG2vB7\n" - "IB9z14KBN5qLHjNGFpMQXHSMek+b/ftTU0ZnPh9uEM5D3YqRLVd7GcdUhHvG8P8Q\n" - "C9aXAoGBAJtID6h8wOGMP0XYX5YYnhlC7dOLfk8UYrzlp3xhqVkzKthTQTj6wx9R\n" - "GtC4k7U1ki8oJsfcIlBNXd768fqDVWjYju5rzShMpo8OCTS6ipAblKjCxPPVhIpv\n" - "tWPlbSn1qj6wylstJ5/3Z+ZW5H4wIKp5jmLiioDhcP0L/Ex3Zx8O\n" - "-----END RSA PRIVATE KEY-----\n"; - -/* test server CA signed certificates */ -const char srv_signed_cert_pem[] = "-----BEGIN CERTIFICATE-----\n" - "MIIDGzCCAgWgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n" - "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n" - "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n" - "vfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW+K03KwEku55QvnUn\n" - "dwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8ILq4sw32vo0fbMu5BZ\n" - "F49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ020Q5EAAEseD1YtWC\n" - "IpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6QYGGh1QmHRPAy3CB\n" - "II6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6xyoOl204xuekZOaG9\n" - "RUPId74Rtmwfi1TLbBzo2wIDAQABo3YwdDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQM\n" - "MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHIAAwHQYDVR0OBBYEFOFi4ilKOP1d\n" - "XHlWCMwmVKr7mgy8MB8GA1UdIwQYMBaAFP2olB4s2T/xuoQ5pT2RKojFwZo2MAsG\n" - "CSqGSIb3DQEBBQOCAQEAHVWPxazupbOkG7Did+dY9z2z6RjTzYvurTtEKQgzM2Vz\n" - "GQBA+3pZ3c5mS97fPIs9hZXfnQeelMeZ2XP1a+9vp35bJjZBBhVH+pqxjCgiUflg\n" - "A3Zqy0XwwVCgQLE2HyaU3DLUD/aeIFK5gJaOSdNTXZLv43K8kl4cqDbMeRpVTbkt\n" - "YmG4AyEOYRNKGTqMEJXJoxD5E3rBUNrVI/XyTjYrulxbNPcMWEHKNeeqWpKDYTFo\n" - "Bb01PCthGXiq/4A2RLAFosadzRa8SBpoSjPPfZ0b2w4MJpReHqKbR5+T2t6hzml6\n" - "4ToyOKPDmamiTuN5KzLN3cw7DQlvWMvqSOChPLnA3Q==\n" - "-----END CERTIFICATE-----\n"; - - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - unsigned int i; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - response = MHD_create_response_from_buffer (strlen (PAGE), - (void *) PAGE, - MHD_RESPMEM_PERSISTENT); - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL -#if EPOLL_SUPPORT - | MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_EPOLL_TURBO -#endif - , - atoi (argv[1]), - NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120, - MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS, - MHD_OPTION_URI_LOG_CALLBACK, &uri_logger_cb, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_callback, NULL, - MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 1000, - MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem, - MHD_OPTION_END); - if (d == NULL) - return 1; - (void) getc (stdin); - MHD_stop_daemon (d); - MHD_destroy_response (response); - for (i=0;i - - -static ssize_t -callback (void *cls, - uint64_t pos, - char *buf, - size_t max) -{ - return MHD_CONTENT_READER_END_OF_STREAM; -} - - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - static int aptr; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (method, "GET")) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, - 1024, - &callback, - NULL, - NULL); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - d = MHD_start_daemon (// MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | MHD_USE_POLL, - MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | MHD_USE_POLL, - // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120, - MHD_OPTION_END); - if (d == NULL) - return 1; - (void) getc (stdin); - MHD_stop_daemon (d); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/demo.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/demo.c deleted file mode 100644 index 80ca09c1..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/demo.c +++ /dev/null @@ -1,907 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2013 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file demo.c - * @brief complex demonstration site: create directory index, offer - * upload via form and HTTP POST, download with mime type detection - * and error reporting (403, etc.) --- and all of this with - * high-performance settings (large buffers, thread pool). - * If you want to benchmark MHD, this code should be used to - * run tests against. Note that the number of threads may need - * to be adjusted depending on the number of available cores. - * @author Christian Grothoff - */ -#include "platform.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -/** - * Number of threads to run in the thread pool. Should (roughly) match - * the number of cores on your system. - */ -#define NUMBER_OF_THREADS CPU_COUNT - -/** - * How many bytes of a file do we give to libmagic to determine the mime type? - * 16k might be a bit excessive, but ought not hurt performance much anyway, - * and should definitively be on the safe side. - */ -#define MAGIC_HEADER_SIZE (16 * 1024) - - -/** - * Page returned for file-not-found. - */ -#define FILE_NOT_FOUND_PAGE "File not foundFile not found" - - -/** - * Page returned for internal errors. - */ -#define INTERNAL_ERROR_PAGE "Internal errorInternal error" - - -/** - * Page returned for refused requests. - */ -#define REQUEST_REFUSED_PAGE "Request refusedRequest refused (file exists?)" - - -/** - * Head of index page. - */ -#define INDEX_PAGE_HEADER "\nWelcome\n\n"\ - "

Upload

\n"\ - "\n"\ - "
Content type:
"\ - "Book"\ - "Image"\ - "Music"\ - "Software"\ - "Videos\n"\ - "Other
"\ - "
Language:
"\ - "none"\ - "English"\ - "German"\ - "French"\ - "Spanish
\n"\ - "
File:
"\ - "
"\ - "\n"\ - "\n"\ - "

Download

\n"\ - "
    \n" - -/** - * Footer of index page. - */ -#define INDEX_PAGE_FOOTER "
\n\n" - - -/** - * NULL-terminated array of supported upload categories. Should match HTML - * in the form. - */ -static const char * const categories[] = - { - "books", - "images", - "music", - "software", - "videos", - "other", - NULL, - }; - - -/** - * Specification of a supported language. - */ -struct Language -{ - /** - * Directory name for the language. - */ - const char *dirname; - - /** - * Long name for humans. - */ - const char *longname; - -}; - -/** - * NULL-terminated array of supported upload categories. Should match HTML - * in the form. - */ -static const struct Language languages[] = - { - { "no-lang", "No language specified" }, - { "en", "English" }, - { "de", "German" }, - { "fr", "French" }, - { "es", "Spanish" }, - { NULL, NULL }, - }; - - -/** - * Response returned if the requested file does not exist (or is not accessible). - */ -static struct MHD_Response *file_not_found_response; - -/** - * Response returned for internal errors. - */ -static struct MHD_Response *internal_error_response; - -/** - * Response returned for '/' (GET) to list the contents of the directory and allow upload. - */ -static struct MHD_Response *cached_directory_response; - -/** - * Response returned for refused uploads. - */ -static struct MHD_Response *request_refused_response; - -/** - * Mutex used when we update the cached directory response object. - */ -static pthread_mutex_t mutex; - -/** - * Global handle to MAGIC data. - */ -static magic_t magic; - - -/** - * Mark the given response as HTML for the brower. - * - * @param response response to mark - */ -static void -mark_as_html (struct MHD_Response *response) -{ - (void) MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_TYPE, - "text/html"); -} - - -/** - * Replace the existing 'cached_directory_response' with the - * given response. - * - * @param response new directory response - */ -static void -update_cached_response (struct MHD_Response *response) -{ - (void) pthread_mutex_lock (&mutex); - if (NULL != cached_directory_response) - MHD_destroy_response (cached_directory_response); - cached_directory_response = response; - (void) pthread_mutex_unlock (&mutex); -} - - -/** - * Context keeping the data for the response we're building. - */ -struct ResponseDataContext -{ - /** - * Response data string. - */ - char *buf; - - /** - * Number of bytes allocated for 'buf'. - */ - size_t buf_len; - - /** - * Current position where we append to 'buf'. Must be smaller or equal to 'buf_len'. - */ - size_t off; - -}; - - -/** - * Create a listing of the files in 'dirname' in HTML. - * - * @param rdc where to store the list of files - * @param dirname name of the directory to list - * @return MHD_YES on success, MHD_NO on error - */ -static int -list_directory (struct ResponseDataContext *rdc, - const char *dirname) -{ - char fullname[PATH_MAX]; - struct stat sbuf; - DIR *dir; - struct dirent *de; - - if (NULL == (dir = opendir (dirname))) - return MHD_NO; - while (NULL != (de = readdir (dir))) - { - if ('.' == de->d_name[0]) - continue; - if (sizeof (fullname) <= (size_t) - snprintf (fullname, sizeof (fullname), - "%s/%s", - dirname, de->d_name)) - continue; /* ugh, file too long? how can this be!? */ - if (0 != stat (fullname, &sbuf)) - continue; /* ugh, failed to 'stat' */ - if (! S_ISREG (sbuf.st_mode)) - continue; /* not a regular file, skip */ - if (rdc->off + 1024 > rdc->buf_len) - { - void *r; - - if ( (2 * rdc->buf_len + 1024) < rdc->buf_len) - break; /* more than SIZE_T _index_ size? Too big for us */ - rdc->buf_len = 2 * rdc->buf_len + 1024; - if (NULL == (r = realloc (rdc->buf, rdc->buf_len))) - break; /* out of memory */ - rdc->buf = r; - } - rdc->off += snprintf (&rdc->buf[rdc->off], - rdc->buf_len - rdc->off, - "
  • %s
    • \n", - fullname, - de->d_name); - } - (void) closedir (dir); - return MHD_YES; -} - - -/** - * Re-scan our local directory and re-build the index. - */ -static void -update_directory () -{ - static size_t initial_allocation = 32 * 1024; /* initial size for response buffer */ - struct MHD_Response *response; - struct ResponseDataContext rdc; - unsigned int language_idx; - unsigned int category_idx; - const struct Language *language; - const char *category; - char dir_name[128]; - struct stat sbuf; - - rdc.buf_len = initial_allocation; - if (NULL == (rdc.buf = malloc (rdc.buf_len))) - { - update_cached_response (NULL); - return; - } - rdc.off = snprintf (rdc.buf, rdc.buf_len, - "%s", - INDEX_PAGE_HEADER); - for (language_idx = 0; NULL != languages[language_idx].dirname; language_idx++) - { - language = &languages[language_idx]; - - if (0 != stat (language->dirname, &sbuf)) - continue; /* empty */ - /* we ensured always +1k room, filenames are ~256 bytes, - so there is always still enough space for the header - without need for an additional reallocation check. */ - rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off, - "

    %s

    \n", - language->longname); - for (category_idx = 0; NULL != categories[category_idx]; category_idx++) - { - category = categories[category_idx]; - snprintf (dir_name, sizeof (dir_name), - "%s/%s", - language->dirname, - category); - if (0 != stat (dir_name, &sbuf)) - continue; /* empty */ - - /* we ensured always +1k room, filenames are ~256 bytes, - so there is always still enough space for the header - without need for an additional reallocation check. */ - rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off, - "

    %s

    \n", - category); - - if (MHD_NO == list_directory (&rdc, dir_name)) - { - free (rdc.buf); - update_cached_response (NULL); - return; - } - } - } - /* we ensured always +1k room, filenames are ~256 bytes, - so there is always still enough space for the footer - without need for a final reallocation check. */ - rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off, - "%s", - INDEX_PAGE_FOOTER); - initial_allocation = rdc.buf_len; /* remember for next time */ - response = MHD_create_response_from_buffer (rdc.off, - rdc.buf, - MHD_RESPMEM_MUST_FREE); - mark_as_html (response); -#if FORCE_CLOSE - (void) MHD_add_response_header (response, - MHD_HTTP_HEADER_CONNECTION, - "close"); -#endif - update_cached_response (response); -} - - -/** - * Context we keep for an upload. - */ -struct UploadContext -{ - /** - * Handle where we write the uploaded file to. - */ - int fd; - - /** - * Name of the file on disk (used to remove on errors). - */ - char *filename; - - /** - * Language for the upload. - */ - char *language; - - /** - * Category for the upload. - */ - char *category; - - /** - * Post processor we're using to process the upload. - */ - struct MHD_PostProcessor *pp; - - /** - * Handle to connection that we're processing the upload for. - */ - struct MHD_Connection *connection; - - /** - * Response to generate, NULL to use directory. - */ - struct MHD_Response *response; -}; - - -/** - * Append the 'size' bytes from 'data' to '*ret', adding - * 0-termination. If '*ret' is NULL, allocate an empty string first. - * - * @param ret string to update, NULL or 0-terminated - * @param data data to append - * @param size number of bytes in 'data' - * @return MHD_NO on allocation failure, MHD_YES on success - */ -static int -do_append (char **ret, - const char *data, - size_t size) -{ - char *buf; - size_t old_len; - - if (NULL == *ret) - old_len = 0; - else - old_len = strlen (*ret); - buf = malloc (old_len + size + 1); - if (NULL == buf) - return MHD_NO; - memcpy (buf, *ret, old_len); - if (NULL != *ret) - free (*ret); - memcpy (&buf[old_len], data, size); - buf[old_len + size] = '\0'; - *ret = buf; - return MHD_YES; -} - - -/** - * Iterator over key-value pairs where the value - * maybe made available in increments and/or may - * not be zero-terminated. Used for processing - * POST data. - * - * @param cls user-specified closure - * @param kind type of the value, always MHD_POSTDATA_KIND when called from MHD - * @param key 0-terminated key for the value - * @param filename name of the uploaded file, NULL if not known - * @param content_type mime-type of the data, NULL if not known - * @param transfer_encoding encoding of the data, NULL if not known - * @param data pointer to size bytes of data at the - * specified offset - * @param off offset of data in the overall value - * @param size number of bytes in data available - * @return MHD_YES to continue iterating, - * MHD_NO to abort the iteration - */ -static int -process_upload_data (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *data, - uint64_t off, - size_t size) -{ - struct UploadContext *uc = cls; - int i; - - if (0 == strcmp (key, "category")) - return do_append (&uc->category, data, size); - if (0 == strcmp (key, "language")) - return do_append (&uc->language, data, size); - if (0 != strcmp (key, "upload")) - { - fprintf (stderr, - "Ignoring unexpected form value `%s'\n", - key); - return MHD_YES; /* ignore */ - } - if (NULL == filename) - { - fprintf (stderr, "No filename, aborting upload\n"); - return MHD_NO; /* no filename, error */ - } - if ( (NULL == uc->category) || - (NULL == uc->language) ) - { - fprintf (stderr, - "Missing form data for upload `%s'\n", - filename); - uc->response = request_refused_response; - return MHD_NO; - } - if (-1 == uc->fd) - { - char fn[PATH_MAX]; - - if ( (NULL != strstr (filename, "..")) || - (NULL != strchr (filename, '/')) || - (NULL != strchr (filename, '\\')) ) - { - uc->response = request_refused_response; - return MHD_NO; - } - /* create directories -- if they don't exist already */ -#ifdef WINDOWS - (void) mkdir (uc->language); -#else - (void) mkdir (uc->language, S_IRWXU); -#endif - snprintf (fn, sizeof (fn), - "%s/%s", - uc->language, - uc->category); -#ifdef WINDOWS - (void) mkdir (fn); -#else - (void) mkdir (fn, S_IRWXU); -#endif - /* open file */ - snprintf (fn, sizeof (fn), - "%s/%s/%s", - uc->language, - uc->category, - filename); - for (i=strlen (fn)-1;i>=0;i--) - if (! isprint ((int) fn[i])) - fn[i] = '_'; - uc->fd = open (fn, - O_CREAT | O_EXCL -#if O_LARGEFILE - | O_LARGEFILE -#endif - | O_WRONLY, - S_IRUSR | S_IWUSR); - if (-1 == uc->fd) - { - fprintf (stderr, - "Error opening file `%s' for upload: %s\n", - fn, - strerror (errno)); - uc->response = request_refused_response; - return MHD_NO; - } - uc->filename = strdup (fn); - } - if ( (0 != size) && - (size != (size_t) write (uc->fd, data, size)) ) - { - /* write failed; likely: disk full */ - fprintf (stderr, - "Error writing to file `%s': %s\n", - uc->filename, - strerror (errno)); - uc->response = internal_error_response; - close (uc->fd); - uc->fd = -1; - if (NULL != uc->filename) - { - unlink (uc->filename); - free (uc->filename); - uc->filename = NULL; - } - return MHD_NO; - } - return MHD_YES; -} - - -/** - * Function called whenever a request was completed. - * Used to clean up 'struct UploadContext' objects. - * - * @param cls client-defined closure, NULL - * @param connection connection handle - * @param con_cls value as set by the last call to - * the MHD_AccessHandlerCallback, points to NULL if this was - * not an upload - * @param toe reason for request termination - */ -static void -response_completed_callback (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct UploadContext *uc = *con_cls; - - if (NULL == uc) - return; /* this request wasn't an upload request */ - if (NULL != uc->pp) - { - MHD_destroy_post_processor (uc->pp); - uc->pp = NULL; - } - if (-1 != uc->fd) - { - (void) close (uc->fd); - if (NULL != uc->filename) - { - fprintf (stderr, - "Upload of file `%s' failed (incomplete or aborted), removing file.\n", - uc->filename); - (void) unlink (uc->filename); - } - } - if (NULL != uc->filename) - free (uc->filename); - free (uc); -} - - -/** - * Return the current directory listing. - * - * @param connection connection to return the directory for - * @return MHD_YES on success, MHD_NO on error - */ -static int -return_directory_response (struct MHD_Connection *connection) -{ - int ret; - - (void) pthread_mutex_lock (&mutex); - if (NULL == cached_directory_response) - ret = MHD_queue_response (connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - internal_error_response); - else - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - cached_directory_response); - (void) pthread_mutex_unlock (&mutex); - return ret; -} - - -/** - * Main callback from MHD, used to generate the page. - * - * @param cls NULL - * @param connection connection handle - * @param url requested URL - * @param method GET, PUT, POST, etc. - * @param version HTTP version - * @param upload_data data from upload (PUT/POST) - * @param upload_data_size number of bytes in "upload_data" - * @param ptr our context - * @return MHD_YES on success, MHD_NO to drop connection - */ -static int -generate_page (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, void **ptr) -{ - struct MHD_Response *response; - int ret; - int fd; - struct stat buf; - - if (0 != strcmp (url, "/")) - { - /* should be file download */ - char file_data[MAGIC_HEADER_SIZE]; - ssize_t got; - const char *mime; - - if (0 != strcmp (method, MHD_HTTP_METHOD_GET)) - return MHD_NO; /* unexpected method (we're not polite...) */ - if ( (0 == stat (&url[1], &buf)) && - (NULL == strstr (&url[1], "..")) && - ('/' != url[1])) - fd = open (&url[1], O_RDONLY); - else - fd = -1; - if (-1 == fd) - return MHD_queue_response (connection, - MHD_HTTP_NOT_FOUND, - file_not_found_response); - /* read beginning of the file to determine mime type */ - got = read (fd, file_data, sizeof (file_data)); - if (-1 != got) - mime = magic_buffer (magic, file_data, got); - else - mime = NULL; - (void) lseek (fd, 0, SEEK_SET); - - if (NULL == (response = MHD_create_response_from_fd (buf.st_size, - fd))) - { - /* internal error (i.e. out of memory) */ - (void) close (fd); - return MHD_NO; - } - - /* add mime type if we had one */ - if (NULL != mime) - (void) MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_TYPE, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; - } - - if (0 == strcmp (method, MHD_HTTP_METHOD_POST)) - { - /* upload! */ - struct UploadContext *uc = *ptr; - - if (NULL == uc) - { - if (NULL == (uc = malloc (sizeof (struct UploadContext)))) - return MHD_NO; /* out of memory, close connection */ - memset (uc, 0, sizeof (struct UploadContext)); - uc->fd = -1; - uc->connection = connection; - uc->pp = MHD_create_post_processor (connection, - 64 * 1024 /* buffer size */, - &process_upload_data, uc); - if (NULL == uc->pp) - { - /* out of memory, close connection */ - free (uc); - return MHD_NO; - } - *ptr = uc; - return MHD_YES; - } - if (0 != *upload_data_size) - { - if (NULL == uc->response) - (void) MHD_post_process (uc->pp, - upload_data, - *upload_data_size); - *upload_data_size = 0; - return MHD_YES; - } - /* end of upload, finish it! */ - MHD_destroy_post_processor (uc->pp); - uc->pp = NULL; - if (-1 != uc->fd) - { - close (uc->fd); - uc->fd = -1; - } - if (NULL != uc->response) - { - return MHD_queue_response (connection, - MHD_HTTP_FORBIDDEN, - uc->response); - } - else - { - update_directory (); - return return_directory_response (connection); - } - } - if (0 == strcmp (method, MHD_HTTP_METHOD_GET)) - { - return return_directory_response (connection); - } - - /* unexpected request, refuse */ - return MHD_queue_response (connection, - MHD_HTTP_FORBIDDEN, - request_refused_response); -} - - -/** - * Function called if we get a SIGPIPE. Does nothing. - * - * @param sig will be SIGPIPE (ignored) - */ -static void -catcher (int sig) -{ - /* do nothing */ -} - - -/** - * setup handlers to ignore SIGPIPE. - */ -#ifndef MINGW -static void -ignore_sigpipe () -{ - struct sigaction oldsig; - struct sigaction sig; - - sig.sa_handler = &catcher; - sigemptyset (&sig.sa_mask); -#ifdef SA_INTERRUPT - sig.sa_flags = SA_INTERRUPT; /* SunOS */ -#else - sig.sa_flags = SA_RESTART; -#endif - if (0 != sigaction (SIGPIPE, &sig, &oldsig)) - fprintf (stderr, - "Failed to install SIGPIPE handler: %s\n", strerror (errno)); -} -#endif - - -/** - * Entry point to demo. Note: this HTTP server will make all - * files in the current directory and its subdirectories available - * to anyone. Press ENTER to stop the server once it has started. - * - * @param argc number of arguments in argv - * @param argv first and only argument should be the port number - * @return 0 on success - */ -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - unsigned int port; - - if ( (argc != 2) || - (1 != sscanf (argv[1], "%u", &port)) || - (UINT16_MAX < port) ) - { - fprintf (stderr, - "%s PORT\n", argv[0]); - return 1; - } - #ifndef MINGW - ignore_sigpipe (); - #endif - magic = magic_open (MAGIC_MIME_TYPE); - (void) magic_load (magic, NULL); - - (void) pthread_mutex_init (&mutex, NULL); - file_not_found_response = MHD_create_response_from_buffer (strlen (FILE_NOT_FOUND_PAGE), - (void *) FILE_NOT_FOUND_PAGE, - MHD_RESPMEM_PERSISTENT); - mark_as_html (file_not_found_response); - request_refused_response = MHD_create_response_from_buffer (strlen (REQUEST_REFUSED_PAGE), - (void *) REQUEST_REFUSED_PAGE, - MHD_RESPMEM_PERSISTENT); - mark_as_html (request_refused_response); - internal_error_response = MHD_create_response_from_buffer (strlen (INTERNAL_ERROR_PAGE), - (void *) INTERNAL_ERROR_PAGE, - MHD_RESPMEM_PERSISTENT); - mark_as_html (internal_error_response); - update_directory (); - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG -#if EPOLL_SUPPORT - | MHD_USE_EPOLL_LINUX_ONLY -#endif - , - port, - NULL, NULL, - &generate_page, NULL, - MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (256 * 1024), -#if PRODUCTION - MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) (64), -#endif - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) (120 /* seconds */), - MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS, - MHD_OPTION_NOTIFY_COMPLETED, &response_completed_callback, NULL, - MHD_OPTION_END); - if (NULL == d) - return 1; - fprintf (stderr, "HTTP server running. Press ENTER to stop the server\n"); - (void) getc (stdin); - MHD_stop_daemon (d); - MHD_destroy_response (file_not_found_response); - MHD_destroy_response (request_refused_response); - MHD_destroy_response (internal_error_response); - update_cached_response (NULL); - (void) pthread_mutex_destroy (&mutex); - magic_close (magic); - return 0; -} - -/* end of demo.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/demo_https.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/demo_https.c deleted file mode 100644 index f34a715c..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/demo_https.c +++ /dev/null @@ -1,960 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2013 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file demo_https.c - * @brief complex demonstration site: create directory index, offer - * upload via form and HTTP POST, download with mime type detection - * and error reporting (403, etc.) --- and all of this with - * high-performance settings (large buffers, thread pool). - * If you want to benchmark MHD, this code should be used to - * run tests against. Note that the number of threads may need - * to be adjusted depending on the number of available cores. - * Logic is identical to demo.c, just adds HTTPS support. - * @author Christian Grothoff - */ -#include "platform.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -/** - * Number of threads to run in the thread pool. Should (roughly) match - * the number of cores on your system. - */ -#define NUMBER_OF_THREADS CPU_COUNT - -/** - * How many bytes of a file do we give to libmagic to determine the mime type? - * 16k might be a bit excessive, but ought not hurt performance much anyway, - * and should definitively be on the safe side. - */ -#define MAGIC_HEADER_SIZE (16 * 1024) - - -/** - * Page returned for file-not-found. - */ -#define FILE_NOT_FOUND_PAGE "File not foundFile not found" - - -/** - * Page returned for internal errors. - */ -#define INTERNAL_ERROR_PAGE "Internal errorInternal error" - - -/** - * Page returned for refused requests. - */ -#define REQUEST_REFUSED_PAGE "Request refusedRequest refused (file exists?)" - - -/** - * Head of index page. - */ -#define INDEX_PAGE_HEADER "\nWelcome\n\n"\ - "

    Upload

    \n"\ - "
    \n"\ - "
    Content type:
    "\ - "Book"\ - "Image"\ - "Music"\ - "Software"\ - "Videos\n"\ - "Other
    "\ - "
    Language:
    "\ - "none"\ - "English"\ - "German"\ - "French"\ - "Spanish
    \n"\ - "
    File:
    "\ - "
    "\ - "\n"\ - "\n"\ - "

    Download

    \n"\ - "
      \n" - -/** - * Footer of index page. - */ -#define INDEX_PAGE_FOOTER "
    \n\n" - - -/** - * NULL-terminated array of supported upload categories. Should match HTML - * in the form. - */ -static const char * const categories[] = - { - "books", - "images", - "music", - "software", - "videos", - "other", - NULL, - }; - - -/** - * Specification of a supported language. - */ -struct Language -{ - /** - * Directory name for the language. - */ - const char *dirname; - - /** - * Long name for humans. - */ - const char *longname; - -}; - -/** - * NULL-terminated array of supported upload categories. Should match HTML - * in the form. - */ -static const struct Language languages[] = - { - { "no-lang", "No language specified" }, - { "en", "English" }, - { "de", "German" }, - { "fr", "French" }, - { "es", "Spanish" }, - { NULL, NULL }, - }; - - -/** - * Response returned if the requested file does not exist (or is not accessible). - */ -static struct MHD_Response *file_not_found_response; - -/** - * Response returned for internal errors. - */ -static struct MHD_Response *internal_error_response; - -/** - * Response returned for '/' (GET) to list the contents of the directory and allow upload. - */ -static struct MHD_Response *cached_directory_response; - -/** - * Response returned for refused uploads. - */ -static struct MHD_Response *request_refused_response; - -/** - * Mutex used when we update the cached directory response object. - */ -static pthread_mutex_t mutex; - -/** - * Global handle to MAGIC data. - */ -static magic_t magic; - - -/** - * Mark the given response as HTML for the brower. - * - * @param response response to mark - */ -static void -mark_as_html (struct MHD_Response *response) -{ - (void) MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_TYPE, - "text/html"); -} - - -/** - * Replace the existing 'cached_directory_response' with the - * given response. - * - * @param response new directory response - */ -static void -update_cached_response (struct MHD_Response *response) -{ - (void) pthread_mutex_lock (&mutex); - if (NULL != cached_directory_response) - MHD_destroy_response (cached_directory_response); - cached_directory_response = response; - (void) pthread_mutex_unlock (&mutex); -} - - -/** - * Context keeping the data for the response we're building. - */ -struct ResponseDataContext -{ - /** - * Response data string. - */ - char *buf; - - /** - * Number of bytes allocated for 'buf'. - */ - size_t buf_len; - - /** - * Current position where we append to 'buf'. Must be smaller or equal to 'buf_len'. - */ - size_t off; - -}; - - -/** - * Create a listing of the files in 'dirname' in HTML. - * - * @param rdc where to store the list of files - * @param dirname name of the directory to list - * @return MHD_YES on success, MHD_NO on error - */ -static int -list_directory (struct ResponseDataContext *rdc, - const char *dirname) -{ - char fullname[PATH_MAX]; - struct stat sbuf; - DIR *dir; - struct dirent *de; - - if (NULL == (dir = opendir (dirname))) - return MHD_NO; - while (NULL != (de = readdir (dir))) - { - if ('.' == de->d_name[0]) - continue; - if (sizeof (fullname) <= (size_t) - snprintf (fullname, sizeof (fullname), - "%s/%s", - dirname, de->d_name)) - continue; /* ugh, file too long? how can this be!? */ - if (0 != stat (fullname, &sbuf)) - continue; /* ugh, failed to 'stat' */ - if (! S_ISREG (sbuf.st_mode)) - continue; /* not a regular file, skip */ - if (rdc->off + 1024 > rdc->buf_len) - { - void *r; - - if ( (2 * rdc->buf_len + 1024) < rdc->buf_len) - break; /* more than SIZE_T _index_ size? Too big for us */ - rdc->buf_len = 2 * rdc->buf_len + 1024; - if (NULL == (r = realloc (rdc->buf, rdc->buf_len))) - break; /* out of memory */ - rdc->buf = r; - } - rdc->off += snprintf (&rdc->buf[rdc->off], - rdc->buf_len - rdc->off, - "
  • %s
    • \n", - fullname, - de->d_name); - } - (void) closedir (dir); - return MHD_YES; -} - - -/** - * Re-scan our local directory and re-build the index. - */ -static void -update_directory () -{ - static size_t initial_allocation = 32 * 1024; /* initial size for response buffer */ - struct MHD_Response *response; - struct ResponseDataContext rdc; - unsigned int language_idx; - unsigned int category_idx; - const struct Language *language; - const char *category; - char dir_name[128]; - struct stat sbuf; - - rdc.buf_len = initial_allocation; - if (NULL == (rdc.buf = malloc (rdc.buf_len))) - { - update_cached_response (NULL); - return; - } - rdc.off = snprintf (rdc.buf, rdc.buf_len, - "%s", - INDEX_PAGE_HEADER); - for (language_idx = 0; NULL != languages[language_idx].dirname; language_idx++) - { - language = &languages[language_idx]; - - if (0 != stat (language->dirname, &sbuf)) - continue; /* empty */ - /* we ensured always +1k room, filenames are ~256 bytes, - so there is always still enough space for the header - without need for an additional reallocation check. */ - rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off, - "

    %s

    \n", - language->longname); - for (category_idx = 0; NULL != categories[category_idx]; category_idx++) - { - category = categories[category_idx]; - snprintf (dir_name, sizeof (dir_name), - "%s/%s", - language->dirname, - category); - if (0 != stat (dir_name, &sbuf)) - continue; /* empty */ - - /* we ensured always +1k room, filenames are ~256 bytes, - so there is always still enough space for the header - without need for an additional reallocation check. */ - rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off, - "

    %s

    \n", - category); - - if (MHD_NO == list_directory (&rdc, dir_name)) - { - free (rdc.buf); - update_cached_response (NULL); - return; - } - } - } - /* we ensured always +1k room, filenames are ~256 bytes, - so there is always still enough space for the footer - without need for a final reallocation check. */ - rdc.off += snprintf (&rdc.buf[rdc.off], rdc.buf_len - rdc.off, - "%s", - INDEX_PAGE_FOOTER); - initial_allocation = rdc.buf_len; /* remember for next time */ - response = MHD_create_response_from_buffer (rdc.off, - rdc.buf, - MHD_RESPMEM_MUST_FREE); - mark_as_html (response); -#if FORCE_CLOSE - (void) MHD_add_response_header (response, - MHD_HTTP_HEADER_CONNECTION, - "close"); -#endif - update_cached_response (response); -} - - -/** - * Context we keep for an upload. - */ -struct UploadContext -{ - /** - * Handle where we write the uploaded file to. - */ - int fd; - - /** - * Name of the file on disk (used to remove on errors). - */ - char *filename; - - /** - * Language for the upload. - */ - char *language; - - /** - * Category for the upload. - */ - char *category; - - /** - * Post processor we're using to process the upload. - */ - struct MHD_PostProcessor *pp; - - /** - * Handle to connection that we're processing the upload for. - */ - struct MHD_Connection *connection; - - /** - * Response to generate, NULL to use directory. - */ - struct MHD_Response *response; -}; - - -/** - * Append the 'size' bytes from 'data' to '*ret', adding - * 0-termination. If '*ret' is NULL, allocate an empty string first. - * - * @param ret string to update, NULL or 0-terminated - * @param data data to append - * @param size number of bytes in 'data' - * @return MHD_NO on allocation failure, MHD_YES on success - */ -static int -do_append (char **ret, - const char *data, - size_t size) -{ - char *buf; - size_t old_len; - - if (NULL == *ret) - old_len = 0; - else - old_len = strlen (*ret); - buf = malloc (old_len + size + 1); - if (NULL == buf) - return MHD_NO; - memcpy (buf, *ret, old_len); - if (NULL != *ret) - free (*ret); - memcpy (&buf[old_len], data, size); - buf[old_len + size] = '\0'; - *ret = buf; - return MHD_YES; -} - - -/** - * Iterator over key-value pairs where the value - * maybe made available in increments and/or may - * not be zero-terminated. Used for processing - * POST data. - * - * @param cls user-specified closure - * @param kind type of the value, always MHD_POSTDATA_KIND when called from MHD - * @param key 0-terminated key for the value - * @param filename name of the uploaded file, NULL if not known - * @param content_type mime-type of the data, NULL if not known - * @param transfer_encoding encoding of the data, NULL if not known - * @param data pointer to size bytes of data at the - * specified offset - * @param off offset of data in the overall value - * @param size number of bytes in data available - * @return MHD_YES to continue iterating, - * MHD_NO to abort the iteration - */ -static int -process_upload_data (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *data, - uint64_t off, - size_t size) -{ - struct UploadContext *uc = cls; - int i; - - if (0 == strcmp (key, "category")) - return do_append (&uc->category, data, size); - if (0 == strcmp (key, "language")) - return do_append (&uc->language, data, size); - if (0 != strcmp (key, "upload")) - { - fprintf (stderr, - "Ignoring unexpected form value `%s'\n", - key); - return MHD_YES; /* ignore */ - } - if (NULL == filename) - { - fprintf (stderr, "No filename, aborting upload\n"); - return MHD_NO; /* no filename, error */ - } - if ( (NULL == uc->category) || - (NULL == uc->language) ) - { - fprintf (stderr, - "Missing form data for upload `%s'\n", - filename); - uc->response = request_refused_response; - return MHD_NO; - } - if (-1 == uc->fd) - { - char fn[PATH_MAX]; - - if ( (NULL != strstr (filename, "..")) || - (NULL != strchr (filename, '/')) || - (NULL != strchr (filename, '\\')) ) - { - uc->response = request_refused_response; - return MHD_NO; - } - /* create directories -- if they don't exist already */ -#ifdef WINDOWS - (void) mkdir (uc->language); -#else - (void) mkdir (uc->language, S_IRWXU); -#endif - snprintf (fn, sizeof (fn), - "%s/%s", - uc->language, - uc->category); -#ifdef WINDOWS - (void) mkdir (fn); -#else - (void) mkdir (fn, S_IRWXU); -#endif - /* open file */ - snprintf (fn, sizeof (fn), - "%s/%s/%s", - uc->language, - uc->category, - filename); - for (i=strlen (fn)-1;i>=0;i--) - if (! isprint ((int) fn[i])) - fn[i] = '_'; - uc->fd = open (fn, - O_CREAT | O_EXCL -#if O_LARGEFILE - | O_LARGEFILE -#endif - | O_WRONLY, - S_IRUSR | S_IWUSR); - if (-1 == uc->fd) - { - fprintf (stderr, - "Error opening file `%s' for upload: %s\n", - fn, - strerror (errno)); - uc->response = request_refused_response; - return MHD_NO; - } - uc->filename = strdup (fn); - } - if ( (0 != size) && - (size != (size_t) write (uc->fd, data, size)) ) - { - /* write failed; likely: disk full */ - fprintf (stderr, - "Error writing to file `%s': %s\n", - uc->filename, - strerror (errno)); - uc->response = internal_error_response; - close (uc->fd); - uc->fd = -1; - if (NULL != uc->filename) - { - unlink (uc->filename); - free (uc->filename); - uc->filename = NULL; - } - return MHD_NO; - } - return MHD_YES; -} - - -/** - * Function called whenever a request was completed. - * Used to clean up 'struct UploadContext' objects. - * - * @param cls client-defined closure, NULL - * @param connection connection handle - * @param con_cls value as set by the last call to - * the MHD_AccessHandlerCallback, points to NULL if this was - * not an upload - * @param toe reason for request termination - */ -static void -response_completed_callback (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct UploadContext *uc = *con_cls; - - if (NULL == uc) - return; /* this request wasn't an upload request */ - if (NULL != uc->pp) - { - MHD_destroy_post_processor (uc->pp); - uc->pp = NULL; - } - if (-1 != uc->fd) - { - (void) close (uc->fd); - if (NULL != uc->filename) - { - fprintf (stderr, - "Upload of file `%s' failed (incomplete or aborted), removing file.\n", - uc->filename); - (void) unlink (uc->filename); - } - } - if (NULL != uc->filename) - free (uc->filename); - free (uc); -} - - -/** - * Return the current directory listing. - * - * @param connection connection to return the directory for - * @return MHD_YES on success, MHD_NO on error - */ -static int -return_directory_response (struct MHD_Connection *connection) -{ - int ret; - - (void) pthread_mutex_lock (&mutex); - if (NULL == cached_directory_response) - ret = MHD_queue_response (connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - internal_error_response); - else - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - cached_directory_response); - (void) pthread_mutex_unlock (&mutex); - return ret; -} - - -/** - * Main callback from MHD, used to generate the page. - * - * @param cls NULL - * @param connection connection handle - * @param url requested URL - * @param method GET, PUT, POST, etc. - * @param version HTTP version - * @param upload_data data from upload (PUT/POST) - * @param upload_data_size number of bytes in "upload_data" - * @param ptr our context - * @return MHD_YES on success, MHD_NO to drop connection - */ -static int -generate_page (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, void **ptr) -{ - struct MHD_Response *response; - int ret; - int fd; - struct stat buf; - - if (0 != strcmp (url, "/")) - { - /* should be file download */ - char file_data[MAGIC_HEADER_SIZE]; - ssize_t got; - const char *mime; - - if (0 != strcmp (method, MHD_HTTP_METHOD_GET)) - return MHD_NO; /* unexpected method (we're not polite...) */ - if ( (0 == stat (&url[1], &buf)) && - (NULL == strstr (&url[1], "..")) && - ('/' != url[1])) - fd = open (&url[1], O_RDONLY); - else - fd = -1; - if (-1 == fd) - return MHD_queue_response (connection, - MHD_HTTP_NOT_FOUND, - file_not_found_response); - /* read beginning of the file to determine mime type */ - got = read (fd, file_data, sizeof (file_data)); - if (-1 != got) - mime = magic_buffer (magic, file_data, got); - else - mime = NULL; - (void) lseek (fd, 0, SEEK_SET); - - if (NULL == (response = MHD_create_response_from_fd (buf.st_size, - fd))) - { - /* internal error (i.e. out of memory) */ - (void) close (fd); - return MHD_NO; - } - - /* add mime type if we had one */ - if (NULL != mime) - (void) MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_TYPE, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; - } - - if (0 == strcmp (method, MHD_HTTP_METHOD_POST)) - { - /* upload! */ - struct UploadContext *uc = *ptr; - - if (NULL == uc) - { - if (NULL == (uc = malloc (sizeof (struct UploadContext)))) - return MHD_NO; /* out of memory, close connection */ - memset (uc, 0, sizeof (struct UploadContext)); - uc->fd = -1; - uc->connection = connection; - uc->pp = MHD_create_post_processor (connection, - 64 * 1024 /* buffer size */, - &process_upload_data, uc); - if (NULL == uc->pp) - { - /* out of memory, close connection */ - free (uc); - return MHD_NO; - } - *ptr = uc; - return MHD_YES; - } - if (0 != *upload_data_size) - { - if (NULL == uc->response) - (void) MHD_post_process (uc->pp, - upload_data, - *upload_data_size); - *upload_data_size = 0; - return MHD_YES; - } - /* end of upload, finish it! */ - MHD_destroy_post_processor (uc->pp); - uc->pp = NULL; - if (-1 != uc->fd) - { - close (uc->fd); - uc->fd = -1; - } - if (NULL != uc->response) - { - return MHD_queue_response (connection, - MHD_HTTP_FORBIDDEN, - uc->response); - } - else - { - update_directory (); - return return_directory_response (connection); - } - } - if (0 == strcmp (method, MHD_HTTP_METHOD_GET)) - { - return return_directory_response (connection); - } - - /* unexpected request, refuse */ - return MHD_queue_response (connection, - MHD_HTTP_FORBIDDEN, - request_refused_response); -} - - -/** - * Function called if we get a SIGPIPE. Does nothing. - * - * @param sig will be SIGPIPE (ignored) - */ -static void -catcher (int sig) -{ - /* do nothing */ -} - - -/** - * setup handlers to ignore SIGPIPE. - */ -#ifndef MINGW -static void -ignore_sigpipe () -{ - struct sigaction oldsig; - struct sigaction sig; - - sig.sa_handler = &catcher; - sigemptyset (&sig.sa_mask); -#ifdef SA_INTERRUPT - sig.sa_flags = SA_INTERRUPT; /* SunOS */ -#else - sig.sa_flags = SA_RESTART; -#endif - if (0 != sigaction (SIGPIPE, &sig, &oldsig)) - fprintf (stderr, - "Failed to install SIGPIPE handler: %s\n", strerror (errno)); -} -#endif - -/* test server key */ -const char srv_signed_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n" - "MIIEowIBAAKCAQEAvfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW\n" - "+K03KwEku55QvnUndwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8IL\n" - "q4sw32vo0fbMu5BZF49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ0\n" - "20Q5EAAEseD1YtWCIpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6\n" - "QYGGh1QmHRPAy3CBII6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6x\n" - "yoOl204xuekZOaG9RUPId74Rtmwfi1TLbBzo2wIDAQABAoIBADu09WSICNq5cMe4\n" - "+NKCLlgAT1NiQpLls1gKRbDhKiHU9j8QWNvWWkJWrCya4QdUfLCfeddCMeiQmv3K\n" - "lJMvDs+5OjJSHFoOsGiuW2Ias7IjnIojaJalfBml6frhJ84G27IXmdz6gzOiTIer\n" - "DjeAgcwBaKH5WwIay2TxIaScl7AwHBauQkrLcyb4hTmZuQh6ArVIN6+pzoVuORXM\n" - "bpeNWl2l/HSN3VtUN6aCAKbN/X3o0GavCCMn5Fa85uJFsab4ss/uP+2PusU71+zP\n" - "sBm6p/2IbGvF5k3VPDA7X5YX61sukRjRBihY8xSnNYx1UcoOsX6AiPnbhifD8+xQ\n" - "Tlf8oJUCgYEA0BTfzqNpr9Wxw5/QXaSdw7S/0eP5a0C/nwURvmfSzuTD4equzbEN\n" - "d+dI/s2JMxrdj/I4uoAfUXRGaabevQIjFzC9uyE3LaOyR2zhuvAzX+vVcs6bSXeU\n" - "pKpCAcN+3Z3evMaX2f+z/nfSUAl2i4J2R+/LQAWJW4KwRky/m+cxpfUCgYEA6bN1\n" - "b73bMgM8wpNt6+fcmS+5n0iZihygQ2U2DEud8nZJL4Nrm1dwTnfZfJBnkGj6+0Q0\n" - "cOwj2KS0/wcEdJBP0jucU4v60VMhp75AQeHqidIde0bTViSRo3HWKXHBIFGYoU3T\n" - "LyPyKndbqsOObnsFXHn56Nwhr2HLf6nw4taGQY8CgYBoSW36FLCNbd6QGvLFXBGt\n" - "2lMhEM8az/K58kJ4WXSwOLtr6MD/WjNT2tkcy0puEJLm6BFCd6A6pLn9jaKou/92\n" - "SfltZjJPb3GUlp9zn5tAAeSSi7YMViBrfuFiHObij5LorefBXISLjuYbMwL03MgH\n" - "Ocl2JtA2ywMp2KFXs8GQWQKBgFyIVv5ogQrbZ0pvj31xr9HjqK6d01VxIi+tOmpB\n" - "4ocnOLEcaxX12BzprW55ytfOCVpF1jHD/imAhb3YrHXu0fwe6DXYXfZV4SSG2vB7\n" - "IB9z14KBN5qLHjNGFpMQXHSMek+b/ftTU0ZnPh9uEM5D3YqRLVd7GcdUhHvG8P8Q\n" - "C9aXAoGBAJtID6h8wOGMP0XYX5YYnhlC7dOLfk8UYrzlp3xhqVkzKthTQTj6wx9R\n" - "GtC4k7U1ki8oJsfcIlBNXd768fqDVWjYju5rzShMpo8OCTS6ipAblKjCxPPVhIpv\n" - "tWPlbSn1qj6wylstJ5/3Z+ZW5H4wIKp5jmLiioDhcP0L/Ex3Zx8O\n" - "-----END RSA PRIVATE KEY-----\n"; - -/* test server CA signed certificates */ -const char srv_signed_cert_pem[] = "-----BEGIN CERTIFICATE-----\n" - "MIIDGzCCAgWgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n" - "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n" - "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n" - "vfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW+K03KwEku55QvnUn\n" - "dwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8ILq4sw32vo0fbMu5BZ\n" - "F49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ020Q5EAAEseD1YtWC\n" - "IpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6QYGGh1QmHRPAy3CB\n" - "II6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6xyoOl204xuekZOaG9\n" - "RUPId74Rtmwfi1TLbBzo2wIDAQABo3YwdDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQM\n" - "MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHIAAwHQYDVR0OBBYEFOFi4ilKOP1d\n" - "XHlWCMwmVKr7mgy8MB8GA1UdIwQYMBaAFP2olB4s2T/xuoQ5pT2RKojFwZo2MAsG\n" - "CSqGSIb3DQEBBQOCAQEAHVWPxazupbOkG7Did+dY9z2z6RjTzYvurTtEKQgzM2Vz\n" - "GQBA+3pZ3c5mS97fPIs9hZXfnQeelMeZ2XP1a+9vp35bJjZBBhVH+pqxjCgiUflg\n" - "A3Zqy0XwwVCgQLE2HyaU3DLUD/aeIFK5gJaOSdNTXZLv43K8kl4cqDbMeRpVTbkt\n" - "YmG4AyEOYRNKGTqMEJXJoxD5E3rBUNrVI/XyTjYrulxbNPcMWEHKNeeqWpKDYTFo\n" - "Bb01PCthGXiq/4A2RLAFosadzRa8SBpoSjPPfZ0b2w4MJpReHqKbR5+T2t6hzml6\n" - "4ToyOKPDmamiTuN5KzLN3cw7DQlvWMvqSOChPLnA3Q==\n" - "-----END CERTIFICATE-----\n"; - - -/** - * Entry point to demo. Note: this HTTP server will make all - * files in the current directory and its subdirectories available - * to anyone. Press ENTER to stop the server once it has started. - * - * @param argc number of arguments in argv - * @param argv first and only argument should be the port number - * @return 0 on success - */ -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - unsigned int port; - - if ( (argc != 2) || - (1 != sscanf (argv[1], "%u", &port)) || - (UINT16_MAX < port) ) - { - fprintf (stderr, - "%s PORT\n", argv[0]); - return 1; - } - #ifndef MINGW - ignore_sigpipe (); - #endif - magic = magic_open (MAGIC_MIME_TYPE); - (void) magic_load (magic, NULL); - - (void) pthread_mutex_init (&mutex, NULL); - file_not_found_response = MHD_create_response_from_buffer (strlen (FILE_NOT_FOUND_PAGE), - (void *) FILE_NOT_FOUND_PAGE, - MHD_RESPMEM_PERSISTENT); - mark_as_html (file_not_found_response); - request_refused_response = MHD_create_response_from_buffer (strlen (REQUEST_REFUSED_PAGE), - (void *) REQUEST_REFUSED_PAGE, - MHD_RESPMEM_PERSISTENT); - mark_as_html (request_refused_response); - internal_error_response = MHD_create_response_from_buffer (strlen (INTERNAL_ERROR_PAGE), - (void *) INTERNAL_ERROR_PAGE, - MHD_RESPMEM_PERSISTENT); - mark_as_html (internal_error_response); - update_directory (); - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | MHD_USE_SSL -#if EPOLL_SUPPORT - | MHD_USE_EPOLL_LINUX_ONLY -#endif - , - port, - NULL, NULL, - &generate_page, NULL, - MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (256 * 1024), -#if PRODUCTION - MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) (64), -#endif - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) (120 /* seconds */), - MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS, - MHD_OPTION_NOTIFY_COMPLETED, &response_completed_callback, NULL, - MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem, - MHD_OPTION_END); - if (NULL == d) - return 1; - fprintf (stderr, "HTTP server running. Press ENTER to stop the server\n"); - (void) getc (stdin); - MHD_stop_daemon (d); - MHD_destroy_response (file_not_found_response); - MHD_destroy_response (request_refused_response); - MHD_destroy_response (internal_error_response); - update_cached_response (NULL); - (void) pthread_mutex_destroy (&mutex); - magic_close (magic); - return 0; -} - -/* end of demo_https.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/digest_auth_example.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/digest_auth_example.c deleted file mode 100644 index 62c99cfa..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/digest_auth_example.c +++ /dev/null @@ -1,140 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2010 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file digest_auth_example.c - * @brief minimal example for how to use digest auth with libmicrohttpd - * @author Amr Ali - */ - -#include "platform.h" -#include -#include - -#define PAGE "libmicrohttpd demoAccess granted" - -#define DENIED "libmicrohttpd demoAccess denied" - -#define MY_OPAQUE_STR "11733b200778ce33060f31c9af70a870ba96ddd4" - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - struct MHD_Response *response; - char *username; - const char *password = "testpass"; - const char *realm = "test@example.com"; - int ret; - - username = MHD_digest_auth_get_username(connection); - if (username == NULL) - { - response = MHD_create_response_from_buffer(strlen (DENIED), - DENIED, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_auth_fail_response(connection, realm, - MY_OPAQUE_STR, - response, - MHD_NO); - MHD_destroy_response(response); - return ret; - } - ret = MHD_digest_auth_check(connection, realm, - username, - password, - 300); - free(username); - if ( (ret == MHD_INVALID_NONCE) || - (ret == MHD_NO) ) - { - response = MHD_create_response_from_buffer(strlen (DENIED), - DENIED, - MHD_RESPMEM_PERSISTENT); - if (NULL == response) - return MHD_NO; - ret = MHD_queue_auth_fail_response(connection, realm, - MY_OPAQUE_STR, - response, - (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO); - MHD_destroy_response(response); - return ret; - } - response = MHD_create_response_from_buffer(strlen(PAGE), PAGE, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response(connection, MHD_HTTP_OK, response); - MHD_destroy_response(response); - return ret; -} - -int -main (int argc, char *const *argv) -{ - int fd; - char rnd[8]; - ssize_t len; - size_t off; - struct MHD_Daemon *d; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - fd = open("/dev/urandom", O_RDONLY); - if (-1 == fd) - { - fprintf (stderr, "Failed to open `%s': %s\n", - "/dev/urandom", - strerror (errno)); - return 1; - } - off = 0; - while (off < 8) - { - len = read(fd, rnd, 8); - if (len == -1) - { - fprintf (stderr, "Failed to read `%s': %s\n", - "/dev/urandom", - strerror (errno)); - (void) close (fd); - return 1; - } - off += len; - } - (void) close(fd); - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, &ahc_echo, PAGE, - MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof(rnd), rnd, - MHD_OPTION_NONCE_NC_SIZE, 300, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120, - MHD_OPTION_END); - if (d == NULL) - return 1; - (void) getc (stdin); - MHD_stop_daemon (d); - return 0; -} - -/* end of digest_auth_example.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/dual_stack_example.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/dual_stack_example.c deleted file mode 100644 index 12d50f45..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/dual_stack_example.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2012 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file dual_stack_example.c - * @brief how to use MHD with both IPv4 and IPv6 support (dual-stack) - * @author Christian Grothoff - */ - -#include "platform.h" -#include - -#define PAGE "libmicrohttpd demolibmicrohttpd demo" - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - static int aptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (method, "GET")) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - response = MHD_create_response_from_buffer (strlen (me), - (void *) me, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | MHD_USE_DUAL_STACK, - atoi (argv[1]), - NULL, NULL, &ahc_echo, PAGE, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120, - MHD_OPTION_END); - (void) getc (stdin); - MHD_stop_daemon (d); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/fileserver_example.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/fileserver_example.c deleted file mode 100644 index 8f5223ab..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/fileserver_example.c +++ /dev/null @@ -1,119 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file fileserver_example.c - * @brief minimal example for how to use libmicrohttpd to serve files - * @author Christian Grothoff - */ - -#include "platform.h" -#include -#include - -#define PAGE "File not foundFile not found" - -static ssize_t -file_reader (void *cls, uint64_t pos, char *buf, size_t max) -{ - FILE *file = cls; - - (void) fseek (file, pos, SEEK_SET); - return fread (buf, 1, max, file); -} - -static void -free_callback (void *cls) -{ - FILE *file = cls; - fclose (file); -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, void **ptr) -{ - static int aptr; - struct MHD_Response *response; - int ret; - FILE *file; - struct stat buf; - - if (0 != strcmp (method, MHD_HTTP_METHOD_GET)) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - if (0 == stat (&url[1], &buf)) - file = fopen (&url[1], "rb"); - else - file = NULL; - if (file == NULL) - { - response = MHD_create_response_from_buffer (strlen (PAGE), - (void *) PAGE, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_NOT_FOUND, response); - MHD_destroy_response (response); - } - else - { - response = MHD_create_response_from_callback (buf.st_size, 32 * 1024, /* 32k page size */ - &file_reader, - file, - &free_callback); - if (response == NULL) - { - fclose (file); - return MHD_NO; - } - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - } - return ret; -} - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); - if (d == NULL) - return 1; - (void) getc (stdin); - MHD_stop_daemon (d); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/fileserver_example_dirs.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/fileserver_example_dirs.c deleted file mode 100644 index 9d4a1935..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/fileserver_example_dirs.c +++ /dev/null @@ -1,179 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file fileserver_example.c - * @brief example for how to use libmicrohttpd to serve files (with directory support) - * @author Christian Grothoff - */ - -#include "platform.h" -#include -#include -#include - -#define PAGE "File not foundFile not found" - -static ssize_t -file_reader (void *cls, uint64_t pos, char *buf, size_t max) -{ - FILE *file = cls; - - (void) fseek (file, pos, SEEK_SET); - return fread (buf, 1, max, file); -} - -static void -file_free_callback (void *cls) -{ - FILE *file = cls; - fclose (file); -} - -static void -dir_free_callback (void *cls) -{ - DIR *dir = cls; - if (dir != NULL) - closedir (dir); -} - -static ssize_t -dir_reader (void *cls, uint64_t pos, char *buf, size_t max) -{ - DIR *dir = cls; - struct dirent *e; - - if (max < 512) - return 0; - do - { - e = readdir (dir); - if (e == NULL) - return MHD_CONTENT_READER_END_OF_STREAM; - } while (e->d_name[0] == '.'); - return snprintf (buf, max, - "%s
    ", - e->d_name, - e->d_name); -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, void **ptr) -{ - static int aptr; - struct MHD_Response *response; - int ret; - FILE *file; - DIR *dir; - struct stat buf; - char emsg[1024]; - - if (0 != strcmp (method, MHD_HTTP_METHOD_GET)) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - if ( (0 == stat (&url[1], &buf)) && - (S_ISREG (buf.st_mode)) ) - file = fopen (&url[1], "rb"); - else - file = NULL; - if (file == NULL) - { - dir = opendir ("."); - if (dir == NULL) - { - /* most likely cause: more concurrent requests than - available file descriptors / 2 */ - snprintf (emsg, - sizeof (emsg), - "Failed to open directory `.': %s\n", - strerror (errno)); - response = MHD_create_response_from_buffer (strlen (emsg), - emsg, - MHD_RESPMEM_MUST_COPY); - if (response == NULL) - return MHD_NO; - ret = MHD_queue_response (connection, MHD_HTTP_SERVICE_UNAVAILABLE, response); - MHD_destroy_response (response); - } - else - { - response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, - 32 * 1024, - &dir_reader, - dir, - &dir_free_callback); - if (response == NULL) - { - closedir (dir); - return MHD_NO; - } - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - } - } - else - { - response = MHD_create_response_from_callback (buf.st_size, 32 * 1024, /* 32k page size */ - &file_reader, - file, - &file_free_callback); - if (response == NULL) - { - fclose (file); - return MHD_NO; - } - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - } - return ret; -} - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); - if (d == NULL) - return 1; - (void) getc (stdin); - MHD_stop_daemon (d); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/fileserver_example_external_select.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/fileserver_example_external_select.c deleted file mode 100644 index 7a270613..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/fileserver_example_external_select.c +++ /dev/null @@ -1,149 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file fileserver_example_external_select.c - * @brief minimal example for how to use libmicrohttpd to server files - * @author Christian Grothoff - */ - -#include "platform.h" -#include -#include -#include - -#define PAGE "File not foundFile not found" - -static ssize_t -file_reader (void *cls, uint64_t pos, char *buf, size_t max) -{ - FILE *file = cls; - - (void) fseek (file, pos, SEEK_SET); - return fread (buf, 1, max, file); -} - -static void -free_callback (void *cls) -{ - FILE *file = cls; - fclose (file); -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, void **ptr) -{ - static int aptr; - struct MHD_Response *response; - int ret; - FILE *file; - struct stat buf; - - if (0 != strcmp (method, MHD_HTTP_METHOD_GET)) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - if ( (0 == stat (&url[1], &buf)) && - (S_ISREG (buf.st_mode)) ) - file = fopen (&url[1], "rb"); - else - file = NULL; - if (file == NULL) - { - response = MHD_create_response_from_buffer (strlen (PAGE), - (void *) PAGE, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_NOT_FOUND, response); - MHD_destroy_response (response); - } - else - { - response = MHD_create_response_from_callback (buf.st_size, 32 * 1024, /* 32k page size */ - &file_reader, - file, - &free_callback); - if (response == NULL) - { - fclose (file); - return MHD_NO; - } - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - } - return ret; -} - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - time_t end; - time_t t; - struct timeval tv; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - MHD_UNSIGNED_LONG_LONG mhd_timeout; - - if (argc != 3) - { - printf ("%s PORT SECONDS-TO-RUN\n", argv[0]); - return 1; - } - d = MHD_start_daemon (MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); - if (d == NULL) - return 1; - end = time (NULL) + atoi (argv[2]); - while ((t = time (NULL)) < end) - { - tv.tv_sec = end - t; - tv.tv_usec = 0; - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - break; /* fatal internal error */ - if (MHD_get_timeout (d, &mhd_timeout) == MHD_YES) - { - if (((MHD_UNSIGNED_LONG_LONG)tv.tv_sec) < mhd_timeout / 1000LL) - { - tv.tv_sec = mhd_timeout / 1000LL; - tv.tv_usec = (mhd_timeout - (tv.tv_sec * 1000LL)) * 1000LL; - } - } - select (max + 1, &rs, &ws, &es, &tv); - MHD_run (d); - } - MHD_stop_daemon (d); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/https_fileserver_example.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/https_fileserver_example.c deleted file mode 100644 index fe0c2de7..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/https_fileserver_example.c +++ /dev/null @@ -1,207 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file https_fileserver_example.c - * @brief a simple HTTPS file server using TLS. - * - * Usage : - * - * 'http_fileserver_example HTTP-PORT SECONDS-TO-RUN' - * - * The certificate & key are required by the server to operate, Omitting the - * path arguments will cause the server to use the hard coded example certificate & key. - * - * 'certtool' may be used to generate these if required. - * - * @author Sagie Amir - */ - -#include "platform.h" -#include -#include -#include -#include - -#define BUF_SIZE 1024 -#define MAX_URL_LEN 255 - -// TODO remove if unused -#define CAFILE "ca.pem" -#define CRLFILE "crl.pem" - -#define EMPTY_PAGE "File not foundFile not found" - -/* Test Certificate */ -const char cert_pem[] = - "-----BEGIN CERTIFICATE-----\n" - "MIICpjCCAZCgAwIBAgIESEPtjjALBgkqhkiG9w0BAQUwADAeFw0wODA2MDIxMjU0\n" - "MzhaFw0wOTA2MDIxMjU0NDZaMAAwggEfMAsGCSqGSIb3DQEBAQOCAQ4AMIIBCQKC\n" - "AQC03TyUvK5HmUAirRp067taIEO4bibh5nqolUoUdo/LeblMQV+qnrv/RNAMTx5X\n" - "fNLZ45/kbM9geF8qY0vsPyQvP4jumzK0LOJYuIwmHaUm9vbXnYieILiwCuTgjaud\n" - "3VkZDoQ9fteIo+6we9UTpVqZpxpbLulBMh/VsvX0cPJ1VFC7rT59o9hAUlFf9jX/\n" - "GmKdYI79MtgVx0OPBjmmSD6kicBBfmfgkO7bIGwlRtsIyMznxbHu6VuoX/eVxrTv\n" - "rmCwgEXLWRZ6ru8MQl5YfqeGXXRVwMeXU961KefbuvmEPccgCxm8FZ1C1cnDHFXh\n" - "siSgAzMBjC/b6KVhNQ4KnUdZAgMBAAGjLzAtMAwGA1UdEwEB/wQCMAAwHQYDVR0O\n" - "BBYEFJcUvpjvE5fF/yzUshkWDpdYiQh/MAsGCSqGSIb3DQEBBQOCAQEARP7eKSB2\n" - "RNd6XjEjK0SrxtoTnxS3nw9sfcS7/qD1+XHdObtDFqGNSjGYFB3Gpx8fpQhCXdoN\n" - "8QUs3/5ZVa5yjZMQewWBgz8kNbnbH40F2y81MHITxxCe1Y+qqHWwVaYLsiOTqj2/\n" - "0S3QjEJ9tvklmg7JX09HC4m5QRYfWBeQLD1u8ZjA1Sf1xJriomFVyRLI2VPO2bNe\n" - "JDMXWuP+8kMC7gEvUnJ7A92Y2yrhu3QI3bjPk8uSpHea19Q77tul1UVBJ5g+zpH3\n" - "OsF5p0MyaVf09GTzcLds5nE/osTdXGUyHJapWReVmPm3Zn6gqYlnzD99z+DPIgIV\n" - "RhZvQx74NQnS6g==\n" "-----END CERTIFICATE-----\n"; - -const char key_pem[] = - "-----BEGIN RSA PRIVATE KEY-----\n" - "MIIEowIBAAKCAQEAtN08lLyuR5lAIq0adOu7WiBDuG4m4eZ6qJVKFHaPy3m5TEFf\n" - "qp67/0TQDE8eV3zS2eOf5GzPYHhfKmNL7D8kLz+I7psytCziWLiMJh2lJvb2152I\n" - "niC4sArk4I2rnd1ZGQ6EPX7XiKPusHvVE6VamacaWy7pQTIf1bL19HDydVRQu60+\n" - "faPYQFJRX/Y1/xpinWCO/TLYFcdDjwY5pkg+pInAQX5n4JDu2yBsJUbbCMjM58Wx\n" - "7ulbqF/3lca0765gsIBFy1kWeq7vDEJeWH6nhl10VcDHl1PetSnn27r5hD3HIAsZ\n" - "vBWdQtXJwxxV4bIkoAMzAYwv2+ilYTUOCp1HWQIDAQABAoIBAArOQv3R7gmqDspj\n" - "lDaTFOz0C4e70QfjGMX0sWnakYnDGn6DU19iv3GnX1S072ejtgc9kcJ4e8VUO79R\n" - "EmqpdRR7k8dJr3RTUCyjzf/C+qiCzcmhCFYGN3KRHA6MeEnkvRuBogX4i5EG1k5l\n" - "/5t+YBTZBnqXKWlzQLKoUAiMLPg0eRWh+6q7H4N7kdWWBmTpako7TEqpIwuEnPGx\n" - "u3EPuTR+LN6lF55WBePbCHccUHUQaXuav18NuDkcJmCiMArK9SKb+h0RqLD6oMI/\n" - "dKD6n8cZXeMBkK+C8U/K0sN2hFHACsu30b9XfdnljgP9v+BP8GhnB0nCB6tNBCPo\n" - "32srOwECgYEAxWh3iBT4lWqL6bZavVbnhmvtif4nHv2t2/hOs/CAq8iLAw0oWGZc\n" - "+JEZTUDMvFRlulr0kcaWra+4fN3OmJnjeuFXZq52lfMgXBIKBmoSaZpIh2aDY1Rd\n" - "RbEse7nQl9hTEPmYspiXLGtnAXW7HuWqVfFFP3ya8rUS3t4d07Hig8ECgYEA6ou6\n" - "OHiBRTbtDqLIv8NghARc/AqwNWgEc9PelCPe5bdCOLBEyFjqKiT2MttnSSUc2Zob\n" - "XhYkHC6zN1Mlq30N0e3Q61YK9LxMdU1vsluXxNq2rfK1Scb1oOlOOtlbV3zA3VRF\n" - "hV3t1nOA9tFmUrwZi0CUMWJE/zbPAyhwWotKyZkCgYEAh0kFicPdbABdrCglXVae\n" - "SnfSjVwYkVuGd5Ze0WADvjYsVkYBHTvhgRNnRJMg+/vWz3Sf4Ps4rgUbqK8Vc20b\n" - "AU5G6H6tlCvPRGm0ZxrwTWDHTcuKRVs+pJE8C/qWoklE/AAhjluWVoGwUMbPGuiH\n" - "6Gf1bgHF6oj/Sq7rv/VLZ8ECgYBeq7ml05YyLuJutuwa4yzQ/MXfghzv4aVyb0F3\n" - "QCdXR6o2IYgR6jnSewrZKlA9aPqFJrwHNR6sNXlnSmt5Fcf/RWO/qgJQGLUv3+rG\n" - "7kuLTNDR05azSdiZc7J89ID3Bkb+z2YkV+6JUiPq/Ei1+nDBEXb/m+/HqALU/nyj\n" - "P3gXeQKBgBusb8Rbd+KgxSA0hwY6aoRTPRt8LNvXdsB9vRcKKHUFQvxUWiUSS+L9\n" - "/Qu1sJbrUquKOHqksV5wCnWnAKyJNJlhHuBToqQTgKXjuNmVdYSe631saiI7PHyC\n" - "eRJ6DxULPxABytJrYCRrNqmXi5TCiqR2mtfalEMOPxz8rUU8dYyx\n" - "-----END RSA PRIVATE KEY-----\n"; - -static ssize_t -file_reader (void *cls, uint64_t pos, char *buf, size_t max) -{ - FILE *file = cls; - - (void) fseek (file, pos, SEEK_SET); - return fread (buf, 1, max, file); -} - -static void -file_free_callback (void *cls) -{ - FILE *file = cls; - fclose (file); -} - -/* HTTP access handler call back */ -static int -http_ahc (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, void **ptr) -{ - static int aptr; - struct MHD_Response *response; - int ret; - FILE *file; - struct stat buf; - - if (0 != strcmp (method, MHD_HTTP_METHOD_GET)) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - - if ( (0 == stat (&url[1], &buf)) && - (S_ISREG (buf.st_mode)) ) - file = fopen (&url[1], "rb"); - else - file = NULL; - if (file == NULL) - { - response = MHD_create_response_from_buffer (strlen (EMPTY_PAGE), - (void *) EMPTY_PAGE, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_NOT_FOUND, response); - MHD_destroy_response (response); - } - else - { - response = MHD_create_response_from_callback (buf.st_size, 32 * 1024, /* 32k PAGE_NOT_FOUND size */ - &file_reader, file, - &file_free_callback); - if (response == NULL) - { - fclose (file); - return MHD_NO; - } - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - } - return ret; -} - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *TLS_daemon; - - if (argc == 2) - { - /* TODO check if this is truly necessary - disallow usage of the blocking /dev/random */ - /* gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); */ - TLS_daemon = - MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | - MHD_USE_SSL, atoi (argv[1]), NULL, NULL, &http_ahc, - NULL, MHD_OPTION_CONNECTION_TIMEOUT, 256, - MHD_OPTION_HTTPS_MEM_KEY, key_pem, - MHD_OPTION_HTTPS_MEM_CERT, cert_pem, - MHD_OPTION_END); - } - else - { - printf ("Usage: %s HTTP-PORT\n", argv[0]); - return 1; - } - - if (TLS_daemon == NULL) - { - fprintf (stderr, "Error: failed to start TLS_daemon\n"); - return 1; - } - else - { - printf ("MHD daemon listening on port %d\n", atoi (argv[1])); - } - - (void) getc (stdin); - - MHD_stop_daemon (TLS_daemon); - - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy.c deleted file mode 100644 index a2275087..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy.c +++ /dev/null @@ -1,322 +0,0 @@ -/* - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file mhd2spdy.c - * @brief The main file of the HTTP-to-SPDY proxy with the 'main' function - * and event loop. No threads are used. - * Currently only GET is supported. - * TODOs: - * - non blocking SSL connect - * - check certificate - * - on closing spdy session, close sockets for all requests - * @author Andrey Uzunov - */ - - -#include "mhd2spdy_structures.h" -#include "mhd2spdy_spdy.h" -#include "mhd2spdy_http.h" - - -static int run = 1; -//static int spdy_close = 0; - - -static void -catch_signal(int signal) -{ - (void)signal; - //spdy_close = 1; - run = 0; -} - - -void -print_stat() -{ - if(!glob_opt.statistics) - return; - - printf("--------------------------\n"); - printf("Statistics (TLS overhead is ignored when used):\n"); - //printf("HTTP bytes received: %lld\n", glob_stat.http_bytes_received); - //printf("HTTP bytes sent: %lld\n", glob_stat.http_bytes_sent); - printf("SPDY bytes sent: %lld\n", glob_stat.spdy_bytes_sent); - printf("SPDY bytes received: %lld\n", glob_stat.spdy_bytes_received); - printf("SPDY bytes received and dropped: %lld\n", glob_stat.spdy_bytes_received_and_dropped); -} - - -int -run_everything () -{ - unsigned long long timeoutlong=0; - struct timeval timeout; - int ret; - fd_set rs; - fd_set ws; - fd_set es; - int maxfd = -1; - int maxfd_s = -1; - struct MHD_Daemon *daemon; - nfds_t spdy_npollfds = 1; - struct URI * spdy2http_uri = NULL; - struct SPDY_Connection *connection; - struct SPDY_Connection *connections[MAX_SPDY_CONNECTIONS]; - struct SPDY_Connection *connection_for_delete; - - if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) - PRINT_INFO("signal failed"); - - if (signal(SIGINT, catch_signal) == SIG_ERR) - PRINT_INFO("signal failed"); - - glob_opt.streams_opened = 0; - glob_opt.responses_pending = 0; - //glob_opt.global_memory = 0; - - srand(time(NULL)); - - if(init_parse_uri(&glob_opt.uri_preg)) - DIE("Regexp compilation failed"); - - if(NULL != glob_opt.spdy2http_str) - { - ret = parse_uri(&glob_opt.uri_preg, glob_opt.spdy2http_str, &spdy2http_uri); - if(ret != 0) - DIE("spdy_parse_uri failed"); - } - - SSL_load_error_strings(); - SSL_library_init(); - glob_opt.ssl_ctx = SSL_CTX_new(SSLv23_client_method()); - if(glob_opt.ssl_ctx == NULL) { - PRINT_INFO2("SSL_CTX_new %s", ERR_error_string(ERR_get_error(), NULL)); - abort(); - } - spdy_ssl_init_ssl_ctx(glob_opt.ssl_ctx, &glob_opt.spdy_proto_version); - - daemon = MHD_start_daemon ( - MHD_SUPPRESS_DATE_NO_CLOCK, - glob_opt.listen_port, - NULL, NULL, &http_cb_request, NULL, - MHD_OPTION_URI_LOG_CALLBACK, &http_cb_log, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &http_cb_request_completed, NULL, - MHD_OPTION_END); - if(NULL==daemon) - DIE("MHD_start_daemon failed"); - - do - { - timeout.tv_sec = 0; - timeout.tv_usec = 0; - - if(NULL == glob_opt.spdy_connection && NULL != glob_opt.spdy2http_str) - { - glob_opt.spdy_connection = spdy_connect(spdy2http_uri, spdy2http_uri->port, strcmp("https", spdy2http_uri->scheme)==0); - if(NULL == glob_opt.spdy_connection && glob_opt.only_proxy) - PRINT_INFO("cannot connect to the proxy"); - } - - FD_ZERO(&rs); - FD_ZERO(&ws); - FD_ZERO(&es); - - ret = MHD_get_timeout(daemon, &timeoutlong); - if(MHD_NO == ret || timeoutlong > 5000) - timeout.tv_sec = 5; - else - { - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - } - - if(MHD_NO == MHD_get_fdset (daemon, - &rs, - &ws, - &es, - &maxfd)) - { - PRINT_INFO("MHD_get_fdset error"); - } - assert(-1 != maxfd); - - maxfd_s = spdy_get_selectfdset( - &rs, - &ws, - &es, - connections, MAX_SPDY_CONNECTIONS, &spdy_npollfds); - if(maxfd_s > maxfd) - maxfd = maxfd_s; - - PRINT_INFO2("MHD timeout %lld %lld", (unsigned long long)timeout.tv_sec, (unsigned long long)timeout.tv_usec); - - glob_opt.spdy_data_received = false; - - ret = select(maxfd+1, &rs, &ws, &es, &timeout); - PRINT_INFO2("timeout now %lld %lld ret is %i", (unsigned long long)timeout.tv_sec, (unsigned long long)timeout.tv_usec, ret); - - switch(ret) - { - case -1: - PRINT_INFO2("select error: %i", errno); - break; - case 0: - //break; - default: - PRINT_INFO("run"); - //MHD_run_from_select(daemon,&rs, &ws, &es); //not closing FDs at some time in past - MHD_run(daemon); - spdy_run_select(&rs, &ws, &es, connections, spdy_npollfds); - if(glob_opt.spdy_data_received) - { - PRINT_INFO("MHD run again"); - //MHD_run_from_select(daemon,&rs, &ws, &es); //not closing FDs at some time in past - MHD_run(daemon); - } - break; - } - } - while(run); - - MHD_stop_daemon (daemon); - - //TODO SSL_free brakes - spdy_free_connection(glob_opt.spdy_connection); - - connection = glob_opt.spdy_connections_head; - while(NULL != connection) - { - connection_for_delete = connection; - connection = connection_for_delete->next; - glob_opt.streams_opened -= connection_for_delete->streams_opened; - DLL_remove(glob_opt.spdy_connections_head, glob_opt.spdy_connections_tail, connection_for_delete); - spdy_free_connection(connection_for_delete); - } - - free_uri(spdy2http_uri); - - deinit_parse_uri(&glob_opt.uri_preg); - - SSL_CTX_free(glob_opt.ssl_ctx); - ERR_free_strings(); - EVP_cleanup(); - - PRINT_INFO2("spdy streams: %i; http requests: %i", glob_opt.streams_opened, glob_opt.responses_pending); - //PRINT_INFO2("memory allocated %zu bytes", glob_opt.global_memory); - - print_stat(); - - return 0; -} - - -void -display_usage() -{ - printf( - "Usage: mhd2spdy [-ovs] [-b ] -p \n\n" - "OPTIONS:\n" - " -p, --port Listening port.\n" - " -b, --backend-proxy If set, he proxy will send requests to\n" - " that SPDY server or proxy. Set the address\n" - " in the form 'http://host:port'. Use 'https'\n" - " for SPDY over TLS, or 'http' for plain SPDY\n" - " communication with the backend.\n" - " -o, --only-proxy If set, the proxy will always forward the\n" - " requests to the backend proxy. If not set,\n" - " the proxy will first try to establsh SPDY\n" - " connection to the requested server. If the\n" - " server does not support SPDY and TLS, the\n" - " backend proxy will be used for the request.\n" - " -v, --verbose Print debug information.\n" - " -s, --statistics Print simple statistics on exit.\n\n" - - ); -} - - -int -main (int argc, - char *const *argv) -{ - int getopt_ret; - int option_index; - struct option long_options[] = { - {"port", required_argument, 0, 'p'}, - {"backend-proxy", required_argument, 0, 'b'}, - {"verbose", no_argument, 0, 'v'}, - {"only-proxy", no_argument, 0, 'o'}, - {"statistics", no_argument, 0, 's'}, - {0, 0, 0, 0} - }; - - while (1) - { - getopt_ret = getopt_long( argc, argv, "p:b:vos", long_options, &option_index); - if (getopt_ret == -1) - break; - - switch(getopt_ret) - { - case 'p': - glob_opt.listen_port = atoi(optarg); - break; - - case 'b': - glob_opt.spdy2http_str = strdup(optarg); - if(NULL == glob_opt.spdy2http_str) - return 1; - break; - - case 'v': - glob_opt.verbose = true; - break; - - case 'o': - glob_opt.only_proxy = true; - break; - - case 's': - glob_opt.statistics = true; - break; - - case 0: - PRINT_INFO("0 from getopt"); - break; - - case '?': - display_usage(); - return 1; - - default: - DIE("default from getopt"); - } - } - - if( - 0 == glob_opt.listen_port - || (glob_opt.only_proxy && NULL == glob_opt.spdy2http_str) - ) - { - display_usage(); - return 1; - } - - return run_everything(); -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_http.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_http.c deleted file mode 100644 index 895f07fa..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_http.c +++ /dev/null @@ -1,422 +0,0 @@ -/* - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file mhd2spdy_http.c - * @brief HTTP part of the proxy. libmicrohttpd is used for the server side. - * @author Andrey Uzunov - */ - -#include "mhd2spdy_structures.h" -#include "mhd2spdy_http.h" -#include "mhd2spdy_spdy.h" - - -void * -http_cb_log(void * cls, -const char * uri) -{ - (void)cls; - - struct HTTP_URI * http_uri; - - PRINT_INFO2("log uri '%s'\n", uri); - - //TODO not freed once in a while - if(NULL == (http_uri = au_malloc(sizeof(struct HTTP_URI )))) - return NULL; - http_uri->uri = strdup(uri); - return http_uri; -} - - -static int -http_cb_iterate(void *cls, - enum MHD_ValueKind kind, - const char *name, - const char *value) -{ - (void)kind; - - static char * const forbidden[] = {"Transfer-Encoding", - "Proxy-Connection", - "Keep-Alive", - "Connection"}; - static int forbidden_size = 4; - int i; - struct SPDY_Headers *spdy_headers = (struct SPDY_Headers *)cls; - - if(0 == strcasecmp(name, "Host")) - spdy_headers->nv[9] = (char *)value; - else - { - for(i=0; inv[spdy_headers->cnt++] = (char *)name; - spdy_headers->nv[spdy_headers->cnt++] = (char *)value; - } - - return MHD_YES; -} - - -static ssize_t -http_cb_response (void *cls, - uint64_t pos, - char *buffer, - size_t max) -{ - (void)pos; - - int ret; - struct Proxy *proxy = (struct Proxy *)cls; - void *newbody; - const union MHD_ConnectionInfo *info; - int val = 1; - - PRINT_INFO2("http_cb_response for %s", proxy->url); - - if(proxy->spdy_error) - return MHD_CONTENT_READER_END_WITH_ERROR; - - if(0 == proxy->http_body_size && (proxy->done || !proxy->spdy_active)) - { - PRINT_INFO("sent end of stream"); - return MHD_CONTENT_READER_END_OF_STREAM; - } - - if(!proxy->http_body_size)//nothing to write now - { - //flush data - info = MHD_get_connection_info (proxy->http_connection, - MHD_CONNECTION_INFO_CONNECTION_FD); - ret = setsockopt(info->connect_fd, IPPROTO_TCP, TCP_NODELAY, &val, (socklen_t)sizeof(val)); - if(ret == -1) { - DIE("setsockopt"); - } - - PRINT_INFO("FLUSH data"); - return 0; - } - - if(max >= proxy->http_body_size) - { - ret = proxy->http_body_size; - newbody = NULL; - } - else - { - ret = max; - if(NULL == (newbody = au_malloc(proxy->http_body_size - max))) - { - PRINT_INFO("no memory"); - return MHD_CONTENT_READER_END_WITH_ERROR; - } - memcpy(newbody, proxy->http_body + max, proxy->http_body_size - max); - } - memcpy(buffer, proxy->http_body, ret); - free(proxy->http_body); - proxy->http_body = newbody; - proxy->http_body_size -= ret; - - if(proxy->length >= 0) - { - proxy->length -= ret; - } - - PRINT_INFO2("response_callback, size: %i",ret); - - return ret; -} - - -static void -http_cb_response_done(void *cls) -{ - (void)cls; - //TODO remove -} - -int -http_cb_request (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, - void **ptr) -{ - (void)cls; - (void)url; - (void)upload_data; - (void)upload_data_size; - - int ret; - struct Proxy *proxy; - struct SPDY_Headers spdy_headers; - bool with_body = false; - struct HTTP_URI *http_uri; - const char *header_value; - - if (NULL == ptr || NULL == *ptr) - return MHD_NO; - - http_uri = (struct HTTP_URI *)*ptr; - - if(NULL == http_uri->proxy) - { - //first call for this request - if (0 != strcmp (method, MHD_HTTP_METHOD_GET) && 0 != strcmp (method, MHD_HTTP_METHOD_POST)) - { - free(http_uri->uri); - free(http_uri); - PRINT_INFO2("unexpected method %s", method); - return MHD_NO; - } - - if(NULL == (proxy = au_malloc(sizeof(struct Proxy)))) - { - free(http_uri->uri); - free(http_uri); - PRINT_INFO("No memory"); - return MHD_NO; - } - - ++glob_opt.responses_pending; - proxy->id = rand(); - proxy->http_active = true; - proxy->http_connection = connection; - http_uri->proxy = proxy; - return MHD_YES; - } - - proxy = http_uri->proxy; - - if(proxy->spdy_error || proxy->http_error) - return MHD_NO; // handled at different place TODO? leaks? - - if(proxy->spdy_active) - { - if(0 == strcmp (method, MHD_HTTP_METHOD_POST)) - { - PRINT_INFO("POST processing"); - - int rc= spdylay_session_resume_data(proxy->spdy_connection->session, proxy->stream_id); - PRINT_INFO2("rc is %i stream is %i", rc, proxy->stream_id); - proxy->spdy_connection->want_io |= WANT_WRITE; - - if(0 == *upload_data_size) - { - PRINT_INFO("POST http EOF"); - proxy->receiving_done = true; - return MHD_YES; - } - - if(!copy_buffer(upload_data, *upload_data_size, &proxy->received_body, &proxy->received_body_size)) - { - //TODO handle it better? - PRINT_INFO("not enough memory (malloc/realloc returned NULL)"); - return MHD_NO; - } - - *upload_data_size = 0; - - return MHD_YES; - } - - //already handled - PRINT_INFO("unnecessary call to http_cb_request"); - return MHD_YES; - } - - //second call for this request - - PRINT_INFO2("received request for '%s %s %s'", method, http_uri->uri, version); - - proxy->url = http_uri->uri; - - header_value = MHD_lookup_connection_value(connection, - MHD_HEADER_KIND, MHD_HTTP_HEADER_CONTENT_LENGTH); - - with_body = 0 == strcmp (method, MHD_HTTP_METHOD_POST) - && (NULL == header_value || 0 != strcmp ("0", header_value)); - - PRINT_INFO2("body will be sent %i", with_body); - - ret = parse_uri(&glob_opt.uri_preg, proxy->url, &proxy->uri); - if(ret != 0) - DIE("parse_uri failed"); - proxy->http_uri = http_uri; - - spdy_headers.num = MHD_get_connection_values (connection, - MHD_HEADER_KIND, - NULL, - NULL); - if(NULL == (spdy_headers.nv = au_malloc(((spdy_headers.num + 5) * 2 + 1) * sizeof(char *)))) - DIE("no memory"); - spdy_headers.nv[0] = ":method"; spdy_headers.nv[1] = method; - spdy_headers.nv[2] = ":path"; spdy_headers.nv[3] = proxy->uri->path_and_more; - spdy_headers.nv[4] = ":version"; spdy_headers.nv[5] = (char *)version; - spdy_headers.nv[6] = ":scheme"; spdy_headers.nv[7] = proxy->uri->scheme; - spdy_headers.nv[8] = ":host"; spdy_headers.nv[9] = NULL; - //nv[14] = NULL; - spdy_headers.cnt = 10; - MHD_get_connection_values (connection, - MHD_HEADER_KIND, - &http_cb_iterate, - &spdy_headers); - - spdy_headers.nv[spdy_headers.cnt] = NULL; - if(NULL == spdy_headers.nv[9]) - spdy_headers.nv[9] = proxy->uri->host_and_port; - - if(0 != spdy_request(spdy_headers.nv, proxy, with_body)) - { - free(spdy_headers.nv); - //free_proxy(proxy); - - return MHD_NO; - } - free(spdy_headers.nv); - - proxy->http_response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, - 4096, - &http_cb_response, - proxy, - &http_cb_response_done); - - if (NULL == proxy->http_response) - DIE("no response"); - - if(MHD_NO == MHD_add_response_header (proxy->http_response, - "Proxy-Connection", "keep-alive")) - PRINT_INFO("SPDY_name_value_add failed: "); - if(MHD_NO == MHD_add_response_header (proxy->http_response, - "Connection", "Keep-Alive")) - PRINT_INFO("SPDY_name_value_add failed: "); - if(MHD_NO == MHD_add_response_header (proxy->http_response, - "Keep-Alive", "timeout=5, max=100")) - PRINT_INFO("SPDY_name_value_add failed: "); - - proxy->spdy_active = true; - - return MHD_YES; -} - - -void -http_create_response(struct Proxy* proxy, - char **nv) -{ - size_t i; - - if(!proxy->http_active) - return; - - for(i = 0; nv[i]; i += 2) { - if(0 == strcmp(":status", nv[i])) - { - char tmp[4]; - memcpy(&tmp,nv[i+1],3); - tmp[3]=0; - proxy->status = atoi(tmp); - continue; - } - else if(0 == strcmp(":version", nv[i])) - { - proxy->version = nv[i+1]; - continue; - } - else if(0 == strcmp("content-length", nv[i])) - { - continue; - } - - char *header = *(nv+i); - if(MHD_NO == MHD_add_response_header (proxy->http_response, - header, nv[i+1])) - { - PRINT_INFO2("SPDY_name_value_add failed: '%s' '%s'", header, nv[i+1]); - } - PRINT_INFO2("adding '%s: %s'",header, nv[i+1]); - } - - if(MHD_NO == MHD_queue_response (proxy->http_connection, proxy->status, proxy->http_response)){ - PRINT_INFO("No queue"); - //TODO - //abort(); - proxy->http_error = true; - } - - MHD_destroy_response (proxy->http_response); - proxy->http_response = NULL; -} - -void -http_cb_request_completed (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - (void)cls; - (void)connection; - struct HTTP_URI *http_uri; - struct Proxy *proxy; - - http_uri = (struct HTTP_URI *)*con_cls; - if(NULL == http_uri) - return; - proxy = (struct Proxy *)http_uri->proxy; - assert(NULL != proxy); - - PRINT_INFO2("http_cb_request_completed %i for %s; id %i",toe, http_uri->uri, proxy->id); - - if(NULL != proxy->http_response) - { - MHD_destroy_response (proxy->http_response); - proxy->http_response = NULL; - } - - if(proxy->spdy_active) - { - proxy->http_active = false; - if(MHD_REQUEST_TERMINATED_COMPLETED_OK != toe) - { - proxy->http_error = true; - if(proxy->stream_id > 0 /*&& NULL != proxy->spdy_connection->session*/) - { - //send RST_STREAM_STATUS_CANCEL - PRINT_INFO2("send rst_stream %i %i",proxy->spdy_active, proxy->stream_id ); - spdylay_submit_rst_stream(proxy->spdy_connection->session, proxy->stream_id, 5); - } - /*else - { - DLL_remove(proxy->spdy_connection->proxies_head, proxy->spdy_connection->proxies_tail, proxy); - free_proxy(proxy); - }*/ - } - } - else - { - PRINT_INFO2("proxy free http id %i ", proxy->id); - free_proxy(proxy); - } - - --glob_opt.responses_pending; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_http.h b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_http.h deleted file mode 100644 index 89d38897..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_http.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file mhd2spdy_http.h - * @brief HTTP part of the proxy. libmicrohttpd is used for the server side. - * @author Andrey Uzunov - */ - -#ifndef HTTP_H -#define HTTP_H - -#include "mhd2spdy_structures.h" - - -int -http_cb_request (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, - void **ptr); - - -void * http_cb_log(void * cls, const char * uri); - - -void -http_create_response(struct Proxy* proxy, char **nv); - - -void -http_cb_request_completed (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_spdy.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_spdy.c deleted file mode 100644 index 95ec43c8..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_spdy.c +++ /dev/null @@ -1,1150 +0,0 @@ -/* - * - * Copyright (c) 2012 Tatsuhiro Tsujikawa - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/** - * @file mhd2spdy_spdy.c - * @brief SPDY part of the proxy. libspdylay is used for the client side. - * The example spdycli.c from spdylay was used as basis; - * however, multiple changes were made. - * @author Tatsuhiro Tsujikawa - * @author Andrey Uzunov - */ - -#include "mhd2spdy_structures.h" -#include "mhd2spdy_spdy.h" -#include "mhd2spdy_http.h" - - -/* - * Prints error containing the function name |func| and message |msg| - * and exit. - */ -static void -spdy_dief(const char *func, - const char *msg) -{ - fprintf(stderr, "FATAL: %s: %s\n", func, msg); - exit(EXIT_FAILURE); -} - - -/* - * Prints error containing the function name |func| and error code - * |error_code| and exit. - */ -void -spdy_diec(const char *func, - int error_code) -{ - fprintf(stderr, "FATAL: %s: error_code=%d, msg=%s\n", func, error_code, - spdylay_strerror(error_code)); - exit(EXIT_FAILURE); -} - - -static ssize_t -spdy_cb_data_source_read(spdylay_session *session, int32_t stream_id, uint8_t *buf, size_t length, int *eof, spdylay_data_source *source, void *user_data) -{ - (void)session; - (void)stream_id; - (void)user_data; - - ssize_t ret; - assert(NULL != source); - assert(NULL != source->ptr); - struct Proxy *proxy = (struct Proxy *)(source->ptr); - void *newbody; - - - if(length < 1) - { - PRINT_INFO("spdy_cb_data_source_read: length is 0"); - return 0; - } - - if(!proxy->received_body_size)//nothing to write now - { - if(proxy->receiving_done) - { - PRINT_INFO("POST spdy EOF"); - *eof = 1; - } - PRINT_INFO("POST SPDYLAY_ERR_DEFERRED"); - return SPDYLAY_ERR_DEFERRED;//TODO SPDYLAY_ERR_DEFERRED should be used - } - - if(length >= proxy->received_body_size) - { - ret = proxy->received_body_size; - newbody = NULL; - } - else - { - ret = length; - if(NULL == (newbody = malloc(proxy->received_body_size - length))) - { - PRINT_INFO("no memory"); - return SPDYLAY_ERR_TEMPORAL_CALLBACK_FAILURE; - } - memcpy(newbody, proxy->received_body + length, proxy->received_body_size - length); - } - memcpy(buf, proxy->received_body, ret); - free(proxy->received_body); - proxy->received_body = newbody; - proxy->received_body_size -= ret; - - if(0 == proxy->received_body_size && proxy->receiving_done) - { - PRINT_INFO("POST spdy EOF"); - *eof = 1; - } - - PRINT_INFO2("given POST bytes to spdylay: %zd", ret); - - return ret; -} - - -/* - * The implementation of spdylay_send_callback type. Here we write - * |data| with size |length| to the network and return the number of - * bytes actually written. See the documentation of - * spdylay_send_callback for the details. - */ -static ssize_t -spdy_cb_send(spdylay_session *session, - const uint8_t *data, - size_t length, - int flags, - void *user_data) -{ - (void)session; - (void)flags; - - //PRINT_INFO("spdy_cb_send called"); - struct SPDY_Connection *connection; - ssize_t rv; - connection = (struct SPDY_Connection*)user_data; - connection->want_io = IO_NONE; - - if(glob_opt.ignore_rst_stream - && 16 == length - && 0x80 == data[0] - && 0x00 == data[2] - && 0x03 == data[3] - ) - { - PRINT_INFO2("ignoring RST_STREAM for stream_id %i %i %i %i", data[8], data[9], data[10], data[11]); - glob_opt.ignore_rst_stream = false; - return 16; - } - glob_opt.ignore_rst_stream = false; - - if(connection->is_tls) - { - ERR_clear_error(); - rv = SSL_write(connection->ssl, data, length); - if(rv < 0) { - int err = SSL_get_error(connection->ssl, rv); - if(err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) { - connection->want_io |= (err == SSL_ERROR_WANT_READ ? - WANT_READ : WANT_WRITE); - rv = SPDYLAY_ERR_WOULDBLOCK; - } else { - rv = SPDYLAY_ERR_CALLBACK_FAILURE; - } - } - } - else - { - rv = write(connection->fd, - data, - length); - - if (rv < 0) - { - switch(errno) - { - case EAGAIN: - #if EAGAIN != EWOULDBLOCK - case EWOULDBLOCK: - #endif - connection->want_io |= WANT_WRITE; - rv = SPDYLAY_ERR_WOULDBLOCK; - break; - - default: - rv = SPDYLAY_ERR_CALLBACK_FAILURE; - } - } - } - - PRINT_INFO2("%zd bytes written by spdy", rv); - - if(rv > 0) - UPDATE_STAT(glob_stat.spdy_bytes_sent, rv); - - return rv; -} - - -/* - * The implementation of spdylay_recv_callback type. Here we read data - * from the network and write them in |buf|. The capacity of |buf| is - * |length| bytes. Returns the number of bytes stored in |buf|. See - * the documentation of spdylay_recv_callback for the details. - */ -static ssize_t -spdy_cb_recv(spdylay_session *session, - uint8_t *buf, - size_t length, - int flags, - void *user_data) -{ - (void)session; - (void)flags; - - struct SPDY_Connection *connection; - ssize_t rv; - - connection = (struct SPDY_Connection*)user_data; - //prevent monopolizing everything - if(!(++connection->counter % 10)) return SPDYLAY_ERR_WOULDBLOCK; - connection->want_io = IO_NONE; - if(connection->is_tls) - { - ERR_clear_error(); - rv = SSL_read(connection->ssl, buf, length); - if(rv < 0) { - int err = SSL_get_error(connection->ssl, rv); - if(err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) { - connection->want_io |= (err == SSL_ERROR_WANT_READ ? - WANT_READ : WANT_WRITE); - rv = SPDYLAY_ERR_WOULDBLOCK; - } else { - rv = SPDYLAY_ERR_CALLBACK_FAILURE; - } - } else if(rv == 0) { - rv = SPDYLAY_ERR_EOF; - } - } - else - { - rv = read(connection->fd, - buf, - length); - - if (rv < 0) - { - switch(errno) - { - case EAGAIN: - #if EAGAIN != EWOULDBLOCK - case EWOULDBLOCK: - #endif - connection->want_io |= WANT_READ; - rv = SPDYLAY_ERR_WOULDBLOCK; - break; - - default: - rv = SPDYLAY_ERR_CALLBACK_FAILURE; - } - } - else if(rv == 0) - rv = SPDYLAY_ERR_EOF; - } - - if(rv > 0) - UPDATE_STAT(glob_stat.spdy_bytes_received, rv); - - return rv; -} - - -static void -spdy_cb_before_ctrl_send(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, - void *user_data) -{ - (void)user_data; - - int32_t stream_id; - struct Proxy *proxy; - - switch(type) { - case SPDYLAY_SYN_STREAM: - stream_id = frame->syn_stream.stream_id; - proxy = spdylay_session_get_stream_user_data(session, stream_id); - proxy->stream_id = stream_id; - ++glob_opt.streams_opened; - ++proxy->spdy_connection->streams_opened; - PRINT_INFO2("opening stream: str open %i; %s", glob_opt.streams_opened, proxy->url); - break; - case SPDYLAY_RST_STREAM: - //try to ignore duplicate RST_STREAMs - //TODO this will ignore RST_STREAMs also for bogus data - glob_opt.ignore_rst_stream = NULL==spdylay_session_get_stream_user_data(session, frame->rst_stream.stream_id); - PRINT_INFO2("sending RST_STREAM for %i; ignore %i; status %i", - frame->rst_stream.stream_id, - glob_opt.ignore_rst_stream, - frame->rst_stream.status_code); - break; - default: - break; - } -} - - -void -spdy_cb_on_ctrl_recv(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, - void *user_data) -{ - (void)user_data; - - char **nv; - int32_t stream_id; - struct Proxy * proxy; - - switch(type) { - case SPDYLAY_SYN_REPLY: - nv = frame->syn_reply.nv; - stream_id = frame->syn_reply.stream_id; - break; - case SPDYLAY_RST_STREAM: - stream_id = frame->rst_stream.stream_id; - break; - case SPDYLAY_HEADERS: - nv = frame->headers.nv; - stream_id = frame->headers.stream_id; - break; - default: - return; - break; - } - - proxy = spdylay_session_get_stream_user_data(session, stream_id); - if(NULL == proxy) - { - PRINT_INFO2("received frame type %i for unkonwn stream id %i", type, stream_id); - return; - //DIE("no proxy obj"); - } - - switch(type) { - case SPDYLAY_SYN_REPLY: - PRINT_INFO2("received headers for %s", proxy->url); - http_create_response(proxy, nv); - break; - case SPDYLAY_RST_STREAM: - PRINT_INFO2("received reset stream for %s", proxy->url); - proxy->spdy_error = true; - break; - case SPDYLAY_HEADERS: - PRINT_INFO2("received headers for %s", proxy->url); - http_create_response(proxy, nv); - break; - default: - return; - break; - } - - glob_opt.spdy_data_received = true; -} - - -/* - * The implementation of spdylay_on_stream_close_callback type. We use - * this function to know the response is fully received. Since we just - * fetch 1 resource in this program, after reception of the response, - * we submit GOAWAY and close the session. - */ -static void -spdy_cb_on_stream_close(spdylay_session *session, - int32_t stream_id, - spdylay_status_code status_code, - void *user_data) -{ - (void)status_code; - (void)user_data; - - struct Proxy * proxy = spdylay_session_get_stream_user_data(session, stream_id); - - assert(NULL != proxy); - - --glob_opt.streams_opened; - --proxy->spdy_connection->streams_opened; - PRINT_INFO2("closing stream: str opened %i; remove proxy %i", glob_opt.streams_opened, proxy->id); - - DLL_remove(proxy->spdy_connection->proxies_head, proxy->spdy_connection->proxies_tail, proxy); - if(proxy->http_active) - { - proxy->spdy_active = false; - } - else - { - free_proxy(proxy); - } -} - - -/* - * The implementation of spdylay_on_data_chunk_recv_callback type. We - * use this function to print the received response body. - */ -static void -spdy_cb_on_data_chunk_recv(spdylay_session *session, - uint8_t flags, - int32_t stream_id, - const uint8_t *data, - size_t len, - void *user_data) -{ - (void)flags; - (void)user_data; - - struct Proxy *proxy; - proxy = spdylay_session_get_stream_user_data(session, stream_id); - - if(NULL == proxy) - { - PRINT_INFO("proxy in spdy_cb_on_data_chunk_recv is NULL)"); - return; - } - - if(!copy_buffer(data, len, &proxy->http_body, &proxy->http_body_size)) - { - //TODO handle it better? - PRINT_INFO("not enough memory (malloc/realloc returned NULL)"); - return; - } - /* - if(NULL == proxy->http_body) - proxy->http_body = au_malloc(len); - else - proxy->http_body = realloc(proxy->http_body, proxy->http_body_size + len); - if(NULL == proxy->http_body) - { - PRINT_INFO("not enough memory (realloc returned NULL)"); - return ; - } - - memcpy(proxy->http_body + proxy->http_body_size, data, len); - proxy->http_body_size += len; - */ - PRINT_INFO2("received data for %s; %zu bytes", proxy->url, len); - glob_opt.spdy_data_received = true; -} - - -static void -spdy_cb_on_data_recv(spdylay_session *session, - uint8_t flags, - int32_t stream_id, - int32_t length, - void *user_data) -{ - (void)length; - (void)user_data; - - if(flags & SPDYLAY_DATA_FLAG_FIN) - { - struct Proxy *proxy; - proxy = spdylay_session_get_stream_user_data(session, stream_id); - proxy->done = true; - PRINT_INFO2("last data frame received for %s", proxy->url); - } -} - - -/* - * Setup callback functions. Spdylay API offers many callback - * functions, but most of them are optional. The send_callback is - * always required. Since we use spdylay_session_recv(), the - * recv_callback is also required. - */ -static void -spdy_setup_spdylay_callbacks(spdylay_session_callbacks *callbacks) -{ - memset(callbacks, 0, sizeof(spdylay_session_callbacks)); - callbacks->send_callback = spdy_cb_send; - callbacks->recv_callback = spdy_cb_recv; - callbacks->before_ctrl_send_callback = spdy_cb_before_ctrl_send; - callbacks->on_ctrl_recv_callback = spdy_cb_on_ctrl_recv; - callbacks->on_stream_close_callback = spdy_cb_on_stream_close; - callbacks->on_data_chunk_recv_callback = spdy_cb_on_data_chunk_recv; - callbacks->on_data_recv_callback = spdy_cb_on_data_recv; -} - - -/* - * Callback function for SSL/TLS NPN. Since this program only supports - * SPDY protocol, if server does not offer SPDY protocol the Spdylay - * library supports, we terminate program. - */ -static int -spdy_cb_ssl_select_next_proto(SSL* ssl, - unsigned char **out, - unsigned char *outlen, - const unsigned char *in, - unsigned int inlen, - void *arg) -{ - (void)ssl; - - int rv; - uint16_t *spdy_proto_version; - - /* spdylay_select_next_protocol() selects SPDY protocol version the - Spdylay library supports. */ - rv = spdylay_select_next_protocol(out, outlen, in, inlen); - if(rv <= 0) { - PRINT_INFO("Server did not advertise spdy/2 or spdy/3 protocol."); - return rv; - } - spdy_proto_version = (uint16_t*)arg; - *spdy_proto_version = rv; - return SSL_TLSEXT_ERR_OK; -} - - -/* - * Setup SSL context. We pass |spdy_proto_version| to get negotiated - * SPDY protocol version in NPN callback. - */ -void -spdy_ssl_init_ssl_ctx(SSL_CTX *ssl_ctx, - uint16_t *spdy_proto_version) -{ - /* Disable SSLv2 and enable all workarounds for buggy servers */ - SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL|SSL_OP_NO_SSLv2 | SSL_OP_NO_COMPRESSION); - SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY); - SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS); - /* Set NPN callback */ - SSL_CTX_set_next_proto_select_cb(ssl_ctx, spdy_cb_ssl_select_next_proto, - spdy_proto_version); -} - - -static int -spdy_ssl_handshake(SSL *ssl, - int fd) -{ - int rv; - - if(SSL_set_fd(ssl, fd) == 0) - spdy_dief("SSL_set_fd", ERR_error_string(ERR_get_error(), NULL)); - - ERR_clear_error(); - rv = SSL_connect(ssl); - if(rv <= 0) - PRINT_INFO2("SSL_connect %s", ERR_error_string(ERR_get_error(), NULL)); - - return rv; -} - - -/* - * Connects to the host |host| and port |port|. This function returns - * the file descriptor of the client socket. - */ -static int -spdy_socket_connect_to(const char *host, - uint16_t port) -{ - struct addrinfo hints; - int fd = -1; - int rv; - char service[NI_MAXSERV]; - struct addrinfo *res, *rp; - - //TODO checks - snprintf(service, sizeof(service), "%u", port); - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - rv = getaddrinfo(host, service, &hints, &res); - if(rv != 0) - { - printf("%s\n",host); - spdy_dief("getaddrinfo", gai_strerror(rv)); - } - for(rp = res; rp; rp = rp->ai_next) - { - fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); - if(fd == -1) - continue; - while((rv = connect(fd, rp->ai_addr, rp->ai_addrlen)) == -1 && - errno == EINTR); - if(rv == 0) - break; - close(fd); - fd = -1; - } - freeaddrinfo(res); - - return fd; -} - - -static void -spdy_socket_make_non_block(int fd) -{ - int flags; - int rv; - - while((flags = fcntl(fd, F_GETFL, 0)) == -1 && errno == EINTR); - - if(flags == -1) - spdy_dief("fcntl", strerror(errno)); - - while((rv = fcntl(fd, F_SETFL, flags | O_NONBLOCK)) == -1 && errno == EINTR); - - if(rv == -1) - spdy_dief("fcntl", strerror(errno)); -} - - -/* - * Setting TCP_NODELAY is not mandatory for the SPDY protocol. - */ -static void -spdy_socket_set_tcp_nodelay(int fd) -{ - int val = 1; - int rv; - - rv = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, (socklen_t)sizeof(val)); - if(rv == -1) - spdy_dief("setsockopt", strerror(errno)); -} - -/* - * Update |pollfd| based on the state of |connection|. - */ - /* -void -spdy_ctl_poll(struct pollfd *pollfd, - struct SPDY_Connection *connection) -{ - pollfd->events = 0; - if(spdylay_session_want_read(connection->session) || - connection->want_io & WANT_READ) - { - pollfd->events |= POLLIN; - } - if(spdylay_session_want_write(connection->session) || - connection->want_io & WANT_WRITE) - { - pollfd->events |= POLLOUT; - } -}*/ - - -/* - * Update |selectfd| based on the state of |connection|. - */ -bool -spdy_ctl_select(fd_set * read_fd_set, - fd_set * write_fd_set, - fd_set * except_fd_set, - struct SPDY_Connection *connection) -{ - (void)except_fd_set; - - bool ret = false; - - if(spdylay_session_want_read(connection->session) || - connection->want_io & WANT_READ) - { - FD_SET(connection->fd, read_fd_set); - ret = true; - } - if(spdylay_session_want_write(connection->session) || - connection->want_io & WANT_WRITE) - { - FD_SET(connection->fd, write_fd_set); - ret = true; - } - - return ret; -} - - -/* - * Performs the network I/O. - */ -int -spdy_exec_io(struct SPDY_Connection *connection) -{ - int rv; - - rv = spdylay_session_recv(connection->session); - if(rv != 0) - { - PRINT_INFO2("spdylay_session_recv %i", rv); - return rv; - } - rv = spdylay_session_send(connection->session); - if(rv != 0) - PRINT_INFO2("spdylay_session_send %i", rv); - - return rv; -} - - -/* - * Fetches the resource denoted by |uri|. - */ -struct SPDY_Connection * -spdy_connect(const struct URI *uri, - uint16_t port, - bool is_tls) -{ - spdylay_session_callbacks callbacks; - int fd; - SSL *ssl=NULL; - struct SPDY_Connection * connection = NULL; - int rv; - - spdy_setup_spdylay_callbacks(&callbacks); - - /* Establish connection and setup SSL */ - PRINT_INFO2("connecting to %s:%i", uri->host, port); - fd = spdy_socket_connect_to(uri->host, port); - if(fd == -1) - { - PRINT_INFO("Could not open file descriptor"); - return NULL; - } - - if(is_tls) - { - ssl = SSL_new(glob_opt.ssl_ctx); - if(ssl == NULL) { - spdy_dief("SSL_new", ERR_error_string(ERR_get_error(), NULL)); - } - - //TODO non-blocking - /* To simplify the program, we perform SSL/TLS handshake in blocking - I/O. */ - glob_opt.spdy_proto_version = 0; - rv = spdy_ssl_handshake(ssl, fd); - if(rv <= 0 || (glob_opt.spdy_proto_version != 3 && glob_opt.spdy_proto_version != 2)) - { - PRINT_INFO("Closing SSL"); - //no spdy on the other side - goto free_and_fail; - } - } - else - { - glob_opt.spdy_proto_version = 3; - } - - if(NULL == (connection = au_malloc(sizeof(struct SPDY_Connection)))) - goto free_and_fail; - - connection->is_tls = is_tls; - connection->ssl = ssl; - connection->want_io = IO_NONE; - if(NULL == (connection->host = strdup(uri->host))) - goto free_and_fail; - - /* Here make file descriptor non-block */ - spdy_socket_make_non_block(fd); - spdy_socket_set_tcp_nodelay(fd); - - PRINT_INFO2("[INFO] SPDY protocol version = %d\n", glob_opt.spdy_proto_version); - rv = spdylay_session_client_new(&(connection->session), glob_opt.spdy_proto_version, - &callbacks, connection); - if(rv != 0) { - spdy_diec("spdylay_session_client_new", rv); - } - - connection->fd = fd; - - return connection; - - //for GOTO - free_and_fail: - if(NULL != connection) - { - free(connection->host); - free(connection); - } - - if(is_tls) - SSL_shutdown(ssl); - - close(fd); - - if(is_tls) - SSL_free(ssl); - - return NULL; -} - - -void -spdy_free_connection(struct SPDY_Connection * connection) -{ - struct Proxy *proxy; - struct Proxy *proxy_next; - - if(NULL != connection) - { - for(proxy = connection->proxies_head; NULL != proxy; proxy=proxy_next) - { - proxy_next = proxy->next; - DLL_remove(connection->proxies_head, connection->proxies_tail, proxy); - proxy->spdy_active = false; - proxy->spdy_error = true; - PRINT_INFO2("spdy_free_connection for id %i", proxy->id); - if(!proxy->http_active) - { - free_proxy(proxy); - } - } - spdylay_session_del(connection->session); - SSL_free(connection->ssl); - free(connection->host); - free(connection); - //connection->session = NULL; - } -} - - -int -spdy_request(const char **nv, - struct Proxy *proxy, - bool with_body) -{ - int ret; - uint16_t port; - struct SPDY_Connection *connection; - spdylay_data_provider post_data; - - if(glob_opt.only_proxy) - { - connection = glob_opt.spdy_connection; - } - else - { - connection = glob_opt.spdy_connections_head; - while(NULL != connection) - { - if(0 == strcasecmp(proxy->uri->host, connection->host)) - break; - connection = connection->next; - } - - if(NULL == connection) - { - //connect to host - port = proxy->uri->port; - if(0 == port) port = 443; - connection = spdy_connect(proxy->uri, port, true); - if(NULL != connection) - { - DLL_insert(glob_opt.spdy_connections_head, glob_opt.spdy_connections_tail, connection); - glob_opt.total_spdy_connections++; - } - else - connection = glob_opt.spdy_connection; - } - } - - if(NULL == connection) - { - PRINT_INFO("there is no proxy!"); - return -1; - } - - proxy->spdy_connection = connection; - if(with_body) - { - post_data.source.ptr = proxy; - post_data.read_callback = &spdy_cb_data_source_read; - ret = spdylay_submit_request(connection->session, 0, nv, &post_data, proxy); - } - else - ret = spdylay_submit_request(connection->session, 0, nv, NULL, proxy); - - if(ret != 0) { - spdy_diec("spdylay_spdy_submit_request", ret); - } - PRINT_INFO2("adding proxy %i", proxy->id); - if(NULL != connection->proxies_head) - PRINT_INFO2("before proxy %i", connection->proxies_head->id); - DLL_insert(connection->proxies_head, connection->proxies_tail, proxy); - - return ret; -} - -/* -void -spdy_get_pollfdset(struct pollfd fds[], - struct SPDY_Connection *connections[], - unsigned int max_size, - nfds_t *real_size) -{ - struct SPDY_Connection *connection; - struct Proxy *proxy; - - *real_size = 0; - if(max_size<1) - return; - - if(NULL != glob_opt.spdy_connection) - { - spdy_ctl_poll(&(fds[*real_size]), glob_opt.spdy_connection); - if(!fds[*real_size].events) - { - //PRINT_INFO("TODO drop connection"); - glob_opt.streams_opened -= glob_opt.spdy_connection->streams_opened; - - for(proxy = glob_opt.spdy_connection->proxies_head; NULL != proxy; proxy=proxy->next) - { - abort(); - DLL_remove(glob_opt.spdy_connection->proxies_head, glob_opt.spdy_connection->proxies_tail, proxy); - proxy->spdy_active = false; - } - spdy_free_connection(glob_opt.spdy_connection); - glob_opt.spdy_connection = NULL; - } - else - { - fds[*real_size].fd = glob_opt.spdy_connection->fd; - connections[*real_size] = glob_opt.spdy_connection; - ++(*real_size); - } - } - - connection = glob_opt.spdy_connections_head; - - while(NULL != connection && *real_size < max_size) - { - assert(!glob_opt.only_proxy); - spdy_ctl_poll(&(fds[*real_size]), connection); - if(!fds[*real_size].events) - { - //PRINT_INFO("TODO drop connection"); - glob_opt.streams_opened -= connection->streams_opened; - DLL_remove(glob_opt.spdy_connections_head, glob_opt.spdy_connections_tail, connection); - glob_opt.total_spdy_connections--; - - for(proxy = connection->proxies_head; NULL != proxy; proxy=proxy->next) - { - abort(); - DLL_remove(connection->proxies_head, connection->proxies_tail, proxy); - proxy->spdy_active = false; - } - spdy_free_connection(connection); - } - else - { - fds[*real_size].fd = connection->fd; - connections[*real_size] = connection; - ++(*real_size); - } - connection = connection->next; - } - - //, "TODO max num of conn reached; close something" - assert(NULL == connection); -} -*/ - -int -spdy_get_selectfdset(fd_set * read_fd_set, - fd_set * write_fd_set, - fd_set * except_fd_set, - struct SPDY_Connection *connections[], - unsigned int max_size, - nfds_t *real_size) -{ - struct SPDY_Connection *connection; - struct SPDY_Connection *next_connection; - bool ret; - int maxfd = 0; - - *real_size = 0; - if(max_size<1) - return 0; - - if(NULL != glob_opt.spdy_connection) - { - ret = spdy_ctl_select(read_fd_set, - write_fd_set, - except_fd_set, glob_opt.spdy_connection); - if(!ret) - { - glob_opt.streams_opened -= glob_opt.spdy_connection->streams_opened; - - PRINT_INFO("spdy_free_connection in spdy_get_selectfdset"); - spdy_free_connection(glob_opt.spdy_connection); - glob_opt.spdy_connection = NULL; - } - else - { - connections[*real_size] = glob_opt.spdy_connection; - ++(*real_size); - if(maxfd < glob_opt.spdy_connection->fd) maxfd = glob_opt.spdy_connection->fd; - } - } - - connection = glob_opt.spdy_connections_head; - - while(NULL != connection && *real_size < max_size) - { - assert(!glob_opt.only_proxy); - ret = spdy_ctl_select(read_fd_set, - write_fd_set, - except_fd_set, connection); - - next_connection = connection->next; - if(!ret) - { - glob_opt.streams_opened -= connection->streams_opened; - DLL_remove(glob_opt.spdy_connections_head, glob_opt.spdy_connections_tail, connection); - glob_opt.total_spdy_connections--; - - PRINT_INFO("spdy_free_connection in spdy_get_selectfdset"); - spdy_free_connection(connection); - } - else - { - connections[*real_size] = connection; - ++(*real_size); - if(maxfd < connection->fd) maxfd = connection->fd; - } - connection = next_connection; - } - - //, "TODO max num of conn reached; close something" - assert(NULL == connection); - - return maxfd; -} - -/* -void -spdy_run(struct pollfd fds[], - struct SPDY_Connection *connections[], - int size) -{ - int i; - int ret; - struct Proxy *proxy; - - for(i=0; ihost); - if(fds[i].revents & (POLLIN | POLLOUT)) - { - ret = spdy_exec_io(connections[i]); - //PRINT_INFO2("%i",ret); - //if((spdy_pollfds[i].revents & POLLHUP) || (spdy_pollfds[0].revents & POLLERR)) - // PRINT_INFO("SPDY SPDY_Connection error"); - - //TODO POLLRDHUP - // always close on ret != 0? - - if(0 != ret) - { - glob_opt.streams_opened -= connections[i]->streams_opened; - if(connections[i] == glob_opt.spdy_connection) - { - glob_opt.spdy_connection = NULL; - } - else - { - DLL_remove(glob_opt.spdy_connections_head, glob_opt.spdy_connections_tail, connections[i]); - glob_opt.total_spdy_connections--; - } - for(proxy = connections[i]->proxies_head; NULL != proxy; proxy=proxy->next) - { - abort(); - DLL_remove(connections[i]->proxies_head, connections[i]->proxies_tail, proxy); - proxy->spdy_active = false; - proxy->spdy_error = true; - PRINT_INFO2("spdy_free_connection for id %i", proxy->id); - } - PRINT_INFO("spdy_free_connection in loop"); - spdy_free_connection(connections[i]); - } - } - else - PRINT_INFO("not called"); - } -} -*/ - -void -spdy_run_select(fd_set * read_fd_set, - fd_set * write_fd_set, - fd_set * except_fd_set, - struct SPDY_Connection *connections[], - int size) -{ - int i; - int ret; - - for(i=0; ihost); - if(FD_ISSET(connections[i]->fd, read_fd_set) || FD_ISSET(connections[i]->fd, write_fd_set) || FD_ISSET(connections[i]->fd, except_fd_set)) - { - //raise(SIGINT); - ret = spdy_exec_io(connections[i]); - - if(0 != ret) - { - glob_opt.streams_opened -= connections[i]->streams_opened; - if(connections[i] == glob_opt.spdy_connection) - { - glob_opt.spdy_connection = NULL; - } - else - { - DLL_remove(glob_opt.spdy_connections_head, glob_opt.spdy_connections_tail, connections[i]); - glob_opt.total_spdy_connections--; - } - PRINT_INFO("in spdy_run_select"); - spdy_free_connection(connections[i]); - } - } - else - { - PRINT_INFO("not called"); - //PRINT_INFO2("connection->want_io %i",connections[i]->want_io); - //PRINT_INFO2("read %i",spdylay_session_want_read(connections[i]->session)); - //PRINT_INFO2("write %i",spdylay_session_want_write(connections[i]->session)); - //raise(SIGINT); - } - } -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_spdy.h b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_spdy.h deleted file mode 100644 index 4207c622..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_spdy.h +++ /dev/null @@ -1,102 +0,0 @@ -/* - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file mhd2spdy_spdy.h - * @brief SPDY part of the proxy. libspdylay is used for the client side. - * @author Andrey Uzunov - */ - -#ifndef SPDY_H -#define SPDY_H - -#include "mhd2spdy_structures.h" - - -struct SPDY_Connection * -spdy_connect(const struct URI *uri, - uint16_t port, - bool is_tls); - - -void -spdy_ctl_poll(struct pollfd *pollfd, - struct SPDY_Connection *connection); - - -bool -spdy_ctl_select(fd_set * read_fd_set, - fd_set * write_fd_set, - fd_set * except_fd_set, - struct SPDY_Connection *connection); - - -int -spdy_exec_io(struct SPDY_Connection *connection); - - -void -spdy_diec(const char *func, - int error_code); - - -int -spdy_request(const char **nv, - struct Proxy *proxy, - bool with_body); - - -void -spdy_ssl_init_ssl_ctx(SSL_CTX *ssl_ctx, - uint16_t *spdy_proto_version); - - -void -spdy_free_connection(struct SPDY_Connection * connection); - - -void -spdy_get_pollfdset(struct pollfd fds[], - struct SPDY_Connection *connections[], - unsigned int max_size, - nfds_t *real_size); - - -int -spdy_get_selectfdset(fd_set * read_fd_set, - fd_set * write_fd_set, - fd_set * except_fd_set, - struct SPDY_Connection *connections[], - unsigned int max_size, - nfds_t *real_size); - - -void -spdy_run(struct pollfd fds[], - struct SPDY_Connection *connections[], - int size); - - -void -spdy_run_select(fd_set * read_fd_set, - fd_set * write_fd_set, - fd_set * except_fd_set, - struct SPDY_Connection *connections[], - int size); - - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_structures.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_structures.c deleted file mode 100644 index 6d4a4076..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_structures.c +++ /dev/null @@ -1,162 +0,0 @@ -/* - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file mhd2spdy_structures.h - * @brief Common functions, macros. - * @author Andrey Uzunov - */ - -#include "mhd2spdy_structures.h" - - -void -free_uri(struct URI * uri) -{ - if(NULL != uri) - { - free(uri->full_uri); - free(uri->scheme); - free(uri->host_and_port); - free(uri->host); - free(uri->path); - free(uri->path_and_more); - free(uri->query); - free(uri->fragment); - uri->port = 0; - free(uri); - } -} - - -int -init_parse_uri(regex_t * preg) -{ - // RFC 2396 - // ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))? - /* - scheme = $2 - authority = $4 - path = $5 - query = $7 - fragment = $9 - */ - - return regcomp(preg, "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?", REG_EXTENDED); -} - -void -deinit_parse_uri(regex_t * preg) -{ - regfree(preg); -} - -int -parse_uri(regex_t * preg, - char * full_uri, - struct URI ** uri) -{ - int ret; - char *colon; - long long port; - size_t nmatch = 10; - regmatch_t pmatch[10]; - - if (0 != (ret = regexec(preg, full_uri, nmatch, pmatch, 0))) - return ret; - - *uri = au_malloc(sizeof(struct URI)); - if(NULL == *uri) - return -200; - - (*uri)->full_uri = strdup(full_uri); - - asprintf(&((*uri)->scheme), "%.*s",pmatch[2].rm_eo - pmatch[2].rm_so, &full_uri[pmatch[2].rm_so]); - asprintf(&((*uri)->host_and_port), "%.*s",pmatch[4].rm_eo - pmatch[4].rm_so, &full_uri[pmatch[4].rm_so]); - asprintf(&((*uri)->path), "%.*s",pmatch[5].rm_eo - pmatch[5].rm_so, &full_uri[pmatch[5].rm_so]); - asprintf(&((*uri)->path_and_more), "%.*s",pmatch[9].rm_eo - pmatch[5].rm_so, &full_uri[pmatch[5].rm_so]); - asprintf(&((*uri)->query), "%.*s",pmatch[7].rm_eo - pmatch[7].rm_so, &full_uri[pmatch[7].rm_so]); - asprintf(&((*uri)->fragment), "%.*s",pmatch[9].rm_eo - pmatch[9].rm_so, &full_uri[pmatch[9].rm_so]); - - colon = strrchr((*uri)->host_and_port, ':'); - if(NULL == colon) - { - (*uri)->host = strdup((*uri)->host_and_port); - (*uri)->port = 0; - - return 0; - } - - port = atoi(colon + 1); - if(port<1 || port >= 256 * 256) - { - free_uri(*uri); - return -100; - } - (*uri)->port = port; - asprintf(&((*uri)->host), "%.*s", (int)(colon - (*uri)->host_and_port), (*uri)->host_and_port); - - return 0; -} - - -void -free_proxy(struct Proxy *proxy) -{ - PRINT_INFO2("free proxy called for '%s'", proxy->url); - if(NULL != proxy->http_body && proxy->http_body_size > 0) - UPDATE_STAT(glob_stat.spdy_bytes_received_and_dropped, proxy->http_body_size); - free(proxy->http_body); - free_uri(proxy->uri); - free(proxy->url); - free(proxy->http_uri); - free(proxy); -} - - -void *au_malloc(size_t size) -{ - void *new_memory; - - new_memory = malloc(size); - if(NULL != new_memory) - { - glob_opt.global_memory += size; - memset(new_memory, 0, size); - } - return new_memory; -} - - -bool -copy_buffer(const void *src, size_t src_size, void **dst, size_t *dst_size) -{ - if(0 == src_size) - return true; - - if(NULL == *dst) - *dst = malloc(src_size); - else - *dst = realloc(*dst, src_size + *dst_size); - if(NULL == *dst) - return false; - - memcpy(*dst + *dst_size, src, src_size); - *dst_size += src_size; - - return true; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_structures.h b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_structures.h deleted file mode 100644 index f5679341..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/mhd2spdy_structures.h +++ /dev/null @@ -1,296 +0,0 @@ -/* - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file mhd2spdy_structures.h - * @brief Common structures, functions, macros and global variables. - * @author Andrey Uzunov - */ -#ifndef STRUCTURES_H -#define STRUCTURES_H - -#define _GNU_SOURCE - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -/* WANT_READ if SSL connection needs more input; or WANT_WRITE if it - needs more output; or IO_NONE. This is necessary because SSL/TLS - re-negotiation is possible at any time. Spdylay API offers - similar functions like spdylay_session_want_read() and - spdylay_session_want_write() but they do not take into account - SSL connection. */ -enum -{ - IO_NONE, - WANT_READ, - WANT_WRITE -}; - - -struct Proxy; - - -struct SPDY_Connection { - SSL *ssl; - spdylay_session *session; - struct SPDY_Connection *prev; - struct SPDY_Connection *next; - struct Proxy *proxies_head; - struct Proxy *proxies_tail; - char *host; - int fd; - int want_io; - uint counter; - uint streams_opened; - bool is_tls; -}; - - -struct URI -{ - char * full_uri; - char * scheme; - char * host_and_port; - char * host; - char * path; - char * path_and_more; - char * query; - char * fragment; - uint16_t port; -}; - - -struct HTTP_URI; - - -struct Proxy -{ - struct MHD_Connection *http_connection; - struct MHD_Response *http_response; - struct URI *uri; - struct HTTP_URI *http_uri; - struct SPDY_Connection *spdy_connection; - struct Proxy *next; - struct Proxy *prev; - char *url; - char *version; - void *http_body; - void *received_body; - size_t http_body_size; - size_t received_body_size; - ssize_t length; - int status; - int id; - int32_t stream_id; - bool done; - bool http_error; - bool spdy_error; - bool http_active; - bool spdy_active; - bool receiving_done; -}; - - -struct HTTP_URI -{ - char * uri; - struct Proxy * proxy; -}; - - -struct SPDY_Headers -{ - const char **nv; - int num; - int cnt; -}; - - -struct global_options -{ - char *spdy2http_str; - struct SPDY_Connection *spdy_connection; - struct SPDY_Connection *spdy_connections_head; - struct SPDY_Connection *spdy_connections_tail; - int streams_opened; - int responses_pending; - regex_t uri_preg; - size_t global_memory; - SSL_CTX *ssl_ctx; - uint32_t total_spdy_connections; - uint16_t spdy_proto_version; - uint16_t listen_port; - bool verbose; - bool only_proxy; - bool spdy_data_received; - bool statistics; - bool ignore_rst_stream; -} -glob_opt; - - -struct global_statistics -{ - //unsigned long long http_bytes_sent; - //unsigned long long http_bytes_received; - unsigned long long spdy_bytes_sent; - unsigned long long spdy_bytes_received; - unsigned long long spdy_bytes_received_and_dropped; -} -glob_stat; - - -//forbidden headers -#define SPDY_HTTP_HEADER_TRANSFER_ENCODING "transfer-encoding" -#define SPDY_HTTP_HEADER_PROXY_CONNECTION "proxy-connection" -#define SPDY_HTTP_HEADER_KEEP_ALIVE "keep-alive" -#define SPDY_HTTP_HEADER_CONNECTION "connection" - -#define MAX_SPDY_CONNECTIONS 100 - -#define SPDY_MAX_OUTLEN 4096 - -/** - * Insert an element at the head of a DLL. Assumes that head, tail and - * element are structs with prev and next fields. - * - * @param head pointer to the head of the DLL (struct ? *) - * @param tail pointer to the tail of the DLL (struct ? *) - * @param element element to insert (struct ? *) - */ -#define DLL_insert(head,tail,element) do { \ - (element)->next = (head); \ - (element)->prev = NULL; \ - if ((tail) == NULL) \ - (tail) = element; \ - else \ - (head)->prev = element; \ - (head) = (element); } while (0) - - -/** - * Remove an element from a DLL. Assumes - * that head, tail and element are structs - * with prev and next fields. - * - * @param head pointer to the head of the DLL (struct ? *) - * @param tail pointer to the tail of the DLL (struct ? *) - * @param element element to remove (struct ? *) - */ -#define DLL_remove(head,tail,element) do { \ - if ((element)->prev == NULL) \ - (head) = (element)->next; \ - else \ - (element)->prev->next = (element)->next; \ - if ((element)->next == NULL) \ - (tail) = (element)->prev; \ - else \ - (element)->next->prev = (element)->prev; \ - (element)->next = NULL; \ - (element)->prev = NULL; } while (0) - - -#define PRINT_INFO(msg) do{\ - if(glob_opt.verbose){\ - printf("%i:%s\n", __LINE__, msg);\ - fflush(stdout);\ - }\ - }\ - while(0) - - -#define PRINT_INFO2(fmt, ...) do{\ - if(glob_opt.verbose){\ - printf("%i\n", __LINE__);\ - printf(fmt,##__VA_ARGS__);\ - printf("\n");\ - fflush(stdout);\ - }\ - }\ - while(0) - - -#define DIE(msg) do{\ - printf("FATAL ERROR (line %i): %s\n", __LINE__, msg);\ - fflush(stdout);\ - exit(EXIT_FAILURE);\ - }\ - while(0) - - -#define UPDATE_STAT(stat, value) do{\ - if(glob_opt.statistics)\ - {\ - stat += value;\ - }\ - }\ - while(0) - - -void -free_uri(struct URI * uri); - - -int -init_parse_uri(regex_t * preg); - - -void -deinit_parse_uri(regex_t * preg); - - -int -parse_uri(regex_t * preg, - char * full_uri, - struct URI ** uri); - - -void -free_proxy(struct Proxy *proxy); - - -void * -au_malloc(size_t size); - - -bool -copy_buffer(const void *src, size_t src_size, void **dst, size_t *dst_size); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/minimal_example.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/minimal_example.c deleted file mode 100644 index 313651c7..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/minimal_example.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file minimal_example.c - * @brief minimal example for how to use libmicrohttpd - * @author Christian Grothoff - */ - -#include "platform.h" -#include - -#define PAGE "libmicrohttpd demolibmicrohttpd demo" - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - static int aptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (method, "GET")) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - response = MHD_create_response_from_buffer (strlen (me), - (void *) me, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - d = MHD_start_daemon (// MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | MHD_USE_POLL, - MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | MHD_USE_POLL, - // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, &ahc_echo, PAGE, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120, - MHD_OPTION_END); - if (d == NULL) - return 1; - (void) getc (stdin); - MHD_stop_daemon (d); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/minimal_example_comet.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/minimal_example_comet.c deleted file mode 100644 index 0c9d264b..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/minimal_example_comet.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file minimal_example.c - * @brief minimal example for how to generate an infinite stream with libmicrohttpd - * @author Christian Grothoff - */ - -#include "platform.h" -#include - -static ssize_t -data_generator (void *cls, uint64_t pos, char *buf, size_t max) -{ - if (max < 80) - return 0; - memset (buf, 'A', max - 1); - buf[79] = '\n'; - return 80; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - static int aptr; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (method, "GET")) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, - 80, - &data_generator, NULL, NULL); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); - if (d == NULL) - return 1; - (void) getc (stdin); - MHD_stop_daemon (d); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/post_example.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/post_example.c deleted file mode 100644 index d8d13f99..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/post_example.c +++ /dev/null @@ -1,750 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2011 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file post_example.c - * @brief example for processing POST requests using libmicrohttpd - * @author Christian Grothoff - */ - -#include -#include -#include -#include -#include -#include - -/** - * Invalid method page. - */ -#define METHOD_ERROR "Illegal requestGo away." - -/** - * Invalid URL page. - */ -#define NOT_FOUND_ERROR "Not foundGo away." - -/** - * Front page. (/) - */ -#define MAIN_PAGE "Welcome
    What is your name? " - -/** - * Second page. (/2) - */ -#define SECOND_PAGE "Tell me moreprevious %s, what is your job? " - -/** - * Second page (/S) - */ -#define SUBMIT_PAGE "Ready to submit?previous " - -/** - * Last page. - */ -#define LAST_PAGE "Thank youThank you." - -/** - * Name of our cookie. - */ -#define COOKIE_NAME "session" - - -/** - * State we keep for each user/session/browser. - */ -struct Session -{ - /** - * We keep all sessions in a linked list. - */ - struct Session *next; - - /** - * Unique ID for this session. - */ - char sid[33]; - - /** - * Reference counter giving the number of connections - * currently using this session. - */ - unsigned int rc; - - /** - * Time when this session was last active. - */ - time_t start; - - /** - * String submitted via form. - */ - char value_1[64]; - - /** - * Another value submitted via form. - */ - char value_2[64]; - -}; - - -/** - * Data kept per request. - */ -struct Request -{ - - /** - * Associated session. - */ - struct Session *session; - - /** - * Post processor handling form data (IF this is - * a POST request). - */ - struct MHD_PostProcessor *pp; - - /** - * URL to serve in response to this POST (if this request - * was a 'POST') - */ - const char *post_url; - -}; - - -/** - * Linked list of all active sessions. Yes, O(n) but a - * hash table would be overkill for a simple example... - */ -static struct Session *sessions; - - - - -/** - * Return the session handle for this connection, or - * create one if this is a new user. - */ -static struct Session * -get_session (struct MHD_Connection *connection) -{ - struct Session *ret; - const char *cookie; - - cookie = MHD_lookup_connection_value (connection, - MHD_COOKIE_KIND, - COOKIE_NAME); - if (cookie != NULL) - { - /* find existing session */ - ret = sessions; - while (NULL != ret) - { - if (0 == strcmp (cookie, ret->sid)) - break; - ret = ret->next; - } - if (NULL != ret) - { - ret->rc++; - return ret; - } - } - /* create fresh session */ - ret = calloc (1, sizeof (struct Session)); - if (NULL == ret) - { - fprintf (stderr, "calloc error: %s\n", strerror (errno)); - return NULL; - } - /* not a super-secure way to generate a random session ID, - but should do for a simple example... */ - snprintf (ret->sid, - sizeof (ret->sid), - "%X%X%X%X", - (unsigned int) rand (), - (unsigned int) rand (), - (unsigned int) rand (), - (unsigned int) rand ()); - ret->rc++; - ret->start = time (NULL); - ret->next = sessions; - sessions = ret; - return ret; -} - - -/** - * Type of handler that generates a reply. - * - * @param cls content for the page (handler-specific) - * @param mime mime type to use - * @param session session information - * @param connection connection to process - * @param MHD_YES on success, MHD_NO on failure - */ -typedef int (*PageHandler)(const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection); - - -/** - * Entry we generate for each page served. - */ -struct Page -{ - /** - * Acceptable URL for this page. - */ - const char *url; - - /** - * Mime type to set for the page. - */ - const char *mime; - - /** - * Handler to call to generate response. - */ - PageHandler handler; - - /** - * Extra argument to handler. - */ - const void *handler_cls; -}; - - -/** - * Add header to response to set a session cookie. - * - * @param session session to use - * @param response response to modify - */ -static void -add_session_cookie (struct Session *session, - struct MHD_Response *response) -{ - char cstr[256]; - snprintf (cstr, - sizeof (cstr), - "%s=%s", - COOKIE_NAME, - session->sid); - if (MHD_NO == - MHD_add_response_header (response, - MHD_HTTP_HEADER_SET_COOKIE, - cstr)) - { - fprintf (stderr, - "Failed to set session cookie header!\n"); - } -} - - -/** - * Handler that returns a simple static HTTP page that - * is passed in via 'cls'. - * - * @param cls a 'const char *' with the HTML webpage to return - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ -static int -serve_simple_form (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) -{ - int ret; - const char *form = cls; - struct MHD_Response *response; - - /* return static form */ - response = MHD_create_response_from_buffer (strlen (form), - (void *) form, - MHD_RESPMEM_PERSISTENT); - if (NULL == response) - return MHD_NO; - add_session_cookie (session, response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; -} - - -/** - * Handler that adds the 'v1' value to the given HTML code. - * - * @param cls unused - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ -static int -fill_v1_form (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) -{ - int ret; - char *reply; - struct MHD_Response *response; - - reply = malloc (strlen (MAIN_PAGE) + strlen (session->value_1) + 1); - if (NULL == reply) - return MHD_NO; - snprintf (reply, - strlen (MAIN_PAGE) + strlen (session->value_1) + 1, - MAIN_PAGE, - session->value_1); - /* return static form */ - response = MHD_create_response_from_buffer (strlen (reply), - (void *) reply, - MHD_RESPMEM_MUST_FREE); - if (NULL == response) - return MHD_NO; - add_session_cookie (session, response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; -} - - -/** - * Handler that adds the 'v1' and 'v2' values to the given HTML code. - * - * @param cls unused - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ -static int -fill_v1_v2_form (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) -{ - int ret; - char *reply; - struct MHD_Response *response; - - reply = malloc (strlen (SECOND_PAGE) + strlen (session->value_1) + strlen (session->value_2) + 1); - if (NULL == reply) - return MHD_NO; - snprintf (reply, - strlen (SECOND_PAGE) + strlen (session->value_1) + strlen (session->value_2) + 1, - SECOND_PAGE, - session->value_1, - session->value_2); - /* return static form */ - response = MHD_create_response_from_buffer (strlen (reply), - (void *) reply, - MHD_RESPMEM_MUST_FREE); - if (NULL == response) - return MHD_NO; - add_session_cookie (session, response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); - return ret; -} - - -/** - * Handler used to generate a 404 reply. - * - * @param cls a 'const char *' with the HTML webpage to return - * @param mime mime type to use - * @param session session handle - * @param connection connection to use - */ -static int -not_found_page (const void *cls, - const char *mime, - struct Session *session, - struct MHD_Connection *connection) -{ - int ret; - struct MHD_Response *response; - - /* unsupported HTTP method */ - response = MHD_create_response_from_buffer (strlen (NOT_FOUND_ERROR), - (void *) NOT_FOUND_ERROR, - MHD_RESPMEM_PERSISTENT); - if (NULL == response) - return MHD_NO; - ret = MHD_queue_response (connection, - MHD_HTTP_NOT_FOUND, - response); - MHD_add_response_header (response, - MHD_HTTP_HEADER_CONTENT_ENCODING, - mime); - MHD_destroy_response (response); - return ret; -} - - -/** - * List of all pages served by this HTTP server. - */ -static struct Page pages[] = - { - { "/", "text/html", &fill_v1_form, NULL }, - { "/2", "text/html", &fill_v1_v2_form, NULL }, - { "/S", "text/html", &serve_simple_form, SUBMIT_PAGE }, - { "/F", "text/html", &serve_simple_form, LAST_PAGE }, - { NULL, NULL, ¬_found_page, NULL } /* 404 */ - }; - - - -/** - * Iterator over key-value pairs where the value - * maybe made available in increments and/or may - * not be zero-terminated. Used for processing - * POST data. - * - * @param cls user-specified closure - * @param kind type of the value - * @param key 0-terminated key for the value - * @param filename name of the uploaded file, NULL if not known - * @param content_type mime-type of the data, NULL if not known - * @param transfer_encoding encoding of the data, NULL if not known - * @param data pointer to size bytes of data at the - * specified offset - * @param off offset of data in the overall value - * @param size number of bytes in data available - * @return MHD_YES to continue iterating, - * MHD_NO to abort the iteration - */ -static int -post_iterator (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *data, uint64_t off, size_t size) -{ - struct Request *request = cls; - struct Session *session = request->session; - - if (0 == strcmp ("DONE", key)) - { - fprintf (stdout, - "Session `%s' submitted `%s', `%s'\n", - session->sid, - session->value_1, - session->value_2); - return MHD_YES; - } - if (0 == strcmp ("v1", key)) - { - if (size + off >= sizeof(session->value_1)) - size = sizeof (session->value_1) - off - 1; - memcpy (&session->value_1[off], - data, - size); - session->value_1[size+off] = '\0'; - return MHD_YES; - } - if (0 == strcmp ("v2", key)) - { - if (size + off >= sizeof(session->value_2)) - size = sizeof (session->value_2) - off - 1; - memcpy (&session->value_2[off], - data, - size); - session->value_2[size+off] = '\0'; - return MHD_YES; - } - fprintf (stderr, - "Unsupported form value `%s'\n", - key); - return MHD_YES; -} - - -/** - * Main MHD callback for handling requests. - * - * @param cls argument given together with the function - * pointer when the handler was registered with MHD - * @param connection handle identifying the incoming connection - * @param url the requested url - * @param method the HTTP method used ("GET", "PUT", etc.) - * @param version the HTTP version string (i.e. "HTTP/1.1") - * @param upload_data the data being uploaded (excluding HEADERS, - * for a POST that fits into memory and that is encoded - * with a supported encoding, the POST data will NOT be - * given in upload_data and is instead available as - * part of MHD_get_connection_values; very large POST - * data *will* be made available incrementally in - * upload_data) - * @param upload_data_size set initially to the size of the - * upload_data provided; the method must update this - * value to the number of bytes NOT processed; - * @param ptr pointer that the callback can set to some - * address and that will be preserved by MHD for future - * calls for this request; since the access handler may - * be called many times (i.e., for a PUT/POST operation - * with plenty of upload data) this allows the application - * to easily associate some request-specific state. - * If necessary, this state can be cleaned up in the - * global "MHD_RequestCompleted" callback (which - * can be set with the MHD_OPTION_NOTIFY_COMPLETED). - * Initially, *con_cls will be NULL. - * @return MHS_YES if the connection was handled successfully, - * MHS_NO if the socket must be closed due to a serios - * error while handling the request - */ -static int -create_response (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, - void **ptr) -{ - struct MHD_Response *response; - struct Request *request; - struct Session *session; - int ret; - unsigned int i; - - request = *ptr; - if (NULL == request) - { - request = calloc (1, sizeof (struct Request)); - if (NULL == request) - { - fprintf (stderr, "calloc error: %s\n", strerror (errno)); - return MHD_NO; - } - *ptr = request; - if (0 == strcmp (method, MHD_HTTP_METHOD_POST)) - { - request->pp = MHD_create_post_processor (connection, 1024, - &post_iterator, request); - if (NULL == request->pp) - { - fprintf (stderr, "Failed to setup post processor for `%s'\n", - url); - return MHD_NO; /* internal error */ - } - } - return MHD_YES; - } - if (NULL == request->session) - { - request->session = get_session (connection); - if (NULL == request->session) - { - fprintf (stderr, "Failed to setup session for `%s'\n", - url); - return MHD_NO; /* internal error */ - } - } - session = request->session; - session->start = time (NULL); - if (0 == strcmp (method, MHD_HTTP_METHOD_POST)) - { - /* evaluate POST data */ - MHD_post_process (request->pp, - upload_data, - *upload_data_size); - if (0 != *upload_data_size) - { - *upload_data_size = 0; - return MHD_YES; - } - /* done with POST data, serve response */ - MHD_destroy_post_processor (request->pp); - request->pp = NULL; - method = MHD_HTTP_METHOD_GET; /* fake 'GET' */ - if (NULL != request->post_url) - url = request->post_url; - } - - if ( (0 == strcmp (method, MHD_HTTP_METHOD_GET)) || - (0 == strcmp (method, MHD_HTTP_METHOD_HEAD)) ) - { - /* find out which page to serve */ - i=0; - while ( (pages[i].url != NULL) && - (0 != strcmp (pages[i].url, url)) ) - i++; - ret = pages[i].handler (pages[i].handler_cls, - pages[i].mime, - session, connection); - if (ret != MHD_YES) - fprintf (stderr, "Failed to create page for `%s'\n", - url); - return ret; - } - /* unsupported HTTP method */ - response = MHD_create_response_from_buffer (strlen (METHOD_ERROR), - (void *) METHOD_ERROR, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, - MHD_HTTP_METHOD_NOT_ACCEPTABLE, - response); - MHD_destroy_response (response); - return ret; -} - - -/** - * Callback called upon completion of a request. - * Decrements session reference counter. - * - * @param cls not used - * @param connection connection that completed - * @param con_cls session handle - * @param toe status code - */ -static void -request_completed_callback (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct Request *request = *con_cls; - - if (NULL == request) - return; - if (NULL != request->session) - request->session->rc--; - if (NULL != request->pp) - MHD_destroy_post_processor (request->pp); - free (request); -} - - -/** - * Clean up handles of sessions that have been idle for - * too long. - */ -static void -expire_sessions () -{ - struct Session *pos; - struct Session *prev; - struct Session *next; - time_t now; - - now = time (NULL); - prev = NULL; - pos = sessions; - while (NULL != pos) - { - next = pos->next; - if (now - pos->start > 60 * 60) - { - /* expire sessions after 1h */ - if (NULL == prev) - sessions = pos->next; - else - prev->next = next; - free (pos); - } - else - prev = pos; - pos = next; - } -} - - -/** - * Call with the port number as the only argument. - * Never terminates (other than by signals, such as CTRL-C). - */ -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - struct timeval tv; - struct timeval *tvp; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - MHD_UNSIGNED_LONG_LONG mhd_timeout; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - /* initialize PRNG */ - srand ((unsigned int) time (NULL)); - d = MHD_start_daemon (MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, - &create_response, NULL, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 15, - MHD_OPTION_NOTIFY_COMPLETED, &request_completed_callback, NULL, - MHD_OPTION_END); - if (NULL == d) - return 1; - while (1) - { - expire_sessions (); - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - break; /* fatal internal error */ - if (MHD_get_timeout (d, &mhd_timeout) == MHD_YES) - { - tv.tv_sec = mhd_timeout / 1000; - tv.tv_usec = (mhd_timeout - (tv.tv_sec * 1000)) * 1000; - tvp = &tv; - } - else - tvp = NULL; - select (max + 1, &rs, &ws, &es, tvp); - MHD_run (d); - } - MHD_stop_daemon (d); - return 0; -} - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/querystring_example.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/querystring_example.c deleted file mode 100644 index 24f8ae4c..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/querystring_example.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file querystring_example.c - * @brief example for how to get the query string from libmicrohttpd - * Call with an URI ending with something like "?q=QUERY" - * @author Christian Grothoff - */ - -#include "platform.h" -#include - -#define PAGE "libmicrohttpd demoQuery string for "%s" was "%s"" - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - static int aptr; - const char *fmt = cls; - const char *val; - char *me; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (method, "GET")) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - val = MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, "q"); - me = malloc (snprintf (NULL, 0, fmt, "q", val) + 1); - if (me == NULL) - return MHD_NO; - sprintf (me, fmt, "q", val); - response = MHD_create_response_from_buffer (strlen (me), me, - MHD_RESPMEM_MUST_FREE); - if (response == NULL) - { - free (me); - return MHD_NO; - } - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); - if (d == NULL) - return 1; - (void) getc (stdin); - MHD_stop_daemon (d); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/refuse_post_example.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/refuse_post_example.c deleted file mode 100644 index 846546c4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/refuse_post_example.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file refuse_post_example.c - * @brief example for how to refuse a POST request properly - * @author Christian Grothoff and Sebastian Gerhardt - */ -#include "platform.h" -#include - -const char *askpage = "\n\ - Upload a file, please!
    \n\ - \n\ - \n\ - \n\ - "; - -#define BUSYPAGE "Webserver busyWe are too busy to process POSTs right now." - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - static int aptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - - if ((0 != strcmp (method, "GET")) && (0 != strcmp (method, "POST"))) - return MHD_NO; /* unexpected method */ - - if (&aptr != *ptr) - { - *ptr = &aptr; - - /* always to busy for POST requests */ - if (0 == strcmp (method, "POST")) - { - response = MHD_create_response_from_buffer (strlen (BUSYPAGE), - (void *) BUSYPAGE, - MHD_RESPMEM_PERSISTENT); - ret = - MHD_queue_response (connection, MHD_HTTP_SERVICE_UNAVAILABLE, - response); - MHD_destroy_response (response); - return ret; - } - } - - *ptr = NULL; /* reset when done */ - response = MHD_create_response_from_buffer (strlen (me), - (void *) me, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - -int -main (int argc, char *const *argv) -{ - struct MHD_Daemon *d; - - if (argc != 2) - { - printf ("%s PORT\n", argv[0]); - return 1; - } - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - atoi (argv[1]), - NULL, NULL, &ahc_echo, (void *) askpage, - MHD_OPTION_END); - if (d == NULL) - return 1; - (void) getc (stdin); - MHD_stop_daemon (d); - return 0; -} - -/* end of refuse_post_example.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/spdy_event_loop.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/spdy_event_loop.c deleted file mode 100644 index 6b7192c3..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/spdy_event_loop.c +++ /dev/null @@ -1,487 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file event_loop.c - * @brief shows how to use the daemon. THIS IS MAINLY A TEST AND DEBUG - * PROGRAM - * @author Andrey Uzunov - */ - -#include "platform.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include "microspdy.h" -#include -#include -#ifndef MINGW -#include -#endif -//#include "../framinglayer/structures.h" -//#include "../applicationlayer/alstructures.h" - -static int run = 1; - -static int run2 = 1; - - -static uint64_t loops; - -static time_t start; - - -static void -new_session_callback (void *cls, - struct SPDY_Session * session) -{ - (void)cls; - - char ipstr[1024]; - - struct sockaddr *addr; - socklen_t addr_len = SPDY_get_remote_addr(session, &addr); - - if(!addr_len) - { - printf("SPDY_get_remote_addr"); - abort(); - } - - if(AF_INET == addr->sa_family) - { - struct sockaddr_in * addr4 = (struct sockaddr_in *) addr; - if(NULL == inet_ntop(AF_INET, &(addr4->sin_addr), ipstr, sizeof(ipstr))) - { - printf("inet_ntop"); - abort(); - } - printf("New connection from: %s:%i\n", ipstr, ntohs(addr4->sin_port)); - - } - else if(AF_INET6 == addr->sa_family) - { - struct sockaddr_in6 * addr6 = (struct sockaddr_in6 *) addr; - if(NULL == inet_ntop(AF_INET6, &(addr6->sin6_addr), ipstr, sizeof(ipstr))) - { - printf("inet_ntop"); - abort(); - } - printf("New connection from: %s:%i\n", ipstr, ntohs(addr6->sin6_port)); - - } -} - - -static void -session_closed_handler (void *cls, - struct SPDY_Session * session, - int by_client) -{ - (void)cls; - (void)session; - - //printf("session_closed_handler called\n"); - - if(SPDY_YES != by_client) - { - //killchild(child,"wrong by_client"); - printf("session closed by server\n"); - } - else - { - printf("session closed by client\n"); - } - - //session_closed_called = 1; -} - - -static void -response_done_callback(void *cls, - struct SPDY_Response *response, - struct SPDY_Request *request, - enum SPDY_RESPONSE_RESULT status, - bool streamopened) -{ - (void)streamopened; - if(strcmp(cls, "/close (daemon1)") == 0) - run = 0; - else { - if(strcmp(cls, "/close (daemon2)") == 0) run2 = 0; - loops = 0; - start = time(NULL); - } - if(SPDY_RESPONSE_RESULT_SUCCESS != status) - { - printf("not sent frame cause %i", status); - } - printf("answer for %s was sent\n", (char*)cls); - //printf("raw sent headers %s\n", (char *)(response->headers)+8); - - SPDY_destroy_request(request); - SPDY_destroy_response(response); - free(cls); -} - -/* -static int -print_headers (void *cls, - const char *name, const char *value) -{ - (void)cls; - printf("%s: %s\n",name,value); - return SPDY_YES; -} - */ - - -/* -void -new_request_cb (void *cls, - struct SPDY_Request * request, - uint8_t priority, - const char *method, - const char *path, - const char *version, - const char *host, - const char *scheme, - struct SPDY_NameValue * headers) -{ - (void)cls; - (void)request; - printf("Priority: %i\nHTTP headers, scheme: %s\n\n%s %s %s\nHost: %s\n", priority,scheme,method,path,version,host); - SPDY_name_value_iterate(headers, &print_headers, NULL); -} -*/ - - -static int -append_headers_to_data (void *cls, - const char *name, const char * const *value, int num_values) -{ - char **data = cls; - void *tofree = *data; - int i; - - if(num_values) - for(i=0;i" - "Closing now!
    This is an answer to the following " - "request:

    %s
    ",data); - } - else - { - asprintf(&html,"" - "This is an answer to the following " - "request:

    %s
    ",data); - } - - free(data); - - response = SPDY_build_response(200,NULL,SPDY_HTTP_VERSION_1_1,NULL,html,strlen(html)); - free(html); - } - - if(NULL==response){ - fprintf(stdout,"no response obj\n"); - abort(); - } - - char *pathcls; - asprintf(&pathcls, "%s (daemon%i)",path,NULL==cls ? 1 : 2); - if(SPDY_queue_response(request,response,true,false,&response_done_callback,pathcls)!=SPDY_YES) - { - fprintf(stdout,"queue\n"); - abort(); - } -} - - -static int -new_post_data_cb (void * cls, - struct SPDY_Request *request, - const void * buf, - size_t size, - bool more) -{ - (void)cls; - (void)request; - (void)more; - - printf("DATA:\n===============================\n"); - write(0, buf, size); - printf("\n===============================\n"); - return SPDY_YES; -} - - -static void -sig_handler(int signo) -{ - (void)signo; - - printf("received signal\n"); -} - - -int -main (int argc, char *const *argv) -{ - if(argc != 2) return 1; - - #ifndef MINGW - if (signal(SIGPIPE, sig_handler) == SIG_ERR) - printf("\ncan't catch SIGPIPE\n"); - #endif - - SPDY_init(); - - /* - struct sockaddr_in addr4; - struct in_addr inaddr4; - inaddr4.s_addr = htonl(INADDR_ANY); - addr4.sin_family = AF_INET; - addr4.sin_addr = inaddr4; - addr4.sin_port = htons(atoi(argv[1])); - */ - - struct SPDY_Daemon *daemon = SPDY_start_daemon(atoi(argv[1]), - DATA_DIR "cert-and-key.pem", - DATA_DIR "cert-and-key.pem", - &new_session_callback,&session_closed_handler,&standard_request_handler,&new_post_data_cb,NULL, - SPDY_DAEMON_OPTION_SESSION_TIMEOUT, 10, - //SPDY_DAEMON_OPTION_SOCK_ADDR, (struct sockaddr *)&addr4, - SPDY_DAEMON_OPTION_END); - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - /* - struct sockaddr_in6 addr6; - addr6.sin6_family = AF_INET6; - addr6.sin6_addr = in6addr_any; - addr6.sin6_port = htons(atoi(argv[1]) + 1); - */ - - struct SPDY_Daemon *daemon2 = SPDY_start_daemon(atoi(argv[1]) + 1, - DATA_DIR "cert-and-key.pem", - DATA_DIR "cert-and-key.pem", - &new_session_callback,NULL,&standard_request_handler,&new_post_data_cb,&main, - //SPDY_DAEMON_OPTION_SESSION_TIMEOUT, 0, - //SPDY_DAEMON_OPTION_SOCK_ADDR, (struct sockaddr *)&addr6, - //SPDY_DAEMON_OPTION_FLAGS, SPDY_DAEMON_FLAG_ONLY_IPV6, - SPDY_DAEMON_OPTION_END); - - if(NULL==daemon2){ - printf("no daemon\n"); - return 1; - } - - do - { - unsigned long long timeoutlong=0; - struct timeval timeout; - volatile int rc; /* select() return code */ - volatile int ret; - - fd_set read_fd_set; - fd_set write_fd_set; - fd_set except_fd_set; - int maxfd = -1; - - if(run && daemon != NULL) - { - loops++; - FD_ZERO(&read_fd_set); - FD_ZERO(&write_fd_set); - FD_ZERO(&except_fd_set); - - ret = SPDY_get_timeout(daemon, &timeoutlong); - if(SPDY_NO == ret || timeoutlong > 1000) - { - timeout.tv_sec = 1; - timeout.tv_usec = 0; - } - else - { - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - } - - printf("ret=%i; timeoutlong=%llu; sec=%llu; usec=%llu\n", ret, timeoutlong, (long long unsigned)timeout.tv_sec, (long long unsigned)timeout.tv_usec); - //raise(SIGINT); - - /* get file descriptors from the transfers */ - maxfd = SPDY_get_fdset (daemon, - &read_fd_set, - &write_fd_set, - &except_fd_set); - -//struct timeval ts1,ts2; - //gettimeofday(&ts1, NULL); - rc = select(maxfd+1, &read_fd_set, &write_fd_set, &except_fd_set, &timeout); - //gettimeofday(&ts2, NULL); - printf("rc %i\n",rc); - // printf("time for select %i\n",ts2.tv_usec - ts1.tv_usec); - // printf("%i %i %i %i\n",ts1.tv_sec, ts1.tv_usec,ts2.tv_sec, ts2.tv_usec); - - switch(rc) { - case -1: - /* select error */ - break; - case 0: - - break; - default: - SPDY_run(daemon); - - break; - } - } - else if(daemon != NULL){ - - printf("%lu loops in %llu secs\n", loops, (long long unsigned)(time(NULL) - start)); - SPDY_stop_daemon(daemon); - daemon=NULL; - } - - if(run2) - { - FD_ZERO(&read_fd_set); - FD_ZERO(&write_fd_set); - FD_ZERO(&except_fd_set); - - ret = SPDY_get_timeout(daemon2, &timeoutlong); - //printf("tout %i\n",timeoutlong); - if(SPDY_NO == ret || timeoutlong > 1) - { - //do sth else - //sleep(1); - - //try new connection - timeout.tv_sec = 1; - timeout.tv_usec = 0; - } - else - { - timeout.tv_sec = timeoutlong; - timeout.tv_usec = 0;//(timeoutlong % 1000) * 1000; - } - - //printf("ret=%i; timeoutlong=%i; sec=%i; usec=%i\n", ret, timeoutlong, timeout.tv_sec, timeout.tv_usec); - //raise(SIGINT); - - /* get file descriptors from the transfers */ - maxfd = SPDY_get_fdset (daemon2, - &read_fd_set, - &write_fd_set, - &except_fd_set); - - rc = select(maxfd+1, &read_fd_set, &write_fd_set, &except_fd_set, &timeout); - - switch(rc) { - case -1: - /* select error */ - break; - case 0: - - break; - default: - SPDY_run(daemon2); - - break; - } - } - else if(daemon2 != NULL){ - SPDY_stop_daemon(daemon2); - daemon2=NULL; - } - } - while(run || run2); - - if(daemon != NULL){ - SPDY_stop_daemon(daemon); - } - if(daemon2 != NULL){ - SPDY_stop_daemon(daemon2); - } - - SPDY_deinit(); - - return 0; -} - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/spdy_fileserver.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/spdy_fileserver.c deleted file mode 100644 index 0a0254ff..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/spdy_fileserver.c +++ /dev/null @@ -1,353 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file fileserver.c - * @brief Simple example how the lib can be used for serving - * files directly read from the system - * @author Andrey Uzunov - */ - -//for asprintf -#define _GNU_SOURCE - -#include -#include -#include -#include -#include -#include -#include -#include -#include "microspdy.h" -#include "time.h" - - -int run = 1; -char* basedir; - - -#define GET_MIME_TYPE(fname, mime) do {\ - unsigned int __len = strlen(fname);\ - if (__len < 4 || '.' != (fname)[__len - 4]) \ - { \ - (mime) = strdup("application/octet-stream");\ - printf("MIME for %s is applic...\n", (fname));\ - }\ - else {\ - const char * __ext = &(fname)[__len - 3];\ - if(0 == strcmp(__ext, "jpg")) (mime) = strdup("image/jpeg");\ - else if(0 == strcmp(__ext, "png")) (mime) = strdup("image/png");\ - else if(0 == strcmp(__ext, "css")) (mime) = strdup("text/css");\ - else if(0 == strcmp(__ext, "gif")) (mime) = strdup("image/gif");\ - else if(0 == strcmp(__ext, "htm")) (mime) = strdup("text/html");\ - else \ - { \ - (mime) = strdup("application/octet-stream");\ - printf("MIME for %s is applic...\n", (fname));\ - }\ - }\ - if(NULL == (mime))\ - {\ - printf("no memory\n");\ - abort();\ - }\ - } while (0) - - -static const char *DAY_NAMES[] = - { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; - -static const char *MONTH_NAMES[] = - { "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - -//taken from http://stackoverflow.com/questions/2726975/how-can-i-generate-an-rfc1123-date-string-from-c-code-win32 -//and modified for linux -char *Rfc1123_DateTimeNow() -{ - const int RFC1123_TIME_LEN = 29; - time_t t; - struct tm tm; - char * buf = malloc(RFC1123_TIME_LEN+1); - - if (NULL == buf) - return NULL; - time(&t); - gmtime_r( &t, &tm); - - strftime(buf, RFC1123_TIME_LEN+1, "---, %d --- %Y %H:%M:%S GMT", &tm); - memcpy(buf, DAY_NAMES[tm.tm_wday], 3); - memcpy(buf+8, MONTH_NAMES[tm.tm_mon], 3); - - return buf; -} - - -ssize_t -response_callback (void *cls, - void *buffer, - size_t max, - bool *more) -{ - FILE *fd =(FILE*)cls; - - int ret = fread(buffer,1,max,fd); - *more = feof(fd) == 0; - - //if(!(*more)) - // fclose(fd); - - return ret; -} - - -void -response_done_callback(void *cls, - struct SPDY_Response *response, - struct SPDY_Request *request, - enum SPDY_RESPONSE_RESULT status, - bool streamopened) -{ - (void)streamopened; - (void)status; - //printf("answer for %s was sent\n", (char *)cls); - - /*if(SPDY_RESPONSE_RESULT_SUCCESS != status) - { - printf("answer for %s was NOT sent, %i\n", (char *)cls,status); - }*/ - - SPDY_destroy_request(request); - SPDY_destroy_response(response); - if(NULL!=cls)fclose(cls); -} - -void -standard_request_handler(void *cls, - struct SPDY_Request * request, - uint8_t priority, - const char *method, - const char *path, - const char *version, - const char *host, - const char *scheme, - struct SPDY_NameValue * headers, - bool more) -{ - (void)cls; - (void)request; - (void)priority; - (void)host; - (void)scheme; - (void)headers; - (void)method; - (void)version; - (void)more; - - struct SPDY_Response *response=NULL; - struct SPDY_NameValue *resp_headers; - char *fname; - char *fsize; - char *mime=NULL; - char *date=NULL; - ssize_t filesize = -666; - FILE *fd = NULL; - int ret = -666; - - //printf("received request for '%s %s %s'\n", method, path, version); - if(strlen(path) > 1 && NULL == strstr(path, "..") && '/' == path[0]) - { - asprintf(&fname,"%s%s",basedir,path); - if(0 == access(fname, R_OK)) - { - if(NULL == (fd = fopen(fname,"r")) - || 0 != (ret = fseek(fd, 0L, SEEK_END)) - || -1 == (filesize = ftell(fd)) - || 0 != (ret = fseek(fd, 0L, SEEK_SET))) - { - printf("Error on opening %s\n%p %i %zd\n",fname, fd, ret, filesize); - response = SPDY_build_response(SPDY_HTTP_INTERNAL_SERVER_ERROR,NULL,SPDY_HTTP_VERSION_1_1,NULL,NULL,0); - } - else - { - if(NULL == (resp_headers = SPDY_name_value_create())) - { - printf("SPDY_name_value_create failed\n"); - abort(); - } - - date = Rfc1123_DateTimeNow(); - if(NULL == date - || SPDY_YES != SPDY_name_value_add(resp_headers,SPDY_HTTP_HEADER_DATE,date)) - { - printf("SPDY_name_value_add or Rfc1123_DateTimeNow failed\n"); - abort(); - } - free(date); - - if(-1 == asprintf(&fsize, "%zd", filesize) - || SPDY_YES != SPDY_name_value_add(resp_headers,SPDY_HTTP_HEADER_CONTENT_LENGTH,fsize)) - { - printf("SPDY_name_value_add or asprintf failed\n"); - abort(); - } - free(fsize); - - GET_MIME_TYPE(path,mime); - if(SPDY_YES != SPDY_name_value_add(resp_headers,SPDY_HTTP_HEADER_CONTENT_TYPE,mime)) - { - printf("SPDY_name_value_add failed\n"); - abort(); - } - free(mime); - - if(SPDY_YES != SPDY_name_value_add(resp_headers,SPDY_HTTP_HEADER_SERVER,"libmicrospdy/fileserver")) - { - printf("SPDY_name_value_add failed\n"); - abort(); - } - - response = SPDY_build_response_with_callback(200,NULL, - SPDY_HTTP_VERSION_1_1,resp_headers,&response_callback,fd,SPDY_MAX_SUPPORTED_FRAME_SIZE); - SPDY_name_value_destroy(resp_headers); - } - - if(NULL==response){ - printf("no response obj\n"); - abort(); - } - - if(SPDY_queue_response(request,response,true,false,&response_done_callback,fd)!=SPDY_YES) - { - printf("queue\n"); - abort(); - } - - free(fname); - return; - } - free(fname); - } - - if(strcmp(path,"/close")==0) - { - run = 0; - } - - response = SPDY_build_response(SPDY_HTTP_NOT_FOUND,NULL,SPDY_HTTP_VERSION_1_1,NULL,NULL,0); - printf("Not found %s\n",path); - - if(NULL==response){ - printf("no response obj\n"); - abort(); - } - - if(SPDY_queue_response(request,response,true,false,&response_done_callback,NULL)!=SPDY_YES) - { - printf("queue\n"); - abort(); - } -} - -int -main (int argc, char *const *argv) -{ - unsigned long long timeoutlong=0; - struct timeval timeout; - int ret; - fd_set read_fd_set; - fd_set write_fd_set; - fd_set except_fd_set; - int maxfd = -1; - struct SPDY_Daemon *daemon; - - if(argc != 5) - { - printf("Usage: %s cert-file key-file base-dir port\n", argv[0]); - return 1; - } - - SPDY_init(); - - daemon = SPDY_start_daemon(atoi(argv[4]), - argv[1], - argv[2], - NULL, - NULL, - &standard_request_handler, - NULL, - NULL, - SPDY_DAEMON_OPTION_SESSION_TIMEOUT, - 1800, - SPDY_DAEMON_OPTION_END); - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - basedir = argv[3]; - - do - { - FD_ZERO(&read_fd_set); - FD_ZERO(&write_fd_set); - FD_ZERO(&except_fd_set); - - ret = SPDY_get_timeout(daemon, &timeoutlong); - if(SPDY_NO == ret || timeoutlong > 1000) - { - timeout.tv_sec = 1; - timeout.tv_usec = 0; - } - else - { - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - } - - maxfd = SPDY_get_fdset (daemon, - &read_fd_set, - &write_fd_set, - &except_fd_set); - - ret = select(maxfd+1, &read_fd_set, &write_fd_set, &except_fd_set, &timeout); - - switch(ret) { - case -1: - printf("select error: %i\n", errno); - break; - case 0: - - break; - default: - SPDY_run(daemon); - - break; - } - } - while(run); - - SPDY_stop_daemon(daemon); - - SPDY_deinit(); - - return 0; -} - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/spdy_response_with_callback.c b/src/hos_libhttpserver/src/libmicrohttpd/src/examples/spdy_response_with_callback.c deleted file mode 100644 index 5bd452d2..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/examples/spdy_response_with_callback.c +++ /dev/null @@ -1,236 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file response_with_callback.c - * @brief shows how to create responses with callbacks - * @author Andrey Uzunov - */ - -//for asprintf -#define _GNU_SOURCE - -#include -#include -#include -#include -#include -#include -#include -#include -#include "microspdy.h" - -static int run = 1; - - -static ssize_t -response_callback (void *cls, - void *buffer, - size_t max, - bool *more) -{ - FILE *fd =(FILE*)cls; - - int ret = fread(buffer,1,max,fd); - *more = feof(fd) == 0; - - if(!(*more)) - fclose(fd); - - return ret; -} - - -static void -response_done_callback(void *cls, - struct SPDY_Response *response, - struct SPDY_Request *request, - enum SPDY_RESPONSE_RESULT status, - bool streamopened) -{ - (void)streamopened; - (void)status; - - printf("answer for %s was sent\n", (char *)cls); - - SPDY_destroy_request(request); - SPDY_destroy_response(response); - free(cls); -} - - -static void -standard_request_handler(void *cls, - struct SPDY_Request * request, - uint8_t priority, - const char *method, - const char *path, - const char *version, - const char *host, - const char *scheme, - struct SPDY_NameValue * headers, - bool more) -{ - (void)cls; - (void)request; - (void)priority; - (void)host; - (void)scheme; - (void)headers; - (void)more; - - char *html; - struct SPDY_Response *response=NULL; - struct SPDY_NameValue *resp_headers; - - printf("received request for '%s %s %s'\n", method, path, version); - if(strcmp(path,"/spdy-draft.txt")==0) - { - FILE *fd = fopen(DATA_DIR "spdy-draft.txt","r"); - - if(NULL == (resp_headers = SPDY_name_value_create())) - { - fprintf(stdout,"SPDY_name_value_create failed\n"); - abort(); - } - if(SPDY_YES != SPDY_name_value_add(resp_headers,SPDY_HTTP_HEADER_CONTENT_TYPE,"text/plain")) - { - fprintf(stdout,"SPDY_name_value_add failed\n"); - abort(); - } - - response = SPDY_build_response_with_callback(200,NULL, - SPDY_HTTP_VERSION_1_1,resp_headers,&response_callback,fd,SPDY_MAX_SUPPORTED_FRAME_SIZE); - SPDY_name_value_destroy(resp_headers); - } - else - { - if(strcmp(path,"/close")==0) - { - asprintf(&html,"" - "Closing now!"); - run = 0; - } - else - { - asprintf(&html,"" - "/spdy-draft.txt
    "); - } - - response = SPDY_build_response(200,NULL,SPDY_HTTP_VERSION_1_1,NULL,html,strlen(html)); - free(html); - } - - if(NULL==response){ - fprintf(stdout,"no response obj\n"); - abort(); - } - - void *clspath = strdup(path); - - if(SPDY_queue_response(request,response,true,false,&response_done_callback,clspath)!=SPDY_YES) - { - fprintf(stdout,"queue\n"); - abort(); - } -} - - -int -main (int argc, char *const *argv) -{ - unsigned long long timeoutlong=0; - struct timeval timeout; - int ret; - fd_set read_fd_set; - fd_set write_fd_set; - fd_set except_fd_set; - int maxfd = -1; - struct SPDY_Daemon *daemon; - - if(argc != 2) - { - return 1; - } - - SPDY_init(); - - daemon = SPDY_start_daemon(atoi(argv[1]), - DATA_DIR "cert-and-key.pem", - DATA_DIR "cert-and-key.pem", - NULL, - NULL, - &standard_request_handler, - NULL, - NULL, - SPDY_DAEMON_OPTION_SESSION_TIMEOUT, - 1800, - SPDY_DAEMON_OPTION_END); - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - do - { - FD_ZERO(&read_fd_set); - FD_ZERO(&write_fd_set); - FD_ZERO(&except_fd_set); - - ret = SPDY_get_timeout(daemon, &timeoutlong); - if(SPDY_NO == ret || timeoutlong > 1000) - { - timeout.tv_sec = 1; - timeout.tv_usec = 0; - } - else - { - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - } - - maxfd = SPDY_get_fdset (daemon, - &read_fd_set, - &write_fd_set, - &except_fd_set); - - ret = select(maxfd+1, &read_fd_set, &write_fd_set, &except_fd_set, &timeout); - - switch(ret) { - case -1: - printf("select error: %i\n", errno); - break; - case 0: - - break; - default: - SPDY_run(daemon); - - break; - } - } - while(run); - - SPDY_stop_daemon(daemon); - - SPDY_deinit(); - - return 0; -} - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/include/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/src/include/Makefile.am deleted file mode 100644 index 437008fd..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/include/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -# This Makefile.am is in the public domain -SUBDIRS = . - -if ENABLE_SPDY -microspdy = microspdy.h -endif - -include_HEADERS = microhttpd.h $(microspdy) - -EXTRA_DIST = platform.h platform_interface.h w32functions.h autoinit_funcs.h diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/include/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/src/include/Makefile.in deleted file mode 100644 index 151ac48f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/include/Makefile.in +++ /dev/null @@ -1,723 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/include -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(am__include_HEADERS_DIST) -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__include_HEADERS_DIST = microhttpd.h microspdy.h -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(includedir)" -HEADERS = $(include_HEADERS) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -SUBDIRS = . -@ENABLE_SPDY_TRUE@microspdy = microspdy.h -include_HEADERS = microhttpd.h $(microspdy) -EXTRA_DIST = platform.h platform_interface.h w32functions.h autoinit_funcs.h -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/include/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/include/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(HEADERS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(includedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-includeHEADERS - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-includeHEADERS - -.MAKE: $(am__recursive_targets) install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-includeHEADERS install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-includeHEADERS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/include/autoinit_funcs.h b/src/hos_libhttpserver/src/libmicrohttpd/src/include/autoinit_funcs.h deleted file mode 100644 index 2f309e18..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/include/autoinit_funcs.h +++ /dev/null @@ -1,242 +0,0 @@ -/* - * AutoinitFuncs: Automatic Initialization and Deinitialization Functions - * CopyrightCopyright (C) 2014 Karlson2k (Evgeny Grin) - * - * This header is free software; you can redistribute it and / or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This header 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this header; if not, see - * . - */ - -/* - General usage is simple: include this header, declare or define two - functions with zero parameters (void) and any return type: one for - initialization and one for deinitialization, add - _SET_INIT_AND_DEINIT_FUNCS(FuncInitName, FuncDeInitName) to the code - and functions will be automatically called during application startup - and shutdown. - This is useful for libraries as libraries doesn't have direct access - to main() functions. - Example: - ------------------------------------------------- - #include - #include "autoinit_funcs.h" - - int someVar; - void* somePtr; - - void libInit(void) - { - someVar = 3; - somePtr = malloc(100); - } - - void libDeinit(void) - { - free(somePtr); - } - - _SET_INIT_AND_DEINIT_FUNCS(libInit,libDeinit); - ------------------------------------------------- - - If initializer or deinitializer functions is not needed, just define - it as empty function. - - This header should work with GCC, clang, MSVC (2010 or later). - Supported C and C++ languages; application, static and dynamic (DLL) - libraries; non-optimized (Debug) and optimized (Release) compilation - and linking. - - For more information see header code and comments in code. - */ -#ifndef AUTOINIT_FUNCS_INCLUDED -#define AUTOINIT_FUNCS_INCLUDED 1 - -/** -* Current version of the header. -* 0x01093001 = 1.9.30-1. -*/ -#define AUTOINIT_FUNCS_VERSION 0x01000001 - -#if defined(__GNUC__) -#/* if possible - check for supported attribute */ -#ifdef __has_attribute -#if !__has_attribute(constructor) || !__has_attribute(destructor) -#define _GNUC_ATTR_CONSTR_NOT_SUPPORTED 1 -#endif /* !__has_attribute(constructor) || !__has_attribute(destructor) */ -#endif /* __has_attribute */ -#endif /* __GNUC__ */ - -#if defined(__GNUC__) && !defined(_GNUC_ATTR_CONSTR_NOT_SUPPORTED) - -#define GNUC_SET_INIT_AND_DEINIT(FI,FD) \ - void __attribute__ ((constructor)) _GNUC_init_helper_##FI(void) \ - { (void)(FI)(); } \ - void __attribute__ ((destructor)) _GNUC_deinit_helper_##FD(void) \ - { (void)(FD)(); } \ - struct _GNUC_dummy_str_##FI{int i;} - -#define _SET_INIT_AND_DEINIT_FUNCS(FI,FD) GNUC_SET_INIT_AND_DEINIT(FI,FD) -#define _AUTOINIT_FUNCS_ARE_SUPPORTED 1 - -#elif defined (_MSC_FULL_VER) && _MSC_VER+0 >= 1600 - -/* Make sure that your project/sources define: - _LIB if building a static library (_LIB is ignored if _CONSOLE is defined); - _USRDLL if building DLL-library; - not defined both _LIB and _USRDLL if building an application */ - -/* Define AUTOINIT_FUNCS_DECLARE_STATIC_REG if you need macro declaration - for registering static initialization functions even if you building DLL */ -/* Define AUTOINIT_FUNCS_FORCE_STATIC_REG if you want to set main macro - _SET_INIT_AND_DEINIT_FUNCS to static version even if building a DLL*/ - -/* Stringify macros */ -#define _INSTRMACRO(a) #a -#define _STRMACRO(a) _INSTRMACRO(a) - -#if !defined(_USRDLL) || defined(AUTOINIT_FUNCS_DECLARE_STATIC_REG) - -/* required for atexit() */ -#include - -/* Use "C" linkage for variable to simplify variable decoration */ -#ifdef __cplusplus -#define W32_INITVARDECL extern "C" -#else -#define W32_INITVARDECL extern -#endif - -/* How variable is decorated by compiler */ -#if defined(_M_X64) || defined(_M_AMD64) -#define W32_VARDECORPREFIX -#define W32_DECORVARNAME(v) v -#define W32_VARDECORPEFIXSTR "" -#elif defined(_M_IX86) || defined(_X86_) -#define W32_VARDECORPREFIX _ -#define W32_DECORVARNAME(v) _##v -#define W32_VARDECORPEFIXSTR "_" -#else -#error Do not know how to decorate symbols for this architecture -#endif - -/* Internal variable prefix (can be any) */ -#define W32_INITHELPERVARNAME(f) _initHelperDummy_##f -#define W32_INITHELPERVARNAMEDECORSTR(f) W32_VARDECORPEFIXSTR _STRMACRO(W32_INITHELPERVARNAME(f)) - -/* Declare section (segment), put variable pointing to init function to chosen segment, - force linker to include variable to avoid omitting by optimizer */ -/* Initialization function must be declared as - int __cdecl FuncName(void) */ -/* Return value is ignored for C++ initializers */ -/* For C initializers: startup process is aborted if initializer return non-zero */ -#define W32_FPTR_IN_SEG(S,F) \ - __pragma(section(S,long,read)) \ - __pragma(comment(linker, "/INCLUDE:" W32_INITHELPERVARNAMEDECORSTR(F))) \ - W32_INITVARDECL __declspec(allocate(S)) int(__cdecl *W32_INITHELPERVARNAME(F))(void) = &F - -/* Section (segment) names for pointers to initializers */ -#define W32_SEG_INIT_C_USER ".CRT$XCU" -#define W32_SEG_INIT_C_LIB ".CRT$XCL" -#define W32_SEG_INIT_CXX_USER ".CRT$XIU" -#define W32_SEG_INIT_CXX_LIB ".CRT$XIL" - -/* Declare macro for different initializers sections */ -/* Macro can be used several times to register several initializers */ -/* Once function is registered as initializer, it will be called automatically - during application startup */ -/* "lib" initializers are called before "user" initializers */ -/* "C" initializers are called before "C++" initializers */ -#define W32_REG_INIT_C_USER(F) W32_FPTR_IN_SEG(W32_SEG_INIT_C_USER,F) -#define W32_REG_INIT_C_LIB(F) W32_FPTR_IN_SEG(W32_SEG_INIT_C_LIB,F) -#define W32_REG_INIT_CXX_USER(F) W32_FPTR_IN_SEG(W32_SEG_INIT_CXX_USER,F) -#define W32_REG_INIT_CXX_LIB(F) W32_FPTR_IN_SEG(W32_SEG_INIT_CXX_LIB,F) - -/* Choose main register macro based on language and program type */ -/* Assuming that _LIB or _USRDLL is defined for static or DLL-library */ -/* Macro can be used several times to register several initializers */ -/* Once function is registered as initializer, it will be called automatically - during application startup */ -/* Define AUTOINIT_FUNCS_FORCE_USER_LVL_INIT to register initializers - at user level even if building library */ -#ifdef __cplusplus -#if ((defined(_LIB) && !defined(_CONSOLE)) || defined(_USRDLL)) && !defined(AUTOINIT_FUNCS_FORCE_USER_LVL_INIT) -#define W32_REGISTER_INIT(F) W32_REG_INIT_CXX_LIB(F) -#else /* ! _LIB && ! _DLL */ -#define W32_REGISTER_INIT(F) W32_REG_INIT_CXX_USER(F) -#endif /* ! _LIB && ! _DLL */ -#else /* !__cplusplus*/ -#if ((defined(_LIB) && !defined(_CONSOLE)) || defined(_USRDLL)) && !defined(AUTOINIT_FUNCS_FORCE_USER_LVL_INIT) -#define W32_REGISTER_INIT(F) W32_REG_INIT_C_LIB(F) -#else /* ! _LIB && ! _DLL */ -#define W32_REGISTER_INIT(F) W32_REG_INIT_C_USER(F) -#endif /* ! _LIB && ! _DLL */ -#endif /* !__cplusplus*/ - -#else /* _USRDLL */ - -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* WIN32_LEAN_AND_MEAN */ -/* Required for DllMain */ -#include -#endif /* _USRDLL */ - - -#if !defined(_USRDLL) || defined(AUTOINIT_FUNCS_FORCE_STATIC_REG) -#define W32_SET_INIT_AND_DEINIT(FI,FD) \ - void __cdecl _W32_deinit_helper_##FD(void) \ - { (void)(FD)(); } \ - int __cdecl _W32_init_helper_##FI(void) \ - { (void)(FI)(); atexit(_W32_deinit_helper_##FD); return 0; } \ - W32_REGISTER_INIT(_W32_init_helper_##FI) -#else /* _USRDLL */ - -/* If DllMain is already present in code, define AUTOINIT_FUNCS_CALL_USR_DLLMAIN - and rename DllMain to usr_DllMain */ -#ifndef AUTOINIT_FUNCS_CALL_USR_DLLMAIN -#define W32_SET_INIT_AND_DEINIT(FI,FD) \ - BOOL WINAPI DllMain(HINSTANCE hinst,DWORD reason,LPVOID unused) \ - { if(DLL_PROCESS_ATTACH==reason) {(void)(FI)();} \ - else if(DLL_PROCESS_DETACH==reason) {(void)(FD)();} \ - return TRUE; \ - } struct _W32_dummy_strc_##FI{int i;} -#else /* AUTOINIT_FUNCS_CALL_USR_DLLMAIN */ -#define W32_SET_INIT_AND_DEINIT(FI,FD) \ - BOOL WINAPI usr_DllMain(HINSTANCE hinst,DWORD reason,LPVOID unused); \ - BOOL WINAPI DllMain(HINSTANCE hinst,DWORD reason,LPVOID unused) \ - { if(DLL_PROCESS_ATTACH==reason) {(void)(FI)();} \ - else if(DLL_PROCESS_DETACH==reason) {(void)(FD)();} \ - return usr_DllMain(hinst,reason,unused); \ - } struct _W32_dummy_strc_##FI{int i;} -#endif /* AUTOINIT_FUNCS_CALL_USR_DLLMAIN */ -#endif /* _USRDLL */ - -#define _SET_INIT_AND_DEINIT_FUNCS(FI,FD) W32_SET_INIT_AND_DEINIT(FI,FD) -/* Indicate that automatic initializers/deinitializers are supported */ -#define _AUTOINIT_FUNCS_ARE_SUPPORTED 1 - -#else /* !__GNUC__ && !_MSC_FULL_VER */ - -/* Define EMIT_ERROR_IF_AUTOINIT_FUNCS_ARE_NOT_SUPPORTED before inclusion of header to - abort compilation if automatic initializers/deinitializers are not supported */ -#ifdef EMIT_ERROR_IF_AUTOINIT_FUNCS_ARE_NOT_SUPPORTED -#error Compiler/platform don not support automatic calls of user-defined initializer and deinitializer -#endif /* EMIT_ERROR_IF_AUTOINIT_FUNCS_ARE_NOT_SUPPORTED */ - -/* Do nothing */ -#define _SET_INIT_AND_DEINIT_FUNCS(FI,FD) -/* Indicate that automatic initializers/deinitializers are not supported */ -#define _AUTOINIT_FUNCS_ARE_NOT_SUPPORTED 1 - -#endif /* !__GNUC__ && !_MSC_FULL_VER */ -#endif /* !AUTOINIT_FUNCS_INCLUDED */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/include/microhttpd.h b/src/hos_libhttpserver/src/libmicrohttpd/src/include/microhttpd.h deleted file mode 100644 index ca3bb869..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/include/microhttpd.h +++ /dev/null @@ -1,2675 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2006-2015 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file microhttpd.h - * @brief public interface to libmicrohttpd - * @author Christian Grothoff - * @author Chris GauthierDickey - * - * All symbols defined in this header start with MHD. MHD is a small - * HTTP daemon library. As such, it does not have any API for logging - * errors (you can only enable or disable logging to stderr). Also, - * it may not support all of the HTTP features directly, where - * applicable, portions of HTTP may have to be handled by clients of - * the library. - * - * The library is supposed to handle everything that it must handle - * (because the API would not allow clients to do this), such as basic - * connection management; however, detailed interpretations of headers - * -- such as range requests -- and HTTP methods are left to clients. - * The library does understand HEAD and will only send the headers of - * the response and not the body, even if the client supplied a body. - * The library also understands headers that control connection - * management (specifically, "Connection: close" and "Expect: 100 - * continue" are understood and handled automatically). - * - * MHD understands POST data and is able to decode certain formats - * (at the moment only "application/x-www-form-urlencoded" and - * "mulitpart/formdata"). Unsupported encodings and large POST - * submissions may require the application to manually process - * the stream, which is provided to the main application (and thus can be - * processed, just not conveniently by MHD). - * - * The header file defines various constants used by the HTTP protocol. - * This does not mean that MHD actually interprets all of these - * values. The provided constants are exported as a convenience - * for users of the library. MHD does not verify that transmitted - * HTTP headers are part of the standard specification; users of the - * library are free to define their own extensions of the HTTP - * standard and use those with MHD. - * - * All functions are guaranteed to be completely reentrant and - * thread-safe (with the exception of #MHD_set_connection_value, - * which must only be used in a particular context). - * - * NEW: Before including "microhttpd.h" you should add the necessary - * includes to define the `uint64_t`, `size_t`, `fd_set`, `socklen_t` - * and `struct sockaddr` data types (which headers are needed may - * depend on your platform; for possible suggestions consult - * "platform.h" in the MHD distribution). If you have done so, you - * should also have a line with "#define MHD_PLATFORM_H" which will - * prevent this header from trying (and, depending on your platform, - * failing) to include the right headers. - * - * @defgroup event event-loop control - * MHD API to start and stop the HTTP server and manage the event loop. - * @defgroup response generation of responses - * MHD API used to generate responses. - * @defgroup request handling of requests - * MHD API used to access information about requests. - * @defgroup authentication HTTP authentication - * MHD API related to basic and digest HTTP authentication. - * @defgroup logging logging - * MHD API to mange logging and error handling - * @defgroup specialized misc. specialized functions - * This group includes functions that do not fit into any particular - * category and that are rarely used. - */ - -#ifndef MHD_MICROHTTPD_H -#define MHD_MICROHTTPD_H - -#ifdef __cplusplus -extern "C" -{ -#if 0 /* keep Emacsens' auto-indent happy */ -} -#endif -#endif - -/* While we generally would like users to use a configure-driven - build process which detects which headers are present and - hence works on any platform, we use "standard" includes here - to build out-of-the-box for beginning users on common systems. - - Once you have a proper build system and go for more exotic - platforms, you should define MHD_PLATFORM_H in some header that - you always include *before* "microhttpd.h". Then the following - "standard" includes won't be used (which might be a good - idea, especially on platforms where they do not exist). */ -#ifndef MHD_PLATFORM_H -#include -#include -#include -#if defined(_WIN32) && !defined(__CYGWIN__) -#include -#if defined(_MSC_FULL_VER) && !defined (_SSIZE_T_DEFINED) -#define _SSIZE_T_DEFINED -typedef intptr_t ssize_t; -#endif // !_SSIZE_T_DEFINED */ -#else -#include -#include -#include -#endif -#endif - -#if defined(__CYGWIN__) && !defined(_SYS_TYPES_FD_SET) -/* Do not define __USE_W32_SOCKETS under Cygwin! */ -#error Cygwin with winsock fd_set is not supported -#endif - -/** - * Current version of the library. - * 0x01093001 = 1.9.30-1. - */ -#define MHD_VERSION 0x00094200 - -/** - * MHD-internal return code for "YES". - */ -#define MHD_YES 1 - -/** - * MHD-internal return code for "NO". - */ -#define MHD_NO 0 - -/** - * MHD digest auth internal code for an invalid nonce. - */ -#define MHD_INVALID_NONCE -1 - -/** - * Constant used to indicate unknown size (use when - * creating a response). - */ -#ifdef UINT64_MAX -#define MHD_SIZE_UNKNOWN UINT64_MAX -#else -#define MHD_SIZE_UNKNOWN ((uint64_t) -1LL) -#endif - -#ifdef SIZE_MAX -#define MHD_CONTENT_READER_END_OF_STREAM SIZE_MAX -#define MHD_CONTENT_READER_END_WITH_ERROR (SIZE_MAX - 1) -#else -#define MHD_CONTENT_READER_END_OF_STREAM ((size_t) -1LL) -#define MHD_CONTENT_READER_END_WITH_ERROR (((size_t) -1LL) - 1) -#endif - -#ifndef _MHD_EXTERN -#if defined(_WIN32) && defined(MHD_W32LIB) -#define _MHD_EXTERN extern -#elif defined (_WIN32) && defined(MHD_W32DLL) -/* Define MHD_W32DLL when using MHD as W32 .DLL to speed up linker a little */ -#define _MHD_EXTERN __declspec(dllimport) -#else -#define _MHD_EXTERN extern -#endif -#endif - -#ifndef MHD_SOCKET_DEFINED -/** - * MHD_socket is type for socket FDs - */ -#if !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) -#define MHD_POSIX_SOCKETS 1 -typedef int MHD_socket; -#define MHD_INVALID_SOCKET (-1) -#else /* !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) */ -#define MHD_WINSOCK_SOCKETS 1 -#include -typedef SOCKET MHD_socket; -#define MHD_INVALID_SOCKET (INVALID_SOCKET) -#endif /* !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) */ -#define MHD_SOCKET_DEFINED 1 -#endif /* MHD_SOCKET_DEFINED */ - -/** - * Not all architectures and `printf()`'s support the `long long` type. - * This gives the ability to replace `long long` with just a `long`, - * standard `int` or a `short`. - */ -#ifndef MHD_LONG_LONG -/** - * @deprecated use #MHD_UNSIGNED_LONG_LONG instead! - */ -#define MHD_LONG_LONG long long -#define MHD_UNSIGNED_LONG_LONG unsigned long long -#endif -/** - * Format string for printing a variable of type #MHD_LONG_LONG. - * You should only redefine this if you also define #MHD_LONG_LONG. - */ -#ifndef MHD_LONG_LONG_PRINTF -/** - * @deprecated use #MHD_UNSIGNED_LONG_LONG_PRINTF instead! - */ -#define MHD_LONG_LONG_PRINTF "ll" -#define MHD_UNSIGNED_LONG_LONG_PRINTF "%llu" -#endif - - -/** - * @defgroup httpcode HTTP response codes. - * These are the status codes defined for HTTP responses. - * @{ - */ -#define MHD_HTTP_CONTINUE 100 -#define MHD_HTTP_SWITCHING_PROTOCOLS 101 -#define MHD_HTTP_PROCESSING 102 - -#define MHD_HTTP_OK 200 -#define MHD_HTTP_CREATED 201 -#define MHD_HTTP_ACCEPTED 202 -#define MHD_HTTP_NON_AUTHORITATIVE_INFORMATION 203 -#define MHD_HTTP_NO_CONTENT 204 -#define MHD_HTTP_RESET_CONTENT 205 -#define MHD_HTTP_PARTIAL_CONTENT 206 -#define MHD_HTTP_MULTI_STATUS 207 - -#define MHD_HTTP_MULTIPLE_CHOICES 300 -#define MHD_HTTP_MOVED_PERMANENTLY 301 -#define MHD_HTTP_FOUND 302 -#define MHD_HTTP_SEE_OTHER 303 -#define MHD_HTTP_NOT_MODIFIED 304 -#define MHD_HTTP_USE_PROXY 305 -#define MHD_HTTP_SWITCH_PROXY 306 -#define MHD_HTTP_TEMPORARY_REDIRECT 307 - -#define MHD_HTTP_BAD_REQUEST 400 -#define MHD_HTTP_UNAUTHORIZED 401 -#define MHD_HTTP_PAYMENT_REQUIRED 402 -#define MHD_HTTP_FORBIDDEN 403 -#define MHD_HTTP_NOT_FOUND 404 -#define MHD_HTTP_METHOD_NOT_ALLOWED 405 -#define MHD_HTTP_NOT_ACCEPTABLE 406 -/** @deprecated */ -#define MHD_HTTP_METHOD_NOT_ACCEPTABLE 406 -#define MHD_HTTP_PROXY_AUTHENTICATION_REQUIRED 407 -#define MHD_HTTP_REQUEST_TIMEOUT 408 -#define MHD_HTTP_CONFLICT 409 -#define MHD_HTTP_GONE 410 -#define MHD_HTTP_LENGTH_REQUIRED 411 -#define MHD_HTTP_PRECONDITION_FAILED 412 -#define MHD_HTTP_REQUEST_ENTITY_TOO_LARGE 413 -#define MHD_HTTP_REQUEST_URI_TOO_LONG 414 -#define MHD_HTTP_UNSUPPORTED_MEDIA_TYPE 415 -#define MHD_HTTP_REQUESTED_RANGE_NOT_SATISFIABLE 416 -#define MHD_HTTP_EXPECTATION_FAILED 417 -#define MHD_HTTP_UNPROCESSABLE_ENTITY 422 -#define MHD_HTTP_LOCKED 423 -#define MHD_HTTP_FAILED_DEPENDENCY 424 -#define MHD_HTTP_UNORDERED_COLLECTION 425 -#define MHD_HTTP_UPGRADE_REQUIRED 426 -#define MHD_HTTP_NO_RESPONSE 444 -#define MHD_HTTP_RETRY_WITH 449 -#define MHD_HTTP_BLOCKED_BY_WINDOWS_PARENTAL_CONTROLS 450 -#define MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS 451 - -#define MHD_HTTP_INTERNAL_SERVER_ERROR 500 -#define MHD_HTTP_NOT_IMPLEMENTED 501 -#define MHD_HTTP_BAD_GATEWAY 502 -#define MHD_HTTP_SERVICE_UNAVAILABLE 503 -#define MHD_HTTP_GATEWAY_TIMEOUT 504 -#define MHD_HTTP_HTTP_VERSION_NOT_SUPPORTED 505 -#define MHD_HTTP_VARIANT_ALSO_NEGOTIATES 506 -#define MHD_HTTP_INSUFFICIENT_STORAGE 507 -#define MHD_HTTP_BANDWIDTH_LIMIT_EXCEEDED 509 -#define MHD_HTTP_NOT_EXTENDED 510 - -/** @} */ /* end of group httpcode */ - -/** - * Flag to be or-ed with MHD_HTTP status code for - * SHOUTcast. This will cause the response to begin - * with the SHOUTcast "ICY" line instad of "HTTP". - * @ingroup specialized - */ -#define MHD_ICY_FLAG ((uint32_t)(((uint32_t)1) << 31)) - -/** - * @defgroup headers HTTP headers - * These are the standard headers found in HTTP requests and responses. - * @{ - */ -/* See also: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html */ -#define MHD_HTTP_HEADER_ACCEPT "Accept" -#define MHD_HTTP_HEADER_ACCEPT_CHARSET "Accept-Charset" -#define MHD_HTTP_HEADER_ACCEPT_ENCODING "Accept-Encoding" -#define MHD_HTTP_HEADER_ACCEPT_LANGUAGE "Accept-Language" -#define MHD_HTTP_HEADER_ACCEPT_RANGES "Accept-Ranges" -#define MHD_HTTP_HEADER_AGE "Age" -#define MHD_HTTP_HEADER_ALLOW "Allow" -#define MHD_HTTP_HEADER_AUTHORIZATION "Authorization" -#define MHD_HTTP_HEADER_CACHE_CONTROL "Cache-Control" -#define MHD_HTTP_HEADER_CONNECTION "Connection" -#define MHD_HTTP_HEADER_CONTENT_ENCODING "Content-Encoding" -#define MHD_HTTP_HEADER_CONTENT_LANGUAGE "Content-Language" -#define MHD_HTTP_HEADER_CONTENT_LENGTH "Content-Length" -#define MHD_HTTP_HEADER_CONTENT_LOCATION "Content-Location" -#define MHD_HTTP_HEADER_CONTENT_MD5 "Content-MD5" -#define MHD_HTTP_HEADER_CONTENT_RANGE "Content-Range" -#define MHD_HTTP_HEADER_CONTENT_TYPE "Content-Type" -#define MHD_HTTP_HEADER_COOKIE "Cookie" -#define MHD_HTTP_HEADER_DATE "Date" -#define MHD_HTTP_HEADER_ETAG "ETag" -#define MHD_HTTP_HEADER_EXPECT "Expect" -#define MHD_HTTP_HEADER_EXPIRES "Expires" -#define MHD_HTTP_HEADER_FROM "From" -#define MHD_HTTP_HEADER_HOST "Host" -#define MHD_HTTP_HEADER_IF_MATCH "If-Match" -#define MHD_HTTP_HEADER_IF_MODIFIED_SINCE "If-Modified-Since" -#define MHD_HTTP_HEADER_IF_NONE_MATCH "If-None-Match" -#define MHD_HTTP_HEADER_IF_RANGE "If-Range" -#define MHD_HTTP_HEADER_IF_UNMODIFIED_SINCE "If-Unmodified-Since" -#define MHD_HTTP_HEADER_LAST_MODIFIED "Last-Modified" -#define MHD_HTTP_HEADER_LOCATION "Location" -#define MHD_HTTP_HEADER_MAX_FORWARDS "Max-Forwards" -#define MHD_HTTP_HEADER_PRAGMA "Pragma" -#define MHD_HTTP_HEADER_PROXY_AUTHENTICATE "Proxy-Authenticate" -#define MHD_HTTP_HEADER_PROXY_AUTHORIZATION "Proxy-Authorization" -#define MHD_HTTP_HEADER_RANGE "Range" -/* This is not a typo, see HTTP spec */ -#define MHD_HTTP_HEADER_REFERER "Referer" -#define MHD_HTTP_HEADER_RETRY_AFTER "Retry-After" -#define MHD_HTTP_HEADER_SERVER "Server" -#define MHD_HTTP_HEADER_SET_COOKIE "Set-Cookie" -#define MHD_HTTP_HEADER_SET_COOKIE2 "Set-Cookie2" -#define MHD_HTTP_HEADER_TE "TE" -#define MHD_HTTP_HEADER_TRAILER "Trailer" -#define MHD_HTTP_HEADER_TRANSFER_ENCODING "Transfer-Encoding" -#define MHD_HTTP_HEADER_UPGRADE "Upgrade" -#define MHD_HTTP_HEADER_USER_AGENT "User-Agent" -#define MHD_HTTP_HEADER_VARY "Vary" -#define MHD_HTTP_HEADER_VIA "Via" -#define MHD_HTTP_HEADER_WARNING "Warning" -#define MHD_HTTP_HEADER_WWW_AUTHENTICATE "WWW-Authenticate" -#define MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN "Access-Control-Allow-Origin" - -/** @} */ /* end of group headers */ - -/** - * @defgroup versions HTTP versions - * These strings should be used to match against the first line of the - * HTTP header. - * @{ - */ -#define MHD_HTTP_VERSION_1_0 "HTTP/1.0" -#define MHD_HTTP_VERSION_1_1 "HTTP/1.1" - -/** @} */ /* end of group versions */ - -/** - * @defgroup methods HTTP methods - * Standard HTTP methods (as strings). - * @{ - */ -#define MHD_HTTP_METHOD_CONNECT "CONNECT" -#define MHD_HTTP_METHOD_DELETE "DELETE" -#define MHD_HTTP_METHOD_GET "GET" -#define MHD_HTTP_METHOD_HEAD "HEAD" -#define MHD_HTTP_METHOD_OPTIONS "OPTIONS" -#define MHD_HTTP_METHOD_POST "POST" -#define MHD_HTTP_METHOD_PUT "PUT" -#define MHD_HTTP_METHOD_PATCH "PATCH" -#define MHD_HTTP_METHOD_TRACE "TRACE" - -/** @} */ /* end of group methods */ - -/** - * @defgroup postenc HTTP POST encodings - * See also: http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4 - * @{ - */ -#define MHD_HTTP_POST_ENCODING_FORM_URLENCODED "application/x-www-form-urlencoded" -#define MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA "multipart/form-data" - -/** @} */ /* end of group postenc */ - - -/** - * @brief Handle for the daemon (listening on a socket for HTTP traffic). - * @ingroup event - */ -struct MHD_Daemon; - -/** - * @brief Handle for a connection / HTTP request. - * - * With HTTP/1.1, multiple requests can be run over the same - * connection. However, MHD will only show one request per TCP - * connection to the client at any given time. - * @ingroup request - */ -struct MHD_Connection; - -/** - * @brief Handle for a response. - * @ingroup response - */ -struct MHD_Response; - -/** - * @brief Handle for POST processing. - * @ingroup response - */ -struct MHD_PostProcessor; - - -/** - * @brief Flags for the `struct MHD_Daemon`. - * - * Note that if neither #MHD_USE_THREAD_PER_CONNECTION nor - * #MHD_USE_SELECT_INTERNALLY is used, the client wants control over - * the process and will call the appropriate microhttpd callbacks. - * - * Starting the daemon may also fail if a particular option is not - * implemented or not supported on the target platform (i.e. no - * support for SSL, threads or IPv6). - */ -enum MHD_FLAG -{ - /** - * No options selected. - */ - MHD_NO_FLAG = 0, - - /** - * Run in debug mode. If this flag is used, the library should - * print error messages and warnings to `stderr`. - */ - MHD_USE_DEBUG = 1, - - /** - * Run in HTTPS mode. - */ - MHD_USE_SSL = 2, - - /** - * Run using one thread per connection. - */ - MHD_USE_THREAD_PER_CONNECTION = 4, - - /** - * Run using an internal thread (or thread pool) doing `select()`. - */ - MHD_USE_SELECT_INTERNALLY = 8, - - /** - * Run using the IPv6 protocol (otherwise, MHD will just support - * IPv4). If you want MHD to support IPv4 and IPv6 using a single - * socket, pass #MHD_USE_DUAL_STACK, otherwise, if you only pass - * this option, MHD will try to bind to IPv6-only (resulting in - * no IPv4 support). - */ - MHD_USE_IPv6 = 16, - - /** - * Be pedantic about the protocol (as opposed to as tolerant as - * possible). Specifically, at the moment, this flag causes MHD to - * reject HTTP 1.1 connections without a "Host" header. This is - * required by the standard, but of course in violation of the "be - * as liberal as possible in what you accept" norm. It is - * recommended to turn this ON if you are testing clients against - * MHD, and OFF in production. - */ - MHD_USE_PEDANTIC_CHECKS = 32, - - /** - * Use `poll()` instead of `select()`. This allows sockets with `fd >= - * FD_SETSIZE`. This option is not compatible with using an - * 'external' `select()` mode (as there is no API to get the file - * descriptors for the external select from MHD) and must also not - * be used in combination with #MHD_USE_EPOLL_LINUX_ONLY. - */ - MHD_USE_POLL = 64, - - /** - * Run using an internal thread (or thread pool) doing `poll()`. - */ - MHD_USE_POLL_INTERNALLY = MHD_USE_SELECT_INTERNALLY | MHD_USE_POLL, - - /** - * Suppress (automatically) adding the 'Date:' header to HTTP responses. - * This option should ONLY be used on systems that do not have a clock - * and that DO provide other mechanisms for cache control. See also - * RFC 2616, section 14.18 (exception 3). - */ - MHD_SUPPRESS_DATE_NO_CLOCK = 128, - - /** - * Run without a listen socket. This option only makes sense if - * #MHD_add_connection is to be used exclusively to connect HTTP - * clients to the HTTP server. This option is incompatible with - * using a thread pool; if it is used, #MHD_OPTION_THREAD_POOL_SIZE - * is ignored. - */ - MHD_USE_NO_LISTEN_SOCKET = 256, - - /** - * Use `epoll()` instead of `select()` or `poll()` for the event loop. - * This option is only available on Linux; using the option on - * non-Linux systems will cause #MHD_start_daemon to fail. - */ - MHD_USE_EPOLL_LINUX_ONLY = 512, - - /** - * Run using an internal thread (or thread pool) doing `epoll()`. - * This option is only available on Linux; using the option on - * non-Linux systems will cause #MHD_start_daemon to fail. - */ - MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY = MHD_USE_SELECT_INTERNALLY | MHD_USE_EPOLL_LINUX_ONLY, - - /** - * Force MHD to use a signal pipe to notify the event loop (of - * threads) of our shutdown. This is required if an appliction uses - * #MHD_USE_SELECT_INTERNALLY or #MHD_USE_THREAD_PER_CONNECTION and - * then performs #MHD_quiesce_daemon (which eliminates our ability - * to signal termination via the listen socket). In these modes, - * #MHD_quiesce_daemon will fail if this option was not set. Also, - * use of this option is automatic (as in, you do not even have to - * specify it), if #MHD_USE_NO_LISTEN_SOCKET is specified. In - * "external" `select()` mode, this option is always simply ignored. - * MHD can be build for use a pair of sockets instead of a pipe. - * Pair of sockets is forced on W32. - * - * You must also use this option if you use internal select mode - * or a thread pool in conjunction with #MHD_add_connection. - */ - MHD_USE_PIPE_FOR_SHUTDOWN = 1024, - - /** - * Use a single socket for IPv4 and IPv6. - */ - MHD_USE_DUAL_STACK = MHD_USE_IPv6 | 2048, - - /** - * Enable `epoll()` turbo. Disables certain calls to `shutdown()` - * and enables aggressive non-blocking optimisitc reads. - * Most effects only happen with #MHD_USE_EPOLL_LINUX_ONLY. - * Enalbed always on W32 as winsock does not properly behave - * with `shutdown()` and this then fixes potential problems. - */ - MHD_USE_EPOLL_TURBO = 4096, - - /** - * Enable suspend/resume functions, which also implies setting up - * pipes to signal resume. - */ - MHD_USE_SUSPEND_RESUME = 8192 | MHD_USE_PIPE_FOR_SHUTDOWN, - - /** - * Enable TCP_FASTOPEN option. This option is only available on Linux with a - * kernel >= 3.6. On other systems, using this option cases #MHD_start_daemon - * to fail. - */ - MHD_USE_TCP_FASTOPEN = 16384 - -}; - - -/** - * Type of a callback function used for logging by MHD. - * - * @param cls closure - * @param fm format string (`printf()`-style) - * @param ap arguments to @a fm - * @ingroup logging - */ -typedef void (*MHD_LogCallback)(void *cls, const char *fm, va_list ap); - - -/** - * @brief MHD options. - * - * Passed in the varargs portion of #MHD_start_daemon. - */ -enum MHD_OPTION -{ - - /** - * No more options / last option. This is used - * to terminate the VARARGs list. - */ - MHD_OPTION_END = 0, - - /** - * Maximum memory size per connection (followed by a `size_t`). - * Default is 32 kb (#MHD_POOL_SIZE_DEFAULT). - * Values above 128k are unlikely to result in much benefit, as half - * of the memory will be typically used for IO, and TCP buffers are - * unlikely to support window sizes above 64k on most systems. - */ - MHD_OPTION_CONNECTION_MEMORY_LIMIT = 1, - - /** - * Maximum number of concurrent connections to - * accept (followed by an `unsigned int`). - */ - MHD_OPTION_CONNECTION_LIMIT = 2, - - /** - * After how many seconds of inactivity should a - * connection automatically be timed out? (followed - * by an `unsigned int`; use zero for no timeout). - */ - MHD_OPTION_CONNECTION_TIMEOUT = 3, - - /** - * Register a function that should be called whenever a request has - * been completed (this can be used for application-specific clean - * up). Requests that have never been presented to the application - * (via #MHD_AccessHandlerCallback) will not result in - * notifications. - * - * This option should be followed by TWO pointers. First a pointer - * to a function of type #MHD_RequestCompletedCallback and second a - * pointer to a closure to pass to the request completed callback. - * The second pointer maybe NULL. - */ - MHD_OPTION_NOTIFY_COMPLETED = 4, - - /** - * Limit on the number of (concurrent) connections made to the - * server from the same IP address. Can be used to prevent one - * IP from taking over all of the allowed connections. If the - * same IP tries to establish more than the specified number of - * connections, they will be immediately rejected. The option - * should be followed by an `unsigned int`. The default is - * zero, which means no limit on the number of connections - * from the same IP address. - */ - MHD_OPTION_PER_IP_CONNECTION_LIMIT = 5, - - /** - * Bind daemon to the supplied `struct sockaddr`. This option should - * be followed by a `struct sockaddr *`. If #MHD_USE_IPv6 is - * specified, the `struct sockaddr*` should point to a `struct - * sockaddr_in6`, otherwise to a `struct sockaddr_in`. - */ - MHD_OPTION_SOCK_ADDR = 6, - - /** - * Specify a function that should be called before parsing the URI from - * the client. The specified callback function can be used for processing - * the URI (including the options) before it is parsed. The URI after - * parsing will no longer contain the options, which maybe inconvenient for - * logging. This option should be followed by two arguments, the first - * one must be of the form - * - * void * my_logger(void *cls, const char *uri, struct MHD_Connection *con) - * - * where the return value will be passed as - * (`* con_cls`) in calls to the #MHD_AccessHandlerCallback - * when this request is processed later; returning a - * value of NULL has no special significance (however, - * note that if you return non-NULL, you can no longer - * rely on the first call to the access handler having - * `NULL == *con_cls` on entry;) - * "cls" will be set to the second argument following - * #MHD_OPTION_URI_LOG_CALLBACK. Finally, uri will - * be the 0-terminated URI of the request. - * - * Note that during the time of this call, most of the connection's - * state is not initialized (as we have not yet parsed he headers). - * However, information about the connecting client (IP, socket) - * is available. - */ - MHD_OPTION_URI_LOG_CALLBACK = 7, - - /** - * Memory pointer for the private key (key.pem) to be used by the - * HTTPS daemon. This option should be followed by a - * `const char *` argument. - * This should be used in conjunction with #MHD_OPTION_HTTPS_MEM_CERT. - */ - MHD_OPTION_HTTPS_MEM_KEY = 8, - - /** - * Memory pointer for the certificate (cert.pem) to be used by the - * HTTPS daemon. This option should be followed by a - * `const char *` argument. - * This should be used in conjunction with #MHD_OPTION_HTTPS_MEM_KEY. - */ - MHD_OPTION_HTTPS_MEM_CERT = 9, - - /** - * Daemon credentials type. - * Followed by an argument of type - * `gnutls_credentials_type_t`. - */ - MHD_OPTION_HTTPS_CRED_TYPE = 10, - - /** - * Memory pointer to a `const char *` specifying the - * cipher algorithm (default: "NORMAL"). - */ - MHD_OPTION_HTTPS_PRIORITIES = 11, - - /** - * Pass a listen socket for MHD to use (systemd-style). If this - * option is used, MHD will not open its own listen socket(s). The - * argument passed must be of type `int` and refer to an - * existing socket that has been bound to a port and is listening. - */ - MHD_OPTION_LISTEN_SOCKET = 12, - - /** - * Use the given function for logging error messages. This option - * must be followed by two arguments; the first must be a pointer to - * a function of type #MHD_LogCallback and the second a pointer - * `void *` which will be passed as the first argument to the log - * callback. - * - * Note that MHD will not generate any log messages - * if it was compiled without the "--enable-messages" - * flag being set. - */ - MHD_OPTION_EXTERNAL_LOGGER = 13, - - /** - * Number (`unsigned int`) of threads in thread pool. Enable - * thread pooling by setting this value to to something - * greater than 1. Currently, thread model must be - * #MHD_USE_SELECT_INTERNALLY if thread pooling is enabled - * (#MHD_start_daemon returns NULL for an unsupported thread - * model). - */ - MHD_OPTION_THREAD_POOL_SIZE = 14, - - /** - * Additional options given in an array of `struct MHD_OptionItem`. - * The array must be terminated with an entry `{MHD_OPTION_END, 0, NULL}`. - * An example for code using #MHD_OPTION_ARRAY is: - * - * struct MHD_OptionItem ops[] = { - * { MHD_OPTION_CONNECTION_LIMIT, 100, NULL }, - * { MHD_OPTION_CONNECTION_TIMEOUT, 10, NULL }, - * { MHD_OPTION_END, 0, NULL } - * }; - * d = MHD_start_daemon (0, 8080, NULL, NULL, dh, NULL, - * MHD_OPTION_ARRAY, ops, - * MHD_OPTION_END); - * - * For options that expect a single pointer argument, the - * second member of the `struct MHD_OptionItem` is ignored. - * For options that expect two pointer arguments, the first - * argument must be cast to `intptr_t`. - */ - MHD_OPTION_ARRAY = 15, - - /** - * Specify a function that should be called for unescaping escape - * sequences in URIs and URI arguments. Note that this function - * will NOT be used by the `struct MHD_PostProcessor`. If this - * option is not specified, the default method will be used which - * decodes escape sequences of the form "%HH". This option should - * be followed by two arguments, the first one must be of the form - * - * size_t my_unescaper(void *cls, - * struct MHD_Connection *c, - * char *s) - * - * where the return value must be "strlen(s)" and "s" should be - * updated. Note that the unescape function must not lengthen "s" - * (the result must be shorter than the input and still be - * 0-terminated). "cls" will be set to the second argument - * following #MHD_OPTION_UNESCAPE_CALLBACK. - */ - MHD_OPTION_UNESCAPE_CALLBACK = 16, - - /** - * Memory pointer for the random values to be used by the Digest - * Auth module. This option should be followed by two arguments. - * First an integer of type `size_t` which specifies the size - * of the buffer pointed to by the second argument in bytes. - * Note that the application must ensure that the buffer of the - * second argument remains allocated and unmodified while the - * deamon is running. - */ - MHD_OPTION_DIGEST_AUTH_RANDOM = 17, - - /** - * Size of the internal array holding the map of the nonce and - * the nonce counter. This option should be followed by an `unsigend int` - * argument. - */ - MHD_OPTION_NONCE_NC_SIZE = 18, - - /** - * Desired size of the stack for threads created by MHD. Followed - * by an argument of type `size_t`. Use 0 for system default. - */ - MHD_OPTION_THREAD_STACK_SIZE = 19, - - /** - * Memory pointer for the certificate (ca.pem) to be used by the - * HTTPS daemon for client authentification. - * This option should be followed by a `const char *` argument. - */ - MHD_OPTION_HTTPS_MEM_TRUST = 20, - - /** - * Increment to use for growing the read buffer (followed by a - * `size_t`). Must fit within #MHD_OPTION_CONNECTION_MEMORY_LIMIT. - */ - MHD_OPTION_CONNECTION_MEMORY_INCREMENT = 21, - - /** - * Use a callback to determine which X.509 certificate should be - * used for a given HTTPS connection. This option should be - * followed by a argument of type `gnutls_certificate_retrieve_function2 *`. - * This option provides an - * alternative to #MHD_OPTION_HTTPS_MEM_KEY, - * #MHD_OPTION_HTTPS_MEM_CERT. You must use this version if - * multiple domains are to be hosted at the same IP address using - * TLS's Server Name Indication (SNI) extension. In this case, - * the callback is expected to select the correct certificate - * based on the SNI information provided. The callback is expected - * to access the SNI data using `gnutls_server_name_get()`. - * Using this option requires GnuTLS 3.0 or higher. - */ - MHD_OPTION_HTTPS_CERT_CALLBACK = 22, - - /** - * When using #MHD_USE_TCP_FASTOPEN, this option changes the default TCP - * fastopen queue length of 50. Note that having a larger queue size can - * cause resource exhaustion attack as the TCP stack has to now allocate - * resources for the SYN packet along with its DATA. This option should be - * followed by an `unsigned int` argument. - */ - MHD_OPTION_TCP_FASTOPEN_QUEUE_SIZE = 23, - - /** - * Memory pointer for the Diffie-Hellman parameters (dh.pem) to be used by the - * HTTPS daemon for key exchange. - * This option must be followed by a `const char *` argument. - */ - MHD_OPTION_HTTPS_MEM_DHPARAMS = 24, - - /** - * If present and set to true, allow reusing address:port socket - * (by using SO_REUSEPORT on most platform, or platform-specific ways). - * If present and set to false, disallow reusing address:port socket - * (does nothing on most plaform, but uses SO_EXCLUSIVEADDRUSE on Windows). - * This option must be followed by a `unsigned int` argument. - */ - MHD_OPTION_LISTENING_ADDRESS_REUSE = 25, - - /** - * Memory pointer for a password that decrypts the private key (key.pem) - * to be used by the HTTPS daemon. This option should be followed by a - * `const char *` argument. - * This should be used in conjunction with #MHD_OPTION_HTTPS_MEM_KEY. - * @sa ::MHD_FEATURE_HTTPS_KEY_PASSWORD - */ - MHD_OPTION_HTTPS_KEY_PASSWORD = 26, - - /** - * Register a function that should be called whenever a connection is - * started or closed. - * - * This option should be followed by TWO pointers. First a pointer - * to a function of type #MHD_NotifyConnectionCallback and second a - * pointer to a closure to pass to the request completed callback. - * The second pointer maybe NULL. - */ - MHD_OPTION_NOTIFY_CONNECTION = 27 - -}; - - -/** - * Entry in an #MHD_OPTION_ARRAY. - */ -struct MHD_OptionItem -{ - /** - * Which option is being given. Use #MHD_OPTION_END - * to terminate the array. - */ - enum MHD_OPTION option; - - /** - * Option value (for integer arguments, and for options requiring - * two pointer arguments); should be 0 for options that take no - * arguments or only a single pointer argument. - */ - intptr_t value; - - /** - * Pointer option value (use NULL for options taking no arguments - * or only an integer option). - */ - void *ptr_value; - -}; - - -/** - * The `enum MHD_ValueKind` specifies the source of - * the key-value pairs in the HTTP protocol. - */ -enum MHD_ValueKind -{ - - /** - * Response header - */ - MHD_RESPONSE_HEADER_KIND = 0, - - /** - * HTTP header. - */ - MHD_HEADER_KIND = 1, - - /** - * Cookies. Note that the original HTTP header containing - * the cookie(s) will still be available and intact. - */ - MHD_COOKIE_KIND = 2, - - /** - * POST data. This is available only if a content encoding - * supported by MHD is used (currently only URL encoding), - * and only if the posted content fits within the available - * memory pool. Note that in that case, the upload data - * given to the #MHD_AccessHandlerCallback will be - * empty (since it has already been processed). - */ - MHD_POSTDATA_KIND = 4, - - /** - * GET (URI) arguments. - */ - MHD_GET_ARGUMENT_KIND = 8, - - /** - * HTTP footer (only for HTTP 1.1 chunked encodings). - */ - MHD_FOOTER_KIND = 16 -}; - - -/** - * The `enum MHD_RequestTerminationCode` specifies reasons - * why a request has been terminated (or completed). - * @ingroup request - */ -enum MHD_RequestTerminationCode -{ - - /** - * We finished sending the response. - * @ingroup request - */ - MHD_REQUEST_TERMINATED_COMPLETED_OK = 0, - - /** - * Error handling the connection (resources - * exhausted, other side closed connection, - * application error accepting request, etc.) - * @ingroup request - */ - MHD_REQUEST_TERMINATED_WITH_ERROR = 1, - - /** - * No activity on the connection for the number - * of seconds specified using - * #MHD_OPTION_CONNECTION_TIMEOUT. - * @ingroup request - */ - MHD_REQUEST_TERMINATED_TIMEOUT_REACHED = 2, - - /** - * We had to close the session since MHD was being - * shut down. - * @ingroup request - */ - MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN = 3, - - /** - * We tried to read additional data, but the other side closed the - * connection. This error is similar to - * #MHD_REQUEST_TERMINATED_WITH_ERROR, but specific to the case where - * the connection died because the other side did not send expected - * data. - * @ingroup request - */ - MHD_REQUEST_TERMINATED_READ_ERROR = 4, - - /** - * The client terminated the connection by closing the socket - * for writing (TCP half-closed); MHD aborted sending the - * response according to RFC 2616, section 8.1.4. - * @ingroup request - */ - MHD_REQUEST_TERMINATED_CLIENT_ABORT = 5 - -}; - - -/** - * The `enum MHD_ConnectionNotificationCode` specifies types - * of connection notifications. - * @ingroup request - */ -enum MHD_ConnectionNotificationCode -{ - - /** - * A new connection has been started. - * @ingroup request - */ - MHD_CONNECTION_NOTIFY_STARTED = 0, - - /** - * A connection is closed. - * @ingroup request - */ - MHD_CONNECTION_NOTIFY_CLOSED = 1 - -}; - - -/** - * Information about a connection. - */ -union MHD_ConnectionInfo -{ - - /** - * Cipher algorithm used, of type "enum gnutls_cipher_algorithm". - */ - int /* enum gnutls_cipher_algorithm */ cipher_algorithm; - - /** - * Protocol used, of type "enum gnutls_protocol". - */ - int /* enum gnutls_protocol */ protocol; - - /** - * Connect socket - */ - MHD_socket connect_fd; - - /** - * GNUtls session handle, of type "gnutls_session_t". - */ - void * /* gnutls_session_t */ tls_session; - - /** - * GNUtls client certificate handle, of type "gnutls_x509_crt_t". - */ - void * /* gnutls_x509_crt_t */ client_cert; - - /** - * Address information for the client. - */ - struct sockaddr *client_addr; - - /** - * Which daemon manages this connection (useful in case there are many - * daemons running). - */ - struct MHD_Daemon *daemon; - - /** - * Socket-specific client context. Points to the same address as - * the "socket_context" of the #MHD_NotifyConnectionCallback. - */ - void **socket_context; -}; - - -/** - * Values of this enum are used to specify what - * information about a connection is desired. - * @ingroup request - */ -enum MHD_ConnectionInfoType -{ - /** - * What cipher algorithm is being used. - * Takes no extra arguments. - * @ingroup request - */ - MHD_CONNECTION_INFO_CIPHER_ALGO, - - /** - * - * Takes no extra arguments. - * @ingroup request - */ - MHD_CONNECTION_INFO_PROTOCOL, - - /** - * Obtain IP address of the client. Takes no extra arguments. - * Returns essentially a `struct sockaddr **` (since the API returns - * a `union MHD_ConnectionInfo *` and that union contains a `struct - * sockaddr *`). - * @ingroup request - */ - MHD_CONNECTION_INFO_CLIENT_ADDRESS, - - /** - * Get the gnuTLS session handle. - * @ingroup request - */ - MHD_CONNECTION_INFO_GNUTLS_SESSION, - - /** - * Get the gnuTLS client certificate handle. Dysfunctional (never - * implemented, deprecated). Use #MHD_CONNECTION_INFO_GNUTLS_SESSION - * to get the `gnutls_session_t` and then call - * gnutls_certificate_get_peers(). - */ - MHD_CONNECTION_INFO_GNUTLS_CLIENT_CERT, - - /** - * Get the `struct MHD_Daemon *` responsible for managing this connection. - * @ingroup request - */ - MHD_CONNECTION_INFO_DAEMON, - - /** - * Request the file descriptor for the listening socket. - * No extra arguments should be passed. - * @ingroup request - */ - MHD_CONNECTION_INFO_CONNECTION_FD, - - /** - * Returns the client-specific pointer to a `void *` that was (possibly) - * set during a #MHD_NotifyConnectionCallback when the socket was - * first accepted. Note that this is NOT the same as the "con_cls" - * argument of the #MHD_AccessHandlerCallback. The "con_cls" is - * fresh for each HTTP request, while the "socket_context" is fresh - * for each socket. - */ - MHD_CONNECTION_INFO_SOCKET_CONTEXT - -}; - - -/** - * Values of this enum are used to specify what - * information about a deamon is desired. - */ -enum MHD_DaemonInfoType -{ - /** - * No longer supported (will return NULL). - */ - MHD_DAEMON_INFO_KEY_SIZE, - - /** - * No longer supported (will return NULL). - */ - MHD_DAEMON_INFO_MAC_KEY_SIZE, - - /** - * Request the file descriptor for the listening socket. - * No extra arguments should be passed. - */ - MHD_DAEMON_INFO_LISTEN_FD, - - /** - * Request the file descriptor for the external epoll. - * No extra arguments should be passed. - */ - MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY, - - /** - * Request the number of current connections handled by the daemon. - * No extra arguments should be passed. - */ - MHD_DAEMON_INFO_CURRENT_CONNECTIONS -}; - - -/** - * Callback for serious error condition. The default action is to print - * an error message and `abort()`. - * - * @param cls user specified value - * @param file where the error occured - * @param line where the error occured - * @param reason error detail, may be NULL - * @ingroup logging - */ -typedef void -(*MHD_PanicCallback) (void *cls, - const char *file, - unsigned int line, - const char *reason); - -/** - * Allow or deny a client to connect. - * - * @param cls closure - * @param addr address information from the client - * @param addrlen length of @a addr - * @return #MHD_YES if connection is allowed, #MHD_NO if not - */ -typedef int -(*MHD_AcceptPolicyCallback) (void *cls, - const struct sockaddr *addr, - socklen_t addrlen); - - -/** - * A client has requested the given url using the given method - * (#MHD_HTTP_METHOD_GET, #MHD_HTTP_METHOD_PUT, - * #MHD_HTTP_METHOD_DELETE, #MHD_HTTP_METHOD_POST, etc). The callback - * must call MHD callbacks to provide content to give back to the - * client and return an HTTP status code (i.e. #MHD_HTTP_OK, - * #MHD_HTTP_NOT_FOUND, etc.). - * - * @param cls argument given together with the function - * pointer when the handler was registered with MHD - * @param url the requested url - * @param method the HTTP method used (#MHD_HTTP_METHOD_GET, - * #MHD_HTTP_METHOD_PUT, etc.) - * @param version the HTTP version string (i.e. - * #MHD_HTTP_VERSION_1_1) - * @param upload_data the data being uploaded (excluding HEADERS, - * for a POST that fits into memory and that is encoded - * with a supported encoding, the POST data will NOT be - * given in upload_data and is instead available as - * part of #MHD_get_connection_values; very large POST - * data *will* be made available incrementally in - * @a upload_data) - * @param upload_data_size set initially to the size of the - * @a upload_data provided; the method must update this - * value to the number of bytes NOT processed; - * @param con_cls pointer that the callback can set to some - * address and that will be preserved by MHD for future - * calls for this request; since the access handler may - * be called many times (i.e., for a PUT/POST operation - * with plenty of upload data) this allows the application - * to easily associate some request-specific state. - * If necessary, this state can be cleaned up in the - * global #MHD_RequestCompletedCallback (which - * can be set with the #MHD_OPTION_NOTIFY_COMPLETED). - * Initially, `*con_cls` will be NULL. - * @return #MHD_YES if the connection was handled successfully, - * #MHD_NO if the socket must be closed due to a serios - * error while handling the request - */ -typedef int -(*MHD_AccessHandlerCallback) (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t *upload_data_size, - void **con_cls); - - -/** - * Signature of the callback used by MHD to notify the - * application about completed requests. - * - * @param cls client-defined closure - * @param connection connection handle - * @param con_cls value as set by the last call to - * the #MHD_AccessHandlerCallback - * @param toe reason for request termination - * @see #MHD_OPTION_NOTIFY_COMPLETED - * @ingroup request - */ -typedef void -(*MHD_RequestCompletedCallback) (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe); - -/** - * Signature of the callback used by MHD to notify the - * application about started/stopped connections - * - * @param cls client-defined closure - * @param connection connection handle - * @param socket_context socket-specific pointer where the - * client can associate some state specific - * to the TCP connection; note that this is - * different from the "con_cls" which is per - * HTTP request. The client can initialize - * during #MHD_CONNECTION_NOTIFY_STARTED and - * cleanup during #MHD_CONNECTION_NOTIFY_CLOSED - * and access in the meantime using - * #MHD_CONNECTION_INFO_SOCKET_CONTEXT. - * @param toe reason for connection notification - * @see #MHD_OPTION_NOTIFY_CONNECTION - * @ingroup request - */ -typedef void -(*MHD_NotifyConnectionCallback) (void *cls, - struct MHD_Connection *connection, - void **socket_context, - enum MHD_ConnectionNotificationCode toe); - - -/** - * Iterator over key-value pairs. This iterator - * can be used to iterate over all of the cookies, - * headers, or POST-data fields of a request, and - * also to iterate over the headers that have been - * added to a response. - * - * @param cls closure - * @param kind kind of the header we are looking at - * @param key key for the value, can be an empty string - * @param value corresponding value, can be NULL - * @return #MHD_YES to continue iterating, - * #MHD_NO to abort the iteration - * @ingroup request - */ -typedef int -(*MHD_KeyValueIterator) (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *value); - - -/** - * Callback used by libmicrohttpd in order to obtain content. The - * callback is to copy at most @a max bytes of content into @a buf. The - * total number of bytes that has been placed into @a buf should be - * returned. - * - * Note that returning zero will cause libmicrohttpd to try again. - * Thus, returning zero should only be used in conjunction - * with MHD_suspend_connection() to avoid busy waiting. - * - * @param cls extra argument to the callback - * @param pos position in the datastream to access; - * note that if a `struct MHD_Response` object is re-used, - * it is possible for the same content reader to - * be queried multiple times for the same data; - * however, if a `struct MHD_Response` is not re-used, - * libmicrohttpd guarantees that "pos" will be - * the sum of all non-negative return values - * obtained from the content reader so far. - * @param buf where to copy the data - * @param max maximum number of bytes to copy to @a buf (size of @a buf) - * @return number of bytes written to @a buf; - * 0 is legal unless we are running in internal select mode (since - * this would cause busy-waiting); 0 in external select mode - * will cause this function to be called again once the external - * select calls MHD again; - * #MHD_CONTENT_READER_END_OF_STREAM (-1) for the regular - * end of transmission (with chunked encoding, MHD will then - * terminate the chunk and send any HTTP footers that might be - * present; without chunked encoding and given an unknown - * response size, MHD will simply close the connection; note - * that while returning #MHD_CONTENT_READER_END_OF_STREAM is not technically - * legal if a response size was specified, MHD accepts this - * and treats it just as #MHD_CONTENT_READER_END_WITH_ERROR; - * #MHD_CONTENT_READER_END_WITH_ERROR (-2) to indicate a server - * error generating the response; this will cause MHD to simply - * close the connection immediately. If a response size was - * given or if chunked encoding is in use, this will indicate - * an error to the client. Note, however, that if the client - * does not know a response size and chunked encoding is not in - * use, then clients will not be able to tell the difference between - * #MHD_CONTENT_READER_END_WITH_ERROR and #MHD_CONTENT_READER_END_OF_STREAM. - * This is not a limitation of MHD but rather of the HTTP protocol. - */ -typedef ssize_t -(*MHD_ContentReaderCallback) (void *cls, - uint64_t pos, - char *buf, - size_t max); - - -/** - * This method is called by libmicrohttpd if we - * are done with a content reader. It should - * be used to free resources associated with the - * content reader. - * - * @param cls closure - * @ingroup response - */ -typedef void -(*MHD_ContentReaderFreeCallback) (void *cls); - - -/** - * Iterator over key-value pairs where the value - * maybe made available in increments and/or may - * not be zero-terminated. Used for processing - * POST data. - * - * @param cls user-specified closure - * @param kind type of the value, always #MHD_POSTDATA_KIND when called from MHD - * @param key 0-terminated key for the value - * @param filename name of the uploaded file, NULL if not known - * @param content_type mime-type of the data, NULL if not known - * @param transfer_encoding encoding of the data, NULL if not known - * @param data pointer to @a size bytes of data at the - * specified offset - * @param off offset of data in the overall value - * @param size number of bytes in @a data available - * @return #MHD_YES to continue iterating, - * #MHD_NO to abort the iteration - */ -typedef int -(*MHD_PostDataIterator) (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *data, - uint64_t off, - size_t size); - -/* **************** Daemon handling functions ***************** */ - -/** - * Start a webserver on the given port. - * - * @param flags combination of `enum MHD_FLAG` values - * @param port port to bind to (in host byte order) - * @param apc callback to call to check which clients - * will be allowed to connect; you can pass NULL - * in which case connections from any IP will be - * accepted - * @param apc_cls extra argument to apc - * @param dh handler called for all requests (repeatedly) - * @param dh_cls extra argument to @a dh - * @param ap list of options (type-value pairs, - * terminated with #MHD_OPTION_END). - * @return NULL on error, handle to daemon on success - * @ingroup event - */ -_MHD_EXTERN struct MHD_Daemon * -MHD_start_daemon_va (unsigned int flags, - uint16_t port, - MHD_AcceptPolicyCallback apc, void *apc_cls, - MHD_AccessHandlerCallback dh, void *dh_cls, - va_list ap); - - -/** - * Start a webserver on the given port. Variadic version of - * #MHD_start_daemon_va. - * - * @param flags combination of `enum MHD_FLAG` values - * @param port port to bind to - * @param apc callback to call to check which clients - * will be allowed to connect; you can pass NULL - * in which case connections from any IP will be - * accepted - * @param apc_cls extra argument to apc - * @param dh handler called for all requests (repeatedly) - * @param dh_cls extra argument to @a dh - * @return NULL on error, handle to daemon on success - * @ingroup event - */ -_MHD_EXTERN struct MHD_Daemon * -MHD_start_daemon (unsigned int flags, - uint16_t port, - MHD_AcceptPolicyCallback apc, void *apc_cls, - MHD_AccessHandlerCallback dh, void *dh_cls, - ...); - - -/** - * Stop accepting connections from the listening socket. Allows - * clients to continue processing, but stops accepting new - * connections. Note that the caller is responsible for closing the - * returned socket; however, if MHD is run using threads (anything but - * external select mode), it must not be closed until AFTER - * #MHD_stop_daemon has been called (as it is theoretically possible - * that an existing thread is still using it). - * - * Note that some thread modes require the caller to have passed - * #MHD_USE_PIPE_FOR_SHUTDOWN when using this API. If this daemon is - * in one of those modes and this option was not given to - * #MHD_start_daemon, this function will return #MHD_INVALID_SOCKET. - * - * @param daemon daemon to stop accepting new connections for - * @return old listen socket on success, #MHD_INVALID_SOCKET if - * the daemon was already not listening anymore - * @ingroup specialized - */ -_MHD_EXTERN MHD_socket -MHD_quiesce_daemon (struct MHD_Daemon *daemon); - - -/** - * Shutdown an HTTP daemon. - * - * @param daemon daemon to stop - * @ingroup event - */ -_MHD_EXTERN void -MHD_stop_daemon (struct MHD_Daemon *daemon); - - -/** - * Add another client connection to the set of connections managed by - * MHD. This API is usually not needed (since MHD will accept inbound - * connections on the server socket). Use this API in special cases, - * for example if your HTTP server is behind NAT and needs to connect - * out to the HTTP client, or if you are building a proxy. - * - * If you use this API in conjunction with a internal select or a - * thread pool, you must set the option - * #MHD_USE_PIPE_FOR_SHUTDOWN to ensure that the freshly added - * connection is immediately processed by MHD. - * - * The given client socket will be managed (and closed!) by MHD after - * this call and must no longer be used directly by the application - * afterwards. - * - * Per-IP connection limits are ignored when using this API. - * - * @param daemon daemon that manages the connection - * @param client_socket socket to manage (MHD will expect - * to receive an HTTP request from this socket next). - * @param addr IP address of the client - * @param addrlen number of bytes in @a addr - * @return #MHD_YES on success, #MHD_NO if this daemon could - * not handle the connection (i.e. `malloc()` failed, etc). - * The socket will be closed in any case; `errno` is - * set to indicate further details about the error. - * @ingroup specialized - */ -_MHD_EXTERN int -MHD_add_connection (struct MHD_Daemon *daemon, - MHD_socket client_socket, - const struct sockaddr *addr, - socklen_t addrlen); - - -/** - * Obtain the `select()` sets for this daemon. - * Daemon's FDs will be added to fd_sets. To get only - * daemon FDs in fd_sets, call FD_ZERO for each fd_set - * before calling this function. FD_SETSIZE is assumed - * to be platform's default. - * - * @param daemon daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @param max_fd increased to largest FD added (if larger - * than existing value); can be NULL - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call or any FD didn't - * fit fd_set. - * @ingroup event - */ -_MHD_EXTERN int -MHD_get_fdset (struct MHD_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set, - MHD_socket *max_fd); - - -/** - * Obtain the `select()` sets for this daemon. - * Daemon's FDs will be added to fd_sets. To get only - * daemon FDs in fd_sets, call FD_ZERO for each fd_set - * before calling this function. Passing custom FD_SETSIZE - * as @a fd_setsize allow usage of larger/smaller than - * platform's default fd_sets. - * - * @param daemon daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @param max_fd increased to largest FD added (if larger - * than existing value); can be NULL - * @param fd_setsize value of FD_SETSIZE - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call or any FD didn't - * fit fd_set. - * @ingroup event - */ -_MHD_EXTERN int -MHD_get_fdset2 (struct MHD_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set, - MHD_socket *max_fd, - unsigned int fd_setsize); - - -/** - * Obtain the `select()` sets for this daemon. - * Daemon's FDs will be added to fd_sets. To get only - * daemon FDs in fd_sets, call FD_ZERO for each fd_set - * before calling this function. Size of fd_set is - * determined by current value of FD_SETSIZE. - * - * @param daemon daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @param max_fd increased to largest FD added (if larger - * than existing value); can be NULL - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call or any FD didn't - * fit fd_set. - * @ingroup event - */ -#define MHD_get_fdset(daemon,read_fd_set,write_fd_set,except_fd_set,max_fd) \ - MHD_get_fdset2((daemon),(read_fd_set),(write_fd_set),(except_fd_set),(max_fd),FD_SETSIZE) - - -/** - * Obtain timeout value for `select()` for this daemon (only needed if - * connection timeout is used). The returned value is how many milliseconds - * `select()` or `poll()` should at most block, not the timeout value set for - * connections. This function MUST NOT be called if MHD is running with - * #MHD_USE_THREAD_PER_CONNECTION. - * - * @param daemon daemon to query for timeout - * @param timeout set to the timeout (in milliseconds) - * @return #MHD_YES on success, #MHD_NO if timeouts are - * not used (or no connections exist that would - * necessiate the use of a timeout right now). - * @ingroup event - */ -_MHD_EXTERN int -MHD_get_timeout (struct MHD_Daemon *daemon, - MHD_UNSIGNED_LONG_LONG *timeout); - - -/** - * Run webserver operations (without blocking unless in client - * callbacks). This method should be called by clients in combination - * with #MHD_get_fdset if the client-controlled select method is used. - * - * This function is a convenience method, which is useful if the - * fd_sets from #MHD_get_fdset were not directly passed to `select()`; - * with this function, MHD will internally do the appropriate `select()` - * call itself again. While it is always safe to call #MHD_run (in - * external select mode), you should call #MHD_run_from_select if - * performance is important (as it saves an expensive call to - * `select()`). - * - * @param daemon daemon to run - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call. - * @ingroup event - */ -_MHD_EXTERN int -MHD_run (struct MHD_Daemon *daemon); - - -/** - * Run webserver operations. This method should be called by clients - * in combination with #MHD_get_fdset if the client-controlled select - * method is used. - * - * You can use this function instead of #MHD_run if you called - * `select()` on the result from #MHD_get_fdset. File descriptors in - * the sets that are not controlled by MHD will be ignored. Calling - * this function instead of #MHD_run is more efficient as MHD will - * not have to call `select()` again to determine which operations are - * ready. - * - * @param daemon daemon to run select loop for - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set (not used, can be NULL) - * @return #MHD_NO on serious errors, #MHD_YES on success - * @ingroup event - */ -_MHD_EXTERN int -MHD_run_from_select (struct MHD_Daemon *daemon, - const fd_set *read_fd_set, - const fd_set *write_fd_set, - const fd_set *except_fd_set); - - - - -/* **************** Connection handling functions ***************** */ - -/** - * Get all of the headers from the request. - * - * @param connection connection to get values from - * @param kind types of values to iterate over - * @param iterator callback to call on each header; - * maybe NULL (then just count headers) - * @param iterator_cls extra argument to @a iterator - * @return number of entries iterated over - * @ingroup request - */ -_MHD_EXTERN int -MHD_get_connection_values (struct MHD_Connection *connection, - enum MHD_ValueKind kind, - MHD_KeyValueIterator iterator, void *iterator_cls); - - -/** - * This function can be used to add an entry to the HTTP headers of a - * connection (so that the #MHD_get_connection_values function will - * return them -- and the `struct MHD_PostProcessor` will also see - * them). This maybe required in certain situations (see Mantis - * #1399) where (broken) HTTP implementations fail to supply values - * needed by the post processor (or other parts of the application). - * - * This function MUST only be called from within the - * #MHD_AccessHandlerCallback (otherwise, access maybe improperly - * synchronized). Furthermore, the client must guarantee that the key - * and value arguments are 0-terminated strings that are NOT freed - * until the connection is closed. (The easiest way to do this is by - * passing only arguments to permanently allocated strings.). - * - * @param connection the connection for which a - * value should be set - * @param kind kind of the value - * @param key key for the value - * @param value the value itself - * @return #MHD_NO if the operation could not be - * performed due to insufficient memory; - * #MHD_YES on success - * @ingroup request - */ -_MHD_EXTERN int -MHD_set_connection_value (struct MHD_Connection *connection, - enum MHD_ValueKind kind, - const char *key, - const char *value); - - -/** - * Sets the global error handler to a different implementation. @a cb - * will only be called in the case of typically fatal, serious - * internal consistency issues. These issues should only arise in the - * case of serious memory corruption or similar problems with the - * architecture. While @a cb is allowed to return and MHD will then - * try to continue, this is never safe. - * - * The default implementation that is used if no panic function is set - * simply prints an error message and calls `abort()`. Alternative - * implementations might call `exit()` or other similar functions. - * - * @param cb new error handler - * @param cls passed to @a cb - * @ingroup logging - */ -_MHD_EXTERN void -MHD_set_panic_func (MHD_PanicCallback cb, void *cls); - - -/** - * Process escape sequences ('%HH') Updates val in place; the - * result should be UTF-8 encoded and cannot be larger than the input. - * The result must also still be 0-terminated. - * - * @param val value to unescape (modified in the process) - * @return length of the resulting val (`strlen(val)` may be - * shorter afterwards due to elimination of escape sequences) - */ -_MHD_EXTERN size_t -MHD_http_unescape (char *val); - - -/** - * Get a particular header value. If multiple - * values match the kind, return any one of them. - * - * @param connection connection to get values from - * @param kind what kind of value are we looking for - * @param key the header to look for, NULL to lookup 'trailing' value without a key - * @return NULL if no such item was found - * @ingroup request - */ -_MHD_EXTERN const char * -MHD_lookup_connection_value (struct MHD_Connection *connection, - enum MHD_ValueKind kind, - const char *key); - - -/** - * Queue a response to be transmitted to the client (as soon as - * possible but after #MHD_AccessHandlerCallback returns). - * - * @param connection the connection identifying the client - * @param status_code HTTP status code (i.e. #MHD_HTTP_OK) - * @param response response to transmit - * @return #MHD_NO on error (i.e. reply already sent), - * #MHD_YES on success or if message has been queued - * @ingroup response - */ -_MHD_EXTERN int -MHD_queue_response (struct MHD_Connection *connection, - unsigned int status_code, - struct MHD_Response *response); - - -/** - * Suspend handling of network data for a given connection. This can - * be used to dequeue a connection from MHD's event loop (external - * select, internal select or thread pool; not applicable to - * thread-per-connection!) for a while. - * - * If you use this API in conjunction with a internal select or a - * thread pool, you must set the option #MHD_USE_PIPE_FOR_SHUTDOWN to - * ensure that a resumed connection is immediately processed by MHD. - * - * Suspended connections continue to count against the total number of - * connections allowed (per daemon, as well as per IP, if such limits - * are set). Suspended connections will NOT time out; timeouts will - * restart when the connection handling is resumed. While a - * connection is suspended, MHD will not detect disconnects by the - * client. - * - * The only safe time to suspend a connection is from the - * #MHD_AccessHandlerCallback. - * - * Finally, it is an API violation to call #MHD_stop_daemon while - * having suspended connections (this will at least create memory and - * socket leaks or lead to undefined behavior). You must explicitly - * resume all connections before stopping the daemon. - * - * @param connection the connection to suspend - */ -_MHD_EXTERN void -MHD_suspend_connection (struct MHD_Connection *connection); - - -/** - * Resume handling of network data for suspended connection. It is - * safe to resume a suspended connection at any time. Calling this - * function on a connection that was not previously suspended will - * result in undefined behavior. - * - * @param connection the connection to resume - */ -_MHD_EXTERN void -MHD_resume_connection (struct MHD_Connection *connection); - - -/* **************** Response manipulation functions ***************** */ - - -/** - * Flags for special handling of responses. - */ -enum MHD_ResponseFlags -{ - /** - * Default: no special flags. - */ - MHD_RF_NONE = 0, - - /** - * Only respond in conservative HTTP 1.0-mode. In particular, - * do not (automatically) sent "Connection" headers and always - * close the connection after generating the response. - */ - MHD_RF_HTTP_VERSION_1_0_ONLY = 1 - -}; - - -/** - * MHD options (for future extensions). - */ -enum MHD_ResponseOptions -{ - /** - * End of the list of options. - */ - MHD_RO_END = 0 -}; - - -/** - * Set special flags and options for a response. - * - * @param response the response to modify - * @param flags to set for the response - * @param ... #MHD_RO_END terminated list of options - * @return #MHD_YES on success, #MHD_NO on error - */ -_MHD_EXTERN int -MHD_set_response_options (struct MHD_Response *response, - enum MHD_ResponseFlags flags, - ...); - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response, #MHD_SIZE_UNKNOWN for unknown - * @param block_size preferred block size for querying crc (advisory only, - * MHD may still call @a crc using smaller chunks); this - * is essentially the buffer size used for IO, clients - * should pick a value that is appropriate for IO and - * memory performance requirements - * @param crc callback to use to obtain response data - * @param crc_cls extra argument to @a crc - * @param crfc callback to call to free @a crc_cls resources - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -_MHD_EXTERN struct MHD_Response * -MHD_create_response_from_callback (uint64_t size, - size_t block_size, - MHD_ContentReaderCallback crc, void *crc_cls, - MHD_ContentReaderFreeCallback crfc); - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the @a data portion of the response - * @param data the data itself - * @param must_free libmicrohttpd should free data when done - * @param must_copy libmicrohttpd must make a copy of @a data - * right away, the data maybe released anytime after - * this call returns - * @return NULL on error (i.e. invalid arguments, out of memory) - * @deprecated use #MHD_create_response_from_buffer instead - * @ingroup response - */ -_MHD_EXTERN struct MHD_Response * -MHD_create_response_from_data (size_t size, - void *data, - int must_free, - int must_copy); - - -/** - * Specification for how MHD should treat the memory buffer - * given for the response. - * @ingroup response - */ -enum MHD_ResponseMemoryMode -{ - - /** - * Buffer is a persistent (static/global) buffer that won't change - * for at least the lifetime of the response, MHD should just use - * it, not free it, not copy it, just keep an alias to it. - * @ingroup response - */ - MHD_RESPMEM_PERSISTENT, - - /** - * Buffer is heap-allocated with `malloc()` (or equivalent) and - * should be freed by MHD after processing the response has - * concluded (response reference counter reaches zero). - * @ingroup response - */ - MHD_RESPMEM_MUST_FREE, - - /** - * Buffer is in transient memory, but not on the heap (for example, - * on the stack or non-`malloc()` allocated) and only valid during the - * call to #MHD_create_response_from_buffer. MHD must make its - * own private copy of the data for processing. - * @ingroup response - */ - MHD_RESPMEM_MUST_COPY - -}; - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response - * @param buffer size bytes containing the response's data portion - * @param mode flags for buffer management - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -_MHD_EXTERN struct MHD_Response * -MHD_create_response_from_buffer (size_t size, - void *buffer, - enum MHD_ResponseMemoryMode mode); - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response - * @param fd file descriptor referring to a file on disk with the - * data; will be closed when response is destroyed; - * fd should be in 'blocking' mode - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -_MHD_EXTERN struct MHD_Response * -MHD_create_response_from_fd (size_t size, - int fd); - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response - * @param fd file descriptor referring to a file on disk with the - * data; will be closed when response is destroyed; - * fd should be in 'blocking' mode - * @param offset offset to start reading from in the file; - * Be careful! `off_t` may have been compiled to be a - * 64-bit variable for MHD, in which case your application - * also has to be compiled using the same options! Read - * the MHD manual for more details. - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -_MHD_EXTERN struct MHD_Response * -MHD_create_response_from_fd_at_offset (size_t size, - int fd, - off_t offset); - - -#if 0 -/** - * Enumeration for actions MHD should perform on the underlying socket - * of the upgrade. This API is not finalized, and in particular - * the final set of actions is yet to be decided. This is just an - * idea for what we might want. - */ -enum MHD_UpgradeAction -{ - - /** - * Close the socket, the application is done with it. - * - * Takes no extra arguments. - * - * NOTE: it is unclear if we want to have this in the - * "final" API, this is all just ideas. - */ - MHD_UPGRADE_ACTION_CLOSE = 0, - - /** - * Uncork the TCP write buffer (that is, tell the OS to transmit all - * bytes in the buffer now, and to not use TCP-CORKing). - * - * Takes no extra arguments. - * - * NOTE: it is unclear if we want to have this in the - * "final" API, this is all just ideas. - */ - MHD_UPGRADE_ACTION_CORK - -}; - - -/** - * This connection-specific callback is provided by MHD to - * applications (unusual) during the #MHD_UpgradeHandler. - * It allows applications to perform 'special' actions on - * the underlying socket from the upgrade. - * - * @param cls the closure (from `upgrade_action_cls`) - * @param action which action should be performed - * @param ... arguments to the action (depends on the action) - * @return #MHD_NO on error, #MHD_YES on success - */ -typedef int -(*MHD_UpgradeActionCallback)(void *cls, - enum MHD_UpgradeAction action, - ...); - -/** - * Function called after a protocol "upgrade" response was sent - * successfully and the socket should now be controlled by some - * protocol other than HTTP. - * - * Any data received on the socket will be made available in - * 'data_in'. The function should update 'data_in_size' to - * reflect the number of bytes consumed from 'data_in' (the remaining - * bytes will be made available in the next call to the handler). - * - * Any data that should be transmitted on the socket should be - * stored in 'data_out'. '*data_out_size' is initially set to - * the available buffer space in 'data_out'. It should be set to - * the number of bytes stored in 'data_out' (which can be zero). - * - * The return value is a BITMASK that indicates how the function - * intends to interact with the event loop. It can request to be - * notified for reading, writing, request to UNCORK the send buffer - * (which MHD is allowed to ignore, if it is not possible to uncork on - * the local platform), to wait for the 'external' select loop to - * trigger another round. It is also possible to specify "no events" - * to terminate the connection; in this case, the - * #MHD_RequestCompletedCallback will be called and all resources of - * the connection will be released. - * - * Except when in 'thread-per-connection' mode, implementations - * of this function should never block (as it will still be called - * from within the main event loop). - * - * @param cls closure - * @param connection original HTTP connection handle, - * giving the function a last chance - * to inspect the original HTTP request - * @param sock socket to use for bi-directional communication - * with the client. For HTTPS, this may not be a socket - * that is directly connected to the client and thus certain - * operations (TCP-specific setsockopt(), getsockopt(), etc.) - * may not work as expected (as the socket could be from a - * socketpair() or a TCP-loopback) - * @param upgrade_action function that can be used to perform actions - * on the @a sock (like those that cannot be done explicitly). - * Applications must use this callback to perform the - * close() action on the @a sock. - * @param upgrade_action_cls closure that must be passed to @a upgrade_action - */ -typedef void -(*MHD_UpgradeHandler)(void *cls, - struct MHD_Connection *connection, - MHD_SOCKET sock, - MHD_UpgradeActionCallback upgrade_action, - void *upgrade_action_cls); - - -/** - * Create a response object that can be used for 101 UPGRADE - * responses, for example to implement WebSockets. After sending the - * response, control over the data stream is given to the callback (which - * can then, for example, start some bi-directional communication). - * If the response is queued for multiple connections, the callback - * will be called for each connection. The callback - * will ONLY be called after the response header was successfully passed - * to the OS; if there are communication errors before, the usual MHD - * connection error handling code will be performed. - * - * Setting the correct HTTP code (i.e. MHD_HTTP_SWITCHING_PROTOCOLS) - * and setting correct HTTP headers for the upgrade must be done - * manually (this way, it is possible to implement most existing - * WebSocket versions using this API; in fact, this API might be useful - * for any protocol switch, not just WebSockets). Note that - * draft-ietf-hybi-thewebsocketprotocol-00 cannot be implemented this - * way as the header "HTTP/1.1 101 WebSocket Protocol Handshake" - * cannot be generated; instead, MHD will always produce "HTTP/1.1 101 - * Switching Protocols" (if the response code 101 is used). - * - * As usual, the response object can be extended with header - * information and then be used any number of times (as long as the - * header information is not connection-specific). - * - * @param upgrade_handler function to call with the 'upgraded' socket - * @param upgrade_handler_cls closure for @a upgrade_handler - * @return NULL on error (i.e. invalid arguments, out of memory) - */ -struct MHD_Response * -MHD_create_response_for_upgrade (MHD_UpgradeHandler upgrade_handler, - void *upgrade_handler_cls); -#endif - -/** - * Destroy a response object and associated resources. Note that - * libmicrohttpd may keep some of the resources around if the response - * is still in the queue for some clients, so the memory may not - * necessarily be freed immediatley. - * - * @param response response to destroy - * @ingroup response - */ -_MHD_EXTERN void -MHD_destroy_response (struct MHD_Response *response); - - -/** - * Add a header line to the response. - * - * @param response response to add a header to - * @param header the header to add - * @param content value to add - * @return #MHD_NO on error (i.e. invalid header or content format), - * or out of memory - * @ingroup response - */ -_MHD_EXTERN int -MHD_add_response_header (struct MHD_Response *response, - const char *header, - const char *content); - - -/** - * Add a footer line to the response. - * - * @param response response to remove a header from - * @param footer the footer to delete - * @param content value to delete - * @return #MHD_NO on error (i.e. invalid footer or content format). - * @ingroup response - */ -_MHD_EXTERN int -MHD_add_response_footer (struct MHD_Response *response, - const char *footer, - const char *content); - - -/** - * Delete a header (or footer) line from the response. - * - * @param response response to remove a header from - * @param header the header to delete - * @param content value to delete - * @return #MHD_NO on error (no such header known) - * @ingroup response - */ -_MHD_EXTERN int -MHD_del_response_header (struct MHD_Response *response, - const char *header, - const char *content); - - -/** - * Get all of the headers (and footers) added to a response. - * - * @param response response to query - * @param iterator callback to call on each header; - * maybe NULL (then just count headers) - * @param iterator_cls extra argument to @a iterator - * @return number of entries iterated over - * @ingroup response - */ -_MHD_EXTERN int -MHD_get_response_headers (struct MHD_Response *response, - MHD_KeyValueIterator iterator, void *iterator_cls); - - -/** - * Get a particular header (or footer) from the response. - * - * @param response response to query - * @param key which header to get - * @return NULL if header does not exist - * @ingroup response - */ -_MHD_EXTERN const char * -MHD_get_response_header (struct MHD_Response *response, - const char *key); - - -/* ********************** PostProcessor functions ********************** */ - -/** - * Create a `struct MHD_PostProcessor`. - * - * A `struct MHD_PostProcessor` can be used to (incrementally) parse - * the data portion of a POST request. Note that some buggy browsers - * fail to set the encoding type. If you want to support those, you - * may have to call #MHD_set_connection_value with the proper encoding - * type before creating a post processor (if no supported encoding - * type is set, this function will fail). - * - * @param connection the connection on which the POST is - * happening (used to determine the POST format) - * @param buffer_size maximum number of bytes to use for - * internal buffering (used only for the parsing, - * specifically the parsing of the keys). A - * tiny value (256-1024) should be sufficient. - * Do NOT use a value smaller than 256. For good - * performance, use 32 or 64k (i.e. 65536). - * @param iter iterator to be called with the parsed data, - * Must NOT be NULL. - * @param iter_cls first argument to @a iter - * @return NULL on error (out of memory, unsupported encoding), - * otherwise a PP handle - * @ingroup request - */ -_MHD_EXTERN struct MHD_PostProcessor * -MHD_create_post_processor (struct MHD_Connection *connection, - size_t buffer_size, - MHD_PostDataIterator iter, void *iter_cls); - - -/** - * Parse and process POST data. Call this function when POST data is - * available (usually during an #MHD_AccessHandlerCallback) with the - * "upload_data" and "upload_data_size". Whenever possible, this will - * then cause calls to the #MHD_PostDataIterator. - * - * @param pp the post processor - * @param post_data @a post_data_len bytes of POST data - * @param post_data_len length of @a post_data - * @return #MHD_YES on success, #MHD_NO on error - * (out-of-memory, iterator aborted, parse error) - * @ingroup request - */ -_MHD_EXTERN int -MHD_post_process (struct MHD_PostProcessor *pp, - const char *post_data, size_t post_data_len); - - -/** - * Release PostProcessor resources. - * - * @param pp the PostProcessor to destroy - * @return #MHD_YES if processing completed nicely, - * #MHD_NO if there were spurious characters / formatting - * problems; it is common to ignore the return - * value of this function - * @ingroup request - */ -_MHD_EXTERN int -MHD_destroy_post_processor (struct MHD_PostProcessor *pp); - - -/* ********************* Digest Authentication functions *************** */ - - -/** - * Constant to indicate that the nonce of the provided - * authentication code was wrong. - * @ingroup authentication - */ -#define MHD_INVALID_NONCE -1 - - -/** - * Get the username from the authorization header sent by the client - * - * @param connection The MHD connection structure - * @return NULL if no username could be found, a pointer - * to the username if found - * @ingroup authentication - */ -_MHD_EXTERN char * -MHD_digest_auth_get_username (struct MHD_Connection *connection); - - -/** - * Authenticates the authorization header sent by the client - * - * @param connection The MHD connection structure - * @param realm The realm presented to the client - * @param username The username needs to be authenticated - * @param password The password used in the authentication - * @param nonce_timeout The amount of time for a nonce to be - * invalid in seconds - * @return #MHD_YES if authenticated, #MHD_NO if not, - * #MHD_INVALID_NONCE if nonce is invalid - * @ingroup authentication - */ -_MHD_EXTERN int -MHD_digest_auth_check (struct MHD_Connection *connection, - const char *realm, - const char *username, - const char *password, - unsigned int nonce_timeout); - - -/** - * Queues a response to request authentication from the client - * - * @param connection The MHD connection structure - * @param realm The realm presented to the client - * @param opaque string to user for opaque value - * @param response reply to send; should contain the "access denied" - * body; note that this function will set the "WWW Authenticate" - * header and that the caller should not do this - * @param signal_stale #MHD_YES if the nonce is invalid to add - * 'stale=true' to the authentication header - * @return #MHD_YES on success, #MHD_NO otherwise - * @ingroup authentication - */ -_MHD_EXTERN int -MHD_queue_auth_fail_response (struct MHD_Connection *connection, - const char *realm, - const char *opaque, - struct MHD_Response *response, - int signal_stale); - - -/** - * Get the username and password from the basic authorization header sent by the client - * - * @param connection The MHD connection structure - * @param password a pointer for the password - * @return NULL if no username could be found, a pointer - * to the username if found - * @ingroup authentication - */ -_MHD_EXTERN char * -MHD_basic_auth_get_username_password (struct MHD_Connection *connection, - char** password); - - -/** - * Queues a response to request basic authentication from the client - * The given response object is expected to include the payload for - * the response; the "WWW-Authenticate" header will be added and the - * response queued with the 'UNAUTHORIZED' status code. - * - * @param connection The MHD connection structure - * @param realm the realm presented to the client - * @param response response object to modify and queue - * @return #MHD_YES on success, #MHD_NO otherwise - * @ingroup authentication - */ -_MHD_EXTERN int -MHD_queue_basic_auth_fail_response (struct MHD_Connection *connection, - const char *realm, - struct MHD_Response *response); - -/* ********************** generic query functions ********************** */ - - -/** - * Obtain information about the given connection. - * - * @param connection what connection to get information about - * @param info_type what information is desired? - * @param ... depends on @a info_type - * @return NULL if this information is not available - * (or if the @a info_type is unknown) - * @ingroup specialized - */ -_MHD_EXTERN const union MHD_ConnectionInfo * -MHD_get_connection_info (struct MHD_Connection *connection, - enum MHD_ConnectionInfoType info_type, - ...); - - -/** - * MHD connection options. Given to #MHD_set_connection_option to - * set custom options for a particular connection. - */ -enum MHD_CONNECTION_OPTION -{ - - /** - * Set a custom timeout for the given connection. Specified - * as the number of seconds, given as an `unsigned int`. Use - * zero for no timeout. - */ - MHD_CONNECTION_OPTION_TIMEOUT - -}; - - -/** - * Set a custom option for the given connection, overriding defaults. - * - * @param connection connection to modify - * @param option option to set - * @param ... arguments to the option, depending on the option type - * @return #MHD_YES on success, #MHD_NO if setting the option failed - * @ingroup specialized - */ -_MHD_EXTERN int -MHD_set_connection_option (struct MHD_Connection *connection, - enum MHD_CONNECTION_OPTION option, - ...); - - -/** - * Information about an MHD daemon. - */ -union MHD_DaemonInfo -{ - /** - * Size of the key, no longer supported. - * @deprecated - */ - size_t key_size; - - /** - * Size of the mac key, no longer supported. - * @deprecated - */ - size_t mac_key_size; - - /** - * Listen socket file descriptor, for #MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY - * and #MHD_DAEMON_INFO_LISTEN_FD. - */ - MHD_socket listen_fd; - - /** - * Number of active connections, for #MHD_DAEMON_INFO_CURRENT_CONNECTIONS. - */ - unsigned int num_connections; -}; - - -/** - * Obtain information about the given daemon - * (not fully implemented!). - * - * @param daemon what daemon to get information about - * @param info_type what information is desired? - * @param ... depends on @a info_type - * @return NULL if this information is not available - * (or if the @a info_type is unknown) - * @ingroup specialized - */ -_MHD_EXTERN const union MHD_DaemonInfo * -MHD_get_daemon_info (struct MHD_Daemon *daemon, - enum MHD_DaemonInfoType info_type, - ...); - - -/** - * Obtain the version of this library - * - * @return static version string, e.g. "0.9.9" - * @ingroup specialized - */ -_MHD_EXTERN const char* -MHD_get_version (void); - - -/** - * Types of information about MHD features, - * used by #MHD_is_feature_supported(). - */ -enum MHD_FEATURE -{ - /** - * Get whether messages are supported. If supported then in debug - * mode messages can be printed to stderr or to external logger. - */ - MHD_FEATURE_MESSGES = 1, - - /** - * Get whether HTTPS is supported. If supported then flag - * #MHD_USE_SSL and options #MHD_OPTION_HTTPS_MEM_KEY, - * #MHD_OPTION_HTTPS_MEM_CERT, #MHD_OPTION_HTTPS_MEM_TRUST, - * #MHD_OPTION_HTTPS_MEM_DHPARAMS, #MHD_OPTION_HTTPS_CRED_TYPE, - * #MHD_OPTION_HTTPS_PRIORITIES can be used. - */ - MHD_FEATURE_SSL = 2, - - /** - * Get whether option #MHD_OPTION_HTTPS_CERT_CALLBACK is - * supported. - */ - MHD_FEATURE_HTTPS_CERT_CALLBACK = 3, - - /** - * Get whether IPv6 is supported. If supported then flag - * #MHD_USE_IPv6 can be used. - */ - MHD_FEATURE_IPv6 = 4, - - /** - * Get whether IPv6 without IPv4 is supported. If not supported - * then IPv4 is always enabled in IPv6 sockets and - * flag #MHD_USE_DUAL_STACK if always used when #MHD_USE_IPv6 is - * specified. - */ - MHD_FEATURE_IPv6_ONLY = 5, - - /** - * Get whether `poll()` is supported. If supported then flag - * #MHD_USE_POLL can be used. - */ - MHD_FEATURE_POLL = 6, - - /** - * Get whether `epoll()` is supported. If supported then Flags - * #MHD_USE_EPOLL_LINUX_ONLY and - * #MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY can be used. - */ - MHD_FEATURE_EPOLL = 7, - - /** - * Get whether shutdown on listen socket to signal other - * threads is supported. If not supported flag - * #MHD_USE_PIPE_FOR_SHUTDOWN is automatically forced. - */ - MHD_FEATURE_SHUTDOWN_LISTEN_SOCKET = 8, - - /** - * Get whether socketpair is used internally instead of pipe to - * signal other threads. - */ - MHD_FEATURE_SOCKETPAIR = 9, - - /** - * Get whether TCP Fast Open is supported. If supported then - * flag #MHD_USE_TCP_FASTOPEN and option - * #MHD_OPTION_TCP_FASTOPEN_QUEUE_SIZE can be used. - */ - MHD_FEATURE_TCP_FASTOPEN = 10, - - /** - * Get whether HTTP Basic authorization is supported. If supported - * then functions #MHD_basic_auth_get_username_password and - * #MHD_queue_basic_auth_fail_response can be used. - */ - MHD_FEATURE_BASIC_AUTH = 11, - - /** - * Get whether HTTP Digest authorization is supported. If - * supported then options #MHD_OPTION_DIGEST_AUTH_RANDOM, - * #MHD_OPTION_NONCE_NC_SIZE and - * #MHD_digest_auth_check() can be used. - */ - MHD_FEATURE_DIGEST_AUTH = 12, - - /** - * Get whether postprocessor is supported. If supported then - * functions #MHD_create_post_processor(), #MHD_post_process() and - * #MHD_destroy_post_processor() can - * be used. - */ - MHD_FEATURE_POSTPROCESSOR = 13, - - /** - * Get whether password encrypted private key for HTTPS daemon is - * supported. If supported then option - * ::MHD_OPTION_HTTPS_KEY_PASSWORD can be used. - */ - MHD_FEATURE_HTTPS_KEY_PASSWORD = 14 -}; - - -/** - * Get information about supported MHD features. - * Indicate that MHD was compiled with or without support for - * particular feature. Some features require additional support - * by kernel. Kernel support is not checked by this function. - * - * @param feature type of requested information - * @return #MHD_YES if feature is supported by MHD, #MHD_NO if - * feature is not supported or feature is unknown. - * @ingroup specialized - */ -_MHD_EXTERN int -MHD_is_feature_supported(enum MHD_FEATURE feature); - - -#if 0 /* keep Emacsens' auto-indent happy */ -{ -#endif -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/include/microspdy.h b/src/hos_libhttpserver/src/libmicrohttpd/src/include/microspdy.h deleted file mode 100644 index 7da5fbe6..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/include/microspdy.h +++ /dev/null @@ -1,1380 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012, 2013 Christian Grothoff - - 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 3 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, see . -*/ - -/** - * @file microspdy.h - * @brief public interface to libmicrospdy - * @author Andrey Uzunov - * @author Christian Grothoff - * - * All symbols defined in this header start with SPDY_. libmisrospdy is a small - * SPDY daemon library. The application can start multiple daemons - * and they are independent.

    - * - * The header file defines various constants used by the SPDY and the HTTP protocol. - * This does not mean that the lib actually interprets all of these - * values. Not everything is implemented. The provided constants are exported as a convenience - * for users of the library. The lib does not verify that provided - * HTTP headers and if their values conform to the SPDY protocol, - * it only checks if the required headers for the SPDY requests and - * responses are provided.

    - * - * The library uses just a single thread.

    - * - * Before including "microspdy.h" you should add the necessary - * includes to define the types used in this file (which headers are needed may - * depend on your platform; for possible suggestions consult - * "platform.h" in the libmicrospdy distribution).

    - * - * All of the functions returning SPDY_YES/SPDY_NO return - * SPDY_INPUT_ERROR when any of the parameters are invalid, e.g. - * required parameter is NULL.

    - * - * The library does not check if anything at the application layer -- - * requests and responses -- is correct. For example, it - * is up to the user to check if a client is sending HTTP body but the - * method is GET.

    - * - * The SPDY flow control is just partially implemented: the receiving - * window is updated, and the client is notified, to prevent a client - * from stop sending POST body data, for example. - */ -#ifndef SPDY_MICROSPDY_H -#define SPDY_MICROSPDY_H - -#include -#include - -/* While we generally would like users to use a configure-driven - build process which detects which headers are present and - hence works on any platform, we use "standard" includes here - to build out-of-the-box for beginning users on common systems. - - Once you have a proper build system and go for more exotic - platforms, you should define MHD_PLATFORM_H in some header that - you always include *before* "microhttpd.h". Then the following - "standard" includes won't be used (which might be a good - idea, especially on platforms where they do not exist). */ -#ifndef MHD_PLATFORM_H -#include -#include -#include -#ifdef __MINGW32__ -#include -#else -#include -#include -#include -#endif -#endif - -#ifndef _MHD_EXTERN -#define _MHD_EXTERN extern -#endif - -/** - * return code for "YES". - */ -#define SPDY_YES 1 - -/** - * return code for "NO". - */ -#define SPDY_NO 0 - -/** - * return code for error when input parameters are wrong. To be returned - * only by functions which return int. The others will return NULL on - * input error. - */ -#define SPDY_INPUT_ERROR -1 - -/** - * SPDY version supported by the lib. - */ -#define SPDY_VERSION 3 - -/** - * The maximum allowed size (without 8 byte headers) of - * SPDY frames (value length) is 8192. The lib will accept and - * send frames with length at most this value here. - */ -#define SPDY_MAX_SUPPORTED_FRAME_SIZE 8192 - -/** - * HTTP response codes. - */ -#define SPDY_HTTP_CONTINUE 100 -#define SPDY_HTTP_SWITCHING_PROTOCOLS 101 -#define SPDY_HTTP_PROCESSING 102 - -#define SPDY_HTTP_OK 200 -#define SPDY_HTTP_CREATED 201 -#define SPDY_HTTP_ACCEPTED 202 -#define SPDY_HTTP_NON_AUTHORITATIVE_INFORMATION 203 -#define SPDY_HTTP_NO_CONTENT 204 -#define SPDY_HTTP_RESET_CONTENT 205 -#define SPDY_HTTP_PARTIAL_CONTENT 206 -#define SPDY_HTTP_MULTI_STATUS 207 - -#define SPDY_HTTP_MULTIPLE_CHOICES 300 -#define SPDY_HTTP_MOVED_PERMANENTLY 301 -#define SPDY_HTTP_FOUND 302 -#define SPDY_HTTP_SEE_OTHER 303 -#define SPDY_HTTP_NOT_MODIFIED 304 -#define SPDY_HTTP_USE_PROXY 305 -#define SPDY_HTTP_SWITCH_PROXY 306 -#define SPDY_HTTP_TEMPORARY_REDIRECT 307 - -#define SPDY_HTTP_BAD_REQUEST 400 -#define SPDY_HTTP_UNAUTHORIZED 401 -#define SPDY_HTTP_PAYMENT_REQUIRED 402 -#define SPDY_HTTP_FORBIDDEN 403 -#define SPDY_HTTP_NOT_FOUND 404 -#define SPDY_HTTP_METHOD_NOT_ALLOWED 405 -#define SPDY_HTTP_METHOD_NOT_ACCEPTABLE 406 -#define SPDY_HTTP_PROXY_AUTHENTICATION_REQUIRED 407 -#define SPDY_HTTP_REQUEST_TIMEOUT 408 -#define SPDY_HTTP_CONFLICT 409 -#define SPDY_HTTP_GONE 410 -#define SPDY_HTTP_LENGTH_REQUIRED 411 -#define SPDY_HTTP_PRECONDITION_FAILED 412 -#define SPDY_HTTP_REQUEST_ENTITY_TOO_LARGE 413 -#define SPDY_HTTP_REQUEST_URI_TOO_LONG 414 -#define SPDY_HTTP_UNSUPPORTED_MEDIA_TYPE 415 -#define SPDY_HTTP_REQUESTED_RANGE_NOT_SATISFIABLE 416 -#define SPDY_HTTP_EXPECTATION_FAILED 417 -#define SPDY_HTTP_UNPROCESSABLE_ENTITY 422 -#define SPDY_HTTP_LOCKED 423 -#define SPDY_HTTP_FAILED_DEPENDENCY 424 -#define SPDY_HTTP_UNORDERED_COLLECTION 425 -#define SPDY_HTTP_UPGRADE_REQUIRED 426 -#define SPDY_HTTP_NO_RESPONSE 444 -#define SPDY_HTTP_RETRY_WITH 449 -#define SPDY_HTTP_BLOCKED_BY_WINDOWS_PARENTAL_CONTROLS 450 -#define SPDY_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS 451 - -#define SPDY_HTTP_INTERNAL_SERVER_ERROR 500 -#define SPDY_HTTP_NOT_IMPLEMENTED 501 -#define SPDY_HTTP_BAD_GATEWAY 502 -#define SPDY_HTTP_SERVICE_UNAVAILABLE 503 -#define SPDY_HTTP_GATEWAY_TIMEOUT 504 -#define SPDY_HTTP_HTTP_VERSION_NOT_SUPPORTED 505 -#define SPDY_HTTP_VARIANT_ALSO_NEGOTIATES 506 -#define SPDY_HTTP_INSUFFICIENT_STORAGE 507 -#define SPDY_HTTP_BANDWIDTH_LIMIT_EXCEEDED 509 -#define SPDY_HTTP_NOT_EXTENDED 510 - -/** - * HTTP headers are used in SPDY, but all of them MUST be lowercase. - * Some are not valid in SPDY and MUST not be used - */ -#define SPDY_HTTP_HEADER_ACCEPT "accept" -#define SPDY_HTTP_HEADER_ACCEPT_CHARSET "accept-charset" -#define SPDY_HTTP_HEADER_ACCEPT_ENCODING "accept-encoding" -#define SPDY_HTTP_HEADER_ACCEPT_LANGUAGE "accept-language" -#define SPDY_HTTP_HEADER_ACCEPT_RANGES "accept-ranges" -#define SPDY_HTTP_HEADER_AGE "age" -#define SPDY_HTTP_HEADER_ALLOW "allow" -#define SPDY_HTTP_HEADER_AUTHORIZATION "authorization" -#define SPDY_HTTP_HEADER_CACHE_CONTROL "cache-control" -/* Connection header is forbidden in SPDY */ -#define SPDY_HTTP_HEADER_CONNECTION "connection" -#define SPDY_HTTP_HEADER_CONTENT_ENCODING "content-encoding" -#define SPDY_HTTP_HEADER_CONTENT_LANGUAGE "content-language" -#define SPDY_HTTP_HEADER_CONTENT_LENGTH "content-length" -#define SPDY_HTTP_HEADER_CONTENT_LOCATION "content-location" -#define SPDY_HTTP_HEADER_CONTENT_MD5 "content-md5" -#define SPDY_HTTP_HEADER_CONTENT_RANGE "content-range" -#define SPDY_HTTP_HEADER_CONTENT_TYPE "content-type" -#define SPDY_HTTP_HEADER_COOKIE "cookie" -#define SPDY_HTTP_HEADER_DATE "date" -#define SPDY_HTTP_HEADER_ETAG "etag" -#define SPDY_HTTP_HEADER_EXPECT "expect" -#define SPDY_HTTP_HEADER_EXPIRES "expires" -#define SPDY_HTTP_HEADER_FROM "from" -/* Host header is forbidden in SPDY */ -#define SPDY_HTTP_HEADER_HOST "host" -#define SPDY_HTTP_HEADER_IF_MATCH "if-match" -#define SPDY_HTTP_HEADER_IF_MODIFIED_SINCE "if-modified-since" -#define SPDY_HTTP_HEADER_IF_NONE_MATCH "if-none-match" -#define SPDY_HTTP_HEADER_IF_RANGE "if-range" -#define SPDY_HTTP_HEADER_IF_UNMODIFIED_SINCE "if-unmodified-since" -/* Keep-Alive header is forbidden in SPDY */ -#define SPDY_HTTP_HEADER_KEEP_ALIVE "keep-alive" -#define SPDY_HTTP_HEADER_LAST_MODIFIED "last-modified" -#define SPDY_HTTP_HEADER_LOCATION "location" -#define SPDY_HTTP_HEADER_MAX_FORWARDS "max-forwards" -#define SPDY_HTTP_HEADER_PRAGMA "pragma" -#define SPDY_HTTP_HEADER_PROXY_AUTHENTICATE "proxy-authenticate" -#define SPDY_HTTP_HEADER_PROXY_AUTHORIZATION "proxy-authorization" -/* Proxy-Connection header is forbidden in SPDY */ -#define SPDY_HTTP_HEADER_PROXY_CONNECTION "proxy-connection" -#define SPDY_HTTP_HEADER_RANGE "range" -#define SPDY_HTTP_HEADER_REFERER "referer" -#define SPDY_HTTP_HEADER_RETRY_AFTER "retry-after" -#define SPDY_HTTP_HEADER_SERVER "server" -#define SPDY_HTTP_HEADER_SET_COOKIE "set-cookie" -#define SPDY_HTTP_HEADER_SET_COOKIE2 "set-cookie2" -#define SPDY_HTTP_HEADER_TE "te" -#define SPDY_HTTP_HEADER_TRAILER "trailer" -/* Transfer-Encoding header is forbidden in SPDY */ -#define SPDY_HTTP_HEADER_TRANSFER_ENCODING "transfer-encoding" -#define SPDY_HTTP_HEADER_UPGRADE "upgrade" -#define SPDY_HTTP_HEADER_USER_AGENT "user-agent" -#define SPDY_HTTP_HEADER_VARY "vary" -#define SPDY_HTTP_HEADER_VIA "via" -#define SPDY_HTTP_HEADER_WARNING "warning" -#define SPDY_HTTP_HEADER_WWW_AUTHENTICATE "www-authenticate" - -/** - * HTTP versions (a value must be provided in SPDY requests/responses). - */ -#define SPDY_HTTP_VERSION_1_0 "HTTP/1.0" -#define SPDY_HTTP_VERSION_1_1 "HTTP/1.1" - -/** - * HTTP methods - */ -#define SPDY_HTTP_METHOD_CONNECT "CONNECT" -#define SPDY_HTTP_METHOD_DELETE "DELETE" -#define SPDY_HTTP_METHOD_GET "GET" -#define SPDY_HTTP_METHOD_HEAD "HEAD" -#define SPDY_HTTP_METHOD_OPTIONS "OPTIONS" -#define SPDY_HTTP_METHOD_POST "POST" -#define SPDY_HTTP_METHOD_PUT "PUT" -#define SPDY_HTTP_METHOD_TRACE "TRACE" - -/** - * HTTP POST encodings, see also - * http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4 - */ -#define SPDY_HTTP_POST_ENCODING_FORM_URLENCODED "application/x-www-form-urlencoded" -#define SPDY_HTTP_POST_ENCODING_MULTIPART_FORMDATA "multipart/form-data" - - -/** - * Handle for the daemon (listening on a socket). - */ -struct SPDY_Daemon; - - -/** - * Handle for a SPDY session/connection. - */ -struct SPDY_Session; - - -/** - * Handle for a SPDY request sent by a client. The structure has pointer - * to the session's handler - */ -struct SPDY_Request; - - -/** - * Handle for a response containing HTTP headers and data to be sent. - * The structure has pointer to the session's handler - * for this response. - */ -struct SPDY_Response; - - -/** - * Collection of tuples of an HTTP header and values used in requests - * and responses. - */ -struct SPDY_NameValue; - - -/** - * Collection of tuples of a SPDY setting ID, value - * and flags used to control the sessions. - */ -struct SPDY_Settings; - - -/** - * SPDY IO sybsystem flags used by SPDY_init() and SPDY_deinit().

    - * - * The values are used internally as flags, that is why they must be - * powers of 2. - */ -enum SPDY_IO_SUBSYSTEM -{ - - /** - * No subsystem. For internal use. - */ - SPDY_IO_SUBSYSTEM_NONE = 0, - - /** - * Default TLS implementation provided by openSSL/libssl. - */ - SPDY_IO_SUBSYSTEM_OPENSSL = 1, - - /** - * No TLS is used. - */ - SPDY_IO_SUBSYSTEM_RAW = 2 -}; - - -/** - * SPDY daemon options. Passed in the varargs portion of - * SPDY_start_daemon to customize the daemon. Each option must - * be followed by a value of a specific type.

    - * - * The values are used internally as flags, that is why they must be - * powers of 2. - */ -enum SPDY_DAEMON_OPTION -{ - - /** - * No more options / last option. This is used - * to terminate the VARARGs list. - */ - SPDY_DAEMON_OPTION_END = 0, - - /** - * Set a custom timeout for all connections. Must be followed by - * a number of seconds, given as an 'unsigned int'. Use - * zero for no timeout. - */ - SPDY_DAEMON_OPTION_SESSION_TIMEOUT = 1, - - /** - * Bind daemon to the supplied sockaddr. This option must be - * followed by a 'struct sockaddr *'. The 'struct sockaddr*' - * should point to a 'struct sockaddr_in6' or to a - * 'struct sockaddr_in'. - */ - SPDY_DAEMON_OPTION_SOCK_ADDR = 2, - - /** - * Flags for the daemon. Must be followed by a SPDY_DAEMON_FLAG value - * which is the result of bitwise OR of desired flags. - */ - SPDY_DAEMON_OPTION_FLAGS = 4, - - /** - * IO subsystem type used by daemon and all its sessions. If not set, - * TLS provided by openssl is used. Must be followed by a - * SPDY_IO_SUBSYSTEM value. - */ - SPDY_DAEMON_OPTION_IO_SUBSYSTEM = 8, - - /** - * Maximum number of frames to be written to the socket at once. The - * library tries to send max_num_frames in a single call to SPDY_run - * for a single session. This means no requests can be received nor - * other sessions can send data as long the current one has enough - * frames to send and there is no error on writing. Thus, a big value - * will affect the performance. Small value gives fairnes for sessions. - * Must be followed by a positive integer (uin32_t). If not set, the - * default value 10 will be used. - */ - SPDY_DAEMON_OPTION_MAX_NUM_FRAMES = 16 -}; - - -/** - * Flags for starting SPDY daemon. They are used to set some settings - * for the daemon, which do not require values. - */ -enum SPDY_DAEMON_FLAG -{ - /** - * No flags selected. - */ - SPDY_DAEMON_FLAG_NO = 0, - - /** - * The server will bind only on IPv6 addresses. If the flag is set and - * the daemon is provided with IPv4 address or IPv6 is not supported, - * starting daemon will fail. - */ - SPDY_DAEMON_FLAG_ONLY_IPV6 = 1, - - /** - * All sessions' sockets will be set with TCP_NODELAY if the flag is - * used. Option considered only by SPDY_IO_SUBSYSTEM_RAW. - */ - SPDY_DAEMON_FLAG_NO_DELAY = 2 -}; - - -/** - * SPDY settings IDs sent by both client and server in SPDY SETTINGS frame. - * They affect the whole SPDY session. Defined in SPDY Protocol - Draft 3. - */ -enum SPDY_SETTINGS -{ - - /** - * Allows the sender to send its expected upload bandwidth on this - * channel. This number is an estimate. The value should be the - * integral number of kilobytes per second that the sender predicts - * as an expected maximum upload channel capacity. - */ - SPDY_SETTINGS_UPLOAD_BANDWIDTH = 1, - - /** - * Allows the sender to send its expected download bandwidth on this - * channel. This number is an estimate. The value should be the - * integral number of kilobytes per second that the sender predicts as - * an expected maximum download channel capacity. - */ - SPDY_SETTINGS_DOWNLOAD_BANDWIDTH = 2, - - /** - * Allows the sender to send its expected round-trip-time on this - * channel. The round trip time is defined as the minimum amount of - * time to send a control frame from this client to the remote and - * receive a response. The value is represented in milliseconds. - */ - SPDY_SETTINGS_ROUND_TRIP_TIME = 3, - - /** - * Allows the sender to inform the remote endpoint the maximum number - * of concurrent streams which it will allow. By default there is no - * limit. For implementors it is recommended that this value be no - * smaller than 100. - */ - SPDY_SETTINGS_MAX_CONCURRENT_STREAMS = 4, - - /** - * Allows the sender to inform the remote endpoint of the current TCP - * CWND value. - */ - SPDY_SETTINGS_CURRENT_CWND = 5, - - /** - * Allows the sender to inform the remote endpoint the retransmission - * rate (bytes retransmitted / total bytes transmitted). - */ - SPDY_SETTINGS_DOWNLOAD_RETRANS_RATE = 6, - - /** - * Allows the sender to inform the remote endpoint the initial window - * size (in bytes) for new streams. - */ - SPDY_SETTINGS_INITIAL_WINDOW_SIZE = 7, - - /** - * Allows the server to inform the client if the new size of the - * client certificate vector. - */ - SPDY_SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE = 8 -}; - - -/** - * Flags for each individual SPDY setting in the SPDY SETTINGS frame. - * They affect only one setting to which they are set. - * Defined in SPDY Protocol - Draft 3. - */ -enum SPDY_FLAG_SETTINGS -{ - - /** - * When set, the sender of this SETTINGS frame is requesting that the - * recipient persist the ID/Value and return it in future SETTINGS - * frames sent from the sender to this recipient. Because persistence - * is only implemented on the client, this flag is only sent by the - * server. - */ - SPDY_FLAG_SETTINGS_PERSIST_VALUE = 1, - - /** - * When set, the sender is notifying the recipient that this ID/Value - * pair was previously sent to the sender by the recipient with the - * #SPDY_FLAG_SETTINGS_PERSIST_VALUE, and the sender is returning it. - * Because persistence is only implemented on the client, this flag is - * only sent by the client. - */ - SPDY_FLAG_SETTINGS_PERSISTED = 2 -}; - - -/** - * Flag associated with a whole SPDY SETTINGS frame. Affect all the - * settings in the frame. Defined in SPDY Protocol - Draft 3. - */ -enum SPDY_FLAG_SETTINGS_FRAME -{ - - /** - * When set, the client should clear any previously persisted SETTINGS - * ID/Value pairs. If this frame contains ID/Value pairs with the - * #SPDY_FLAG_SETTINGS_PERSIST_VALUE set, then the client will first - * clear its existing, persisted settings, and then persist the values - * with the flag set which are contained within this frame. Because - * persistence is only implemented on the client, this flag can only - * be used when the sender is the server. - */ - SPDY_FLAG_SETTINGS_CLEAR_SETTINGS = 1 -}; - - -/** - * SPDY settings function options. Passed in the varargs portion of - * SPDY_SettingsReceivedCallback and SPDY_send_settings to customize - * more the settings handling. Each option must - * be followed by a value of a specific type.

    - * - * The values are used internally as flags, that is why they must be - * powers of 2. - */ -enum SPDY_SETTINGS_OPTION -{ - - /** - * No more options / last option. This is used - * to terminate the VARARGs list. - */ - SPDY_SETTINGS_OPTION_END = 0 -}; - - -/** - * Used as a parameter for SPDY_ResponseResultCallback and shows if the - * response was actually written to the TLS socket or discarded by the - * lib for any reason (and respectively the reason). - */ -enum SPDY_RESPONSE_RESULT -{ - - /** - * The lib has written the full response to the TLS socket. - */ - SPDY_RESPONSE_RESULT_SUCCESS = 0, - - /** - * The session is being closed, so the data is being discarded - */ - SPDY_RESPONSE_RESULT_SESSION_CLOSED = 1, - - /** - * The stream for this response has been closed. May happen when the - * sender had sent first SYN_STREAM and after that RST_STREAM. - */ - SPDY_RESPONSE_RESULT_STREAM_CLOSED = 2 -}; - - -/** - * Callback for serious error condition. The default action is to print - * an error message and abort(). - * - * @param cls user specified value - * @param file where the error occured - * @param line where the error occured - * @param reason error details message, may be NULL - */ -typedef void -(*SPDY_PanicCallback) (void * cls, - const char *file, - unsigned int line, - const char *reason); - - -/** - * Callback for new SPDY session established by a client. Called - * immediately after the TCP connection was established. - * - * @param cls client-defined closure - * @param session handler for the new SPDY session - */ -typedef void -(*SPDY_NewSessionCallback) (void * cls, - struct SPDY_Session * session); - - -/** - * Callback for closed session. Called after the TCP connection was - * closed. In this callback function the user has the last - * chance to access the SPDY_Session structure. After that the latter - * will be cleaned! - * - * @param cls client-defined closure - * @param session handler for the closed SPDY session - * @param by_client #SPDY_YES if the session close was initiated by the - * client; - * #SPDY_NO if closed by the server - */ -typedef void -(*SPDY_SessionClosedCallback) (void *cls, - struct SPDY_Session *session, - int by_client); - - -/** - * Iterator over name-value pairs. - * - * @param cls client-defined closure - * @param name of the pair - * @param value of the pair - * @return #SPDY_YES to continue iterating, - * #SPDY_NO to abort the iteration - */ -typedef int -(*SPDY_NameValueIterator) (void *cls, - const char *name, - const char * const * value, - int num_values); - - -/** - * Callback for received SPDY request. The functions is called whenever - * a reqest comes, but will also be called if more headers/trailers are - * received. - * - * @param cls client-defined closure - * @param request handler. The request object is required for - * sending responses. - * @param priority of the SPDY stream which the request was - * sent over - * @param method HTTP method - * @param path HTTP path - * @param version HTTP version just like in HTTP request/response: - * "HTTP/1.0" or "HTTP/1.1" currently - * @param host called host as in HTTP - * @param scheme used ("http" or "https"). In SPDY 3 it is only "https". - * @param headers other HTTP headers from the request - * @param more a flag saying if more data related to the request is - * expected to be received. HTTP body may arrive (e.g. POST data); - * then SPDY_NewDataCallback will be called for the connection. - * It is also possible that more headers/trailers arrive; - * then the same callback will be invoked. The user should detect - * that it is not the first invocation of the function for that - * request. - */ -typedef void -(*SPDY_NewRequestCallback) (void *cls, - struct SPDY_Request *request, - uint8_t priority, - const char *method, - const char *path, - const char *version, - const char *host, - const char *scheme, - struct SPDY_NameValue *headers, - bool more); - - -/** - * Callback for received new data chunk (HTTP body) from a given - * request (e.g. POST data). - * - * @param cls client-defined closure - * @param request handler - * @param buf data chunk from the POST data - * @param size the size of the data chunk 'buf' in bytes. Note that it - * may be 0. - * @param more false if this is the last chunk from the data. Note: - * true does not mean that more data will come, exceptional - * situation is possible - * @return #SPDY_YES to continue calling the function, - * #SPDY_NO to stop calling the function for this request - */ -typedef int -(*SPDY_NewDataCallback) (void *cls, - struct SPDY_Request *request, - const void *buf, - size_t size, - bool more); -// How about passing POST encoding information -// here as well? -//TODO - - -/** - * Callback to be used with SPDY_build_response_with_callback. The - * callback will be called when the lib wants to write to the TLS socket. - * The application should provide the data to be sent. - * - * @param cls client-defined closure - * @param max maximum number of bytes that are allowed to be written - * to the buffer. - * @param more true if more data will be sent (i.e. the function must - * be calleed again), - * false if this is the last chunk, the lib will close - * the stream - * @return number of bytes written to buffer. On error the call MUST - * return value less than 0 to indicate the library. - */ -typedef ssize_t -(*SPDY_ResponseCallback) (void *cls, - void *buffer, - size_t max, - bool *more); - - -/** - * Callback to be called when the last bytes from the response was sent - * to the client or when the response was discarded from the lib. This - * callback is a very good place to discard the request and the response - * objects, if they will not be reused (e.g., sending the same response - * again). If the stream is closed it is safe to discard the request - * object. - * - * @param cls client-defined closure - * @param response handler to the response that was just sent - * @param request handler to the request for which the response was sent - * @param status shows if actually the response was sent or it was - * discarded by the lib for any reason (e.g., closing session, - * closing stream, stopping daemon, etc.). It is possible that - * status indicates an error but parts of the response headers - * and/or body (in one - * or several frames) were already sent to the client. - * @param streamopened indicates if the the stream for this request/ - * response pair is still opened. If yes, the server may want - * to use SPDY push to send something additional to the client - * and/or close the stream. - */ -typedef void -(*SPDY_ResponseResultCallback) (void * cls, - struct SPDY_Response *response, - struct SPDY_Request *request, - enum SPDY_RESPONSE_RESULT status, - bool streamopened); - - -/** - * Callback to notify when SPDY ping response is received. - * - * @param session handler for which the ping request was sent - * @param rtt the timespan between sending ping request and receiving it - * from the library - */ -typedef void -(*SPDY_PingCallback) (void * cls, - struct SPDY_Session *session, - struct timeval *rtt); - - -/** - * Iterator over settings ID/Value/Flags tuples. - * - * @param cls client-defined closure - * @param id SPDY settings ID - * @param value value for this setting - * @param flags flags for this tuple; use - * `enum SPDY_FLAG_SETTINGS` - * @return #SPDY_YES to continue iterating, - * #SPDY_NO to abort the iteration - */ -typedef int -(*SPDY_SettingsIterator) (void *cls, - enum SPDY_SETTINGS id, - int32_t value, - uint8_t flags); - - -/** - * Callback to notify when SPDY SETTINGS are received from the client. - * - * @param session handler for which settings are received - * @param settings ID/value/flags tuples of the settings - * @param flags for the whole settings frame; use - * enum SPDY_FLAG_SETTINGS_FRAME - * @param ... list of options (type-value pairs, - * terminated with #SPDY_SETTINGS_OPTION_END). - */ -typedef void -(*SPDY_SettingsReceivedCallback) (struct SPDY_Session *session, - struct SPDY_Settings *settings, - uint8_t flags, - ...); - - -/* Global functions for the library */ - - -/** - * Init function for the whole library. It MUST be called before any - * other function of the library to initialize things like TLS context - * and possibly other stuff needed by the lib. Currently the call - * always returns #SPDY_YES. - * - * @param io_subsystem the IO subsystem that will - * be initialized. Several can be used with bitwise OR. If no - * parameter is set, the default openssl subsystem will be used. - * @return #SPDY_YES if the library was correctly initialized and its - * functions can be used now; - * #SPDY_NO on error - */ -_MHD_EXTERN int -(SPDY_init) (enum SPDY_IO_SUBSYSTEM io_subsystem, ...); -#define SPDY_init() SPDY_init (SPDY_IO_SUBSYSTEM_OPENSSL) - - -/** - * Deinit function for the whole lib. It can be called after finishing - * using the library. It frees and cleans up resources allocated in - * SPDY_init. Currently the function does not do anything. - */ -_MHD_EXTERN void -SPDY_deinit (void); - - -/** - * Sets the global error handler to a different implementation. "cb" - * will only be called in the case of typically fatal, serious - * internal consistency issues. These issues should only arise in the - * case of serious memory corruption or similar problems with the - * architecture as well as failed assertions. While "cb" is allowed to - * return and the lib will then try to continue, this is never safe. - * - * The default implementation that is used if no panic function is set - * simply prints an error message and calls "abort". Alternative - * implementations might call "exit" or other similar functions. - * - * @param cb new error handler - * @param cls passed to error handler - */ -_MHD_EXTERN void -SPDY_set_panic_func (SPDY_PanicCallback cb, - void *cls); - - -/* Daemon functions */ - - -/** - * Start a SPDY webserver on the given port. - * - * @param port to bind to. The value is ignored if address structure - * is passed as daemon option - * @param certfile path to the certificate that will be used by server - * @param keyfile path to the keyfile for the certificate - * @param nscb callback called when a new SPDY session is - * established by a client - * @param sccb callback called when a session is closed - * @param nrcb callback called when a client sends request - * @param npdcb callback called when HTTP body (POST data) is received - * after request - * @param cls common extra argument to all of the callbacks - * @param ... list of options (type-value pairs, - * terminated with #SPDY_DAEMON_OPTION_END). - * @return NULL on error, handle to daemon on success - */ -_MHD_EXTERN struct SPDY_Daemon * -SPDY_start_daemon (uint16_t port, - const char *certfile, - const char *keyfile, - SPDY_NewSessionCallback nscb, - SPDY_SessionClosedCallback sccb, - SPDY_NewRequestCallback nrcb, - SPDY_NewDataCallback npdcb, - void *cls, - ...); - - -/** - * Shutdown the daemon. First all sessions are closed. It is NOT safe - * to call this function in user callbacks. - * - * @param daemon to stop - */ -_MHD_EXTERN void -SPDY_stop_daemon (struct SPDY_Daemon *daemon); - - -/** - * Obtain the select sets for this daemon. Only those are retrieved, - * which some processing should be done for, i.e. not all sockets are - * added to write_fd_set.

    - * - * It is possible that there is - * nothing to be read from a socket but there is data either in the - * TLS subsystem's read buffers or in libmicrospdy's read buffers, which - * waits for being processed. In such case the file descriptor will be - * added to write_fd_set. Since it is very likely for the socket to be - * ready for writing, the select used in the application's event loop - * will return with success, SPDY_run will be called, the data will be - * processed and maybe something will be written to the socket. Without - * this behaviour, considering a proper event loop, data may stay in the - * buffers, but run is never called. - * - * @param daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @return largest FD added to any of the sets - */ -_MHD_EXTERN int -SPDY_get_fdset (struct SPDY_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set); - - -/** - * Obtain timeout value for select for this daemon. The returned value - * is how long select - * should at most block, not the timeout value set for connections. - * - * @param daemon to query for timeout - * @param timeout will be set to the timeout value (in milliseconds) - * @return #SPDY_YES on success - * #SPDY_NO if no connections exist that - * would necessiate the use of a timeout right now - */ -_MHD_EXTERN int -SPDY_get_timeout (struct SPDY_Daemon *daemon, - unsigned long long *timeout); - - -/** - * Run webserver operations. This method must be called in - * the client event loop. - * - * @param daemon to run - */ -_MHD_EXTERN void -SPDY_run (struct SPDY_Daemon *daemon); - - -/* SPDY Session handling functions */ - - -/** - * Closes a SPDY session. SPDY clients and servers are expected to keep - * sessions opened as long as possible. However, the server may want to - * close some connections, e.g. if there are too many, to free some - * resources. The function can also be used to close a specific session - * if the client is not desired. - * - * @param session handler to be closed - */ -_MHD_EXTERN void -SPDY_close_session (struct SPDY_Session * session); - - -/** - * Associate a void pointer with a session. The data accessible by the - * pointer can later be used wherever the session handler is available. - * - * @param session handler - * @param cls any data pointed by a pointer to be accessible later - */ -_MHD_EXTERN void -SPDY_set_cls_to_session (struct SPDY_Session *session, - void *cls); - - -/** - * Retrieves the pointer associated with SPDY_set_cls_to_session(). - * - * @param session handler to get its cls - * @return same pointer added by SPDY_set_cls_to_session() or - * NULL when nothing was associated - */ -_MHD_EXTERN void * -SPDY_get_cls_from_session (struct SPDY_Session *session); - - -/** - * Retrieves the remote address of a given session. - * - * @param session handler to get its remote address - * @param addr out parameter; pointing to remote address - * @return length of the address structure - */ -_MHD_EXTERN socklen_t -SPDY_get_remote_addr (struct SPDY_Session *session, - struct sockaddr **addr); - - -/* SPDY name/value data structure handling functions */ - - -/** - * Create a new NameValue structure. It is needed for putting inside the - * HTTP headers and their values for a response. The user should later - * destroy alone the structure. - * - * @return handler to the new empty structure or NULL on error - */ -_MHD_EXTERN struct SPDY_NameValue * -SPDY_name_value_create (void); - - -/** - * Add name/value pair to a NameValue structure. SPDY_NO will be returned - * if the name/value pair is already in the structure. It is legal to - * add different values for the same name. - * - * @param container structure to which the new pair is added - * @param name for the value. Null-terminated string. - * @param value the value itself. Null-terminated string. - * @return #SPDY_NO on error or #SPDY_YES on success - */ -_MHD_EXTERN int -SPDY_name_value_add (struct SPDY_NameValue *container, - const char *name, - const char *value); - - -/** - * Lookup value for a name in a name/value structure. - * - * @param container structure in which to lookup - * @param name the name to look for - * @param num_values length of the returned array with values - * @return NULL if no such item was found, or an array containing the - * values - */ -_MHD_EXTERN const char * const * -SPDY_name_value_lookup (struct SPDY_NameValue *container, - const char *name, - int *num_values); - - -/** - * Iterate over name/value structure. - * - * @param container structure which to iterate over - * @param iterator callback to call on each name/value pair; - * maybe NULL (then just count headers) - * @param iterator_cls extra argument to @a iterator - * @return number of entries iterated over - */ -_MHD_EXTERN int -SPDY_name_value_iterate (struct SPDY_NameValue *container, - SPDY_NameValueIterator iterator, - void *iterator_cls); - - -/** - * Destroy a NameValue structure. Use this function to destroy only - * objects which, after passed to, will not be destroied by other - * functions. - * - */ -_MHD_EXTERN void -SPDY_name_value_destroy (struct SPDY_NameValue *container); - - -/* SPDY request handling functions */ - - -/** - * Gets the session responsible for the given - * request. - * - * @param request for which the session is wanted - * @return session handler for the request - */ -_MHD_EXTERN struct SPDY_Session * -SPDY_get_session_for_request (const struct SPDY_Request *request); - - -/** - * Associate a void pointer with a request. The data accessible by the - * pointer can later be used wherever the request handler is available. - * - * @param request with which to associate a pointer - * @param cls any data pointed by a pointer to be accessible later - */ -_MHD_EXTERN void -SPDY_set_cls_to_request (struct SPDY_Request *request, - void *cls); - - -/** - * Retrieves the pointer associated with the request by - * SPDY_set_cls_to_request(). - * - * @param request to get its cls - * @return same pointer added by SPDY_set_cls_to_request() or - * NULL when nothing was associated - */ -_MHD_EXTERN void * -SPDY_get_cls_from_request (struct SPDY_Request *request); - - -/* SPDY response handling functions */ - - -/** - * Create response object containing all needed headers and data. The - * response object is not bound to a request, so it can be used multiple - * times with SPDY_queue_response() and schould be - * destroied by calling the SPDY_destroy_response().

    - * - * Currently the library does not provide compression of the body data. - * It is up to the user to pass already compressed data and the - * appropriate headers to this function when desired. - * - * @param status HTTP status code for the response (e.g. 404) - * @param statustext HTTP status message for the response, which will - * be appended to the status code (e.g. "OK"). Can be NULL - * @param version HTTP version for the response (e.g. "http/1.1") - * @param headers name/value structure containing additional HTTP headers. - * Can be NULL. Can be used multiple times, it is up to - * the user to destoy the object when not needed anymore. - * @param data the body of the response. The lib will make a copy of it, - * so it is up to the user to take care of the memory - * pointed by data - * @param size length of @a data. It can be 0, then the lib will send only - * headers - * @return NULL on error, handle to response object on success - */ -_MHD_EXTERN struct SPDY_Response * -SPDY_build_response (int status, - const char *statustext, - const char *version, - struct SPDY_NameValue *headers, - const void *data, - size_t size); - - -/** - * Create response object containing all needed headers. The data will - * be provided later when the lib calls the callback function (just - * before writing it to the TLS socket). The - * response object is not bound to a request, so it can be used multiple - * times with SPDY_queue_response() and schould be - * destroied by calling the SPDY_destroy_response().

    - * - * Currently the library does not provide compression of the body data. - * It is up to the user to pass already compressed data and the - * appropriate headers to this function and the callback when desired. - * - * @param status HTTP status code for the response (e.g. 404) - * @param statustext HTTP status message for the response, which will - * be appended to the status code (e.g. "OK"). Can be NULL - * @param version HTTP version for the response (e.g. "http/1.1") - * @param headers name/value structure containing additional HTTP headers. - * Can be NULL. Can be used multiple times, it is up to - * the user to destoy the object when not needed anymore. - * @param rcb callback to use to obtain response data - * @param rcb_cls extra argument to @a rcb - * @param block_size preferred block size for querying rcb (advisory only, - * the lib will call rcb specifying the block size); clients - * should pick a value that is appropriate for IO and - * memory performance requirements. The function will - * fail if the value is bigger than the maximum - * supported value (SPDY_MAX_SUPPORTED_FRAME_SIZE). - * Can be 0, then the lib will use - * #SPDY_MAX_SUPPORTED_FRAME_SIZE instead. - * @return NULL on error, handle to response object on success - */ -_MHD_EXTERN struct SPDY_Response * -SPDY_build_response_with_callback(int status, - const char *statustext, - const char *version, - struct SPDY_NameValue *headers, - SPDY_ResponseCallback rcb, - void *rcb_cls, - uint32_t block_size); - - -/** - * Queue response object to be sent to the client. A successfully queued - * response may never be sent, e.g. when the stream gets closed. The - * data will be added to the output queue. The call will fail, if the - * output for this session - * is closed (i.e. the session is closed, half or full) or the output - * channel for the stream, on which the request was received, is closed - * (i.e. the stream is closed, half or full). - * - * @param request object identifying the request to which the - * response is returned - * @param response object containg headers and data to be sent - * @param closestream TRUE if the server does NOT intend to PUSH - * something more associated to this request/response later, - * FALSE otherwise - * @param consider_priority if FALSE, the response will be added to the - * end of the queue. If TRUE, the response will be added after - * the last previously added response with priority of the - * request grater or equal to that of the current one. This - * means that the function should be called with TRUE each time - * if one wants to be sure that the output queue behaves like - * a priority queue - * @param rrcb callback called when all the data was sent (last frame - * from response) or when that frame was discarded (e.g. the - * stream has been closed meanwhile) - * @param rrcb_cls extra argument to @a rrcb - * @return #SPDY_NO on error or #SPDY_YES on success - */ -_MHD_EXTERN int -SPDY_queue_response (struct SPDY_Request *request, - struct SPDY_Response *response, - bool closestream, - bool consider_priority, - SPDY_ResponseResultCallback rrcb, - void *rrcb_cls); - - -/** - * Destroy a response structure. It should be called for all objects - * returned by SPDY_build_response*() functions to free the memory - * associated with the prepared response. It is safe to call this - * function not before being sure that the response will not be used by - * the lib anymore, this means after SPDY_ResponseResultCallback - * callbacks were called for all calls to SPDY_queue_response() passing - * this response. - * - * @param response to destroy - */ -_MHD_EXTERN void -SPDY_destroy_response (struct SPDY_Response *response); - - -/* SPDY settings ID/value data structure handling functions */ - - -/** - * Create a new SettingsIDValue structure. It is needed for putting - * inside tuples of SPDY option, flags and value for sending to the - * client. - * - * @return hendler to the new empty structure or NULL on error - */ -_MHD_EXTERN const struct SPDY_Settings * -SPDY_settings_create (void); - - -/** - * Add or update a tuple to a SettingsIDValue structure. - * - * @param container structure to which the new tuple is added - * @param id SPDY settings ID that will be sent. If this ID already in - * container, the tupple for it will be updated (value and/or - * flags). If it is not in the container, a new tupple will be - * added. - * @param flags SPDY settings flags applied only to this setting - * @param value of the setting - * @return #SPDY_NO on error - * or #SPDY_YES if a new setting was added - */ -_MHD_EXTERN int -SPDY_settings_add (struct SPDY_Settings *container, - enum SPDY_SETTINGS id, - enum SPDY_FLAG_SETTINGS flags, - int32_t value); - - -/** - * Lookup value and flags for an ID in a settings ID/value structure. - * - * @param container structure in which to lookup - * @param id SPDY settings ID to search for - * @param flags out param for SPDY settings flags for this setting; - * check it against the flags in enum SPDY_FLAG_SETTINGS - * @param value out param for the value of this setting - * @return #SPDY_NO if the setting is not into the structure - * or #SPDY_YES if it is into it - */ -_MHD_EXTERN int -SPDY_settings_lookup (const struct SPDY_Settings *container, - enum SPDY_SETTINGS id, - enum SPDY_FLAG_SETTINGS *flags, - int32_t *value); - - -/** - * Iterate over settings ID/value structure. - * - * @param container structure which to iterate over - * @param iterator callback to call on each ID/value pair; - * maybe NULL (then just count number of settings) - * @param iterator_cls extra argument to iterator - * @return number of entries iterated over - */ -_MHD_EXTERN int -SPDY_settings_iterate (const struct SPDY_Settings *container, - SPDY_SettingsIterator iterator, - void *iterator_cls); - - -/** - * Destroy a settings ID/value structure. Use this function to destroy - * only objects which, after passed to, will not be destroied by other - * functions. - * - * @param container structure which to detroy - */ -_MHD_EXTERN void -SPDY_settings_destroy (struct SPDY_Settings * container); - - -/* SPDY SETTINGS handling functions */ - - -/** - * Send SPDY SETTINGS to the client. The call will return fail if there - * in invald setting into the settings container (e.g. invalid setting - * ID). - * - * @param session SPDY_Session handler for which settings are being sent - * @param settings ID/value pairs of the settings to be sent. - * Can be used multiple times, it is up to the user to destoy - * the object when not needed anymore. - * @param flags for the whole settings frame. They are valid for all tuples - * @param ... list of options (type-value pairs, - * terminated with #SPDY_SETTINGS_OPTION_END). - * @return SPDY_NO on error or SPDY_YES on - * success - */ -_MHD_EXTERN int -SPDY_send_settings (struct SPDY_Session *session, - struct SPDY_Settings *settings, - enum SPDY_FLAG_SETTINGS_FRAME flags, - ...); - - -/* SPDY misc functions */ - - -/** - * Destroy a request structure. It should be called for all objects - * received as a parameter in SPDY_NewRequestCallback to free the memory - * associated with the request. It is safe to call this - * function not before being sure that the request will not be used by - * the lib anymore, this means after the stream, on which this request - * had been sent, was closed and all SPDY_ResponseResultCallback - * callbacks were called for all calls to SPDY_queue_response() passing - * this request object. - * - * @param request to destroy - */ -_MHD_EXTERN void -SPDY_destroy_request (struct SPDY_Request * request); - - -/** - * Send SPDY ping to the client - * - * @param session handler for which the ping request is sent - * @param rttcb callback called when ping response to the request is - * received - * @param rttcb_cls extra argument to @a rttcb - * @return #SPDY_NO on error or #SPDY_YES on success - */ -_MHD_EXTERN int -SPDY_send_ping (struct SPDY_Session *session, - SPDY_PingCallback rttcb, - void *rttcb_cls); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/include/platform.h b/src/hos_libhttpserver/src/libmicrohttpd/src/include/platform.h deleted file mode 100644 index 22dddddf..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/include/platform.h +++ /dev/null @@ -1,205 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2008 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file platform.h - * @brief platform-specific includes for libmicrohttpd - * @author Christian Grothoff - * - * This file is included by the libmicrohttpd code - * before "microhttpd.h"; it provides the required - * standard headers (which are platform-specific).

    - * - * Note that this file depends on our configure.ac - * build process and the generated config.h file. - * Hence you cannot include it directly in applications - * that use libmicrohttpd. - */ -#ifndef MHD_PLATFORM_H -#define MHD_PLATFORM_H - -#include "MHD_config.h" - -#ifndef BUILDING_MHD_LIB -#ifdef _MHD_EXTERN -#undef _MHD_EXTERN -#endif /* _MHD_EXTERN */ -#if defined(_WIN32) && defined(MHD_W32LIB) -#define _MHD_EXTERN extern -#elif defined (_WIN32) && defined(MHD_W32DLL) -#define _MHD_EXTERN __declspec(dllimport) -#else -#define _MHD_EXTERN extern -#endif -#elif !defined(_MHD_EXTERN) /* && BUILDING_MHD_LIB */ -#if defined(_WIN32) && defined(MHD_W32LIB) -#define _MHD_EXTERN extern -#elif defined (_WIN32) && defined(MHD_W32DLL) -#define _MHD_EXTERN extern __declspec(dllexport) -#else -#define _MHD_EXTERN extern -#endif -#endif /* BUILDING_MHD_LIB */ - -#define _XOPEN_SOURCE_EXTENDED 1 -#if OS390 -#define _OPEN_THREADS -#define _OPEN_SYS_SOCK_IPV6 -#define _OPEN_MSGQ_EXT -#define _LP64 -#endif - -#if defined(_WIN32) -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 -#else // _WIN32_WINNT -#if _WIN32_WINNT < 0x0501 -#error "Headers for Windows XP or later are required" -#endif // _WIN32_WINNT < 0x0501 -#endif // _WIN32_WINNT -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#endif // _WIN32 - -#include -#include -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#include -#include -#include -#include -#include -#ifdef MHD_USE_POSIX_THREADS -#undef HAVE_CONFIG_H -#include -#define HAVE_CONFIG_H 1 -#endif // MHD_USE_POSIX_THREADS - -/* different OSes have fd_set in - a broad range of header files; - we just include most of them (if they - are available) */ - - -#ifdef OS_VXWORKS -#include -#include -#include -#include -#define RESTRICT __restrict__ -#endif -#if HAVE_MEMORY_H -#include -#endif - -#if HAVE_SYS_SELECT_H -#include -#endif -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_SYS_TIME_H -#include -#endif -#if HAVE_SYS_STAT_H -#include -#endif -#if HAVE_SYS_MSG_H -#include -#endif -#if HAVE_SYS_MMAN_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_TIME_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif - - -#if defined(_WIN32) && !defined(__CYGWIN__) -#include -#define sleep(seconds) (SleepEx((seconds)*1000, 1)/1000) -#define usleep(useconds) (void)SleepEx((useconds)/1000, 1) -#endif - -#if !defined(SHUT_WR) && defined(SD_SEND) -#define SHUT_WR SD_SEND -#endif -#if !defined(SHUT_RD) && defined(SD_RECEIVE) -#define SHUT_RD SD_RECEIVE -#endif -#if !defined(SHUT_RDWR) && defined(SD_BOTH) -#define SHUT_RDWR SD_BOTH -#endif - -#if defined(_MSC_FULL_VER) && !defined (_SSIZE_T_DEFINED) -#define _SSIZE_T_DEFINED -typedef intptr_t ssize_t; -#endif // !_SSIZE_T_DEFINED */ -#ifndef MHD_SOCKET_DEFINED -/** - * MHD_socket is type for socket FDs - */ -#if !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) -#define MHD_POSIX_SOCKETS 1 -typedef int MHD_socket; -#define MHD_INVALID_SOCKET (-1) -#else /* !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) */ -#define MHD_WINSOCK_SOCKETS 1 -#include -typedef SOCKET MHD_socket; -#define MHD_INVALID_SOCKET (INVALID_SOCKET) -#endif /* !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) */ -#define MHD_SOCKET_DEFINED 1 -#endif /* MHD_SOCKET_DEFINED */ - -/* Force don't use pipes on W32 */ -#if defined(_WIN32) && !defined(MHD_DONT_USE_PIPES) -#define MHD_DONT_USE_PIPES 1 -#endif /* defined(_WIN32) && !defined(MHD_DONT_USE_PIPES) */ - -/* MHD_pipe is type for pipe FDs*/ -#ifndef MHD_DONT_USE_PIPES -typedef int MHD_pipe; -#else /* ! MHD_DONT_USE_PIPES */ -typedef MHD_socket MHD_pipe; -#endif /* ! MHD_DONT_USE_PIPES */ - -#if !defined(IPPROTO_IPV6) && defined(_MSC_FULL_VER) && _WIN32_WINNT >= 0x0501 -/* VC use IPPROTO_IPV6 as part of enum */ -#define IPPROTO_IPV6 IPPROTO_IPV6 -#endif - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/include/platform_interface.h b/src/hos_libhttpserver/src/libmicrohttpd/src/include/platform_interface.h deleted file mode 100644 index 9e63f7a7..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/include/platform_interface.h +++ /dev/null @@ -1,344 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2014 Karlson2k (Evgeny Grin) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. - If not, see . -*/ - -/** - * @file include/platform_interface.h - * @brief internal platform abstraction functions - * @author Karlson2k (Evgeny Grin) - */ - -#ifndef MHD_PLATFORM_INTERFACE_H -#define MHD_PLATFORM_INTERFACE_H - -#include "platform.h" -#if defined(_WIN32) && !defined(__CYGWIN__) -#include "w32functions.h" -#endif - -/* ***************************** - General function mapping - *****************************/ -#if !defined(_WIN32) || defined(__CYGWIN__) -/** - * Check two strings case-insensitive equality - * @param a first string to check - * @param b second string to check - * @return boolean true if strings are equal, boolean false if strings are unequal - */ -#define MHD_str_equal_caseless_(a,b) (0==strcasecmp((a),(b))) -#else -/** - * Check two strings case-insensitive equality - * @param a first string to check - * @param b second string to check - * @return boolean true if strings are equal, boolean false if strings are unequal - */ -#define MHD_str_equal_caseless_(a,b) (0==_stricmp((a),(b))) -#endif - -#if !defined(_WIN32) || defined(__CYGWIN__) -/** - * Check not more than n chars in two strings case-insensitive equality - * @param a first string to check - * @param b second string to check - * @param n maximum number of chars to check - * @return boolean true if strings are equal, boolean false if strings are unequal - */ -#define MHD_str_equal_caseless_n_(a,b,n) (0==strncasecmp((a),(b),(n))) -#else -/** - * Check not more than n chars in two strings case-insensitive equality - * @param a first string to check - * @param b second string to check - * @param n maximum number of chars to check - * @return boolean true if strings are equal, boolean false if strings are unequal - */ -#define MHD_str_equal_caseless_n_(a,b,n) (0==_strnicmp((a),(b),(n))) -#endif - -/* Platform-independent snprintf name */ -#if !defined(_WIN32) || defined(__CYGWIN__) -#define MHD_snprintf_ snprintf -#else -#define MHD_snprintf_ W32_snprintf -#endif - - - -/* MHD_socket_close_(fd) close any FDs (non-W32) / close only socket FDs (W32) */ -#if !defined(_WIN32) || defined(__CYGWIN__) -#define MHD_socket_close_(fd) close((fd)) -#else -#define MHD_socket_close_(fd) closesocket((fd)) -#endif - -/* MHD_socket_errno_ is errno of last function (non-W32) / errno of last socket function (W32) */ -#if !defined(_WIN32) || defined(__CYGWIN__) -#define MHD_socket_errno_ errno -#else -#define MHD_socket_errno_ MHD_W32_errno_from_winsock_() -#endif - -/* MHD_socket_last_strerr_ is description string of last errno (non-W32) / - * description string of last socket error (W32) */ -#if !defined(_WIN32) || defined(__CYGWIN__) -#define MHD_socket_last_strerr_() strerror(errno) -#else -#define MHD_socket_last_strerr_() MHD_W32_strerror_last_winsock_() -#endif - -/* MHD_strerror_ is strerror (both non-W32/W32) */ -#if !defined(_WIN32) || defined(__CYGWIN__) -#define MHD_strerror_(errnum) strerror((errnum)) -#else -#define MHD_strerror_(errnum) MHD_W32_strerror_((errnum)) -#endif - -/* MHD_set_socket_errno_ set errno to errnum (non-W32) / set socket last error to errnum (W32) */ -#if !defined(_WIN32) || defined(__CYGWIN__) -#define MHD_set_socket_errno_(errnum) errno=(errnum) -#else -#define MHD_set_socket_errno_(errnum) MHD_W32_set_last_winsock_error_((errnum)) -#endif - -/* MHD_SYS_select_ is wrapper macro for system select() function */ -#if !defined(MHD_WINSOCK_SOCKETS) -#define MHD_SYS_select_(n,r,w,e,t) select((n),(r),(w),(e),(t)) -#else -#define MHD_SYS_select_(n,r,w,e,t) select((int)0,(r),(w),(e),(t)) -#endif - -#if defined(HAVE_POLL) -/* MHD_sys_poll_ is wrapper macro for system poll() function */ -#if !defined(MHD_WINSOCK_SOCKETS) -#define MHD_sys_poll_ poll -#else /* MHD_WINSOCK_SOCKETS */ -#define MHD_sys_poll_ WSAPoll -#endif /* MHD_WINSOCK_SOCKETS */ -#endif /* HAVE_POLL */ - -/* MHD_pipe_ create pipe (!MHD_DONT_USE_PIPES) / - * create two connected sockets (MHD_DONT_USE_PIPES) */ -#ifndef MHD_DONT_USE_PIPES -#define MHD_pipe_(fdarr) pipe((fdarr)) -#else /* MHD_DONT_USE_PIPES */ -#if !defined(_WIN32) || defined(__CYGWIN__) -#define MHD_pipe_(fdarr) socketpair(AF_LOCAL, SOCK_STREAM, 0, (fdarr)) -#else /* !defined(_WIN32) || defined(__CYGWIN__) */ -#define MHD_pipe_(fdarr) MHD_W32_pair_of_sockets_((fdarr)) -#endif /* !defined(_WIN32) || defined(__CYGWIN__) */ -#endif /* MHD_DONT_USE_PIPES */ - -/* MHD_pipe_errno_ is errno of last function (!MHD_DONT_USE_PIPES) / - * errno of last emulated pipe function (MHD_DONT_USE_PIPES) */ -#ifndef MHD_DONT_USE_PIPES -#define MHD_pipe_errno_ errno -#else -#define MHD_pipe_errno_ MHD_socket_errno_ -#endif - -/* MHD_pipe_last_strerror_ is description string of last errno (!MHD_DONT_USE_PIPES) / - * description string of last pipe error (MHD_DONT_USE_PIPES) */ -#ifndef MHD_DONT_USE_PIPES -#define MHD_pipe_last_strerror_() strerror(errno) -#else -#define MHD_pipe_last_strerror_() MHD_socket_last_strerr_() -#endif - -/* MHD_pipe_write_ write data to real pipe (!MHD_DONT_USE_PIPES) / - * write data to emulated pipe (MHD_DONT_USE_PIPES) */ -#ifndef MHD_DONT_USE_PIPES -#define MHD_pipe_write_(fd, ptr, sz) write((fd), (const void*)(ptr), (sz)) -#else -#define MHD_pipe_write_(fd, ptr, sz) send((fd), (const char*)(ptr), (sz), 0) -#endif - -/* MHD_pipe_read_ read data from real pipe (!MHD_DONT_USE_PIPES) / - * read data from emulated pipe (MHD_DONT_USE_PIPES) */ -#ifndef MHD_DONT_USE_PIPES -#define MHD_pipe_read_(fd, ptr, sz) read((fd), (void*)(ptr), (sz)) -#else -#define MHD_pipe_read_(fd, ptr, sz) recv((fd), (char*)(ptr), (sz), 0) -#endif - -/* MHD_pipe_close_(fd) close any FDs (non-W32) / - * close emulated pipe FDs (W32) */ -#ifndef MHD_DONT_USE_PIPES -#define MHD_pipe_close_(fd) close((fd)) -#else -#define MHD_pipe_close_(fd) MHD_socket_close_((fd)) -#endif - -/* MHD_INVALID_PIPE_ is a value of bad pipe FD */ -#ifndef MHD_DONT_USE_PIPES -#define MHD_INVALID_PIPE_ (-1) -#else -#define MHD_INVALID_PIPE_ MHD_INVALID_SOCKET -#endif - -#if !defined(_WIN32) || defined(__CYGWIN__) -#define MHD_random_() random() -#else -#define MHD_random_() MHD_W32_random_() -#endif - -#if defined(MHD_USE_POSIX_THREADS) -typedef pthread_t MHD_thread_handle_; -#elif defined(MHD_USE_W32_THREADS) -#include -typedef HANDLE MHD_thread_handle_; -#else -#error "No threading API is available." -#endif - -#if defined(MHD_USE_POSIX_THREADS) -#define MHD_THRD_RTRN_TYPE_ void* -#define MHD_THRD_CALL_SPEC_ -#elif defined(MHD_USE_W32_THREADS) -#define MHD_THRD_RTRN_TYPE_ unsigned -#define MHD_THRD_CALL_SPEC_ __stdcall -#endif - -#if defined(MHD_USE_POSIX_THREADS) -/** - * Wait until specified thread is ended - * @param thread ID to watch - * @return zero on success, nonzero on failure - */ -#define MHD_join_thread_(thread) pthread_join((thread), NULL) -#elif defined(MHD_USE_W32_THREADS) -/** - * Wait until specified thread is ended - * Close thread handle on success - * @param thread handle to watch - * @return zero on success, nonzero on failure - */ -#define MHD_join_thread_(thread) (WAIT_OBJECT_0 == WaitForSingleObject((thread), INFINITE) ? (CloseHandle((thread)), 0) : 1 ) -#endif - -#if defined(MHD_USE_W32_THREADS) -#define MHD_W32_MUTEX_ 1 -#include -typedef CRITICAL_SECTION MHD_mutex_; -#elif defined(HAVE_PTHREAD_H) && defined(MHD_USE_POSIX_THREADS) -#define MHD_PTHREAD_MUTEX_ 1 -typedef pthread_mutex_t MHD_mutex_; -#else -#error "No base mutex API is available." -#endif - -#if defined(MHD_PTHREAD_MUTEX_) -/** - * Create new mutex. - * @param mutex pointer to the mutex - * @return #MHD_YES on success, #MHD_NO on failure - */ -#define MHD_mutex_create_(mutex) \ - ((0 == pthread_mutex_init ((mutex), NULL)) ? MHD_YES : MHD_NO) -#elif defined(MHD_W32_MUTEX_) -/** - * Create new mutex. - * @param mutex pointer to mutex - * @return #MHD_YES on success, #MHD_NO on failure - */ -#define MHD_mutex_create_(mutex) \ - ((NULL != (mutex) && 0 != InitializeCriticalSectionAndSpinCount((mutex),2000)) ? MHD_YES : MHD_NO) -#endif - -#if defined(MHD_PTHREAD_MUTEX_) -/** - * Destroy previously created mutex. - * @param mutex pointer to mutex - * @return #MHD_YES on success, #MHD_NO on failure - */ -#define MHD_mutex_destroy_(mutex) \ - ((0 == pthread_mutex_destroy ((mutex))) ? MHD_YES : MHD_NO) -#elif defined(MHD_W32_MUTEX_) -/** - * Destroy previously created mutex. - * @param mutex pointer to mutex - * @return #MHD_YES on success, #MHD_NO on failure - */ -#define MHD_mutex_destroy_(mutex) \ - ((NULL != (mutex)) ? (DeleteCriticalSection(mutex), MHD_YES) : MHD_NO) -#endif - -#if defined(MHD_PTHREAD_MUTEX_) -/** - * Acquire lock on previously created mutex. - * If mutex was already locked by other thread, function - * blocks until mutex becomes available. - * @param mutex pointer to mutex - * @return #MHD_YES on success, #MHD_NO on failure - */ -#define MHD_mutex_lock_(mutex) \ - ((0 == pthread_mutex_lock((mutex))) ? MHD_YES : MHD_NO) -#elif defined(MHD_W32_MUTEX_) -/** - * Acquire lock on previously created mutex. - * If mutex was already locked by other thread, function - * blocks until mutex becomes available. - * @param mutex pointer to mutex - * @return #MHD_YES on success, #MHD_NO on failure - */ -#define MHD_mutex_lock_(mutex) \ - ((NULL != (mutex)) ? (EnterCriticalSection((mutex)), MHD_YES) : MHD_NO) -#endif - -#if defined(MHD_PTHREAD_MUTEX_) -/** - * Try to acquire lock on previously created mutex. - * Function returns immediately. - * @param mutex pointer to mutex - * @return #MHD_YES if mutex is locked, #MHD_NO if - * mutex was not locked. - */ -#define MHD_mutex_trylock_(mutex) \ - ((0 == pthread_mutex_trylock((mutex))) ? MHD_YES : MHD_NO) -#elif defined(MHD_W32_MUTEX_) -/** - * Try to acquire lock on previously created mutex. - * Function returns immediately. - * @param mutex pointer to mutex - * @return #MHD_YES if mutex is locked, #MHD_NO if - * mutex was not locked. - */ -#define MHD_mutex_trylock_(mutex) \ - ((NULL != (mutex) && 0 != TryEnterCriticalSection ((mutex))) ? MHD_YES : MHD_NO) -#endif - -#if defined(MHD_PTHREAD_MUTEX_) -/** - * Unlock previously created and locked mutex. - * @param mutex pointer to mutex - * @return #MHD_YES on success, #MHD_NO on failure - */ -#define MHD_mutex_unlock_(mutex) \ - ((0 == pthread_mutex_unlock((mutex))) ? MHD_YES : MHD_NO) -#elif defined(MHD_W32_MUTEX_) -/** - * Unlock previously created and locked mutex. - * @param mutex pointer to mutex - * @return #MHD_YES on success, #MHD_NO on failure - */ -#define MHD_mutex_unlock_(mutex) \ - ((NULL != (mutex)) ? (LeaveCriticalSection((mutex)), MHD_YES) : MHD_NO) -#endif - -#endif // MHD_PLATFORM_INTERFACE_H diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/include/w32functions.h b/src/hos_libhttpserver/src/libmicrohttpd/src/include/w32functions.h deleted file mode 100644 index a86c4b25..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/include/w32functions.h +++ /dev/null @@ -1,213 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2014 Karlson2k (Evgeny Grin) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. - If not, see . -*/ - -/** - * @file include/w32functions.h - * @brief internal functions for W32 systems - * @author Karlson2k (Evgeny Grin) - */ - -#ifndef MHD_W32FUNCTIONS_H -#define MHD_W32FUNCTIONS_H -#ifndef _WIN32 -#error w32functions.h is designed only for W32 systems -#endif - -#include "platform.h" -#include -#include -#include "platform_interface.h" - -#ifdef __cplusplus -extern "C" -{ -#endif - -#define MHDW32ERRBASE 3300 - -#ifndef EWOULDBLOCK -#define EWOULDBLOCK (MHDW32ERRBASE+1) -#endif -#ifndef EINPROGRESS -#define EINPROGRESS (MHDW32ERRBASE+2) -#endif -#ifndef EALREADY -#define EALREADY (MHDW32ERRBASE+3) -#endif -#ifndef ENOTSOCK -#define ENOTSOCK (MHDW32ERRBASE+4) -#endif -#ifndef EDESTADDRREQ -#define EDESTADDRREQ (MHDW32ERRBASE+5) -#endif -#ifndef EMSGSIZE -#define EMSGSIZE (MHDW32ERRBASE+6) -#endif -#ifndef EPROTOTYPE -#define EPROTOTYPE (MHDW32ERRBASE+7) -#endif -#ifndef ENOPROTOOPT -#define ENOPROTOOPT (MHDW32ERRBASE+8) -#endif -#ifndef EPROTONOSUPPORT -#define EPROTONOSUPPORT (MHDW32ERRBASE+9) -#endif -#ifndef EOPNOTSUPP -#define EOPNOTSUPP (MHDW32ERRBASE+10) -#endif -#ifndef EAFNOSUPPORT -#define EAFNOSUPPORT (MHDW32ERRBASE+11) -#endif -#ifndef EADDRINUSE -#define EADDRINUSE (MHDW32ERRBASE+12) -#endif -#ifndef EADDRNOTAVAIL -#define EADDRNOTAVAIL (MHDW32ERRBASE+13) -#endif -#ifndef ENETDOWN -#define ENETDOWN (MHDW32ERRBASE+14) -#endif -#ifndef ENETUNREACH -#define ENETUNREACH (MHDW32ERRBASE+15) -#endif -#ifndef ENETRESET -#define ENETRESET (MHDW32ERRBASE+16) -#endif -#ifndef ECONNABORTED -#define ECONNABORTED (MHDW32ERRBASE+17) -#endif -#ifndef ECONNRESET -#define ECONNRESET (MHDW32ERRBASE+18) -#endif -#ifndef ENOBUFS -#define ENOBUFS (MHDW32ERRBASE+19) -#endif -#ifndef EISCONN -#define EISCONN (MHDW32ERRBASE+20) -#endif -#ifndef ENOTCONN -#define ENOTCONN (MHDW32ERRBASE+21) -#endif -#ifndef ETOOMANYREFS -#define ETOOMANYREFS (MHDW32ERRBASE+22) -#endif -#ifndef ECONNREFUSED -#define ECONNREFUSED (MHDW32ERRBASE+23) -#endif -#ifndef ELOOP -#define ELOOP (MHDW32ERRBASE+24) -#endif -#ifndef EHOSTDOWN -#define EHOSTDOWN (MHDW32ERRBASE+25) -#endif -#ifndef EHOSTUNREACH -#define EHOSTUNREACH (MHDW32ERRBASE+26) -#endif -#ifndef EPROCLIM -#define EPROCLIM (MHDW32ERRBASE+27) -#endif -#ifndef EUSERS -#define EUSERS (MHDW32ERRBASE+28) -#endif -#ifndef EDQUOT -#define EDQUOT (MHDW32ERRBASE+29) -#endif -#ifndef ESTALE -#define ESTALE (MHDW32ERRBASE+30) -#endif -#ifndef EREMOTE -#define EREMOTE (MHDW32ERRBASE+31) -#endif -#ifndef ESOCKTNOSUPPORT -#define ESOCKTNOSUPPORT (MHDW32ERRBASE+32) -#endif -#ifndef EPFNOSUPPORT -#define EPFNOSUPPORT (MHDW32ERRBASE+33) -#endif -#ifndef ESHUTDOWN -#define ESHUTDOWN (MHDW32ERRBASE+34) -#endif -#ifndef ENODATA -#define ENODATA (MHDW32ERRBASE+35) -#endif -#ifndef ETIMEDOUT -#define ETIMEDOUT (MHDW32ERRBASE+36) -#endif - -/** - * Return errno equivalent of last winsock error - * @return errno equivalent of last winsock error - */ -int MHD_W32_errno_from_winsock_(void); - -/** - * Return pointer to string description of errnum error - * Works fine with both standard errno errnums - * and errnums from MHD_W32_errno_from_winsock_ - * @param errnum the errno or value from MHD_W32_errno_from_winsock_() - * @return pointer to string description of error - */ -const char* MHD_W32_strerror_(int errnum); - -/** - * Return pointer to string description of last winsock error - * @return pointer to string description of last winsock error - */ -const char* MHD_W32_strerror_last_winsock_(void); - -/** - * Set last winsock error to equivalent of given errno value - * @param errnum the errno value to set - */ -void MHD_W32_set_last_winsock_error_(int errnum); - -/** - * Create pair of mutually connected TCP/IP sockets on loopback address - * @param sockets_pair array to receive resulted sockets - * @return zero on success, -1 otherwise - */ -int MHD_W32_pair_of_sockets_(SOCKET sockets_pair[2]); - -/** - * Generate 31-bit pseudo random number. - * Function initialize itself at first call to current time. - * @return 31-bit pseudo random number. - */ -int MHD_W32_random_(void); - -/* Emulate snprintf function on W32 */ -int W32_snprintf(char *__restrict s, size_t n, const char *__restrict format, ...); - -#ifndef _MSC_FULL_VER -/* Thread name available only for VC-compiler */ -static void W32_SetThreadName(const DWORD thread_id, const char *thread_name) -{ } -#else /* _MSC_FULL_VER */ -/** - * Set thread name - * @param thread_id ID of thread, -1 for current thread - * @param thread_name name to set - */ -void W32_SetThreadName(const DWORD thread_id, const char *thread_name); -#endif - -#ifdef __cplusplus -} -#endif -#endif //MHD_W32FUNCTIONS_H diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/Makefile.am deleted file mode 100644 index dbf3bac8..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/Makefile.am +++ /dev/null @@ -1,176 +0,0 @@ -# This Makefile.am is in the public domain -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/microhttpd - -AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) - -if HAVE_W32 -MHD_W32_LIB = $(top_builddir)/src/platform/libplatform_interface.la -endif - -lib_LTLIBRARIES = \ - libmicrohttpd.la - -noinst_DATA = -MOSTLYCLEANFILES = - -if W32_SHARED_LIB_EXP -W32_MHD_LIB_LDFLAGS = -Wl,--output-def,$(lt_cv_objdir)/libmicrohttpd.def -XCClinker -static-libgcc -noinst_DATA += $(lt_cv_objdir)/libmicrohttpd.lib $(lt_cv_objdir)/libmicrohttpd.def $(lt_cv_objdir)/libmicrohttpd.exp -MOSTLYCLEANFILES += $(lt_cv_objdir)/libmicrohttpd.lib $(lt_cv_objdir)/libmicrohttpd.def $(lt_cv_objdir)/libmicrohttpd.exp - -$(lt_cv_objdir)/libmicrohttpd.def: libmicrohttpd.la - -$(lt_cv_objdir)/libmicrohttpd.exp: $(lt_cv_objdir)/libmicrohttpd.lib - -$(lt_cv_objdir)/libmicrohttpd.lib: $(lt_cv_objdir)/libmicrohttpd.def libmicrohttpd.la $(libmicrohttpd_la_OBJECTS) -if USE_MS_LIB_TOOL - @echo Creating $@ and libmicrohttpd.exp by $(MS_LIB_TOOL)... && \ - dll_name=`$(EGREP) -o dlname=\'.+\' libmicrohttpd.la` && \ - dll_name=$${dll_name#*\'} && dll_name=$${dll_name%\'} && test -n "$$dll_name" && \ - echo Creating $$dll_name by $(MS_LIB_TOOL).. && cd "$(lt_cv_objdir)" && \ - $(MS_LIB_TOOL) -def:libmicrohttpd.def -name:$$dll_name -out:libmicrohttpd.lib $(libmicrohttpd_la_OBJECTS:.lo=.o) && cd .. -else - @echo Creating $@ and libmicrohttpd.exp by $(DLLTOOL)... && \ - dll_name=`$(EGREP) -o dlname=\'.+\' libmicrohttpd.la` && \ - dll_name=$${dll_name#*\'} && dll_name=$${dll_name%\'} && test -n "$$dll_name" && \ - echo Creating $$dll_name by $(DLLTOOL).. && cd "$(lt_cv_objdir)" && \ - $(DLLTOOL) -d ./libmicrohttpd.def -D $$dll_name -l libmicrohttpd.lib $(libmicrohttpd_la_OBJECTS:.lo=.o) -e ./libmicrohttpd.exp && cd .. &&\ - echo Created libmicrohttpd.exp and libmicrohttpd.lib. -endif -else - W32_MHD_LIB_LDFLAGS = -endif - -if W32_STATIC_LIB -noinst_DATA += $(lt_cv_objdir)/libmicrohttpd-static.lib -MOSTLYCLEANFILES += $(lt_cv_objdir)/libmicrohttpd-static.lib - -$(lt_cv_objdir)/libmicrohttpd-static.lib: libmicrohttpd.la $(libmicrohttpd_la_OBJECTS) -if USE_MS_LIB_TOOL - $(MS_LIB_TOOL) -out:$@ $(libmicrohttpd_la_OBJECTS:.lo=.o) -else - cp $(lt_cv_objdir)/libmicrohttpd.a $@ -endif -endif - - -libmicrohttpd_la_SOURCES = \ - connection.c connection.h \ - reason_phrase.c reason_phrase.h \ - daemon.c \ - internal.c internal.h \ - memorypool.c memorypool.h \ - response.c response.h -libmicrohttpd_la_CPPFLAGS = \ - $(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) \ - -DBUILDING_MHD_LIB=1 -libmicrohttpd_la_CFLAGS = \ - $(AM_CFLAGS) $(MHD_LIB_CFLAGS) -libmicrohttpd_la_LDFLAGS = \ - $(MHD_LIB_LDFLAGS) \ - $(W32_MHD_LIB_LDFLAGS) \ - -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ -libmicrohttpd_la_LIBADD = \ - $(MHD_W32_LIB) $(MHD_LIBDEPS) -libmicrohttpd_la_DEPENDENCIES = \ - $(MHD_W32_LIB) - -if HAVE_W32 -MHD_DLL_RES_SRC = microhttpd_dll_res.rc -MHD_DLL_RES_LO = libmicrohttpd_la-$(MHD_DLL_RES_SRC:.rc=.lo) - -EXTRA_libmicrohttpd_la_DEPENDENCIES = $(MHD_DLL_RES_LO) -libmicrohttpd_la_LIBADD += $(MHD_DLL_RES_LO) - -# General rule is not required, but keep it just in case -.rc.lo: - $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) $(RCFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< -o $@ - -# To add dll resource only to .dll file and exclude it form static -# lib, a little trick was used. Allow libtool to create file.lo, -# file.o and .libs/file.lo, .libs/file.o files, then overwrite file.o -# by empty object generated from empty c-file. Later libtool will -# use .libs/file.o for shared lib and empty file.o for static lib. -# This implementation is based on trick found in liblzma. -# Note: windres does not understand '-isystem' flag, so all -# possible '-isystem' flags are replaced by simple '-I' flags. -$(MHD_DLL_RES_LO): $(MHD_DLL_RES_SRC) - RC_CPP_FLAGS=" $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) " && \ - $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) $(RCFLAGS) $(DEFS) $${RC_CPP_FLAGS// -isystem / -I } $< -o $@ && \ - echo > $@-empty.c && $(CC) $(AM_CFLAGS) $(CFLAGS) -c $@-empty.c -o $(@:.lo=.o) && rm -f $@-empty.c -endif - -if USE_COVERAGE - AM_CFLAGS += --coverage -endif - -if !HAVE_TSEARCH -libmicrohttpd_la_SOURCES += \ - tsearch.c tsearch.h -endif - -if HAVE_POSTPROCESSOR -libmicrohttpd_la_SOURCES += \ - postprocessor.c -endif - -if ENABLE_DAUTH -libmicrohttpd_la_SOURCES += \ - digestauth.c \ - md5.c md5.h -endif - -if ENABLE_BAUTH -libmicrohttpd_la_SOURCES += \ - basicauth.c \ - base64.c base64.h -endif - -if ENABLE_HTTPS -libmicrohttpd_la_SOURCES += \ - connection_https.c connection_https.h -endif - - - -check_PROGRAMS = \ - test_daemon - -if HAVE_POSTPROCESSOR -check_PROGRAMS += \ - test_postprocessor \ - test_postprocessor_large \ - test_postprocessor_amp -endif - -TESTS = $(check_PROGRAMS) - -test_daemon_SOURCES = \ - test_daemon.c -test_daemon_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -test_postprocessor_SOURCES = \ - test_postprocessor.c -test_postprocessor_CPPFLAGS = \ - $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) -test_postprocessor_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(MHD_W32_LIB) - -test_postprocessor_amp_SOURCES = \ - test_postprocessor_amp.c -test_postprocessor_amp_CPPFLAGS = \ - $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) -test_postprocessor_amp_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -test_postprocessor_large_SOURCES = \ - test_postprocessor_large.c -test_postprocessor_large_CPPFLAGS = \ - $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) -test_postprocessor_large_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(MHD_W32_LIB) diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/Makefile.in deleted file mode 100644 index f6aa7ab0..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/Makefile.in +++ /dev/null @@ -1,1427 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@W32_SHARED_LIB_EXP_TRUE@am__append_1 = $(lt_cv_objdir)/libmicrohttpd.lib $(lt_cv_objdir)/libmicrohttpd.def $(lt_cv_objdir)/libmicrohttpd.exp -@W32_SHARED_LIB_EXP_TRUE@am__append_2 = $(lt_cv_objdir)/libmicrohttpd.lib $(lt_cv_objdir)/libmicrohttpd.def $(lt_cv_objdir)/libmicrohttpd.exp -@W32_STATIC_LIB_TRUE@am__append_3 = $(lt_cv_objdir)/libmicrohttpd-static.lib -@W32_STATIC_LIB_TRUE@am__append_4 = $(lt_cv_objdir)/libmicrohttpd-static.lib -@HAVE_W32_TRUE@am__append_5 = $(MHD_DLL_RES_LO) -@USE_COVERAGE_TRUE@am__append_6 = --coverage -@HAVE_TSEARCH_FALSE@am__append_7 = \ -@HAVE_TSEARCH_FALSE@ tsearch.c tsearch.h - -@HAVE_POSTPROCESSOR_TRUE@am__append_8 = \ -@HAVE_POSTPROCESSOR_TRUE@ postprocessor.c - -@ENABLE_DAUTH_TRUE@am__append_9 = \ -@ENABLE_DAUTH_TRUE@ digestauth.c \ -@ENABLE_DAUTH_TRUE@ md5.c md5.h - -@ENABLE_BAUTH_TRUE@am__append_10 = \ -@ENABLE_BAUTH_TRUE@ basicauth.c \ -@ENABLE_BAUTH_TRUE@ base64.c base64.h - -@ENABLE_HTTPS_TRUE@am__append_11 = \ -@ENABLE_HTTPS_TRUE@ connection_https.c connection_https.h - -check_PROGRAMS = test_daemon$(EXEEXT) $(am__EXEEXT_1) -@HAVE_POSTPROCESSOR_TRUE@am__append_12 = \ -@HAVE_POSTPROCESSOR_TRUE@ test_postprocessor \ -@HAVE_POSTPROCESSOR_TRUE@ test_postprocessor_large \ -@HAVE_POSTPROCESSOR_TRUE@ test_postprocessor_amp - -subdir = src/microhttpd -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/microhttpd_dll_res.rc.in $(top_srcdir)/depcomp \ - $(top_srcdir)/test-driver -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = microhttpd_dll_res.rc -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = -am__libmicrohttpd_la_SOURCES_DIST = connection.c connection.h \ - reason_phrase.c reason_phrase.h daemon.c internal.c internal.h \ - memorypool.c memorypool.h response.c response.h tsearch.c \ - tsearch.h postprocessor.c digestauth.c md5.c md5.h basicauth.c \ - base64.c base64.h connection_https.c connection_https.h -@HAVE_TSEARCH_FALSE@am__objects_1 = libmicrohttpd_la-tsearch.lo -@HAVE_POSTPROCESSOR_TRUE@am__objects_2 = \ -@HAVE_POSTPROCESSOR_TRUE@ libmicrohttpd_la-postprocessor.lo -@ENABLE_DAUTH_TRUE@am__objects_3 = libmicrohttpd_la-digestauth.lo \ -@ENABLE_DAUTH_TRUE@ libmicrohttpd_la-md5.lo -@ENABLE_BAUTH_TRUE@am__objects_4 = libmicrohttpd_la-basicauth.lo \ -@ENABLE_BAUTH_TRUE@ libmicrohttpd_la-base64.lo -@ENABLE_HTTPS_TRUE@am__objects_5 = \ -@ENABLE_HTTPS_TRUE@ libmicrohttpd_la-connection_https.lo -am_libmicrohttpd_la_OBJECTS = libmicrohttpd_la-connection.lo \ - libmicrohttpd_la-reason_phrase.lo libmicrohttpd_la-daemon.lo \ - libmicrohttpd_la-internal.lo libmicrohttpd_la-memorypool.lo \ - libmicrohttpd_la-response.lo $(am__objects_1) $(am__objects_2) \ - $(am__objects_3) $(am__objects_4) $(am__objects_5) -libmicrohttpd_la_OBJECTS = $(am_libmicrohttpd_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -libmicrohttpd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libmicrohttpd_la_CFLAGS) $(CFLAGS) \ - $(libmicrohttpd_la_LDFLAGS) $(LDFLAGS) -o $@ -@HAVE_POSTPROCESSOR_TRUE@am__EXEEXT_1 = test_postprocessor$(EXEEXT) \ -@HAVE_POSTPROCESSOR_TRUE@ test_postprocessor_large$(EXEEXT) \ -@HAVE_POSTPROCESSOR_TRUE@ test_postprocessor_amp$(EXEEXT) -am_test_daemon_OBJECTS = test_daemon.$(OBJEXT) -test_daemon_OBJECTS = $(am_test_daemon_OBJECTS) -test_daemon_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_postprocessor_OBJECTS = \ - test_postprocessor-test_postprocessor.$(OBJEXT) -test_postprocessor_OBJECTS = $(am_test_postprocessor_OBJECTS) -test_postprocessor_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la $(MHD_W32_LIB) -am_test_postprocessor_amp_OBJECTS = \ - test_postprocessor_amp-test_postprocessor_amp.$(OBJEXT) -test_postprocessor_amp_OBJECTS = $(am_test_postprocessor_amp_OBJECTS) -test_postprocessor_amp_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_postprocessor_large_OBJECTS = \ - test_postprocessor_large-test_postprocessor_large.$(OBJEXT) -test_postprocessor_large_OBJECTS = \ - $(am_test_postprocessor_large_OBJECTS) -test_postprocessor_large_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la $(MHD_W32_LIB) -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libmicrohttpd_la_SOURCES) $(test_daemon_SOURCES) \ - $(test_postprocessor_SOURCES) \ - $(test_postprocessor_amp_SOURCES) \ - $(test_postprocessor_large_SOURCES) -DIST_SOURCES = $(am__libmicrohttpd_la_SOURCES_DIST) \ - $(test_daemon_SOURCES) $(test_postprocessor_SOURCES) \ - $(test_postprocessor_amp_SOURCES) \ - $(test_postprocessor_large_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DATA = $(noinst_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -am__tty_colors_dummy = \ - mgn= red= grn= lgn= blu= brg= std=; \ - am__color_tests=no -am__tty_colors = { \ - $(am__tty_colors_dummy); \ - if test "X$(AM_COLOR_TESTS)" = Xno; then \ - am__color_tests=no; \ - elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ - am__color_tests=yes; \ - elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ - am__color_tests=yes; \ - fi; \ - if test $$am__color_tests = yes; then \ - red=''; \ - grn=''; \ - lgn=''; \ - blu=''; \ - mgn=''; \ - brg=''; \ - std=''; \ - fi; \ -} -am__recheck_rx = ^[ ]*:recheck:[ ]* -am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* -am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* -# A command that, given a newline-separated list of test names on the -# standard input, print the name of the tests that are to be re-run -# upon "make recheck". -am__list_recheck_tests = $(AWK) '{ \ - recheck = 1; \ - while ((rc = (getline line < ($$0 ".trs"))) != 0) \ - { \ - if (rc < 0) \ - { \ - if ((getline line2 < ($$0 ".log")) < 0) \ - recheck = 0; \ - break; \ - } \ - else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ - { \ - recheck = 0; \ - break; \ - } \ - else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ - { \ - break; \ - } \ - }; \ - if (recheck) \ - print $$0; \ - close ($$0 ".trs"); \ - close ($$0 ".log"); \ -}' -# A command that, given a newline-separated list of test names on the -# standard input, create the global log from their .trs and .log files. -am__create_global_log = $(AWK) ' \ -function fatal(msg) \ -{ \ - print "fatal: making $@: " msg | "cat >&2"; \ - exit 1; \ -} \ -function rst_section(header) \ -{ \ - print header; \ - len = length(header); \ - for (i = 1; i <= len; i = i + 1) \ - printf "="; \ - printf "\n\n"; \ -} \ -{ \ - copy_in_global_log = 1; \ - global_test_result = "RUN"; \ - while ((rc = (getline line < ($$0 ".trs"))) != 0) \ - { \ - if (rc < 0) \ - fatal("failed to read from " $$0 ".trs"); \ - if (line ~ /$(am__global_test_result_rx)/) \ - { \ - sub("$(am__global_test_result_rx)", "", line); \ - sub("[ ]*$$", "", line); \ - global_test_result = line; \ - } \ - else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ - copy_in_global_log = 0; \ - }; \ - if (copy_in_global_log) \ - { \ - rst_section(global_test_result ": " $$0); \ - while ((rc = (getline line < ($$0 ".log"))) != 0) \ - { \ - if (rc < 0) \ - fatal("failed to read from " $$0 ".log"); \ - print line; \ - }; \ - printf "\n"; \ - }; \ - close ($$0 ".trs"); \ - close ($$0 ".log"); \ -}' -# Restructured Text title. -am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } -# Solaris 10 'make', and several other traditional 'make' implementations, -# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it -# by disabling -e (using the XSI extension "set +e") if it's set. -am__sh_e_setup = case $$- in *e*) set +e;; esac -# Default flags passed to test drivers. -am__common_driver_flags = \ - --color-tests "$$am__color_tests" \ - --enable-hard-errors "$$am__enable_hard_errors" \ - --expect-failure "$$am__expect_failure" -# To be inserted before the command running the test. Creates the -# directory for the log if needed. Stores in $dir the directory -# containing $f, in $tst the test, in $log the log. Executes the -# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and -# passes TESTS_ENVIRONMENT. Set up options for the wrapper that -# will run the test scripts (or their associated LOG_COMPILER, if -# thy have one). -am__check_pre = \ -$(am__sh_e_setup); \ -$(am__vpath_adj_setup) $(am__vpath_adj) \ -$(am__tty_colors); \ -srcdir=$(srcdir); export srcdir; \ -case "$@" in \ - */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ - *) am__odir=.;; \ -esac; \ -test "x$$am__odir" = x"." || test -d "$$am__odir" \ - || $(MKDIR_P) "$$am__odir" || exit $$?; \ -if test -f "./$$f"; then dir=./; \ -elif test -f "$$f"; then dir=; \ -else dir="$(srcdir)/"; fi; \ -tst=$$dir$$f; log='$@'; \ -if test -n '$(DISABLE_HARD_ERRORS)'; then \ - am__enable_hard_errors=no; \ -else \ - am__enable_hard_errors=yes; \ -fi; \ -case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ - am__expect_failure=yes;; \ - *) \ - am__expect_failure=no;; \ -esac; \ -$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) -# A shell command to get the names of the tests scripts with any registered -# extension removed (i.e., equivalently, the names of the test logs, with -# the '.log' extension removed). The result is saved in the shell variable -# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, -# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", -# since that might cause problem with VPATH rewrites for suffix-less tests. -# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. -am__set_TESTS_bases = \ - bases='$(TEST_LOGS)'; \ - bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ - bases=`echo $$bases` -RECHECK_LOGS = $(TEST_LOGS) -AM_RECURSIVE_TARGETS = check recheck -TEST_SUITE_LOG = test-suite.log -TEST_EXTENSIONS = @EXEEXT@ .test -LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver -LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) -am__set_b = \ - case '$@' in \ - */*) \ - case '$*' in \ - */*) b='$*';; \ - *) b=`echo '$@' | sed 's/\.log$$//'`; \ - esac;; \ - *) \ - b='$*';; \ - esac -am__test_logs1 = $(TESTS:=.log) -am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) -TEST_LOGS = $(am__test_logs2:.test.log=.log) -TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver -TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ - $(TEST_LOG_FLAGS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/microhttpd - -AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) $(am__append_6) -@HAVE_W32_TRUE@MHD_W32_LIB = $(top_builddir)/src/platform/libplatform_interface.la -lib_LTLIBRARIES = \ - libmicrohttpd.la - -noinst_DATA = $(am__append_1) $(am__append_3) -MOSTLYCLEANFILES = $(am__append_2) $(am__append_4) -@W32_SHARED_LIB_EXP_FALSE@W32_MHD_LIB_LDFLAGS = -@W32_SHARED_LIB_EXP_TRUE@W32_MHD_LIB_LDFLAGS = -Wl,--output-def,$(lt_cv_objdir)/libmicrohttpd.def -XCClinker -static-libgcc -libmicrohttpd_la_SOURCES = connection.c connection.h reason_phrase.c \ - reason_phrase.h daemon.c internal.c internal.h memorypool.c \ - memorypool.h response.c response.h $(am__append_7) \ - $(am__append_8) $(am__append_9) $(am__append_10) \ - $(am__append_11) -libmicrohttpd_la_CPPFLAGS = \ - $(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) \ - -DBUILDING_MHD_LIB=1 - -libmicrohttpd_la_CFLAGS = \ - $(AM_CFLAGS) $(MHD_LIB_CFLAGS) - -libmicrohttpd_la_LDFLAGS = \ - $(MHD_LIB_LDFLAGS) \ - $(W32_MHD_LIB_LDFLAGS) \ - -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ - -libmicrohttpd_la_LIBADD = $(MHD_W32_LIB) $(MHD_LIBDEPS) \ - $(am__append_5) -libmicrohttpd_la_DEPENDENCIES = \ - $(MHD_W32_LIB) - -@HAVE_W32_TRUE@MHD_DLL_RES_SRC = microhttpd_dll_res.rc -@HAVE_W32_TRUE@MHD_DLL_RES_LO = libmicrohttpd_la-$(MHD_DLL_RES_SRC:.rc=.lo) -@HAVE_W32_TRUE@EXTRA_libmicrohttpd_la_DEPENDENCIES = $(MHD_DLL_RES_LO) -TESTS = $(check_PROGRAMS) -test_daemon_SOURCES = \ - test_daemon.c - -test_daemon_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -test_postprocessor_SOURCES = \ - test_postprocessor.c - -test_postprocessor_CPPFLAGS = \ - $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) - -test_postprocessor_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(MHD_W32_LIB) - -test_postprocessor_amp_SOURCES = \ - test_postprocessor_amp.c - -test_postprocessor_amp_CPPFLAGS = \ - $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) - -test_postprocessor_amp_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -test_postprocessor_large_SOURCES = \ - test_postprocessor_large.c - -test_postprocessor_large_CPPFLAGS = \ - $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) - -test_postprocessor_large_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(MHD_W32_LIB) - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .log .o .obj .rc .test .test$(EXEEXT) .trs -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/microhttpd/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/microhttpd/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -microhttpd_dll_res.rc: $(top_builddir)/config.status $(srcdir)/microhttpd_dll_res.rc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libmicrohttpd.la: $(libmicrohttpd_la_OBJECTS) $(libmicrohttpd_la_DEPENDENCIES) $(EXTRA_libmicrohttpd_la_DEPENDENCIES) - $(AM_V_CCLD)$(libmicrohttpd_la_LINK) -rpath $(libdir) $(libmicrohttpd_la_OBJECTS) $(libmicrohttpd_la_LIBADD) $(LIBS) - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -test_daemon$(EXEEXT): $(test_daemon_OBJECTS) $(test_daemon_DEPENDENCIES) $(EXTRA_test_daemon_DEPENDENCIES) - @rm -f test_daemon$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_daemon_OBJECTS) $(test_daemon_LDADD) $(LIBS) - -test_postprocessor$(EXEEXT): $(test_postprocessor_OBJECTS) $(test_postprocessor_DEPENDENCIES) $(EXTRA_test_postprocessor_DEPENDENCIES) - @rm -f test_postprocessor$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_postprocessor_OBJECTS) $(test_postprocessor_LDADD) $(LIBS) - -test_postprocessor_amp$(EXEEXT): $(test_postprocessor_amp_OBJECTS) $(test_postprocessor_amp_DEPENDENCIES) $(EXTRA_test_postprocessor_amp_DEPENDENCIES) - @rm -f test_postprocessor_amp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_postprocessor_amp_OBJECTS) $(test_postprocessor_amp_LDADD) $(LIBS) - -test_postprocessor_large$(EXEEXT): $(test_postprocessor_large_OBJECTS) $(test_postprocessor_large_DEPENDENCIES) $(EXTRA_test_postprocessor_large_DEPENDENCIES) - @rm -f test_postprocessor_large$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_postprocessor_large_OBJECTS) $(test_postprocessor_large_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-base64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-basicauth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-connection.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-connection_https.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-daemon.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-digestauth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-internal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-md5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-memorypool.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-postprocessor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-reason_phrase.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-response.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrohttpd_la-tsearch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_daemon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_postprocessor-test_postprocessor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_postprocessor_amp-test_postprocessor_amp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_postprocessor_large-test_postprocessor_large.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -libmicrohttpd_la-connection.lo: connection.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-connection.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-connection.Tpo -c -o libmicrohttpd_la-connection.lo `test -f 'connection.c' || echo '$(srcdir)/'`connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-connection.Tpo $(DEPDIR)/libmicrohttpd_la-connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='connection.c' object='libmicrohttpd_la-connection.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-connection.lo `test -f 'connection.c' || echo '$(srcdir)/'`connection.c - -libmicrohttpd_la-reason_phrase.lo: reason_phrase.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-reason_phrase.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-reason_phrase.Tpo -c -o libmicrohttpd_la-reason_phrase.lo `test -f 'reason_phrase.c' || echo '$(srcdir)/'`reason_phrase.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-reason_phrase.Tpo $(DEPDIR)/libmicrohttpd_la-reason_phrase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reason_phrase.c' object='libmicrohttpd_la-reason_phrase.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-reason_phrase.lo `test -f 'reason_phrase.c' || echo '$(srcdir)/'`reason_phrase.c - -libmicrohttpd_la-daemon.lo: daemon.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-daemon.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-daemon.Tpo -c -o libmicrohttpd_la-daemon.lo `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-daemon.Tpo $(DEPDIR)/libmicrohttpd_la-daemon.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon.c' object='libmicrohttpd_la-daemon.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-daemon.lo `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c - -libmicrohttpd_la-internal.lo: internal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-internal.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-internal.Tpo -c -o libmicrohttpd_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-internal.Tpo $(DEPDIR)/libmicrohttpd_la-internal.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='internal.c' object='libmicrohttpd_la-internal.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c - -libmicrohttpd_la-memorypool.lo: memorypool.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-memorypool.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-memorypool.Tpo -c -o libmicrohttpd_la-memorypool.lo `test -f 'memorypool.c' || echo '$(srcdir)/'`memorypool.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-memorypool.Tpo $(DEPDIR)/libmicrohttpd_la-memorypool.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='memorypool.c' object='libmicrohttpd_la-memorypool.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-memorypool.lo `test -f 'memorypool.c' || echo '$(srcdir)/'`memorypool.c - -libmicrohttpd_la-response.lo: response.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-response.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-response.Tpo -c -o libmicrohttpd_la-response.lo `test -f 'response.c' || echo '$(srcdir)/'`response.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-response.Tpo $(DEPDIR)/libmicrohttpd_la-response.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='response.c' object='libmicrohttpd_la-response.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-response.lo `test -f 'response.c' || echo '$(srcdir)/'`response.c - -libmicrohttpd_la-tsearch.lo: tsearch.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-tsearch.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-tsearch.Tpo -c -o libmicrohttpd_la-tsearch.lo `test -f 'tsearch.c' || echo '$(srcdir)/'`tsearch.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-tsearch.Tpo $(DEPDIR)/libmicrohttpd_la-tsearch.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tsearch.c' object='libmicrohttpd_la-tsearch.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-tsearch.lo `test -f 'tsearch.c' || echo '$(srcdir)/'`tsearch.c - -libmicrohttpd_la-postprocessor.lo: postprocessor.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-postprocessor.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-postprocessor.Tpo -c -o libmicrohttpd_la-postprocessor.lo `test -f 'postprocessor.c' || echo '$(srcdir)/'`postprocessor.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-postprocessor.Tpo $(DEPDIR)/libmicrohttpd_la-postprocessor.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='postprocessor.c' object='libmicrohttpd_la-postprocessor.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-postprocessor.lo `test -f 'postprocessor.c' || echo '$(srcdir)/'`postprocessor.c - -libmicrohttpd_la-digestauth.lo: digestauth.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-digestauth.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-digestauth.Tpo -c -o libmicrohttpd_la-digestauth.lo `test -f 'digestauth.c' || echo '$(srcdir)/'`digestauth.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-digestauth.Tpo $(DEPDIR)/libmicrohttpd_la-digestauth.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='digestauth.c' object='libmicrohttpd_la-digestauth.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-digestauth.lo `test -f 'digestauth.c' || echo '$(srcdir)/'`digestauth.c - -libmicrohttpd_la-md5.lo: md5.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-md5.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-md5.Tpo -c -o libmicrohttpd_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-md5.Tpo $(DEPDIR)/libmicrohttpd_la-md5.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5.c' object='libmicrohttpd_la-md5.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c - -libmicrohttpd_la-basicauth.lo: basicauth.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-basicauth.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-basicauth.Tpo -c -o libmicrohttpd_la-basicauth.lo `test -f 'basicauth.c' || echo '$(srcdir)/'`basicauth.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-basicauth.Tpo $(DEPDIR)/libmicrohttpd_la-basicauth.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='basicauth.c' object='libmicrohttpd_la-basicauth.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-basicauth.lo `test -f 'basicauth.c' || echo '$(srcdir)/'`basicauth.c - -libmicrohttpd_la-base64.lo: base64.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-base64.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-base64.Tpo -c -o libmicrohttpd_la-base64.lo `test -f 'base64.c' || echo '$(srcdir)/'`base64.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-base64.Tpo $(DEPDIR)/libmicrohttpd_la-base64.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='base64.c' object='libmicrohttpd_la-base64.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-base64.lo `test -f 'base64.c' || echo '$(srcdir)/'`base64.c - -libmicrohttpd_la-connection_https.lo: connection_https.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -MT libmicrohttpd_la-connection_https.lo -MD -MP -MF $(DEPDIR)/libmicrohttpd_la-connection_https.Tpo -c -o libmicrohttpd_la-connection_https.lo `test -f 'connection_https.c' || echo '$(srcdir)/'`connection_https.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrohttpd_la-connection_https.Tpo $(DEPDIR)/libmicrohttpd_la-connection_https.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='connection_https.c' object='libmicrohttpd_la-connection_https.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $(libmicrohttpd_la_CFLAGS) $(CFLAGS) -c -o libmicrohttpd_la-connection_https.lo `test -f 'connection_https.c' || echo '$(srcdir)/'`connection_https.c - -test_postprocessor-test_postprocessor.o: test_postprocessor.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_postprocessor-test_postprocessor.o -MD -MP -MF $(DEPDIR)/test_postprocessor-test_postprocessor.Tpo -c -o test_postprocessor-test_postprocessor.o `test -f 'test_postprocessor.c' || echo '$(srcdir)/'`test_postprocessor.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_postprocessor-test_postprocessor.Tpo $(DEPDIR)/test_postprocessor-test_postprocessor.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_postprocessor.c' object='test_postprocessor-test_postprocessor.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_postprocessor-test_postprocessor.o `test -f 'test_postprocessor.c' || echo '$(srcdir)/'`test_postprocessor.c - -test_postprocessor-test_postprocessor.obj: test_postprocessor.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_postprocessor-test_postprocessor.obj -MD -MP -MF $(DEPDIR)/test_postprocessor-test_postprocessor.Tpo -c -o test_postprocessor-test_postprocessor.obj `if test -f 'test_postprocessor.c'; then $(CYGPATH_W) 'test_postprocessor.c'; else $(CYGPATH_W) '$(srcdir)/test_postprocessor.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_postprocessor-test_postprocessor.Tpo $(DEPDIR)/test_postprocessor-test_postprocessor.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_postprocessor.c' object='test_postprocessor-test_postprocessor.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_postprocessor-test_postprocessor.obj `if test -f 'test_postprocessor.c'; then $(CYGPATH_W) 'test_postprocessor.c'; else $(CYGPATH_W) '$(srcdir)/test_postprocessor.c'; fi` - -test_postprocessor_amp-test_postprocessor_amp.o: test_postprocessor_amp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_amp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_postprocessor_amp-test_postprocessor_amp.o -MD -MP -MF $(DEPDIR)/test_postprocessor_amp-test_postprocessor_amp.Tpo -c -o test_postprocessor_amp-test_postprocessor_amp.o `test -f 'test_postprocessor_amp.c' || echo '$(srcdir)/'`test_postprocessor_amp.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_postprocessor_amp-test_postprocessor_amp.Tpo $(DEPDIR)/test_postprocessor_amp-test_postprocessor_amp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_postprocessor_amp.c' object='test_postprocessor_amp-test_postprocessor_amp.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_amp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_postprocessor_amp-test_postprocessor_amp.o `test -f 'test_postprocessor_amp.c' || echo '$(srcdir)/'`test_postprocessor_amp.c - -test_postprocessor_amp-test_postprocessor_amp.obj: test_postprocessor_amp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_amp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_postprocessor_amp-test_postprocessor_amp.obj -MD -MP -MF $(DEPDIR)/test_postprocessor_amp-test_postprocessor_amp.Tpo -c -o test_postprocessor_amp-test_postprocessor_amp.obj `if test -f 'test_postprocessor_amp.c'; then $(CYGPATH_W) 'test_postprocessor_amp.c'; else $(CYGPATH_W) '$(srcdir)/test_postprocessor_amp.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_postprocessor_amp-test_postprocessor_amp.Tpo $(DEPDIR)/test_postprocessor_amp-test_postprocessor_amp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_postprocessor_amp.c' object='test_postprocessor_amp-test_postprocessor_amp.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_amp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_postprocessor_amp-test_postprocessor_amp.obj `if test -f 'test_postprocessor_amp.c'; then $(CYGPATH_W) 'test_postprocessor_amp.c'; else $(CYGPATH_W) '$(srcdir)/test_postprocessor_amp.c'; fi` - -test_postprocessor_large-test_postprocessor_large.o: test_postprocessor_large.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_large_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_postprocessor_large-test_postprocessor_large.o -MD -MP -MF $(DEPDIR)/test_postprocessor_large-test_postprocessor_large.Tpo -c -o test_postprocessor_large-test_postprocessor_large.o `test -f 'test_postprocessor_large.c' || echo '$(srcdir)/'`test_postprocessor_large.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_postprocessor_large-test_postprocessor_large.Tpo $(DEPDIR)/test_postprocessor_large-test_postprocessor_large.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_postprocessor_large.c' object='test_postprocessor_large-test_postprocessor_large.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_large_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_postprocessor_large-test_postprocessor_large.o `test -f 'test_postprocessor_large.c' || echo '$(srcdir)/'`test_postprocessor_large.c - -test_postprocessor_large-test_postprocessor_large.obj: test_postprocessor_large.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_large_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_postprocessor_large-test_postprocessor_large.obj -MD -MP -MF $(DEPDIR)/test_postprocessor_large-test_postprocessor_large.Tpo -c -o test_postprocessor_large-test_postprocessor_large.obj `if test -f 'test_postprocessor_large.c'; then $(CYGPATH_W) 'test_postprocessor_large.c'; else $(CYGPATH_W) '$(srcdir)/test_postprocessor_large.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_postprocessor_large-test_postprocessor_large.Tpo $(DEPDIR)/test_postprocessor_large-test_postprocessor_large.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_postprocessor_large.c' object='test_postprocessor_large-test_postprocessor_large.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_postprocessor_large_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_postprocessor_large-test_postprocessor_large.obj `if test -f 'test_postprocessor_large.c'; then $(CYGPATH_W) 'test_postprocessor_large.c'; else $(CYGPATH_W) '$(srcdir)/test_postprocessor_large.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -# Recover from deleted '.trs' file; this should ensure that -# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create -# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells -# to avoid problems with "make -n". -.log.trs: - rm -f $< $@ - $(MAKE) $(AM_MAKEFLAGS) $< - -# Leading 'am--fnord' is there to ensure the list of targets does not -# expand to empty, as could happen e.g. with make check TESTS=''. -am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) -am--force-recheck: - @: - -$(TEST_SUITE_LOG): $(TEST_LOGS) - @$(am__set_TESTS_bases); \ - am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ - redo_bases=`for i in $$bases; do \ - am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ - done`; \ - if test -n "$$redo_bases"; then \ - redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ - redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ - if $(am__make_dryrun); then :; else \ - rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ - fi; \ - fi; \ - if test -n "$$am__remaking_logs"; then \ - echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ - "recursion detected" >&2; \ - else \ - am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ - fi; \ - if $(am__make_dryrun); then :; else \ - st=0; \ - errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ - for i in $$redo_bases; do \ - test -f $$i.trs && test -r $$i.trs \ - || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ - test -f $$i.log && test -r $$i.log \ - || { echo "$$errmsg $$i.log" >&2; st=1; }; \ - done; \ - test $$st -eq 0 || exit 1; \ - fi - @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ - ws='[ ]'; \ - results=`for b in $$bases; do echo $$b.trs; done`; \ - test -n "$$results" || results=/dev/null; \ - all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ - pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ - fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ - skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ - xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ - xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ - error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ - if test `expr $$fail + $$xpass + $$error` -eq 0; then \ - success=true; \ - else \ - success=false; \ - fi; \ - br='==================='; br=$$br$$br$$br$$br; \ - result_count () \ - { \ - if test x"$$1" = x"--maybe-color"; then \ - maybe_colorize=yes; \ - elif test x"$$1" = x"--no-color"; then \ - maybe_colorize=no; \ - else \ - echo "$@: invalid 'result_count' usage" >&2; exit 4; \ - fi; \ - shift; \ - desc=$$1 count=$$2; \ - if test $$maybe_colorize = yes && test $$count -gt 0; then \ - color_start=$$3 color_end=$$std; \ - else \ - color_start= color_end=; \ - fi; \ - echo "$${color_start}# $$desc $$count$${color_end}"; \ - }; \ - create_testsuite_report () \ - { \ - result_count $$1 "TOTAL:" $$all "$$brg"; \ - result_count $$1 "PASS: " $$pass "$$grn"; \ - result_count $$1 "SKIP: " $$skip "$$blu"; \ - result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ - result_count $$1 "FAIL: " $$fail "$$red"; \ - result_count $$1 "XPASS:" $$xpass "$$red"; \ - result_count $$1 "ERROR:" $$error "$$mgn"; \ - }; \ - { \ - echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ - $(am__rst_title); \ - create_testsuite_report --no-color; \ - echo; \ - echo ".. contents:: :depth: 2"; \ - echo; \ - for b in $$bases; do echo $$b; done \ - | $(am__create_global_log); \ - } >$(TEST_SUITE_LOG).tmp || exit 1; \ - mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ - if $$success; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ - fi; \ - echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ - echo "$${col}$$br$${std}"; \ - create_testsuite_report --maybe-color; \ - echo "$$col$$br$$std"; \ - if $$success; then :; else \ - echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ - if test -n "$(PACKAGE_BUGREPORT)"; then \ - echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ - fi; \ - echo "$$col$$br$$std"; \ - fi; \ - $$success || exit 1 - -check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - log_list=`for i in $$bases; do echo $$i.log; done`; \ - trs_list=`for i in $$bases; do echo $$i.trs; done`; \ - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; -recheck: all $(check_PROGRAMS) - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ - | $(am__list_recheck_tests)` || exit 1; \ - log_list=`for i in $$bases; do echo $$i.log; done`; \ - log_list=`echo $$log_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ - am__force_recheck=am--force-recheck \ - TEST_LOGS="$$log_list"; \ - exit $$? -test_daemon.log: test_daemon$(EXEEXT) - @p='test_daemon$(EXEEXT)'; \ - b='test_daemon'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_postprocessor.log: test_postprocessor$(EXEEXT) - @p='test_postprocessor$(EXEEXT)'; \ - b='test_postprocessor'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_postprocessor_large.log: test_postprocessor_large$(EXEEXT) - @p='test_postprocessor_large$(EXEEXT)'; \ - b='test_postprocessor_large'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_postprocessor_amp.log: test_postprocessor_amp$(EXEEXT) - @p='test_postprocessor_amp$(EXEEXT)'; \ - b='test_postprocessor_amp'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -.test.log: - @p='$<'; \ - $(am__set_b); \ - $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -@am__EXEEXT_TRUE@.test$(EXEEXT).log: -@am__EXEEXT_TRUE@ @p='$<'; \ -@am__EXEEXT_TRUE@ $(am__set_b); \ -@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ -@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ -@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ -@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) -installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) - -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) - -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) - -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ - clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-libLTLIBRARIES - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-libLTLIBRARIES - -.MAKE: check-am install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ - clean-libtool cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - recheck tags tags-am uninstall uninstall-am \ - uninstall-libLTLIBRARIES - - -@W32_SHARED_LIB_EXP_TRUE@$(lt_cv_objdir)/libmicrohttpd.def: libmicrohttpd.la - -@W32_SHARED_LIB_EXP_TRUE@$(lt_cv_objdir)/libmicrohttpd.exp: $(lt_cv_objdir)/libmicrohttpd.lib - -@W32_SHARED_LIB_EXP_TRUE@$(lt_cv_objdir)/libmicrohttpd.lib: $(lt_cv_objdir)/libmicrohttpd.def libmicrohttpd.la $(libmicrohttpd_la_OBJECTS) -@USE_MS_LIB_TOOL_TRUE@@W32_SHARED_LIB_EXP_TRUE@ @echo Creating $@ and libmicrohttpd.exp by $(MS_LIB_TOOL)... && \ -@USE_MS_LIB_TOOL_TRUE@@W32_SHARED_LIB_EXP_TRUE@ dll_name=`$(EGREP) -o dlname=\'.+\' libmicrohttpd.la` && \ -@USE_MS_LIB_TOOL_TRUE@@W32_SHARED_LIB_EXP_TRUE@ dll_name=$${dll_name#*\'} && dll_name=$${dll_name%\'} && test -n "$$dll_name" && \ -@USE_MS_LIB_TOOL_TRUE@@W32_SHARED_LIB_EXP_TRUE@ echo Creating $$dll_name by $(MS_LIB_TOOL).. && cd "$(lt_cv_objdir)" && \ -@USE_MS_LIB_TOOL_TRUE@@W32_SHARED_LIB_EXP_TRUE@ $(MS_LIB_TOOL) -def:libmicrohttpd.def -name:$$dll_name -out:libmicrohttpd.lib $(libmicrohttpd_la_OBJECTS:.lo=.o) && cd .. -@USE_MS_LIB_TOOL_FALSE@@W32_SHARED_LIB_EXP_TRUE@ @echo Creating $@ and libmicrohttpd.exp by $(DLLTOOL)... && \ -@USE_MS_LIB_TOOL_FALSE@@W32_SHARED_LIB_EXP_TRUE@ dll_name=`$(EGREP) -o dlname=\'.+\' libmicrohttpd.la` && \ -@USE_MS_LIB_TOOL_FALSE@@W32_SHARED_LIB_EXP_TRUE@ dll_name=$${dll_name#*\'} && dll_name=$${dll_name%\'} && test -n "$$dll_name" && \ -@USE_MS_LIB_TOOL_FALSE@@W32_SHARED_LIB_EXP_TRUE@ echo Creating $$dll_name by $(DLLTOOL).. && cd "$(lt_cv_objdir)" && \ -@USE_MS_LIB_TOOL_FALSE@@W32_SHARED_LIB_EXP_TRUE@ $(DLLTOOL) -d ./libmicrohttpd.def -D $$dll_name -l libmicrohttpd.lib $(libmicrohttpd_la_OBJECTS:.lo=.o) -e ./libmicrohttpd.exp && cd .. &&\ -@USE_MS_LIB_TOOL_FALSE@@W32_SHARED_LIB_EXP_TRUE@ echo Created libmicrohttpd.exp and libmicrohttpd.lib. - -@W32_STATIC_LIB_TRUE@$(lt_cv_objdir)/libmicrohttpd-static.lib: libmicrohttpd.la $(libmicrohttpd_la_OBJECTS) -@USE_MS_LIB_TOOL_TRUE@@W32_STATIC_LIB_TRUE@ $(MS_LIB_TOOL) -out:$@ $(libmicrohttpd_la_OBJECTS:.lo=.o) -@USE_MS_LIB_TOOL_FALSE@@W32_STATIC_LIB_TRUE@ cp $(lt_cv_objdir)/libmicrohttpd.a $@ - -# General rule is not required, but keep it just in case -@HAVE_W32_TRUE@.rc.lo: -@HAVE_W32_TRUE@ $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) $(RCFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< -o $@ - -# To add dll resource only to .dll file and exclude it form static -# lib, a little trick was used. Allow libtool to create file.lo, -# file.o and .libs/file.lo, .libs/file.o files, then overwrite file.o -# by empty object generated from empty c-file. Later libtool will -# use .libs/file.o for shared lib and empty file.o for static lib. -# This implementation is based on trick found in liblzma. -# Note: windres does not understand '-isystem' flag, so all -# possible '-isystem' flags are replaced by simple '-I' flags. -@HAVE_W32_TRUE@$(MHD_DLL_RES_LO): $(MHD_DLL_RES_SRC) -@HAVE_W32_TRUE@ RC_CPP_FLAGS=" $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) " && \ -@HAVE_W32_TRUE@ $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) $(RCFLAGS) $(DEFS) $${RC_CPP_FLAGS// -isystem / -I } $< -o $@ && \ -@HAVE_W32_TRUE@ echo > $@-empty.c && $(CC) $(AM_CFLAGS) $(CFLAGS) -c $@-empty.c -o $(@:.lo=.o) && rm -f $@-empty.c - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/base64.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/base64.c deleted file mode 100644 index 4fb4755e..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/base64.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * This code implements the BASE64 algorithm. - * This code is in the public domain; do with it what you wish. - * - * @file base64.c - * @brief This code implements the BASE64 algorithm - * @author Matthieu Speder - */ -#include "base64.h" - -static const char base64_chars[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - -static const char base64_digits[] = - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 62, 0, 0, 0, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 0, 0, 0, -1, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 0, 0, 0, 0, 0, 0, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - - -char * -BASE64Decode(const char* src) -{ - size_t in_len = strlen (src); - char* dest; - char* result; - - if (in_len % 4) - { - /* Wrong base64 string length */ - return NULL; - } - result = dest = malloc(in_len / 4 * 3 + 1); - if (result == NULL) - return NULL; /* out of memory */ - while (*src) { - char a = base64_digits[(unsigned char)*(src++)]; - char b = base64_digits[(unsigned char)*(src++)]; - char c = base64_digits[(unsigned char)*(src++)]; - char d = base64_digits[(unsigned char)*(src++)]; - *(dest++) = (a << 2) | ((b & 0x30) >> 4); - if (c == (char)-1) - break; - *(dest++) = ((b & 0x0f) << 4) | ((c & 0x3c) >> 2); - if (d == (char)-1) - break; - *(dest++) = ((c & 0x03) << 6) | d; - } - *dest = 0; - return result; -} - - -/* end of base64.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/base64.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/base64.h deleted file mode 100644 index ba96ca0c..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/base64.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * This code implements the BASE64 algorithm. - * This code is in the public domain; do with it what you wish. - * - * @file base64.c - * @brief This code implements the BASE64 algorithm - * @author Matthieu Speder - */ -#ifndef BASE64_H -#define BASE64_H - -#include "platform.h" - -char * -BASE64Decode(const char* src); - -#endif /* !BASE64_H */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/basicauth.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/basicauth.c deleted file mode 100644 index cbe0fc70..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/basicauth.c +++ /dev/null @@ -1,148 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2010, 2011, 2012 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file basicauth.c - * @brief Implements HTTP basic authentication methods - * @author Amr Ali - * @author Matthieu Speder - */ -#include "platform.h" -#include -#include "internal.h" -#include "base64.h" - -/** - * Beginning string for any valid Basic authentication header. - */ -#define _BASIC_BASE "Basic " - - -/** - * Get the username and password from the basic authorization header sent by the client - * - * @param connection The MHD connection structure - * @param password a pointer for the password - * @return NULL if no username could be found, a pointer - * to the username if found - * @ingroup authentication - */ -char * -MHD_basic_auth_get_username_password (struct MHD_Connection *connection, - char** password) -{ - const char *header; - char *decode; - const char *separator; - char *user; - - if ( (NULL == (header = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_AUTHORIZATION))) || - (0 != strncmp (header, _BASIC_BASE, strlen(_BASIC_BASE))) ) - return NULL; - header += strlen (_BASIC_BASE); - if (NULL == (decode = BASE64Decode (header))) - { -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Error decoding basic authentication\n"); -#endif - return NULL; - } - /* Find user:password pattern */ - if (NULL == (separator = strchr (decode, ':'))) - { -#if HAVE_MESSAGES - MHD_DLOG(connection->daemon, - "Basic authentication doesn't contain ':' separator\n"); -#endif - free (decode); - return NULL; - } - if (NULL == (user = strdup (decode))) - { - free (decode); - return NULL; - } - user[separator - decode] = '\0'; /* cut off at ':' */ - if (NULL != password) - { - *password = strdup (separator + 1); - if (NULL == *password) - { -#if HAVE_MESSAGES - MHD_DLOG(connection->daemon, - "Failed to allocate memory for password\n"); -#endif - free (decode); - free (user); - return NULL; - } - } - free (decode); - return user; -} - - -/** - * Queues a response to request basic authentication from the client. - * The given response object is expected to include the payload for - * the response; the "WWW-Authenticate" header will be added and the - * response queued with the 'UNAUTHORIZED' status code. - * - * @param connection The MHD connection structure - * @param realm the realm presented to the client - * @param response response object to modify and queue - * @return #MHD_YES on success, #MHD_NO otherwise - * @ingroup authentication - */ -int -MHD_queue_basic_auth_fail_response (struct MHD_Connection *connection, - const char *realm, - struct MHD_Response *response) -{ - int ret; - size_t hlen = strlen(realm) + strlen("Basic realm=\"\"") + 1; - char *header; - - header = (char*)malloc(hlen); - if (NULL == header) - { -#if HAVE_MESSAGES - MHD_DLOG(connection->daemon, - "Failed to allocate memory for auth header\n"); -#endif /* HAVE_MESSAGES */ - return MHD_NO; - } - MHD_snprintf_ (header, - hlen, - "Basic realm=\"%s\"", - realm); - ret = MHD_add_response_header (response, - MHD_HTTP_HEADER_WWW_AUTHENTICATE, - header); - free(header); - if (MHD_YES == ret) - ret = MHD_queue_response (connection, - MHD_HTTP_UNAUTHORIZED, - response); - return ret; -} - -/* end of basicauth.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection.c deleted file mode 100644 index 785fafdc..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection.c +++ /dev/null @@ -1,2919 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007-2015 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -/** - * @file connection.c - * @brief Methods for managing connections - * @author Daniel Pittman - * @author Christian Grothoff - */ - -#include "internal.h" -#include -#include "connection.h" -#include "memorypool.h" -#include "response.h" -#include "reason_phrase.h" - -#if HAVE_NETINET_TCP_H -/* for TCP_CORK */ -#include -#endif - -#if defined(_WIN32) && defined(MHD_W32_MUTEX_) -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif /* _WIN32 && MHD_W32_MUTEX_ */ - - -/** - * Message to transmit when http 1.1 request is received - */ -#define HTTP_100_CONTINUE "HTTP/1.1 100 Continue\r\n\r\n" - -/** - * Response text used when the request (http header) is too big to - * be processed. - * - * Intentionally empty here to keep our memory footprint - * minimal. - */ -#if HAVE_MESSAGES -#define REQUEST_TOO_BIG "Request too bigYour HTTP header was too big for the memory constraints of this webserver." -#else -#define REQUEST_TOO_BIG "" -#endif - -/** - * Response text used when the request (http header) does not - * contain a "Host:" header and still claims to be HTTP 1.1. - * - * Intentionally empty here to keep our memory footprint - * minimal. - */ -#if HAVE_MESSAGES -#define REQUEST_LACKS_HOST ""Host:" header requiredIn HTTP 1.1, requests must include a "Host:" header, and your HTTP 1.1 request lacked such a header." -#else -#define REQUEST_LACKS_HOST "" -#endif - -/** - * Response text used when the request (http header) is - * malformed. - * - * Intentionally empty here to keep our memory footprint - * minimal. - */ -#if HAVE_MESSAGES -#define REQUEST_MALFORMED "Request malformedYour HTTP request was syntactically incorrect." -#else -#define REQUEST_MALFORMED "" -#endif - -/** - * Response text used when there is an internal server error. - * - * Intentionally empty here to keep our memory footprint - * minimal. - */ -#if HAVE_MESSAGES -#define INTERNAL_ERROR "Internal server errorSome programmer needs to study the manual more carefully." -#else -#define INTERNAL_ERROR "" -#endif - -/** - * Add extra debug messages with reasons for closing connections - * (non-error reasons). - */ -#define DEBUG_CLOSE MHD_NO - -/** - * Should all data send be printed to stderr? - */ -#define DEBUG_SEND_DATA MHD_NO - - -/** - * Get all of the headers from the request. - * - * @param connection connection to get values from - * @param kind types of values to iterate over - * @param iterator callback to call on each header; - * maybe NULL (then just count headers) - * @param iterator_cls extra argument to @a iterator - * @return number of entries iterated over - * @ingroup request - */ -int -MHD_get_connection_values (struct MHD_Connection *connection, - enum MHD_ValueKind kind, - MHD_KeyValueIterator iterator, void *iterator_cls) -{ - int ret; - struct MHD_HTTP_Header *pos; - - if (NULL == connection) - return -1; - ret = 0; - for (pos = connection->headers_received; NULL != pos; pos = pos->next) - if (0 != (pos->kind & kind)) - { - ret++; - if ((NULL != iterator) && - (MHD_YES != iterator (iterator_cls, - kind, pos->header, pos->value))) - return ret; - } - return ret; -} - - -/** - * This function can be used to add an entry to the HTTP headers of a - * connection (so that the #MHD_get_connection_values function will - * return them -- and the `struct MHD_PostProcessor` will also see - * them). This maybe required in certain situations (see Mantis - * #1399) where (broken) HTTP implementations fail to supply values - * needed by the post processor (or other parts of the application). - * - * This function MUST only be called from within the - * #MHD_AccessHandlerCallback (otherwise, access maybe improperly - * synchronized). Furthermore, the client must guarantee that the key - * and value arguments are 0-terminated strings that are NOT freed - * until the connection is closed. (The easiest way to do this is by - * passing only arguments to permanently allocated strings.). - * - * @param connection the connection for which a - * value should be set - * @param kind kind of the value - * @param key key for the value - * @param value the value itself - * @return #MHD_NO if the operation could not be - * performed due to insufficient memory; - * #MHD_YES on success - * @ingroup request - */ -int -MHD_set_connection_value (struct MHD_Connection *connection, - enum MHD_ValueKind kind, - const char *key, const char *value) -{ - struct MHD_HTTP_Header *pos; - - pos = MHD_pool_allocate (connection->pool, - sizeof (struct MHD_HTTP_Header), MHD_YES); - if (NULL == pos) - return MHD_NO; - pos->header = (char *) key; - pos->value = (char *) value; - pos->kind = kind; - pos->next = NULL; - /* append 'pos' to the linked list of headers */ - if (NULL == connection->headers_received_tail) - { - connection->headers_received = pos; - connection->headers_received_tail = pos; - } - else - { - connection->headers_received_tail->next = pos; - connection->headers_received_tail = pos; - } - return MHD_YES; -} - - -/** - * Get a particular header value. If multiple - * values match the kind, return any one of them. - * - * @param connection connection to get values from - * @param kind what kind of value are we looking for - * @param key the header to look for, NULL to lookup 'trailing' value without a key - * @return NULL if no such item was found - * @ingroup request - */ -const char * -MHD_lookup_connection_value (struct MHD_Connection *connection, - enum MHD_ValueKind kind, const char *key) -{ - struct MHD_HTTP_Header *pos; - - if (NULL == connection) - return NULL; - for (pos = connection->headers_received; NULL != pos; pos = pos->next) - if ((0 != (pos->kind & kind)) && - ( (key == pos->header) || - ( (NULL != pos->header) && - (NULL != key) && - (MHD_str_equal_caseless_(key, pos->header))))) - return pos->value; - return NULL; -} - - -/** - * Do we (still) need to send a 100 continue - * message for this connection? - * - * @param connection connection to test - * @return 0 if we don't need 100 CONTINUE, 1 if we do - */ -static int -need_100_continue (struct MHD_Connection *connection) -{ - const char *expect; - - return ( (NULL == connection->response) && - (NULL != connection->version) && - (MHD_str_equal_caseless_(connection->version, - MHD_HTTP_VERSION_1_1)) && - (NULL != (expect = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_EXPECT))) && - (MHD_str_equal_caseless_(expect, "100-continue")) && - (connection->continue_message_write_offset < - strlen (HTTP_100_CONTINUE)) ); -} - - -/** - * Close the given connection and give the - * specified termination code to the user. - * - * @param connection connection to close - * @param termination_code termination reason to give - */ -void -MHD_connection_close (struct MHD_Connection *connection, - enum MHD_RequestTerminationCode termination_code) -{ - struct MHD_Daemon *daemon; - - daemon = connection->daemon; - if (0 == (connection->daemon->options & MHD_USE_EPOLL_TURBO)) - shutdown (connection->socket_fd, - (MHD_YES == connection->read_closed) ? SHUT_WR : SHUT_RDWR); - connection->state = MHD_CONNECTION_CLOSED; - connection->event_loop_info = MHD_EVENT_LOOP_INFO_CLEANUP; - if ( (NULL != daemon->notify_completed) && - (MHD_YES == connection->client_aware) ) - daemon->notify_completed (daemon->notify_completed_cls, - connection, - &connection->client_context, - termination_code); - connection->client_aware = MHD_NO; -} - - -/** - * A serious error occured, close the - * connection (and notify the application). - * - * @param connection connection to close with error - * @param emsg error message (can be NULL) - */ -static void -connection_close_error (struct MHD_Connection *connection, - const char *emsg) -{ -#if HAVE_MESSAGES - if (NULL != emsg) - MHD_DLOG (connection->daemon, emsg); -#endif - MHD_connection_close (connection, MHD_REQUEST_TERMINATED_WITH_ERROR); -} - - -/** - * Macro to only include error message in call to - * "connection_close_error" if we have HAVE_MESSAGES. - */ -#if HAVE_MESSAGES -#define CONNECTION_CLOSE_ERROR(c, emsg) connection_close_error (c, emsg) -#else -#define CONNECTION_CLOSE_ERROR(c, emsg) connection_close_error (c, NULL) -#endif - - -/** - * Prepare the response buffer of this connection for - * sending. Assumes that the response mutex is - * already held. If the transmission is complete, - * this function may close the socket (and return - * #MHD_NO). - * - * @param connection the connection - * @return #MHD_NO if readying the response failed (the - * lock on the response will have been released already - * in this case). - */ -static int -try_ready_normal_body (struct MHD_Connection *connection) -{ - ssize_t ret; - struct MHD_Response *response; - - response = connection->response; - if (NULL == response->crc) - return MHD_YES; - if (0 == response->total_size) - return MHD_YES; /* 0-byte response is always ready */ - if ( (response->data_start <= - connection->response_write_position) && - (response->data_size + response->data_start > - connection->response_write_position) ) - return MHD_YES; /* response already ready */ -#if LINUX - if ( (MHD_INVALID_SOCKET != response->fd) && - (0 == (connection->daemon->options & MHD_USE_SSL)) ) - { - /* will use sendfile, no need to bother response crc */ - return MHD_YES; - } -#endif - - ret = response->crc (response->crc_cls, - connection->response_write_position, - response->data, - MHD_MIN (response->data_buffer_size, - response->total_size - - connection->response_write_position)); - if ( (((ssize_t) MHD_CONTENT_READER_END_OF_STREAM) == ret) || - (((ssize_t) MHD_CONTENT_READER_END_WITH_ERROR) == ret) ) - { - /* either error or http 1.0 transfer, close socket! */ - response->total_size = connection->response_write_position; - if (NULL != response->crc) - (void) MHD_mutex_unlock_ (&response->mutex); - if ( ((ssize_t)MHD_CONTENT_READER_END_OF_STREAM) == ret) - MHD_connection_close (connection, MHD_REQUEST_TERMINATED_COMPLETED_OK); - else - CONNECTION_CLOSE_ERROR (connection, - "Closing connection (stream error)\n"); - return MHD_NO; - } - response->data_start = connection->response_write_position; - response->data_size = ret; - if (0 == ret) - { - connection->state = MHD_CONNECTION_NORMAL_BODY_UNREADY; - if (NULL != response->crc) - (void) MHD_mutex_unlock_ (&response->mutex); - return MHD_NO; - } - return MHD_YES; -} - - -/** - * Prepare the response buffer of this connection for sending. - * Assumes that the response mutex is already held. If the - * transmission is complete, this function may close the socket (and - * return MHD_NO). - * - * @param connection the connection - * @return #MHD_NO if readying the response failed - */ -static int -try_ready_chunked_body (struct MHD_Connection *connection) -{ - ssize_t ret; - char *buf; - struct MHD_Response *response; - size_t size; - char cbuf[10]; /* 10: max strlen of "%x\r\n" */ - size_t cblen; - - response = connection->response; - if (0 == connection->write_buffer_size) - { - size = connection->daemon->pool_size; - do - { - size /= 2; - if (size < 128) - { - /* not enough memory */ - CONNECTION_CLOSE_ERROR (connection, - "Closing connection (out of memory)\n"); - return MHD_NO; - } - buf = MHD_pool_allocate (connection->pool, size, MHD_NO); - } - while (NULL == buf); - connection->write_buffer_size = size; - connection->write_buffer = buf; - } - - if ( (response->data_start <= - connection->response_write_position) && - (response->data_size + response->data_start > - connection->response_write_position) ) - { - /* buffer already ready, use what is there for the chunk */ - ret = response->data_size + response->data_start - connection->response_write_position; - if ( (ret > 0) && - (((size_t) ret) > connection->write_buffer_size - sizeof (cbuf) - 2) ) - ret = connection->write_buffer_size - sizeof (cbuf) - 2; - memcpy (&connection->write_buffer[sizeof (cbuf)], - &response->data[connection->response_write_position - response->data_start], - ret); - } - else - { - /* buffer not in range, try to fill it */ - if (0 == response->total_size) - ret = 0; /* response must be empty, don't bother calling crc */ - else - ret = response->crc (response->crc_cls, - connection->response_write_position, - &connection->write_buffer[sizeof (cbuf)], - connection->write_buffer_size - sizeof (cbuf) - 2); - } - if ( ((ssize_t) MHD_CONTENT_READER_END_WITH_ERROR) == ret) - { - /* error, close socket! */ - response->total_size = connection->response_write_position; - CONNECTION_CLOSE_ERROR (connection, - "Closing connection (error generating response)\n"); - return MHD_NO; - } - if ( (((ssize_t) MHD_CONTENT_READER_END_OF_STREAM) == ret) || - (0 == response->total_size) ) - { - /* end of message, signal other side! */ - strcpy (connection->write_buffer, "0\r\n"); - connection->write_buffer_append_offset = 3; - connection->write_buffer_send_offset = 0; - response->total_size = connection->response_write_position; - return MHD_YES; - } - if (0 == ret) - { - connection->state = MHD_CONNECTION_CHUNKED_BODY_UNREADY; - return MHD_NO; - } - if (ret > 0xFFFFFF) - ret = 0xFFFFFF; - MHD_snprintf_ (cbuf, - sizeof (cbuf), - "%X\r\n", (unsigned int) ret); - cblen = strlen (cbuf); - EXTRA_CHECK (cblen <= sizeof (cbuf)); - memcpy (&connection->write_buffer[sizeof (cbuf) - cblen], cbuf, cblen); - memcpy (&connection->write_buffer[sizeof (cbuf) + ret], "\r\n", 2); - connection->response_write_position += ret; - connection->write_buffer_send_offset = sizeof (cbuf) - cblen; - connection->write_buffer_append_offset = sizeof (cbuf) + ret + 2; - return MHD_YES; -} - - -/** - * Are we allowed to keep the given connection alive? We can use the - * TCP stream for a second request if the connection is HTTP 1.1 and - * the "Connection" header either does not exist or is not set to - * "close", or if the connection is HTTP 1.0 and the "Connection" - * header is explicitly set to "keep-alive". If no HTTP version is - * specified (or if it is not 1.0 or 1.1), we definitively close the - * connection. If the "Connection" header is not exactly "close" or - * "keep-alive", we proceed to use the default for the respective HTTP - * version (which is conservative for HTTP 1.0, but might be a bit - * optimistic for HTTP 1.1). - * - * @param connection the connection to check for keepalive - * @return #MHD_YES if (based on the request), a keepalive is - * legal - */ -static int -keepalive_possible (struct MHD_Connection *connection) -{ - const char *end; - - if (NULL == connection->version) - return MHD_NO; - if ( (NULL != connection->response) && - (0 != (connection->response->flags & MHD_RF_HTTP_VERSION_1_0_ONLY) ) ) - return MHD_NO; - end = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_CONNECTION); - if (MHD_str_equal_caseless_(connection->version, - MHD_HTTP_VERSION_1_1)) - { - if (NULL == end) - return MHD_YES; - if ( (MHD_str_equal_caseless_ (end, "close")) || - (MHD_str_equal_caseless_ (end, "upgrade")) ) - return MHD_NO; - return MHD_YES; - } - if (MHD_str_equal_caseless_(connection->version, - MHD_HTTP_VERSION_1_0)) - { - if (NULL == end) - return MHD_NO; - if (MHD_str_equal_caseless_(end, "Keep-Alive")) - return MHD_YES; - return MHD_NO; - } - return MHD_NO; -} - - -/** - * Produce HTTP "Date:" header. - * - * @param date where to write the header, with - * at least 128 bytes available space. - */ -static void -get_date_string (char *date) -{ - static const char *const days[] = - { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; - static const char *const mons[] = - { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", - "Nov", "Dec" - }; - struct tm now; - time_t t; -#if defined(_WIN32) && !defined(HAVE_GMTIME_S) && !defined(__CYGWIN__) - struct tm* pNow; -#endif - - date[0] = 0; - time (&t); -#if !defined(_WIN32) - if (NULL != gmtime_r (&t, &now)) - { -#elif defined(HAVE_GMTIME_S) - if (0 == gmtime_s (&now, &t)) - { -#elif defined(__CYGWIN__) - if (NULL != gmtime_r (&t, &now)) - { -#else - pNow = gmtime(&t); - if (NULL != pNow) - { - now = *pNow; -#endif - sprintf (date, - "Date: %3s, %02u %3s %04u %02u:%02u:%02u GMT\r\n", - days[now.tm_wday % 7], - (unsigned int) now.tm_mday, - mons[now.tm_mon % 12], - (unsigned int) (1900 + now.tm_year), - (unsigned int) now.tm_hour, - (unsigned int) now.tm_min, - (unsigned int) now.tm_sec); - } -} - - -/** - * Try growing the read buffer. We initially claim half the - * available buffer space for the read buffer (the other half - * being left for management data structures; the write - * buffer can in the end take virtually everything as the - * read buffer can be reduced to the minimum necessary at that - * point. - * - * @param connection the connection - * @return #MHD_YES on success, #MHD_NO on failure - */ -static int -try_grow_read_buffer (struct MHD_Connection *connection) -{ - void *buf; - size_t new_size; - - if (0 == connection->read_buffer_size) - new_size = connection->daemon->pool_size / 2; - else - new_size = connection->read_buffer_size + MHD_BUF_INC_SIZE; - buf = MHD_pool_reallocate (connection->pool, - connection->read_buffer, - connection->read_buffer_size, - new_size); - if (NULL == buf) - return MHD_NO; - /* we can actually grow the buffer, do it! */ - connection->read_buffer = buf; - connection->read_buffer_size = new_size; - return MHD_YES; -} - - -/** - * Allocate the connection's write buffer and fill it with all of the - * headers (or footers, if we have already sent the body) from the - * HTTPd's response. If headers are missing in the response supplied - * by the application, additional headers may be added here. - * - * @param connection the connection - * @return #MHD_YES on success, #MHD_NO on failure (out of memory) - */ -static int -build_header_response (struct MHD_Connection *connection) -{ - size_t size; - size_t off; - struct MHD_HTTP_Header *pos; - char code[256]; - char date[128]; - char content_length_buf[128]; - size_t content_length_len; - char *data; - enum MHD_ValueKind kind; - const char *reason_phrase; - uint32_t rc; - const char *client_requested_close; - const char *response_has_close; - const char *response_has_keepalive; - const char *have_encoding; - const char *have_content_length; - int must_add_close; - int must_add_chunked_encoding; - int must_add_keep_alive; - int must_add_content_length; - - EXTRA_CHECK (NULL != connection->version); - if (0 == strlen (connection->version)) - { - data = MHD_pool_allocate (connection->pool, 0, MHD_YES); - connection->write_buffer = data; - connection->write_buffer_append_offset = 0; - connection->write_buffer_send_offset = 0; - connection->write_buffer_size = 0; - return MHD_YES; - } - if (MHD_CONNECTION_FOOTERS_RECEIVED == connection->state) - { - rc = connection->responseCode & (~MHD_ICY_FLAG); - reason_phrase = MHD_get_reason_phrase_for (rc); - sprintf (code, - "%s %u %s\r\n", - (0 != (connection->responseCode & MHD_ICY_FLAG)) - ? "ICY" - : ( (MHD_str_equal_caseless_ (MHD_HTTP_VERSION_1_0, - connection->version)) - ? MHD_HTTP_VERSION_1_0 - : MHD_HTTP_VERSION_1_1), - rc, - reason_phrase); - off = strlen (code); - /* estimate size */ - size = off + 2; /* +2 for extra "\r\n" at the end */ - kind = MHD_HEADER_KIND; - if ( (0 == (connection->daemon->options & MHD_SUPPRESS_DATE_NO_CLOCK)) && - (NULL == MHD_get_response_header (connection->response, - MHD_HTTP_HEADER_DATE)) ) - get_date_string (date); - else - date[0] = '\0'; - size += strlen (date); - } - else - { - /* 2 bytes for final CRLF of a Chunked-Body */ - size = 2; - kind = MHD_FOOTER_KIND; - off = 0; - } - - /* calculate extra headers we need to add, such as 'Connection: close', - first see what was explicitly requested by the application */ - must_add_close = MHD_NO; - must_add_chunked_encoding = MHD_NO; - must_add_keep_alive = MHD_NO; - must_add_content_length = MHD_NO; - switch (connection->state) - { - case MHD_CONNECTION_FOOTERS_RECEIVED: - response_has_close = MHD_get_response_header (connection->response, - MHD_HTTP_HEADER_CONNECTION); - response_has_keepalive = response_has_close; - if ( (NULL != response_has_close) && - (!MHD_str_equal_caseless_ (response_has_close, "close")) ) - response_has_close = NULL; - if ( (NULL != response_has_keepalive) && - (!MHD_str_equal_caseless_ (response_has_keepalive, "Keep-Alive")) ) - response_has_keepalive = NULL; - client_requested_close = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_CONNECTION); - if ( (NULL != client_requested_close) && - (!MHD_str_equal_caseless_ (client_requested_close, "close")) ) - client_requested_close = NULL; - - /* now analyze chunked encoding situation */ - connection->have_chunked_upload = MHD_NO; - - if ( (MHD_SIZE_UNKNOWN == connection->response->total_size) && - (NULL == response_has_close) && - (NULL == client_requested_close) ) - { - /* size is unknown, and close was not explicitly requested; - need to either to HTTP 1.1 chunked encoding or - close the connection */ - /* 'close' header doesn't exist yet, see if we need to add one; - if the client asked for a close, no need to start chunk'ing */ - if ( (MHD_YES == keepalive_possible (connection)) && - (MHD_str_equal_caseless_ (MHD_HTTP_VERSION_1_1, - connection->version) ) ) - { - have_encoding = MHD_get_response_header (connection->response, - MHD_HTTP_HEADER_TRANSFER_ENCODING); - if (NULL == have_encoding) - { - must_add_chunked_encoding = MHD_YES; - connection->have_chunked_upload = MHD_YES; - } - else if (MHD_str_equal_caseless_(have_encoding, "identity")) - { - /* application forced identity encoding, can't do 'chunked' */ - must_add_close = MHD_YES; - } - else - { - connection->have_chunked_upload = MHD_YES; - } - } - else - { - /* Keep alive or chunking not possible - => set close header if not present */ - if (NULL == response_has_close) - must_add_close = MHD_YES; - } - } - - /* check for other reasons to add 'close' header */ - if ( ( (NULL != client_requested_close) || - (MHD_YES == connection->read_closed) ) && - (NULL == response_has_close) && - (0 == (connection->response->flags & MHD_RF_HTTP_VERSION_1_0_ONLY) ) ) - must_add_close = MHD_YES; - - /* check if we should add a 'content length' header */ - have_content_length = MHD_get_response_header (connection->response, - MHD_HTTP_HEADER_CONTENT_LENGTH); - - if ( (MHD_SIZE_UNKNOWN != connection->response->total_size) && - (NULL == have_content_length) && - ( (NULL == connection->method) || - (! MHD_str_equal_caseless_ (connection->method, - MHD_HTTP_METHOD_CONNECT)) ) ) - { - /* - Here we add a content-length if one is missing; however, - for 'connect' methods, the responses MUST NOT include a - content-length header *if* the response code is 2xx (in - which case we expect there to be no body). Still, - as we don't know the response code here in some cases, we - simply only force adding a content-length header if this - is not a 'connect' or if the response is not empty - (which is kind of more sane, because if some crazy - application did return content with a 2xx status code, - then having a content-length might again be a good idea). - - Note that the change from 'SHOULD NOT' to 'MUST NOT' is - a recent development of the HTTP 1.1 specification. - */ - content_length_len - = sprintf (content_length_buf, - MHD_HTTP_HEADER_CONTENT_LENGTH ": " MHD_UNSIGNED_LONG_LONG_PRINTF "\r\n", - (MHD_UNSIGNED_LONG_LONG) connection->response->total_size); - must_add_content_length = MHD_YES; - } - - /* check for adding keep alive */ - if ( (NULL == response_has_keepalive) && - (NULL == response_has_close) && - (MHD_NO == must_add_close) && - (0 == (connection->response->flags & MHD_RF_HTTP_VERSION_1_0_ONLY) ) && - (MHD_YES == keepalive_possible (connection)) ) - must_add_keep_alive = MHD_YES; - break; - case MHD_CONNECTION_BODY_SENT: - break; - default: - EXTRA_CHECK (0); - } - - if (must_add_close) - size += strlen ("Connection: close\r\n"); - if (must_add_keep_alive) - size += strlen ("Connection: Keep-Alive\r\n"); - if (must_add_chunked_encoding) - size += strlen ("Transfer-Encoding: chunked\r\n"); - if (must_add_content_length) - size += content_length_len; - EXTRA_CHECK (! (must_add_close && must_add_keep_alive) ); - EXTRA_CHECK (! (must_add_chunked_encoding && must_add_content_length) ); - - for (pos = connection->response->first_header; NULL != pos; pos = pos->next) - if ( (pos->kind == kind) && - (! ( (MHD_YES == must_add_close) && - (pos->value == response_has_keepalive) && - (MHD_str_equal_caseless_(pos->header, - MHD_HTTP_HEADER_CONNECTION) ) ) ) ) - size += strlen (pos->header) + strlen (pos->value) + 4; /* colon, space, linefeeds */ - /* produce data */ - data = MHD_pool_allocate (connection->pool, size + 1, MHD_NO); - if (NULL == data) - { -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Not enough memory for write!\n"); -#endif - return MHD_NO; - } - if (MHD_CONNECTION_FOOTERS_RECEIVED == connection->state) - { - memcpy (data, code, off); - } - if (must_add_close) - { - /* we must add the 'Connection: close' header */ - memcpy (&data[off], - "Connection: close\r\n", - strlen ("Connection: close\r\n")); - off += strlen ("Connection: close\r\n"); - } - if (must_add_keep_alive) - { - /* we must add the 'Connection: Keep-Alive' header */ - memcpy (&data[off], - "Connection: Keep-Alive\r\n", - strlen ("Connection: Keep-Alive\r\n")); - off += strlen ("Connection: Keep-Alive\r\n"); - } - if (must_add_chunked_encoding) - { - /* we must add the 'Transfer-Encoding: chunked' header */ - memcpy (&data[off], - "Transfer-Encoding: chunked\r\n", - strlen ("Transfer-Encoding: chunked\r\n")); - off += strlen ("Transfer-Encoding: chunked\r\n"); - } - if (must_add_content_length) - { - /* we must add the 'Content-Length' header */ - memcpy (&data[off], - content_length_buf, - content_length_len); - off += content_length_len; - } - for (pos = connection->response->first_header; NULL != pos; pos = pos->next) - if ( (pos->kind == kind) && - (! ( (pos->value == response_has_keepalive) && - (MHD_YES == must_add_close) && - (MHD_str_equal_caseless_(pos->header, - MHD_HTTP_HEADER_CONNECTION) ) ) ) ) - off += sprintf (&data[off], - "%s: %s\r\n", - pos->header, - pos->value); - if (MHD_CONNECTION_FOOTERS_RECEIVED == connection->state) - { - strcpy (&data[off], date); - off += strlen (date); - } - memcpy (&data[off], "\r\n", 2); - off += 2; - - if (off != size) - mhd_panic (mhd_panic_cls, __FILE__, __LINE__, NULL); - connection->write_buffer = data; - connection->write_buffer_append_offset = size; - connection->write_buffer_send_offset = 0; - connection->write_buffer_size = size + 1; - return MHD_YES; -} - - -/** - * We encountered an error processing the request. - * Handle it properly by stopping to read data - * and sending the indicated response code and message. - * - * @param connection the connection - * @param status_code the response code to send (400, 413 or 414) - * @param message the error message to send - */ -static void -transmit_error_response (struct MHD_Connection *connection, - unsigned int status_code, - const char *message) -{ - struct MHD_Response *response; - - if (NULL == connection->version) - { - /* we were unable to process the full header line, so we don't - really know what version the client speaks; assume 1.0 */ - connection->version = MHD_HTTP_VERSION_1_0; - } - connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; - connection->read_closed = MHD_YES; -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Error %u (`%s') processing request, closing connection.\n", - status_code, message); -#endif - EXTRA_CHECK (NULL == connection->response); - response = MHD_create_response_from_buffer (strlen (message), - (void *) message, - MHD_RESPMEM_PERSISTENT); - MHD_queue_response (connection, status_code, response); - EXTRA_CHECK (NULL != connection->response); - MHD_destroy_response (response); - if (MHD_NO == build_header_response (connection)) - { - /* oops - close! */ - CONNECTION_CLOSE_ERROR (connection, - "Closing connection (failed to create response header)\n"); - } - else - { - connection->state = MHD_CONNECTION_HEADERS_SENDING; - } -} - - -/** - * Update the 'event_loop_info' field of this connection based on the state - * that the connection is now in. May also close the connection or - * perform other updates to the connection if needed to prepare for - * the next round of the event loop. - * - * @param connection connetion to get poll set for - */ -static void -MHD_connection_update_event_loop_info (struct MHD_Connection *connection) -{ - while (1) - { -#if DEBUG_STATES - MHD_DLOG (connection->daemon, - "%s: state: %s\n", - __FUNCTION__, - MHD_state_to_string (connection->state)); -#endif - switch (connection->state) - { -#if HTTPS_SUPPORT - case MHD_TLS_CONNECTION_INIT: - if (0 == gnutls_record_get_direction (connection->tls_session)) - connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ; - else - connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE; - break; -#endif - case MHD_CONNECTION_INIT: - case MHD_CONNECTION_URL_RECEIVED: - case MHD_CONNECTION_HEADER_PART_RECEIVED: - /* while reading headers, we always grow the - read buffer if needed, no size-check required */ - if ( (connection->read_buffer_offset == connection->read_buffer_size) && - (MHD_NO == try_grow_read_buffer (connection)) ) - { - transmit_error_response (connection, - (connection->url != NULL) - ? MHD_HTTP_REQUEST_ENTITY_TOO_LARGE - : MHD_HTTP_REQUEST_URI_TOO_LONG, - REQUEST_TOO_BIG); - continue; - } - if (MHD_NO == connection->read_closed) - connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ; - else - connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; - break; - case MHD_CONNECTION_HEADERS_RECEIVED: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_HEADERS_PROCESSED: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_CONTINUE_SENDING: - connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE; - break; - case MHD_CONNECTION_CONTINUE_SENT: - if (connection->read_buffer_offset == connection->read_buffer_size) - { - if ((MHD_YES != try_grow_read_buffer (connection)) && - (0 != (connection->daemon->options & - (MHD_USE_SELECT_INTERNALLY | - MHD_USE_THREAD_PER_CONNECTION)))) - { - /* failed to grow the read buffer, and the - client which is supposed to handle the - received data in a *blocking* fashion - (in this mode) did not handle the data as - it was supposed to! - => we would either have to do busy-waiting - (on the client, which would likely fail), - or if we do nothing, we would just timeout - on the connection (if a timeout is even - set!). - Solution: we kill the connection with an error */ - transmit_error_response (connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - INTERNAL_ERROR); - continue; - } - } - if ( (connection->read_buffer_offset < connection->read_buffer_size) && - (MHD_NO == connection->read_closed) ) - connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ; - else - connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; - break; - case MHD_CONNECTION_BODY_RECEIVED: - case MHD_CONNECTION_FOOTER_PART_RECEIVED: - /* while reading footers, we always grow the - read buffer if needed, no size-check required */ - if (MHD_YES == connection->read_closed) - { - CONNECTION_CLOSE_ERROR (connection, - NULL); - continue; - } - connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ; - /* transition to FOOTERS_RECEIVED - happens in read handler */ - break; - case MHD_CONNECTION_FOOTERS_RECEIVED: - connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; - break; - case MHD_CONNECTION_HEADERS_SENDING: - /* headers in buffer, keep writing */ - connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE; - break; - case MHD_CONNECTION_HEADERS_SENT: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_NORMAL_BODY_READY: - connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE; - break; - case MHD_CONNECTION_NORMAL_BODY_UNREADY: - connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; - break; - case MHD_CONNECTION_CHUNKED_BODY_READY: - connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE; - break; - case MHD_CONNECTION_CHUNKED_BODY_UNREADY: - connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; - break; - case MHD_CONNECTION_BODY_SENT: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_FOOTERS_SENDING: - connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE; - break; - case MHD_CONNECTION_FOOTERS_SENT: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_CLOSED: - connection->event_loop_info = MHD_EVENT_LOOP_INFO_CLEANUP; - return; /* do nothing, not even reading */ - default: - EXTRA_CHECK (0); - } - break; - } -} - - -/** - * Parse a single line of the HTTP header. Advance - * read_buffer (!) appropriately. If the current line does not - * fit, consider growing the buffer. If the line is - * far too long, close the connection. If no line is - * found (incomplete, buffer too small, line too long), - * return NULL. Otherwise return a pointer to the line. - * - * @param connection connection we're processing - * @return NULL if no full line is available - */ -static char * -get_next_header_line (struct MHD_Connection *connection) -{ - char *rbuf; - size_t pos; - - if (0 == connection->read_buffer_offset) - return NULL; - pos = 0; - rbuf = connection->read_buffer; - while ((pos < connection->read_buffer_offset - 1) && - ('\r' != rbuf[pos]) && ('\n' != rbuf[pos])) - pos++; - if ( (pos == connection->read_buffer_offset - 1) && - ('\n' != rbuf[pos]) ) - { - /* not found, consider growing... */ - if ( (connection->read_buffer_offset == connection->read_buffer_size) && - (MHD_NO == - try_grow_read_buffer (connection)) ) - { - transmit_error_response (connection, - (NULL != connection->url) - ? MHD_HTTP_REQUEST_ENTITY_TOO_LARGE - : MHD_HTTP_REQUEST_URI_TOO_LONG, - REQUEST_TOO_BIG); - } - return NULL; - } - /* found, check if we have proper LFCR */ - if (('\r' == rbuf[pos]) && ('\n' == rbuf[pos + 1])) - rbuf[pos++] = '\0'; /* skip both r and n */ - rbuf[pos++] = '\0'; - connection->read_buffer += pos; - connection->read_buffer_size -= pos; - connection->read_buffer_offset -= pos; - return rbuf; -} - - -/** - * Add an entry to the HTTP headers of a connection. If this fails, - * transmit an error response (request too big). - * - * @param connection the connection for which a - * value should be set - * @param kind kind of the value - * @param key key for the value - * @param value the value itself - * @return #MHD_NO on failure (out of memory), #MHD_YES for success - */ -static int -connection_add_header (struct MHD_Connection *connection, - char *key, char *value, enum MHD_ValueKind kind) -{ - if (MHD_NO == MHD_set_connection_value (connection, - kind, - key, value)) - { -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Not enough memory to allocate header record!\n"); -#endif - transmit_error_response (connection, MHD_HTTP_REQUEST_ENTITY_TOO_LARGE, - REQUEST_TOO_BIG); - return MHD_NO; - } - return MHD_YES; -} - - -/** - * Parse and unescape the arguments given by the client as part - * of the HTTP request URI. - * - * @param kind header kind to use for adding to the connection - * @param connection connection to add headers to - * @param args argument URI string (after "?" in URI) - * @return #MHD_NO on failure (out of memory), #MHD_YES for success - */ -static int -parse_arguments (enum MHD_ValueKind kind, - struct MHD_Connection *connection, - char *args) -{ - char *equals; - char *amper; - - while (NULL != args) - { - equals = strchr (args, '='); - amper = strchr (args, '&'); - if (NULL == amper) - { - /* last argument */ - if (NULL == equals) - { - /* got 'foo', add key 'foo' with NULL for value */ - MHD_unescape_plus (args); - connection->daemon->unescape_callback (connection->daemon->unescape_callback_cls, - connection, - args); - return connection_add_header (connection, - args, - NULL, - kind); - } - /* got 'foo=bar' */ - equals[0] = '\0'; - equals++; - MHD_unescape_plus (args); - connection->daemon->unescape_callback (connection->daemon->unescape_callback_cls, - connection, - args); - MHD_unescape_plus (equals); - connection->daemon->unescape_callback (connection->daemon->unescape_callback_cls, - connection, - equals); - return connection_add_header (connection, args, equals, kind); - } - /* amper is non-NULL here */ - amper[0] = '\0'; - amper++; - if ( (NULL == equals) || - (equals >= amper) ) - { - /* got 'foo&bar' or 'foo&bar=val', add key 'foo' with NULL for value */ - MHD_unescape_plus (args); - connection->daemon->unescape_callback (connection->daemon->unescape_callback_cls, - connection, - args); - if (MHD_NO == - connection_add_header (connection, - args, - NULL, - kind)) - return MHD_NO; - /* continue with 'bar' */ - args = amper; - continue; - - } - /* equals and amper are non-NULL here, and equals < amper, - so we got regular 'foo=value&bar...'-kind of argument */ - equals[0] = '\0'; - equals++; - MHD_unescape_plus (args); - connection->daemon->unescape_callback (connection->daemon->unescape_callback_cls, - connection, - args); - MHD_unescape_plus (equals); - connection->daemon->unescape_callback (connection->daemon->unescape_callback_cls, - connection, - equals); - if (MHD_NO == connection_add_header (connection, args, equals, kind)) - return MHD_NO; - args = amper; - } - return MHD_YES; -} - - -/** - * Parse the cookie header (see RFC 2109). - * - * @return #MHD_YES for success, #MHD_NO for failure (malformed, out of memory) - */ -static int -parse_cookie_header (struct MHD_Connection *connection) -{ - const char *hdr; - char *cpy; - char *pos; - char *sce; - char *semicolon; - char *equals; - char *ekill; - char old; - int quotes; - - hdr = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_COOKIE); - if (NULL == hdr) - return MHD_YES; - cpy = MHD_pool_allocate (connection->pool, strlen (hdr) + 1, MHD_YES); - if (NULL == cpy) - { -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Not enough memory to parse cookies!\n"); -#endif - transmit_error_response (connection, MHD_HTTP_REQUEST_ENTITY_TOO_LARGE, - REQUEST_TOO_BIG); - return MHD_NO; - } - memcpy (cpy, hdr, strlen (hdr) + 1); - pos = cpy; - while (NULL != pos) - { - while (' ' == *pos) - pos++; /* skip spaces */ - - sce = pos; - while (((*sce) != '\0') && - ((*sce) != ',') && ((*sce) != ';') && ((*sce) != '=')) - sce++; - /* remove tailing whitespace (if any) from key */ - ekill = sce - 1; - while ((*ekill == ' ') && (ekill >= pos)) - *(ekill--) = '\0'; - old = *sce; - *sce = '\0'; - if (old != '=') - { - /* value part omitted, use empty string... */ - if (MHD_NO == - connection_add_header (connection, pos, "", MHD_COOKIE_KIND)) - return MHD_NO; - if (old == '\0') - break; - pos = sce + 1; - continue; - } - equals = sce + 1; - quotes = 0; - semicolon = equals; - while ( ('\0' != semicolon[0]) && - ( (0 != quotes) || - ( (';' != semicolon[0]) && - (',' != semicolon[0]) ) ) ) - { - if ('"' == semicolon[0]) - quotes = (quotes + 1) & 1; - semicolon++; - } - if ('\0' == semicolon[0]) - semicolon = NULL; - if (NULL != semicolon) - { - semicolon[0] = '\0'; - semicolon++; - } - /* remove quotes */ - if ( ('"' == equals[0]) && - ('"' == equals[strlen (equals) - 1]) ) - { - equals[strlen (equals) - 1] = '\0'; - equals++; - } - if (MHD_NO == connection_add_header (connection, - pos, equals, MHD_COOKIE_KIND)) - return MHD_NO; - pos = semicolon; - } - return MHD_YES; -} - - -/** - * Parse the first line of the HTTP HEADER. - * - * @param connection the connection (updated) - * @param line the first line - * @return #MHD_YES if the line is ok, #MHD_NO if it is malformed - */ -static int -parse_initial_message_line (struct MHD_Connection *connection, - char *line) -{ - char *uri; - char *http_version; - char *args; - - if (NULL == (uri = strchr (line, ' '))) - return MHD_NO; /* serious error */ - uri[0] = '\0'; - connection->method = line; - uri++; - while (' ' == uri[0]) - uri++; - http_version = strchr (uri, ' '); - if (NULL != http_version) - { - http_version[0] = '\0'; - http_version++; - } - if (NULL != connection->daemon->uri_log_callback) - connection->client_context - = connection->daemon->uri_log_callback (connection->daemon->uri_log_callback_cls, - uri, - connection); - args = strchr (uri, '?'); - if (NULL != args) - { - args[0] = '\0'; - args++; - parse_arguments (MHD_GET_ARGUMENT_KIND, connection, args); - } - connection->daemon->unescape_callback (connection->daemon->unescape_callback_cls, - connection, - uri); - connection->url = uri; - if (NULL == http_version) - connection->version = ""; - else - connection->version = http_version; - return MHD_YES; -} - - -/** - * Call the handler of the application for this - * connection. Handles chunking of the upload - * as well as normal uploads. - * - * @param connection connection we're processing - */ -static void -call_connection_handler (struct MHD_Connection *connection) -{ - size_t processed; - - if (NULL != connection->response) - return; /* already queued a response */ - processed = 0; - connection->client_aware = MHD_YES; - if (MHD_NO == - connection->daemon->default_handler (connection->daemon-> default_handler_cls, - connection, - connection->url, - connection->method, - connection->version, - NULL, &processed, - &connection->client_context)) - { - /* serious internal error, close connection */ - CONNECTION_CLOSE_ERROR (connection, - "Internal application error, closing connection.\n"); - return; - } -} - - - -/** - * Call the handler of the application for this - * connection. Handles chunking of the upload - * as well as normal uploads. - * - * @param connection connection we're processing - */ -static void -process_request_body (struct MHD_Connection *connection) -{ - size_t processed; - size_t available; - size_t used; - size_t i; - int instant_retry; - int malformed; - char *buffer_head; - char *end; - - if (NULL != connection->response) - return; /* already queued a response */ - - buffer_head = connection->read_buffer; - available = connection->read_buffer_offset; - do - { - instant_retry = MHD_NO; - if ( (MHD_YES == connection->have_chunked_upload) && - (MHD_SIZE_UNKNOWN == connection->remaining_upload_size) ) - { - if ( (connection->current_chunk_offset == connection->current_chunk_size) && - (0 != connection->current_chunk_offset) && - (available >= 2) ) - { - /* skip new line at the *end* of a chunk */ - i = 0; - if ((buffer_head[i] == '\r') || (buffer_head[i] == '\n')) - i++; /* skip 1st part of line feed */ - if ((buffer_head[i] == '\r') || (buffer_head[i] == '\n')) - i++; /* skip 2nd part of line feed */ - if (i == 0) - { - /* malformed encoding */ - CONNECTION_CLOSE_ERROR (connection, - "Received malformed HTTP request (bad chunked encoding), closing connection.\n"); - return; - } - available -= i; - buffer_head += i; - connection->current_chunk_offset = 0; - connection->current_chunk_size = 0; - } - if (connection->current_chunk_offset < - connection->current_chunk_size) - { - /* we are in the middle of a chunk, give - as much as possible to the client (without - crossing chunk boundaries) */ - processed = - connection->current_chunk_size - - connection->current_chunk_offset; - if (processed > available) - processed = available; - if (available > processed) - instant_retry = MHD_YES; - } - else - { - /* we need to read chunk boundaries */ - i = 0; - while (i < available) - { - if ((buffer_head[i] == '\r') || (buffer_head[i] == '\n')) - break; - i++; - if (i >= 6) - break; - } - /* take '\n' into account; if '\n' - is the unavailable character, we - will need to wait until we have it - before going further */ - if ((i + 1 >= available) && - !((i == 1) && (available == 2) && (buffer_head[0] == '0'))) - break; /* need more data... */ - malformed = (i >= 6); - if (!malformed) - { - buffer_head[i] = '\0'; - connection->current_chunk_size = strtoul (buffer_head, &end, 16); - malformed = ('\0' != *end); - } - if (malformed) - { - /* malformed encoding */ - CONNECTION_CLOSE_ERROR (connection, - "Received malformed HTTP request (bad chunked encoding), closing connection.\n"); - return; - } - i++; - if ((i < available) && - ((buffer_head[i] == '\r') || (buffer_head[i] == '\n'))) - i++; /* skip 2nd part of line feed */ - - buffer_head += i; - available -= i; - connection->current_chunk_offset = 0; - - if (available > 0) - instant_retry = MHD_YES; - if (0 == connection->current_chunk_size) - { - connection->remaining_upload_size = 0; - break; - } - continue; - } - } - else - { - /* no chunked encoding, give all to the client */ - if ( (0 != connection->remaining_upload_size) && - (MHD_SIZE_UNKNOWN != connection->remaining_upload_size) && - (connection->remaining_upload_size < available) ) - { - processed = connection->remaining_upload_size; - } - else - { - /** - * 1. no chunked encoding, give all to the client - * 2. client may send large chunked data, but only a smaller part is available at one time. - */ - processed = available; - } - } - used = processed; - connection->client_aware = MHD_YES; - if (MHD_NO == - connection->daemon->default_handler (connection->daemon->default_handler_cls, - connection, - connection->url, - connection->method, - connection->version, - buffer_head, - &processed, - &connection->client_context)) - { - /* serious internal error, close connection */ - CONNECTION_CLOSE_ERROR (connection, - "Internal application error, closing connection.\n"); - return; - } - if (processed > used) - mhd_panic (mhd_panic_cls, __FILE__, __LINE__ -#if HAVE_MESSAGES - , "API violation" -#else - , NULL -#endif - ); - if (0 != processed) - instant_retry = MHD_NO; /* client did not process everything */ - used -= processed; - if (connection->have_chunked_upload == MHD_YES) - connection->current_chunk_offset += used; - /* dh left "processed" bytes in buffer for next time... */ - buffer_head += used; - available -= used; - if (connection->remaining_upload_size != MHD_SIZE_UNKNOWN) - connection->remaining_upload_size -= used; - } - while (MHD_YES == instant_retry); - if (available > 0) - memmove (connection->read_buffer, buffer_head, available); - connection->read_buffer_offset = available; -} - - -/** - * Try reading data from the socket into the - * read buffer of the connection. - * - * @param connection connection we're processing - * @return #MHD_YES if something changed, - * #MHD_NO if we were interrupted or if - * no space was available - */ -static int -do_read (struct MHD_Connection *connection) -{ - int bytes_read; - - if (connection->read_buffer_size == connection->read_buffer_offset) - return MHD_NO; - bytes_read = connection->recv_cls (connection, - &connection->read_buffer - [connection->read_buffer_offset], - connection->read_buffer_size - - connection->read_buffer_offset); - if (bytes_read < 0) - { - const int err = MHD_socket_errno_; - if ((EINTR == err) || (EAGAIN == err) || (EWOULDBLOCK == err)) - return MHD_NO; - if (ECONNRESET == err) - { - CONNECTION_CLOSE_ERROR (connection, NULL); - return MHD_NO; - } - CONNECTION_CLOSE_ERROR (connection, NULL); - return MHD_YES; - } - if (0 == bytes_read) - { - /* other side closed connection; RFC 2616, section 8.1.4 suggests - we should then shutdown ourselves as well. */ - connection->read_closed = MHD_YES; - MHD_connection_close (connection, - MHD_REQUEST_TERMINATED_CLIENT_ABORT); - return MHD_YES; - } - connection->read_buffer_offset += bytes_read; - return MHD_YES; -} - - -/** - * Try writing data to the socket from the - * write buffer of the connection. - * - * @param connection connection we're processing - * @return #MHD_YES if something changed, - * #MHD_NO if we were interrupted - */ -static int -do_write (struct MHD_Connection *connection) -{ - ssize_t ret; - size_t max; - - max = connection->write_buffer_append_offset - connection->write_buffer_send_offset; - ret = connection->send_cls (connection, - &connection->write_buffer - [connection->write_buffer_send_offset], - max); - - if (ret < 0) - { - const int err = MHD_socket_errno_; - if ((EINTR == err) || (EAGAIN == err) || (EWOULDBLOCK == err)) - return MHD_NO; - CONNECTION_CLOSE_ERROR (connection, NULL); - return MHD_YES; - } -#if DEBUG_SEND_DATA - fprintf (stderr, - "Sent response: `%.*s'\n", - ret, - &connection->write_buffer[connection->write_buffer_send_offset]); -#endif - /* only increment if this wasn't a "sendfile" transmission without - buffer involvement! */ - if (0 != max) - connection->write_buffer_send_offset += ret; - return MHD_YES; -} - - -/** - * Check if we are done sending the write-buffer. - * If so, transition into "next_state". - * - * @param connection connection to check write status for - * @param next_state the next state to transition to - * @return #MHD_NO if we are not done, #MHD_YES if we are - */ -static int -check_write_done (struct MHD_Connection *connection, - enum MHD_CONNECTION_STATE next_state) -{ - if (connection->write_buffer_append_offset != - connection->write_buffer_send_offset) - return MHD_NO; - connection->write_buffer_append_offset = 0; - connection->write_buffer_send_offset = 0; - connection->state = next_state; - MHD_pool_reallocate (connection->pool, - connection->write_buffer, - connection->write_buffer_size, 0); - connection->write_buffer = NULL; - connection->write_buffer_size = 0; - return MHD_YES; -} - - -/** - * We have received (possibly the beginning of) a line in the - * header (or footer). Validate (check for ":") and prepare - * to process. - * - * @param connection connection we're processing - * @param line line from the header to process - * @return #MHD_YES on success, #MHD_NO on error (malformed @a line) - */ -static int -process_header_line (struct MHD_Connection *connection, char *line) -{ - char *colon; - - /* line should be normal header line, find colon */ - colon = strchr (line, ':'); - if (NULL == colon) - { - /* error in header line, die hard */ - CONNECTION_CLOSE_ERROR (connection, - "Received malformed line (no colon), closing connection.\n"); - return MHD_NO; - } - /* zero-terminate header */ - colon[0] = '\0'; - colon++; /* advance to value */ - while ((colon[0] != '\0') && ((colon[0] == ' ') || (colon[0] == '\t'))) - colon++; - /* we do the actual adding of the connection - header at the beginning of the while - loop since we need to be able to inspect - the *next* header line (in case it starts - with a space...) */ - connection->last = line; - connection->colon = colon; - return MHD_YES; -} - - -/** - * Process a header value that spans multiple lines. - * The previous line(s) are in connection->last. - * - * @param connection connection we're processing - * @param line the current input line - * @param kind if the line is complete, add a header - * of the given kind - * @return #MHD_YES if the line was processed successfully - */ -static int -process_broken_line (struct MHD_Connection *connection, - char *line, enum MHD_ValueKind kind) -{ - char *last; - char *tmp; - size_t last_len; - size_t tmp_len; - - last = connection->last; - if ((line[0] == ' ') || (line[0] == '\t')) - { - /* value was continued on the next line, see - http://www.jmarshall.com/easy/http/ */ - last_len = strlen (last); - /* skip whitespace at start of 2nd line */ - tmp = line; - while ((tmp[0] == ' ') || (tmp[0] == '\t')) - tmp++; - tmp_len = strlen (tmp); - /* FIXME: we might be able to do this better (faster!), as most - likely 'last' and 'line' should already be adjacent in - memory; however, doing this right gets tricky if we have a - value continued over multiple lines (in which case we need to - record how often we have done this so we can check for - adjaency); also, in the case where these are not adjacent - (not sure how it can happen!), we would want to allocate from - the end of the pool, so as to not destroy the read-buffer's - ability to grow nicely. */ - last = MHD_pool_reallocate (connection->pool, - last, - last_len + 1, - last_len + tmp_len + 1); - if (NULL == last) - { - transmit_error_response (connection, - MHD_HTTP_REQUEST_ENTITY_TOO_LARGE, - REQUEST_TOO_BIG); - return MHD_NO; - } - memcpy (&last[last_len], tmp, tmp_len + 1); - connection->last = last; - return MHD_YES; /* possibly more than 2 lines... */ - } - EXTRA_CHECK ((NULL != last) && (NULL != connection->colon)); - if ((MHD_NO == connection_add_header (connection, - last, connection->colon, kind))) - { - transmit_error_response (connection, MHD_HTTP_REQUEST_ENTITY_TOO_LARGE, - REQUEST_TOO_BIG); - return MHD_NO; - } - /* we still have the current line to deal with... */ - if (0 != strlen (line)) - { - if (MHD_NO == process_header_line (connection, line)) - { - transmit_error_response (connection, - MHD_HTTP_BAD_REQUEST, REQUEST_MALFORMED); - return MHD_NO; - } - } - return MHD_YES; -} - - -/** - * Parse the various headers; figure out the size - * of the upload and make sure the headers follow - * the protocol. Advance to the appropriate state. - * - * @param connection connection we're processing - */ -static void -parse_connection_headers (struct MHD_Connection *connection) -{ - const char *clen; - MHD_UNSIGNED_LONG_LONG cval; - struct MHD_Response *response; - const char *enc; - char *end; - - parse_cookie_header (connection); - if ( (0 != (MHD_USE_PEDANTIC_CHECKS & connection->daemon->options)) && - (NULL != connection->version) && - (MHD_str_equal_caseless_(MHD_HTTP_VERSION_1_1, connection->version)) && - (NULL == - MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_HOST)) ) - { - /* die, http 1.1 request without host and we are pedantic */ - connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; - connection->read_closed = MHD_YES; -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Received `%s' request without `%s' header.\n", - MHD_HTTP_VERSION_1_1, MHD_HTTP_HEADER_HOST); -#endif - EXTRA_CHECK (NULL == connection->response); - response = - MHD_create_response_from_buffer (strlen (REQUEST_LACKS_HOST), - REQUEST_LACKS_HOST, - MHD_RESPMEM_PERSISTENT); - MHD_queue_response (connection, MHD_HTTP_BAD_REQUEST, response); - MHD_destroy_response (response); - return; - } - - connection->remaining_upload_size = 0; - enc = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_TRANSFER_ENCODING); - if (NULL != enc) - { - connection->remaining_upload_size = MHD_SIZE_UNKNOWN; - if (MHD_str_equal_caseless_(enc, "chunked")) - connection->have_chunked_upload = MHD_YES; - } - else - { - clen = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_CONTENT_LENGTH); - if (NULL != clen) - { - cval = strtoul (clen, &end, 10); - if ( ('\0' != *end) || - ( (LONG_MAX == cval) && (errno == ERANGE) ) ) - { -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Failed to parse `%s' header `%s', closing connection.\n", - MHD_HTTP_HEADER_CONTENT_LENGTH, - clen); -#endif - CONNECTION_CLOSE_ERROR (connection, NULL); - return; - } - connection->remaining_upload_size = cval; - } - } -} - - -/** - * Update the 'last_activity' field of the connection to the current time - * and move the connection to the head of the 'normal_timeout' list if - * the timeout for the connection uses the default value. - * - * @param connection the connection that saw some activity - */ -static void -update_last_activity (struct MHD_Connection *connection) -{ - struct MHD_Daemon *daemon = connection->daemon; - - connection->last_activity = MHD_monotonic_time(); - if (connection->connection_timeout != daemon->connection_timeout) - return; /* custom timeout, no need to move it in "normal" DLL */ - - /* move connection to head of timeout list (by remove + add operation) */ - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to acquire cleanup mutex\n"); - XDLL_remove (daemon->normal_timeout_head, - daemon->normal_timeout_tail, - connection); - XDLL_insert (daemon->normal_timeout_head, - daemon->normal_timeout_tail, - connection); - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_unlock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to release cleanup mutex\n"); -} - - -/** - * This function handles a particular connection when it has been - * determined that there is data to be read off a socket. - * - * @param connection connection to handle - * @return always #MHD_YES (we should continue to process the - * connection) - */ -int -MHD_connection_handle_read (struct MHD_Connection *connection) -{ - update_last_activity (connection); - if (MHD_CONNECTION_CLOSED == connection->state) - return MHD_YES; - /* make sure "read" has a reasonable number of bytes - in buffer to use per system call (if possible) */ - if (connection->read_buffer_offset + connection->daemon->pool_increment > - connection->read_buffer_size) - try_grow_read_buffer (connection); - if (MHD_NO == do_read (connection)) - return MHD_YES; - while (1) - { -#if DEBUG_STATES - MHD_DLOG (connection->daemon, "%s: state: %s\n", - __FUNCTION__, - MHD_state_to_string (connection->state)); -#endif - switch (connection->state) - { - case MHD_CONNECTION_INIT: - case MHD_CONNECTION_URL_RECEIVED: - case MHD_CONNECTION_HEADER_PART_RECEIVED: - case MHD_CONNECTION_HEADERS_RECEIVED: - case MHD_CONNECTION_HEADERS_PROCESSED: - case MHD_CONNECTION_CONTINUE_SENDING: - case MHD_CONNECTION_CONTINUE_SENT: - case MHD_CONNECTION_BODY_RECEIVED: - case MHD_CONNECTION_FOOTER_PART_RECEIVED: - /* nothing to do but default action */ - if (MHD_YES == connection->read_closed) - { - MHD_connection_close (connection, - MHD_REQUEST_TERMINATED_READ_ERROR); - continue; - } - break; - case MHD_CONNECTION_CLOSED: - return MHD_YES; - default: - /* shrink read buffer to how much is actually used */ - MHD_pool_reallocate (connection->pool, - connection->read_buffer, - connection->read_buffer_size + 1, - connection->read_buffer_offset); - break; - } - break; - } - return MHD_YES; -} - - -/** - * This function was created to handle writes to sockets when it has - * been determined that the socket can be written to. - * - * @param connection connection to handle - * @return always #MHD_YES (we should continue to process the - * connection) - */ -int -MHD_connection_handle_write (struct MHD_Connection *connection) -{ - struct MHD_Response *response; - ssize_t ret; - - update_last_activity (connection); - while (1) - { -#if DEBUG_STATES - MHD_DLOG (connection->daemon, "%s: state: %s\n", - __FUNCTION__, - MHD_state_to_string (connection->state)); -#endif - switch (connection->state) - { - case MHD_CONNECTION_INIT: - case MHD_CONNECTION_URL_RECEIVED: - case MHD_CONNECTION_HEADER_PART_RECEIVED: - case MHD_CONNECTION_HEADERS_RECEIVED: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_HEADERS_PROCESSED: - break; - case MHD_CONNECTION_CONTINUE_SENDING: - ret = connection->send_cls (connection, - &HTTP_100_CONTINUE - [connection->continue_message_write_offset], - strlen (HTTP_100_CONTINUE) - - connection->continue_message_write_offset); - if (ret < 0) - { - const int err = MHD_socket_errno_; - if ((err == EINTR) || (err == EAGAIN) || (EWOULDBLOCK == err)) - break; -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Failed to send data: %s\n", - MHD_socket_last_strerr_ ()); -#endif - CONNECTION_CLOSE_ERROR (connection, NULL); - return MHD_YES; - } -#if DEBUG_SEND_DATA - fprintf (stderr, - "Sent 100 continue response: `%.*s'\n", - (int) ret, - &HTTP_100_CONTINUE[connection->continue_message_write_offset]); -#endif - connection->continue_message_write_offset += ret; - break; - case MHD_CONNECTION_CONTINUE_SENT: - case MHD_CONNECTION_BODY_RECEIVED: - case MHD_CONNECTION_FOOTER_PART_RECEIVED: - case MHD_CONNECTION_FOOTERS_RECEIVED: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_HEADERS_SENDING: - do_write (connection); - if (connection->state != MHD_CONNECTION_HEADERS_SENDING) - break; - check_write_done (connection, MHD_CONNECTION_HEADERS_SENT); - break; - case MHD_CONNECTION_HEADERS_SENT: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_NORMAL_BODY_READY: - response = connection->response; - if (NULL != response->crc) - (void) MHD_mutex_lock_ (&response->mutex); - if (MHD_YES != try_ready_normal_body (connection)) - break; - ret = connection->send_cls (connection, - &response->data - [connection->response_write_position - - response->data_start], - response->data_size - - (connection->response_write_position - - response->data_start)); - const int err = MHD_socket_errno_; -#if DEBUG_SEND_DATA - if (ret > 0) - fprintf (stderr, - "Sent DATA response: `%.*s'\n", - (int) ret, - &response->data[connection->response_write_position - - response->data_start]); -#endif - if (NULL != response->crc) - (void) MHD_mutex_unlock_ (&response->mutex); - if (ret < 0) - { - if ((err == EINTR) || (err == EAGAIN) || (EWOULDBLOCK == err)) - return MHD_YES; -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Failed to send data: %s\n", - MHD_socket_last_strerr_ ()); -#endif - CONNECTION_CLOSE_ERROR (connection, NULL); - return MHD_YES; - } - connection->response_write_position += ret; - if (connection->response_write_position == - connection->response->total_size) - connection->state = MHD_CONNECTION_FOOTERS_SENT; /* have no footers */ - break; - case MHD_CONNECTION_NORMAL_BODY_UNREADY: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_CHUNKED_BODY_READY: - do_write (connection); - if (MHD_CONNECTION_CHUNKED_BODY_READY != connection->state) - break; - check_write_done (connection, - (connection->response->total_size == - connection->response_write_position) ? - MHD_CONNECTION_BODY_SENT : - MHD_CONNECTION_CHUNKED_BODY_UNREADY); - break; - case MHD_CONNECTION_CHUNKED_BODY_UNREADY: - case MHD_CONNECTION_BODY_SENT: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_FOOTERS_SENDING: - do_write (connection); - if (connection->state != MHD_CONNECTION_FOOTERS_SENDING) - break; - check_write_done (connection, MHD_CONNECTION_FOOTERS_SENT); - break; - case MHD_CONNECTION_FOOTERS_SENT: - EXTRA_CHECK (0); - break; - case MHD_CONNECTION_CLOSED: - return MHD_YES; - case MHD_TLS_CONNECTION_INIT: - EXTRA_CHECK (0); - break; - default: - EXTRA_CHECK (0); - CONNECTION_CLOSE_ERROR (connection, - "Internal error\n"); - return MHD_YES; - } - break; - } - return MHD_YES; -} - - -/** - * Clean up the state of the given connection and move it into the - * clean up queue for final disposal. - * - * @param connection handle for the connection to clean up - */ -static void -cleanup_connection (struct MHD_Connection *connection) -{ - struct MHD_Daemon *daemon = connection->daemon; - - if (NULL != connection->response) - { - MHD_destroy_response (connection->response); - connection->response = NULL; - } - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to acquire cleanup mutex\n"); - if (connection->connection_timeout == daemon->connection_timeout) - XDLL_remove (daemon->normal_timeout_head, - daemon->normal_timeout_tail, - connection); - else - XDLL_remove (daemon->manual_timeout_head, - daemon->manual_timeout_tail, - connection); - if (MHD_YES == connection->suspended) - DLL_remove (daemon->suspended_connections_head, - daemon->suspended_connections_tail, - connection); - else - DLL_remove (daemon->connections_head, - daemon->connections_tail, - connection); - DLL_insert (daemon->cleanup_head, - daemon->cleanup_tail, - connection); - connection->suspended = MHD_NO; - connection->resuming = MHD_NO; - connection->in_idle = MHD_NO; - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_unlock_(&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to release cleanup mutex\n"); -} - - -/** - * This function was created to handle per-connection processing that - * has to happen even if the socket cannot be read or written to. - * - * @param connection connection to handle - * @return #MHD_YES if we should continue to process the - * connection (not dead yet), #MHD_NO if it died - */ -int -MHD_connection_handle_idle (struct MHD_Connection *connection) -{ - struct MHD_Daemon *daemon = connection->daemon; - unsigned int timeout; - const char *end; - char *line; - int client_close; - - connection->in_idle = MHD_YES; - while (1) - { -#if DEBUG_STATES - MHD_DLOG (daemon, - "%s: state: %s\n", - __FUNCTION__, - MHD_state_to_string (connection->state)); -#endif - switch (connection->state) - { - case MHD_CONNECTION_INIT: - line = get_next_header_line (connection); - if (NULL == line) - { - if (MHD_CONNECTION_INIT != connection->state) - continue; - if (MHD_YES == connection->read_closed) - { - CONNECTION_CLOSE_ERROR (connection, - NULL); - continue; - } - break; - } - if (MHD_NO == parse_initial_message_line (connection, line)) - CONNECTION_CLOSE_ERROR (connection, NULL); - else - connection->state = MHD_CONNECTION_URL_RECEIVED; - continue; - case MHD_CONNECTION_URL_RECEIVED: - line = get_next_header_line (connection); - if (NULL == line) - { - if (MHD_CONNECTION_URL_RECEIVED != connection->state) - continue; - if (MHD_YES == connection->read_closed) - { - CONNECTION_CLOSE_ERROR (connection, - NULL); - continue; - } - break; - } - if (strlen (line) == 0) - { - connection->state = MHD_CONNECTION_HEADERS_RECEIVED; - continue; - } - if (MHD_NO == process_header_line (connection, line)) - { - transmit_error_response (connection, - MHD_HTTP_BAD_REQUEST, - REQUEST_MALFORMED); - break; - } - connection->state = MHD_CONNECTION_HEADER_PART_RECEIVED; - continue; - case MHD_CONNECTION_HEADER_PART_RECEIVED: - line = get_next_header_line (connection); - if (NULL == line) - { - if (connection->state != MHD_CONNECTION_HEADER_PART_RECEIVED) - continue; - if (MHD_YES == connection->read_closed) - { - CONNECTION_CLOSE_ERROR (connection, - NULL); - continue; - } - break; - } - if (MHD_NO == - process_broken_line (connection, line, MHD_HEADER_KIND)) - continue; - if (0 == strlen (line)) - { - connection->state = MHD_CONNECTION_HEADERS_RECEIVED; - continue; - } - continue; - case MHD_CONNECTION_HEADERS_RECEIVED: - parse_connection_headers (connection); - if (MHD_CONNECTION_CLOSED == connection->state) - continue; - connection->state = MHD_CONNECTION_HEADERS_PROCESSED; - continue; - case MHD_CONNECTION_HEADERS_PROCESSED: - call_connection_handler (connection); /* first call */ - if (MHD_CONNECTION_CLOSED == connection->state) - continue; - if (need_100_continue (connection)) - { - connection->state = MHD_CONNECTION_CONTINUE_SENDING; - break; - } - if ( (NULL != connection->response) && - ( (MHD_str_equal_caseless_ (connection->method, - MHD_HTTP_METHOD_POST)) || - (MHD_str_equal_caseless_ (connection->method, - MHD_HTTP_METHOD_PUT))) ) - { - /* we refused (no upload allowed!) */ - connection->remaining_upload_size = 0; - /* force close, in case client still tries to upload... */ - connection->read_closed = MHD_YES; - } - connection->state = (0 == connection->remaining_upload_size) - ? MHD_CONNECTION_FOOTERS_RECEIVED : MHD_CONNECTION_CONTINUE_SENT; - continue; - case MHD_CONNECTION_CONTINUE_SENDING: - if (connection->continue_message_write_offset == - strlen (HTTP_100_CONTINUE)) - { - connection->state = MHD_CONNECTION_CONTINUE_SENT; - continue; - } - break; - case MHD_CONNECTION_CONTINUE_SENT: - if (0 != connection->read_buffer_offset) - { - process_request_body (connection); /* loop call */ - if (MHD_CONNECTION_CLOSED == connection->state) - continue; - } - if ((0 == connection->remaining_upload_size) || - ((connection->remaining_upload_size == MHD_SIZE_UNKNOWN) && - (0 == connection->read_buffer_offset) && - (MHD_YES == connection->read_closed))) - { - if ((MHD_YES == connection->have_chunked_upload) && - (MHD_NO == connection->read_closed)) - connection->state = MHD_CONNECTION_BODY_RECEIVED; - else - connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; - continue; - } - break; - case MHD_CONNECTION_BODY_RECEIVED: - line = get_next_header_line (connection); - if (NULL == line) - { - if (connection->state != MHD_CONNECTION_BODY_RECEIVED) - continue; - if (MHD_YES == connection->read_closed) - { - CONNECTION_CLOSE_ERROR (connection, - NULL); - continue; - } - break; - } - if (0 == strlen (line)) - { - connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; - continue; - } - if (MHD_NO == process_header_line (connection, line)) - { - transmit_error_response (connection, - MHD_HTTP_BAD_REQUEST, - REQUEST_MALFORMED); - break; - } - connection->state = MHD_CONNECTION_FOOTER_PART_RECEIVED; - continue; - case MHD_CONNECTION_FOOTER_PART_RECEIVED: - line = get_next_header_line (connection); - if (NULL == line) - { - if (connection->state != MHD_CONNECTION_FOOTER_PART_RECEIVED) - continue; - if (MHD_YES == connection->read_closed) - { - CONNECTION_CLOSE_ERROR (connection, - NULL); - continue; - } - break; - } - if (MHD_NO == - process_broken_line (connection, line, MHD_FOOTER_KIND)) - continue; - if (0 == strlen (line)) - { - connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; - continue; - } - continue; - case MHD_CONNECTION_FOOTERS_RECEIVED: - call_connection_handler (connection); /* "final" call */ - if (connection->state == MHD_CONNECTION_CLOSED) - continue; - if (NULL == connection->response) - break; /* try again next time */ - if (MHD_NO == build_header_response (connection)) - { - /* oops - close! */ - CONNECTION_CLOSE_ERROR (connection, - "Closing connection (failed to create response header)\n"); - continue; - } - connection->state = MHD_CONNECTION_HEADERS_SENDING; - -#if HAVE_DECL_TCP_CORK - /* starting header send, set TCP cork */ - { - const int val = 1; - setsockopt (connection->socket_fd, IPPROTO_TCP, TCP_CORK, &val, - sizeof (val)); - } -#endif - break; - case MHD_CONNECTION_HEADERS_SENDING: - /* no default action */ - break; - case MHD_CONNECTION_HEADERS_SENT: - if (connection->have_chunked_upload) - connection->state = MHD_CONNECTION_CHUNKED_BODY_UNREADY; - else - connection->state = MHD_CONNECTION_NORMAL_BODY_UNREADY; - continue; - case MHD_CONNECTION_NORMAL_BODY_READY: - /* nothing to do here */ - break; - case MHD_CONNECTION_NORMAL_BODY_UNREADY: - if (NULL != connection->response->crc) - (void) MHD_mutex_lock_ (&connection->response->mutex); - if (0 == connection->response->total_size) - { - if (NULL != connection->response->crc) - (void) MHD_mutex_unlock_ (&connection->response->mutex); - connection->state = MHD_CONNECTION_BODY_SENT; - continue; - } - if (MHD_YES == try_ready_normal_body (connection)) - { - if (NULL != connection->response->crc) - (void) MHD_mutex_unlock_ (&connection->response->mutex); - connection->state = MHD_CONNECTION_NORMAL_BODY_READY; - break; - } - /* not ready, no socket action */ - break; - case MHD_CONNECTION_CHUNKED_BODY_READY: - /* nothing to do here */ - break; - case MHD_CONNECTION_CHUNKED_BODY_UNREADY: - if (NULL != connection->response->crc) - (void) MHD_mutex_lock_ (&connection->response->mutex); - if (0 == connection->response->total_size) - { - if (NULL != connection->response->crc) - (void) MHD_mutex_unlock_ (&connection->response->mutex); - connection->state = MHD_CONNECTION_BODY_SENT; - continue; - } - if (MHD_YES == try_ready_chunked_body (connection)) - { - if (NULL != connection->response->crc) - (void) MHD_mutex_unlock_ (&connection->response->mutex); - connection->state = MHD_CONNECTION_CHUNKED_BODY_READY; - continue; - } - if (NULL != connection->response->crc) - (void) MHD_mutex_unlock_ (&connection->response->mutex); - break; - case MHD_CONNECTION_BODY_SENT: - if (MHD_NO == build_header_response (connection)) - { - /* oops - close! */ - CONNECTION_CLOSE_ERROR (connection, - "Closing connection (failed to create response header)\n"); - continue; - } - if ( (MHD_NO == connection->have_chunked_upload) || - (connection->write_buffer_send_offset == - connection->write_buffer_append_offset) ) - connection->state = MHD_CONNECTION_FOOTERS_SENT; - else - connection->state = MHD_CONNECTION_FOOTERS_SENDING; - continue; - case MHD_CONNECTION_FOOTERS_SENDING: - /* no default action */ - break; - case MHD_CONNECTION_FOOTERS_SENT: -#if HAVE_DECL_TCP_CORK - /* done sending, uncork */ - { - const int val = 0; - setsockopt (connection->socket_fd, IPPROTO_TCP, TCP_CORK, &val, - sizeof (val)); - } -#endif - end = - MHD_get_response_header (connection->response, - MHD_HTTP_HEADER_CONNECTION); - client_close = ((NULL != end) && (MHD_str_equal_caseless_(end, "close"))); - MHD_destroy_response (connection->response); - connection->response = NULL; - if ( (NULL != daemon->notify_completed) && - (MHD_YES == connection->client_aware) ) - { - daemon->notify_completed (daemon->notify_completed_cls, - connection, - &connection->client_context, - MHD_REQUEST_TERMINATED_COMPLETED_OK); - connection->client_aware = MHD_NO; - } - end = - MHD_lookup_connection_value (connection, MHD_HEADER_KIND, - MHD_HTTP_HEADER_CONNECTION); - if ( (MHD_YES == connection->read_closed) || - (client_close) || - ((NULL != end) && (MHD_str_equal_caseless_ (end, "close"))) ) - { - connection->read_closed = MHD_YES; - connection->read_buffer_offset = 0; - } - if (((MHD_YES == connection->read_closed) && - (0 == connection->read_buffer_offset)) || - (MHD_NO == keepalive_possible (connection))) - { - /* have to close for some reason */ - MHD_connection_close (connection, - MHD_REQUEST_TERMINATED_COMPLETED_OK); - MHD_pool_destroy (connection->pool); - connection->pool = NULL; - connection->read_buffer = NULL; - connection->read_buffer_size = 0; - connection->read_buffer_offset = 0; - } - else - { - /* can try to keep-alive */ - connection->version = NULL; - connection->state = MHD_CONNECTION_INIT; - connection->read_buffer - = MHD_pool_reset (connection->pool, - connection->read_buffer, - connection->read_buffer_size); - } - connection->client_aware = MHD_NO; - connection->client_context = NULL; - connection->continue_message_write_offset = 0; - connection->responseCode = 0; - connection->headers_received = NULL; - connection->headers_received_tail = NULL; - connection->response_write_position = 0; - connection->have_chunked_upload = MHD_NO; - connection->method = NULL; - connection->url = NULL; - connection->write_buffer = NULL; - connection->write_buffer_size = 0; - connection->write_buffer_send_offset = 0; - connection->write_buffer_append_offset = 0; - continue; - case MHD_CONNECTION_CLOSED: - cleanup_connection (connection); - return MHD_NO; - default: - EXTRA_CHECK (0); - break; - } - break; - } - timeout = connection->connection_timeout; - if ( (0 != timeout) && - (timeout <= (MHD_monotonic_time() - connection->last_activity)) ) - { - MHD_connection_close (connection, MHD_REQUEST_TERMINATED_TIMEOUT_REACHED); - connection->in_idle = MHD_NO; - return MHD_YES; - } - MHD_connection_update_event_loop_info (connection); -#if EPOLL_SUPPORT - switch (connection->event_loop_info) - { - case MHD_EVENT_LOOP_INFO_READ: - if ( (0 != (connection->epoll_state & MHD_EPOLL_STATE_READ_READY)) && - (0 == (connection->epoll_state & MHD_EPOLL_STATE_SUSPENDED)) && - (0 == (connection->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL)) ) - { - EDLL_insert (daemon->eready_head, - daemon->eready_tail, - connection); - connection->epoll_state |= MHD_EPOLL_STATE_IN_EREADY_EDLL; - } - break; - case MHD_EVENT_LOOP_INFO_WRITE: - if ( (0 != (connection->epoll_state & MHD_EPOLL_STATE_WRITE_READY)) && - (0 == (connection->epoll_state & MHD_EPOLL_STATE_SUSPENDED)) && - (0 == (connection->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL)) ) - { - EDLL_insert (daemon->eready_head, - daemon->eready_tail, - connection); - connection->epoll_state |= MHD_EPOLL_STATE_IN_EREADY_EDLL; - } - break; - case MHD_EVENT_LOOP_INFO_BLOCK: - /* we should look at this connection again in the next iteration - of the event loop, as we're waiting on the application */ - if ( (0 == (connection->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL) && - (0 == (connection->epoll_state & MHD_EPOLL_STATE_SUSPENDED))) ) - { - EDLL_insert (daemon->eready_head, - daemon->eready_tail, - connection); - connection->epoll_state |= MHD_EPOLL_STATE_IN_EREADY_EDLL; - } - break; - case MHD_EVENT_LOOP_INFO_CLEANUP: - /* This connection is finished, nothing left to do */ - break; - } - return MHD_connection_epoll_update_ (connection); -#else - return MHD_YES; -#endif -} - - -#if EPOLL_SUPPORT -/** - * Perform epoll() processing, possibly moving the connection back into - * the epoll() set if needed. - * - * @param connection connection to process - * @return #MHD_YES if we should continue to process the - * connection (not dead yet), #MHD_NO if it died - */ -int -MHD_connection_epoll_update_ (struct MHD_Connection *connection) -{ - struct MHD_Daemon *daemon = connection->daemon; - - if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) && - (0 == (connection->epoll_state & MHD_EPOLL_STATE_IN_EPOLL_SET)) && - (0 == (connection->epoll_state & MHD_EPOLL_STATE_SUSPENDED)) && - ( (0 == (connection->epoll_state & MHD_EPOLL_STATE_WRITE_READY)) || - ( (0 == (connection->epoll_state & MHD_EPOLL_STATE_READ_READY)) && - ( (MHD_EVENT_LOOP_INFO_READ == connection->event_loop_info) || - (connection->read_buffer_size > connection->read_buffer_offset) ) && - (MHD_NO == connection->read_closed) ) ) ) - { - /* add to epoll set */ - struct epoll_event event; - - event.events = EPOLLIN | EPOLLOUT | EPOLLET; - event.data.ptr = connection; - if (0 != epoll_ctl (daemon->epoll_fd, - EPOLL_CTL_ADD, - connection->socket_fd, - &event)) - { -#if HAVE_MESSAGES - if (0 != (daemon->options & MHD_USE_DEBUG)) - MHD_DLOG (daemon, - "Call to epoll_ctl failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - connection->state = MHD_CONNECTION_CLOSED; - cleanup_connection (connection); - return MHD_NO; - } - connection->epoll_state |= MHD_EPOLL_STATE_IN_EPOLL_SET; - } - connection->in_idle = MHD_NO; - return MHD_YES; -} -#endif - - -/** - * Set callbacks for this connection to those for HTTP. - * - * @param connection connection to initialize - */ -void -MHD_set_http_callbacks_ (struct MHD_Connection *connection) -{ - connection->read_handler = &MHD_connection_handle_read; - connection->write_handler = &MHD_connection_handle_write; - connection->idle_handler = &MHD_connection_handle_idle; -} - - -/** - * Obtain information about the given connection. - * - * @param connection what connection to get information about - * @param info_type what information is desired? - * @param ... depends on @a info_type - * @return NULL if this information is not available - * (or if the @a info_type is unknown) - * @ingroup specialized - */ -const union MHD_ConnectionInfo * -MHD_get_connection_info (struct MHD_Connection *connection, - enum MHD_ConnectionInfoType info_type, ...) -{ - switch (info_type) - { -#if HTTPS_SUPPORT - case MHD_CONNECTION_INFO_CIPHER_ALGO: - if (connection->tls_session == NULL) - return NULL; - connection->cipher = gnutls_cipher_get (connection->tls_session); - return (const union MHD_ConnectionInfo *) &connection->cipher; - case MHD_CONNECTION_INFO_PROTOCOL: - if (connection->tls_session == NULL) - return NULL; - connection->protocol = gnutls_protocol_get_version (connection->tls_session); - return (const union MHD_ConnectionInfo *) &connection->protocol; - case MHD_CONNECTION_INFO_GNUTLS_SESSION: - if (connection->tls_session == NULL) - return NULL; - return (const union MHD_ConnectionInfo *) &connection->tls_session; -#endif - case MHD_CONNECTION_INFO_CLIENT_ADDRESS: - return (const union MHD_ConnectionInfo *) &connection->addr; - case MHD_CONNECTION_INFO_DAEMON: - return (const union MHD_ConnectionInfo *) &connection->daemon; - case MHD_CONNECTION_INFO_CONNECTION_FD: - return (const union MHD_ConnectionInfo *) &connection->socket_fd; - case MHD_CONNECTION_INFO_SOCKET_CONTEXT: - return (const union MHD_ConnectionInfo *) &connection->socket_context; - default: - return NULL; - }; -} - - -/** - * Set a custom option for the given connection, overriding defaults. - * - * @param connection connection to modify - * @param option option to set - * @param ... arguments to the option, depending on the option type - * @return #MHD_YES on success, #MHD_NO if setting the option failed - * @ingroup specialized - */ -int -MHD_set_connection_option (struct MHD_Connection *connection, - enum MHD_CONNECTION_OPTION option, - ...) -{ - va_list ap; - struct MHD_Daemon *daemon; - - daemon = connection->daemon; - switch (option) - { - case MHD_CONNECTION_OPTION_TIMEOUT: - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to acquire cleanup mutex\n"); - if (MHD_YES != connection->suspended) - { - if (connection->connection_timeout == daemon->connection_timeout) - XDLL_remove (daemon->normal_timeout_head, - daemon->normal_timeout_tail, - connection); - else - XDLL_remove (daemon->manual_timeout_head, - daemon->manual_timeout_tail, - connection); - } - va_start (ap, option); - connection->connection_timeout = va_arg (ap, unsigned int); - va_end (ap); - if (MHD_YES != connection->suspended) - { - if (connection->connection_timeout == daemon->connection_timeout) - XDLL_insert (daemon->normal_timeout_head, - daemon->normal_timeout_tail, - connection); - else - XDLL_insert (daemon->manual_timeout_head, - daemon->manual_timeout_tail, - connection); - } - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_unlock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to release cleanup mutex\n"); - return MHD_YES; - default: - return MHD_NO; - } -} - - -/** - * Queue a response to be transmitted to the client (as soon as - * possible but after #MHD_AccessHandlerCallback returns). - * - * @param connection the connection identifying the client - * @param status_code HTTP status code (i.e. #MHD_HTTP_OK) - * @param response response to transmit - * @return #MHD_NO on error (i.e. reply already sent), - * #MHD_YES on success or if message has been queued - * @ingroup response - */ -int -MHD_queue_response (struct MHD_Connection *connection, - unsigned int status_code, - struct MHD_Response *response) -{ - if ( (NULL == connection) || - (NULL == response) || - (NULL != connection->response) || - ( (MHD_CONNECTION_HEADERS_PROCESSED != connection->state) && - (MHD_CONNECTION_FOOTERS_RECEIVED != connection->state) ) ) - return MHD_NO; - MHD_increment_response_rc (response); - connection->response = response; - connection->responseCode = status_code; - if ( (NULL != connection->method) && - (MHD_str_equal_caseless_ (connection->method, MHD_HTTP_METHOD_HEAD)) ) - { - /* if this is a "HEAD" request, pretend that we - have already sent the full message body */ - connection->response_write_position = response->total_size; - } - if ( (MHD_CONNECTION_HEADERS_PROCESSED == connection->state) && - (NULL != connection->method) && - ( (MHD_str_equal_caseless_ (connection->method, - MHD_HTTP_METHOD_POST)) || - (MHD_str_equal_caseless_ (connection->method, - MHD_HTTP_METHOD_PUT))) ) - { - /* response was queued "early", refuse to read body / footers or - further requests! */ - connection->read_closed = MHD_YES; - connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; - } - if (MHD_NO == connection->in_idle) - (void) MHD_connection_handle_idle (connection); - return MHD_YES; -} - - -/* end of connection.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection.h deleted file mode 100644 index 07feec26..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file connection.h - * @brief Methods for managing connections - * @author Daniel Pittman - * @author Christian Grothoff - */ - -#ifndef CONNECTION_H -#define CONNECTION_H - -#include "internal.h" - - -/** - * Set callbacks for this connection to those for HTTP. - * - * @param connection connection to initialize - */ -void -MHD_set_http_callbacks_ (struct MHD_Connection *connection); - - -/** - * This function handles a particular connection when it has been - * determined that there is data to be read off a socket. All - * implementations (multithreaded, external select, internal select) - * call this function to handle reads. - * - * @param connection connection to handle - * @return always MHD_YES (we should continue to process the - * connection) - */ -int -MHD_connection_handle_read (struct MHD_Connection *connection); - - -/** - * This function was created to handle writes to sockets when it has - * been determined that the socket can be written to. All - * implementations (multithreaded, external select, internal select) - * call this function - * - * @param connection connection to handle - * @return always MHD_YES (we should continue to process the - * connection) - */ -int -MHD_connection_handle_write (struct MHD_Connection *connection); - - -/** - * This function was created to handle per-connection processing that - * has to happen even if the socket cannot be read or written to. All - * implementations (multithreaded, external select, internal select) - * call this function. - * - * @param connection connection to handle - * @return MHD_YES if we should continue to process the - * connection (not dead yet), MHD_NO if it died - */ -int -MHD_connection_handle_idle (struct MHD_Connection *connection); - - -/** - * Close the given connection and give the - * specified termination code to the user. - * - * @param connection connection to close - * @param termination_code termination reason to give - */ -void -MHD_connection_close (struct MHD_Connection *connection, - enum MHD_RequestTerminationCode termination_code); - - -#if EPOLL_SUPPORT -/** - * Perform epoll processing, possibly moving the connection back into - * the epoll set if needed. - * - * @param connection connection to process - * @return MHD_YES if we should continue to process the - * connection (not dead yet), MHD_NO if it died - */ -int -MHD_connection_epoll_update_ (struct MHD_Connection *connection); -#endif - - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection_https.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection_https.c deleted file mode 100644 index 834d52e0..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection_https.c +++ /dev/null @@ -1,183 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008, 2010 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -/** - * @file connection_https.c - * @brief Methods for managing SSL/TLS connections. This file is only - * compiled if ENABLE_HTTPS is set. - * @author Sagie Amir - * @author Christian Grothoff - */ - -#include "internal.h" -#include "connection.h" -#include "memorypool.h" -#include "response.h" -#include "reason_phrase.h" -#include - - -/** - * Give gnuTLS chance to work on the TLS handshake. - * - * @param connection connection to handshake on - * @return #MHD_YES on error or if the handshake is progressing - * #MHD_NO if the handshake has completed successfully - * and we should start to read/write data - */ -static int -run_tls_handshake (struct MHD_Connection *connection) -{ - int ret; - - connection->last_activity = MHD_monotonic_time(); - if (connection->state == MHD_TLS_CONNECTION_INIT) - { - ret = gnutls_handshake (connection->tls_session); - if (ret == GNUTLS_E_SUCCESS) - { - /* set connection state to enable HTTP processing */ - connection->state = MHD_CONNECTION_INIT; - return MHD_YES; - } - if ( (ret == GNUTLS_E_AGAIN) || - (ret == GNUTLS_E_INTERRUPTED) ) - { - /* handshake not done */ - return MHD_YES; - } - /* handshake failed */ -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Error: received handshake message out of context\n"); -#endif - MHD_connection_close (connection, - MHD_REQUEST_TERMINATED_WITH_ERROR); - return MHD_YES; - } - return MHD_NO; -} - - -/** - * This function handles a particular SSL/TLS connection when - * it has been determined that there is data to be read off a - * socket. Message processing is done by message type which is - * determined by peeking into the first message type byte of the - * stream. - * - * Error message handling: all fatal level messages cause the - * connection to be terminated. - * - * Application data is forwarded to the underlying daemon for - * processing. - * - * @param connection the source connection - * @return always #MHD_YES (we should continue to process the connection) - */ -static int -MHD_tls_connection_handle_read (struct MHD_Connection *connection) -{ - if (MHD_YES == run_tls_handshake (connection)) - return MHD_YES; - return MHD_connection_handle_read (connection); -} - - -/** - * This function was created to handle writes to sockets when it has - * been determined that the socket can be written to. This function - * will forward all write requests to the underlying daemon unless - * the connection has been marked for closing. - * - * @return always #MHD_YES (we should continue to process the connection) - */ -static int -MHD_tls_connection_handle_write (struct MHD_Connection *connection) -{ - if (MHD_YES == run_tls_handshake (connection)) - return MHD_YES; - return MHD_connection_handle_write (connection); -} - - -/** - * This function was created to handle per-connection processing that - * has to happen even if the socket cannot be read or written to. All - * implementations (multithreaded, external select, internal select) - * call this function. - * - * @param connection being handled - * @return #MHD_YES if we should continue to process the - * connection (not dead yet), #MHD_NO if it died - */ -static int -MHD_tls_connection_handle_idle (struct MHD_Connection *connection) -{ - unsigned int timeout; - -#if DEBUG_STATES - MHD_DLOG (connection->daemon, - "%s: state: %s\n", - __FUNCTION__, - MHD_state_to_string (connection->state)); -#endif - timeout = connection->connection_timeout; - if ( (timeout != 0) && (timeout <= (MHD_monotonic_time() - connection->last_activity))) - MHD_connection_close (connection, - MHD_REQUEST_TERMINATED_TIMEOUT_REACHED); - switch (connection->state) - { - /* on newly created connections we might reach here before any reply has been received */ - case MHD_TLS_CONNECTION_INIT: - break; - /* close connection if necessary */ - case MHD_CONNECTION_CLOSED: - gnutls_bye (connection->tls_session, GNUTLS_SHUT_RDWR); - return MHD_connection_handle_idle (connection); - default: - if ( (0 != gnutls_record_check_pending (connection->tls_session)) && - (MHD_YES != MHD_tls_connection_handle_read (connection)) ) - return MHD_YES; - return MHD_connection_handle_idle (connection); - } -#if EPOLL_SUPPORT - return MHD_connection_epoll_update_ (connection); -#else - return MHD_YES; -#endif -} - - -/** - * Set connection callback function to be used through out - * the processing of this secure connection. - * - * @param connection which callbacks should be modified - */ -void -MHD_set_https_callbacks (struct MHD_Connection *connection) -{ - connection->read_handler = &MHD_tls_connection_handle_read; - connection->write_handler = &MHD_tls_connection_handle_write; - connection->idle_handler = &MHD_tls_connection_handle_idle; -} - -/* end of connection_https.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection_https.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection_https.h deleted file mode 100644 index 02ffb52e..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/connection_https.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2008 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file connection_https.h - * @brief Methods for managing connections - * @author Christian Grothoff - */ - -#ifndef CONNECTION_HTTPS_H -#define CONNECTION_HTTPS_H - -#include "internal.h" - -#if HTTPS_SUPPORT -/** - * Set connection callback function to be used through out - * the processing of this secure connection. - * - * @param connection which callbacks should be modified - */ -void -MHD_set_https_callbacks (struct MHD_Connection *connection); -#endif - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/daemon.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/daemon.c deleted file mode 100644 index 1aa7d8d3..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/daemon.c +++ /dev/null @@ -1,4844 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007-2014 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -/** - * @file microhttpd/daemon.c - * @brief A minimal-HTTP server library - * @author Daniel Pittman - * @author Christian Grothoff - */ -#if defined(_WIN32) && !defined(__CYGWIN__) -/* override small default value */ -#define FD_SETSIZE 1024 -#define MHD_DEFAULT_FD_SETSIZE 64 -#else -#define MHD_DEFAULT_FD_SETSIZE FD_SETSIZE -#endif -#include "platform.h" -#include "internal.h" -#include "response.h" -#include "connection.h" -#include "memorypool.h" -#include -#include "autoinit_funcs.h" - -#if HAVE_SEARCH_H -#include -#else -#include "tsearch.h" -#endif - -#if HTTPS_SUPPORT -#include "connection_https.h" -#include -#endif - -#if defined(HAVE_POLL_H) && defined(HAVE_POLL) -#include -#endif - -#ifdef LINUX -#include -#endif - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#include -#endif - -#ifndef HAVE_ACCEPT4 -#define HAVE_ACCEPT4 0 -#endif - -/** - * Default connection limit. - */ -#ifndef WINDOWS -#define MHD_MAX_CONNECTIONS_DEFAULT FD_SETSIZE - 4 -#else -#define MHD_MAX_CONNECTIONS_DEFAULT FD_SETSIZE -#endif - -/** - * Default memory allowed per connection. - */ -#define MHD_POOL_SIZE_DEFAULT (32 * 1024) - -#ifdef TCP_FASTOPEN -/** - * Default TCP fastopen queue size. - */ -#define MHD_TCP_FASTOPEN_QUEUE_SIZE_DEFAULT 10 -#endif - -/** - * Print extra messages with reasons for closing - * sockets? (only adds non-error messages). - */ -#define DEBUG_CLOSE MHD_NO - -/** - * Print extra messages when establishing - * connections? (only adds non-error messages). - */ -#define DEBUG_CONNECT MHD_NO - -#ifndef LINUX -#ifndef MSG_NOSIGNAL -#define MSG_NOSIGNAL 0 -#endif -#endif - -#ifndef SOCK_CLOEXEC -#define SOCK_CLOEXEC 0 -#endif - -#ifndef EPOLL_CLOEXEC -#define EPOLL_CLOEXEC 0 -#endif - - -/** - * Default implementation of the panic function, - * prints an error message and aborts. - * - * @param cls unused - * @param file name of the file with the problem - * @param line line number with the problem - * @param reason error message with details - */ -static void -mhd_panic_std (void *cls, - const char *file, - unsigned int line, - const char *reason) -{ -#if HAVE_MESSAGES - fprintf (stderr, "Fatal error in GNU libmicrohttpd %s:%u: %s\n", - file, line, reason); -#endif - abort (); -} - - -/** - * Handler for fatal errors. - */ -MHD_PanicCallback mhd_panic; - -/** - * Closure argument for "mhd_panic". - */ -void *mhd_panic_cls; - -#ifdef _WIN32 -/** - * Track initialization of winsock - */ -static int mhd_winsock_inited_ = 0; -#endif - -/** - * Trace up to and return master daemon. If the supplied daemon - * is a master, then return the daemon itself. - * - * @param daemon handle to a daemon - * @return master daemon handle - */ -static struct MHD_Daemon* -MHD_get_master (struct MHD_Daemon *daemon) -{ - while (NULL != daemon->master) - daemon = daemon->master; - return daemon; -} - - -/** - * Maintain connection count for single address. - */ -struct MHD_IPCount -{ - /** - * Address family. AF_INET or AF_INET6 for now. - */ - int family; - - /** - * Actual address. - */ - union - { - /** - * IPv4 address. - */ - struct in_addr ipv4; -#if HAVE_INET6 - /** - * IPv6 address. - */ - struct in6_addr ipv6; -#endif - } addr; - - /** - * Counter. - */ - unsigned int count; -}; - - -/** - * Lock shared structure for IP connection counts and connection DLLs. - * - * @param daemon handle to daemon where lock is - */ -static void -MHD_ip_count_lock (struct MHD_Daemon *daemon) -{ - if (MHD_YES != MHD_mutex_lock_(&daemon->per_ip_connection_mutex)) - { - MHD_PANIC ("Failed to acquire IP connection limit mutex\n"); - } -} - - -/** - * Unlock shared structure for IP connection counts and connection DLLs. - * - * @param daemon handle to daemon where lock is - */ -static void -MHD_ip_count_unlock (struct MHD_Daemon *daemon) -{ - if (MHD_YES != MHD_mutex_unlock_(&daemon->per_ip_connection_mutex)) - { - MHD_PANIC ("Failed to release IP connection limit mutex\n"); - } -} - - -/** - * Tree comparison function for IP addresses (supplied to tsearch() family). - * We compare everything in the struct up through the beginning of the - * 'count' field. - * - * @param a1 first address to compare - * @param a2 second address to compare - * @return -1, 0 or 1 depending on result of compare - */ -static int -MHD_ip_addr_compare (const void *a1, const void *a2) -{ - return memcmp (a1, a2, offsetof (struct MHD_IPCount, count)); -} - - -/** - * Parse address and initialize 'key' using the address. - * - * @param addr address to parse - * @param addrlen number of bytes in addr - * @param key where to store the parsed address - * @return #MHD_YES on success and #MHD_NO otherwise (e.g., invalid address type) - */ -static int -MHD_ip_addr_to_key (const struct sockaddr *addr, - socklen_t addrlen, - struct MHD_IPCount *key) -{ - memset(key, 0, sizeof(*key)); - - /* IPv4 addresses */ - if (sizeof (struct sockaddr_in) == addrlen) - { - const struct sockaddr_in *addr4 = (const struct sockaddr_in*) addr; - key->family = AF_INET; - memcpy (&key->addr.ipv4, &addr4->sin_addr, sizeof(addr4->sin_addr)); - return MHD_YES; - } - -#if HAVE_INET6 - /* IPv6 addresses */ - if (sizeof (struct sockaddr_in6) == addrlen) - { - const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6*) addr; - key->family = AF_INET6; - memcpy (&key->addr.ipv6, &addr6->sin6_addr, sizeof(addr6->sin6_addr)); - return MHD_YES; - } -#endif - - /* Some other address */ - return MHD_NO; -} - - -/** - * Check if IP address is over its limit. - * - * @param daemon handle to daemon where connection counts are tracked - * @param addr address to add (or increment counter) - * @param addrlen number of bytes in addr - * @return Return #MHD_YES if IP below limit, #MHD_NO if IP has surpassed limit. - * Also returns #MHD_NO if fails to allocate memory. - */ -static int -MHD_ip_limit_add (struct MHD_Daemon *daemon, - const struct sockaddr *addr, - socklen_t addrlen) -{ - struct MHD_IPCount *key; - void **nodep; - void *node; - int result; - - daemon = MHD_get_master (daemon); - /* Ignore if no connection limit assigned */ - if (0 == daemon->per_ip_connection_limit) - return MHD_YES; - - if (NULL == (key = malloc (sizeof(*key)))) - return MHD_NO; - - /* Initialize key */ - if (MHD_NO == MHD_ip_addr_to_key (addr, addrlen, key)) - { - /* Allow unhandled address types through */ - free (key); - return MHD_YES; - } - MHD_ip_count_lock (daemon); - - /* Search for the IP address */ - if (NULL == (nodep = tsearch (key, - &daemon->per_ip_connection_count, - &MHD_ip_addr_compare))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to add IP connection count node\n"); -#endif - MHD_ip_count_unlock (daemon); - free (key); - return MHD_NO; - } - node = *nodep; - /* If we got an existing node back, free the one we created */ - if (node != key) - free(key); - key = (struct MHD_IPCount *) node; - /* Test if there is room for another connection; if so, - * increment count */ - result = (key->count < daemon->per_ip_connection_limit); - if (MHD_YES == result) - ++key->count; - - MHD_ip_count_unlock (daemon); - return result; -} - - -/** - * Decrement connection count for IP address, removing from table - * count reaches 0. - * - * @param daemon handle to daemon where connection counts are tracked - * @param addr address to remove (or decrement counter) - * @param addrlen number of bytes in @a addr - */ -static void -MHD_ip_limit_del (struct MHD_Daemon *daemon, - const struct sockaddr *addr, - socklen_t addrlen) -{ - struct MHD_IPCount search_key; - struct MHD_IPCount *found_key; - void **nodep; - - daemon = MHD_get_master (daemon); - /* Ignore if no connection limit assigned */ - if (0 == daemon->per_ip_connection_limit) - return; - /* Initialize search key */ - if (MHD_NO == MHD_ip_addr_to_key (addr, addrlen, &search_key)) - return; - - MHD_ip_count_lock (daemon); - - /* Search for the IP address */ - if (NULL == (nodep = tfind (&search_key, - &daemon->per_ip_connection_count, - &MHD_ip_addr_compare))) - { - /* Something's wrong if we couldn't find an IP address - * that was previously added */ - MHD_PANIC ("Failed to find previously-added IP address\n"); - } - found_key = (struct MHD_IPCount *) *nodep; - /* Validate existing count for IP address */ - if (0 == found_key->count) - { - MHD_PANIC ("Previously-added IP address had 0 count\n"); - } - /* Remove the node entirely if count reduces to 0 */ - if (0 == --found_key->count) - { - tdelete (found_key, - &daemon->per_ip_connection_count, - &MHD_ip_addr_compare); - free (found_key); - } - - MHD_ip_count_unlock (daemon); -} - - -#if HTTPS_SUPPORT -/** - * Callback for receiving data from the socket. - * - * @param connection the MHD_Connection structure - * @param other where to write received data to - * @param i maximum size of other (in bytes) - * @return number of bytes actually received - */ -static ssize_t -recv_tls_adapter (struct MHD_Connection *connection, void *other, size_t i) -{ - int res; - - if (MHD_YES == connection->tls_read_ready) - { - connection->daemon->num_tls_read_ready--; - connection->tls_read_ready = MHD_NO; - } - res = gnutls_record_recv (connection->tls_session, other, i); - if ( (GNUTLS_E_AGAIN == res) || - (GNUTLS_E_INTERRUPTED == res) ) - { - MHD_set_socket_errno_ (EINTR); -#if EPOLL_SUPPORT - connection->epoll_state &= ~MHD_EPOLL_STATE_READ_READY; -#endif - return -1; - } - if (res < 0) - { - /* Likely 'GNUTLS_E_INVALID_SESSION' (client communication - disrupted); set errno to something caller will interpret - correctly as a hard error */ - MHD_set_socket_errno_ (ECONNRESET); - return res; - } - if (res == i) - { - connection->tls_read_ready = MHD_YES; - connection->daemon->num_tls_read_ready++; - } - return res; -} - - -/** - * Callback for writing data to the socket. - * - * @param connection the MHD connection structure - * @param other data to write - * @param i number of bytes to write - * @return actual number of bytes written - */ -static ssize_t -send_tls_adapter (struct MHD_Connection *connection, - const void *other, size_t i) -{ - int res; - - res = gnutls_record_send (connection->tls_session, other, i); - if ( (GNUTLS_E_AGAIN == res) || - (GNUTLS_E_INTERRUPTED == res) ) - { - MHD_set_socket_errno_ (EINTR); -#if EPOLL_SUPPORT - connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY; -#endif - return -1; - } - if (res < 0) - { - /* some other GNUTLS error, should set 'errno'; as we do not - really understand the error (not listed in GnuTLS - documentation explicitly), we set 'errno' to something that - will cause the connection to fail. */ - MHD_set_socket_errno_ (ECONNRESET); - return -1; - } - return res; -} - - -/** - * Read and setup our certificate and key. - * - * @param daemon handle to daemon to initialize - * @return 0 on success - */ -static int -MHD_init_daemon_certificate (struct MHD_Daemon *daemon) -{ - gnutls_datum_t key; - gnutls_datum_t cert; - int ret; - -#if GNUTLS_VERSION_MAJOR >= 3 - if (NULL != daemon->cert_callback) - { - gnutls_certificate_set_retrieve_function2 (daemon->x509_cred, - daemon->cert_callback); - } -#endif - if (NULL != daemon->https_mem_trust) - { - cert.data = (unsigned char *) daemon->https_mem_trust; - cert.size = strlen (daemon->https_mem_trust); - if (gnutls_certificate_set_x509_trust_mem (daemon->x509_cred, &cert, - GNUTLS_X509_FMT_PEM) < 0) - { -#if HAVE_MESSAGES - MHD_DLOG(daemon, - "Bad trust certificate format\n"); -#endif - return -1; - } - } - - if (MHD_YES == daemon->have_dhparams) - { - gnutls_certificate_set_dh_params (daemon->x509_cred, - daemon->https_mem_dhparams); - } - /* certificate & key loaded from memory */ - if ( (NULL != daemon->https_mem_cert) && - (NULL != daemon->https_mem_key) ) - { - key.data = (unsigned char *) daemon->https_mem_key; - key.size = strlen (daemon->https_mem_key); - cert.data = (unsigned char *) daemon->https_mem_cert; - cert.size = strlen (daemon->https_mem_cert); - - if (NULL != daemon->https_key_password) { -#if GNUTLS_VERSION_NUMBER >= 0x030111 - ret = gnutls_certificate_set_x509_key_mem2 (daemon->x509_cred, - &cert, &key, - GNUTLS_X509_FMT_PEM, - daemon->https_key_password, - 0); -#else -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to setup x509 certificate/key: pre 3.X.X version " \ - "of GnuTLS does not support setting key password"); -#endif - return -1; -#endif - } - else - ret = gnutls_certificate_set_x509_key_mem (daemon->x509_cred, - &cert, &key, - GNUTLS_X509_FMT_PEM); -#if HAVE_MESSAGES - if (0 != ret) - MHD_DLOG (daemon, - "GnuTLS failed to setup x509 certificate/key: %s\n", - gnutls_strerror (ret)); -#endif - return ret; - } -#if GNUTLS_VERSION_MAJOR >= 3 - if (NULL != daemon->cert_callback) - return 0; -#endif -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "You need to specify a certificate and key location\n"); -#endif - return -1; -} - - -/** - * Initialize security aspects of the HTTPS daemon - * - * @param daemon handle to daemon to initialize - * @return 0 on success - */ -static int -MHD_TLS_init (struct MHD_Daemon *daemon) -{ - switch (daemon->cred_type) - { - case GNUTLS_CRD_CERTIFICATE: - if (0 != - gnutls_certificate_allocate_credentials (&daemon->x509_cred)) - return GNUTLS_E_MEMORY_ERROR; - return MHD_init_daemon_certificate (daemon); - default: -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Error: invalid credentials type %d specified.\n", - daemon->cred_type); -#endif - return -1; - } -} -#endif - - -/** - * Add @a fd to the @a set. If @a fd is - * greater than @a max_fd, set @a max_fd to @a fd. - * - * @param fd file descriptor to add to the @a set - * @param set set to modify - * @param max_fd maximum value to potentially update - * @param fd_setsize value of FD_SETSIZE - * @return #MHD_YES on success, #MHD_NO otherwise - */ -static int -add_to_fd_set (MHD_socket fd, - fd_set *set, - MHD_socket *max_fd, - unsigned int fd_setsize) -{ - if (NULL == set) - return MHD_NO; -#ifdef MHD_WINSOCK_SOCKETS - if (set->fd_count >= fd_setsize) - { - if (FD_ISSET(fd, set)) - return MHD_YES; - else - return MHD_NO; - } -#else // ! MHD_WINSOCK_SOCKETS - if (fd >= fd_setsize) - return MHD_NO; -#endif // ! MHD_WINSOCK_SOCKETS - FD_SET (fd, set); - if ( (NULL != max_fd) && (MHD_INVALID_SOCKET != fd) && - ((fd > *max_fd) || (MHD_INVALID_SOCKET == *max_fd)) ) - *max_fd = fd; - - return MHD_YES; -} - -#undef MHD_get_fdset - -/** - * Obtain the `select()` sets for this daemon. - * Daemon's FDs will be added to fd_sets. To get only - * daemon FDs in fd_sets, call FD_ZERO for each fd_set - * before calling this function. FD_SETSIZE is assumed - * to be platform's default. - * - * @param daemon daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @param max_fd increased to largest FD added (if larger - * than existing value); can be NULL - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call or any FD didn't - * fit fd_set. - * @ingroup event - */ -int -MHD_get_fdset (struct MHD_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set, - MHD_socket *max_fd) -{ - return MHD_get_fdset2(daemon, read_fd_set, - write_fd_set, except_fd_set, - max_fd, MHD_DEFAULT_FD_SETSIZE); -} - -/** - * Obtain the `select()` sets for this daemon. - * Daemon's FDs will be added to fd_sets. To get only - * daemon FDs in fd_sets, call FD_ZERO for each fd_set - * before calling this function. Passing custom FD_SETSIZE - * as @a fd_setsize allow usage of larger/smaller than - * platform's default fd_sets. - * - * @param daemon daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @param max_fd increased to largest FD added (if larger - * than existing value); can be NULL - * @param fd_setsize value of FD_SETSIZE - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call or any FD didn't - * fit fd_set. - * @ingroup event - */ -int -MHD_get_fdset2 (struct MHD_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set, - MHD_socket *max_fd, - unsigned int fd_setsize) -{ - struct MHD_Connection *pos; - - if ( (NULL == daemon) - || (NULL == read_fd_set) - || (NULL == write_fd_set) - || (MHD_YES == daemon->shutdown) - || (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) - || (0 != (daemon->options & MHD_USE_POLL))) - return MHD_NO; -#if EPOLL_SUPPORT - if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) - { - /* we're in epoll mode, use the epoll FD as a stand-in for - the entire event set */ - - return add_to_fd_set (daemon->epoll_fd, read_fd_set, max_fd, fd_setsize); - } -#endif - if (MHD_INVALID_SOCKET != daemon->socket_fd && - MHD_YES != add_to_fd_set (daemon->socket_fd, read_fd_set, max_fd, fd_setsize)) - return MHD_NO; - - for (pos = daemon->connections_head; NULL != pos; pos = pos->next) - { - switch (pos->event_loop_info) - { - case MHD_EVENT_LOOP_INFO_READ: - if (MHD_YES != add_to_fd_set (pos->socket_fd, read_fd_set, max_fd, fd_setsize)) - return MHD_NO; - break; - case MHD_EVENT_LOOP_INFO_WRITE: - if (MHD_YES != add_to_fd_set (pos->socket_fd, write_fd_set, max_fd, fd_setsize)) - return MHD_NO; - if (pos->read_buffer_size > pos->read_buffer_offset && - MHD_YES != add_to_fd_set (pos->socket_fd, read_fd_set, max_fd, fd_setsize)) - return MHD_NO; - break; - case MHD_EVENT_LOOP_INFO_BLOCK: - if (pos->read_buffer_size > pos->read_buffer_offset && - MHD_YES != add_to_fd_set (pos->socket_fd, read_fd_set, max_fd, fd_setsize)) - return MHD_NO; - break; - case MHD_EVENT_LOOP_INFO_CLEANUP: - /* this should never happen */ - break; - } - } -#if DEBUG_CONNECT -#if HAVE_MESSAGES - if (NULL != max_fd) - MHD_DLOG (daemon, - "Maximum socket in select set: %d\n", - *max_fd); -#endif -#endif - return MHD_YES; -} - - -/** - * Main function of the thread that handles an individual - * connection when #MHD_USE_THREAD_PER_CONNECTION is set. - * - * @param data the `struct MHD_Connection` this thread will handle - * @return always 0 - */ -static MHD_THRD_RTRN_TYPE_ MHD_THRD_CALL_SPEC_ -MHD_handle_connection (void *data) -{ - struct MHD_Connection *con = data; - int num_ready; - fd_set rs; - fd_set ws; - MHD_socket max; - struct timeval tv; - struct timeval *tvp; - unsigned int timeout; - time_t now; -#if WINDOWS - MHD_pipe spipe = con->daemon->wpipe[0]; - char tmp; -#ifdef HAVE_POLL - int extra_slot; -#endif /* HAVE_POLL */ -#define EXTRA_SLOTS 1 -#else /* !WINDOWS */ -#define EXTRA_SLOTS 0 -#endif /* !WINDOWS */ -#ifdef HAVE_POLL - struct pollfd p[1 + EXTRA_SLOTS]; -#endif - - timeout = con->daemon->connection_timeout; - while ( (MHD_YES != con->daemon->shutdown) && - (MHD_CONNECTION_CLOSED != con->state) ) - { - tvp = NULL; - if (timeout > 0) - { - now = MHD_monotonic_time(); - if (now - con->last_activity > timeout) - tv.tv_sec = 0; - else - tv.tv_sec = timeout - (now - con->last_activity); - tv.tv_usec = 0; - tvp = &tv; - } -#if HTTPS_SUPPORT - if (MHD_YES == con->tls_read_ready) - { - /* do not block (more data may be inside of TLS buffers waiting for us) */ - tv.tv_sec = 0; - tv.tv_usec = 0; - tvp = &tv; - } -#endif - if (0 == (con->daemon->options & MHD_USE_POLL)) - { - /* use select */ - int err_state = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - max = 0; - switch (con->event_loop_info) - { - case MHD_EVENT_LOOP_INFO_READ: - if (MHD_YES != - add_to_fd_set (con->socket_fd, &rs, &max, FD_SETSIZE)) - err_state = 1; - break; - case MHD_EVENT_LOOP_INFO_WRITE: - if (MHD_YES != - add_to_fd_set (con->socket_fd, &ws, &max, FD_SETSIZE)) - err_state = 1; - if ( (con->read_buffer_size > con->read_buffer_offset) && - (MHD_YES != - add_to_fd_set (con->socket_fd, &rs, &max, FD_SETSIZE)) ) - err_state = 1; - break; - case MHD_EVENT_LOOP_INFO_BLOCK: - if ( (con->read_buffer_size > con->read_buffer_offset) && - (MHD_YES != - add_to_fd_set (con->socket_fd, &rs, &max, FD_SETSIZE)) ) - err_state = 1; - tv.tv_sec = 0; - tv.tv_usec = 0; - tvp = &tv; - break; - case MHD_EVENT_LOOP_INFO_CLEANUP: - /* how did we get here!? */ - goto exit; - } -#if WINDOWS - if (MHD_INVALID_PIPE_ != spipe) - { - if (MHD_YES != - add_to_fd_set (spipe, &rs, &max, FD_SETSIZE)) - err_state = 1; - } -#endif - if (0 != err_state) - { -#if HAVE_MESSAGES - MHD_DLOG (con->daemon, - "Can't add FD to fd_set\n"); -#endif - goto exit; - } - - num_ready = MHD_SYS_select_ (max + 1, &rs, &ws, NULL, tvp); - if (num_ready < 0) - { - if (EINTR == MHD_socket_errno_) - continue; -#if HAVE_MESSAGES - MHD_DLOG (con->daemon, - "Error during select (%d): `%s'\n", - MHD_socket_errno_, - MHD_socket_last_strerr_ ()); -#endif - break; - } -#if WINDOWS - /* drain signaling pipe */ - if ( (MHD_INVALID_PIPE_ != spipe) && - (FD_ISSET (spipe, &rs)) ) - (void) MHD_pipe_read_ (spipe, &tmp, sizeof (tmp)); -#endif - /* call appropriate connection handler if necessary */ - if ( (FD_ISSET (con->socket_fd, &rs)) -#if HTTPS_SUPPORT - || (MHD_YES == con->tls_read_ready) -#endif - ) - con->read_handler (con); - if (FD_ISSET (con->socket_fd, &ws)) - con->write_handler (con); - if (MHD_NO == con->idle_handler (con)) - goto exit; - } -#ifdef HAVE_POLL - else - { - /* use poll */ - memset (&p, 0, sizeof (p)); - p[0].fd = con->socket_fd; - switch (con->event_loop_info) - { - case MHD_EVENT_LOOP_INFO_READ: - p[0].events |= POLLIN; - break; - case MHD_EVENT_LOOP_INFO_WRITE: - p[0].events |= POLLOUT; - if (con->read_buffer_size > con->read_buffer_offset) - p[0].events |= POLLIN; - break; - case MHD_EVENT_LOOP_INFO_BLOCK: - if (con->read_buffer_size > con->read_buffer_offset) - p[0].events |= POLLIN; - tv.tv_sec = 0; - tv.tv_usec = 0; - tvp = &tv; - break; - case MHD_EVENT_LOOP_INFO_CLEANUP: - /* how did we get here!? */ - goto exit; - } -#if WINDOWS - extra_slot = 0; - if (MHD_INVALID_PIPE_ != spipe) - { - p[1].events |= POLLIN; - p[1].fd = spipe; - p[1].revents = 0; - extra_slot = 1; - } -#endif - if (MHD_sys_poll_ (p, -#if WINDOWS - 1 + extra_slot, -#else - 1, -#endif - (NULL == tvp) ? -1 : tv.tv_sec * 1000) < 0) - { - if (EINTR == MHD_socket_errno_) - continue; -#if HAVE_MESSAGES - MHD_DLOG (con->daemon, - "Error during poll: `%s'\n", - MHD_socket_last_strerr_ ()); -#endif - break; - } -#if WINDOWS - /* drain signaling pipe */ - if ( (MHD_INVALID_PIPE_ != spipe) && - (0 != (p[1].revents & (POLLERR | POLLHUP))) ) - (void) MHD_pipe_read_ (spipe, &tmp, sizeof (tmp)); -#endif - if ( (0 != (p[0].revents & POLLIN)) -#if HTTPS_SUPPORT - || (MHD_YES == con->tls_read_ready) -#endif - ) - con->read_handler (con); - if (0 != (p[0].revents & POLLOUT)) - con->write_handler (con); - if (0 != (p[0].revents & (POLLERR | POLLHUP))) - MHD_connection_close (con, MHD_REQUEST_TERMINATED_WITH_ERROR); - if (MHD_NO == con->idle_handler (con)) - goto exit; - } -#endif - } - if (MHD_CONNECTION_IN_CLEANUP != con->state) - { -#if DEBUG_CLOSE -#if HAVE_MESSAGES - MHD_DLOG (con->daemon, - "Processing thread terminating, closing connection\n"); -#endif -#endif - if (MHD_CONNECTION_CLOSED != con->state) - MHD_connection_close (con, - MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN); - con->idle_handler (con); - } -exit: - if (NULL != con->response) - { - MHD_destroy_response (con->response); - con->response = NULL; - } - - if (NULL != con->daemon->notify_connection) - con->daemon->notify_connection (con->daemon->notify_connection_cls, - con, - &con->socket_context, - MHD_CONNECTION_NOTIFY_CLOSED); - - return (MHD_THRD_RTRN_TYPE_)0; -} - - -/** - * Callback for receiving data from the socket. - * - * @param connection the MHD connection structure - * @param other where to write received data to - * @param i maximum size of other (in bytes) - * @return number of bytes actually received - */ -static ssize_t -recv_param_adapter (struct MHD_Connection *connection, - void *other, - size_t i) -{ - ssize_t ret; - - if ( (MHD_INVALID_SOCKET == connection->socket_fd) || - (MHD_CONNECTION_CLOSED == connection->state) ) - { - MHD_set_socket_errno_ (ENOTCONN); - return -1; - } - ret = recv (connection->socket_fd, other, i, MSG_NOSIGNAL); -#if EPOLL_SUPPORT - if (ret < (ssize_t) i) - { - /* partial read --- no longer read-ready */ - connection->epoll_state &= ~MHD_EPOLL_STATE_READ_READY; - } -#endif - return ret; -} - - -/** - * Callback for writing data to the socket. - * - * @param connection the MHD connection structure - * @param other data to write - * @param i number of bytes to write - * @return actual number of bytes written - */ -static ssize_t -send_param_adapter (struct MHD_Connection *connection, - const void *other, - size_t i) -{ - ssize_t ret; -#if LINUX - MHD_socket fd; - off_t offset; - off_t left; -#endif - - if ( (MHD_INVALID_SOCKET == connection->socket_fd) || - (MHD_CONNECTION_CLOSED == connection->state) ) - { - MHD_set_socket_errno_ (ENOTCONN); - return -1; - } - if (0 != (connection->daemon->options & MHD_USE_SSL)) - return send (connection->socket_fd, other, i, MSG_NOSIGNAL); -#if LINUX - if ( (connection->write_buffer_append_offset == - connection->write_buffer_send_offset) && - (NULL != connection->response) && - (MHD_INVALID_SOCKET != (fd = connection->response->fd)) ) - { - /* can use sendfile */ - offset = (off_t) connection->response_write_position + connection->response->fd_off; - left = connection->response->total_size - connection->response_write_position; - if (left > SSIZE_MAX) - left = SSIZE_MAX; /* cap at return value limit */ - if (-1 != (ret = sendfile (connection->socket_fd, - fd, - &offset, - (size_t) left))) - { -#if EPOLL_SUPPORT - if (ret < left) - { - /* partial write --- no longer write-ready */ - connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY; - } -#endif - return ret; - } - const int err = MHD_socket_errno_; - if ( (EINTR == err) || (EAGAIN == err) || (EWOULDBLOCK == err) ) - return 0; - if ( (EINVAL == err) || (EBADF == err) ) - return -1; - /* None of the 'usual' sendfile errors occurred, so we should try - to fall back to 'SEND'; see also this thread for info on - odd libc/Linux behavior with sendfile: - http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html */ - } -#endif - ret = send (connection->socket_fd, other, i, MSG_NOSIGNAL); -#if EPOLL_SUPPORT - if (ret < (ssize_t) i) - { - /* partial write --- no longer write-ready */ - connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY; - } -#endif - /* Handle broken kernel / libc, returning -1 but not setting errno; - kill connection as that should be safe; reported on mailinglist here: - http://lists.gnu.org/archive/html/libmicrohttpd/2014-10/msg00023.html */ - if ( (-1 == ret) && (0 == errno) ) - errno = ECONNRESET; - return ret; -} - - -/** - * Signature of main function for a thread. - * - * @param cls closure argument for the function - * @return termination code from the thread - */ -typedef MHD_THRD_RTRN_TYPE_ (MHD_THRD_CALL_SPEC_ *ThreadStartRoutine)(void *cls); - - -/** - * Create a thread and set the attributes according to our options. - * - * @param thread handle to initialize - * @param daemon daemon with options - * @param start_routine main function of thread - * @param arg argument for start_routine - * @return 0 on success - */ -static int -create_thread (MHD_thread_handle_ *thread, - const struct MHD_Daemon *daemon, - ThreadStartRoutine start_routine, - void *arg) -{ -#if defined(MHD_USE_POSIX_THREADS) - pthread_attr_t attr; - pthread_attr_t *pattr; - int ret; - - if (0 != daemon->thread_stack_size) - { - if (0 != (ret = pthread_attr_init (&attr))) - goto ERR; - if (0 != (ret = pthread_attr_setstacksize (&attr, daemon->thread_stack_size))) - { - pthread_attr_destroy (&attr); - goto ERR; - } - pattr = &attr; - } - else - { - pattr = NULL; - } - ret = pthread_create (thread, pattr, - start_routine, arg); -#ifdef HAVE_PTHREAD_SETNAME_NP - (void) pthread_setname_np (*thread, "libmicrohttpd"); -#endif /* HAVE_PTHREAD_SETNAME_NP */ - if (0 != daemon->thread_stack_size) - pthread_attr_destroy (&attr); - return ret; - ERR: -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to set thread stack size\n"); -#endif - errno = EINVAL; - return ret; -#elif defined(MHD_USE_W32_THREADS) - unsigned threadID; - *thread = (HANDLE)_beginthreadex(NULL, (unsigned)daemon->thread_stack_size, start_routine, - arg, 0, &threadID); - if (NULL == (*thread)) - return errno; - - W32_SetThreadName(threadID, "libmicrohttpd"); - - return 0; -#endif -} - - -/** - * Add another client connection to the set of connections - * managed by MHD. This API is usually not needed (since - * MHD will accept inbound connections on the server socket). - * Use this API in special cases, for example if your HTTP - * server is behind NAT and needs to connect out to the - * HTTP client. - * - * The given client socket will be managed (and closed!) by MHD after - * this call and must no longer be used directly by the application - * afterwards. - * - * Per-IP connection limits are ignored when using this API. - * - * @param daemon daemon that manages the connection - * @param client_socket socket to manage (MHD will expect - * to receive an HTTP request from this socket next). - * @param addr IP address of the client - * @param addrlen number of bytes in @a addr - * @param external_add perform additional operations needed due - * to the application calling us directly - * @return #MHD_YES on success, #MHD_NO if this daemon could - * not handle the connection (i.e. malloc failed, etc). - * The socket will be closed in any case; 'errno' is - * set to indicate further details about the error. - */ -static int -internal_add_connection (struct MHD_Daemon *daemon, - MHD_socket client_socket, - const struct sockaddr *addr, - socklen_t addrlen, - int external_add) -{ - struct MHD_Connection *connection; - int res_thread_create; - unsigned int i; - int eno; - struct MHD_Daemon *worker; -#if OSX - static int on = 1; -#endif - - if (NULL != daemon->worker_pool) - { - /* have a pool, try to find a pool with capacity; we use the - socket as the initial offset into the pool for load - balancing */ - for (i=0;iworker_pool_size;i++) - { - worker = &daemon->worker_pool[(i + client_socket) % daemon->worker_pool_size]; - if (worker->connections < worker->connection_limit) - return internal_add_connection (worker, - client_socket, - addr, addrlen, - external_add); - } - /* all pools are at their connection limit, must refuse */ - if (0 != MHD_socket_close_ (client_socket)) - MHD_PANIC ("close failed\n"); -#if ENFILE - errno = ENFILE; -#endif - return MHD_NO; - } - -#ifndef WINDOWS - if ( (client_socket >= FD_SETSIZE) && - (0 == (daemon->options & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Socket descriptor larger than FD_SETSIZE: %d > %d\n", - client_socket, - FD_SETSIZE); -#endif - if (0 != MHD_socket_close_ (client_socket)) - MHD_PANIC ("close failed\n"); -#if EINVAL - errno = EINVAL; -#endif - return MHD_NO; - } -#endif - - -#if HAVE_MESSAGES -#if DEBUG_CONNECT - MHD_DLOG (daemon, - "Accepted connection on socket %d\n", - client_socket); -#endif -#endif - if ( (daemon->connections == daemon->connection_limit) || - (MHD_NO == MHD_ip_limit_add (daemon, addr, addrlen)) ) - { - /* above connection limit - reject */ -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Server reached connection limit (closing inbound connection)\n"); -#endif - if (0 != MHD_socket_close_ (client_socket)) - MHD_PANIC ("close failed\n"); -#if ENFILE - errno = ENFILE; -#endif - return MHD_NO; - } - - /* apply connection acceptance policy if present */ - if ( (NULL != daemon->apc) && - (MHD_NO == daemon->apc (daemon->apc_cls, - addr, addrlen)) ) - { -#if DEBUG_CLOSE -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Connection rejected, closing connection\n"); -#endif -#endif - if (0 != MHD_socket_close_ (client_socket)) - MHD_PANIC ("close failed\n"); - MHD_ip_limit_del (daemon, addr, addrlen); -#if EACCESS - errno = EACCESS; -#endif - return MHD_NO; - } - -#if OSX -#ifdef SOL_SOCKET -#ifdef SO_NOSIGPIPE - setsockopt (client_socket, - SOL_SOCKET, SO_NOSIGPIPE, - &on, sizeof (on)); -#endif -#endif -#endif - - if (NULL == (connection = malloc (sizeof (struct MHD_Connection)))) - { - eno = errno; -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Error allocating memory: %s\n", - MHD_strerror_ (errno)); -#endif - if (0 != MHD_socket_close_ (client_socket)) - MHD_PANIC ("close failed\n"); - MHD_ip_limit_del (daemon, addr, addrlen); - errno = eno; - return MHD_NO; - } - memset (connection, - 0, - sizeof (struct MHD_Connection)); - connection->pool = MHD_pool_create (daemon->pool_size); - if (NULL == connection->pool) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Error allocating memory: %s\n", - MHD_strerror_ (errno)); -#endif - if (0 != MHD_socket_close_ (client_socket)) - MHD_PANIC ("close failed\n"); - MHD_ip_limit_del (daemon, addr, addrlen); - free (connection); -#if ENOMEM - errno = ENOMEM; -#endif - return MHD_NO; - } - - connection->connection_timeout = daemon->connection_timeout; - if (NULL == (connection->addr = malloc (addrlen))) - { - eno = errno; -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Error allocating memory: %s\n", - MHD_strerror_ (errno)); -#endif - if (0 != MHD_socket_close_ (client_socket)) - MHD_PANIC ("close failed\n"); - MHD_ip_limit_del (daemon, addr, addrlen); - MHD_pool_destroy (connection->pool); - free (connection); - errno = eno; - return MHD_NO; - } - memcpy (connection->addr, addr, addrlen); - connection->addr_len = addrlen; - connection->socket_fd = client_socket; - connection->daemon = daemon; - connection->last_activity = MHD_monotonic_time(); - - /* set default connection handlers */ - MHD_set_http_callbacks_ (connection); - connection->recv_cls = &recv_param_adapter; - connection->send_cls = &send_param_adapter; - - if (0 == (connection->daemon->options & MHD_USE_EPOLL_TURBO)) - { - /* non-blocking sockets are required on most systems and for GNUtls; - however, they somehow cause serious problems on CYGWIN (#1824); - in turbo mode, we assume that non-blocking was already set - by 'accept4' or whoever calls 'MHD_add_connection' */ -#ifdef CYGWIN - if (0 != (daemon->options & MHD_USE_SSL)) -#endif - { - /* make socket non-blocking */ -#if !defined(WINDOWS) || defined(CYGWIN) - int flags = fcntl (connection->socket_fd, F_GETFL); - if ( (-1 == flags) || - (0 != fcntl (connection->socket_fd, F_SETFL, flags | O_NONBLOCK)) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to make socket non-blocking: %s\n", - MHD_socket_last_strerr_ ()); -#endif - } -#else - unsigned long flags = 1; - if (0 != ioctlsocket (connection->socket_fd, FIONBIO, &flags)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to make socket non-blocking: %s\n", - MHD_socket_last_strerr_ ()); -#endif - } -#endif - } - } - -#if HTTPS_SUPPORT - if (0 != (daemon->options & MHD_USE_SSL)) - { - connection->recv_cls = &recv_tls_adapter; - connection->send_cls = &send_tls_adapter; - connection->state = MHD_TLS_CONNECTION_INIT; - MHD_set_https_callbacks (connection); - gnutls_init (&connection->tls_session, GNUTLS_SERVER); - gnutls_priority_set (connection->tls_session, - daemon->priority_cache); - switch (daemon->cred_type) - { - /* set needed credentials for certificate authentication. */ - case GNUTLS_CRD_CERTIFICATE: - gnutls_credentials_set (connection->tls_session, - GNUTLS_CRD_CERTIFICATE, - daemon->x509_cred); - break; - default: -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Failed to setup TLS credentials: unknown credential type %d\n", - daemon->cred_type); -#endif - if (0 != MHD_socket_close_ (client_socket)) - MHD_PANIC ("close failed\n"); - MHD_ip_limit_del (daemon, addr, addrlen); - free (connection->addr); - free (connection); - MHD_PANIC ("Unknown credential type"); -#if EINVAL - errno = EINVAL; -#endif - return MHD_NO; - } - gnutls_transport_set_ptr (connection->tls_session, - (gnutls_transport_ptr_t) connection); - gnutls_transport_set_pull_function (connection->tls_session, - (gnutls_pull_func) &recv_param_adapter); - gnutls_transport_set_push_function (connection->tls_session, - (gnutls_push_func) &send_param_adapter); - - if (daemon->https_mem_trust) - gnutls_certificate_server_set_request (connection->tls_session, - GNUTLS_CERT_REQUEST); - } -#endif - - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to acquire cleanup mutex\n"); - XDLL_insert (daemon->normal_timeout_head, - daemon->normal_timeout_tail, - connection); - DLL_insert (daemon->connections_head, - daemon->connections_tail, - connection); - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_unlock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to release cleanup mutex\n"); - - if (NULL != daemon->notify_connection) - daemon->notify_connection (daemon->notify_connection_cls, - connection, - &connection->socket_context, - MHD_CONNECTION_NOTIFY_STARTED); - - /* attempt to create handler thread */ - if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) - { - res_thread_create = create_thread (&connection->pid, - daemon, - &MHD_handle_connection, - connection); - if (0 != res_thread_create) - { - eno = errno; -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to create a thread: %s\n", - MHD_strerror_ (res_thread_create)); -#endif - goto cleanup; - } - } - else - if ( (MHD_YES == external_add) && - (MHD_INVALID_PIPE_ != daemon->wpipe[1]) && - (1 != MHD_pipe_write_ (daemon->wpipe[1], "n", 1)) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "failed to signal new connection via pipe"); -#endif - } -#if EPOLL_SUPPORT - if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) - { - if (0 == (daemon->options & MHD_USE_EPOLL_TURBO)) - { - struct epoll_event event; - - event.events = EPOLLIN | EPOLLOUT | EPOLLET; - event.data.ptr = connection; - if (0 != epoll_ctl (daemon->epoll_fd, - EPOLL_CTL_ADD, - client_socket, - &event)) - { - eno = errno; -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Call to epoll_ctl failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - goto cleanup; - } - connection->epoll_state |= MHD_EPOLL_STATE_IN_EPOLL_SET; - } - else - { - connection->epoll_state |= MHD_EPOLL_STATE_READ_READY | MHD_EPOLL_STATE_WRITE_READY - | MHD_EPOLL_STATE_IN_EREADY_EDLL; - EDLL_insert (daemon->eready_head, - daemon->eready_tail, - connection); - } - } -#endif - daemon->connections++; - return MHD_YES; - cleanup: - if (NULL != daemon->notify_connection) - daemon->notify_connection (daemon->notify_connection_cls, - connection, - &connection->socket_context, - MHD_CONNECTION_NOTIFY_CLOSED); - if (0 != MHD_socket_close_ (client_socket)) - MHD_PANIC ("close failed\n"); - MHD_ip_limit_del (daemon, addr, addrlen); - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to acquire cleanup mutex\n"); - DLL_remove (daemon->connections_head, - daemon->connections_tail, - connection); - XDLL_remove (daemon->normal_timeout_head, - daemon->normal_timeout_tail, - connection); - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_unlock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to release cleanup mutex\n"); - MHD_pool_destroy (connection->pool); - free (connection->addr); - free (connection); -#if EINVAL - errno = eno; -#endif - return MHD_NO; -} - - -/** - * Suspend handling of network data for a given connection. This can - * be used to dequeue a connection from MHD's event loop (external - * select, internal select or thread pool; not applicable to - * thread-per-connection!) for a while. - * - * If you use this API in conjunction with a internal select or a - * thread pool, you must set the option #MHD_USE_PIPE_FOR_SHUTDOWN to - * ensure that a resumed connection is immediately processed by MHD. - * - * Suspended connections continue to count against the total number of - * connections allowed (per daemon, as well as per IP, if such limits - * are set). Suspended connections will NOT time out; timeouts will - * restart when the connection handling is resumed. While a - * connection is suspended, MHD will not detect disconnects by the - * client. - * - * The only safe time to suspend a connection is from the - * #MHD_AccessHandlerCallback. - * - * Finally, it is an API violation to call #MHD_stop_daemon while - * having suspended connections (this will at least create memory and - * socket leaks or lead to undefined behavior). You must explicitly - * resume all connections before stopping the daemon. - * - * @param connection the connection to suspend - */ -void -MHD_suspend_connection (struct MHD_Connection *connection) -{ - struct MHD_Daemon *daemon; - - daemon = connection->daemon; - if (MHD_USE_SUSPEND_RESUME != (daemon->options & MHD_USE_SUSPEND_RESUME)) - MHD_PANIC ("Cannot suspend connections without enabling MHD_USE_SUSPEND_RESUME!\n"); - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to acquire cleanup mutex\n"); - DLL_remove (daemon->connections_head, - daemon->connections_tail, - connection); - DLL_insert (daemon->suspended_connections_head, - daemon->suspended_connections_tail, - connection); - if (connection->connection_timeout == daemon->connection_timeout) - XDLL_remove (daemon->normal_timeout_head, - daemon->normal_timeout_tail, - connection); - else - XDLL_remove (daemon->manual_timeout_head, - daemon->manual_timeout_tail, - connection); -#if EPOLL_SUPPORT - if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) - { - if (0 != (connection->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL)) - { - EDLL_remove (daemon->eready_head, - daemon->eready_tail, - connection); - connection->epoll_state &= ~MHD_EPOLL_STATE_IN_EREADY_EDLL; - } - if (0 != (connection->epoll_state & MHD_EPOLL_STATE_IN_EPOLL_SET)) - { - if (0 != epoll_ctl (daemon->epoll_fd, - EPOLL_CTL_DEL, - connection->socket_fd, - NULL)) - MHD_PANIC ("Failed to remove FD from epoll set\n"); - connection->epoll_state &= ~MHD_EPOLL_STATE_IN_EPOLL_SET; - } - connection->epoll_state |= MHD_EPOLL_STATE_SUSPENDED; - } -#endif - connection->suspended = MHD_YES; - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_unlock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to release cleanup mutex\n"); -} - - -/** - * Resume handling of network data for suspended connection. It is - * safe to resume a suspended connection at any time. Calling this function - * on a connection that was not previously suspended will result - * in undefined behavior. - * - * @param connection the connection to resume - */ -void -MHD_resume_connection (struct MHD_Connection *connection) -{ - struct MHD_Daemon *daemon; - - daemon = connection->daemon; - if (MHD_USE_SUSPEND_RESUME != (daemon->options & MHD_USE_SUSPEND_RESUME)) - MHD_PANIC ("Cannot resume connections without enabling MHD_USE_SUSPEND_RESUME!\n"); - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to acquire cleanup mutex\n"); - connection->resuming = MHD_YES; - daemon->resuming = MHD_YES; - if ( (MHD_INVALID_PIPE_ != daemon->wpipe[1]) && - (1 != MHD_pipe_write_ (daemon->wpipe[1], "r", 1)) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "failed to signal resume via pipe"); -#endif - } - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_unlock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to release cleanup mutex\n"); -} - - -/** - * Run through the suspended connections and move any that are no - * longer suspended back to the active state. - * - * @param daemon daemon context - * @return #MHD_YES if a connection was actually resumed - */ -static int -resume_suspended_connections (struct MHD_Daemon *daemon) -{ - struct MHD_Connection *pos; - struct MHD_Connection *next = NULL; - int ret; - - ret = MHD_NO; - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to acquire cleanup mutex\n"); - if (MHD_YES == daemon->resuming) - next = daemon->suspended_connections_head; - - while (NULL != (pos = next)) - { - next = pos->next; - if (MHD_NO == pos->resuming) - continue; - ret = MHD_YES; - DLL_remove (daemon->suspended_connections_head, - daemon->suspended_connections_tail, - pos); - DLL_insert (daemon->connections_head, - daemon->connections_tail, - pos); - if (pos->connection_timeout == daemon->connection_timeout) - XDLL_insert (daemon->normal_timeout_head, - daemon->normal_timeout_tail, - pos); - else - XDLL_insert (daemon->manual_timeout_head, - daemon->manual_timeout_tail, - pos); -#if EPOLL_SUPPORT - if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) - { - if (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL)) - MHD_PANIC ("Resumed connection was already in EREADY set\n"); - /* we always mark resumed connections as ready, as we - might have missed the edge poll event during suspension */ - EDLL_insert (daemon->eready_head, - daemon->eready_tail, - pos); - pos->epoll_state |= MHD_EPOLL_STATE_IN_EREADY_EDLL; - pos->epoll_state &= ~MHD_EPOLL_STATE_SUSPENDED; - } -#endif - pos->suspended = MHD_NO; - pos->resuming = MHD_NO; - } - daemon->resuming = MHD_NO; - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_unlock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to release cleanup mutex\n"); - return ret; -} - - -/** - * Change socket options to be non-blocking, non-inheritable. - * - * @param daemon daemon context - * @param sock socket to manipulate - */ -static void -make_nonblocking_noninheritable (struct MHD_Daemon *daemon, - MHD_socket sock) -{ -#ifdef WINDOWS - DWORD dwFlags; - unsigned long flags = 1; - - if (0 != ioctlsocket (sock, FIONBIO, &flags)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to make socket non-blocking: %s\n", - MHD_socket_last_strerr_ ()); -#endif - } - if (!GetHandleInformation ((HANDLE) sock, &dwFlags) || - ((dwFlags != (dwFlags & ~HANDLE_FLAG_INHERIT)) && - !SetHandleInformation ((HANDLE) sock, HANDLE_FLAG_INHERIT, 0))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to make socket non-inheritable: %u\n", - (unsigned int) GetLastError ()); -#endif - } -#else - int flags; - int nonblock; - - nonblock = O_NONBLOCK; -#ifdef CYGWIN - if (0 == (daemon->options & MHD_USE_SSL)) - nonblock = 0; -#endif - flags = fcntl (sock, F_GETFD); - if ( ( (-1 == flags) || - ( (flags != (flags | FD_CLOEXEC)) && - (0 != fcntl (sock, F_SETFD, flags | nonblock | FD_CLOEXEC)) ) ) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to make socket non-inheritable: %s\n", - MHD_socket_last_strerr_ ()); -#endif - } -#endif -} - - -/** - * Add another client connection to the set of connections managed by - * MHD. This API is usually not needed (since MHD will accept inbound - * connections on the server socket). Use this API in special cases, - * for example if your HTTP server is behind NAT and needs to connect - * out to the HTTP client, or if you are building a proxy. - * - * If you use this API in conjunction with a internal select or a - * thread pool, you must set the option - * #MHD_USE_PIPE_FOR_SHUTDOWN to ensure that the freshly added - * connection is immediately processed by MHD. - * - * The given client socket will be managed (and closed!) by MHD after - * this call and must no longer be used directly by the application - * afterwards. - * - * Per-IP connection limits are ignored when using this API. - * - * @param daemon daemon that manages the connection - * @param client_socket socket to manage (MHD will expect - * to receive an HTTP request from this socket next). - * @param addr IP address of the client - * @param addrlen number of bytes in @a addr - * @return #MHD_YES on success, #MHD_NO if this daemon could - * not handle the connection (i.e. malloc() failed, etc). - * The socket will be closed in any case; `errno` is - * set to indicate further details about the error. - * @ingroup specialized - */ -int -MHD_add_connection (struct MHD_Daemon *daemon, - MHD_socket client_socket, - const struct sockaddr *addr, - socklen_t addrlen) -{ - make_nonblocking_noninheritable (daemon, - client_socket); - return internal_add_connection (daemon, - client_socket, - addr, addrlen, - MHD_YES); -} - - -/** - * Accept an incoming connection and create the MHD_Connection object for - * it. This function also enforces policy by way of checking with the - * accept policy callback. - * - * @param daemon handle with the listen socket - * @return #MHD_YES on success (connections denied by policy or due - * to 'out of memory' and similar errors) are still considered - * successful as far as #MHD_accept_connection() is concerned); - * a return code of #MHD_NO only refers to the actual - * accept() system call. - */ -static int -MHD_accept_connection (struct MHD_Daemon *daemon) -{ -#if HAVE_INET6 - struct sockaddr_in6 addrstorage; -#else - struct sockaddr_in addrstorage; -#endif - struct sockaddr *addr = (struct sockaddr *) &addrstorage; - socklen_t addrlen; - MHD_socket s; - MHD_socket fd; - int nonblock; - - addrlen = sizeof (addrstorage); - memset (addr, 0, sizeof (addrstorage)); - if (MHD_INVALID_SOCKET == (fd = daemon->socket_fd)) - return MHD_NO; -#ifdef HAVE_SOCK_NONBLOCK - nonblock = SOCK_NONBLOCK; -#else - nonblock = 0; -#endif -#ifdef CYGWIN - if (0 == (daemon->options & MHD_USE_SSL)) - nonblock = 0; -#endif -#if HAVE_ACCEPT4 - s = accept4 (fd, addr, &addrlen, SOCK_CLOEXEC | nonblock); -#else - s = accept (fd, addr, &addrlen); -#endif - if ((MHD_INVALID_SOCKET == s) || (addrlen <= 0)) - { -#if HAVE_MESSAGES - const int err = MHD_socket_errno_; - /* This could be a common occurance with multiple worker threads */ - if ( (EINVAL == err) && - (MHD_INVALID_SOCKET == daemon->socket_fd) ) - return MHD_NO; /* can happen during shutdown */ - if ((EAGAIN != err) && (EWOULDBLOCK != err)) - MHD_DLOG (daemon, - "Error accepting connection: %s\n", - MHD_socket_last_strerr_ ()); -#endif - if (MHD_INVALID_SOCKET != s) - { - if (0 != MHD_socket_close_ (s)) - MHD_PANIC ("close failed\n"); - /* just in case */ - } - return MHD_NO; - } -#if !defined(HAVE_ACCEPT4) || HAVE_ACCEPT4+0 == 0 || !defined(HAVE_SOCK_NONBLOCK) || SOCK_CLOEXEC+0 == 0 - make_nonblocking_noninheritable (daemon, s); -#endif -#if HAVE_MESSAGES -#if DEBUG_CONNECT - MHD_DLOG (daemon, - "Accepted connection on socket %d\n", - s); -#endif -#endif - (void) internal_add_connection (daemon, s, - addr, addrlen, - MHD_NO); - return MHD_YES; -} - - -/** - * Free resources associated with all closed connections. - * (destroy responses, free buffers, etc.). All closed - * connections are kept in the "cleanup" doubly-linked list. - * - * @param daemon daemon to clean up - */ -static void -MHD_cleanup_connections (struct MHD_Daemon *daemon) -{ - struct MHD_Connection *pos; - - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to acquire cleanup mutex\n"); - while (NULL != (pos = daemon->cleanup_head)) - { - DLL_remove (daemon->cleanup_head, - daemon->cleanup_tail, - pos); - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_NO == pos->thread_joined) ) - { - if (0 != MHD_join_thread_ (pos->pid)) - { - MHD_PANIC ("Failed to join a thread\n"); - } - } - MHD_pool_destroy (pos->pool); -#if HTTPS_SUPPORT - if (NULL != pos->tls_session) - gnutls_deinit (pos->tls_session); -#endif - if (NULL != daemon->notify_connection) - daemon->notify_connection (daemon->notify_connection_cls, - pos, - &pos->socket_context, - MHD_CONNECTION_NOTIFY_CLOSED); - MHD_ip_limit_del (daemon, pos->addr, pos->addr_len); -#if EPOLL_SUPPORT - if (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL)) - { - EDLL_remove (daemon->eready_head, - daemon->eready_tail, - pos); - pos->epoll_state &= ~MHD_EPOLL_STATE_IN_EREADY_EDLL; - } - if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) && - (MHD_INVALID_SOCKET != daemon->epoll_fd) && - (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EPOLL_SET)) ) - { - /* epoll documentation suggests that closing a FD - automatically removes it from the epoll set; however, - this is not true as if we fail to do manually remove it, - we are still seeing an event for this fd in epoll, - causing grief (use-after-free...) --- at least on my - system. */ - if (0 != epoll_ctl (daemon->epoll_fd, - EPOLL_CTL_DEL, - pos->socket_fd, - NULL)) - MHD_PANIC ("Failed to remove FD from epoll set\n"); - pos->epoll_state &= ~MHD_EPOLL_STATE_IN_EPOLL_SET; - } -#endif - if (NULL != pos->response) - { - MHD_destroy_response (pos->response); - pos->response = NULL; - } - if (MHD_INVALID_SOCKET != pos->socket_fd) - { -#ifdef WINDOWS - shutdown (pos->socket_fd, SHUT_WR); -#endif - if (0 != MHD_socket_close_ (pos->socket_fd)) - MHD_PANIC ("close failed\n"); - } - if (NULL != pos->addr) - free (pos->addr); - free (pos); - daemon->connections--; - } - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_unlock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to release cleanup mutex\n"); -} - - -/** - * Obtain timeout value for `select()` for this daemon (only needed if - * connection timeout is used). The returned value is how long - * `select()` or `poll()` should at most block, not the timeout value set - * for connections. This function MUST NOT be called if MHD is - * running with #MHD_USE_THREAD_PER_CONNECTION. - * - * @param daemon daemon to query for timeout - * @param timeout set to the timeout (in milliseconds) - * @return #MHD_YES on success, #MHD_NO if timeouts are - * not used (or no connections exist that would - * necessiate the use of a timeout right now). - * @ingroup event - */ -int -MHD_get_timeout (struct MHD_Daemon *daemon, - MHD_UNSIGNED_LONG_LONG *timeout) -{ - time_t earliest_deadline; - time_t now; - struct MHD_Connection *pos; - int have_timeout; - - if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Illegal call to MHD_get_timeout\n"); -#endif - return MHD_NO; - } - -#if HTTPS_SUPPORT - if (0 != daemon->num_tls_read_ready) - { - /* if there is any TLS connection with data ready for - reading, we must not block in the event loop */ - *timeout = 0; - return MHD_YES; - } -#endif - - have_timeout = MHD_NO; - earliest_deadline = 0; /* avoid compiler warnings */ - for (pos = daemon->manual_timeout_head; NULL != pos; pos = pos->nextX) - { - if (0 != pos->connection_timeout) - { - if ( (! have_timeout) || - (earliest_deadline > pos->last_activity + pos->connection_timeout) ) - earliest_deadline = pos->last_activity + pos->connection_timeout; -#if HTTPS_SUPPORT - if ( (0 != (daemon->options & MHD_USE_SSL)) && - (0 != gnutls_record_check_pending (pos->tls_session)) ) - earliest_deadline = 0; -#endif - have_timeout = MHD_YES; - } - } - /* normal timeouts are sorted, so we only need to look at the 'head' */ - pos = daemon->normal_timeout_head; - if ( (NULL != pos) && - (0 != pos->connection_timeout) ) - { - if ( (! have_timeout) || - (earliest_deadline > pos->last_activity + pos->connection_timeout) ) - earliest_deadline = pos->last_activity + pos->connection_timeout; -#if HTTPS_SUPPORT - if ( (0 != (daemon->options & MHD_USE_SSL)) && - (0 != gnutls_record_check_pending (pos->tls_session)) ) - earliest_deadline = 0; -#endif - have_timeout = MHD_YES; - } - - if (MHD_NO == have_timeout) - return MHD_NO; - now = MHD_monotonic_time(); - if (earliest_deadline < now) - *timeout = 0; - else - *timeout = 1000 * (1 + earliest_deadline - now); - return MHD_YES; -} - - -/** - * Run webserver operations. This method should be called by clients - * in combination with #MHD_get_fdset if the client-controlled select - * method is used. - * - * You can use this function instead of #MHD_run if you called - * `select()` on the result from #MHD_get_fdset. File descriptors in - * the sets that are not controlled by MHD will be ignored. Calling - * this function instead of #MHD_run is more efficient as MHD will - * not have to call `select()` again to determine which operations are - * ready. - * - * @param daemon daemon to run select loop for - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set (not used, can be NULL) - * @return #MHD_NO on serious errors, #MHD_YES on success - * @ingroup event - */ -int -MHD_run_from_select (struct MHD_Daemon *daemon, - const fd_set *read_fd_set, - const fd_set *write_fd_set, - const fd_set *except_fd_set) -{ - MHD_socket ds; - char tmp; - struct MHD_Connection *pos; - struct MHD_Connection *next; - -#if EPOLL_SUPPORT - if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) - { - /* we're in epoll mode, the epoll FD stands for - the entire event set! */ - if (daemon->epoll_fd >= FD_SETSIZE) - return MHD_NO; /* poll fd too big, fail hard */ - if (FD_ISSET (daemon->epoll_fd, read_fd_set)) - return MHD_run (daemon); - return MHD_YES; - } -#endif - - /* select connection thread handling type */ - if ( (MHD_INVALID_SOCKET != (ds = daemon->socket_fd)) && - (FD_ISSET (ds, read_fd_set)) ) - (void) MHD_accept_connection (daemon); - /* drain signaling pipe to avoid spinning select */ - if ( (MHD_INVALID_PIPE_ != daemon->wpipe[0]) && - (FD_ISSET (daemon->wpipe[0], read_fd_set)) ) - (void) MHD_pipe_read_ (daemon->wpipe[0], &tmp, sizeof (tmp)); - - if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) - { - /* do not have a thread per connection, process all connections now */ - next = daemon->connections_head; - while (NULL != (pos = next)) - { - next = pos->next; - ds = pos->socket_fd; - if (MHD_INVALID_SOCKET == ds) - continue; - switch (pos->event_loop_info) - { - case MHD_EVENT_LOOP_INFO_READ: - if ( (FD_ISSET (ds, read_fd_set)) -#if HTTPS_SUPPORT - || (MHD_YES == pos->tls_read_ready) -#endif - ) - pos->read_handler (pos); - break; - case MHD_EVENT_LOOP_INFO_WRITE: - if ( (FD_ISSET (ds, read_fd_set)) && - (pos->read_buffer_size > pos->read_buffer_offset) ) - pos->read_handler (pos); - if (FD_ISSET (ds, write_fd_set)) - pos->write_handler (pos); - break; - case MHD_EVENT_LOOP_INFO_BLOCK: - if ( (FD_ISSET (ds, read_fd_set)) && - (pos->read_buffer_size > pos->read_buffer_offset) ) - pos->read_handler (pos); - break; - case MHD_EVENT_LOOP_INFO_CLEANUP: - /* should never happen */ - break; - } - pos->idle_handler (pos); - } - } - MHD_cleanup_connections (daemon); - return MHD_YES; -} - - -/** - * Main internal select() call. Will compute select sets, call select() - * and then #MHD_run_from_select with the result. - * - * @param daemon daemon to run select() loop for - * @param may_block #MHD_YES if blocking, #MHD_NO if non-blocking - * @return #MHD_NO on serious errors, #MHD_YES on success - */ -static int -MHD_select (struct MHD_Daemon *daemon, - int may_block) -{ - int num_ready; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - struct timeval timeout; - struct timeval *tv; - MHD_UNSIGNED_LONG_LONG ltimeout; - - timeout.tv_sec = 0; - timeout.tv_usec = 0; - if (MHD_YES == daemon->shutdown) - return MHD_NO; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - max = MHD_INVALID_SOCKET; - if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) - { - if ( (MHD_USE_SUSPEND_RESUME == (daemon->options & MHD_USE_SUSPEND_RESUME)) && - (MHD_YES == resume_suspended_connections (daemon)) ) - may_block = MHD_NO; - - /* single-threaded, go over everything */ - if (MHD_NO == MHD_get_fdset2 (daemon, &rs, &ws, &es, &max, FD_SETSIZE)) - return MHD_NO; - - /* If we're at the connection limit, no need to - accept new connections; however, make sure - we do not miss the shutdown, so only do this - optimization if we have a shutdown signaling - pipe. */ - if ( (MHD_INVALID_SOCKET != daemon->socket_fd) && - (daemon->connections == daemon->connection_limit) && - (0 != (daemon->options & MHD_USE_PIPE_FOR_SHUTDOWN)) ) - FD_CLR (daemon->socket_fd, &rs); - } - else - { - /* accept only, have one thread per connection */ - if ( (MHD_INVALID_SOCKET != daemon->socket_fd) && - (MHD_YES != add_to_fd_set (daemon->socket_fd, - &rs, - &max, - FD_SETSIZE)) ) - return MHD_NO; - } - if ( (MHD_INVALID_PIPE_ != daemon->wpipe[0]) && - (MHD_YES != add_to_fd_set (daemon->wpipe[0], - &rs, - &max, - FD_SETSIZE)) ) - return MHD_NO; - - tv = NULL; - if (MHD_NO == may_block) - { - timeout.tv_usec = 0; - timeout.tv_sec = 0; - tv = &timeout; - } - else if ( (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES == MHD_get_timeout (daemon, <imeout)) ) - { - /* ltimeout is in ms */ - timeout.tv_usec = (ltimeout % 1000) * 1000; - timeout.tv_sec = ltimeout / 1000; - tv = &timeout; - } - if (MHD_INVALID_SOCKET == max) - return MHD_YES; - num_ready = MHD_SYS_select_ (max + 1, &rs, &ws, &es, tv); - if (MHD_YES == daemon->shutdown) - return MHD_NO; - if (num_ready < 0) - { - if (EINTR == MHD_socket_errno_) - return MHD_YES; -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "select failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - return MHD_NO; - } - return MHD_run_from_select (daemon, &rs, &ws, &es); -} - - -#ifdef HAVE_POLL -/** - * Process all of our connections and possibly the server - * socket using poll(). - * - * @param daemon daemon to run poll loop for - * @param may_block #MHD_YES if blocking, #MHD_NO if non-blocking - * @return #MHD_NO on serious errors, #MHD_YES on success - */ -static int -MHD_poll_all (struct MHD_Daemon *daemon, - int may_block) -{ - unsigned int num_connections; - struct MHD_Connection *pos; - struct MHD_Connection *next; - - if ( (MHD_USE_SUSPEND_RESUME == (daemon->options & MHD_USE_SUSPEND_RESUME)) && - (MHD_YES == resume_suspended_connections (daemon)) ) - may_block = MHD_NO; - - /* count number of connections and thus determine poll set size */ - num_connections = 0; - for (pos = daemon->connections_head; NULL != pos; pos = pos->next) - num_connections++; - { - MHD_UNSIGNED_LONG_LONG ltimeout; - unsigned int i; - int timeout; - unsigned int poll_server; - int poll_listen; - int poll_pipe; - char tmp; - struct pollfd *p; - - p = malloc(sizeof (struct pollfd) * (2 + num_connections)); - if (NULL == p) - { -#if HAVE_MESSAGES - MHD_DLOG(daemon, - "Error allocating memory: %s\n", - MHD_strerror_(errno)); -#endif - return MHD_NO; - } - memset (p, 0, sizeof (struct pollfd) * (2 + num_connections)); - poll_server = 0; - poll_listen = -1; - if ( (MHD_INVALID_SOCKET != daemon->socket_fd) && - (daemon->connections < daemon->connection_limit) ) - { - /* only listen if we are not at the connection limit */ - p[poll_server].fd = daemon->socket_fd; - p[poll_server].events = POLLIN; - p[poll_server].revents = 0; - poll_listen = (int) poll_server; - poll_server++; - } - poll_pipe = -1; - if (MHD_INVALID_PIPE_ != daemon->wpipe[0]) - { - p[poll_server].fd = daemon->wpipe[0]; - p[poll_server].events = POLLIN; - p[poll_server].revents = 0; - poll_pipe = (int) poll_server; - poll_server++; - } - if (may_block == MHD_NO) - timeout = 0; - else if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || - (MHD_YES != MHD_get_timeout (daemon, <imeout)) ) - timeout = -1; - else - timeout = (ltimeout > INT_MAX) ? INT_MAX : (int) ltimeout; - - i = 0; - for (pos = daemon->connections_head; NULL != pos; pos = pos->next) - { - p[poll_server+i].fd = pos->socket_fd; - switch (pos->event_loop_info) - { - case MHD_EVENT_LOOP_INFO_READ: - p[poll_server+i].events |= POLLIN; - break; - case MHD_EVENT_LOOP_INFO_WRITE: - p[poll_server+i].events |= POLLOUT; - if (pos->read_buffer_size > pos->read_buffer_offset) - p[poll_server+i].events |= POLLIN; - break; - case MHD_EVENT_LOOP_INFO_BLOCK: - if (pos->read_buffer_size > pos->read_buffer_offset) - p[poll_server+i].events |= POLLIN; - break; - case MHD_EVENT_LOOP_INFO_CLEANUP: - timeout = 0; /* clean up "pos" immediately */ - break; - } - i++; - } - if (0 == poll_server + num_connections) - { - free(p); - return MHD_YES; - } - if (MHD_sys_poll_(p, poll_server + num_connections, timeout) < 0) - { - if (EINTR == MHD_socket_errno_) - { - free(p); - return MHD_YES; - } -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "poll failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - free(p); - return MHD_NO; - } - /* handle shutdown */ - if (MHD_YES == daemon->shutdown) - { - free(p); - return MHD_NO; - } - i = 0; - next = daemon->connections_head; - while (NULL != (pos = next)) - { - next = pos->next; - switch (pos->event_loop_info) - { - case MHD_EVENT_LOOP_INFO_READ: - /* first, sanity checks */ - if (i >= num_connections) - break; /* connection list changed somehow, retry later ... */ - if (p[poll_server+i].fd != pos->socket_fd) - break; /* fd mismatch, something else happened, retry later ... */ - /* normal handling */ - if (0 != (p[poll_server+i].revents & POLLIN)) - pos->read_handler (pos); - pos->idle_handler (pos); - i++; - break; - case MHD_EVENT_LOOP_INFO_WRITE: - /* first, sanity checks */ - if (i >= num_connections) - break; /* connection list changed somehow, retry later ... */ - if (p[poll_server+i].fd != pos->socket_fd) - break; /* fd mismatch, something else happened, retry later ... */ - /* normal handling */ - if (0 != (p[poll_server+i].revents & POLLIN)) - pos->read_handler (pos); - if (0 != (p[poll_server+i].revents & POLLOUT)) - pos->write_handler (pos); - pos->idle_handler (pos); - i++; - break; - case MHD_EVENT_LOOP_INFO_BLOCK: - if (0 != (p[poll_server+i].revents & POLLIN)) - pos->read_handler (pos); - pos->idle_handler (pos); - break; - case MHD_EVENT_LOOP_INFO_CLEANUP: - pos->idle_handler (pos); - break; - } - } - /* handle 'listen' FD */ - if ( (-1 != poll_listen) && - (0 != (p[poll_listen].revents & POLLIN)) ) - (void) MHD_accept_connection (daemon); - - /* handle pipe FD */ - if ( (-1 != poll_pipe) && - (0 != (p[poll_pipe].revents & POLLIN)) ) - (void) MHD_pipe_read_ (daemon->wpipe[0], &tmp, sizeof (tmp)); - - free(p); - } - return MHD_YES; -} - - -/** - * Process only the listen socket using poll(). - * - * @param daemon daemon to run poll loop for - * @param may_block #MHD_YES if blocking, #MHD_NO if non-blocking - * @return #MHD_NO on serious errors, #MHD_YES on success - */ -static int -MHD_poll_listen_socket (struct MHD_Daemon *daemon, - int may_block) -{ - struct pollfd p[2]; - int timeout; - unsigned int poll_count; - int poll_listen; - - memset (&p, 0, sizeof (p)); - poll_count = 0; - poll_listen = -1; - if (MHD_INVALID_SOCKET != daemon->socket_fd) - { - p[poll_count].fd = daemon->socket_fd; - p[poll_count].events = POLLIN; - p[poll_count].revents = 0; - poll_listen = poll_count; - poll_count++; - } - if (MHD_INVALID_PIPE_ != daemon->wpipe[0]) - { - p[poll_count].fd = daemon->wpipe[0]; - p[poll_count].events = POLLIN; - p[poll_count].revents = 0; - poll_count++; - } - if (MHD_NO == may_block) - timeout = 0; - else - timeout = -1; - if (0 == poll_count) - return MHD_YES; - if (MHD_sys_poll_(p, poll_count, timeout) < 0) - { - if (EINTR == MHD_socket_errno_) - return MHD_YES; -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "poll failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - return MHD_NO; - } - /* handle shutdown */ - if (MHD_YES == daemon->shutdown) - return MHD_NO; - if ( (-1 != poll_listen) && - (0 != (p[poll_listen].revents & POLLIN)) ) - (void) MHD_accept_connection (daemon); - return MHD_YES; -} -#endif - - -/** - * Do poll()-based processing. - * - * @param daemon daemon to run poll()-loop for - * @param may_block #MHD_YES if blocking, #MHD_NO if non-blocking - * @return #MHD_NO on serious errors, #MHD_YES on success - */ -static int -MHD_poll (struct MHD_Daemon *daemon, - int may_block) -{ -#ifdef HAVE_POLL - if (MHD_YES == daemon->shutdown) - return MHD_NO; - if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) - return MHD_poll_all (daemon, may_block); - else - return MHD_poll_listen_socket (daemon, may_block); -#else - return MHD_NO; -#endif -} - - -#if EPOLL_SUPPORT - -/** - * How many events to we process at most per epoll() call? Trade-off - * between required stack-size and number of system calls we have to - * make; 128 should be way enough to avoid more than one system call - * for most scenarios, and still be moderate in stack size - * consumption. Embedded systems might want to choose a smaller value - * --- but why use epoll() on such a system in the first place? - */ -#define MAX_EVENTS 128 - - -/** - * Do epoll()-based processing (this function is allowed to - * block if @a may_block is set to #MHD_YES). - * - * @param daemon daemon to run poll loop for - * @param may_block #MHD_YES if blocking, #MHD_NO if non-blocking - * @return #MHD_NO on serious errors, #MHD_YES on success - */ -static int -MHD_epoll (struct MHD_Daemon *daemon, - int may_block) -{ - struct MHD_Connection *pos; - struct MHD_Connection *next; - struct epoll_event events[MAX_EVENTS]; - struct epoll_event event; - int timeout_ms; - MHD_UNSIGNED_LONG_LONG timeout_ll; - int num_events; - unsigned int i; - unsigned int series_length; - char tmp; - - if (-1 == daemon->epoll_fd) - return MHD_NO; /* we're down! */ - if (MHD_YES == daemon->shutdown) - return MHD_NO; - if ( (MHD_INVALID_SOCKET != daemon->socket_fd) && - (daemon->connections < daemon->connection_limit) && - (MHD_NO == daemon->listen_socket_in_epoll) ) - { - event.events = EPOLLIN; - event.data.ptr = daemon; - if (0 != epoll_ctl (daemon->epoll_fd, - EPOLL_CTL_ADD, - daemon->socket_fd, - &event)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Call to epoll_ctl failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - return MHD_NO; - } - daemon->listen_socket_in_epoll = MHD_YES; - } - if ( (MHD_YES == daemon->listen_socket_in_epoll) && - (daemon->connections == daemon->connection_limit) ) - { - /* we're at the connection limit, disable listen socket - for event loop for now */ - if (0 != epoll_ctl (daemon->epoll_fd, - EPOLL_CTL_DEL, - daemon->socket_fd, - NULL)) - MHD_PANIC ("Failed to remove listen FD from epoll set\n"); - daemon->listen_socket_in_epoll = MHD_NO; - } - if (MHD_YES == may_block) - { - if (MHD_YES == MHD_get_timeout (daemon, - &timeout_ll)) - { - if (timeout_ll >= (MHD_UNSIGNED_LONG_LONG) INT_MAX) - timeout_ms = INT_MAX; - else - timeout_ms = (int) timeout_ll; - } - else - timeout_ms = -1; - } - else - timeout_ms = 0; - - /* drain 'epoll' event queue; need to iterate as we get at most - MAX_EVENTS in one system call here; in practice this should - pretty much mean only one round, but better an extra loop here - than unfair behavior... */ - num_events = MAX_EVENTS; - while (MAX_EVENTS == num_events) - { - /* update event masks */ - num_events = epoll_wait (daemon->epoll_fd, - events, MAX_EVENTS, timeout_ms); - if (-1 == num_events) - { - if (EINTR == MHD_socket_errno_) - return MHD_YES; -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Call to epoll_wait failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - return MHD_NO; - } - for (i=0;i<(unsigned int) num_events;i++) - { - if (NULL == events[i].data.ptr) - continue; /* shutdown signal! */ - if ( (MHD_INVALID_PIPE_ != daemon->wpipe[0]) && - (daemon->wpipe[0] == events[i].data.fd) ) - { - (void) MHD_pipe_read_ (daemon->wpipe[0], &tmp, sizeof (tmp)); - continue; - } - if (daemon != events[i].data.ptr) - { - /* this is an event relating to a 'normal' connection, - remember the event and if appropriate mark the - connection as 'eready'. */ - pos = events[i].data.ptr; - if (0 != (events[i].events & EPOLLIN)) - { - pos->epoll_state |= MHD_EPOLL_STATE_READ_READY; - if ( ( (MHD_EVENT_LOOP_INFO_READ == pos->event_loop_info) || - (pos->read_buffer_size > pos->read_buffer_offset) ) && - (0 == (pos->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL) ) ) - { - EDLL_insert (daemon->eready_head, - daemon->eready_tail, - pos); - pos->epoll_state |= MHD_EPOLL_STATE_IN_EREADY_EDLL; - } - } - if (0 != (events[i].events & EPOLLOUT)) - { - pos->epoll_state |= MHD_EPOLL_STATE_WRITE_READY; - if ( (MHD_EVENT_LOOP_INFO_WRITE == pos->event_loop_info) && - (0 == (pos->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL) ) ) - { - EDLL_insert (daemon->eready_head, - daemon->eready_tail, - pos); - pos->epoll_state |= MHD_EPOLL_STATE_IN_EREADY_EDLL; - } - } - } - else /* must be listen socket */ - { - /* run 'accept' until it fails or we are not allowed to take - on more connections */ - series_length = 0; - while ( (MHD_YES == MHD_accept_connection (daemon)) && - (daemon->connections < daemon->connection_limit) && - (series_length < 128) ) - series_length++; - } - } - } - - /* we handle resumes here because we may have ready connections - that will not be placed into the epoll list immediately. */ - if ( (MHD_USE_SUSPEND_RESUME == (daemon->options & MHD_USE_SUSPEND_RESUME)) && - (MHD_YES == resume_suspended_connections (daemon)) ) - may_block = MHD_NO; - - /* process events for connections */ - while (NULL != (pos = daemon->eready_tail)) - { - EDLL_remove (daemon->eready_head, - daemon->eready_tail, - pos); - pos->epoll_state &= ~MHD_EPOLL_STATE_IN_EREADY_EDLL; - if (MHD_EVENT_LOOP_INFO_READ == pos->event_loop_info) - pos->read_handler (pos); - if (MHD_EVENT_LOOP_INFO_WRITE == pos->event_loop_info) - pos->write_handler (pos); - pos->idle_handler (pos); - } - - /* Finally, handle timed-out connections; we need to do this here - as the epoll mechanism won't call the 'idle_handler' on everything, - as the other event loops do. As timeouts do not get an explicit - event, we need to find those connections that might have timed out - here. - - Connections with custom timeouts must all be looked at, as we - do not bother to sort that (presumably very short) list. */ - next = daemon->manual_timeout_head; - while (NULL != (pos = next)) - { - next = pos->nextX; - pos->idle_handler (pos); - } - /* Connections with the default timeout are sorted by prepending - them to the head of the list whenever we touch the connection; - thus it sufficies to iterate from the tail until the first - connection is NOT timed out */ - next = daemon->normal_timeout_tail; - while (NULL != (pos = next)) - { - next = pos->prevX; - pos->idle_handler (pos); - if (MHD_CONNECTION_CLOSED != pos->state) - break; /* sorted by timeout, no need to visit the rest! */ - } - return MHD_YES; -} -#endif - - -/** - * Run webserver operations (without blocking unless in client - * callbacks). This method should be called by clients in combination - * with #MHD_get_fdset if the client-controlled select method is used. - * - * This function is a convenience method, which is useful if the - * fd_sets from #MHD_get_fdset were not directly passed to `select()`; - * with this function, MHD will internally do the appropriate `select()` - * call itself again. While it is always safe to call #MHD_run (in - * external select mode), you should call #MHD_run_from_select if - * performance is important (as it saves an expensive call to - * `select()`). - * - * @param daemon daemon to run - * @return #MHD_YES on success, #MHD_NO if this - * daemon was not started with the right - * options for this call. - * @ingroup event - */ -int -MHD_run (struct MHD_Daemon *daemon) -{ - if ( (MHD_YES == daemon->shutdown) || - (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || - (0 != (daemon->options & MHD_USE_SELECT_INTERNALLY)) ) - return MHD_NO; - if (0 != (daemon->options & MHD_USE_POLL)) - { - MHD_poll (daemon, MHD_NO); - MHD_cleanup_connections (daemon); - } -#if EPOLL_SUPPORT - else if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) - { - MHD_epoll (daemon, MHD_NO); - MHD_cleanup_connections (daemon); - } -#endif - else - { - MHD_select (daemon, MHD_NO); - /* MHD_select does MHD_cleanup_connections already */ - } - return MHD_YES; -} - - -/** - * Thread that runs the select loop until the daemon - * is explicitly shut down. - * - * @param cls 'struct MHD_Deamon' to run select loop in a thread for - * @return always 0 (on shutdown) - */ -static MHD_THRD_RTRN_TYPE_ MHD_THRD_CALL_SPEC_ -MHD_select_thread (void *cls) -{ - struct MHD_Daemon *daemon = cls; - - while (MHD_YES != daemon->shutdown) - { - if (0 != (daemon->options & MHD_USE_POLL)) - MHD_poll (daemon, MHD_YES); -#if EPOLL_SUPPORT - else if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) - MHD_epoll (daemon, MHD_YES); -#endif - else - MHD_select (daemon, MHD_YES); - MHD_cleanup_connections (daemon); - } - return (MHD_THRD_RTRN_TYPE_)0; -} - - -/** - * Process escape sequences ('%HH') Updates val in place; the - * result should be UTF-8 encoded and cannot be larger than the input. - * The result must also still be 0-terminated. - * - * @param cls closure (use NULL) - * @param connection handle to connection, not used - * @param val value to unescape (modified in the process) - * @return length of the resulting val (strlen(val) maybe - * shorter afterwards due to elimination of escape sequences) - */ -static size_t -unescape_wrapper (void *cls, - struct MHD_Connection *connection, - char *val) -{ - return MHD_http_unescape (val); -} - - -/** - * Start a webserver on the given port. Variadic version of - * #MHD_start_daemon_va. - * - * @param flags combination of `enum MHD_FLAG` values - * @param port port to bind to - * @param apc callback to call to check which clients - * will be allowed to connect; you can pass NULL - * in which case connections from any IP will be - * accepted - * @param apc_cls extra argument to @a apc - * @param dh handler called for all requests (repeatedly) - * @param dh_cls extra argument to @a dh - * @return NULL on error, handle to daemon on success - * @ingroup event - */ -struct MHD_Daemon * -MHD_start_daemon (unsigned int flags, - uint16_t port, - MHD_AcceptPolicyCallback apc, - void *apc_cls, - MHD_AccessHandlerCallback dh, void *dh_cls, ...) -{ - struct MHD_Daemon *daemon; - va_list ap; - - va_start (ap, dh_cls); - daemon = MHD_start_daemon_va (flags, port, apc, apc_cls, dh, dh_cls, ap); - va_end (ap); - return daemon; -} - - -/** - * Stop accepting connections from the listening socket. Allows - * clients to continue processing, but stops accepting new - * connections. Note that the caller is responsible for closing the - * returned socket; however, if MHD is run using threads (anything but - * external select mode), it must not be closed until AFTER - * #MHD_stop_daemon has been called (as it is theoretically possible - * that an existing thread is still using it). - * - * Note that some thread modes require the caller to have passed - * #MHD_USE_PIPE_FOR_SHUTDOWN when using this API. If this daemon is - * in one of those modes and this option was not given to - * #MHD_start_daemon, this function will return #MHD_INVALID_SOCKET. - * - * @param daemon daemon to stop accepting new connections for - * @return old listen socket on success, #MHD_INVALID_SOCKET if - * the daemon was already not listening anymore - * @ingroup specialized - */ -MHD_socket -MHD_quiesce_daemon (struct MHD_Daemon *daemon) -{ - unsigned int i; - MHD_socket ret; - - ret = daemon->socket_fd; - if (MHD_INVALID_SOCKET == ret) - return MHD_INVALID_SOCKET; - if ( (MHD_INVALID_PIPE_ == daemon->wpipe[1]) && - (0 != (daemon->options & (MHD_USE_SELECT_INTERNALLY | MHD_USE_THREAD_PER_CONNECTION))) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Using MHD_quiesce_daemon in this mode requires MHD_USE_PIPE_FOR_SHUTDOWN\n"); -#endif - return MHD_INVALID_SOCKET; - } - - if (NULL != daemon->worker_pool) - for (i = 0; i < daemon->worker_pool_size; i++) - { - daemon->worker_pool[i].socket_fd = MHD_INVALID_SOCKET; -#if EPOLL_SUPPORT - if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) && - (-1 != daemon->worker_pool[i].epoll_fd) && - (MHD_YES == daemon->worker_pool[i].listen_socket_in_epoll) ) - { - if (0 != epoll_ctl (daemon->worker_pool[i].epoll_fd, - EPOLL_CTL_DEL, - ret, - NULL)) - MHD_PANIC ("Failed to remove listen FD from epoll set\n"); - daemon->worker_pool[i].listen_socket_in_epoll = MHD_NO; - } -#endif - } - daemon->socket_fd = MHD_INVALID_SOCKET; -#if EPOLL_SUPPORT - if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) && - (-1 != daemon->epoll_fd) && - (MHD_YES == daemon->listen_socket_in_epoll) ) - { - if (0 != epoll_ctl (daemon->epoll_fd, - EPOLL_CTL_DEL, - ret, - NULL)) - MHD_PANIC ("Failed to remove listen FD from epoll set\n"); - daemon->listen_socket_in_epoll = MHD_NO; - } -#endif - return ret; -} - - -/** - * Signature of the MHD custom logger function. - * - * @param cls closure - * @param format format string - * @param va arguments to the format string (fprintf-style) - */ -typedef void (*VfprintfFunctionPointerType)(void *cls, - const char *format, - va_list va); - - -/** - * Parse a list of options given as varargs. - * - * @param daemon the daemon to initialize - * @param servaddr where to store the server's listen address - * @param ap the options - * @return #MHD_YES on success, #MHD_NO on error - */ -static int -parse_options_va (struct MHD_Daemon *daemon, - const struct sockaddr **servaddr, - va_list ap); - - -/** - * Parse a list of options given as varargs. - * - * @param daemon the daemon to initialize - * @param servaddr where to store the server's listen address - * @param ... the options - * @return #MHD_YES on success, #MHD_NO on error - */ -static int -parse_options (struct MHD_Daemon *daemon, - const struct sockaddr **servaddr, - ...) -{ - va_list ap; - int ret; - - va_start (ap, servaddr); - ret = parse_options_va (daemon, servaddr, ap); - va_end (ap); - return ret; -} - - -/** - * Parse a list of options given as varargs. - * - * @param daemon the daemon to initialize - * @param servaddr where to store the server's listen address - * @param ap the options - * @return #MHD_YES on success, #MHD_NO on error - */ -static int -parse_options_va (struct MHD_Daemon *daemon, - const struct sockaddr **servaddr, - va_list ap) -{ - enum MHD_OPTION opt; - struct MHD_OptionItem *oa; - unsigned int i; -#if HTTPS_SUPPORT - int ret; - const char *pstr; -#endif - - while (MHD_OPTION_END != (opt = (enum MHD_OPTION) va_arg (ap, int))) - { - switch (opt) - { - case MHD_OPTION_CONNECTION_MEMORY_LIMIT: - daemon->pool_size = va_arg (ap, size_t); - break; - case MHD_OPTION_CONNECTION_MEMORY_INCREMENT: - daemon->pool_increment= va_arg (ap, size_t); - break; - case MHD_OPTION_CONNECTION_LIMIT: - daemon->connection_limit = va_arg (ap, unsigned int); - break; - case MHD_OPTION_CONNECTION_TIMEOUT: - daemon->connection_timeout = va_arg (ap, unsigned int); - break; - case MHD_OPTION_NOTIFY_COMPLETED: - daemon->notify_completed = - va_arg (ap, MHD_RequestCompletedCallback); - daemon->notify_completed_cls = va_arg (ap, void *); - break; - case MHD_OPTION_NOTIFY_CONNECTION: - daemon->notify_connection = - va_arg (ap, MHD_NotifyConnectionCallback); - daemon->notify_connection_cls = va_arg (ap, void *); - break; - case MHD_OPTION_PER_IP_CONNECTION_LIMIT: - daemon->per_ip_connection_limit = va_arg (ap, unsigned int); - break; - case MHD_OPTION_SOCK_ADDR: - *servaddr = va_arg (ap, const struct sockaddr *); - break; - case MHD_OPTION_URI_LOG_CALLBACK: - daemon->uri_log_callback = - va_arg (ap, LogCallback); - daemon->uri_log_callback_cls = va_arg (ap, void *); - break; - case MHD_OPTION_THREAD_POOL_SIZE: - daemon->worker_pool_size = va_arg (ap, unsigned int); - if (daemon->worker_pool_size >= (SIZE_MAX / sizeof (struct MHD_Daemon))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Specified thread pool size (%u) too big\n", - daemon->worker_pool_size); -#endif - return MHD_NO; - } - break; -#if HTTPS_SUPPORT - case MHD_OPTION_HTTPS_MEM_KEY: - if (0 != (daemon->options & MHD_USE_SSL)) - daemon->https_mem_key = va_arg (ap, const char *); -#if HAVE_MESSAGES - else - MHD_DLOG (daemon, - "MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n", - opt); -#endif - break; - case MHD_OPTION_HTTPS_KEY_PASSWORD: - if (0 != (daemon->options & MHD_USE_SSL)) - daemon->https_key_password = va_arg (ap, const char *); -#if HAVE_MESSAGES - else - MHD_DLOG (daemon, - "MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n", - opt); -#endif - break; - case MHD_OPTION_HTTPS_MEM_CERT: - if (0 != (daemon->options & MHD_USE_SSL)) - daemon->https_mem_cert = va_arg (ap, const char *); -#if HAVE_MESSAGES - else - MHD_DLOG (daemon, - "MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n", - opt); -#endif - break; - case MHD_OPTION_HTTPS_MEM_TRUST: - if (0 != (daemon->options & MHD_USE_SSL)) - daemon->https_mem_trust = va_arg (ap, const char *); -#if HAVE_MESSAGES - else - MHD_DLOG (daemon, - "MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n", - opt); -#endif - break; - case MHD_OPTION_HTTPS_CRED_TYPE: - daemon->cred_type = (gnutls_credentials_type_t) va_arg (ap, int); - break; - case MHD_OPTION_HTTPS_MEM_DHPARAMS: - if (0 != (daemon->options & MHD_USE_SSL)) - { - const char *arg = va_arg (ap, const char *); - gnutls_datum_t dhpar; - - if (gnutls_dh_params_init (&daemon->https_mem_dhparams) < 0) - { -#if HAVE_MESSAGES - MHD_DLOG(daemon, - "Error initializing DH parameters\n"); -#endif - return MHD_NO; - } - dhpar.data = (unsigned char *) arg; - dhpar.size = strlen (arg); - if (gnutls_dh_params_import_pkcs3 (daemon->https_mem_dhparams, &dhpar, - GNUTLS_X509_FMT_PEM) < 0) - { -#if HAVE_MESSAGES - MHD_DLOG(daemon, - "Bad Diffie-Hellman parameters format\n"); -#endif - gnutls_dh_params_deinit (daemon->https_mem_dhparams); - return MHD_NO; - } - daemon->have_dhparams = MHD_YES; - } - else - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n", - opt); -#endif - return MHD_NO; - } - break; - case MHD_OPTION_HTTPS_PRIORITIES: - if (0 != (daemon->options & MHD_USE_SSL)) - { - gnutls_priority_deinit (daemon->priority_cache); - ret = gnutls_priority_init (&daemon->priority_cache, - pstr = va_arg (ap, const char*), - NULL); - if (GNUTLS_E_SUCCESS != ret) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Setting priorities to `%s' failed: %s\n", - pstr, - gnutls_strerror (ret)); -#endif - daemon->priority_cache = NULL; - return MHD_NO; - } - } - break; - case MHD_OPTION_HTTPS_CERT_CALLBACK: -#if GNUTLS_VERSION_MAJOR < 3 -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "MHD_OPTION_HTTPS_CERT_CALLBACK requires building MHD with GnuTLS >= 3.0\n"); -#endif - return MHD_NO; -#else - if (0 != (daemon->options & MHD_USE_SSL)) - daemon->cert_callback = va_arg (ap, gnutls_certificate_retrieve_function2 *); - break; -#endif -#endif -#ifdef DAUTH_SUPPORT - case MHD_OPTION_DIGEST_AUTH_RANDOM: - daemon->digest_auth_rand_size = va_arg (ap, size_t); - daemon->digest_auth_random = va_arg (ap, const char *); - break; - case MHD_OPTION_NONCE_NC_SIZE: - daemon->nonce_nc_size = va_arg (ap, unsigned int); - break; -#endif - case MHD_OPTION_LISTEN_SOCKET: - daemon->socket_fd = va_arg (ap, MHD_socket); - break; - case MHD_OPTION_EXTERNAL_LOGGER: -#if HAVE_MESSAGES - daemon->custom_error_log = - va_arg (ap, VfprintfFunctionPointerType); - daemon->custom_error_log_cls = va_arg (ap, void *); -#else - va_arg (ap, VfprintfFunctionPointerType); - va_arg (ap, void *); -#endif - break; - case MHD_OPTION_THREAD_STACK_SIZE: - daemon->thread_stack_size = va_arg (ap, size_t); - break; -#ifdef TCP_FASTOPEN - case MHD_OPTION_TCP_FASTOPEN_QUEUE_SIZE: - daemon->fastopen_queue_size = va_arg (ap, unsigned int); - break; -#endif - case MHD_OPTION_LISTENING_ADDRESS_REUSE: - daemon->listening_address_reuse = va_arg (ap, unsigned int) ? 1 : -1; - break; - case MHD_OPTION_ARRAY: - oa = va_arg (ap, struct MHD_OptionItem*); - i = 0; - while (MHD_OPTION_END != (opt = oa[i].option)) - { - switch (opt) - { - /* all options taking 'size_t' */ - case MHD_OPTION_CONNECTION_MEMORY_LIMIT: - case MHD_OPTION_CONNECTION_MEMORY_INCREMENT: - case MHD_OPTION_THREAD_STACK_SIZE: - if (MHD_YES != parse_options (daemon, - servaddr, - opt, - (size_t) oa[i].value, - MHD_OPTION_END)) - return MHD_NO; - break; - /* all options taking 'unsigned int' */ - case MHD_OPTION_NONCE_NC_SIZE: - case MHD_OPTION_CONNECTION_LIMIT: - case MHD_OPTION_CONNECTION_TIMEOUT: - case MHD_OPTION_PER_IP_CONNECTION_LIMIT: - case MHD_OPTION_THREAD_POOL_SIZE: - case MHD_OPTION_TCP_FASTOPEN_QUEUE_SIZE: - case MHD_OPTION_LISTENING_ADDRESS_REUSE: - if (MHD_YES != parse_options (daemon, - servaddr, - opt, - (unsigned int) oa[i].value, - MHD_OPTION_END)) - return MHD_NO; - break; - /* all options taking 'enum' */ - case MHD_OPTION_HTTPS_CRED_TYPE: - if (MHD_YES != parse_options (daemon, - servaddr, - opt, - (int) oa[i].value, - MHD_OPTION_END)) - return MHD_NO; - break; - /* all options taking 'MHD_socket' */ - case MHD_OPTION_LISTEN_SOCKET: - if (MHD_YES != parse_options (daemon, - servaddr, - opt, - (MHD_socket) oa[i].value, - MHD_OPTION_END)) - return MHD_NO; - break; - /* all options taking one pointer */ - case MHD_OPTION_SOCK_ADDR: - case MHD_OPTION_HTTPS_MEM_KEY: - case MHD_OPTION_HTTPS_KEY_PASSWORD: - case MHD_OPTION_HTTPS_MEM_CERT: - case MHD_OPTION_HTTPS_MEM_TRUST: - case MHD_OPTION_HTTPS_MEM_DHPARAMS: - case MHD_OPTION_HTTPS_PRIORITIES: - case MHD_OPTION_ARRAY: - case MHD_OPTION_HTTPS_CERT_CALLBACK: - if (MHD_YES != parse_options (daemon, - servaddr, - opt, - oa[i].ptr_value, - MHD_OPTION_END)) - return MHD_NO; - break; - /* all options taking two pointers */ - case MHD_OPTION_NOTIFY_COMPLETED: - case MHD_OPTION_NOTIFY_CONNECTION: - case MHD_OPTION_URI_LOG_CALLBACK: - case MHD_OPTION_EXTERNAL_LOGGER: - case MHD_OPTION_UNESCAPE_CALLBACK: - if (MHD_YES != parse_options (daemon, - servaddr, - opt, - (void *) oa[i].value, - oa[i].ptr_value, - MHD_OPTION_END)) - return MHD_NO; - break; - /* options taking size_t-number followed by pointer */ - case MHD_OPTION_DIGEST_AUTH_RANDOM: - if (MHD_YES != parse_options (daemon, - servaddr, - opt, - (size_t) oa[i].value, - oa[i].ptr_value, - MHD_OPTION_END)) - return MHD_NO; - break; - default: - return MHD_NO; - } - i++; - } - break; - case MHD_OPTION_UNESCAPE_CALLBACK: - daemon->unescape_callback = - va_arg (ap, UnescapeCallback); - daemon->unescape_callback_cls = va_arg (ap, void *); - break; - default: -#if HAVE_MESSAGES - if (((opt >= MHD_OPTION_HTTPS_MEM_KEY) && - (opt <= MHD_OPTION_HTTPS_PRIORITIES)) || (opt == MHD_OPTION_HTTPS_MEM_TRUST)) - { - MHD_DLOG (daemon, - "MHD HTTPS option %d passed to MHD compiled without HTTPS support\n", - opt); - } - else - { - MHD_DLOG (daemon, - "Invalid option %d! (Did you terminate the list with MHD_OPTION_END?)\n", - opt); - } -#endif - return MHD_NO; - } - } - return MHD_YES; -} - - -/** - * Create a listen socket, if possible with SOCK_CLOEXEC flag set. - * - * @param daemon daemon for which we create the socket - * @param domain socket domain (i.e. PF_INET) - * @param type socket type (usually SOCK_STREAM) - * @param protocol desired protocol, 0 for default - */ -static MHD_socket -create_socket (struct MHD_Daemon *daemon, - int domain, int type, int protocol) -{ - int ctype = type | SOCK_CLOEXEC; - MHD_socket fd; - - /* use SOCK_STREAM rather than ai_socktype: some getaddrinfo - * implementations do not set ai_socktype, e.g. RHL6.2. */ - fd = socket (domain, ctype, protocol); - if ( (MHD_INVALID_SOCKET == fd) && (EINVAL == MHD_socket_errno_) && (0 != SOCK_CLOEXEC) ) - { - ctype = type; - fd = socket(domain, type, protocol); - } - if (MHD_INVALID_SOCKET == fd) - return MHD_INVALID_SOCKET; - if (type == ctype) - make_nonblocking_noninheritable (daemon, fd); - return fd; -} - - -#if EPOLL_SUPPORT -/** - * Setup epoll() FD for the daemon and initialize it to listen - * on the listen FD. - * - * @param daemon daemon to initialize for epoll() - * @return #MHD_YES on success, #MHD_NO on failure - */ -static int -setup_epoll_to_listen (struct MHD_Daemon *daemon) -{ - struct epoll_event event; - -#ifdef HAVE_EPOLL_CREATE1 - daemon->epoll_fd = epoll_create1 (EPOLL_CLOEXEC); -#else /* !HAVE_EPOLL_CREATE1 */ - daemon->epoll_fd = epoll_create (MAX_EVENTS); -#endif /* !HAVE_EPOLL_CREATE1 */ - if (-1 == daemon->epoll_fd) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Call to epoll_create1 failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - return MHD_NO; - } -#ifndef HAVE_EPOLL_CREATE1 - else - { - int fdflags = fcntl (daemon->epoll_fd, F_GETFD); - if (0 > fdflags || 0 > fcntl (daemon->epoll_fd, F_SETFD, fdflags | FD_CLOEXEC)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to change flags on epoll fd: %s\n", - MHD_socket_last_strerr_ ()); -#endif /* HAVE_MESSAGES */ - } - } -#endif /* !HAVE_EPOLL_CREATE1 */ - if (0 == EPOLL_CLOEXEC) - make_nonblocking_noninheritable (daemon, - daemon->epoll_fd); - if (MHD_INVALID_SOCKET == daemon->socket_fd) - return MHD_YES; /* non-listening daemon */ - event.events = EPOLLIN; - event.data.ptr = daemon; - if (0 != epoll_ctl (daemon->epoll_fd, - EPOLL_CTL_ADD, - daemon->socket_fd, - &event)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Call to epoll_ctl failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - return MHD_NO; - } - if ( (MHD_INVALID_PIPE_ != daemon->wpipe[0]) && - (MHD_USE_SUSPEND_RESUME == (daemon->options & MHD_USE_SUSPEND_RESUME)) ) - { - event.events = EPOLLIN | EPOLLET; - event.data.ptr = NULL; - event.data.fd = daemon->wpipe[0]; - if (0 != epoll_ctl (daemon->epoll_fd, - EPOLL_CTL_ADD, - daemon->wpipe[0], - &event)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Call to epoll_ctl failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - return MHD_NO; - } - } - daemon->listen_socket_in_epoll = MHD_YES; - return MHD_YES; -} -#endif - - -/** - * Start a webserver on the given port. - * - * @param flags combination of `enum MHD_FLAG` values - * @param port port to bind to (in host byte order) - * @param apc callback to call to check which clients - * will be allowed to connect; you can pass NULL - * in which case connections from any IP will be - * accepted - * @param apc_cls extra argument to @a apc - * @param dh handler called for all requests (repeatedly) - * @param dh_cls extra argument to @a dh - * @param ap list of options (type-value pairs, - * terminated with #MHD_OPTION_END). - * @return NULL on error, handle to daemon on success - * @ingroup event - */ -struct MHD_Daemon * -MHD_start_daemon_va (unsigned int flags, - uint16_t port, - MHD_AcceptPolicyCallback apc, - void *apc_cls, - MHD_AccessHandlerCallback dh, void *dh_cls, - va_list ap) -{ - const int on = 1; - struct MHD_Daemon *daemon; - MHD_socket socket_fd; - struct sockaddr_in servaddr4; -#if HAVE_INET6 - struct sockaddr_in6 servaddr6; -#endif - const struct sockaddr *servaddr = NULL; - socklen_t addrlen; - unsigned int i; - int res_thread_create; - int use_pipe; - -#ifndef HAVE_INET6 - if (0 != (flags & MHD_USE_IPv6)) - return NULL; -#endif -#ifndef HAVE_POLL - if (0 != (flags & MHD_USE_POLL)) - return NULL; -#endif -#if ! HTTPS_SUPPORT - if (0 != (flags & MHD_USE_SSL)) - return NULL; -#endif -#ifndef TCP_FASTOPEN - if (0 != (flags & MHD_USE_TCP_FASTOPEN)) - return NULL; -#endif - if (NULL == dh) - return NULL; - if (NULL == (daemon = malloc (sizeof (struct MHD_Daemon)))) - return NULL; - memset (daemon, 0, sizeof (struct MHD_Daemon)); -#if EPOLL_SUPPORT - daemon->epoll_fd = -1; -#endif - /* try to open listen socket */ -#if HTTPS_SUPPORT - if (0 != (flags & MHD_USE_SSL)) - { - gnutls_priority_init (&daemon->priority_cache, - "NORMAL", - NULL); - } -#endif - daemon->socket_fd = MHD_INVALID_SOCKET; - daemon->listening_address_reuse = 0; - daemon->options = flags; -#if WINDOWS - /* Winsock is broken with respect to 'shutdown'; - this disables us calling 'shutdown' on W32. */ - daemon->options |= MHD_USE_EPOLL_TURBO; -#endif - daemon->port = port; - daemon->apc = apc; - daemon->apc_cls = apc_cls; - daemon->default_handler = dh; - daemon->default_handler_cls = dh_cls; - daemon->connections = 0; - daemon->connection_limit = MHD_MAX_CONNECTIONS_DEFAULT; - daemon->pool_size = MHD_POOL_SIZE_DEFAULT; - daemon->pool_increment = MHD_BUF_INC_SIZE; - daemon->unescape_callback = &unescape_wrapper; - daemon->connection_timeout = 0; /* no timeout */ - daemon->wpipe[0] = MHD_INVALID_PIPE_; - daemon->wpipe[1] = MHD_INVALID_PIPE_; -#if HAVE_MESSAGES - daemon->custom_error_log = (MHD_LogCallback) &vfprintf; - daemon->custom_error_log_cls = stderr; -#endif -#ifdef HAVE_LISTEN_SHUTDOWN - use_pipe = (0 != (daemon->options & (MHD_USE_NO_LISTEN_SOCKET | MHD_USE_PIPE_FOR_SHUTDOWN))); -#else - use_pipe = 1; /* yes, must use pipe to signal shutdown */ -#endif - if (0 == (flags & (MHD_USE_SELECT_INTERNALLY | MHD_USE_THREAD_PER_CONNECTION))) - use_pipe = 0; /* useless if we are using 'external' select */ - if ( (use_pipe) && (0 != MHD_pipe_ (daemon->wpipe)) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to create control pipe: %s\n", - MHD_strerror_ (errno)); -#endif - free (daemon); - return NULL; - } -#ifndef WINDOWS - if ( (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) && - (1 == use_pipe) && - (daemon->wpipe[0] >= FD_SETSIZE) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "file descriptor for control pipe exceeds maximum value\n"); -#endif - if (0 != MHD_pipe_close_ (daemon->wpipe[0])) - MHD_PANIC ("close failed\n"); - if (0 != MHD_pipe_close_ (daemon->wpipe[1])) - MHD_PANIC ("close failed\n"); - free (daemon); - return NULL; - } -#endif -#ifdef DAUTH_SUPPORT - daemon->digest_auth_rand_size = 0; - daemon->digest_auth_random = NULL; - daemon->nonce_nc_size = 4; /* tiny */ -#endif -#if HTTPS_SUPPORT - if (0 != (flags & MHD_USE_SSL)) - { - daemon->cred_type = GNUTLS_CRD_CERTIFICATE; - } -#endif - - - if (MHD_YES != parse_options_va (daemon, &servaddr, ap)) - { -#if HTTPS_SUPPORT - if ( (0 != (flags & MHD_USE_SSL)) && - (NULL != daemon->priority_cache) ) - gnutls_priority_deinit (daemon->priority_cache); -#endif - free (daemon); - return NULL; - } -#ifdef DAUTH_SUPPORT - if (daemon->nonce_nc_size > 0) - { - if ( ( (size_t) (daemon->nonce_nc_size * sizeof (struct MHD_NonceNc))) / - sizeof(struct MHD_NonceNc) != daemon->nonce_nc_size) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Specified value for NC_SIZE too large\n"); -#endif -#if HTTPS_SUPPORT - if (0 != (flags & MHD_USE_SSL)) - gnutls_priority_deinit (daemon->priority_cache); -#endif - free (daemon); - return NULL; - } - daemon->nnc = malloc (daemon->nonce_nc_size * sizeof (struct MHD_NonceNc)); - if (NULL == daemon->nnc) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to allocate memory for nonce-nc map: %s\n", - MHD_strerror_ (errno)); -#endif -#if HTTPS_SUPPORT - if (0 != (flags & MHD_USE_SSL)) - gnutls_priority_deinit (daemon->priority_cache); -#endif - free (daemon); - return NULL; - } - } - - if (MHD_YES != MHD_mutex_create_ (&daemon->nnc_lock)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "MHD failed to initialize nonce-nc mutex\n"); -#endif -#if HTTPS_SUPPORT - if (0 != (flags & MHD_USE_SSL)) - gnutls_priority_deinit (daemon->priority_cache); -#endif - free (daemon->nnc); - free (daemon); - return NULL; - } -#endif - - /* Thread pooling currently works only with internal select thread model */ - if ( (0 == (flags & MHD_USE_SELECT_INTERNALLY)) && - (daemon->worker_pool_size > 0) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "MHD thread pooling only works with MHD_USE_SELECT_INTERNALLY\n"); -#endif - goto free_and_fail; - } - - if ( (MHD_USE_SUSPEND_RESUME == (flags & MHD_USE_SUSPEND_RESUME)) && - (0 != (flags & MHD_USE_THREAD_PER_CONNECTION)) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Combining MHD_USE_THREAD_PER_CONNECTION and MHD_USE_SUSPEND_RESUME is not supported.\n"); -#endif - goto free_and_fail; - } - -#ifdef __SYMBIAN32__ - if (0 != (flags & (MHD_USE_SELECT_INTERNALLY | MHD_USE_THREAD_PER_CONNECTION))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Threaded operations are not supported on Symbian.\n"); -#endif - goto free_and_fail; - } -#endif - if ( (MHD_INVALID_SOCKET == daemon->socket_fd) && - (0 == (daemon->options & MHD_USE_NO_LISTEN_SOCKET)) ) - { - /* try to open listen socket */ - if (0 != (flags & MHD_USE_IPv6)) - socket_fd = create_socket (daemon, - PF_INET6, SOCK_STREAM, 0); - else - socket_fd = create_socket (daemon, - PF_INET, SOCK_STREAM, 0); - if (MHD_INVALID_SOCKET == socket_fd) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Call to socket failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - goto free_and_fail; - } - - /* Apply the socket options according to listening_address_reuse. */ - if (0 == daemon->listening_address_reuse) - { - /* No user requirement, use "traditional" default SO_REUSEADDR, - and do not fail if it doesn't work */ - if (0 > setsockopt (socket_fd, - SOL_SOCKET, - SO_REUSEADDR, - (void*)&on, sizeof (on))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "setsockopt failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - } - } - else if (daemon->listening_address_reuse > 0) - { - /* User requested to allow reusing listening address:port. - * Use SO_REUSEADDR on Windows and SO_REUSEPORT on most platforms. - * Fail if SO_REUSEPORT does not exist or setsockopt fails. - */ -#ifdef _WIN32 - /* SO_REUSEADDR on W32 has the same semantics - as SO_REUSEPORT on BSD/Linux */ - if (0 > setsockopt (socket_fd, - SOL_SOCKET, - SO_REUSEADDR, - (void*)&on, sizeof (on))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "setsockopt failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - goto free_and_fail; - } -#else -#ifndef SO_REUSEPORT -#ifdef LINUX -/* Supported since Linux 3.9, but often not present (or commented out) - in the headers at this time; but 15 is reserved for this and - thus should be safe to use. */ -#define SO_REUSEPORT 15 -#endif -#endif -#ifdef SO_REUSEPORT - if (0 > setsockopt (socket_fd, - SOL_SOCKET, - SO_REUSEPORT, - (void*)&on, sizeof (on))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "setsockopt failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - goto free_and_fail; - } -#else - /* we're supposed to allow address:port re-use, but - on this platform we cannot; fail hard */ -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Cannot allow listening address reuse: SO_REUSEPORT not defined\n"); -#endif - goto free_and_fail; -#endif -#endif - } - else /* if (daemon->listening_address_reuse < 0) */ - { - /* User requested to disallow reusing listening address:port. - * Do nothing except for Windows where SO_EXCLUSIVEADDRUSE - * is used. Fail if it does not exist or setsockopt fails. - */ -#ifdef _WIN32 -#ifdef SO_EXCLUSIVEADDRUSE - if (0 > setsockopt (socket_fd, - SOL_SOCKET, - SO_EXCLUSIVEADDRUSE, - (void*)&on, sizeof (on))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "setsockopt failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - goto free_and_fail; - } -#else /* SO_EXCLUSIVEADDRUSE not defined on W32? */ -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Cannot disallow listening address reuse: SO_EXCLUSIVEADDRUSE not defined\n"); -#endif - goto free_and_fail; -#endif -#endif /* _WIN32 */ - } - - /* check for user supplied sockaddr */ -#if HAVE_INET6 - if (0 != (flags & MHD_USE_IPv6)) - addrlen = sizeof (struct sockaddr_in6); - else -#endif - addrlen = sizeof (struct sockaddr_in); - if (NULL == servaddr) - { -#if HAVE_INET6 - if (0 != (flags & MHD_USE_IPv6)) - { - memset (&servaddr6, 0, sizeof (struct sockaddr_in6)); - servaddr6.sin6_family = AF_INET6; - servaddr6.sin6_port = htons (port); -#if HAVE_SOCKADDR_IN_SIN_LEN - servaddr6.sin6_len = sizeof (struct sockaddr_in6); -#endif - servaddr = (struct sockaddr *) &servaddr6; - } - else -#endif - { - memset (&servaddr4, 0, sizeof (struct sockaddr_in)); - servaddr4.sin_family = AF_INET; - servaddr4.sin_port = htons (port); -#if HAVE_SOCKADDR_IN_SIN_LEN - servaddr4.sin_len = sizeof (struct sockaddr_in); -#endif - servaddr = (struct sockaddr *) &servaddr4; - } - } - daemon->socket_fd = socket_fd; - - if (0 != (flags & MHD_USE_IPv6)) - { -#ifdef IPPROTO_IPV6 -#ifdef IPV6_V6ONLY - /* Note: "IPV6_V6ONLY" is declared by Windows Vista ff., see "IPPROTO_IPV6 Socket Options" - (http://msdn.microsoft.com/en-us/library/ms738574%28v=VS.85%29.aspx); - and may also be missing on older POSIX systems; good luck if you have any of those, - your IPv6 socket may then also bind against IPv4 anyway... */ -#ifndef WINDOWS - const int -#else - const char -#endif - on = (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK)); - if (0 > setsockopt (socket_fd, - IPPROTO_IPV6, IPV6_V6ONLY, - &on, sizeof (on))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "setsockopt failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - } -#endif -#endif - } - if (-1 == bind (socket_fd, servaddr, addrlen)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to bind to port %u: %s\n", - (unsigned int) port, - MHD_socket_last_strerr_ ()); -#endif - if (0 != MHD_socket_close_ (socket_fd)) - MHD_PANIC ("close failed\n"); - goto free_and_fail; - } -#ifdef TCP_FASTOPEN - if (0 != (flags & MHD_USE_TCP_FASTOPEN)) - { - if (0 == daemon->fastopen_queue_size) - daemon->fastopen_queue_size = MHD_TCP_FASTOPEN_QUEUE_SIZE_DEFAULT; - if (0 != setsockopt (socket_fd, - IPPROTO_TCP, TCP_FASTOPEN, - &daemon->fastopen_queue_size, - sizeof (daemon->fastopen_queue_size))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "setsockopt failed: %s\n", - MHD_socket_last_strerr_ ()); -#endif - } - } -#endif -#if EPOLL_SUPPORT - if (0 != (flags & MHD_USE_EPOLL_LINUX_ONLY)) - { - int sk_flags = fcntl (socket_fd, F_GETFL); - if (0 != fcntl (socket_fd, F_SETFL, sk_flags | O_NONBLOCK)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to make listen socket non-blocking: %s\n", - MHD_socket_last_strerr_ ()); -#endif - if (0 != MHD_socket_close_ (socket_fd)) - MHD_PANIC ("close failed\n"); - goto free_and_fail; - } - } -#endif - if (listen (socket_fd, 32) < 0) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to listen for connections: %s\n", - MHD_socket_last_strerr_ ()); -#endif - if (0 != MHD_socket_close_ (socket_fd)) - MHD_PANIC ("close failed\n"); - goto free_and_fail; - } - } - else - { - socket_fd = daemon->socket_fd; - } -#ifndef WINDOWS - if ( (socket_fd >= FD_SETSIZE) && - (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY)) ) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Socket descriptor larger than FD_SETSIZE: %d > %d\n", - socket_fd, - FD_SETSIZE); -#endif - if (0 != MHD_socket_close_ (socket_fd)) - MHD_PANIC ("close failed\n"); - goto free_and_fail; - } -#endif - -#if EPOLL_SUPPORT - if ( (0 != (flags & MHD_USE_EPOLL_LINUX_ONLY)) && - (0 == daemon->worker_pool_size) && - (0 == (daemon->options & MHD_USE_NO_LISTEN_SOCKET)) ) - { - if (0 != (flags & MHD_USE_THREAD_PER_CONNECTION)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Combining MHD_USE_THREAD_PER_CONNECTION and MHD_USE_EPOLL_LINUX_ONLY is not supported.\n"); -#endif - goto free_and_fail; - } - if (MHD_YES != setup_epoll_to_listen (daemon)) - goto free_and_fail; - } -#else - if (0 != (flags & MHD_USE_EPOLL_LINUX_ONLY)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "epoll is not supported on this platform by this build.\n"); -#endif - goto free_and_fail; - } -#endif - - if (MHD_YES != MHD_mutex_create_ (&daemon->per_ip_connection_mutex)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "MHD failed to initialize IP connection limit mutex\n"); -#endif - if ( (MHD_INVALID_SOCKET != socket_fd) && - (0 != MHD_socket_close_ (socket_fd)) ) - MHD_PANIC ("close failed\n"); - goto free_and_fail; - } - if (MHD_YES != MHD_mutex_create_ (&daemon->cleanup_connection_mutex)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "MHD failed to initialize IP connection limit mutex\n"); -#endif - (void) MHD_mutex_destroy_ (&daemon->cleanup_connection_mutex); - if ( (MHD_INVALID_SOCKET != socket_fd) && - (0 != MHD_socket_close_ (socket_fd)) ) - MHD_PANIC ("close failed\n"); - goto free_and_fail; - } - -#if HTTPS_SUPPORT - /* initialize HTTPS daemon certificate aspects & send / recv functions */ - if ((0 != (flags & MHD_USE_SSL)) && (0 != MHD_TLS_init (daemon))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to initialize TLS support\n"); -#endif - if ( (MHD_INVALID_SOCKET != socket_fd) && - (0 != MHD_socket_close_ (socket_fd)) ) - MHD_PANIC ("close failed\n"); - (void) MHD_mutex_destroy_ (&daemon->cleanup_connection_mutex); - (void) MHD_mutex_destroy_ (&daemon->per_ip_connection_mutex); - goto free_and_fail; - } -#endif - if ( ( (0 != (flags & MHD_USE_THREAD_PER_CONNECTION)) || - ( (0 != (flags & MHD_USE_SELECT_INTERNALLY)) && - (0 == daemon->worker_pool_size)) ) && - (0 == (daemon->options & MHD_USE_NO_LISTEN_SOCKET)) && - (0 != (res_thread_create = - create_thread (&daemon->pid, daemon, &MHD_select_thread, daemon)))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to create listen thread: %s\n", - MHD_strerror_ (res_thread_create)); -#endif - (void) MHD_mutex_destroy_ (&daemon->cleanup_connection_mutex); - (void) MHD_mutex_destroy_ (&daemon->per_ip_connection_mutex); - if ( (MHD_INVALID_SOCKET != socket_fd) && - (0 != MHD_socket_close_ (socket_fd)) ) - MHD_PANIC ("close failed\n"); - goto free_and_fail; - } - if ( (daemon->worker_pool_size > 0) && - (0 == (daemon->options & MHD_USE_NO_LISTEN_SOCKET)) ) - { -#if !defined(WINDOWS) || defined(CYGWIN) - int sk_flags; -#else - unsigned long sk_flags; -#endif - - /* Coarse-grained count of connections per thread (note error - * due to integer division). Also keep track of how many - * connections are leftover after an equal split. */ - unsigned int conns_per_thread = daemon->connection_limit - / daemon->worker_pool_size; - unsigned int leftover_conns = daemon->connection_limit - % daemon->worker_pool_size; - - i = 0; /* we need this in case fcntl or malloc fails */ - - /* Accept must be non-blocking. Multiple children may wake up - * to handle a new connection, but only one will win the race. - * The others must immediately return. */ -#if !defined(WINDOWS) || defined(CYGWIN) - sk_flags = fcntl (socket_fd, F_GETFL); - if (sk_flags < 0) - goto thread_failed; - if (0 != fcntl (socket_fd, F_SETFL, sk_flags | O_NONBLOCK)) - goto thread_failed; -#else - sk_flags = 1; - if (SOCKET_ERROR == ioctlsocket (socket_fd, FIONBIO, &sk_flags)) - goto thread_failed; -#endif /* WINDOWS && !CYGWIN */ - - /* Allocate memory for pooled objects */ - daemon->worker_pool = malloc (sizeof (struct MHD_Daemon) - * daemon->worker_pool_size); - if (NULL == daemon->worker_pool) - goto thread_failed; - - /* Start the workers in the pool */ - for (i = 0; i < daemon->worker_pool_size; ++i) - { - /* Create copy of the Daemon object for each worker */ - struct MHD_Daemon *d = &daemon->worker_pool[i]; - - memcpy (d, daemon, sizeof (struct MHD_Daemon)); - /* Adjust pooling params for worker daemons; note that memcpy() - has already copied MHD_USE_SELECT_INTERNALLY thread model into - the worker threads. */ - d->master = daemon; - d->worker_pool_size = 0; - d->worker_pool = NULL; - - if ( (MHD_USE_SUSPEND_RESUME == (flags & MHD_USE_SUSPEND_RESUME)) && - (0 != MHD_pipe_ (d->wpipe)) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to create worker control pipe: %s\n", - MHD_pipe_last_strerror_() ); -#endif - goto thread_failed; - } -#ifndef WINDOWS - if ( (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) && - (MHD_USE_SUSPEND_RESUME == (flags & MHD_USE_SUSPEND_RESUME)) && - (d->wpipe[0] >= FD_SETSIZE) ) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "file descriptor for worker control pipe exceeds maximum value\n"); -#endif - if (0 != MHD_pipe_close_ (d->wpipe[0])) - MHD_PANIC ("close failed\n"); - if (0 != MHD_pipe_close_ (d->wpipe[1])) - MHD_PANIC ("close failed\n"); - goto thread_failed; - } -#endif - - /* Divide available connections evenly amongst the threads. - * Thread indexes in [0, leftover_conns) each get one of the - * leftover connections. */ - d->connection_limit = conns_per_thread; - if (i < leftover_conns) - ++d->connection_limit; -#if EPOLL_SUPPORT - if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) && - (MHD_YES != setup_epoll_to_listen (d)) ) - goto thread_failed; -#endif - /* Must init cleanup connection mutex for each worker */ - if (MHD_YES != MHD_mutex_create_ (&d->cleanup_connection_mutex)) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "MHD failed to initialize cleanup connection mutex for thread worker %d\n", i); -#endif - goto thread_failed; - } - - /* Spawn the worker thread */ - if (0 != (res_thread_create = - create_thread (&d->pid, daemon, &MHD_select_thread, d))) - { -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to create pool thread: %s\n", - MHD_strerror_ (res_thread_create)); -#endif - /* Free memory for this worker; cleanup below handles - * all previously-created workers. */ - (void) MHD_mutex_destroy_ (&d->cleanup_connection_mutex); - goto thread_failed; - } - } - } -#if HTTPS_SUPPORT - /* API promises to never use the password after initialization, - so we additionally NULL it here to not deref a dangling pointer. */ - daemon->https_key_password = NULL; -#endif /* HTTPS_SUPPORT */ - - return daemon; - -thread_failed: - /* If no worker threads created, then shut down normally. Calling - MHD_stop_daemon (as we do below) doesn't work here since it - assumes a 0-sized thread pool means we had been in the default - MHD_USE_SELECT_INTERNALLY mode. */ - if (0 == i) - { - if ( (MHD_INVALID_SOCKET != socket_fd) && - (0 != MHD_socket_close_ (socket_fd)) ) - MHD_PANIC ("close failed\n"); - (void) MHD_mutex_destroy_ (&daemon->cleanup_connection_mutex); - (void) MHD_mutex_destroy_ (&daemon->per_ip_connection_mutex); - if (NULL != daemon->worker_pool) - free (daemon->worker_pool); - goto free_and_fail; - } - - /* Shutdown worker threads we've already created. Pretend - as though we had fully initialized our daemon, but - with a smaller number of threads than had been - requested. */ - daemon->worker_pool_size = i; - MHD_stop_daemon (daemon); - return NULL; - - free_and_fail: - /* clean up basic memory state in 'daemon' and return NULL to - indicate failure */ -#if EPOLL_SUPPORT - if (-1 != daemon->epoll_fd) - close (daemon->epoll_fd); -#endif -#ifdef DAUTH_SUPPORT - free (daemon->nnc); - (void) MHD_mutex_destroy_ (&daemon->nnc_lock); -#endif -#if HTTPS_SUPPORT - if (0 != (flags & MHD_USE_SSL)) - gnutls_priority_deinit (daemon->priority_cache); -#endif - free (daemon); - return NULL; -} - - -/** - * Close the given connection, remove it from all of its - * DLLs and move it into the cleanup queue. - * - * @param pos connection to move to cleanup - */ -static void -close_connection (struct MHD_Connection *pos) -{ - struct MHD_Daemon *daemon = pos->daemon; - - MHD_connection_close (pos, - MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN); - if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) - return; /* must let thread to the rest */ - if (pos->connection_timeout == pos->daemon->connection_timeout) - XDLL_remove (daemon->normal_timeout_head, - daemon->normal_timeout_tail, - pos); - else - XDLL_remove (daemon->manual_timeout_head, - daemon->manual_timeout_tail, - pos); - DLL_remove (daemon->connections_head, - daemon->connections_tail, - pos); - pos->event_loop_info = MHD_EVENT_LOOP_INFO_CLEANUP; - DLL_insert (daemon->cleanup_head, - daemon->cleanup_tail, - pos); -} - - -/** - * Close all connections for the daemon; must only be called after - * all of the threads have been joined and there is no more concurrent - * activity on the connection lists. - * - * @param daemon daemon to close down - */ -static void -close_all_connections (struct MHD_Daemon *daemon) -{ - struct MHD_Connection *pos; - - /* first, make sure all threads are aware of shutdown; need to - traverse DLLs in peace... */ - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_lock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to acquire cleanup mutex\n"); - for (pos = daemon->connections_head; NULL != pos; pos = pos->next) - { - shutdown (pos->socket_fd, - (pos->read_closed == MHD_YES) ? SHUT_WR : SHUT_RDWR); -#if WINDOWS - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_INVALID_PIPE_ != daemon->wpipe[1]) && - (1 != MHD_pipe_write_ (daemon->wpipe[1], "e", 1)) ) - MHD_PANIC ("failed to signal shutdown via pipe"); -#endif - } - if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && - (MHD_YES != MHD_mutex_unlock_ (&daemon->cleanup_connection_mutex)) ) - MHD_PANIC ("Failed to release cleanup mutex\n"); - - /* now, collect threads from thread pool */ - if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) - { - for (pos = daemon->connections_head; NULL != pos; pos = pos->next) - { - if (0 != MHD_join_thread_ (pos->pid)) - MHD_PANIC ("Failed to join a thread\n"); - pos->thread_joined = MHD_YES; - } - } - - /* now that we're alone, move everyone to cleanup */ - while (NULL != (pos = daemon->connections_head)) - close_connection (pos); - MHD_cleanup_connections (daemon); -} - - -#if EPOLL_SUPPORT -/** - * Shutdown epoll()-event loop by adding 'wpipe' to its event set. - * - * @param daemon daemon of which the epoll() instance must be signalled - */ -static void -epoll_shutdown (struct MHD_Daemon *daemon) -{ - struct epoll_event event; - - if (MHD_INVALID_PIPE_ == daemon->wpipe[1]) - { - /* wpipe was required in this mode, how could this happen? */ - MHD_PANIC ("Internal error\n"); - } - event.events = EPOLLOUT; - event.data.ptr = NULL; - if (0 != epoll_ctl (daemon->epoll_fd, - EPOLL_CTL_ADD, - daemon->wpipe[1], - &event)) - MHD_PANIC ("Failed to add wpipe to epoll set to signal termination\n"); -} -#endif - - -/** - * Shutdown an HTTP daemon. - * - * @param daemon daemon to stop - * @ingroup event - */ -void -MHD_stop_daemon (struct MHD_Daemon *daemon) -{ - MHD_socket fd; - unsigned int i; - - if (NULL == daemon) - return; - daemon->shutdown = MHD_YES; - fd = daemon->socket_fd; - daemon->socket_fd = MHD_INVALID_SOCKET; - /* Prepare workers for shutdown */ - if (NULL != daemon->worker_pool) - { - /* MHD_USE_NO_LISTEN_SOCKET disables thread pools, hence we need to check */ - for (i = 0; i < daemon->worker_pool_size; ++i) - { - daemon->worker_pool[i].shutdown = MHD_YES; - daemon->worker_pool[i].socket_fd = MHD_INVALID_SOCKET; -#if EPOLL_SUPPORT - if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) && - (-1 != daemon->worker_pool[i].epoll_fd) && - (MHD_INVALID_SOCKET == fd) ) - epoll_shutdown (&daemon->worker_pool[i]); -#endif - } - } - if (MHD_INVALID_PIPE_ != daemon->wpipe[1]) - { - if (1 != MHD_pipe_write_ (daemon->wpipe[1], "e", 1)) - MHD_PANIC ("failed to signal shutdown via pipe"); - } -#ifdef HAVE_LISTEN_SHUTDOWN - else - { - /* fd might be MHD_INVALID_SOCKET here due to 'MHD_quiesce_daemon' */ - if (MHD_INVALID_SOCKET != fd) - (void) shutdown (fd, SHUT_RDWR); - } -#endif -#if EPOLL_SUPPORT - if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) && - (-1 != daemon->epoll_fd) && - (MHD_INVALID_SOCKET == fd) ) - epoll_shutdown (daemon); -#endif - -#if DEBUG_CLOSE -#if HAVE_MESSAGES - MHD_DLOG (daemon, - "MHD listen socket shutdown\n"); -#endif -#endif - - - /* Signal workers to stop and clean them up */ - if (NULL != daemon->worker_pool) - { - /* MHD_USE_NO_LISTEN_SOCKET disables thread pools, hence we need to check */ - for (i = 0; i < daemon->worker_pool_size; ++i) - { - if (MHD_INVALID_PIPE_ != daemon->worker_pool[i].wpipe[1]) - { - if (1 != MHD_pipe_write_ (daemon->worker_pool[i].wpipe[1], "e", 1)) - MHD_PANIC ("failed to signal shutdown via pipe"); - } - if (0 != MHD_join_thread_ (daemon->worker_pool[i].pid)) - MHD_PANIC ("Failed to join a thread\n"); - close_all_connections (&daemon->worker_pool[i]); - (void) MHD_mutex_destroy_ (&daemon->worker_pool[i].cleanup_connection_mutex); -#if EPOLL_SUPPORT - if ( (-1 != daemon->worker_pool[i].epoll_fd) && - (0 != MHD_socket_close_ (daemon->worker_pool[i].epoll_fd)) ) - MHD_PANIC ("close failed\n"); -#endif - if ( (MHD_USE_SUSPEND_RESUME == (daemon->options & MHD_USE_SUSPEND_RESUME)) ) - { - if (MHD_INVALID_PIPE_ != daemon->worker_pool[i].wpipe[1]) - { - if (0 != MHD_pipe_close_ (daemon->worker_pool[i].wpipe[0])) - MHD_PANIC ("close failed\n"); - if (0 != MHD_pipe_close_ (daemon->worker_pool[i].wpipe[1])) - MHD_PANIC ("close failed\n"); - } - } - } - free (daemon->worker_pool); - } - else - { - /* clean up master threads */ - if ((0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || - ((0 != (daemon->options & MHD_USE_SELECT_INTERNALLY)) - && (0 == daemon->worker_pool_size))) - { - if (0 != MHD_join_thread_ (daemon->pid)) - { - MHD_PANIC ("Failed to join a thread\n"); - } - } - } - close_all_connections (daemon); - if ( (MHD_INVALID_SOCKET != fd) && - (0 != MHD_socket_close_ (fd)) ) - MHD_PANIC ("close failed\n"); - - /* TLS clean up */ -#if HTTPS_SUPPORT - if (MHD_YES == daemon->have_dhparams) - { - gnutls_dh_params_deinit (daemon->https_mem_dhparams); - daemon->have_dhparams = MHD_NO; - } - if (0 != (daemon->options & MHD_USE_SSL)) - { - gnutls_priority_deinit (daemon->priority_cache); - if (daemon->x509_cred) - gnutls_certificate_free_credentials (daemon->x509_cred); - } -#endif -#if EPOLL_SUPPORT - if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) && - (-1 != daemon->epoll_fd) && - (0 != MHD_socket_close_ (daemon->epoll_fd)) ) - MHD_PANIC ("close failed\n"); -#endif - -#ifdef DAUTH_SUPPORT - free (daemon->nnc); - (void) MHD_mutex_destroy_ (&daemon->nnc_lock); -#endif - (void) MHD_mutex_destroy_ (&daemon->per_ip_connection_mutex); - (void) MHD_mutex_destroy_ (&daemon->cleanup_connection_mutex); - - if (MHD_INVALID_PIPE_ != daemon->wpipe[1]) - { - if (0 != MHD_pipe_close_ (daemon->wpipe[0])) - MHD_PANIC ("close failed\n"); - if (0 != MHD_pipe_close_ (daemon->wpipe[1])) - MHD_PANIC ("close failed\n"); - } - free (daemon); -} - - -/** - * Obtain information about the given daemon - * (not fully implemented!). - * - * @param daemon what daemon to get information about - * @param info_type what information is desired? - * @param ... depends on @a info_type - * @return NULL if this information is not available - * (or if the @a info_type is unknown) - * @ingroup specialized - */ -const union MHD_DaemonInfo * -MHD_get_daemon_info (struct MHD_Daemon *daemon, - enum MHD_DaemonInfoType info_type, - ...) -{ - switch (info_type) - { - case MHD_DAEMON_INFO_KEY_SIZE: - return NULL; /* no longer supported */ - case MHD_DAEMON_INFO_MAC_KEY_SIZE: - return NULL; /* no longer supported */ - case MHD_DAEMON_INFO_LISTEN_FD: - return (const union MHD_DaemonInfo *) &daemon->socket_fd; -#if EPOLL_SUPPORT - case MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY: - return (const union MHD_DaemonInfo *) &daemon->epoll_fd; -#endif - case MHD_DAEMON_INFO_CURRENT_CONNECTIONS: - MHD_cleanup_connections (daemon); - if (daemon->worker_pool) - { - /* Collect the connection information stored in the workers. */ - unsigned int i; - - daemon->connections = 0; - for (i=0;iworker_pool_size;i++) - { - MHD_cleanup_connections (&daemon->worker_pool[i]); - daemon->connections += daemon->worker_pool[i].connections; - } - } - return (const union MHD_DaemonInfo *) &daemon->connections; - default: - return NULL; - }; -} - - -/** - * Sets the global error handler to a different implementation. @a cb - * will only be called in the case of typically fatal, serious - * internal consistency issues. These issues should only arise in the - * case of serious memory corruption or similar problems with the - * architecture. While @a cb is allowed to return and MHD will then - * try to continue, this is never safe. - * - * The default implementation that is used if no panic function is set - * simply prints an error message and calls `abort()`. Alternative - * implementations might call `exit()` or other similar functions. - * - * @param cb new error handler - * @param cls passed to @a cb - * @ingroup logging - */ -void -MHD_set_panic_func (MHD_PanicCallback cb, void *cls) -{ - mhd_panic = cb; - mhd_panic_cls = cls; -} - - -/** - * Obtain the version of this library - * - * @return static version string, e.g. "0.9.9" - * @ingroup specialized - */ -const char * -MHD_get_version (void) -{ -#ifdef PACKAGE_VERSION - return PACKAGE_VERSION; -#else /* !PACKAGE_VERSION */ - static char ver[12] = "\0\0\0\0\0\0\0\0\0\0\0"; - if (0 == ver[0]) - { - int res = MHD_snprintf_(ver, sizeof(ver), "%x.%x.%x", - (((int)MHD_VERSION >> 24) & 0xFF), - (((int)MHD_VERSION >> 16) & 0xFF), - (((int)MHD_VERSION >> 8) & 0xFF)); - if (0 >= res || sizeof(ver) <= res) - return "0.0.0"; /* Can't return real version*/ - } - return ver; -#endif /* !PACKAGE_VERSION */ -} - - -/** - * Get information about supported MHD features. - * Indicate that MHD was compiled with or without support for - * particular feature. Some features require additional support - * by kernel. Kernel support is not checked by this function. - * - * @param feature type of requested information - * @return #MHD_YES if feature is supported by MHD, #MHD_NO if - * feature is not supported or feature is unknown. - * @ingroup specialized - */ -_MHD_EXTERN int -MHD_is_feature_supported(enum MHD_FEATURE feature) -{ - switch(feature) - { - case MHD_FEATURE_MESSGES: -#if HAVE_MESSAGES - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_SSL: -#if HTTPS_SUPPORT - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_HTTPS_CERT_CALLBACK: -#if HTTPS_SUPPORT && GNUTLS_VERSION_MAJOR >= 3 - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_IPv6: -#ifdef HAVE_INET6 - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_IPv6_ONLY: -#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY) - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_POLL: -#ifdef HAVE_POLL - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_EPOLL: -#if EPOLL_SUPPORT - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_SHUTDOWN_LISTEN_SOCKET: -#ifdef HAVE_LISTEN_SHUTDOWN - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_SOCKETPAIR: -#ifdef MHD_DONT_USE_PIPES - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_TCP_FASTOPEN: -#ifdef TCP_FASTOPEN - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_BASIC_AUTH: -#if BAUTH_SUPPORT - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_DIGEST_AUTH: -#if DAUTH_SUPPORT - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_POSTPROCESSOR: -#if HAVE_POSTPROCESSOR - return MHD_YES; -#else - return MHD_NO; -#endif - case MHD_FEATURE_HTTPS_KEY_PASSWORD: -#if HTTPS_SUPPORT && GNUTLS_VERSION_NUMBER >= 0x030111 - return MHD_YES; -#else - return MHD_NO; -#endif - } - return MHD_NO; -} - - -#if HTTPS_SUPPORT && GCRYPT_VERSION_NUMBER < 0x010600 -#if defined(MHD_USE_POSIX_THREADS) -GCRY_THREAD_OPTION_PTHREAD_IMPL; -#elif defined(MHD_W32_MUTEX_) -static int gcry_w32_mutex_init (void **ppmtx) -{ - *ppmtx = malloc (sizeof (MHD_mutex_)); - - if (NULL == *ppmtx) - return ENOMEM; - - if (MHD_YES != MHD_mutex_create_ ((MHD_mutex_*)*ppmtx)) - { - free (*ppmtx); - *ppmtx = NULL; - return EPERM; - } - - return 0; -} -static int gcry_w32_mutex_destroy (void **ppmtx) - { int res = (MHD_YES == MHD_mutex_destroy_ ((MHD_mutex_*)*ppmtx)) ? 0 : 1; - free (*ppmtx); return res; } -static int gcry_w32_mutex_lock (void **ppmtx) - { return (MHD_YES == MHD_mutex_lock_ ((MHD_mutex_*)*ppmtx)) ? 0 : 1; } -static int gcry_w32_mutex_unlock (void **ppmtx) - { return (MHD_YES == MHD_mutex_unlock_ ((MHD_mutex_*)*ppmtx)) ? 0 : 1; } - -static struct gcry_thread_cbs gcry_threads_w32 = { - (GCRY_THREAD_OPTION_USER | (GCRY_THREAD_OPTION_VERSION << 8)), - NULL, gcry_w32_mutex_init, gcry_w32_mutex_destroy, - gcry_w32_mutex_lock, gcry_w32_mutex_unlock, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; - -#endif // defined(MHD_W32_MUTEX_) -#endif // HTTPS_SUPPORT && GCRYPT_VERSION_NUMBER < 0x010600 - - -/** - * Initialize do setup work. - */ -void MHD_init(void) -{ - mhd_panic = &mhd_panic_std; - mhd_panic_cls = NULL; - -#ifdef _WIN32 - WSADATA wsd; - if (0 != WSAStartup(MAKEWORD(2, 2), &wsd)) - MHD_PANIC ("Failed to initialize winsock\n"); - mhd_winsock_inited_ = 1; - if (2 != LOBYTE(wsd.wVersion) && 2 != HIBYTE(wsd.wVersion)) - MHD_PANIC ("Winsock version 2.2 is not available\n"); -#endif -#if HTTPS_SUPPORT -#if GCRYPT_VERSION_NUMBER < 0x010600 -#if defined(MHD_USE_POSIX_THREADS) - if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread)) - MHD_PANIC ("Failed to initialise multithreading in libgcrypt\n"); -#elif defined(MHD_W32_MUTEX_) - if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_w32)) - MHD_PANIC ("Failed to initialise multithreading in libgcrypt\n"); -#endif // defined(MHD_W32_MUTEX_) - gcry_check_version (NULL); -#else - if (NULL == gcry_check_version ("1.6.0")) - MHD_PANIC ("libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer\n"); -#endif - gnutls_global_init (); -#endif -} - - -void MHD_fini(void) -{ -#if HTTPS_SUPPORT - gnutls_global_deinit (); -#endif -#ifdef _WIN32 - if (mhd_winsock_inited_) - WSACleanup(); -#endif -} - -_SET_INIT_AND_DEINIT_FUNCS(MHD_init, MHD_fini); - -/* end of daemon.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/digestauth.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/digestauth.c deleted file mode 100644 index 9c3fe8c5..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/digestauth.c +++ /dev/null @@ -1,871 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2010, 2011, 2012 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/** - * @file digestauth.c - * @brief Implements HTTP digest authentication - * @author Amr Ali - * @author Matthieu Speder - */ -#include "platform.h" -#include -#include "internal.h" -#include "md5.h" - -#if defined(_WIN32) && defined(MHD_W32_MUTEX_) -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif /* _WIN32 && MHD_W32_MUTEX_ */ - -#define HASH_MD5_HEX_LEN (2 * MD5_DIGEST_SIZE) - -/** - * Beginning string for any valid Digest authentication header. - */ -#define _BASE "Digest " - -/** - * Maximum length of a username for digest authentication. - */ -#define MAX_USERNAME_LENGTH 128 - -/** - * Maximum length of a realm for digest authentication. - */ -#define MAX_REALM_LENGTH 256 - -/** - * Maximum length of the response in digest authentication. - */ -#define MAX_AUTH_RESPONSE_LENGTH 128 - - -/** - * convert bin to hex - * - * @param bin binary data - * @param len number of bytes in bin - * @param hex pointer to len*2+1 bytes - */ -static void -cvthex (const unsigned char *bin, - size_t len, - char *hex) -{ - size_t i; - unsigned int j; - - for (i = 0; i < len; ++i) - { - j = (bin[i] >> 4) & 0x0f; - hex[i * 2] = j <= 9 ? (j + '0') : (j + 'a' - 10); - j = bin[i] & 0x0f; - hex[i * 2 + 1] = j <= 9 ? (j + '0') : (j + 'a' - 10); - } - hex[len * 2] = '\0'; -} - - -/** - * calculate H(A1) as per RFC2617 spec and store the - * result in 'sessionkey'. - * - * @param alg The hash algorithm used, can be "md5" or "md5-sess" - * @param username A `char *' pointer to the username value - * @param realm A `char *' pointer to the realm value - * @param password A `char *' pointer to the password value - * @param nonce A `char *' pointer to the nonce value - * @param cnonce A `char *' pointer to the cnonce value - * @param sessionkey pointer to buffer of HASH_MD5_HEX_LEN+1 bytes - */ -static void -digest_calc_ha1 (const char *alg, - const char *username, - const char *realm, - const char *password, - const char *nonce, - const char *cnonce, - char *sessionkey) -{ - struct MD5Context md5; - unsigned char ha1[MD5_DIGEST_SIZE]; - - MD5Init (&md5); - MD5Update (&md5, username, strlen (username)); - MD5Update (&md5, ":", 1); - MD5Update (&md5, realm, strlen (realm)); - MD5Update (&md5, ":", 1); - MD5Update (&md5, password, strlen (password)); - MD5Final (ha1, &md5); - if (MHD_str_equal_caseless_(alg, "md5-sess")) - { - MD5Init (&md5); - MD5Update (&md5, ha1, sizeof (ha1)); - MD5Update (&md5, ":", 1); - MD5Update (&md5, nonce, strlen (nonce)); - MD5Update (&md5, ":", 1); - MD5Update (&md5, cnonce, strlen (cnonce)); - MD5Final (ha1, &md5); - } - cvthex (ha1, sizeof (ha1), sessionkey); -} - - -/** - * Calculate request-digest/response-digest as per RFC2617 spec - * - * @param ha1 H(A1) - * @param nonce nonce from server - * @param noncecount 8 hex digits - * @param cnonce client nonce - * @param qop qop-value: "", "auth" or "auth-int" - * @param method method from request - * @param uri requested URL - * @param hentity H(entity body) if qop="auth-int" - * @param response request-digest or response-digest - */ -static void -digest_calc_response (const char *ha1, - const char *nonce, - const char *noncecount, - const char *cnonce, - const char *qop, - const char *method, - const char *uri, - const char *hentity, - char *response) -{ - struct MD5Context md5; - unsigned char ha2[MD5_DIGEST_SIZE]; - unsigned char resphash[MD5_DIGEST_SIZE]; - char ha2hex[HASH_MD5_HEX_LEN + 1]; - - MD5Init (&md5); - MD5Update (&md5, method, strlen(method)); - MD5Update (&md5, ":", 1); - MD5Update (&md5, uri, strlen(uri)); -#if 0 - if (0 == strcasecmp(qop, "auth-int")) - { - /* This is dead code since the rest of this module does - not support auth-int. */ - MD5Update (&md5, ":", 1); - if (NULL != hentity) - MD5Update (&md5, hentity, strlen(hentity)); - } -#endif - MD5Final (ha2, &md5); - cvthex (ha2, MD5_DIGEST_SIZE, ha2hex); - MD5Init (&md5); - /* calculate response */ - MD5Update (&md5, ha1, HASH_MD5_HEX_LEN); - MD5Update (&md5, ":", 1); - MD5Update (&md5, nonce, strlen(nonce)); - MD5Update (&md5, ":", 1); - if ('\0' != *qop) - { - MD5Update (&md5, noncecount, strlen(noncecount)); - MD5Update (&md5, ":", 1); - MD5Update (&md5, cnonce, strlen(cnonce)); - MD5Update (&md5, ":", 1); - MD5Update (&md5, qop, strlen(qop)); - MD5Update (&md5, ":", 1); - } - MD5Update (&md5, ha2hex, HASH_MD5_HEX_LEN); - MD5Final (resphash, &md5); - cvthex (resphash, sizeof (resphash), response); -} - - -/** - * Lookup subvalue off of the HTTP Authorization header. - * - * A description of the input format for 'data' is at - * http://en.wikipedia.org/wiki/Digest_access_authentication - * - * - * @param dest where to store the result (possibly truncated if - * the buffer is not big enough). - * @param size size of dest - * @param data pointer to the Authorization header - * @param key key to look up in data - * @return size of the located value, 0 if otherwise - */ -static size_t -lookup_sub_value (char *dest, - size_t size, - const char *data, - const char *key) -{ - size_t keylen; - size_t len; - const char *ptr; - const char *eq; - const char *q1; - const char *q2; - const char *qn; - - if (0 == size) - return 0; - keylen = strlen (key); - ptr = data; - while ('\0' != *ptr) - { - if (NULL == (eq = strchr (ptr, '='))) - return 0; - q1 = eq + 1; - while (' ' == *q1) - q1++; - if ('\"' != *q1) - { - q2 = strchr (q1, ','); - qn = q2; - } - else - { - q1++; - q2 = strchr (q1, '\"'); - if (NULL == q2) - return 0; /* end quote not found */ - qn = q2 + 1; - } - if ((MHD_str_equal_caseless_n_(ptr, - key, - keylen)) && - (eq == &ptr[keylen]) ) - { - if (NULL == q2) - { - len = strlen (q1) + 1; - if (size > len) - size = len; - size--; - strncpy (dest, - q1, - size); - dest[size] = '\0'; - return size; - } - else - { - if (size > (size_t) ((q2 - q1) + 1)) - size = (q2 - q1) + 1; - size--; - memcpy (dest, - q1, - size); - dest[size] = '\0'; - return size; - } - } - if (NULL == qn) - return 0; - ptr = strchr (qn, ','); - if (NULL == ptr) - return 0; - ptr++; - while (' ' == *ptr) - ptr++; - } - return 0; -} - - -/** - * Check nonce-nc map array with either new nonce counter - * or a whole new nonce. - * - * @param connection The MHD connection structure - * @param nonce A pointer that referenced a zero-terminated array of nonce - * @param nc The nonce counter, zero to add the nonce to the array - * @return MHD_YES if successful, MHD_NO if invalid (or we have no NC array) - */ -static int -check_nonce_nc (struct MHD_Connection *connection, - const char *nonce, - unsigned long int nc) -{ - uint32_t off; - uint32_t mod; - const char *np; - - mod = connection->daemon->nonce_nc_size; - if (0 == mod) - return MHD_NO; /* no array! */ - /* super-fast xor-based "hash" function for HT lookup in nonce array */ - off = 0; - np = nonce; - while ('\0' != *np) - { - off = (off << 8) | (*np ^ (off >> 24)); - np++; - } - off = off % mod; - /* - * Look for the nonce, if it does exist and its corresponding - * nonce counter is less than the current nonce counter by 1, - * then only increase the nonce counter by one. - */ - - (void) MHD_mutex_lock_ (&connection->daemon->nnc_lock); - if (0 == nc) - { - strcpy(connection->daemon->nnc[off].nonce, - nonce); - connection->daemon->nnc[off].nc = 0; - (void) MHD_mutex_unlock_ (&connection->daemon->nnc_lock); - return MHD_YES; - } - if ( (nc <= connection->daemon->nnc[off].nc) || - (0 != strcmp(connection->daemon->nnc[off].nonce, nonce)) ) - { - (void) MHD_mutex_unlock_ (&connection->daemon->nnc_lock); -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Stale nonce received. If this happens a lot, you should probably increase the size of the nonce array.\n"); -#endif - return MHD_NO; - } - connection->daemon->nnc[off].nc = nc; - (void) MHD_mutex_unlock_ (&connection->daemon->nnc_lock); - return MHD_YES; -} - - -/** - * Get the username from the authorization header sent by the client - * - * @param connection The MHD connection structure - * @return NULL if no username could be found, a pointer - * to the username if found - * @ingroup authentication - */ -char * -MHD_digest_auth_get_username(struct MHD_Connection *connection) -{ - size_t len; - char user[MAX_USERNAME_LENGTH]; - const char *header; - - if (NULL == (header = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_AUTHORIZATION))) - return NULL; - if (0 != strncmp (header, _BASE, strlen (_BASE))) - return NULL; - header += strlen (_BASE); - if (0 == (len = lookup_sub_value (user, - sizeof (user), - header, - "username"))) - return NULL; - return strdup (user); -} - - -/** - * Calculate the server nonce so that it mitigates replay attacks - * The current format of the nonce is ... - * H(timestamp ":" method ":" random ":" uri ":" realm) + Hex(timestamp) - * - * @param nonce_time The amount of time in seconds for a nonce to be invalid - * @param method HTTP method - * @param rnd A pointer to a character array for the random seed - * @param rnd_size The size of the random seed array @a rnd - * @param uri HTTP URI (in MHD, without the arguments ("?k=v") - * @param realm A string of characters that describes the realm of auth. - * @param nonce A pointer to a character array for the nonce to put in - */ -static void -calculate_nonce (uint32_t nonce_time, - const char *method, - const char *rnd, - size_t rnd_size, - const char *uri, - const char *realm, - char *nonce) -{ - struct MD5Context md5; - unsigned char timestamp[4]; - unsigned char tmpnonce[MD5_DIGEST_SIZE]; - char timestamphex[sizeof(timestamp) * 2 + 1]; - - MD5Init (&md5); - timestamp[0] = (nonce_time & 0xff000000) >> 0x18; - timestamp[1] = (nonce_time & 0x00ff0000) >> 0x10; - timestamp[2] = (nonce_time & 0x0000ff00) >> 0x08; - timestamp[3] = (nonce_time & 0x000000ff); - MD5Update (&md5, timestamp, 4); - MD5Update (&md5, ":", 1); - MD5Update (&md5, method, strlen (method)); - MD5Update (&md5, ":", 1); - if (rnd_size > 0) - MD5Update (&md5, rnd, rnd_size); - MD5Update (&md5, ":", 1); - MD5Update (&md5, uri, strlen (uri)); - MD5Update (&md5, ":", 1); - MD5Update (&md5, realm, strlen (realm)); - MD5Final (tmpnonce, &md5); - cvthex (tmpnonce, sizeof (tmpnonce), nonce); - cvthex (timestamp, 4, timestamphex); - strncat (nonce, timestamphex, 8); -} - - -/** - * Test if the given key-value pair is in the headers for the - * given connection. - * - * @param connection the connection - * @param key the key - * @param value the value, can be NULL - * @return #MHD_YES if the key-value pair is in the headers, - * #MHD_NO if not - */ -static int -test_header (struct MHD_Connection *connection, - const char *key, - const char *value) -{ - struct MHD_HTTP_Header *pos; - - for (pos = connection->headers_received; NULL != pos; pos = pos->next) - { - if (MHD_GET_ARGUMENT_KIND != pos->kind) - continue; - if (0 != strcmp (key, pos->header)) - continue; - if ( (NULL == value) && - (NULL == pos->value) ) - return MHD_YES; - if ( (NULL == value) || - (NULL == pos->value) || - (0 != strcmp (value, pos->value)) ) - continue; - return MHD_YES; - } - return MHD_NO; -} - - -/** - * Check that the arguments given by the client as part - * of the authentication header match the arguments we - * got as part of the HTTP request URI. - * - * @param connection connections with headers to compare against - * @param args argument URI string (after "?" in URI) - * @return MHD_YES if the arguments match, - * MHD_NO if not - */ -static int -check_argument_match (struct MHD_Connection *connection, - const char *args) -{ - struct MHD_HTTP_Header *pos; - char *argb; - char *argp; - char *equals; - char *amper; - unsigned int num_headers; - - argb = strdup(args); - if (NULL == argb) - { -#if HAVE_MESSAGES - MHD_DLOG(connection->daemon, - "Failed to allocate memory for copy of URI arguments\n"); -#endif /* HAVE_MESSAGES */ - return MHD_NO; - } - num_headers = 0; - argp = argb; - while ( (NULL != argp) && - ('\0' != argp[0]) ) - { - equals = strchr (argp, '='); - if (NULL == equals) - { - /* add with 'value' NULL */ - connection->daemon->unescape_callback (connection->daemon->unescape_callback_cls, - connection, - argp); - if (MHD_YES != test_header (connection, argp, NULL)) - return MHD_NO; - num_headers++; - break; - } - equals[0] = '\0'; - equals++; - amper = strchr (equals, '&'); - if (NULL != amper) - { - amper[0] = '\0'; - amper++; - } - connection->daemon->unescape_callback (connection->daemon->unescape_callback_cls, - connection, - argp); - connection->daemon->unescape_callback (connection->daemon->unescape_callback_cls, - connection, - equals); - if (! test_header (connection, argp, equals)) - return MHD_NO; - num_headers++; - argp = amper; - } - - /* also check that the number of headers matches */ - for (pos = connection->headers_received; NULL != pos; pos = pos->next) - { - if (MHD_GET_ARGUMENT_KIND != pos->kind) - continue; - num_headers--; - } - if (0 != num_headers) - return MHD_NO; - return MHD_YES; -} - - -/** - * Authenticates the authorization header sent by the client - * - * @param connection The MHD connection structure - * @param realm The realm presented to the client - * @param username The username needs to be authenticated - * @param password The password used in the authentication - * @param nonce_timeout The amount of time for a nonce to be - * invalid in seconds - * @return #MHD_YES if authenticated, #MHD_NO if not, - * #MHD_INVALID_NONCE if nonce is invalid - * @ingroup authentication - */ -int -MHD_digest_auth_check (struct MHD_Connection *connection, - const char *realm, - const char *username, - const char *password, - unsigned int nonce_timeout) -{ - size_t len; - const char *header; - char *end; - char nonce[MAX_NONCE_LENGTH]; - char cnonce[MAX_NONCE_LENGTH]; - char qop[15]; /* auth,auth-int */ - char nc[20]; - char response[MAX_AUTH_RESPONSE_LENGTH]; - const char *hentity = NULL; /* "auth-int" is not supported */ - char ha1[HASH_MD5_HEX_LEN + 1]; - char respexp[HASH_MD5_HEX_LEN + 1]; - char noncehashexp[HASH_MD5_HEX_LEN + 9]; - uint32_t nonce_time; - uint32_t t; - size_t left; /* number of characters left in 'header' for 'uri' */ - unsigned long int nci; - - header = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_AUTHORIZATION); - if (NULL == header) - return MHD_NO; - if (0 != strncmp(header, _BASE, strlen(_BASE))) - return MHD_NO; - header += strlen (_BASE); - left = strlen (header); - - { - char un[MAX_USERNAME_LENGTH]; - - len = lookup_sub_value (un, - sizeof (un), - header, "username"); - if ( (0 == len) || - (0 != strcmp(username, un)) ) - return MHD_NO; - left -= strlen ("username") + len; - } - - { - char r[MAX_REALM_LENGTH]; - - len = lookup_sub_value(r, - sizeof (r), - header, "realm"); - if ( (0 == len) || - (0 != strcmp(realm, r)) ) - return MHD_NO; - left -= strlen ("realm") + len; - } - - if (0 == (len = lookup_sub_value (nonce, - sizeof (nonce), - header, "nonce"))) - return MHD_NO; - left -= strlen ("nonce") + len; - if (left > 32 * 1024) - { - /* we do not permit URIs longer than 32k, as we want to - make sure to not blow our stack (or per-connection - heap memory limit). Besides, 32k is already insanely - large, but of course in theory the - #MHD_OPTION_CONNECTION_MEMORY_LIMIT might be very large - and would thus permit sending a >32k authorization - header value. */ - return MHD_NO; - } - { - char *uri; - - uri = malloc(left + 1); - if (NULL == uri) - { -#if HAVE_MESSAGES - MHD_DLOG(connection->daemon, - "Failed to allocate memory for auth header processing\n"); -#endif /* HAVE_MESSAGES */ - return MHD_NO; - } - if (0 == lookup_sub_value (uri, - left + 1, - header, "uri")) - { - free(uri); - return MHD_NO; - } - - /* 8 = 4 hexadecimal numbers for the timestamp */ - nonce_time = strtoul (nonce + len - 8, (char **)NULL, 16); - t = (uint32_t) MHD_monotonic_time(); - /* - * First level vetting for the nonce validity: if the timestamp - * attached to the nonce exceeds `nonce_timeout', then the nonce is - * invalid. - */ - if ( (t > nonce_time + nonce_timeout) || - (nonce_time + nonce_timeout < nonce_time) ) - { - free(uri); - return MHD_INVALID_NONCE; - } - if (0 != strncmp (uri, - connection->url, - strlen (connection->url))) - { -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Authentication failed, URI does not match.\n"); -#endif - free(uri); - return MHD_NO; - } - { - const char *args = strchr (uri, '?'); - - if (NULL == args) - args = ""; - else - args++; - if (MHD_YES != - check_argument_match (connection, - args) ) - { -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Authentication failed, arguments do not match.\n"); -#endif - free(uri); - return MHD_NO; - } - } - calculate_nonce (nonce_time, - connection->method, - connection->daemon->digest_auth_random, - connection->daemon->digest_auth_rand_size, - connection->url, - realm, - noncehashexp); - /* - * Second level vetting for the nonce validity - * if the timestamp attached to the nonce is valid - * and possibly fabricated (in case of an attack) - * the attacker must also know the random seed to be - * able to generate a "sane" nonce, which if he does - * not, the nonce fabrication process going to be - * very hard to achieve. - */ - - if (0 != strcmp (nonce, noncehashexp)) - { - free(uri); - return MHD_INVALID_NONCE; - } - if ( (0 == lookup_sub_value (cnonce, - sizeof (cnonce), - header, "cnonce")) || - (0 == lookup_sub_value (qop, sizeof (qop), header, "qop")) || - ( (0 != strcmp (qop, "auth")) && - (0 != strcmp (qop, "")) ) || - (0 == lookup_sub_value (nc, sizeof (nc), header, "nc")) || - (0 == lookup_sub_value (response, sizeof (response), header, "response")) ) - { -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Authentication failed, invalid format.\n"); -#endif - free(uri); - return MHD_NO; - } - nci = strtoul (nc, &end, 16); - if ( ('\0' != *end) || - ( (LONG_MAX == nci) && - (ERANGE == errno) ) ) - { -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Authentication failed, invalid format.\n"); -#endif - free(uri); - return MHD_NO; /* invalid nonce format */ - } - /* - * Checking if that combination of nonce and nc is sound - * and not a replay attack attempt. Also adds the nonce - * to the nonce-nc map if it does not exist there. - */ - - if (MHD_YES != check_nonce_nc (connection, nonce, nci)) - { - free(uri); - return MHD_NO; - } - - digest_calc_ha1("md5", - username, - realm, - password, - nonce, - cnonce, - ha1); - digest_calc_response (ha1, - nonce, - nc, - cnonce, - qop, - connection->method, - uri, - hentity, - respexp); - free(uri); - return (0 == strcmp(response, respexp)) - ? MHD_YES - : MHD_NO; - } -} - - -/** - * Queues a response to request authentication from the client - * - * @param connection The MHD connection structure - * @param realm the realm presented to the client - * @param opaque string to user for opaque value - * @param response reply to send; should contain the "access denied" - * body; note that this function will set the "WWW Authenticate" - * header and that the caller should not do this - * @param signal_stale #MHD_YES if the nonce is invalid to add - * 'stale=true' to the authentication header - * @return #MHD_YES on success, #MHD_NO otherwise - * @ingroup authentication - */ -int -MHD_queue_auth_fail_response (struct MHD_Connection *connection, - const char *realm, - const char *opaque, - struct MHD_Response *response, - int signal_stale) -{ - int ret; - size_t hlen; - char nonce[HASH_MD5_HEX_LEN + 9]; - - /* Generating the server nonce */ - calculate_nonce ((uint32_t) MHD_monotonic_time(), - connection->method, - connection->daemon->digest_auth_random, - connection->daemon->digest_auth_rand_size, - connection->url, - realm, - nonce); - if (MHD_YES != check_nonce_nc (connection, nonce, 0)) - { -#if HAVE_MESSAGES - MHD_DLOG (connection->daemon, - "Could not register nonce (is the nonce array size zero?).\n"); -#endif - return MHD_NO; - } - /* Building the authentication header */ - hlen = MHD_snprintf_(NULL, - 0, - "Digest realm=\"%s\",qop=\"auth\",nonce=\"%s\",opaque=\"%s\"%s", - realm, - nonce, - opaque, - signal_stale - ? ",stale=\"true\"" - : ""); - { - char *header; - - header = malloc(hlen + 1); - if (NULL == header) - { -#if HAVE_MESSAGES - MHD_DLOG(connection->daemon, - "Failed to allocate memory for auth response header\n"); -#endif /* HAVE_MESSAGES */ - return MHD_NO; - } - - MHD_snprintf_(header, - hlen + 1, - "Digest realm=\"%s\",qop=\"auth\",nonce=\"%s\",opaque=\"%s\"%s", - realm, - nonce, - opaque, - signal_stale - ? ",stale=\"true\"" - : ""); - ret = MHD_add_response_header(response, - MHD_HTTP_HEADER_WWW_AUTHENTICATE, - header); - free(header); - } - if (MHD_YES == ret) - ret = MHD_queue_response(connection, - MHD_HTTP_UNAUTHORIZED, - response); - return ret; -} - - -/* end of digestauth.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/internal.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/internal.c deleted file mode 100644 index 6a9188fd..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/internal.c +++ /dev/null @@ -1,195 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file microhttpd/internal.c - * @brief internal shared structures - * @author Daniel Pittman - * @author Christian Grothoff - */ - -#include "internal.h" - -#if HAVE_MESSAGES -#if DEBUG_STATES -/** - * State to string dictionary. - */ -const char * -MHD_state_to_string (enum MHD_CONNECTION_STATE state) -{ - switch (state) - { - case MHD_CONNECTION_INIT: - return "connection init"; - case MHD_CONNECTION_URL_RECEIVED: - return "connection url received"; - case MHD_CONNECTION_HEADER_PART_RECEIVED: - return "header partially received"; - case MHD_CONNECTION_HEADERS_RECEIVED: - return "headers received"; - case MHD_CONNECTION_HEADERS_PROCESSED: - return "headers processed"; - case MHD_CONNECTION_CONTINUE_SENDING: - return "continue sending"; - case MHD_CONNECTION_CONTINUE_SENT: - return "continue sent"; - case MHD_CONNECTION_BODY_RECEIVED: - return "body received"; - case MHD_CONNECTION_FOOTER_PART_RECEIVED: - return "footer partially received"; - case MHD_CONNECTION_FOOTERS_RECEIVED: - return "footers received"; - case MHD_CONNECTION_HEADERS_SENDING: - return "headers sending"; - case MHD_CONNECTION_HEADERS_SENT: - return "headers sent"; - case MHD_CONNECTION_NORMAL_BODY_READY: - return "normal body ready"; - case MHD_CONNECTION_NORMAL_BODY_UNREADY: - return "normal body unready"; - case MHD_CONNECTION_CHUNKED_BODY_READY: - return "chunked body ready"; - case MHD_CONNECTION_CHUNKED_BODY_UNREADY: - return "chunked body unready"; - case MHD_CONNECTION_BODY_SENT: - return "body sent"; - case MHD_CONNECTION_FOOTERS_SENDING: - return "footers sending"; - case MHD_CONNECTION_FOOTERS_SENT: - return "footers sent"; - case MHD_CONNECTION_CLOSED: - return "closed"; - case MHD_TLS_CONNECTION_INIT: - return "secure connection init"; - default: - return "unrecognized connection state"; - } -} -#endif -#endif - -#if HAVE_MESSAGES -/** - * fprintf-like helper function for logging debug - * messages. - */ -void -MHD_DLOG (const struct MHD_Daemon *daemon, const char *format, ...) -{ - va_list va; - - if (0 == (daemon->options & MHD_USE_DEBUG)) - return; - va_start (va, format); - daemon->custom_error_log (daemon->custom_error_log_cls, format, va); - va_end (va); -} -#endif - - -/** - * Convert all occurences of '+' to ' '. - * - * @param arg string that is modified (in place), must be 0-terminated - */ -void -MHD_unescape_plus (char *arg) -{ - char *p; - - for (p=strchr (arg, '+'); NULL != p; p = strchr (p + 1, '+')) - *p = ' '; -} - - -/** - * Process escape sequences ('%HH') Updates val in place; the - * result should be UTF-8 encoded and cannot be larger than the input. - * The result must also still be 0-terminated. - * - * @param val value to unescape (modified in the process) - * @return length of the resulting val (strlen(val) maybe - * shorter afterwards due to elimination of escape sequences) - */ -size_t -MHD_http_unescape (char *val) -{ - char *rpos = val; - char *wpos = val; - char *end; - unsigned int num; - char buf3[3]; - - while ('\0' != *rpos) - { - switch (*rpos) - { - case '%': - if ( ('\0' == rpos[1]) || - ('\0' == rpos[2]) ) - { - *wpos = '\0'; - return wpos - val; - } - buf3[0] = rpos[1]; - buf3[1] = rpos[2]; - buf3[2] = '\0'; - num = strtoul (buf3, &end, 16); - if ('\0' == *end) - { - *wpos = (char)((unsigned char) num); - wpos++; - rpos += 3; - break; - } - /* intentional fall through! */ - default: - *wpos = *rpos; - wpos++; - rpos++; - } - } - *wpos = '\0'; /* add 0-terminator */ - return wpos - val; /* = strlen(val) */ -} - - -/** - * Equivalent to time(NULL) but tries to use some sort of monotonic - * clock that isn't affected by someone setting the system real time - * clock. - * - * @return 'current' time - */ -time_t -MHD_monotonic_time (void) -{ -#ifdef HAVE_CLOCK_GETTIME -#ifdef CLOCK_MONOTONIC - struct timespec ts; - - if (0 == clock_gettime (CLOCK_MONOTONIC, &ts)) - return ts.tv_sec; -#endif -#endif - return time (NULL); -} - -/* end of internal.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/internal.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/internal.h deleted file mode 100644 index 286aee68..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/internal.h +++ /dev/null @@ -1,1459 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007-2015 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file microhttpd/internal.h - * @brief internal shared structures - * @author Daniel Pittman - * @author Christian Grothoff - */ - -#ifndef INTERNAL_H -#define INTERNAL_H - -#include "platform.h" -#include "microhttpd.h" -#include "platform_interface.h" -#if HTTPS_SUPPORT -#include -#if GNUTLS_VERSION_MAJOR >= 3 -#include -#endif -#endif -#if EPOLL_SUPPORT -#include -#endif -#if HAVE_NETINET_TCP_H -/* for TCP_FASTOPEN */ -#include -#endif - - -/** - * Should we perform additional sanity checks at runtime (on our internal - * invariants)? This may lead to aborts, but can be useful for debugging. - */ -#define EXTRA_CHECKS MHD_NO - -#define MHD_MAX(a,b) ((a)<(b)) ? (b) : (a) -#define MHD_MIN(a,b) ((a)<(b)) ? (a) : (b) - - -/** - * Minimum size by which MHD tries to increment read/write buffers. - * We usually begin with half the available pool space for the - * IO-buffer, but if absolutely needed we additively grow by the - * number of bytes given here (up to -- theoretically -- the full pool - * space). - */ -#define MHD_BUF_INC_SIZE 1024 - - -/** - * Handler for fatal errors. - */ -extern MHD_PanicCallback mhd_panic; - -/** - * Closure argument for "mhd_panic". - */ -extern void *mhd_panic_cls; - -/* If we have Clang or gcc >= 4.5, use __buildin_unreachable() */ -#if defined(__clang__) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -#define BUILTIN_NOT_REACHED __builtin_unreachable() -#else -#define BUILTIN_NOT_REACHED -#endif - - -#if HAVE_MESSAGES -/** - * Trigger 'panic' action based on fatal errors. - * - * @param msg error message (const char *) - */ -#define MHD_PANIC(msg) do { mhd_panic (mhd_panic_cls, __FILE__, __LINE__, msg); BUILTIN_NOT_REACHED; } while (0) -#else -/** - * Trigger 'panic' action based on fatal errors. - * - * @param msg error message (const char *) - */ -#define MHD_PANIC(msg) do { mhd_panic (mhd_panic_cls, __FILE__, __LINE__, NULL); BUILTIN_NOT_REACHED; } while (0) -#endif - - -/** - * State of the socket with respect to epoll (bitmask). - */ -enum MHD_EpollState - { - - /** - * The socket is not involved with a defined state in epoll right - * now. - */ - MHD_EPOLL_STATE_UNREADY = 0, - - /** - * epoll told us that data was ready for reading, and we did - * not consume all of it yet. - */ - MHD_EPOLL_STATE_READ_READY = 1, - - /** - * epoll told us that space was available for writing, and we did - * not consume all of it yet. - */ - MHD_EPOLL_STATE_WRITE_READY = 2, - - /** - * Is this connection currently in the 'eready' EDLL? - */ - MHD_EPOLL_STATE_IN_EREADY_EDLL = 4, - - /** - * Is this connection currently in the 'epoll' set? - */ - MHD_EPOLL_STATE_IN_EPOLL_SET = 8, - - /** - * Is this connection currently suspended? - */ - MHD_EPOLL_STATE_SUSPENDED = 16 - }; - - -/** - * What is this connection waiting for? - */ -enum MHD_ConnectionEventLoopInfo - { - /** - * We are waiting to be able to read. - */ - MHD_EVENT_LOOP_INFO_READ = 0, - - /** - * We are waiting to be able to write. - */ - MHD_EVENT_LOOP_INFO_WRITE = 1, - - /** - * We are waiting for the application to provide data. - */ - MHD_EVENT_LOOP_INFO_BLOCK = 2, - - /** - * We are finished and are awaiting cleanup. - */ - MHD_EVENT_LOOP_INFO_CLEANUP = 3 - }; - - -/** - * Maximum length of a nonce in digest authentication. 32(MD5 Hex) + - * 8(Timestamp Hex) + 1(NULL); hence 41 should suffice, but Opera - * (already) takes more (see Mantis #1633), so we've increased the - * value to support something longer... - */ -#define MAX_NONCE_LENGTH 129 - - -/** - * A structure representing the internal holder of the - * nonce-nc map. - */ -struct MHD_NonceNc -{ - - /** - * Nonce counter, a value that increases for each subsequent - * request for the same nonce. - */ - unsigned long int nc; - - /** - * Nonce value: - */ - char nonce[MAX_NONCE_LENGTH]; - -}; - -#if HAVE_MESSAGES -/** - * fprintf-like helper function for logging debug - * messages. - */ -void -MHD_DLOG (const struct MHD_Daemon *daemon, - const char *format, ...); -#endif - - -/** - * Header or cookie in HTTP request or response. - */ -struct MHD_HTTP_Header -{ - /** - * Headers are kept in a linked list. - */ - struct MHD_HTTP_Header *next; - - /** - * The name of the header (key), without - * the colon. - */ - char *header; - - /** - * The value of the header. - */ - char *value; - - /** - * Type of the header (where in the HTTP - * protocol is this header from). - */ - enum MHD_ValueKind kind; - -}; - - -/** - * Representation of a response. - */ -struct MHD_Response -{ - - /** - * Headers to send for the response. Initially - * the linked list is created in inverse order; - * the order should be inverted before sending! - */ - struct MHD_HTTP_Header *first_header; - - /** - * Buffer pointing to data that we are supposed - * to send as a response. - */ - char *data; - - /** - * Closure to give to the content reader @e crc - * and content reader free callback @e crfc. - */ - void *crc_cls; - - /** - * How do we get more data? NULL if we are - * given all of the data up front. - */ - MHD_ContentReaderCallback crc; - - /** - * NULL if data must not be freed, otherwise - * either user-specified callback or "&free". - */ - MHD_ContentReaderFreeCallback crfc; - - /** - * Mutex to synchronize access to @e data, @e size and - * @e reference_count. - */ - MHD_mutex_ mutex; - - /** - * Set to #MHD_SIZE_UNKNOWN if size is not known. - */ - uint64_t total_size; - - /** - * At what offset in the stream is the - * beginning of @e data located? - */ - uint64_t data_start; - - /** - * Offset to start reading from when using @e fd. - */ - off_t fd_off; - - /** - * Number of bytes ready in @e data (buffer may be larger - * than what is filled with payload). - */ - size_t data_size; - - /** - * Size of the data buffer @e data. - */ - size_t data_buffer_size; - - /** - * Reference count for this response. Free - * once the counter hits zero. - */ - unsigned int reference_count; - - /** - * File-descriptor if this response is FD-backed. - */ - int fd; - - /** - * Flags set for the MHD response. - */ - enum MHD_ResponseFlags flags; - -}; - - -/** - * States in a state machine for a connection. - * - * Transitions are any-state to CLOSED, any state to state+1, - * FOOTERS_SENT to INIT. CLOSED is the terminal state and - * INIT the initial state. - * - * Note that transitions for *reading* happen only after - * the input has been processed; transitions for - * *writing* happen after the respective data has been - * put into the write buffer (the write does not have - * to be completed yet). A transition to CLOSED or INIT - * requires the write to be complete. - */ -enum MHD_CONNECTION_STATE -{ - /** - * Connection just started (no headers received). - * Waiting for the line with the request type, URL and version. - */ - MHD_CONNECTION_INIT = 0, - - /** - * 1: We got the URL (and request type and version). Wait for a header line. - */ - MHD_CONNECTION_URL_RECEIVED = MHD_CONNECTION_INIT + 1, - - /** - * 2: We got part of a multi-line request header. Wait for the rest. - */ - MHD_CONNECTION_HEADER_PART_RECEIVED = MHD_CONNECTION_URL_RECEIVED + 1, - - /** - * 3: We got the request headers. Process them. - */ - MHD_CONNECTION_HEADERS_RECEIVED = MHD_CONNECTION_HEADER_PART_RECEIVED + 1, - - /** - * 4: We have processed the request headers. Send 100 continue. - */ - MHD_CONNECTION_HEADERS_PROCESSED = MHD_CONNECTION_HEADERS_RECEIVED + 1, - - /** - * 5: We have processed the headers and need to send 100 CONTINUE. - */ - MHD_CONNECTION_CONTINUE_SENDING = MHD_CONNECTION_HEADERS_PROCESSED + 1, - - /** - * 6: We have sent 100 CONTINUE (or do not need to). Read the message body. - */ - MHD_CONNECTION_CONTINUE_SENT = MHD_CONNECTION_CONTINUE_SENDING + 1, - - /** - * 7: We got the request body. Wait for a line of the footer. - */ - MHD_CONNECTION_BODY_RECEIVED = MHD_CONNECTION_CONTINUE_SENT + 1, - - /** - * 8: We got part of a line of the footer. Wait for the - * rest. - */ - MHD_CONNECTION_FOOTER_PART_RECEIVED = MHD_CONNECTION_BODY_RECEIVED + 1, - - /** - * 9: We received the entire footer. Wait for a response to be queued - * and prepare the response headers. - */ - MHD_CONNECTION_FOOTERS_RECEIVED = MHD_CONNECTION_FOOTER_PART_RECEIVED + 1, - - /** - * 10: We have prepared the response headers in the writ buffer. - * Send the response headers. - */ - MHD_CONNECTION_HEADERS_SENDING = MHD_CONNECTION_FOOTERS_RECEIVED + 1, - - /** - * 11: We have sent the response headers. Get ready to send the body. - */ - MHD_CONNECTION_HEADERS_SENT = MHD_CONNECTION_HEADERS_SENDING + 1, - - /** - * 12: We are ready to send a part of a non-chunked body. Send it. - */ - MHD_CONNECTION_NORMAL_BODY_READY = MHD_CONNECTION_HEADERS_SENT + 1, - - /** - * 13: We are waiting for the client to provide more - * data of a non-chunked body. - */ - MHD_CONNECTION_NORMAL_BODY_UNREADY = MHD_CONNECTION_NORMAL_BODY_READY + 1, - - /** - * 14: We are ready to send a chunk. - */ - MHD_CONNECTION_CHUNKED_BODY_READY = MHD_CONNECTION_NORMAL_BODY_UNREADY + 1, - - /** - * 15: We are waiting for the client to provide a chunk of the body. - */ - MHD_CONNECTION_CHUNKED_BODY_UNREADY = MHD_CONNECTION_CHUNKED_BODY_READY + 1, - - /** - * 16: We have sent the response body. Prepare the footers. - */ - MHD_CONNECTION_BODY_SENT = MHD_CONNECTION_CHUNKED_BODY_UNREADY + 1, - - /** - * 17: We have prepared the response footer. Send it. - */ - MHD_CONNECTION_FOOTERS_SENDING = MHD_CONNECTION_BODY_SENT + 1, - - /** - * 18: We have sent the response footer. Shutdown or restart. - */ - MHD_CONNECTION_FOOTERS_SENT = MHD_CONNECTION_FOOTERS_SENDING + 1, - - /** - * 19: This connection is to be closed. - */ - MHD_CONNECTION_CLOSED = MHD_CONNECTION_FOOTERS_SENT + 1, - - /** - * 20: This connection is finished (only to be freed) - */ - MHD_CONNECTION_IN_CLEANUP = MHD_CONNECTION_CLOSED + 1, - - /* - * SSL/TLS connection states - */ - - /** - * The initial connection state for all secure connectoins - * Handshake messages will be processed in this state & while - * in the 'MHD_TLS_HELLO_REQUEST' state - */ - MHD_TLS_CONNECTION_INIT = MHD_CONNECTION_IN_CLEANUP + 1 - -}; - -/** - * Should all state transitions be printed to stderr? - */ -#define DEBUG_STATES MHD_NO - - -#if HAVE_MESSAGES -#if DEBUG_STATES -const char * -MHD_state_to_string (enum MHD_CONNECTION_STATE state); -#endif -#endif - -/** - * Function to receive plaintext data. - * - * @param conn the connection struct - * @param write_to where to write received data - * @param max_bytes maximum number of bytes to receive - * @return number of bytes written to write_to - */ -typedef ssize_t -(*ReceiveCallback) (struct MHD_Connection *conn, - void *write_to, - size_t max_bytes); - - -/** - * Function to transmit plaintext data. - * - * @param conn the connection struct - * @param read_from where to read data to transmit - * @param max_bytes maximum number of bytes to transmit - * @return number of bytes transmitted - */ -typedef ssize_t -(*TransmitCallback) (struct MHD_Connection *conn, - const void *write_to, - size_t max_bytes); - - -/** - * State kept for each HTTP request. - */ -struct MHD_Connection -{ - -#if EPOLL_SUPPORT - /** - * Next pointer for the EDLL listing connections that are epoll-ready. - */ - struct MHD_Connection *nextE; - - /** - * Previous pointer for the EDLL listing connections that are epoll-ready. - */ - struct MHD_Connection *prevE; -#endif - - /** - * Next pointer for the DLL describing our IO state. - */ - struct MHD_Connection *next; - - /** - * Previous pointer for the DLL describing our IO state. - */ - struct MHD_Connection *prev; - - /** - * Next pointer for the XDLL organizing connections by timeout. - * This DLL can be either the - * 'manual_timeout_head/manual_timeout_tail' or the - * 'normal_timeout_head/normal_timeout_tail', depending on whether a - * custom timeout is set for the connection. - */ - struct MHD_Connection *nextX; - - /** - * Previous pointer for the XDLL organizing connections by timeout. - */ - struct MHD_Connection *prevX; - - /** - * Reference to the MHD_Daemon struct. - */ - struct MHD_Daemon *daemon; - - /** - * Linked list of parsed headers. - */ - struct MHD_HTTP_Header *headers_received; - - /** - * Tail of linked list of parsed headers. - */ - struct MHD_HTTP_Header *headers_received_tail; - - /** - * Response to transmit (initially NULL). - */ - struct MHD_Response *response; - - /** - * The memory pool is created whenever we first read - * from the TCP stream and destroyed at the end of - * each request (and re-created for the next request). - * In the meantime, this pointer is NULL. The - * pool is used for all connection-related data - * except for the response (which maybe shared between - * connections) and the IP address (which persists - * across individual requests). - */ - struct MemoryPool *pool; - - /** - * We allow the main application to associate some pointer with the - * HTTP request, which is passed to each #MHD_AccessHandlerCallback - * and some other API calls. Here is where we store it. (MHD does - * not know or care what it is). - */ - void *client_context; - - /** - * We allow the main application to associate some pointer with the - * TCP connection (which may span multiple HTTP requests). Here is - * where we store it. (MHD does not know or care what it is). - * The location is given to the #MHD_NotifyConnectionCallback and - * also accessible via #MHD_CONNECTION_INFO_SOCKET_CONTEXT. - */ - void *socket_context; - - /** - * Request method. Should be GET/POST/etc. Allocated - * in pool. - */ - char *method; - - /** - * Requested URL (everything after "GET" only). Allocated - * in pool. - */ - char *url; - - /** - * HTTP version string (i.e. http/1.1). Allocated - * in pool. - */ - char *version; - - /** - * Buffer for reading requests. Allocated - * in pool. Actually one byte larger than - * @e read_buffer_size (if non-NULL) to allow for - * 0-termination. - */ - char *read_buffer; - - /** - * Buffer for writing response (headers only). Allocated - * in pool. - */ - char *write_buffer; - - /** - * Last incomplete header line during parsing of headers. - * Allocated in pool. Only valid if state is - * either #MHD_CONNECTION_HEADER_PART_RECEIVED or - * #MHD_CONNECTION_FOOTER_PART_RECEIVED. - */ - char *last; - - /** - * Position after the colon on the last incomplete header - * line during parsing of headers. - * Allocated in pool. Only valid if state is - * either #MHD_CONNECTION_HEADER_PART_RECEIVED or - * #MHD_CONNECTION_FOOTER_PART_RECEIVED. - */ - char *colon; - - /** - * Foreign address (of length @e addr_len). MALLOCED (not - * in pool!). - */ - struct sockaddr *addr; - - /** - * Thread handle for this connection (if we are using - * one thread per connection). - */ - MHD_thread_handle_ pid; - - /** - * Size of read_buffer (in bytes). This value indicates - * how many bytes we're willing to read into the buffer; - * the real buffer is one byte longer to allow for - * adding zero-termination (when needed). - */ - size_t read_buffer_size; - - /** - * Position where we currently append data in - * read_buffer (last valid position). - */ - size_t read_buffer_offset; - - /** - * Size of write_buffer (in bytes). - */ - size_t write_buffer_size; - - /** - * Offset where we are with sending from write_buffer. - */ - size_t write_buffer_send_offset; - - /** - * Last valid location in write_buffer (where do we - * append and up to where is it safe to send?) - */ - size_t write_buffer_append_offset; - - /** - * How many more bytes of the body do we expect - * to read? #MHD_SIZE_UNKNOWN for unknown. - */ - uint64_t remaining_upload_size; - - /** - * Current write position in the actual response - * (excluding headers, content only; should be 0 - * while sending headers). - */ - uint64_t response_write_position; - - /** - * Position in the 100 CONTINUE message that - * we need to send when receiving http 1.1 requests. - */ - size_t continue_message_write_offset; - - /** - * Length of the foreign address. - */ - socklen_t addr_len; - - /** - * Last time this connection had any activity - * (reading or writing). - */ - time_t last_activity; - - /** - * After how many seconds of inactivity should - * this connection time out? Zero for no timeout. - */ - unsigned int connection_timeout; - - /** - * Did we ever call the "default_handler" on this connection? - * (this flag will determine if we call the 'notify_completed' - * handler when the connection closes down). - */ - int client_aware; - - /** - * Socket for this connection. Set to #MHD_INVALID_SOCKET if - * this connection has died (daemon should clean - * up in that case). - */ - MHD_socket socket_fd; - - /** - * Has this socket been closed for reading (i.e. other side closed - * the connection)? If so, we must completely close the connection - * once we are done sending our response (and stop trying to read - * from this socket). - */ - int read_closed; - - /** - * Set to #MHD_YES if the thread has been joined. - */ - int thread_joined; - - /** - * Are we currently inside the "idle" handler (to avoid recursively invoking it). - */ - int in_idle; - -#if EPOLL_SUPPORT - /** - * What is the state of this socket in relation to epoll? - */ - enum MHD_EpollState epoll_state; -#endif - - /** - * State in the FSM for this connection. - */ - enum MHD_CONNECTION_STATE state; - - /** - * What is this connection waiting for? - */ - enum MHD_ConnectionEventLoopInfo event_loop_info; - - /** - * HTTP response code. Only valid if response object - * is already set. - */ - unsigned int responseCode; - - /** - * Set to MHD_YES if the response's content reader - * callback failed to provide data the last time - * we tried to read from it. In that case, the - * write socket should be marked as unready until - * the CRC call succeeds. - */ - int response_unready; - - /** - * Are we receiving with chunked encoding? This will be set to - * MHD_YES after we parse the headers and are processing the body - * with chunks. After we are done with the body and we are - * processing the footers; once the footers are also done, this will - * be set to MHD_NO again (before the final call to the handler). - */ - int have_chunked_upload; - - /** - * If we are receiving with chunked encoding, where are we right - * now? Set to 0 if we are waiting to receive the chunk size; - * otherwise, this is the size of the current chunk. A value of - * zero is also used when we're at the end of the chunks. - */ - size_t current_chunk_size; - - /** - * If we are receiving with chunked encoding, where are we currently - * with respect to the current chunk (at what offset / position)? - */ - size_t current_chunk_offset; - - /** - * Handler used for processing read connection operations - */ - int (*read_handler) (struct MHD_Connection *connection); - - /** - * Handler used for processing write connection operations - */ - int (*write_handler) (struct MHD_Connection *connection); - - /** - * Handler used for processing idle connection operations - */ - int (*idle_handler) (struct MHD_Connection *connection); - - /** - * Function used for reading HTTP request stream. - */ - ReceiveCallback recv_cls; - - /** - * Function used for writing HTTP response stream. - */ - TransmitCallback send_cls; - -#if HTTPS_SUPPORT - /** - * State required for HTTPS/SSL/TLS support. - */ - gnutls_session_t tls_session; - - /** - * Memory location to return for protocol session info. - */ - int protocol; - - /** - * Memory location to return for protocol session info. - */ - int cipher; - - /** - * Could it be that we are ready to read due to TLS buffers - * even though the socket is not? - */ - int tls_read_ready; -#endif - - /** - * Is the connection suspended? - */ - int suspended; - - /** - * Is the connection wanting to resume? - */ - int resuming; -}; - -/** - * Signature of function called to log URI accesses. - * - * @param cls closure - * @param uri uri being accessed - * @param con connection handle - * @return new closure - */ -typedef void * -(*LogCallback)(void * cls, - const char * uri, - struct MHD_Connection *con); - -/** - * Signature of function called to unescape URIs. See also - * #MHD_http_unescape(). - * - * @param cls closure - * @param conn connection handle - * @param uri 0-terminated string to unescape (should be updated) - * @return length of the resulting string - */ -typedef size_t -(*UnescapeCallback)(void *cls, - struct MHD_Connection *conn, - char *uri); - - -/** - * State kept for each MHD daemon. All connections are kept in two - * doubly-linked lists. The first one reflects the state of the - * connection in terms of what operations we are waiting for (read, - * write, locally blocked, cleanup) whereas the second is about its - * timeout state (default or custom). - */ -struct MHD_Daemon -{ - - /** - * Callback function for all requests. - */ - MHD_AccessHandlerCallback default_handler; - - /** - * Closure argument to default_handler. - */ - void *default_handler_cls; - - /** - * Head of doubly-linked list of our current, active connections. - */ - struct MHD_Connection *connections_head; - - /** - * Tail of doubly-linked list of our current, active connections. - */ - struct MHD_Connection *connections_tail; - - /** - * Head of doubly-linked list of our current but suspended connections. - */ - struct MHD_Connection *suspended_connections_head; - - /** - * Tail of doubly-linked list of our current but suspended connections. - */ - struct MHD_Connection *suspended_connections_tail; - - /** - * Head of doubly-linked list of connections to clean up. - */ - struct MHD_Connection *cleanup_head; - - /** - * Tail of doubly-linked list of connections to clean up. - */ - struct MHD_Connection *cleanup_tail; - -#if EPOLL_SUPPORT - /** - * Head of EDLL of connections ready for processing (in epoll mode). - */ - struct MHD_Connection *eready_head; - - /** - * Tail of EDLL of connections ready for processing (in epoll mode) - */ - struct MHD_Connection *eready_tail; -#endif - - /** - * Head of the XDLL of ALL connections with a default ('normal') - * timeout, sorted by timeout (earliest at the tail, most recently - * used connection at the head). MHD can just look at the tail of - * this list to determine the timeout for all of its elements; - * whenever there is an event of a connection, the connection is - * moved back to the tail of the list. - * - * All connections by default start in this list; if a custom - * timeout that does not match 'connection_timeout' is set, they - * are moved to the 'manual_timeout_head'-XDLL. - */ - struct MHD_Connection *normal_timeout_head; - - /** - * Tail of the XDLL of ALL connections with a default timeout, - * sorted by timeout (earliest timeout at the tail). - */ - struct MHD_Connection *normal_timeout_tail; - - /** - * Head of the XDLL of ALL connections with a non-default/custom - * timeout, unsorted. MHD will do a O(n) scan over this list to - * determine the current timeout. - */ - struct MHD_Connection *manual_timeout_head; - - /** - * Tail of the XDLL of ALL connections with a non-default/custom - * timeout, unsorted. - */ - struct MHD_Connection *manual_timeout_tail; - - /** - * Function to call to check if we should accept or reject an - * incoming request. May be NULL. - */ - MHD_AcceptPolicyCallback apc; - - /** - * Closure argument to apc. - */ - void *apc_cls; - - /** - * Function to call when we are done processing - * a particular request. May be NULL. - */ - MHD_RequestCompletedCallback notify_completed; - - /** - * Closure argument to notify_completed. - */ - void *notify_completed_cls; - - /** - * Function to call when we are starting/stopping - * a connection. May be NULL. - */ - MHD_NotifyConnectionCallback notify_connection; - - /** - * Closure argument to notify_connection. - */ - void *notify_connection_cls; - - /** - * Function to call with the full URI at the - * beginning of request processing. May be NULL. - *

    - * Returns the initial pointer to internal state - * kept by the client for the request. - */ - LogCallback uri_log_callback; - - /** - * Closure argument to @e uri_log_callback. - */ - void *uri_log_callback_cls; - - /** - * Function to call when we unescape escape sequences. - */ - UnescapeCallback unescape_callback; - - /** - * Closure for @e unescape_callback. - */ - void *unescape_callback_cls; - -#if HAVE_MESSAGES - /** - * Function for logging error messages (if we - * support error reporting). - */ - void (*custom_error_log) (void *cls, const char *fmt, va_list va); - - /** - * Closure argument to custom_error_log. - */ - void *custom_error_log_cls; -#endif - - /** - * Pointer to master daemon (NULL if this is the master) - */ - struct MHD_Daemon *master; - - /** - * Worker daemons (one per thread) - */ - struct MHD_Daemon *worker_pool; - - /** - * Table storing number of connections per IP - */ - void *per_ip_connection_count; - - /** - * Size of the per-connection memory pools. - */ - size_t pool_size; - - /** - * Increment for growth of the per-connection memory pools. - */ - size_t pool_increment; - - /** - * Size of threads created by MHD. - */ - size_t thread_stack_size; - - /** - * Number of worker daemons - */ - unsigned int worker_pool_size; - - /** - * The select thread handle (if we have internal select) - */ - MHD_thread_handle_ pid; - - /** - * Mutex for per-IP connection counts. - */ - MHD_mutex_ per_ip_connection_mutex; - - /** - * Mutex for (modifying) access to the "cleanup" connection DLL. - */ - MHD_mutex_ cleanup_connection_mutex; - - /** - * Listen socket. - */ - MHD_socket socket_fd; - - /** - * Whether to allow/disallow/ignore reuse of listening address. - * The semantics is the following: - * 0: ignore (user did not ask for neither allow/disallow, use SO_REUSEADDR) - * >0: allow (use SO_REUSEPORT on most platforms, SO_REUSEADDR on Windows) - * <0: disallow (mostly no action, SO_EXCLUSIVEADDRUSE on Windows) - */ - int listening_address_reuse; - -#if EPOLL_SUPPORT - /** - * File descriptor associated with our epoll loop. - */ - int epoll_fd; - - /** - * MHD_YES if the listen socket is in the 'epoll' set, - * MHD_NO if not. - */ - int listen_socket_in_epoll; -#endif - - /** - * Pipe we use to signal shutdown, unless - * 'HAVE_LISTEN_SHUTDOWN' is defined AND we have a listen - * socket (which we can then 'shutdown' to stop listening). - * MHD can be build with usage of socketpair instead of - * pipe (forced on W32). - */ - MHD_pipe wpipe[2]; - - /** - * Are we shutting down? - */ - int shutdown; - - /* - * Do we need to process resuming connections? - */ - int resuming; - - /** - * Number of active parallel connections. - */ - unsigned int connections; - - /** - * Limit on the number of parallel connections. - */ - unsigned int connection_limit; - - /** - * After how many seconds of inactivity should - * connections time out? Zero for no timeout. - */ - unsigned int connection_timeout; - - /** - * Maximum number of connections per IP, or 0 for - * unlimited. - */ - unsigned int per_ip_connection_limit; - - /** - * Daemon's flags (bitfield). - */ - enum MHD_FLAG options; - - /** - * Listen port. - */ - uint16_t port; - -#if HTTPS_SUPPORT - /** - * Desired cipher algorithms. - */ - gnutls_priority_t priority_cache; - - /** - * What kind of credentials are we offering - * for SSL/TLS? - */ - gnutls_credentials_type_t cred_type; - - /** - * Server x509 credentials - */ - gnutls_certificate_credentials_t x509_cred; - - /** - * Diffie-Hellman parameters - */ - gnutls_dh_params_t dh_params; - -#if GNUTLS_VERSION_MAJOR >= 3 - /** - * Function that can be used to obtain the certificate. Needed - * for SNI support. See #MHD_OPTION_HTTPS_CERT_CALLBACK. - */ - gnutls_certificate_retrieve_function2 *cert_callback; -#endif - - /** - * Pointer to our SSL/TLS key (in ASCII) in memory. - */ - const char *https_mem_key; - - /** - * Pointer to our SSL/TLS certificate (in ASCII) in memory. - */ - const char *https_mem_cert; - - /** - * Pointer to 0-terminated HTTPS passphrase in memory. - */ - const char *https_key_password; - - /** - * Pointer to our SSL/TLS certificate authority (in ASCII) in memory. - */ - const char *https_mem_trust; - - /** - * Our Diffie-Hellman parameters in memory. - */ - gnutls_dh_params_t https_mem_dhparams; - - /** - * #MHD_YES if we have initialized @e https_mem_dhparams. - */ - int have_dhparams; - - /** - * For how many connections do we have 'tls_read_ready' set to MHD_YES? - * Used to avoid O(n) traversal over all connections when determining - * event-loop timeout (as it needs to be zero if there is any connection - * which might have ready data within TLS). - */ - unsigned int num_tls_read_ready; - -#endif - -#ifdef DAUTH_SUPPORT - - /** - * Character array of random values. - */ - const char *digest_auth_random; - - /** - * An array that contains the map nonce-nc. - */ - struct MHD_NonceNc *nnc; - - /** - * A rw-lock for synchronizing access to `nnc'. - */ - MHD_mutex_ nnc_lock; - - /** - * Size of `digest_auth_random. - */ - size_t digest_auth_rand_size; - - /** - * Size of the nonce-nc array. - */ - unsigned int nonce_nc_size; - -#endif - -#ifdef TCP_FASTOPEN - /** - * The queue size for incoming SYN + DATA packets. - */ - unsigned int fastopen_queue_size; -#endif -}; - - -#if EXTRA_CHECKS -#define EXTRA_CHECK(a) do { if (!(a)) abort(); } while (0) -#else -#define EXTRA_CHECK(a) -#endif - - -/** - * Insert an element at the head of a DLL. Assumes that head, tail and - * element are structs with prev and next fields. - * - * @param head pointer to the head of the DLL - * @param tail pointer to the tail of the DLL - * @param element element to insert - */ -#define DLL_insert(head,tail,element) do { \ - EXTRA_CHECK (NULL == (element)->next); \ - EXTRA_CHECK (NULL == (element)->prev); \ - (element)->next = (head); \ - (element)->prev = NULL; \ - if ((tail) == NULL) \ - (tail) = element; \ - else \ - (head)->prev = element; \ - (head) = (element); } while (0) - - -/** - * Remove an element from a DLL. Assumes - * that head, tail and element are structs - * with prev and next fields. - * - * @param head pointer to the head of the DLL - * @param tail pointer to the tail of the DLL - * @param element element to remove - */ -#define DLL_remove(head,tail,element) do { \ - EXTRA_CHECK ( (NULL != (element)->next) || ((element) == (tail))); \ - EXTRA_CHECK ( (NULL != (element)->prev) || ((element) == (head))); \ - if ((element)->prev == NULL) \ - (head) = (element)->next; \ - else \ - (element)->prev->next = (element)->next; \ - if ((element)->next == NULL) \ - (tail) = (element)->prev; \ - else \ - (element)->next->prev = (element)->prev; \ - (element)->next = NULL; \ - (element)->prev = NULL; } while (0) - - - -/** - * Insert an element at the head of a XDLL. Assumes that head, tail and - * element are structs with prevX and nextX fields. - * - * @param head pointer to the head of the XDLL - * @param tail pointer to the tail of the XDLL - * @param element element to insert - */ -#define XDLL_insert(head,tail,element) do { \ - EXTRA_CHECK (NULL == (element)->nextX); \ - EXTRA_CHECK (NULL == (element)->prevX); \ - (element)->nextX = (head); \ - (element)->prevX = NULL; \ - if (NULL == (tail)) \ - (tail) = element; \ - else \ - (head)->prevX = element; \ - (head) = (element); } while (0) - - -/** - * Remove an element from a XDLL. Assumes - * that head, tail and element are structs - * with prevX and nextX fields. - * - * @param head pointer to the head of the XDLL - * @param tail pointer to the tail of the XDLL - * @param element element to remove - */ -#define XDLL_remove(head,tail,element) do { \ - EXTRA_CHECK ( (NULL != (element)->nextX) || ((element) == (tail))); \ - EXTRA_CHECK ( (NULL != (element)->prevX) || ((element) == (head))); \ - if (NULL == (element)->prevX) \ - (head) = (element)->nextX; \ - else \ - (element)->prevX->nextX = (element)->nextX; \ - if (NULL == (element)->nextX) \ - (tail) = (element)->prevX; \ - else \ - (element)->nextX->prevX = (element)->prevX; \ - (element)->nextX = NULL; \ - (element)->prevX = NULL; } while (0) - - -/** - * Insert an element at the head of a EDLL. Assumes that head, tail and - * element are structs with prevE and nextE fields. - * - * @param head pointer to the head of the EDLL - * @param tail pointer to the tail of the EDLL - * @param element element to insert - */ -#define EDLL_insert(head,tail,element) do { \ - (element)->nextE = (head); \ - (element)->prevE = NULL; \ - if ((tail) == NULL) \ - (tail) = element; \ - else \ - (head)->prevE = element; \ - (head) = (element); } while (0) - - -/** - * Remove an element from a EDLL. Assumes - * that head, tail and element are structs - * with prevE and nextE fields. - * - * @param head pointer to the head of the EDLL - * @param tail pointer to the tail of the EDLL - * @param element element to remove - */ -#define EDLL_remove(head,tail,element) do { \ - if ((element)->prevE == NULL) \ - (head) = (element)->nextE; \ - else \ - (element)->prevE->nextE = (element)->nextE; \ - if ((element)->nextE == NULL) \ - (tail) = (element)->prevE; \ - else \ - (element)->nextE->prevE = (element)->prevE; \ - (element)->nextE = NULL; \ - (element)->prevE = NULL; } while (0) - - -/** - * Equivalent to `time(NULL)` but tries to use some sort of monotonic - * clock that isn't affected by someone setting the system real time - * clock. - * - * @return 'current' time - */ -time_t -MHD_monotonic_time(void); - - -/** - * Convert all occurences of '+' to ' '. - * - * @param arg string that is modified (in place), must be 0-terminated - */ -void -MHD_unescape_plus (char *arg); - - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/md5.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/md5.c deleted file mode 100644 index e35d5f26..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/md5.c +++ /dev/null @@ -1,267 +0,0 @@ -/* - * This code implements the MD5 message-digest algorithm. - * The algorithm is due to Ron Rivest. This code was - * written by Colin Plumb in 1993, no copyright is claimed. - * This code is in the public domain; do with it what you wish. - * - * Equivalent code is available from RSA Data Security, Inc. - * This code has been tested against that, and is equivalent, - * except that you don't need to include two pages of legalese - * with every copy. - * - * To compute the message digest of a chunk of bytes, declare an - * MD5Context structure, pass it to MD5Init, call MD5Update as - * needed on buffers full of bytes, and then call MD5Final, which - * will fill a supplied 16-byte array with the digest. - */ - -/* Brutally hacked by John Walker back from ANSI C to K&R (no - prototypes) to maintain the tradition that Netfone will compile - with Sun's original "cc". */ - -#include "md5.h" - - -#ifndef HIGHFIRST -#define byteReverse(buf, len) /* Nothing */ -#else -/* - * Note: this code is harmless on little-endian machines. - */ -static void -byteReverse(unsigned char *buf, - unsigned longs) -{ - uint32_t t; - do { - t = (uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 | - ((unsigned) buf[1] << 8 | buf[0]); - *(uint32_t *) buf = t; - buf += 4; - } while (--longs); -} -#endif - - -/* The four core functions - F1 is optimized somewhat */ - -/* #define F1(x, y, z) (x & y | ~x & z) */ -#define F1(x, y, z) (z ^ (x & (y ^ z))) -#define F2(x, y, z) F1(z, x, y) -#define F3(x, y, z) (x ^ y ^ z) -#define F4(x, y, z) (y ^ (x | ~z)) - -/* This is the central step in the MD5 algorithm. */ -#define MD5STEP(f, w, x, y, z, data, s) \ - ( w += f(x, y, z) + data, w = w<>(32-s), w += x ) - -/* - * The core of the MD5 algorithm, this alters an existing MD5 hash to - * reflect the addition of 16 longwords of new data. MD5Update blocks - * the data and converts bytes into longwords for this routine. - */ -static void -MD5Transform(uint32_t buf[4], - uint32_t in[16]) -{ - uint32_t a, b, c, d; - - a = buf[0]; - b = buf[1]; - c = buf[2]; - d = buf[3]; - - MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); - MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); - MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); - MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); - MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); - MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); - MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); - MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); - MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); - MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); - MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); - MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); - MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); - MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); - MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); - MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); - - MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); - MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); - MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); - MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); - MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); - MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); - MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); - MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); - MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); - MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); - MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); - MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); - MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); - MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); - MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); - MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); - - MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); - MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); - MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); - MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); - MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); - MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); - MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); - MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); - MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); - MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); - MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); - MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); - MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); - MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); - MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); - MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); - - MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); - MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); - MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); - MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); - MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); - MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); - MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); - MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); - MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); - MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); - MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); - MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); - MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); - MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); - MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); - MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); - - buf[0] += a; - buf[1] += b; - buf[2] += c; - buf[3] += d; -} - - -/* - * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious - * initialization constants. - */ -void -MD5Init(struct MD5Context *ctx) -{ - ctx->buf[0] = 0x67452301; - ctx->buf[1] = 0xefcdab89; - ctx->buf[2] = 0x98badcfe; - ctx->buf[3] = 0x10325476; - - ctx->bits[0] = 0; - ctx->bits[1] = 0; -} - -/* - * Update context to reflect the concatenation of another buffer full - * of bytes. - */ -void -MD5Update(struct MD5Context *ctx, - const void *data, - unsigned len) -{ - const unsigned char *buf = data; - uint32_t t; - - /* Update bitcount */ - - t = ctx->bits[0]; - if ((ctx->bits[0] = t + ((uint32_t) len << 3)) < t) - ctx->bits[1]++; /* Carry from low to high */ - ctx->bits[1] += len >> 29; - - t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */ - - /* Handle any leading odd-sized chunks */ - - if (t) { - unsigned char *p = (unsigned char *) ctx->in + t; - - t = 64 - t; - if (len < t) { - memcpy(p, buf, len); - return; - } - memcpy(p, buf, t); - byteReverse(ctx->in, 16); - MD5Transform(ctx->buf, (uint32_t *) ctx->in); - buf += t; - len -= t; - } - /* Process data in 64-byte chunks */ - - while (len >= 64) { - memcpy(ctx->in, buf, 64); - byteReverse(ctx->in, 16); - MD5Transform(ctx->buf, (uint32_t *) ctx->in); - buf += 64; - len -= 64; - } - - /* Handle any remaining bytes of data. */ - - memcpy(ctx->in, buf, len); -} - -/* - * Final wrapup - pad to 64-byte boundary with the bit pattern - * 1 0* (64-bit count of bits processed, MSB-first) - */ -void -MD5Final (unsigned char digest[16], - struct MD5Context *ctx) -{ - unsigned count; - unsigned char *p; - - /* Compute number of bytes mod 64 */ - count = (ctx->bits[0] >> 3) & 0x3F; - - /* Set the first char of padding to 0x80. This is safe since there is - always at least one byte free */ - p = ctx->in + count; - *p++ = 0x80; - - /* Bytes of padding needed to make 64 bytes */ - count = 64 - 1 - count; - - /* Pad out to 56 mod 64 */ - if (count < 8) - { - /* Two lots of padding: Pad the first block to 64 bytes */ - memset(p, 0, count); - byteReverse(ctx->in, 16); - MD5Transform(ctx->buf, (uint32_t *) ctx->in); - - /* Now fill the next block with 56 bytes */ - memset(ctx->in, 0, 56); - } - else - { - /* Pad block to 56 bytes */ - memset(p, 0, count - 8); - } - byteReverse(ctx->in, 14); - - /* Append length in bits and transform */ - ((uint32_t *) ctx->in)[14] = ctx->bits[0]; - ((uint32_t *) ctx->in)[15] = ctx->bits[1]; - - MD5Transform(ctx->buf, (uint32_t *) ctx->in); - byteReverse((unsigned char *) ctx->buf, 4); - memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(struct MD5Context)); /* In case it's sensitive */ -} - -/* end of md5.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/md5.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/md5.h deleted file mode 100644 index 5e77774c..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/md5.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This code implements the MD5 message-digest algorithm. - * The algorithm is due to Ron Rivest. This code was - * written by Colin Plumb in 1993, no copyright is claimed. - * This code is in the public domain; do with it what you wish. - * - * Equivalent code is available from RSA Data Security, Inc. - * This code has been tested against that, and is equivalent, - * except that you don't need to include two pages of legalese - * with every copy. - * - * To compute the message digest of a chunk of bytes, declare an - * MD5Context structure, pass it to MD5Init, call MD5Update as - * needed on buffers full of bytes, and then call MD5Final, which - * will fill a supplied 16-byte array with the digest. - */ - -/* Brutally hacked by John Walker back from ANSI C to K&R (no - prototypes) to maintain the tradition that Netfone will compile - with Sun's original "cc". */ - -#ifndef MD5_H -#define MD5_H - -#include "platform.h" -#ifdef WORDS_BIGENDIAN -#define HIGHFIRST -#endif - -#define MD5_DIGEST_SIZE 16 - -struct MD5Context -{ - uint32_t buf[4]; - uint32_t bits[2]; - unsigned char in[64]; -}; - - -void -MD5Init(struct MD5Context *ctx); - -void -MD5Update(struct MD5Context *ctx, - const void *buf, - unsigned len); - -void -MD5Final(unsigned char digest[MD5_DIGEST_SIZE], - struct MD5Context *ctx); - -#endif /* !MD5_H */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/memorypool.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/memorypool.c deleted file mode 100644 index 2f399319..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/memorypool.c +++ /dev/null @@ -1,284 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2009, 2010 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file memorypool.c - * @brief memory pool - * @author Christian Grothoff - */ -#include "memorypool.h" - -/* define MAP_ANONYMOUS for Mac OS X */ -#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) -#define MAP_ANONYMOUS MAP_ANON -#endif -#ifndef MAP_FAILED -#define MAP_FAILED ((void*)-1) -#endif - -/** - * Align to 2x word size (as GNU libc does). - */ -#define ALIGN_SIZE (2 * sizeof(void*)) - -/** - * Round up 'n' to a multiple of ALIGN_SIZE. - */ -#define ROUND_TO_ALIGN(n) ((n+(ALIGN_SIZE-1)) & (~(ALIGN_SIZE-1))) - - -/** - * Handle for a memory pool. Pools are not reentrant and must not be - * used by multiple threads. - */ -struct MemoryPool -{ - - /** - * Pointer to the pool's memory - */ - char *memory; - - /** - * Size of the pool. - */ - size_t size; - - /** - * Offset of the first unallocated byte. - */ - size_t pos; - - /** - * Offset of the last unallocated byte. - */ - size_t end; - - /** - * #MHD_NO if pool was malloc'ed, #MHD_YES if mmapped (VirtualAlloc'ed for W32). - */ - int is_mmap; -}; - - -/** - * Create a memory pool. - * - * @param max maximum size of the pool - * @return NULL on error - */ -struct MemoryPool * -MHD_pool_create (size_t max) -{ - struct MemoryPool *pool; - - pool = malloc (sizeof (struct MemoryPool)); - if (NULL == pool) - return NULL; -#if defined(MAP_ANONYMOUS) || defined(_WIN32) - if (max <= 32 * 1024) - pool->memory = MAP_FAILED; - else -#if defined(MAP_ANONYMOUS) && !defined(_WIN32) - pool->memory = mmap (NULL, max, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); -#elif defined(_WIN32) - pool->memory = VirtualAlloc(NULL, max, MEM_COMMIT | MEM_RESERVE, - PAGE_READWRITE); -#endif -#else - pool->memory = MAP_FAILED; -#endif - if ((pool->memory == MAP_FAILED) || (pool->memory == NULL)) - { - pool->memory = malloc (max); - if (pool->memory == NULL) - { - free (pool); - return NULL; - } - pool->is_mmap = MHD_NO; - } - else - { - pool->is_mmap = MHD_YES; - } - pool->pos = 0; - pool->end = max; - pool->size = max; - return pool; -} - - -/** - * Destroy a memory pool. - * - * @param pool memory pool to destroy - */ -void -MHD_pool_destroy (struct MemoryPool *pool) -{ - if (pool == NULL) - return; - if (pool->is_mmap == MHD_NO) - free (pool->memory); - else -#if defined(MAP_ANONYMOUS) && !defined(_WIN32) - munmap (pool->memory, pool->size); -#elif defined(_WIN32) - VirtualFree(pool->memory, 0, MEM_RELEASE); -#else - abort(); -#endif - free (pool); -} - - -/** - * Allocate size bytes from the pool. - * - * @param pool memory pool to use for the operation - * @param size number of bytes to allocate - * @param from_end allocate from end of pool (set to #MHD_YES); - * use this for small, persistent allocations that - * will never be reallocated - * @return NULL if the pool cannot support size more - * bytes - */ -void * -MHD_pool_allocate (struct MemoryPool *pool, - size_t size, int from_end) -{ - void *ret; - size_t asize; - - asize = ROUND_TO_ALIGN (size); - if ( (0 == asize) && (0 != size) ) - return NULL; /* size too close to SIZE_MAX */ - if ((pool->pos + asize > pool->end) || (pool->pos + asize < pool->pos)) - return NULL; - if (from_end == MHD_YES) - { - ret = &pool->memory[pool->end - asize]; - pool->end -= asize; - } - else - { - ret = &pool->memory[pool->pos]; - pool->pos += asize; - } - return ret; -} - - -/** - * Reallocate a block of memory obtained from the pool. - * This is particularly efficient when growing or - * shrinking the block that was last (re)allocated. - * If the given block is not the most recenlty - * (re)allocated block, the memory of the previous - * allocation may be leaked until the pool is - * destroyed (and copying the data maybe required). - * - * @param pool memory pool to use for the operation - * @param old the existing block - * @param old_size the size of the existing block - * @param new_size the new size of the block - * @return new address of the block, or - * NULL if the pool cannot support @a new_size - * bytes (old continues to be valid for @a old_size) - */ -void * -MHD_pool_reallocate (struct MemoryPool *pool, - void *old, - size_t old_size, - size_t new_size) -{ - void *ret; - size_t asize; - - asize = ROUND_TO_ALIGN (new_size); - if ( (0 == asize) && (0 != new_size) ) - return NULL; /* new_size too close to SIZE_MAX */ - if ((pool->end < old_size) || (pool->end < asize)) - return NULL; /* unsatisfiable or bogus request */ - - if ((pool->pos >= old_size) && (&pool->memory[pool->pos - old_size] == old)) - { - /* was the previous allocation - optimize! */ - if (pool->pos + asize - old_size <= pool->end) - { - /* fits */ - pool->pos += asize - old_size; - if (asize < old_size) /* shrinking - zero again! */ - memset (&pool->memory[pool->pos], 0, old_size - asize); - return old; - } - /* does not fit */ - return NULL; - } - if (asize <= old_size) - return old; /* cannot shrink, no need to move */ - if ((pool->pos + asize >= pool->pos) && - (pool->pos + asize <= pool->end)) - { - /* fits */ - ret = &pool->memory[pool->pos]; - memcpy (ret, old, old_size); - pool->pos += asize; - return ret; - } - /* does not fit */ - return NULL; -} - - -/** - * Clear all entries from the memory pool except - * for @a keep of the given @a size. - * - * @param pool memory pool to use for the operation - * @param keep pointer to the entry to keep (maybe NULL) - * @param size how many bytes need to be kept at this address - * @return addr new address of @a keep (if it had to change) - */ -void * -MHD_pool_reset (struct MemoryPool *pool, - void *keep, - size_t size) -{ - if (NULL != keep) - { - if (keep != pool->memory) - { - memmove (pool->memory, keep, size); - keep = pool->memory; - } - } - pool->end = pool->size; - memset (&pool->memory[size], - 0, - pool->size - size); - if (NULL != keep) - pool->pos = ROUND_TO_ALIGN(size); - return keep; -} - - -/* end of memorypool.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/memorypool.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/memorypool.h deleted file mode 100644 index 4db952a4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/memorypool.h +++ /dev/null @@ -1,114 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2009 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file memorypool.h - * @brief memory pool; mostly used for efficient (de)allocation - * for each connection and bounding memory use for each - * request - * @author Christian Grothoff - */ - -#ifndef MEMORYPOOL_H -#define MEMORYPOOL_H - -#include "internal.h" - -/** - * Opaque handle for a memory pool. - * Pools are not reentrant and must not be used - * by multiple threads. - */ -struct MemoryPool; - - -/** - * Create a memory pool. - * - * @param max maximum size of the pool - * @return NULL on error - */ -struct MemoryPool * -MHD_pool_create (size_t max); - - -/** - * Destroy a memory pool. - * - * @param pool memory pool to destroy - */ -void -MHD_pool_destroy (struct MemoryPool *pool); - - -/** - * Allocate size bytes from the pool. - * - * @param pool memory pool to use for the operation - * @param size number of bytes to allocate - * @param from_end allocate from end of pool (set to MHD_YES); - * use this for small, persistent allocations that - * will never be reallocated - * @return NULL if the pool cannot support size more - * bytes - */ -void * -MHD_pool_allocate (struct MemoryPool *pool, - size_t size, int from_end); - - -/** - * Reallocate a block of memory obtained from the pool. - * This is particularly efficient when growing or - * shrinking the block that was last (re)allocated. - * If the given block is not the most recenlty - * (re)allocated block, the memory of the previous - * allocation may be leaked until the pool is - * destroyed (and copying the data maybe required). - * - * @param pool memory pool to use for the operation - * @param old the existing block - * @param old_size the size of the existing block - * @param new_size the new size of the block - * @return new address of the block, or - * NULL if the pool cannot support new_size - * bytes (old continues to be valid for old_size) - */ -void * -MHD_pool_reallocate (struct MemoryPool *pool, - void *old, - size_t old_size, - size_t new_size); - - -/** - * Clear all entries from the memory pool except - * for "keep" of the given "size". - * - * @param pool memory pool to use for the operation - * @param keep pointer to the entry to keep (maybe NULL) - * @param size how many bytes need to be kept at this address - * @return addr new address of "keep" (if it had to change) - */ -void * -MHD_pool_reset (struct MemoryPool *pool, - void *keep, - size_t size); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/microhttpd_dll_res.rc.in b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/microhttpd_dll_res.rc.in deleted file mode 100644 index 923f3a90..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/microhttpd_dll_res.rc.in +++ /dev/null @@ -1,35 +0,0 @@ -/* W32 resources for .dll */ - -#include - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -VS_VERSION_INFO VERSIONINFO - FILEVERSION @PACKAGE_VERSION_MAJOR@,@PACKAGE_VERSION_MINOR@,@PACKAGE_VERSION_SUBMINOR@,0 - PRODUCTVERSION @PACKAGE_VERSION_MAJOR@,@PACKAGE_VERSION_MINOR@,@PACKAGE_VERSION_SUBMINOR@,0 - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0 - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "04090000" /* Lang = US English, Charset = ASCII */ - BEGIN - VALUE "ProductName", "GNU libmicrohttpd\0" - VALUE "ProductVersion", "@PACKAGE_VERSION@\0" - VALUE "FileVersion", "@PACKAGE_VERSION@\0" - VALUE "FileDescription", "GNU libmicrohttpd dll for Windows (GCC build)\0" - VALUE "InternalName", "libmicrohttpd\0" - VALUE "OriginalFilename", "libmicrohttpd.dll\0" - VALUE "CompanyName", "Free Software Foundation\0" - VALUE "LegalCopyright", "Copyright (C) 2007-2015 Christian Grothoff and project contributors\0" - VALUE "Comments", "http://www.gnu.org/software/libmicrohttpd/\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 0 /* US English, ASCII */ - END -END - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/postprocessor.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/postprocessor.c deleted file mode 100644 index d371f3d0..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/postprocessor.c +++ /dev/null @@ -1,1191 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007-2013 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file postprocessor.c - * @brief Methods for parsing POST data - * @author Christian Grothoff - */ - -#include "internal.h" - -/** - * Size of on-stack buffer that we use for un-escaping of the value. - * We use a pretty small value to be nice to the stack on embedded - * systems. - */ -#define XBUF_SIZE 512 - -/** - * States in the PP parser's state machine. - */ -enum PP_State -{ - /* general states */ - PP_Error, - PP_Done, - PP_Init, - PP_NextBoundary, - - /* url encoding-states */ - PP_ProcessValue, - PP_ExpectNewLine, - - /* post encoding-states */ - PP_ProcessEntryHeaders, - PP_PerformCheckMultipart, - PP_ProcessValueToBoundary, - PP_PerformCleanup, - - /* nested post-encoding states */ - PP_Nested_Init, - PP_Nested_PerformMarking, - PP_Nested_ProcessEntryHeaders, - PP_Nested_ProcessValueToBoundary, - PP_Nested_PerformCleanup - -}; - - -enum RN_State -{ - /** - * No RN-preprocessing in this state. - */ - RN_Inactive = 0, - - /** - * If the next character is CR, skip it. Otherwise, - * just go inactive. - */ - RN_OptN = 1, - - /** - * Expect LFCR (and only LFCR). As always, we also - * expect only LF or only CR. - */ - RN_Full = 2, - - /** - * Expect either LFCR or '--'LFCR. If '--'LFCR, transition into dash-state - * for the main state machine - */ - RN_Dash = 3, - - /** - * Got a single dash, expect second dash. - */ - RN_Dash2 = 4 -}; - - -/** - * Bits for the globally known fields that - * should not be deleted when we exit the - * nested state. - */ -enum NE_State -{ - NE_none = 0, - NE_content_name = 1, - NE_content_type = 2, - NE_content_filename = 4, - NE_content_transfer_encoding = 8 -}; - - -/** - * Internal state of the post-processor. Note that the fields - * are sorted by type to enable optimal packing by the compiler. - */ -struct MHD_PostProcessor -{ - - /** - * The connection for which we are doing - * POST processing. - */ - struct MHD_Connection *connection; - - /** - * Function to call with POST data. - */ - MHD_PostDataIterator ikvi; - - /** - * Extra argument to ikvi. - */ - void *cls; - - /** - * Encoding as given by the headers of the - * connection. - */ - const char *encoding; - - /** - * Primary boundary (points into encoding string) - */ - const char *boundary; - - /** - * Nested boundary (if we have multipart/mixed encoding). - */ - char *nested_boundary; - - /** - * Pointer to the name given in disposition. - */ - char *content_name; - - /** - * Pointer to the (current) content type. - */ - char *content_type; - - /** - * Pointer to the (current) filename. - */ - char *content_filename; - - /** - * Pointer to the (current) encoding. - */ - char *content_transfer_encoding; - - /** - * Unprocessed value bytes due to escape - * sequences (URL-encoding only). - */ - char xbuf[8]; - - /** - * Size of our buffer for the key. - */ - size_t buffer_size; - - /** - * Current position in the key buffer. - */ - size_t buffer_pos; - - /** - * Current position in xbuf. - */ - size_t xbuf_pos; - - /** - * Current offset in the value being processed. - */ - uint64_t value_offset; - - /** - * strlen(boundary) -- if boundary != NULL. - */ - size_t blen; - - /** - * strlen(nested_boundary) -- if nested_boundary != NULL. - */ - size_t nlen; - - /** - * Do we have to call the 'ikvi' callback when processing the - * multipart post body even if the size of the payload is zero? - * Set to #MHD_YES whenever we parse a new multiparty entry header, - * and to #MHD_NO the first time we call the 'ikvi' callback. - * Used to ensure that we do always call 'ikvi' even if the - * payload is empty (but not more than once). - */ - int must_ikvi; - - /** - * State of the parser. - */ - enum PP_State state; - - /** - * Side-state-machine: skip LRCR (or just LF). - * Set to 0 if we are not in skip mode. Set to 2 - * if a LFCR is expected, set to 1 if a CR should - * be skipped if it is the next character. - */ - enum RN_State skip_rn; - - /** - * If we are in skip_rn with "dash" mode and - * do find 2 dashes, what state do we go into? - */ - enum PP_State dash_state; - - /** - * Which headers are global? (used to tell which - * headers were only valid for the nested multipart). - */ - enum NE_State have; - -}; - - -/** - * Create a `struct MHD_PostProcessor`. - * - * A `struct MHD_PostProcessor` can be used to (incrementally) parse - * the data portion of a POST request. Note that some buggy browsers - * fail to set the encoding type. If you want to support those, you - * may have to call #MHD_set_connection_value with the proper encoding - * type before creating a post processor (if no supported encoding - * type is set, this function will fail). - * - * @param connection the connection on which the POST is - * happening (used to determine the POST format) - * @param buffer_size maximum number of bytes to use for - * internal buffering (used only for the parsing, - * specifically the parsing of the keys). A - * tiny value (256-1024) should be sufficient. - * Do NOT use a value smaller than 256. For good - * performance, use 32 or 64k (i.e. 65536). - * @param iter iterator to be called with the parsed data, - * Must NOT be NULL. - * @param iter_cls first argument to @a iter - * @return NULL on error (out of memory, unsupported encoding), - * otherwise a PP handle - * @ingroup request - */ -struct MHD_PostProcessor * -MHD_create_post_processor (struct MHD_Connection *connection, - size_t buffer_size, - MHD_PostDataIterator iter, void *iter_cls) -{ - struct MHD_PostProcessor *ret; - const char *encoding; - const char *boundary; - size_t blen; - - if ((buffer_size < 256) || (connection == NULL) || (iter == NULL)) - mhd_panic (mhd_panic_cls, __FILE__, __LINE__, NULL); - encoding = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - MHD_HTTP_HEADER_CONTENT_TYPE); - if (encoding == NULL) - return NULL; - boundary = NULL; - if (!MHD_str_equal_caseless_n_ (MHD_HTTP_POST_ENCODING_FORM_URLENCODED, encoding, - strlen (MHD_HTTP_POST_ENCODING_FORM_URLENCODED))) - { - if (!MHD_str_equal_caseless_n_ (MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA, encoding, - strlen (MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA))) - return NULL; - boundary = - &encoding[strlen (MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA)]; - /* Q: should this be "strcasestr"? */ - boundary = strstr (boundary, "boundary="); - if (NULL == boundary) - return NULL; /* failed to determine boundary */ - boundary += strlen ("boundary="); - blen = strlen (boundary); - if ((blen == 0) || (blen * 2 + 2 > buffer_size)) - return NULL; /* (will be) out of memory or invalid boundary */ - if ( (boundary[0] == '"') && (boundary[blen - 1] == '"') ) - { - /* remove enclosing quotes */ - ++boundary; - blen -= 2; - } - } - else - blen = 0; - buffer_size += 4; /* round up to get nice block sizes despite boundary search */ - - /* add +1 to ensure we ALWAYS have a zero-termination at the end */ - if (NULL == (ret = malloc (sizeof (struct MHD_PostProcessor) + buffer_size + 1))) - return NULL; - memset (ret, 0, sizeof (struct MHD_PostProcessor) + buffer_size + 1); - ret->connection = connection; - ret->ikvi = iter; - ret->cls = iter_cls; - ret->encoding = encoding; - ret->buffer_size = buffer_size; - ret->state = PP_Init; - ret->blen = blen; - ret->boundary = boundary; - ret->skip_rn = RN_Inactive; - return ret; -} - - -/** - * Process url-encoded POST data. - * - * @param pp post processor context - * @param post_data upload data - * @param post_data_len number of bytes in @a post_data - * @return #MHD_YES on success, #MHD_NO if there was an error processing the data - */ -static int -post_process_urlencoded (struct MHD_PostProcessor *pp, - const char *post_data, - size_t post_data_len) -{ - size_t equals; - size_t amper; - size_t poff; - size_t xoff; - size_t delta; - int end_of_value_found; - char *buf; - char xbuf[XBUF_SIZE + 1]; - - buf = (char *) &pp[1]; - poff = 0; - while (poff < post_data_len) - { - switch (pp->state) - { - case PP_Error: - return MHD_NO; - case PP_Done: - /* did not expect to receive more data */ - pp->state = PP_Error; - return MHD_NO; - case PP_Init: - equals = 0; - while ((equals + poff < post_data_len) && - (post_data[equals + poff] != '=')) - equals++; - if (equals + pp->buffer_pos > pp->buffer_size) - { - pp->state = PP_Error; /* out of memory */ - return MHD_NO; - } - memcpy (&buf[pp->buffer_pos], &post_data[poff], equals); - pp->buffer_pos += equals; - if (equals + poff == post_data_len) - return MHD_YES; /* no '=' yet */ - buf[pp->buffer_pos] = '\0'; /* 0-terminate key */ - pp->buffer_pos = 0; /* reset for next key */ - MHD_unescape_plus (buf); - MHD_http_unescape (buf); - poff += equals + 1; - pp->state = PP_ProcessValue; - pp->value_offset = 0; - break; - case PP_ProcessValue: - /* obtain rest of value from previous iteration */ - memcpy (xbuf, pp->xbuf, pp->xbuf_pos); - xoff = pp->xbuf_pos; - pp->xbuf_pos = 0; - - /* find last position in input buffer that is part of the value */ - amper = 0; - while ((amper + poff < post_data_len) && - (amper < XBUF_SIZE) && - (post_data[amper + poff] != '&') && - (post_data[amper + poff] != '\n') && - (post_data[amper + poff] != '\r')) - amper++; - end_of_value_found = ((amper + poff < post_data_len) && - ((post_data[amper + poff] == '&') || - (post_data[amper + poff] == '\n') || - (post_data[amper + poff] == '\r'))); - /* compute delta, the maximum number of bytes that we will be able to - process right now (either amper-limited of xbuf-size limited) */ - delta = amper; - if (delta > XBUF_SIZE - xoff) - delta = XBUF_SIZE - xoff; - - /* move input into processing buffer */ - memcpy (&xbuf[xoff], &post_data[poff], delta); - xoff += delta; - poff += delta; - - /* find if escape sequence is at the end of the processing buffer; - if so, exclude those from processing (reduce delta to point at - end of processed region) */ - delta = xoff; - if ((delta > 0) && (xbuf[delta - 1] == '%')) - delta--; - else if ((delta > 1) && (xbuf[delta - 2] == '%')) - delta -= 2; - - /* if we have an incomplete escape sequence, save it to - pp->xbuf for later */ - if (delta < xoff) - { - memcpy (pp->xbuf, &xbuf[delta], xoff - delta); - pp->xbuf_pos = xoff - delta; - xoff = delta; - } - - /* If we have nothing to do (delta == 0) and - not just because the value is empty (are - waiting for more data), go for next iteration */ - if ((xoff == 0) && (poff == post_data_len)) - continue; - - /* unescape */ - xbuf[xoff] = '\0'; /* 0-terminate in preparation */ - MHD_unescape_plus (xbuf); - xoff = MHD_http_unescape (xbuf); - /* finally: call application! */ - pp->must_ikvi = MHD_NO; - if (MHD_NO == pp->ikvi (pp->cls, MHD_POSTDATA_KIND, (const char *) &pp[1], /* key */ - NULL, NULL, NULL, xbuf, pp->value_offset, - xoff)) - { - pp->state = PP_Error; - return MHD_NO; - } - pp->value_offset += xoff; - - /* are we done with the value? */ - if (end_of_value_found) - { - /* we found the end of the value! */ - if ((post_data[poff] == '\n') || (post_data[poff] == '\r')) - { - pp->state = PP_ExpectNewLine; - } - else if (post_data[poff] == '&') - { - poff++; /* skip '&' */ - pp->state = PP_Init; - } - } - break; - case PP_ExpectNewLine: - if ((post_data[poff] == '\n') || (post_data[poff] == '\r')) - { - poff++; - /* we are done, report error if we receive any more... */ - pp->state = PP_Done; - return MHD_YES; - } - return MHD_NO; - default: - mhd_panic (mhd_panic_cls, __FILE__, __LINE__, NULL); /* should never happen! */ - } - } - return MHD_YES; -} - - -/** - * If the given line matches the prefix, strdup the - * rest of the line into the suffix ptr. - * - * @param prefix prefix to match - * @param line line to match prefix in - * @param suffix set to a copy of the rest of the line, starting at the end of the match - * @return #MHD_YES if there was a match, #MHD_NO if not - */ -static int -try_match_header (const char *prefix, char *line, char **suffix) -{ - if (NULL != *suffix) - return MHD_NO; - while (*line != 0) - { - if (MHD_str_equal_caseless_n_ (prefix, line, strlen (prefix))) - { - *suffix = strdup (&line[strlen (prefix)]); - return MHD_YES; - } - ++line; - } - return MHD_NO; -} - - -/** - * - * @param pp post processor context - * @param boundary boundary to look for - * @param blen number of bytes in boundary - * @param ioffptr set to the end of the boundary if found, - * otherwise incremented by one (FIXME: quirky API!) - * @param next_state state to which we should advance the post processor - * if the boundary is found - * @param next_dash_state dash_state to which we should advance the - * post processor if the boundary is found - * @return #MHD_NO if the boundary is not found, #MHD_YES if we did find it - */ -static int -find_boundary (struct MHD_PostProcessor *pp, - const char *boundary, - size_t blen, - size_t *ioffptr, - enum PP_State next_state, enum PP_State next_dash_state) -{ - char *buf = (char *) &pp[1]; - const char *dash; - - if (pp->buffer_pos < 2 + blen) - { - if (pp->buffer_pos == pp->buffer_size) - pp->state = PP_Error; /* out of memory */ - // ++(*ioffptr); - return MHD_NO; /* not enough data */ - } - if ((0 != memcmp ("--", buf, 2)) || (0 != memcmp (&buf[2], boundary, blen))) - { - if (pp->state != PP_Init) - { - /* garbage not allowed */ - pp->state = PP_Error; - } - else - { - /* skip over garbage (RFC 2046, 5.1.1) */ - dash = memchr (buf, '-', pp->buffer_pos); - if (NULL == dash) - (*ioffptr) += pp->buffer_pos; /* skip entire buffer */ - else - if (dash == buf) - (*ioffptr)++; /* at least skip one byte */ - else - (*ioffptr) += dash - buf; /* skip to first possible boundary */ - } - return MHD_NO; /* expected boundary */ - } - /* remove boundary from buffer */ - (*ioffptr) += 2 + blen; - /* next: start with headers */ - pp->skip_rn = RN_Dash; - pp->state = next_state; - pp->dash_state = next_dash_state; - return MHD_YES; -} - - -/** - * In buf, there maybe an expression '$key="$value"'. If that is the - * case, copy a copy of $value to destination. - * - * If destination is already non-NULL, do nothing. - */ -static void -try_get_value (const char *buf, - const char *key, - char **destination) -{ - const char *spos; - const char *bpos; - const char *endv; - size_t klen; - size_t vlen; - - if (NULL != *destination) - return; - bpos = buf; - klen = strlen (key); - while (NULL != (spos = strstr (bpos, key))) - { - if ((spos[klen] != '=') || ((spos != buf) && (spos[-1] != ' '))) - { - /* no match */ - bpos = spos + 1; - continue; - } - if (spos[klen + 1] != '"') - return; /* not quoted */ - if (NULL == (endv = strchr (&spos[klen + 2], '\"'))) - return; /* no end-quote */ - vlen = endv - spos - klen - 1; - *destination = malloc (vlen); - if (NULL == *destination) - return; /* out of memory */ - (*destination)[vlen - 1] = '\0'; - memcpy (*destination, &spos[klen + 2], vlen - 1); - return; /* success */ - } -} - - -/** - * Go over the headers of the part and update - * the fields in "pp" according to what we find. - * If we are at the end of the headers (as indicated - * by an empty line), transition into next_state. - * - * @param pp post processor context - * @param ioffptr set to how many bytes have been - * processed - * @param next_state state to which the post processor should - * be advanced if we find the end of the headers - * @return #MHD_YES if we can continue processing, - * #MHD_NO on error or if we do not have - * enough data yet - */ -static int -process_multipart_headers (struct MHD_PostProcessor *pp, - size_t *ioffptr, enum PP_State next_state) -{ - char *buf = (char *) &pp[1]; - size_t newline; - - newline = 0; - while ((newline < pp->buffer_pos) && - (buf[newline] != '\r') && (buf[newline] != '\n')) - newline++; - if (newline == pp->buffer_size) - { - pp->state = PP_Error; - return MHD_NO; /* out of memory */ - } - if (newline == pp->buffer_pos) - return MHD_NO; /* will need more data */ - if (0 == newline) - { - /* empty line - end of headers */ - pp->skip_rn = RN_Full; - pp->state = next_state; - return MHD_YES; - } - /* got an actual header */ - if (buf[newline] == '\r') - pp->skip_rn = RN_OptN; - buf[newline] = '\0'; - if (MHD_str_equal_caseless_n_ ("Content-disposition: ", - buf, strlen ("Content-disposition: "))) - { - try_get_value (&buf[strlen ("Content-disposition: ")], - "name", &pp->content_name); - try_get_value (&buf[strlen ("Content-disposition: ")], - "filename", &pp->content_filename); - } - else - { - try_match_header ("Content-type: ", buf, &pp->content_type); - try_match_header ("Content-Transfer-Encoding: ", - buf, &pp->content_transfer_encoding); - } - (*ioffptr) += newline + 1; - return MHD_YES; -} - - -/** - * We have the value until we hit the given boundary; - * process accordingly. - * - * @param pp post processor context - * @param ioffptr incremented based on the number of bytes processed - * @param boundary the boundary to look for - * @param blen strlen(boundary) - * @param next_state what state to go into after the - * boundary was found - * @param next_dash_state state to go into if the next - * boundary ends with "--" - * @return #MHD_YES if we can continue processing, - * #MHD_NO on error or if we do not have - * enough data yet - */ -static int -process_value_to_boundary (struct MHD_PostProcessor *pp, - size_t *ioffptr, - const char *boundary, - size_t blen, - enum PP_State next_state, - enum PP_State next_dash_state) -{ - char *buf = (char *) &pp[1]; - size_t newline; - const char *r; - - /* all data in buf until the boundary - (\r\n--+boundary) is part of the value */ - newline = 0; - while (1) - { - while (newline + 4 < pp->buffer_pos) - { - r = memchr (&buf[newline], '\r', pp->buffer_pos - newline - 4); - if (NULL == r) - { - newline = pp->buffer_pos - 4; - break; - } - newline = r - buf; - if (0 == memcmp ("\r\n--", &buf[newline], 4)) - break; - newline++; - } - if (newline + pp->blen + 4 <= pp->buffer_pos) - { - /* can check boundary */ - if (0 != memcmp (&buf[newline + 4], boundary, pp->blen)) - { - /* no boundary, "\r\n--" is part of content, skip */ - newline += 4; - continue; - } - else - { - /* boundary found, process until newline then - skip boundary and go back to init */ - pp->skip_rn = RN_Dash; - pp->state = next_state; - pp->dash_state = next_dash_state; - (*ioffptr) += pp->blen + 4; /* skip boundary as well */ - buf[newline] = '\0'; - break; - } - } - else - { - /* cannot check for boundary, process content that - we have and check again later; except, if we have - no content, abort (out of memory) */ - if ((0 == newline) && (pp->buffer_pos == pp->buffer_size)) - { - pp->state = PP_Error; - return MHD_NO; - } - break; - } - } - /* newline is either at beginning of boundary or - at least at the last character that we are sure - is not part of the boundary */ - if ( ( (MHD_YES == pp->must_ikvi) || - (0 != newline) ) && - (MHD_NO == pp->ikvi (pp->cls, - MHD_POSTDATA_KIND, - pp->content_name, - pp->content_filename, - pp->content_type, - pp->content_transfer_encoding, - buf, pp->value_offset, newline)) ) - { - pp->state = PP_Error; - return MHD_NO; - } - pp->must_ikvi = MHD_NO; - pp->value_offset += newline; - (*ioffptr) += newline; - return MHD_YES; -} - - -/** - * - * @param pp post processor context - */ -static void -free_unmarked (struct MHD_PostProcessor *pp) -{ - if ((NULL != pp->content_name) && (0 == (pp->have & NE_content_name))) - { - free (pp->content_name); - pp->content_name = NULL; - } - if ((NULL != pp->content_type) && (0 == (pp->have & NE_content_type))) - { - free (pp->content_type); - pp->content_type = NULL; - } - if ((NULL != pp->content_filename) && - (0 == (pp->have & NE_content_filename))) - { - free (pp->content_filename); - pp->content_filename = NULL; - } - if ((NULL != pp->content_transfer_encoding) && - (0 == (pp->have & NE_content_transfer_encoding))) - { - free (pp->content_transfer_encoding); - pp->content_transfer_encoding = NULL; - } -} - - -/** - * Decode multipart POST data. - * - * @param pp post processor context - * @param post_data data to decode - * @param post_data_len number of bytes in @a post_data - * @return #MHD_NO on error, - */ -static int -post_process_multipart (struct MHD_PostProcessor *pp, - const char *post_data, - size_t post_data_len) -{ - char *buf; - size_t max; - size_t ioff; - size_t poff; - int state_changed; - - buf = (char *) &pp[1]; - ioff = 0; - poff = 0; - state_changed = 1; - while ((poff < post_data_len) || - ((pp->buffer_pos > 0) && (state_changed != 0))) - { - /* first, move as much input data - as possible to our internal buffer */ - max = pp->buffer_size - pp->buffer_pos; - if (max > post_data_len - poff) - max = post_data_len - poff; - memcpy (&buf[pp->buffer_pos], &post_data[poff], max); - poff += max; - pp->buffer_pos += max; - if ((max == 0) && (state_changed == 0) && (poff < post_data_len)) - { - pp->state = PP_Error; - return MHD_NO; /* out of memory */ - } - state_changed = 0; - - /* first state machine for '\r'-'\n' and '--' handling */ - switch (pp->skip_rn) - { - case RN_Inactive: - break; - case RN_OptN: - if (buf[0] == '\n') - { - ioff++; - pp->skip_rn = RN_Inactive; - goto AGAIN; - } - /* fall-through! */ - case RN_Dash: - if (buf[0] == '-') - { - ioff++; - pp->skip_rn = RN_Dash2; - goto AGAIN; - } - pp->skip_rn = RN_Full; - /* fall-through! */ - case RN_Full: - if (buf[0] == '\r') - { - if ((pp->buffer_pos > 1) && (buf[1] == '\n')) - { - pp->skip_rn = RN_Inactive; - ioff += 2; - } - else - { - pp->skip_rn = RN_OptN; - ioff++; - } - goto AGAIN; - } - if (buf[0] == '\n') - { - ioff++; - pp->skip_rn = RN_Inactive; - goto AGAIN; - } - pp->skip_rn = RN_Inactive; - pp->state = PP_Error; - return MHD_NO; /* no '\r\n' */ - case RN_Dash2: - if (buf[0] == '-') - { - ioff++; - pp->skip_rn = RN_Full; - pp->state = pp->dash_state; - goto AGAIN; - } - pp->state = PP_Error; - break; - } - - /* main state engine */ - switch (pp->state) - { - case PP_Error: - return MHD_NO; - case PP_Done: - /* did not expect to receive more data */ - pp->state = PP_Error; - return MHD_NO; - case PP_Init: - /** - * Per RFC2046 5.1.1 NOTE TO IMPLEMENTORS, consume anything - * prior to the first multipart boundary: - * - * > There appears to be room for additional information prior - * > to the first boundary delimiter line and following the - * > final boundary delimiter line. These areas should - * > generally be left blank, and implementations must ignore - * > anything that appears before the first boundary delimiter - * > line or after the last one. - */ - (void) find_boundary (pp, - pp->boundary, - pp->blen, - &ioff, - PP_ProcessEntryHeaders, PP_Done); - break; - case PP_NextBoundary: - if (MHD_NO == find_boundary (pp, - pp->boundary, - pp->blen, - &ioff, - PP_ProcessEntryHeaders, PP_Done)) - { - if (pp->state == PP_Error) - return MHD_NO; - goto END; - } - break; - case PP_ProcessEntryHeaders: - pp->must_ikvi = MHD_YES; - if (MHD_NO == - process_multipart_headers (pp, &ioff, PP_PerformCheckMultipart)) - { - if (pp->state == PP_Error) - return MHD_NO; - else - goto END; - } - state_changed = 1; - break; - case PP_PerformCheckMultipart: - if ((pp->content_type != NULL) && - (MHD_str_equal_caseless_n_ (pp->content_type, - "multipart/mixed", - strlen ("multipart/mixed")))) - { - pp->nested_boundary = strstr (pp->content_type, "boundary="); - if (pp->nested_boundary == NULL) - { - pp->state = PP_Error; - return MHD_NO; - } - pp->nested_boundary = - strdup (&pp->nested_boundary[strlen ("boundary=")]); - if (pp->nested_boundary == NULL) - { - /* out of memory */ - pp->state = PP_Error; - return MHD_NO; - } - /* free old content type, we will need that field - for the content type of the nested elements */ - free (pp->content_type); - pp->content_type = NULL; - pp->nlen = strlen (pp->nested_boundary); - pp->state = PP_Nested_Init; - state_changed = 1; - break; - } - pp->state = PP_ProcessValueToBoundary; - pp->value_offset = 0; - state_changed = 1; - break; - case PP_ProcessValueToBoundary: - if (MHD_NO == process_value_to_boundary (pp, - &ioff, - pp->boundary, - pp->blen, - PP_PerformCleanup, - PP_Done)) - { - if (pp->state == PP_Error) - return MHD_NO; - break; - } - break; - case PP_PerformCleanup: - /* clean up state of one multipart form-data element! */ - pp->have = NE_none; - free_unmarked (pp); - if (pp->nested_boundary != NULL) - { - free (pp->nested_boundary); - pp->nested_boundary = NULL; - } - pp->state = PP_ProcessEntryHeaders; - state_changed = 1; - break; - case PP_Nested_Init: - if (pp->nested_boundary == NULL) - { - pp->state = PP_Error; - return MHD_NO; - } - if (MHD_NO == find_boundary (pp, - pp->nested_boundary, - pp->nlen, - &ioff, - PP_Nested_PerformMarking, - PP_NextBoundary /* or PP_Error? */ )) - { - if (pp->state == PP_Error) - return MHD_NO; - goto END; - } - break; - case PP_Nested_PerformMarking: - /* remember what headers were given - globally */ - pp->have = NE_none; - if (pp->content_name != NULL) - pp->have |= NE_content_name; - if (pp->content_type != NULL) - pp->have |= NE_content_type; - if (pp->content_filename != NULL) - pp->have |= NE_content_filename; - if (pp->content_transfer_encoding != NULL) - pp->have |= NE_content_transfer_encoding; - pp->state = PP_Nested_ProcessEntryHeaders; - state_changed = 1; - break; - case PP_Nested_ProcessEntryHeaders: - pp->value_offset = 0; - if (MHD_NO == - process_multipart_headers (pp, &ioff, - PP_Nested_ProcessValueToBoundary)) - { - if (pp->state == PP_Error) - return MHD_NO; - else - goto END; - } - state_changed = 1; - break; - case PP_Nested_ProcessValueToBoundary: - if (MHD_NO == process_value_to_boundary (pp, - &ioff, - pp->nested_boundary, - pp->nlen, - PP_Nested_PerformCleanup, - PP_NextBoundary)) - { - if (pp->state == PP_Error) - return MHD_NO; - break; - } - break; - case PP_Nested_PerformCleanup: - free_unmarked (pp); - pp->state = PP_Nested_ProcessEntryHeaders; - state_changed = 1; - break; - default: - mhd_panic (mhd_panic_cls, __FILE__, __LINE__, NULL); /* should never happen! */ - } - AGAIN: - if (ioff > 0) - { - memmove (buf, &buf[ioff], pp->buffer_pos - ioff); - pp->buffer_pos -= ioff; - ioff = 0; - state_changed = 1; - } - } -END: - if (ioff != 0) - { - memmove (buf, &buf[ioff], pp->buffer_pos - ioff); - pp->buffer_pos -= ioff; - } - if (poff < post_data_len) - { - pp->state = PP_Error; - return MHD_NO; /* serious error */ - } - return MHD_YES; -} - - -/** - * Parse and process POST data. Call this function when POST data is - * available (usually during an #MHD_AccessHandlerCallback) with the - * "upload_data" and "upload_data_size". Whenever possible, this will - * then cause calls to the #MHD_PostDataIterator. - * - * @param pp the post processor - * @param post_data @a post_data_len bytes of POST data - * @param post_data_len length of @a post_data - * @return #MHD_YES on success, #MHD_NO on error - * (out-of-memory, iterator aborted, parse error) - * @ingroup request - */ -int -MHD_post_process (struct MHD_PostProcessor *pp, - const char *post_data, size_t post_data_len) -{ - if (0 == post_data_len) - return MHD_YES; - if (NULL == pp) - return MHD_NO; - if (MHD_str_equal_caseless_n_ (MHD_HTTP_POST_ENCODING_FORM_URLENCODED, pp->encoding, - strlen(MHD_HTTP_POST_ENCODING_FORM_URLENCODED))) - return post_process_urlencoded (pp, post_data, post_data_len); - if (MHD_str_equal_caseless_n_ (MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA, pp->encoding, - strlen (MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA))) - return post_process_multipart (pp, post_data, post_data_len); - /* this should never be reached */ - return MHD_NO; -} - - -/** - * Release PostProcessor resources. - * - * @param pp post processor context to destroy - * @return #MHD_YES if processing completed nicely, - * #MHD_NO if there were spurious characters / formatting - * problems; it is common to ignore the return - * value of this function - * @ingroup request - */ -int -MHD_destroy_post_processor (struct MHD_PostProcessor *pp) -{ - int ret; - - if (NULL == pp) - return MHD_YES; - if (PP_ProcessValue == pp->state) - { - /* key without terminated value left at the end of the - buffer; fake receiving a termination character to - ensure it is also processed */ - post_process_urlencoded (pp, "\n", 1); - } - /* These internal strings need cleaning up since - the post-processing may have been interrupted - at any stage */ - if ((pp->xbuf_pos > 0) || - ( (pp->state != PP_Done) && - (pp->state != PP_ExpectNewLine))) - ret = MHD_NO; - else - ret = MHD_YES; - pp->have = NE_none; - free_unmarked (pp); - if (pp->nested_boundary != NULL) - free (pp->nested_boundary); - free (pp); - return ret; -} - -/* end of postprocessor.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/reason_phrase.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/reason_phrase.c deleted file mode 100644 index 3afe8af8..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/reason_phrase.c +++ /dev/null @@ -1,160 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2011 Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -/** - * @file reason_phrase.c - * @brief Tables of the string response phrases - * @author Elliot Glaysher - * @author Christian Grothoff (minor code clean up) - */ -#include "platform.h" -#include "reason_phrase.h" - -#ifndef NULL -#define NULL (void*)0 -#endif - -static const char *invalid_hundred[] = { NULL }; - -static const char *const one_hundred[] = { - "Continue", - "Switching Protocols", - "Processing" -}; - -static const char *const two_hundred[] = { - "OK", - "Created", - "Accepted", - "Non-Authoritative Information", - "No Content", - "Reset Content", - "Partial Content", - "Multi Status" -}; - -static const char *const three_hundred[] = { - "Multiple Choices", - "Moved Permanently", - "Moved Temporarily", - "See Other", - "Not Modified", - "Use Proxy", - "Switch Proxy", - "Temporary Redirect" -}; - -static const char *const four_hundred[] = { - "Bad Request", - "Unauthorized", - "Payment Required", - "Forbidden", - "Not Found", - "Method Not Allowed", - "Not Acceptable", - "Proxy Authentication Required", - "Request Time-out", - "Conflict", - "Gone", - "Length Required", - "Precondition Failed", - "Request Entity Too Large", - "Request-URI Too Large", - "Unsupported Media Type", - "Requested Range Not Satisfiable", - "Expectation Failed", - "Unknown", - "Unknown", - "Unknown", /* 420 */ - "Unknown", - "Unprocessable Entity", - "Locked", - "Failed Dependency", - "Unordered Collection", - "Upgrade Required", - "Unknown", - "Unknown", - "Unknown", - "Unknown", /* 430 */ - "Unknown", - "Unknown", - "Unknown", - "Unknown", - "Unknown", /* 435 */ - "Unknown", - "Unknown", - "Unknown", - "Unknown", - "Unknown", /* 440 */ - "Unknown", - "Unknown", - "Unknown", - "No Response", - "Unknown", /* 445 */ - "Unknown", - "Unknown", - "Unknown", - "Retry With", - "Blocked by Windows Parental Controls", /* 450 */ - "Unavailable For Legal Reasons" -}; - -static const char *const five_hundred[] = { - "Internal Server Error", - "Not Implemented", - "Bad Gateway", - "Service Unavailable", - "Gateway Time-out", - "HTTP Version not supported", - "Variant Also Negotiates", - "Insufficient Storage", - "Unknown", - "Bandwidth Limit Exceeded", - "Not Extended" -}; - - -struct MHD_Reason_Block -{ - unsigned int max; - const char *const*data; -}; - -#define BLOCK(m) { (sizeof(m) / sizeof(char*)), m } - -static const struct MHD_Reason_Block reasons[] = { - BLOCK (invalid_hundred), - BLOCK (one_hundred), - BLOCK (two_hundred), - BLOCK (three_hundred), - BLOCK (four_hundred), - BLOCK (five_hundred), -}; - - -const char * -MHD_get_reason_phrase_for (unsigned int code) -{ - if ( (code >= 100) && - (code < 600) && - (reasons[code / 100].max > (code % 100)) ) - return reasons[code / 100].data[code % 100]; - return "Unknown"; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/reason_phrase.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/reason_phrase.h deleted file mode 100644 index e4422329..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/reason_phrase.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Lymba - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file reason_phrase.c - * @brief Tables of the string response phrases - * @author Elliot Glaysher - */ - -#ifndef REASON_PHRASE_H -#define REASON_PHRASE_H - -/** - * Returns the string reason phrase for a response code. - * - * If we don't have a string for a status code, we give the first - * message in that status code class. - */ -const char *MHD_get_reason_phrase_for (unsigned int code); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/response.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/response.c deleted file mode 100644 index 47a439e4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/response.c +++ /dev/null @@ -1,525 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2009, 2010 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file response.c - * @brief Methods for managing response objects - * @author Daniel Pittman - * @author Christian Grothoff - */ - -#include "internal.h" -#include "response.h" - -#if defined(_WIN32) && defined(MHD_W32_MUTEX_) -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif /* _WIN32 && MHD_W32_MUTEX_ */ -#if defined(_WIN32) -#include /* for lseek(), read() */ -#endif /* _WIN32 */ - - -/** - * Add a header or footer line to the response. - * - * @param response response to add a header to - * @param kind header or footer - * @param header the header to add - * @param content value to add - * @return #MHD_NO on error (i.e. invalid header or content format). - */ -static int -add_response_entry (struct MHD_Response *response, - enum MHD_ValueKind kind, - const char *header, - const char *content) -{ - struct MHD_HTTP_Header *hdr; - - if ( (NULL == response) || - (NULL == header) || - (NULL == content) || - (0 == strlen (header)) || - (0 == strlen (content)) || - (NULL != strchr (header, '\t')) || - (NULL != strchr (header, '\r')) || - (NULL != strchr (header, '\n')) || - (NULL != strchr (content, '\t')) || - (NULL != strchr (content, '\r')) || - (NULL != strchr (content, '\n')) ) - return MHD_NO; - if (NULL == (hdr = malloc (sizeof (struct MHD_HTTP_Header)))) - return MHD_NO; - if (NULL == (hdr->header = strdup (header))) - { - free (hdr); - return MHD_NO; - } - if (NULL == (hdr->value = strdup (content))) - { - free (hdr->header); - free (hdr); - return MHD_NO; - } - hdr->kind = kind; - hdr->next = response->first_header; - response->first_header = hdr; - return MHD_YES; -} - - -/** - * Add a header line to the response. - * - * @param response response to add a header to - * @param header the header to add - * @param content value to add - * @return #MHD_NO on error (i.e. invalid header or content format). - * @ingroup response - */ -int -MHD_add_response_header (struct MHD_Response *response, - const char *header, const char *content) -{ - return add_response_entry (response, - MHD_HEADER_KIND, - header, - content); -} - - -/** - * Add a footer line to the response. - * - * @param response response to remove a header from - * @param footer the footer to delete - * @param content value to delete - * @return #MHD_NO on error (i.e. invalid footer or content format). - * @ingroup response - */ -int -MHD_add_response_footer (struct MHD_Response *response, - const char *footer, const char *content) -{ - return add_response_entry (response, - MHD_FOOTER_KIND, - footer, - content); -} - - -/** - * Delete a header (or footer) line from the response. - * - * @param response response to remove a header from - * @param header the header to delete - * @param content value to delete - * @return #MHD_NO on error (no such header known) - * @ingroup response - */ -int -MHD_del_response_header (struct MHD_Response *response, - const char *header, - const char *content) -{ - struct MHD_HTTP_Header *pos; - struct MHD_HTTP_Header *prev; - - if ( (NULL == header) || (NULL == content) ) - return MHD_NO; - prev = NULL; - pos = response->first_header; - while (pos != NULL) - { - if ((0 == strcmp (header, pos->header)) && - (0 == strcmp (content, pos->value))) - { - free (pos->header); - free (pos->value); - if (NULL == prev) - response->first_header = pos->next; - else - prev->next = pos->next; - free (pos); - return MHD_YES; - } - prev = pos; - pos = pos->next; - } - return MHD_NO; -} - - -/** - * Get all of the headers (and footers) added to a response. - * - * @param response response to query - * @param iterator callback to call on each header; - * maybe NULL (then just count headers) - * @param iterator_cls extra argument to @a iterator - * @return number of entries iterated over - * @ingroup response - */ -int -MHD_get_response_headers (struct MHD_Response *response, - MHD_KeyValueIterator iterator, void *iterator_cls) -{ - struct MHD_HTTP_Header *pos; - int numHeaders = 0; - - for (pos = response->first_header; NULL != pos; pos = pos->next) - { - numHeaders++; - if ((NULL != iterator) && - (MHD_YES != iterator (iterator_cls, - pos->kind, pos->header, pos->value))) - break; - } - return numHeaders; -} - - -/** - * Get a particular header (or footer) from the response. - * - * @param response response to query - * @param key which header to get - * @return NULL if header does not exist - * @ingroup response - */ -const char * -MHD_get_response_header (struct MHD_Response *response, - const char *key) -{ - struct MHD_HTTP_Header *pos; - - if (NULL == key) - return NULL; - for (pos = response->first_header; NULL != pos; pos = pos->next) - if (0 == strcmp (key, pos->header)) - return pos->value; - return NULL; -} - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response, #MHD_SIZE_UNKNOWN for unknown - * @param block_size preferred block size for querying crc (advisory only, - * MHD may still call @a crc using smaller chunks); this - * is essentially the buffer size used for IO, clients - * should pick a value that is appropriate for IO and - * memory performance requirements - * @param crc callback to use to obtain response data - * @param crc_cls extra argument to @a crc - * @param crfc callback to call to free @a crc_cls resources - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -struct MHD_Response * -MHD_create_response_from_callback (uint64_t size, - size_t block_size, - MHD_ContentReaderCallback crc, - void *crc_cls, - MHD_ContentReaderFreeCallback crfc) -{ - struct MHD_Response *response; - - if ((NULL == crc) || (0 == block_size)) - return NULL; - if (NULL == (response = malloc (sizeof (struct MHD_Response) + block_size))) - return NULL; - memset (response, 0, sizeof (struct MHD_Response)); - response->fd = -1; - response->data = (void *) &response[1]; - response->data_buffer_size = block_size; - if (MHD_YES != MHD_mutex_create_ (&response->mutex)) - { - free (response); - return NULL; - } - response->crc = crc; - response->crfc = crfc; - response->crc_cls = crc_cls; - response->reference_count = 1; - response->total_size = size; - return response; -} - - -/** - * Set special flags and options for a response. - * - * @param response the response to modify - * @param flags to set for the response - * @param ... #MHD_RO_END terminated list of options - * @return #MHD_YES on success, #MHD_NO on error - */ -int -MHD_set_response_options (struct MHD_Response *response, - enum MHD_ResponseFlags flags, - ...) -{ - va_list ap; - int ret; - enum MHD_ResponseOptions ro; - - ret = MHD_YES; - response->flags = flags; - va_start (ap, flags); - while (MHD_RO_END != (ro = va_arg (ap, enum MHD_ResponseOptions))) - { - switch (ro) - { - default: - ret = MHD_NO; - break; - } - } - va_end (ap); - return ret; -} - - -/** - * Given a file descriptor, read data from the file - * to generate the response. - * - * @param cls pointer to the response - * @param pos offset in the file to access - * @param buf where to write the data - * @param max number of bytes to write at most - * @return number of bytes written - */ -static ssize_t -file_reader (void *cls, uint64_t pos, char *buf, size_t max) -{ - struct MHD_Response *response = cls; - ssize_t n; - - (void) lseek (response->fd, pos + response->fd_off, SEEK_SET); - n = read (response->fd, buf, max); - if (0 == n) - return MHD_CONTENT_READER_END_OF_STREAM; - if (n < 0) - return MHD_CONTENT_READER_END_WITH_ERROR; - return n; -} - - -/** - * Destroy file reader context. Closes the file - * descriptor. - * - * @param cls pointer to file descriptor - */ -static void -free_callback (void *cls) -{ - struct MHD_Response *response = cls; - - (void) close (response->fd); - response->fd = -1; -} - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response - * @param fd file descriptor referring to a file on disk with the - * data; will be closed when response is destroyed; - * fd should be in 'blocking' mode - * @param offset offset to start reading from in the file; - * Be careful! `off_t` may have been compiled to be a - * 64-bit variable for MHD, in which case your application - * also has to be compiled using the same options! Read - * the MHD manual for more details. - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -struct MHD_Response * -MHD_create_response_from_fd_at_offset (size_t size, - int fd, - off_t offset) -{ - struct MHD_Response *response; - - response = MHD_create_response_from_callback (size, - 4 * 1024, - &file_reader, - NULL, - &free_callback); - if (NULL == response) - return NULL; - response->fd = fd; - response->fd_off = offset; - response->crc_cls = response; - return response; -} - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response - * @param fd file descriptor referring to a file on disk with the data - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -struct MHD_Response * -MHD_create_response_from_fd (size_t size, - int fd) -{ - return MHD_create_response_from_fd_at_offset (size, fd, 0); -} - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the @a data portion of the response - * @param data the data itself - * @param must_free libmicrohttpd should free data when done - * @param must_copy libmicrohttpd must make a copy of @a data - * right away, the data maybe released anytime after - * this call returns - * @return NULL on error (i.e. invalid arguments, out of memory) - * @deprecated use #MHD_create_response_from_buffer instead - * @ingroup response - */ -struct MHD_Response * -MHD_create_response_from_data (size_t size, - void *data, int must_free, int must_copy) -{ - struct MHD_Response *response; - void *tmp; - - if ((NULL == data) && (size > 0)) - return NULL; - if (NULL == (response = malloc (sizeof (struct MHD_Response)))) - return NULL; - memset (response, 0, sizeof (struct MHD_Response)); - response->fd = -1; - if (MHD_YES != MHD_mutex_create_ (&response->mutex)) - { - free (response); - return NULL; - } - if ((must_copy) && (size > 0)) - { - if (NULL == (tmp = malloc (size))) - { - (void) MHD_mutex_destroy_ (&response->mutex); - free (response); - return NULL; - } - memcpy (tmp, data, size); - must_free = MHD_YES; - data = tmp; - } - response->crc = NULL; - response->crfc = must_free ? &free : NULL; - response->crc_cls = must_free ? data : NULL; - response->reference_count = 1; - response->total_size = size; - response->data = data; - response->data_size = size; - return response; -} - - -/** - * Create a response object. The response object can be extended with - * header information and then be used any number of times. - * - * @param size size of the data portion of the response - * @param buffer size bytes containing the response's data portion - * @param mode flags for buffer management - * @return NULL on error (i.e. invalid arguments, out of memory) - * @ingroup response - */ -struct MHD_Response * -MHD_create_response_from_buffer (size_t size, - void *buffer, - enum MHD_ResponseMemoryMode mode) -{ - return MHD_create_response_from_data (size, - buffer, - mode == MHD_RESPMEM_MUST_FREE, - mode == MHD_RESPMEM_MUST_COPY); -} - - -/** - * Destroy a response object and associated resources. Note that - * libmicrohttpd may keep some of the resources around if the response - * is still in the queue for some clients, so the memory may not - * necessarily be freed immediatley. - * - * @param response response to destroy - * @ingroup response - */ -void -MHD_destroy_response (struct MHD_Response *response) -{ - struct MHD_HTTP_Header *pos; - - if (NULL == response) - return; - (void) MHD_mutex_lock_ (&response->mutex); - if (0 != --(response->reference_count)) - { - (void) MHD_mutex_unlock_ (&response->mutex); - return; - } - (void) MHD_mutex_unlock_ (&response->mutex); - (void) MHD_mutex_destroy_ (&response->mutex); - if (response->crfc != NULL) - response->crfc (response->crc_cls); - while (NULL != response->first_header) - { - pos = response->first_header; - response->first_header = pos->next; - free (pos->header); - free (pos->value); - free (pos); - } - free (response); -} - - -void -MHD_increment_response_rc (struct MHD_Response *response) -{ - (void) MHD_mutex_lock_ (&response->mutex); - (response->reference_count)++; - (void) MHD_mutex_unlock_ (&response->mutex); -} - - -/* end of response.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/response.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/response.h deleted file mode 100644 index 5785ec96..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/response.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Daniel Pittman and Christian Grothoff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -/** - * @file response.h - * @brief Methods for managing response objects - * @author Daniel Pittman - * @author Christian Grothoff - */ - -#ifndef RESPONSE_H -#define RESPONSE_H - -/** - * Increment response RC. Should this be part of the - * public API? - */ -void -MHD_increment_response_rc (struct MHD_Response *response); - - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_daemon.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_daemon.c deleted file mode 100644 index 13450ba8..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_daemon.c +++ /dev/null @@ -1,167 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_daemon.c - * @brief Testcase for libmicrohttpd starts and stops - * @author Christian Grothoff - */ - -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - - -static int -testStartError () -{ - struct MHD_Daemon *d; - - d = MHD_start_daemon (MHD_USE_DEBUG, 0, NULL, NULL, NULL, NULL); - if (d != NULL) - return 1; - return 0; -} - -static int -apc_nothing (void *cls, const struct sockaddr *addr, socklen_t addrlen) -{ - return MHD_NO; -} - -static int -apc_all (void *cls, const struct sockaddr *addr, socklen_t addrlen) -{ - return MHD_YES; -} - -static int -ahc_nothing (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - return MHD_NO; -} - -static int -testStartStop () -{ - struct MHD_Daemon *d; - - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1080, - &apc_nothing, - NULL, &ahc_nothing, NULL, MHD_OPTION_END); - if (d == NULL) - return 2; - MHD_stop_daemon (d); - return 0; -} - -static int -testExternalRun () -{ - struct MHD_Daemon *d; - fd_set rs; - MHD_socket maxfd; - int i; - - d = MHD_start_daemon (MHD_USE_DEBUG, - 1081, - &apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END); - - if (d == NULL) - return 4; - i = 0; - while (i < 15) - { - maxfd = 0; - FD_ZERO (&rs); - if (MHD_YES != MHD_get_fdset (d, &rs, &rs, &rs, &maxfd)) - { - MHD_stop_daemon (d); - return 256; - } - if (MHD_run (d) == MHD_NO) - { - MHD_stop_daemon (d); - return 8; - } - i++; - } - MHD_stop_daemon (d); - return 0; -} - -static int -testThread () -{ - struct MHD_Daemon *d; - d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SELECT_INTERNALLY, - 1082, - &apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END); - - if (d == NULL) - return 16; - if (MHD_run (d) != MHD_NO) - return 32; - MHD_stop_daemon (d); - return 0; -} - -static int -testMultithread () -{ - struct MHD_Daemon *d; - d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION, - 1083, - &apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END); - - if (d == NULL) - return 64; - if (MHD_run (d) != MHD_NO) - return 128; - MHD_stop_daemon (d); - return 0; -} - -int -main (int argc, char *const *argv) -{ - int errorCount = 0; - errorCount += testStartError (); - errorCount += testStartStop (); - errorCount += testExternalRun (); - errorCount += testThread (); - errorCount += testMultithread (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_postprocessor.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_postprocessor.c deleted file mode 100644 index 66bab81e..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_postprocessor.c +++ /dev/null @@ -1,349 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007,2013 Christian Grothoff - - libmicrohttpd 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 3, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_postprocessor.c - * @brief Testcase for postprocessor - * @author Christian Grothoff - */ - -#include "platform.h" -#include "microhttpd.h" -#include "internal.h" -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -/** - * Array of values that the value checker "wants". - * Each series of checks should be terminated by - * five NULL-entries. - */ -const char *want[] = { -#define URL_DATA "abc=def&x=5" -#define URL_START 0 - "abc", NULL, NULL, NULL, "def", - "x", NULL, NULL, NULL, "5", -#define URL_END (URL_START + 10) - NULL, NULL, NULL, NULL, NULL, -#define FORM_DATA "--AaB03x\r\ncontent-disposition: form-data; name=\"field1\"\r\n\r\nJoe Blow\r\n--AaB03x\r\ncontent-disposition: form-data; name=\"pics\"; filename=\"file1.txt\"\r\nContent-Type: text/plain\r\nContent-Transfer-Encoding: binary\r\n\r\nfiledata\r\n--AaB03x--\r\n" -#define FORM_START (URL_END + 5) - "field1", NULL, NULL, NULL, "Joe Blow", - "pics", "file1.txt", "text/plain", "binary", "filedata", -#define FORM_END (FORM_START + 10) - NULL, NULL, NULL, NULL, NULL, -#define FORM_NESTED_DATA "--AaB03x\r\ncontent-disposition: form-data; name=\"field1\"\r\n\r\nJane Blow\r\n--AaB03x\r\ncontent-disposition: form-data; name=\"pics\"\r\nContent-type: multipart/mixed, boundary=BbC04y\r\n\r\n--BbC04y\r\nContent-disposition: attachment; filename=\"file1.txt\"\r\nContent-Type: text/plain\r\n\r\nfiledata1\r\n--BbC04y\r\nContent-disposition: attachment; filename=\"file2.gif\"\r\nContent-type: image/gif\r\nContent-Transfer-Encoding: binary\r\n\r\nfiledata2\r\n--BbC04y--\r\n--AaB03x--" -#define FORM_NESTED_START (FORM_END + 5) - "field1", NULL, NULL, NULL, "Jane Blow", - "pics", "file1.txt", "text/plain", NULL, "filedata1", - "pics", "file2.gif", "image/gif", "binary", "filedata2", -#define FORM_NESTED_END (FORM_NESTED_START + 15) - NULL, NULL, NULL, NULL, NULL, -#define URL_EMPTY_VALUE_DATA "key1=value1&key2=&key3=" -#define URL_EMPTY_VALUE_START (FORM_NESTED_END + 5) - "key1", NULL, NULL, NULL, "value1", - "key2", NULL, NULL, NULL, "", - "key3", NULL, NULL, NULL, "", -#define URL_EMPTY_VALUE_END (URL_EMPTY_VALUE_START + 15) - NULL, NULL, NULL, NULL, NULL -}; - -static int -mismatch (const char *a, const char *b) -{ - if (a == b) - return 0; - if ((a == NULL) || (b == NULL)) - return 1; - return 0 != strcmp (a, b); -} - -static int -value_checker (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *data, uint64_t off, size_t size) -{ - int *want_off = cls; - int idx = *want_off; - -#if 0 - fprintf (stderr, - "VC: `%s' `%s' `%s' `%s' `%.*s'\n", - key, filename, content_type, transfer_encoding, - (int) size, - data); -#endif - if ( (0 != off) && (0 == size) ) - return MHD_YES; - if ((idx < 0) || - (want[idx] == NULL) || - (0 != strcmp (key, want[idx])) || - (mismatch (filename, want[idx + 1])) || - (mismatch (content_type, want[idx + 2])) || - (mismatch (transfer_encoding, want[idx + 3])) || - (0 != memcmp (data, &want[idx + 4][off], size))) - { - *want_off = -1; - return MHD_NO; - } - if (off + size == strlen (want[idx + 4])) - *want_off = idx + 5; - return MHD_YES; - -} - - -static int -test_urlencoding () -{ - struct MHD_Connection connection; - struct MHD_HTTP_Header header; - struct MHD_PostProcessor *pp; - unsigned int want_off = URL_START; - int i; - int delta; - size_t size; - - memset (&connection, 0, sizeof (struct MHD_Connection)); - memset (&header, 0, sizeof (struct MHD_HTTP_Header)); - connection.headers_received = &header; - header.header = MHD_HTTP_HEADER_CONTENT_TYPE; - header.value = MHD_HTTP_POST_ENCODING_FORM_URLENCODED; - header.kind = MHD_HEADER_KIND; - pp = MHD_create_post_processor (&connection, - 1024, &value_checker, &want_off); - i = 0; - size = strlen (URL_DATA); - while (i < size) - { - delta = 1 + MHD_random_ () % (size - i); - MHD_post_process (pp, &URL_DATA[i], delta); - i += delta; - } - MHD_destroy_post_processor (pp); - if (want_off != URL_END) - return 1; - return 0; -} - - -static int -test_multipart_garbage () -{ - struct MHD_Connection connection; - struct MHD_HTTP_Header header; - struct MHD_PostProcessor *pp; - unsigned int want_off; - size_t size = strlen (FORM_DATA); - size_t splitpoint; - char xdata[size + 3]; - - /* fill in evil garbage at the beginning */ - xdata[0] = '-'; - xdata[1] = 'x'; - xdata[2] = '\r'; - memcpy (&xdata[3], FORM_DATA, size); - size += 3; - - size = strlen (FORM_DATA); - for (splitpoint = 1; splitpoint < size; splitpoint++) - { - want_off = FORM_START; - memset (&connection, 0, sizeof (struct MHD_Connection)); - memset (&header, 0, sizeof (struct MHD_HTTP_Header)); - connection.headers_received = &header; - header.header = MHD_HTTP_HEADER_CONTENT_TYPE; - header.value = - MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA ", boundary=AaB03x"; - header.kind = MHD_HEADER_KIND; - pp = MHD_create_post_processor (&connection, - 1024, &value_checker, &want_off); - MHD_post_process (pp, xdata, splitpoint); - MHD_post_process (pp, &xdata[splitpoint], size - splitpoint); - MHD_destroy_post_processor (pp); - if (want_off != FORM_END) - return (int) splitpoint; - } - return 0; -} - - -static int -test_multipart_splits () -{ - struct MHD_Connection connection; - struct MHD_HTTP_Header header; - struct MHD_PostProcessor *pp; - unsigned int want_off; - size_t size; - size_t splitpoint; - - size = strlen (FORM_DATA); - for (splitpoint = 1; splitpoint < size; splitpoint++) - { - want_off = FORM_START; - memset (&connection, 0, sizeof (struct MHD_Connection)); - memset (&header, 0, sizeof (struct MHD_HTTP_Header)); - connection.headers_received = &header; - header.header = MHD_HTTP_HEADER_CONTENT_TYPE; - header.value = - MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA ", boundary=AaB03x"; - header.kind = MHD_HEADER_KIND; - pp = MHD_create_post_processor (&connection, - 1024, &value_checker, &want_off); - MHD_post_process (pp, FORM_DATA, splitpoint); - MHD_post_process (pp, &FORM_DATA[splitpoint], size - splitpoint); - MHD_destroy_post_processor (pp); - if (want_off != FORM_END) - return (int) splitpoint; - } - return 0; -} - - -static int -test_multipart () -{ - struct MHD_Connection connection; - struct MHD_HTTP_Header header; - struct MHD_PostProcessor *pp; - unsigned int want_off = FORM_START; - int i; - int delta; - size_t size; - - memset (&connection, 0, sizeof (struct MHD_Connection)); - memset (&header, 0, sizeof (struct MHD_HTTP_Header)); - connection.headers_received = &header; - header.header = MHD_HTTP_HEADER_CONTENT_TYPE; - header.value = - MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA ", boundary=AaB03x"; - header.kind = MHD_HEADER_KIND; - pp = MHD_create_post_processor (&connection, - 1024, &value_checker, &want_off); - i = 0; - size = strlen (FORM_DATA); - while (i < size) - { - delta = 1 + MHD_random_ () % (size - i); - MHD_post_process (pp, &FORM_DATA[i], delta); - i += delta; - } - MHD_destroy_post_processor (pp); - if (want_off != FORM_END) - return 2; - return 0; -} - - -static int -test_nested_multipart () -{ - struct MHD_Connection connection; - struct MHD_HTTP_Header header; - struct MHD_PostProcessor *pp; - unsigned int want_off = FORM_NESTED_START; - int i; - int delta; - size_t size; - - memset (&connection, 0, sizeof (struct MHD_Connection)); - memset (&header, 0, sizeof (struct MHD_HTTP_Header)); - connection.headers_received = &header; - header.header = MHD_HTTP_HEADER_CONTENT_TYPE; - header.value = - MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA ", boundary=AaB03x"; - header.kind = MHD_HEADER_KIND; - pp = MHD_create_post_processor (&connection, - 1024, &value_checker, &want_off); - i = 0; - size = strlen (FORM_NESTED_DATA); - while (i < size) - { - delta = 1 + MHD_random_ () % (size - i); - MHD_post_process (pp, &FORM_NESTED_DATA[i], delta); - i += delta; - } - MHD_destroy_post_processor (pp); - if (want_off != FORM_NESTED_END) - return 4; - return 0; -} - - -static int -test_empty_value () -{ - struct MHD_Connection connection; - struct MHD_HTTP_Header header; - struct MHD_PostProcessor *pp; - unsigned int want_off = URL_EMPTY_VALUE_START; - int i; - int delta; - size_t size; - - memset (&connection, 0, sizeof (struct MHD_Connection)); - memset (&header, 0, sizeof (struct MHD_HTTP_Header)); - connection.headers_received = &header; - header.header = MHD_HTTP_HEADER_CONTENT_TYPE; - header.value = MHD_HTTP_POST_ENCODING_FORM_URLENCODED; - header.kind = MHD_HEADER_KIND; - pp = MHD_create_post_processor (&connection, - 1024, &value_checker, &want_off); - i = 0; - size = strlen (URL_EMPTY_VALUE_DATA); - while (i < size) - { - delta = 1 + MHD_random_ () % (size - i); - MHD_post_process (pp, &URL_EMPTY_VALUE_DATA[i], delta); - i += delta; - } - MHD_destroy_post_processor (pp); - if (want_off != URL_EMPTY_VALUE_END) - return 8; - return 0; -} - - - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - errorCount += test_multipart_splits (); - errorCount += test_multipart_garbage (); - errorCount += test_urlencoding (); - errorCount += test_multipart (); - errorCount += test_nested_multipart (); - errorCount += test_empty_value (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_postprocessor_amp.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_postprocessor_amp.c deleted file mode 100644 index 73f72f92..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_postprocessor_amp.c +++ /dev/null @@ -1,47 +0,0 @@ -#include "platform.h" -#include "microhttpd.h" -#include "internal.h" -#include -#include -#include - - -int check_post(void *cls, enum MHD_ValueKind kind, const char* key, - const char* filename, const char* content_type, - const char* content_encoding, const char* data, - uint64_t off, size_t size) -{ - if ((0 != strcmp(key, "a")) && (0 != strcmp(key, "b"))) - { - printf("ERROR: got unexpected '%s'\n", key); - } - - return MHD_YES; -} - - -int -main (int argc, char *const *argv) -{ - struct MHD_Connection connection; - struct MHD_HTTP_Header header; - struct MHD_PostProcessor *pp; - - memset (&connection, 0, sizeof (struct MHD_Connection)); - memset (&header, 0, sizeof (struct MHD_HTTP_Header)); - connection.headers_received = &header; - header.header = MHD_HTTP_HEADER_CONTENT_TYPE; - header.value = MHD_HTTP_POST_ENCODING_FORM_URLENCODED; - header.kind = MHD_HEADER_KIND; - - pp = MHD_create_post_processor (&connection, - 4096, &check_post, NULL); - - const char* post = "a=xx+xx+xxx+xxxxx+xxxx+xxxxxxxx+xxx+xxxxxx+xxx+xxx+xxxxxxx+xxxxx%0A+++++++xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%0A+++++++--%3E%0A++++++++++++++%3Cxxxxx+xxxxx%3D%22xxx%25%22%3E%0A+++++++++++%3Cxx%3E%0A+++++++++++++++%3Cxx+xxxxxxx%3D%22x%22+xxxxx%3D%22xxxxx%22%3E%0A+++++++++++++++++++%3Cxxxxx+xxxxx%3D%22xxx%25%22%3E%0A+++++++++++++++++++++++%3Cxx%3E%0A+++++++++++++++++++++++++++%3Cxx+xxxxx%3D%22xxxx%22%3E%0A+++++++++++++++++++++++++++++++%3Cx+xxxxx%3D%22xxxx-xxxxx%3Axxxxx%22%3Exxxxx%3A%3C%2Fx%3E%0A%0A+++++++++++++++++++++++++++++++%3Cx+xxxxx%3D%22xxxx-xxxxx%3Axxxxx%22%3Exxx%3A%3C%2Fx%3E%0A%0A+++++++++++++++++++++++++++++++%3Cx+xxxxx%3D%22xxxx-xxxxx%3Axxxxx%3B+xxxx-xxxxxx%3A+xxxx%3B%22%3Exxxxx+xxxxx%3A%3C%2Fx%3E%0A+++++++++++++++++++++++++++%3C%2Fxx%3E%0A+++++++++++++++++++++++%3C%2Fxx%3E%0A+++++++++++++++++++%3C%2Fxxxxx%3E%0A+++++++++++++++%3C%2Fxx%3E%0A+++++++++++++++%3Cxx+xxxxx%3D%22xxxx-xxxxx%3A+xxxxx%3B+xxxxx%3A+xxxx%22%3E%26xxxxx%3B+%3Cxxxx%0A+++++++++++++++++++++++xxxxx%3D%22xxxxxxxxxxxxxxx%22%3Exxxx.xx%3C%2Fxxxx%3E%0A+++++++++++++++%3C%2Fxx%3E%0A+++++++++++%3C%2Fxx%3E%0A++++++++++++++++++++++++++%3Cxx%3E%0A+++++++++++++++++++%3Cxx+xxxxx%3D%22xxxx-xxxxx%3A+xxxxx%3B+xxxxx%3A+xxxx%22%3E%26xxxxx%3B+%3Cxxxx%0A+++++++++++++++++++++++++++xxxxx%3D%22xxxxxxxxxxxxxxx%22%3Exxx.xx%3C%2Fxxxx%3E%0A+++++++++++++++++++%3C%2Fxx%3E%0A+++++++++++++++%3C%2Fxx%3E%0A++++++++++++++++++++++%3Cxx%3E%0A+++++++++++++++%3Cxx+xxxxx%3D%22xxxx-xxxxx%3A+xxxxx%3Bxxxx-xxxxxx%3A+xxxx%3B+xxxxx%3A+xxxx%22%3E%26xxxxx%3B+%3Cxxxx%0A+++++++++++++++++++++++xxxxx%3D%22xxxxxxxxxxxxxxx%22%3Exxxx.xx%3C%2Fxxxx%3E%3C%2Fxx%3E%0A+++++++++++%3C%2Fxx%3E%0A+++++++%3C%2Fxxxxx%3E%0A+++++++%3C%21--%0A+++++++xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%0A+++++++xxx+xx+xxxxx+xxxxxxx+xxxxxxx%0A+++++++xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%0A+++++++--%3E%0A+++%3C%2Fxxx%3E%0A%0A%0A%0A+++%3Cxxx+xxxxx%3D%22xxxxxxxxx%22+xx%3D%22xxxxxxxxx%22%3E%3C%2Fxxx%3E%0A%0A+++%3Cxxx+xx%3D%22xxxx%22+xxxxx%3D%22xxxx%22%3E%0A+++++++%3Cxxxxx+xxxxx%3D%22xxxxxxxxx%22%3E%0A+++++++++++%3Cxx%3E%0A+++++++++++++++%3Cxx+xxxxxxx%3D%22x%22+xx%3D%22xxxxxxxxxxxxx%22+xxxxx%3D%22xxxxxxxxxxxxx%22%3E%0A+++++++++++++++++++%3Cxxx+xx%3D%22xxxxxx%22%3E%3C%2Fxxx%3E%0A+++++++++++++++%3C%2Fxx%3E%0A+++++++++++%3C%2Fxx%3E%0A+++++++++++%3Cxx%3E%0A+++++++++++++++%3Cxx+xx%3D%22xxxxxxxxxxxxxxxxx%22+xxxxx%3D%22xxxxxxxxxxxxxxxxx%22%3E%3C%2Fxx%3E%0A+++++++++++++++%3Cxx+xx%3D%22xxxxxxxxxxxxxx%22+xxxxx%3D%22xxxxxxxxxxxxxx%22%3E%0A+++++++++++++++++++%3Cxxx+xx%3D%22xxxxxxx%22%3E%3C%2Fxxx%3E%0A+++++++++++++++%3C%2Fxx%3E%0A+++++++++++%3C%2Fxx%3E%0A+++++++++++%3Cxx%3E%0A+++++++++++++++%3Cxx+xxxxxxx%3D%22x%22+xx%3D%22xxxxxxxxxxxxx%22+xxxxx%3D%22xxxxxxxxxxxxx%22%3E%0A+++++++++++++++++++%3Cxxx+xx%3D%22xxxxxx%22%3E%3C%2Fxxx%3E%0A+++++++++++++++%3C%2Fxx%3E%0A+++++++++++%3C%2Fxx%3E%0A+++++++%3C%2Fxxxxx%3E%0A+++%3C%2Fxxx%3E%0A%3C%2Fxxx%3E%0A%0A%3Cxxx+xx%3D%22xxxxxx%22%3E%3C%2Fxxx%3E%0A%0A%3C%2Fxxxx%3E%0A%3C%2Fxxxx%3E+&b=value"; - - MHD_post_process (pp, post, strlen(post)); - MHD_destroy_post_processor (pp); - - return 0; -} - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_postprocessor_large.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_postprocessor_large.c deleted file mode 100644 index 0af4ab99..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/test_postprocessor_large.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_postprocessor_large.c - * @brief Testcase with very large input for postprocessor - * @author Christian Grothoff - */ - -#include "platform.h" -#include "microhttpd.h" -#include "internal.h" - -#ifndef WINDOWS -#include -#endif - -static int -value_checker (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *data, uint64_t off, size_t size) -{ - unsigned int *pos = cls; -#if 0 - fprintf (stderr, - "VC: %llu %u `%s' `%s' `%s' `%s' `%.*s'\n", - off, size, - key, filename, content_type, transfer_encoding, size, data); -#endif - if (size == 0) - return MHD_YES; - *pos += size; - return MHD_YES; - -} - - -static int -test_simple_large () -{ - struct MHD_Connection connection; - struct MHD_HTTP_Header header; - struct MHD_PostProcessor *pp; - int i; - int delta; - size_t size; - char data[102400]; - unsigned int pos; - - pos = 0; - memset (data, 'A', sizeof (data)); - memcpy (data, "key=", 4); - data[sizeof (data) - 1] = '\0'; - memset (&connection, 0, sizeof (struct MHD_Connection)); - memset (&header, 0, sizeof (struct MHD_HTTP_Header)); - connection.headers_received = &header; - header.header = MHD_HTTP_HEADER_CONTENT_TYPE; - header.value = MHD_HTTP_POST_ENCODING_FORM_URLENCODED; - header.kind = MHD_HEADER_KIND; - pp = MHD_create_post_processor (&connection, 1024, &value_checker, &pos); - i = 0; - size = strlen (data); - while (i < size) - { - delta = 1 + MHD_random_ () % (size - i); - MHD_post_process (pp, &data[i], delta); - i += delta; - } - MHD_destroy_post_processor (pp); - if (pos != sizeof (data) - 5) /* minus 0-termination and 'key=' */ - return 1; - return 0; -} - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - errorCount += test_simple_large (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/tsearch.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/tsearch.c deleted file mode 100644 index 8889f32d..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/tsearch.c +++ /dev/null @@ -1,125 +0,0 @@ -/* $NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $ */ - -/* - * Tree search generalized from Knuth (6.2.2) Algorithm T just like - * the AT&T man page says. - * - * The node_t structure is for internal use only, lint doesn't grok it. - * - * Written by reading the System V Interface Definition, not the code. - * - * Totally public domain. - */ - -#ifndef _MSC_FULL_VER -#include -#endif //! _MSC_FULL_VER -#define _SEARCH_PRIVATE -#include "tsearch.h" -#include - -/* find or insert datum into search tree */ -void * -tsearch(vkey, vrootp, compar) - const void *vkey; /* key to be located */ - void **vrootp; /* address of tree root */ - int (*compar)(const void *, const void *); -{ - node_t *q; - node_t **rootp = (node_t **)vrootp; - - if (rootp == NULL) - return NULL; - - while (*rootp != NULL) { /* Knuth's T1: */ - int r; - - if ((r = (*compar)(vkey, (*rootp)->key)) == 0) /* T2: */ - return *rootp; /* we found it! */ - - rootp = (r < 0) ? - &(*rootp)->llink : /* T3: follow left branch */ - &(*rootp)->rlink; /* T4: follow right branch */ - } - - q = malloc(sizeof(node_t)); /* T5: key not found */ - if (q != 0) { /* make new node */ - *rootp = q; /* link new node to old */ - /* LINTED const castaway ok */ - q->key = (void *)vkey; /* initialize new node */ - q->llink = q->rlink = NULL; - } - return q; -} - -/* find a node, or return 0 */ -void * -tfind(vkey, vrootp, compar) - const void *vkey; /* key to be found */ - void * const *vrootp; /* address of the tree root */ - int (*compar)(const void *, const void *); -{ - node_t **rootp = (node_t **)vrootp; - - if (rootp == NULL) - return NULL; - - while (*rootp != NULL) { /* T1: */ - int r; - - if ((r = (*compar)(vkey, (*rootp)->key)) == 0) /* T2: */ - return *rootp; /* key found */ - rootp = (r < 0) ? - &(*rootp)->llink : /* T3: follow left branch */ - &(*rootp)->rlink; /* T4: follow right branch */ - } - return NULL; -} - -/* - * delete node with given key - * - * vkey: key to be deleted - * vrootp: address of the root of the tree - * compar: function to carry out node comparisons - */ -void * -tdelete(const void * __restrict vkey, void ** __restrict vrootp, - int (*compar)(const void *, const void *)) -{ - node_t **rootp = (node_t **)vrootp; - node_t *p, *q, *r; - int cmp; - - if (rootp == NULL || (p = *rootp) == NULL) - return NULL; - - while ((cmp = (*compar)(vkey, (*rootp)->key)) != 0) { - p = *rootp; - rootp = (cmp < 0) ? - &(*rootp)->llink : /* follow llink branch */ - &(*rootp)->rlink; /* follow rlink branch */ - if (*rootp == NULL) - return NULL; /* key not found */ - } - r = (*rootp)->rlink; /* D1: */ - if ((q = (*rootp)->llink) == NULL) /* Left NULL? */ - q = r; - else if (r != NULL) { /* Right link is NULL? */ - if (r->llink == NULL) { /* D2: Find successor */ - r->llink = q; - q = r; - } else { /* D3: Find NULL link */ - for (q = r->llink; q->llink != NULL; q = r->llink) - r = q; - r->llink = q->rlink; - q->llink = (*rootp)->llink; - q->rlink = (*rootp)->rlink; - } - } - free(*rootp); /* D4: Free node */ - *rootp = q; /* link parent to new node */ - return p; -} - -/* end of tsearch.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/tsearch.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/tsearch.h deleted file mode 100644 index ec9c92de..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microhttpd/tsearch.h +++ /dev/null @@ -1,50 +0,0 @@ -/*- - * Written by J.T. Conklin - * Public domain. - * - * $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $ - * $FreeBSD: release/9.0.0/include/search.h 105250 2002-10-16 14:29:23Z robert $ - */ - -#ifndef _SEARCH_H_ -#define _SEARCH_H_ - -#ifndef _MSC_FULL_VER -#include -#endif /* _MSC_FULL_VER */ -#if !defined(__BEGIN_DECLS) || !defined(__END_DECLS) -#if defined(__cplusplus) -#define __BEGIN_DECLS extern "C" { -#define __END_DECLS }; -#else /* !__cplusplus */ -#define __BEGIN_DECLS -#define __END_DECLS -#endif /* !__cplusplus */ -#endif /* !__BEGIN_DECLS || !__END_DECLS */ -#include - -typedef enum { - preorder, - postorder, - endorder, - leaf -} VISIT; - -#ifdef _SEARCH_PRIVATE -typedef struct node { - char *key; - struct node *llink, *rlink; -} node_t; -#endif - -__BEGIN_DECLS -void *tdelete(const void * __restrict, void ** __restrict, - int (*)(const void *, const void *)); -void *tfind(const void *, void * const *, - int (*)(const void *, const void *)); -void *tsearch(const void *, void **, int (*)(const void *, const void *)); -void twalk(const void *, void (*)(const void *, VISIT, int)); -void tdestroy(void *, void (*)(void *)); -__END_DECLS - -#endif /* !_SEARCH_H_ */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/Makefile.am deleted file mode 100644 index 7fb2c37f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -# This Makefile.am is in the public domain -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/microspdy - -AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) - - -lib_LTLIBRARIES = \ - libmicrospdy.la - -libmicrospdy_la_SOURCES = \ - io.h io.c \ - io_openssl.h io_openssl.c \ - io_raw.h io_raw.c \ - structures.h structures.c \ - internal.h internal.c \ - daemon.h daemon.c \ - stream.h stream.c \ - compression.h compression.c \ - session.h session.c \ - applicationlayer.c applicationlayer.h \ - alstructures.c alstructures.h -libmicrospdy_la_LIBADD = \ - $(SPDY_LIBDEPS) - -libmicrospdy_la_LDFLAGS = \ - $(SPDY_LIB_LDFLAGS) - -libmicrospdy_la_CPPFLAGS = \ - $(AM_CPPFLAGS) $(SPDY_LIB_CPPFLAGS) \ - -DBUILDING_MHD_LIB=1 - -libmicrospdy_la_CFLAGS = -Wextra \ - $(AM_CFLAGS) $(SPDY_LIB_CFLAGS) - - -if USE_COVERAGE - AM_CFLAGS += --coverage -endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/Makefile.in deleted file mode 100644 index d1a45889..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/Makefile.in +++ /dev/null @@ -1,820 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@USE_COVERAGE_TRUE@am__append_1 = --coverage -subdir = src/microspdy -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = -libmicrospdy_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libmicrospdy_la_OBJECTS = libmicrospdy_la-io.lo \ - libmicrospdy_la-io_openssl.lo libmicrospdy_la-io_raw.lo \ - libmicrospdy_la-structures.lo libmicrospdy_la-internal.lo \ - libmicrospdy_la-daemon.lo libmicrospdy_la-stream.lo \ - libmicrospdy_la-compression.lo libmicrospdy_la-session.lo \ - libmicrospdy_la-applicationlayer.lo \ - libmicrospdy_la-alstructures.lo -libmicrospdy_la_OBJECTS = $(am_libmicrospdy_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -libmicrospdy_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libmicrospdy_la_CFLAGS) $(CFLAGS) $(libmicrospdy_la_LDFLAGS) \ - $(LDFLAGS) -o $@ -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libmicrospdy_la_SOURCES) -DIST_SOURCES = $(libmicrospdy_la_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/microspdy - -AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) $(am__append_1) -lib_LTLIBRARIES = \ - libmicrospdy.la - -libmicrospdy_la_SOURCES = \ - io.h io.c \ - io_openssl.h io_openssl.c \ - io_raw.h io_raw.c \ - structures.h structures.c \ - internal.h internal.c \ - daemon.h daemon.c \ - stream.h stream.c \ - compression.h compression.c \ - session.h session.c \ - applicationlayer.c applicationlayer.h \ - alstructures.c alstructures.h - -libmicrospdy_la_LIBADD = \ - $(SPDY_LIBDEPS) - -libmicrospdy_la_LDFLAGS = \ - $(SPDY_LIB_LDFLAGS) - -libmicrospdy_la_CPPFLAGS = \ - $(AM_CPPFLAGS) $(SPDY_LIB_CPPFLAGS) \ - -DBUILDING_MHD_LIB=1 - -libmicrospdy_la_CFLAGS = -Wextra \ - $(AM_CFLAGS) $(SPDY_LIB_CFLAGS) - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/microspdy/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/microspdy/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libmicrospdy.la: $(libmicrospdy_la_OBJECTS) $(libmicrospdy_la_DEPENDENCIES) $(EXTRA_libmicrospdy_la_DEPENDENCIES) - $(AM_V_CCLD)$(libmicrospdy_la_LINK) -rpath $(libdir) $(libmicrospdy_la_OBJECTS) $(libmicrospdy_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-alstructures.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-applicationlayer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-compression.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-daemon.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-internal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-io.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-io_openssl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-io_raw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-session.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmicrospdy_la-structures.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -libmicrospdy_la-io.lo: io.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-io.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-io.Tpo -c -o libmicrospdy_la-io.lo `test -f 'io.c' || echo '$(srcdir)/'`io.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-io.Tpo $(DEPDIR)/libmicrospdy_la-io.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='io.c' object='libmicrospdy_la-io.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-io.lo `test -f 'io.c' || echo '$(srcdir)/'`io.c - -libmicrospdy_la-io_openssl.lo: io_openssl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-io_openssl.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-io_openssl.Tpo -c -o libmicrospdy_la-io_openssl.lo `test -f 'io_openssl.c' || echo '$(srcdir)/'`io_openssl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-io_openssl.Tpo $(DEPDIR)/libmicrospdy_la-io_openssl.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='io_openssl.c' object='libmicrospdy_la-io_openssl.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-io_openssl.lo `test -f 'io_openssl.c' || echo '$(srcdir)/'`io_openssl.c - -libmicrospdy_la-io_raw.lo: io_raw.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-io_raw.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-io_raw.Tpo -c -o libmicrospdy_la-io_raw.lo `test -f 'io_raw.c' || echo '$(srcdir)/'`io_raw.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-io_raw.Tpo $(DEPDIR)/libmicrospdy_la-io_raw.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='io_raw.c' object='libmicrospdy_la-io_raw.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-io_raw.lo `test -f 'io_raw.c' || echo '$(srcdir)/'`io_raw.c - -libmicrospdy_la-structures.lo: structures.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-structures.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-structures.Tpo -c -o libmicrospdy_la-structures.lo `test -f 'structures.c' || echo '$(srcdir)/'`structures.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-structures.Tpo $(DEPDIR)/libmicrospdy_la-structures.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='structures.c' object='libmicrospdy_la-structures.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-structures.lo `test -f 'structures.c' || echo '$(srcdir)/'`structures.c - -libmicrospdy_la-internal.lo: internal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-internal.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-internal.Tpo -c -o libmicrospdy_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-internal.Tpo $(DEPDIR)/libmicrospdy_la-internal.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='internal.c' object='libmicrospdy_la-internal.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c - -libmicrospdy_la-daemon.lo: daemon.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-daemon.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-daemon.Tpo -c -o libmicrospdy_la-daemon.lo `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-daemon.Tpo $(DEPDIR)/libmicrospdy_la-daemon.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon.c' object='libmicrospdy_la-daemon.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-daemon.lo `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c - -libmicrospdy_la-stream.lo: stream.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-stream.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-stream.Tpo -c -o libmicrospdy_la-stream.lo `test -f 'stream.c' || echo '$(srcdir)/'`stream.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-stream.Tpo $(DEPDIR)/libmicrospdy_la-stream.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stream.c' object='libmicrospdy_la-stream.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-stream.lo `test -f 'stream.c' || echo '$(srcdir)/'`stream.c - -libmicrospdy_la-compression.lo: compression.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-compression.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-compression.Tpo -c -o libmicrospdy_la-compression.lo `test -f 'compression.c' || echo '$(srcdir)/'`compression.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-compression.Tpo $(DEPDIR)/libmicrospdy_la-compression.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='compression.c' object='libmicrospdy_la-compression.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-compression.lo `test -f 'compression.c' || echo '$(srcdir)/'`compression.c - -libmicrospdy_la-session.lo: session.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-session.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-session.Tpo -c -o libmicrospdy_la-session.lo `test -f 'session.c' || echo '$(srcdir)/'`session.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-session.Tpo $(DEPDIR)/libmicrospdy_la-session.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='session.c' object='libmicrospdy_la-session.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-session.lo `test -f 'session.c' || echo '$(srcdir)/'`session.c - -libmicrospdy_la-applicationlayer.lo: applicationlayer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-applicationlayer.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-applicationlayer.Tpo -c -o libmicrospdy_la-applicationlayer.lo `test -f 'applicationlayer.c' || echo '$(srcdir)/'`applicationlayer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-applicationlayer.Tpo $(DEPDIR)/libmicrospdy_la-applicationlayer.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='applicationlayer.c' object='libmicrospdy_la-applicationlayer.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-applicationlayer.lo `test -f 'applicationlayer.c' || echo '$(srcdir)/'`applicationlayer.c - -libmicrospdy_la-alstructures.lo: alstructures.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -MT libmicrospdy_la-alstructures.lo -MD -MP -MF $(DEPDIR)/libmicrospdy_la-alstructures.Tpo -c -o libmicrospdy_la-alstructures.lo `test -f 'alstructures.c' || echo '$(srcdir)/'`alstructures.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmicrospdy_la-alstructures.Tpo $(DEPDIR)/libmicrospdy_la-alstructures.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alstructures.c' object='libmicrospdy_la-alstructures.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrospdy_la_CPPFLAGS) $(CPPFLAGS) $(libmicrospdy_la_CFLAGS) $(CFLAGS) -c -o libmicrospdy_la-alstructures.lo `test -f 'alstructures.c' || echo '$(srcdir)/'`alstructures.c - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-libLTLIBRARIES - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-libLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/alstructures.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/alstructures.c deleted file mode 100644 index b588a1c8..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/alstructures.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file alstructures.c - * @brief structures only for the application layer - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "alstructures.h" -#include "internal.h" - -void -SPDY_destroy_request (struct SPDY_Request *request) -{ - if(NULL == request) - { - SPDYF_DEBUG("request is NULL"); - return; - } - //strings into request struct are just references to strings in - //headers, so no need to free them twice - SPDY_name_value_destroy(request->headers); - free(request); -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/alstructures.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/alstructures.h deleted file mode 100644 index 2eb36e82..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/alstructures.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file alstructures.h - * @brief structures only for the application layer - * @author Andrey Uzunov - */ - -#ifndef ALSTRUCTURES_H -#define ALSTRUCTURES_H - -#include "platform.h" - - -/** - * Represents a SPDY request. - */ -struct SPDY_Request -{ - /** - * SPDY stream in whose context the request was received - */ - struct SPDYF_Stream *stream; - - /** - * Other HTTP headers from the request - */ - struct SPDY_NameValue *headers; - - /** - * HTTP method - */ - char *method; - - /** - * HTTP path - */ - char *path; - - /** - * HTTP version just like in HTTP request/response: - * "HTTP/1.0" or "HTTP/1.1" currently - */ - char *version; - - /** - * called host as in HTTP - */ - char *host; - - /** - * The scheme used ("http" or "https") - */ - char *scheme; - - /** - * Extra field to be used by the user with set/get func for whatever - * purpose he wants. - */ - void *user_cls; -}; - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/applicationlayer.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/applicationlayer.c deleted file mode 100644 index bf16b785..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/applicationlayer.c +++ /dev/null @@ -1,748 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file applicationlayer.c - * @brief SPDY application or HTTP layer - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "applicationlayer.h" -#include "alstructures.h" -#include "structures.h" -#include "internal.h" -#include "daemon.h" -#include "session.h" - - -void -spdy_callback_response_done(void *cls, - struct SPDY_Response *response, - struct SPDY_Request *request, - enum SPDY_RESPONSE_RESULT status, - bool streamopened) -{ - (void)cls; - (void)status; - (void)streamopened; - - SPDY_destroy_request(request); - SPDY_destroy_response(response); -} - - -/** - * Callback called when new stream is created. It extracts the info from - * the stream to create (HTTP) request object and pass it to the client. - * - * @param cls - * @param stream the new SPDY stream - * @return SPDY_YES on success, SPDY_NO on memomry error - */ -static int -spdy_handler_new_stream (void *cls, - struct SPDYF_Stream * stream) -{ - (void)cls; - unsigned int i; - char *method = NULL; - char *path = NULL; - char *version = NULL; - char *host = NULL; - char *scheme = NULL; - struct SPDY_Request * request = NULL; - struct SPDY_NameValue * headers = NULL; - struct SPDY_NameValue * iterator = stream->headers; - struct SPDY_Daemon *daemon; - - daemon = stream->session->daemon; - - //if the user doesn't care, ignore it - if(NULL == daemon->new_request_cb) - return SPDY_YES; - - if(NULL == (headers=SPDY_name_value_create())) - goto free_and_fail; - - if(NULL==(request = malloc(sizeof(struct SPDY_Request)))) - goto free_and_fail; - - memset(request, 0, sizeof(struct SPDY_Request)); - request->stream = stream; - - /* extract the mandatory fields from stream->headers' structure - * to pass them to the client */ - while(iterator != NULL) - { - if(strcmp(":method",iterator->name) == 0) - { - if(1 != iterator->num_values) - break; - method = iterator->value[0]; - } - else if(strcmp(":path",iterator->name) == 0) - { - if(1 != iterator->num_values) - break; - path = iterator->value[0]; - } - else if(strcmp(":version",iterator->name) == 0) - { - if(1 != iterator->num_values) - break; - version = iterator->value[0]; - } - else if(strcmp(":host",iterator->name) == 0) - { - //TODO can it have more values? - if(1 != iterator->num_values) - break; - host = iterator->value[0]; - } - else if(strcmp(":scheme",iterator->name) == 0) - { - if(1 != iterator->num_values) - break; - scheme = iterator->value[0]; - } - else - for(i=0; inum_values; ++i) - if (SPDY_YES != SPDY_name_value_add(headers,iterator->name,iterator->value[i])) - { - SPDY_destroy_request(request); - goto free_and_fail; - } - - iterator = iterator->next; - } - - request->method=method; - request->path=path; - request->version=version; - request->host=host; - request->scheme=scheme; - request->headers=headers; - - //check request validity, all these fields are mandatory for a request - if(NULL == method || strlen(method) == 0 - || NULL == path || strlen(path) == 0 - || NULL == version || strlen(version) == 0 - || NULL == host || strlen(host) == 0 - || NULL == scheme || strlen(scheme) == 0 - ) - { - //TODO HTTP 400 Bad Request must be answered - - SPDYF_DEBUG("Bad request"); - - SPDY_destroy_request(request); - - return SPDY_YES; - } - - //call client's callback function to notify - daemon->new_request_cb(daemon->cls, - request, - stream->priority, - method, - path, - version, - host, - scheme, - headers, - !stream->is_in_closed); - - stream->cls = request; - - return SPDY_YES; - - //for GOTO - free_and_fail: - - SPDY_name_value_destroy(headers); - return SPDY_NO; -} - - -/** - * TODO - */ -static int -spdy_handler_new_data (void * cls, - struct SPDYF_Stream *stream, - const void * buf, - size_t size, - bool more) -{ - return stream->session->daemon->received_data_cb(cls, stream->cls, buf, size, more); -} - - - -/** - * Callback to be called when the response queue object was handled and - * the data was already sent or discarded. - * - * @param cls - * @param response_queue the object which is being handled - * @param status shows if actually the response was sent or it was - * discarded by the lib for any reason (e.g., closing session, - * closing stream, stopping daemon, etc.). It is possible that - * status indicates an error but parts of the response headers - * and/or body (in one - * or several frames) were already sent to the client. - */ -static void -spdy_handler_response_queue_result(void * cls, - struct SPDYF_Response_Queue *response_queue, - enum SPDY_RESPONSE_RESULT status) -{ - int streamopened; - struct SPDY_Request *request = (struct SPDY_Request *)cls; - - SPDYF_ASSERT( ( (NULL == response_queue->data_frame) && - (NULL != response_queue->control_frame) ) || - ( (NULL != response_queue->data_frame) && - (NULL == response_queue->control_frame) ), - "response queue must have either control frame or data frame"); - - streamopened = !response_queue->stream->is_out_closed; - - response_queue->rrcb(response_queue->rrcb_cls, response_queue->response, request, status, streamopened); -} - - -int -(SPDY_init) (enum SPDY_IO_SUBSYSTEM io_subsystem, ...) -{ - SPDYF_ASSERT(SPDYF_BUFFER_SIZE >= SPDY_MAX_SUPPORTED_FRAME_SIZE, - "Buffer size is less than max supported frame size!"); - SPDYF_ASSERT(SPDY_MAX_SUPPORTED_FRAME_SIZE >= 32, - "Max supported frame size must be bigger than the minimal value!"); - SPDYF_ASSERT(SPDY_IO_SUBSYSTEM_NONE == spdyf_io_initialized, - "SPDY_init must be called only once per program or after SPDY_deinit"); - - if(SPDY_IO_SUBSYSTEM_OPENSSL & io_subsystem) - { - SPDYF_openssl_global_init(); - spdyf_io_initialized |= SPDY_IO_SUBSYSTEM_OPENSSL; - } - else if(SPDY_IO_SUBSYSTEM_RAW & io_subsystem) - { - SPDYF_raw_global_init(); - spdyf_io_initialized |= SPDY_IO_SUBSYSTEM_RAW; - } - - SPDYF_ASSERT(SPDY_IO_SUBSYSTEM_NONE != spdyf_io_initialized, - "SPDY_init could not find even one IO subsystem"); - - return SPDY_YES; -} - - -void -SPDY_deinit () -{ - SPDYF_ASSERT(SPDY_IO_SUBSYSTEM_NONE != spdyf_io_initialized, - "SPDY_init has not been called!"); - - if(SPDY_IO_SUBSYSTEM_OPENSSL & spdyf_io_initialized) - SPDYF_openssl_global_deinit(); - else if(SPDY_IO_SUBSYSTEM_RAW & spdyf_io_initialized) - SPDYF_raw_global_deinit(); - - spdyf_io_initialized = SPDY_IO_SUBSYSTEM_NONE; -} - - -void -SPDY_run (struct SPDY_Daemon *daemon) -{ - if(NULL == daemon) - { - SPDYF_DEBUG("daemon is NULL"); - return; - } - - SPDYF_run(daemon); -} - - -int -SPDY_get_timeout (struct SPDY_Daemon *daemon, - unsigned long long *timeout) -{ - if(NULL == daemon) - { - SPDYF_DEBUG("daemon is NULL"); - return SPDY_INPUT_ERROR; - } - - return SPDYF_get_timeout(daemon,timeout); -} - - -int -SPDY_get_fdset (struct SPDY_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set) -{ - if(NULL == daemon - || NULL == read_fd_set - || NULL == write_fd_set - || NULL == except_fd_set) - { - SPDYF_DEBUG("a parameter is NULL"); - return SPDY_INPUT_ERROR; - } - - return SPDYF_get_fdset(daemon, - read_fd_set, - write_fd_set, - except_fd_set, - false); -} - - -struct SPDY_Daemon * -SPDY_start_daemon (uint16_t port, - const char *certfile, - const char *keyfile, - SPDY_NewSessionCallback nscb, - SPDY_SessionClosedCallback sccb, - SPDY_NewRequestCallback nrcb, - SPDY_NewDataCallback npdcb, - void * cls, - ...) -{ - struct SPDY_Daemon *daemon; - va_list valist; - - if(SPDY_IO_SUBSYSTEM_NONE == spdyf_io_initialized) - { - SPDYF_DEBUG("library not initialized"); - return NULL; - } - /* - * for now make this checks in framing layer - if(NULL == certfile) - { - SPDYF_DEBUG("certfile is NULL"); - return NULL; - } - if(NULL == keyfile) - { - SPDYF_DEBUG("keyfile is NULL"); - return NULL; - } - */ - - va_start(valist, cls); - daemon = SPDYF_start_daemon_va ( port, - certfile, - keyfile, - nscb, - sccb, - nrcb, - npdcb, - &spdy_handler_new_stream, - &spdy_handler_new_data, - cls, - NULL, - valist - ); - va_end(valist); - - return daemon; -} - - -void -SPDY_stop_daemon (struct SPDY_Daemon *daemon) -{ - if(NULL == daemon) - { - SPDYF_DEBUG("daemon is NULL"); - return; - } - - SPDYF_stop_daemon(daemon); -} - - -struct SPDY_Response * -SPDY_build_response(int status, - const char * statustext, - const char * version, - struct SPDY_NameValue * headers, - const void * data, - size_t size) -{ - struct SPDY_Response *response = NULL; - struct SPDY_NameValue ** all_headers = NULL; //TODO maybe array in stack is enough - char *fullstatus = NULL; - int ret; - int num_hdr_containers = 1; - - if(NULL == version) - { - SPDYF_DEBUG("version is NULL"); - return NULL; - } - - if(NULL == (response = malloc(sizeof(struct SPDY_Response)))) - goto free_and_fail; - memset(response, 0, sizeof(struct SPDY_Response)); - - if(NULL != headers && !SPDYF_name_value_is_empty(headers)) - num_hdr_containers = 2; - - if(NULL == (all_headers = malloc(num_hdr_containers * sizeof(struct SPDY_NameValue *)))) - goto free_and_fail; - memset(all_headers, 0, num_hdr_containers * sizeof(struct SPDY_NameValue *)); - - if(2 == num_hdr_containers) - all_headers[1] = headers; - - if(NULL == (all_headers[0] = SPDY_name_value_create())) - goto free_and_fail; - - if(NULL == statustext) - ret = asprintf(&fullstatus, "%i", status); - else - ret = asprintf(&fullstatus, "%i %s", status, statustext); - if(-1 == ret) - goto free_and_fail; - - if(SPDY_YES != SPDY_name_value_add(all_headers[0], ":status", fullstatus)) - goto free_and_fail; - - free(fullstatus); - fullstatus = NULL; - - if(SPDY_YES != SPDY_name_value_add(all_headers[0], ":version", version)) - goto free_and_fail; - - if(0 >= (response->headers_size = SPDYF_name_value_to_stream(all_headers, - num_hdr_containers, - &(response->headers)))) - goto free_and_fail; - - SPDY_name_value_destroy(all_headers[0]); - free(all_headers); - all_headers = NULL; - - if(size > 0) - { - //copy the data to the response object - if(NULL == (response->data = malloc(size))) - { - free(response->headers); - goto free_and_fail; - } - memcpy(response->data, data, size); - response->data_size = size; - } - - return response; - - //for GOTO - free_and_fail: - - free(fullstatus); - if(NULL != all_headers) - SPDY_name_value_destroy(all_headers[0]); - free(all_headers); - free(response); - - return NULL; -} - - -struct SPDY_Response * -SPDY_build_response_with_callback(int status, - const char * statustext, - const char * version, - struct SPDY_NameValue * headers, - SPDY_ResponseCallback rcb, - void *rcb_cls, - uint32_t block_size) -{ - struct SPDY_Response *response; - - if(NULL == rcb) - { - SPDYF_DEBUG("rcb is NULL"); - return NULL; - } - if(block_size > SPDY_MAX_SUPPORTED_FRAME_SIZE) - { - SPDYF_DEBUG("block_size is wrong"); - return NULL; - } - - if(0 == block_size) - block_size = SPDY_MAX_SUPPORTED_FRAME_SIZE; - - response = SPDY_build_response(status, - statustext, - version, - headers, - NULL, - 0); - - if(NULL == response) - { - return NULL; - } - - response->rcb = rcb; - response->rcb_cls = rcb_cls; - response->rcb_block_size = block_size; - - return response; -} - - -int -SPDY_queue_response (struct SPDY_Request * request, - struct SPDY_Response *response, - bool closestream, - bool consider_priority, - SPDY_ResponseResultCallback rrcb, - void * rrcb_cls) -{ - struct SPDYF_Response_Queue *headers_to_queue; - struct SPDYF_Response_Queue *body_to_queue; - SPDYF_ResponseQueueResultCallback frqcb = NULL; - void *frqcb_cls = NULL; - int int_consider_priority = consider_priority ? SPDY_YES : SPDY_NO; - - if(NULL == request) - { - SPDYF_DEBUG("request is NULL"); - return SPDY_INPUT_ERROR; - } - if(NULL == response) - { - SPDYF_DEBUG("request is NULL"); - return SPDY_INPUT_ERROR; - } - - if(request->stream->is_out_closed - || SPDY_SESSION_STATUS_CLOSING == request->stream->session->status) - return SPDY_NO; - - if(NULL != rrcb) - { - frqcb_cls = request; - frqcb = &spdy_handler_response_queue_result; - } - - if(response->data_size > 0) - { - //SYN_REPLY and DATA will be queued - - if(NULL == (headers_to_queue = SPDYF_response_queue_create(false, - response->headers, - response->headers_size, - response, - request->stream, - false, - NULL, - NULL, - NULL, - NULL))) - { - return SPDY_NO; - } - - if(NULL == (body_to_queue = SPDYF_response_queue_create(true, - response->data, - response->data_size, - response, - request->stream, - closestream, - frqcb, - frqcb_cls, - rrcb, - rrcb_cls))) - { - SPDYF_response_queue_destroy(headers_to_queue); - return SPDY_NO; - } - - SPDYF_queue_response (headers_to_queue, - request->stream->session, - int_consider_priority); - - SPDYF_queue_response (body_to_queue, - request->stream->session, - int_consider_priority); - } - else if(NULL == response->rcb) - { - //no "body" will be queued, e.g. HTTP 404 without body - - if(NULL == (headers_to_queue = SPDYF_response_queue_create(false, - response->headers, - response->headers_size, - response, - request->stream, - closestream, - frqcb, - frqcb_cls, - rrcb, - rrcb_cls))) - { - return SPDY_NO; - } - - SPDYF_queue_response (headers_to_queue, - request->stream->session, - int_consider_priority); - } - else - { - //response with callbacks - - if(NULL == (headers_to_queue = SPDYF_response_queue_create(false, - response->headers, - response->headers_size, - response, - request->stream, - false, - NULL, - NULL, - NULL, - NULL))) - { - return SPDY_NO; - } - - if(NULL == (body_to_queue = SPDYF_response_queue_create(true, - response->data, - response->data_size, - response, - request->stream, - closestream, - frqcb, - frqcb_cls, - rrcb, - rrcb_cls))) - { - SPDYF_response_queue_destroy(headers_to_queue); - return SPDY_NO; - } - - SPDYF_queue_response (headers_to_queue, - request->stream->session, - int_consider_priority); - - SPDYF_queue_response (body_to_queue, - request->stream->session, - int_consider_priority); - } - - return SPDY_YES; -} - - -socklen_t -SPDY_get_remote_addr(struct SPDY_Session * session, - struct sockaddr ** addr) -{ - if(NULL == session) - { - SPDYF_DEBUG("session is NULL"); - return 0; - } - - *addr = session->addr; - - return session->addr_len; -} - - -struct SPDY_Session * -SPDY_get_session_for_request(const struct SPDY_Request * request) -{ - if(NULL == request) - { - SPDYF_DEBUG("request is NULL"); - return NULL; - } - - return request->stream->session; -} - - -void * -SPDY_get_cls_from_session(struct SPDY_Session * session) -{ - if(NULL == session) - { - SPDYF_DEBUG("session is NULL"); - return NULL; - } - - return session->user_cls; -} - - -void -SPDY_set_cls_to_session(struct SPDY_Session * session, - void * cls) -{ - if(NULL == session) - { - SPDYF_DEBUG("session is NULL"); - return; - } - - session->user_cls = cls; -} - - -void * -SPDY_get_cls_from_request(struct SPDY_Request * request) -{ - if(NULL == request) - { - SPDYF_DEBUG("request is NULL"); - return NULL; - } - - return request->user_cls; -} - - -void -SPDY_set_cls_to_request(struct SPDY_Request * request, - void * cls) -{ - if(NULL == request) - { - SPDYF_DEBUG("request is NULL"); - return; - } - - request->user_cls = cls; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/applicationlayer.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/applicationlayer.h deleted file mode 100644 index a36760fe..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/applicationlayer.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file applicationlayer.h - * @brief SPDY application or HTTP layer - * @author Andrey Uzunov - */ - -#ifndef APPLICATIONLAYER_H -#define APPLICATIONLAYER_H - -#include "platform.h" - - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/compression.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/compression.c deleted file mode 100644 index 532ab64a..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/compression.c +++ /dev/null @@ -1,441 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file compression.c - * @brief zlib handling functions - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "structures.h" -#include "internal.h" -#include "compression.h" - -/* spdy ver 3 specific dictionary used by zlib */ -static const unsigned char -spdyf_zlib_dictionary[] = { - 0x00, 0x00, 0x00, 0x07, 0x6f, 0x70, 0x74, 0x69, // - - - - o p t i - 0x6f, 0x6e, 0x73, 0x00, 0x00, 0x00, 0x04, 0x68, // o n s - - - - h - 0x65, 0x61, 0x64, 0x00, 0x00, 0x00, 0x04, 0x70, // e a d - - - - p - 0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x03, 0x70, // o s t - - - - p - 0x75, 0x74, 0x00, 0x00, 0x00, 0x06, 0x64, 0x65, // u t - - - - d e - 0x6c, 0x65, 0x74, 0x65, 0x00, 0x00, 0x00, 0x05, // l e t e - - - - - 0x74, 0x72, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00, // t r a c e - - - - 0x06, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x00, // - a c c e p t - - 0x00, 0x00, 0x0e, 0x61, 0x63, 0x63, 0x65, 0x70, // - - - a c c e p - 0x74, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65, // t - c h a r s e - 0x74, 0x00, 0x00, 0x00, 0x0f, 0x61, 0x63, 0x63, // t - - - - a c c - 0x65, 0x70, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f, // e p t - e n c o - 0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x0f, // d i n g - - - - - 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x6c, // a c c e p t - l - 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x00, // a n g u a g e - - 0x00, 0x00, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x70, // - - - a c c e p - 0x74, 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73, // t - r a n g e s - 0x00, 0x00, 0x00, 0x03, 0x61, 0x67, 0x65, 0x00, // - - - - a g e - - 0x00, 0x00, 0x05, 0x61, 0x6c, 0x6c, 0x6f, 0x77, // - - - a l l o w - 0x00, 0x00, 0x00, 0x0d, 0x61, 0x75, 0x74, 0x68, // - - - - a u t h - 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, // o r i z a t i o - 0x6e, 0x00, 0x00, 0x00, 0x0d, 0x63, 0x61, 0x63, // n - - - - c a c - 0x68, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, // h e - c o n t r - 0x6f, 0x6c, 0x00, 0x00, 0x00, 0x0a, 0x63, 0x6f, // o l - - - - c o - 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, // n n e c t i o n - 0x00, 0x00, 0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74, // - - - - c o n t - 0x65, 0x6e, 0x74, 0x2d, 0x62, 0x61, 0x73, 0x65, // e n t - b a s e - 0x00, 0x00, 0x00, 0x10, 0x63, 0x6f, 0x6e, 0x74, // - - - - c o n t - 0x65, 0x6e, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f, // e n t - e n c o - 0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x10, // d i n g - - - - - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, // c o n t e n t - - 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, // l a n g u a g e - 0x00, 0x00, 0x00, 0x0e, 0x63, 0x6f, 0x6e, 0x74, // - - - - c o n t - 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x65, 0x6e, 0x67, // e n t - l e n g - 0x74, 0x68, 0x00, 0x00, 0x00, 0x10, 0x63, 0x6f, // t h - - - - c o - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x6f, // n t e n t - l o - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, // c a t i o n - - - 0x00, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, // - - c o n t e n - 0x74, 0x2d, 0x6d, 0x64, 0x35, 0x00, 0x00, 0x00, // t - m d 5 - - - - 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, // - c o n t e n t - 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00, // - r a n g e - - - 0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, // - - c o n t e n - 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x00, 0x00, // t - t y p e - - - 0x00, 0x04, 0x64, 0x61, 0x74, 0x65, 0x00, 0x00, // - - d a t e - - - 0x00, 0x04, 0x65, 0x74, 0x61, 0x67, 0x00, 0x00, // - - e t a g - - - 0x00, 0x06, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, // - - e x p e c t - 0x00, 0x00, 0x00, 0x07, 0x65, 0x78, 0x70, 0x69, // - - - - e x p i - 0x72, 0x65, 0x73, 0x00, 0x00, 0x00, 0x04, 0x66, // r e s - - - - f - 0x72, 0x6f, 0x6d, 0x00, 0x00, 0x00, 0x04, 0x68, // r o m - - - - h - 0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x08, 0x69, // o s t - - - - i - 0x66, 0x2d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x00, // f - m a t c h - - 0x00, 0x00, 0x11, 0x69, 0x66, 0x2d, 0x6d, 0x6f, // - - - i f - m o - 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2d, 0x73, // d i f i e d - s - 0x69, 0x6e, 0x63, 0x65, 0x00, 0x00, 0x00, 0x0d, // i n c e - - - - - 0x69, 0x66, 0x2d, 0x6e, 0x6f, 0x6e, 0x65, 0x2d, // i f - n o n e - - 0x6d, 0x61, 0x74, 0x63, 0x68, 0x00, 0x00, 0x00, // m a t c h - - - - 0x08, 0x69, 0x66, 0x2d, 0x72, 0x61, 0x6e, 0x67, // - i f - r a n g - 0x65, 0x00, 0x00, 0x00, 0x13, 0x69, 0x66, 0x2d, // e - - - - i f - - 0x75, 0x6e, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, // u n m o d i f i - 0x65, 0x64, 0x2d, 0x73, 0x69, 0x6e, 0x63, 0x65, // e d - s i n c e - 0x00, 0x00, 0x00, 0x0d, 0x6c, 0x61, 0x73, 0x74, // - - - - l a s t - 0x2d, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, // - m o d i f i e - 0x64, 0x00, 0x00, 0x00, 0x08, 0x6c, 0x6f, 0x63, // d - - - - l o c - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, // a t i o n - - - - 0x0c, 0x6d, 0x61, 0x78, 0x2d, 0x66, 0x6f, 0x72, // - m a x - f o r - 0x77, 0x61, 0x72, 0x64, 0x73, 0x00, 0x00, 0x00, // w a r d s - - - - 0x06, 0x70, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x00, // - p r a g m a - - 0x00, 0x00, 0x12, 0x70, 0x72, 0x6f, 0x78, 0x79, // - - - p r o x y - 0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, // - a u t h e n t - 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00, // i c a t e - - - - 0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2d, 0x61, // - p r o x y - a - 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, // u t h o r i z a - 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x05, // t i o n - - - - - 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00, 0x00, // r a n g e - - - - 0x07, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72, // - r e f e r e r - 0x00, 0x00, 0x00, 0x0b, 0x72, 0x65, 0x74, 0x72, // - - - - r e t r - 0x79, 0x2d, 0x61, 0x66, 0x74, 0x65, 0x72, 0x00, // y - a f t e r - - 0x00, 0x00, 0x06, 0x73, 0x65, 0x72, 0x76, 0x65, // - - - s e r v e - 0x72, 0x00, 0x00, 0x00, 0x02, 0x74, 0x65, 0x00, // r - - - - t e - - 0x00, 0x00, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, // - - - t r a i l - 0x65, 0x72, 0x00, 0x00, 0x00, 0x11, 0x74, 0x72, // e r - - - - t r - 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2d, 0x65, // a n s f e r - e - 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x00, // n c o d i n g - - 0x00, 0x00, 0x07, 0x75, 0x70, 0x67, 0x72, 0x61, // - - - u p g r a - 0x64, 0x65, 0x00, 0x00, 0x00, 0x0a, 0x75, 0x73, // d e - - - - u s - 0x65, 0x72, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, // e r - a g e n t - 0x00, 0x00, 0x00, 0x04, 0x76, 0x61, 0x72, 0x79, // - - - - v a r y - 0x00, 0x00, 0x00, 0x03, 0x76, 0x69, 0x61, 0x00, // - - - - v i a - - 0x00, 0x00, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69, // - - - w a r n i - 0x6e, 0x67, 0x00, 0x00, 0x00, 0x10, 0x77, 0x77, // n g - - - - w w - 0x77, 0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, // w - a u t h e n - 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00, // t i c a t e - - - 0x00, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, // - - m e t h o d - 0x00, 0x00, 0x00, 0x03, 0x67, 0x65, 0x74, 0x00, // - - - - g e t - - 0x00, 0x00, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, // - - - s t a t u - 0x73, 0x00, 0x00, 0x00, 0x06, 0x32, 0x30, 0x30, // s - - - - 2 0 0 - 0x20, 0x4f, 0x4b, 0x00, 0x00, 0x00, 0x07, 0x76, // - O K - - - - v - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x00, // e r s i o n - - - 0x00, 0x08, 0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, // - - H T T P - 1 - 0x2e, 0x31, 0x00, 0x00, 0x00, 0x03, 0x75, 0x72, // - 1 - - - - u r - 0x6c, 0x00, 0x00, 0x00, 0x06, 0x70, 0x75, 0x62, // l - - - - p u b - 0x6c, 0x69, 0x63, 0x00, 0x00, 0x00, 0x0a, 0x73, // l i c - - - - s - 0x65, 0x74, 0x2d, 0x63, 0x6f, 0x6f, 0x6b, 0x69, // e t - c o o k i - 0x65, 0x00, 0x00, 0x00, 0x0a, 0x6b, 0x65, 0x65, // e - - - - k e e - 0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x00, // p - a l i v e - - 0x00, 0x00, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, // - - - o r i g i - 0x6e, 0x31, 0x30, 0x30, 0x31, 0x30, 0x31, 0x32, // n 1 0 0 1 0 1 2 - 0x30, 0x31, 0x32, 0x30, 0x32, 0x32, 0x30, 0x35, // 0 1 2 0 2 2 0 5 - 0x32, 0x30, 0x36, 0x33, 0x30, 0x30, 0x33, 0x30, // 2 0 6 3 0 0 3 0 - 0x32, 0x33, 0x30, 0x33, 0x33, 0x30, 0x34, 0x33, // 2 3 0 3 3 0 4 3 - 0x30, 0x35, 0x33, 0x30, 0x36, 0x33, 0x30, 0x37, // 0 5 3 0 6 3 0 7 - 0x34, 0x30, 0x32, 0x34, 0x30, 0x35, 0x34, 0x30, // 4 0 2 4 0 5 4 0 - 0x36, 0x34, 0x30, 0x37, 0x34, 0x30, 0x38, 0x34, // 6 4 0 7 4 0 8 4 - 0x30, 0x39, 0x34, 0x31, 0x30, 0x34, 0x31, 0x31, // 0 9 4 1 0 4 1 1 - 0x34, 0x31, 0x32, 0x34, 0x31, 0x33, 0x34, 0x31, // 4 1 2 4 1 3 4 1 - 0x34, 0x34, 0x31, 0x35, 0x34, 0x31, 0x36, 0x34, // 4 4 1 5 4 1 6 4 - 0x31, 0x37, 0x35, 0x30, 0x32, 0x35, 0x30, 0x34, // 1 7 5 0 2 5 0 4 - 0x35, 0x30, 0x35, 0x32, 0x30, 0x33, 0x20, 0x4e, // 5 0 5 2 0 3 - N - 0x6f, 0x6e, 0x2d, 0x41, 0x75, 0x74, 0x68, 0x6f, // o n - A u t h o - 0x72, 0x69, 0x74, 0x61, 0x74, 0x69, 0x76, 0x65, // r i t a t i v e - 0x20, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, // - I n f o r m a - 0x74, 0x69, 0x6f, 0x6e, 0x32, 0x30, 0x34, 0x20, // t i o n 2 0 4 - - 0x4e, 0x6f, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x65, // N o - C o n t e - 0x6e, 0x74, 0x33, 0x30, 0x31, 0x20, 0x4d, 0x6f, // n t 3 0 1 - M o - 0x76, 0x65, 0x64, 0x20, 0x50, 0x65, 0x72, 0x6d, // v e d - P e r m - 0x61, 0x6e, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x34, // a n e n t l y 4 - 0x30, 0x30, 0x20, 0x42, 0x61, 0x64, 0x20, 0x52, // 0 0 - B a d - R - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x34, 0x30, // e q u e s t 4 0 - 0x31, 0x20, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, // 1 - U n a u t h - 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x64, 0x34, 0x30, // o r i z e d 4 0 - 0x33, 0x20, 0x46, 0x6f, 0x72, 0x62, 0x69, 0x64, // 3 - F o r b i d - 0x64, 0x65, 0x6e, 0x34, 0x30, 0x34, 0x20, 0x4e, // d e n 4 0 4 - N - 0x6f, 0x74, 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, // o t - F o u n d - 0x35, 0x30, 0x30, 0x20, 0x49, 0x6e, 0x74, 0x65, // 5 0 0 - I n t e - 0x72, 0x6e, 0x61, 0x6c, 0x20, 0x53, 0x65, 0x72, // r n a l - S e r - 0x76, 0x65, 0x72, 0x20, 0x45, 0x72, 0x72, 0x6f, // v e r - E r r o - 0x72, 0x35, 0x30, 0x31, 0x20, 0x4e, 0x6f, 0x74, // r 5 0 1 - N o t - 0x20, 0x49, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, // - I m p l e m e - 0x6e, 0x74, 0x65, 0x64, 0x35, 0x30, 0x33, 0x20, // n t e d 5 0 3 - - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x20, // S e r v i c e - - 0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, // U n a v a i l a - 0x62, 0x6c, 0x65, 0x4a, 0x61, 0x6e, 0x20, 0x46, // b l e J a n - F - 0x65, 0x62, 0x20, 0x4d, 0x61, 0x72, 0x20, 0x41, // e b - M a r - A - 0x70, 0x72, 0x20, 0x4d, 0x61, 0x79, 0x20, 0x4a, // p r - M a y - J - 0x75, 0x6e, 0x20, 0x4a, 0x75, 0x6c, 0x20, 0x41, // u n - J u l - A - 0x75, 0x67, 0x20, 0x53, 0x65, 0x70, 0x74, 0x20, // u g - S e p t - - 0x4f, 0x63, 0x74, 0x20, 0x4e, 0x6f, 0x76, 0x20, // O c t - N o v - - 0x44, 0x65, 0x63, 0x20, 0x30, 0x30, 0x3a, 0x30, // D e c - 0 0 - 0 - 0x30, 0x3a, 0x30, 0x30, 0x20, 0x4d, 0x6f, 0x6e, // 0 - 0 0 - M o n - 0x2c, 0x20, 0x54, 0x75, 0x65, 0x2c, 0x20, 0x57, // - - T u e - - W - 0x65, 0x64, 0x2c, 0x20, 0x54, 0x68, 0x75, 0x2c, // e d - - T h u - - 0x20, 0x46, 0x72, 0x69, 0x2c, 0x20, 0x53, 0x61, // - F r i - - S a - 0x74, 0x2c, 0x20, 0x53, 0x75, 0x6e, 0x2c, 0x20, // t - - S u n - - - 0x47, 0x4d, 0x54, 0x63, 0x68, 0x75, 0x6e, 0x6b, // G M T c h u n k - 0x65, 0x64, 0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f, // e d - t e x t - - 0x68, 0x74, 0x6d, 0x6c, 0x2c, 0x69, 0x6d, 0x61, // h t m l - i m a - 0x67, 0x65, 0x2f, 0x70, 0x6e, 0x67, 0x2c, 0x69, // g e - p n g - i - 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x6a, 0x70, 0x67, // m a g e - j p g - 0x2c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x67, // - i m a g e - g - 0x69, 0x66, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69, // i f - a p p l i - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78, // c a t i o n - x - 0x6d, 0x6c, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69, // m l - a p p l i - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78, // c a t i o n - x - 0x68, 0x74, 0x6d, 0x6c, 0x2b, 0x78, 0x6d, 0x6c, // h t m l - x m l - 0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c, // - t e x t - p l - 0x61, 0x69, 0x6e, 0x2c, 0x74, 0x65, 0x78, 0x74, // a i n - t e x t - 0x2f, 0x6a, 0x61, 0x76, 0x61, 0x73, 0x63, 0x72, // - j a v a s c r - 0x69, 0x70, 0x74, 0x2c, 0x70, 0x75, 0x62, 0x6c, // i p t - p u b l - 0x69, 0x63, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, // i c p r i v a t - 0x65, 0x6d, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65, // e m a x - a g e - 0x3d, 0x67, 0x7a, 0x69, 0x70, 0x2c, 0x64, 0x65, // - g z i p - d e - 0x66, 0x6c, 0x61, 0x74, 0x65, 0x2c, 0x73, 0x64, // f l a t e - s d - 0x63, 0x68, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65, // c h c h a r s e - 0x74, 0x3d, 0x75, 0x74, 0x66, 0x2d, 0x38, 0x63, // t - u t f - 8 c - 0x68, 0x61, 0x72, 0x73, 0x65, 0x74, 0x3d, 0x69, // h a r s e t - i - 0x73, 0x6f, 0x2d, 0x38, 0x38, 0x35, 0x39, 0x2d, // s o - 8 8 5 9 - - 0x31, 0x2c, 0x75, 0x74, 0x66, 0x2d, 0x2c, 0x2a, // 1 - u t f - - - - 0x2c, 0x65, 0x6e, 0x71, 0x3d, 0x30, 0x2e // - e n q - 0 - -}; - - -int -SPDYF_zlib_deflate_init(z_stream *strm) -{ - int ret; - - strm->zalloc = Z_NULL; - strm->zfree = Z_NULL; - strm->opaque = Z_NULL; - //the second argument is "level of compression" - //use 0 for no compression; 9 for best compression - ret = deflateInit(strm, Z_DEFAULT_COMPRESSION); - if(ret != Z_OK) - { - SPDYF_DEBUG("deflate init"); - return SPDY_NO; - } - ret = deflateSetDictionary(strm, - spdyf_zlib_dictionary, - sizeof(spdyf_zlib_dictionary)); - if(ret != Z_OK) - { - SPDYF_DEBUG("deflate set dict"); - deflateEnd(strm); - return SPDY_NO; - } - return SPDY_YES; -} - - -void -SPDYF_zlib_deflate_end(z_stream *strm) -{ - deflateEnd(strm); -} - -int -SPDYF_zlib_deflate(z_stream *strm, - const void *src, - size_t src_size, - size_t *data_used, - void **dest, - size_t *dest_size) -{ - int ret; - int flush; - unsigned int have; - Bytef out[SPDYF_ZLIB_CHUNK]; - - *dest = NULL; - *dest_size = 0; - - do - { - /* check for big data bigger than the buffer used */ - if(src_size > SPDYF_ZLIB_CHUNK) - { - strm->avail_in = SPDYF_ZLIB_CHUNK; - src_size -= SPDYF_ZLIB_CHUNK; - /* flush is used for the loop to detect if we still - * need to supply additional - * data to the stream via avail_in and next_in. */ - flush = Z_NO_FLUSH; - } - else - { - strm->avail_in = src_size; - flush = Z_SYNC_FLUSH; - } - *data_used += strm->avail_in; - - strm->next_in = (Bytef *)src; - - /* Loop while output data is available */ - do - { - strm->avail_out = SPDYF_ZLIB_CHUNK; - strm->next_out = out; - - /* No need to check return value of deflate. - * (See zlib documentation at http://www.zlib.net/zlib_how.html */ - ret = deflate(strm, flush); - have = SPDYF_ZLIB_CHUNK - strm->avail_out; - - /* (Re)allocate memory for dest and keep track of it's size. */ - *dest_size += have; - *dest = realloc(*dest, *dest_size); - if(!*dest) - { - SPDYF_DEBUG("realloc data for result"); - deflateEnd(strm); - return SPDY_NO; - } - memcpy((*dest) + ((*dest_size) - have), out, have); - } - while(strm->avail_out == 0); - /* At this point, all of the input data should already - * have been used. */ - SPDYF_ASSERT(strm->avail_in == 0,"compressing bug"); - } - while(flush != Z_SYNC_FLUSH); - - return Z_OK == ret ? SPDY_YES : SPDY_NO; -} - - -int -SPDYF_zlib_inflate_init(z_stream *strm) -{ - int ret; - - strm->zalloc = Z_NULL; - strm->zfree = Z_NULL; - strm->opaque = Z_NULL; - strm->avail_in = 0; - strm->next_in = Z_NULL; - //change 15 to lower value for performance and benchmark - //"The windowBits parameter is the base two logarithm of the - // maximum window size (the size of the history buffer)." - ret = inflateInit2(strm, 15); - if(ret != Z_OK) - { - SPDYF_DEBUG("Cannot inflateInit2 the stream"); - return SPDY_NO; - } - return SPDY_YES; -} - - -void -SPDYF_zlib_inflate_end(z_stream *strm) -{ - inflateEnd(strm); -} - - -int -SPDYF_zlib_inflate(z_stream *strm, - const void *src, - size_t src_size, - void **dest, - size_t *dest_size) -{ - int ret = Z_OK; - uint32_t have; - Bytef out[SPDYF_ZLIB_CHUNK]; - - *dest = NULL; - *dest_size = 0; - - /* decompress until deflate stream ends or end of file */ - do - { - if(src_size > SPDYF_ZLIB_CHUNK) - { - strm->avail_in = SPDYF_ZLIB_CHUNK; - src_size -= SPDYF_ZLIB_CHUNK; - } - else - { - strm->avail_in = src_size; - src_size = 0; - } - - if(strm->avail_in == 0){ - //the loop breaks always here as the stream never ends - break; - } - - strm->next_in = (Bytef *) src; - /* run inflate() on input until output buffer not full */ - do { - strm->avail_out = SPDYF_ZLIB_CHUNK; - strm->next_out = out; - ret = inflate(strm, Z_SYNC_FLUSH); - - switch (ret) - { - case Z_STREAM_ERROR: - SPDYF_DEBUG("Error on inflate"); - //no inflateEnd here, same in zlib example - return SPDY_NO; - - case Z_NEED_DICT: - ret = inflateSetDictionary(strm, - spdyf_zlib_dictionary, - sizeof(spdyf_zlib_dictionary)); - if(ret != Z_OK) - { - SPDYF_DEBUG("Error on inflateSetDictionary"); - inflateEnd(strm); - return SPDY_NO; - } - ret = inflate(strm, Z_SYNC_FLUSH); - if(Z_STREAM_ERROR == ret) - { - SPDYF_DEBUG("Error on inflate"); - return SPDY_NO; - } - break; - - case Z_DATA_ERROR: - SPDYF_DEBUG("Z_DATA_ERROR"); - inflateEnd(strm); - return SPDY_NO; - - case Z_MEM_ERROR: - SPDYF_DEBUG("Z_MEM_ERROR"); - inflateEnd(strm); - return SPDY_NO; - } - have = SPDYF_ZLIB_CHUNK - strm->avail_out; - *dest_size += have; - /* (re)alloc memory for the output buffer */ - *dest = realloc(*dest, *dest_size); - if(!*dest) - { - SPDYF_DEBUG("Cannot realloc memory"); - inflateEnd(strm); - return SPDY_NO; - } - memcpy((*dest) + ((*dest_size) - have), out, have); - } - while (0 == strm->avail_out); - } - while (Z_STREAM_END != ret); - - return Z_OK == ret || Z_STREAM_END == ret ? SPDY_YES : SPDY_NO; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/compression.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/compression.h deleted file mode 100644 index 40746e78..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/compression.h +++ /dev/null @@ -1,117 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file compression.h - * @brief zlib handling functions - * @author Andrey Uzunov - */ - -#ifndef COMPRESSION_H -#define COMPRESSION_H - -#include "platform.h" - -/* size of buffers used by zlib on (de)compressing */ -#define SPDYF_ZLIB_CHUNK 16384 - - -/** - * Initializes the zlib stream for compression. Must be called once - * for a session on initialization. - * - * @param strm Zlib stream on which we work - * @return SPDY_NO if zlib failed. SPDY_YES otherwise - */ -int -SPDYF_zlib_deflate_init(z_stream *strm); - - -/** - * Deinitializes the zlib stream for compression. Should be called once - * for a session on cleaning up. - * - * @param strm Zlib stream on which we work - */ -void -SPDYF_zlib_deflate_end(z_stream *strm); - - -/** - * Compressing stream with zlib. - * - * @param strm Zlib stream on which we work - * @param src stream of the data to be compressed - * @param src_size size of the data - * @param data_used the number of bytes from src_stream that were used - * TODO do we need - * @param dest the resulting compressed stream. Should be NULL. Must be - * freed later manually. - * @param dest_size size of the data after compression - * @return SPDY_NO if malloc or zlib failed. SPDY_YES otherwise - */ -int -SPDYF_zlib_deflate(z_stream *strm, - const void *src, - size_t src_size, - size_t *data_used, - void **dest, - size_t *dest_size); - - -/** - * Initializes the zlib stream for decompression. Must be called once - * for a session. - * - * @param strm Zlib stream on which we work - * @return SPDY_NO if zlib failed. SPDY_YES otherwise - */ -int -SPDYF_zlib_inflate_init(z_stream *strm); - - -/** - * Deinitializes the zlib stream for decompression. Should be called once - * for a session on cleaning up. - * - * @param strm Zlib stream on which we work - */ -void -SPDYF_zlib_inflate_end(z_stream *strm); - - -/** - * Decompressing stream with zlib. - * - * @param strm Zlib stream on which we work - * @param src stream of the data to be decompressed - * @param src_size size of the data - * @param dest the resulting decompressed stream. Should be NULL. Must - * be freed manually. - * @param dest_size size of the data after decompression - * @return SPDY_NO if malloc or zlib failed. SPDY_YES otherwise. If the - * function fails, the SPDY session must be closed - */ -int -SPDYF_zlib_inflate(z_stream *strm, - const void *src, - size_t src_size, - void **dest, - size_t *dest_size); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/daemon.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/daemon.c deleted file mode 100644 index 32285ae7..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/daemon.c +++ /dev/null @@ -1,544 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file microspdy/daemon.c - * @brief daemon functionality - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "structures.h" -#include "internal.h" -#include "session.h" -#include "io.h" - - -/** - * Default implementation of the panic function, - * prints an error message and aborts. - * - * @param cls unused - * @param file name of the file with the problem - * @param line line number with the problem - * @param reason error message with details - */ -static void -spdyf_panic_std (void *cls, - const char *file, - unsigned int line, - const char *reason) -{ - (void)cls; - fprintf (stdout, "Fatal error in libmicrospdy %s:%u: %s\n", - file, line, reason); - //raise(SIGINT); //used for gdb - abort (); -} - - -/** - * Global handler for fatal errors. - */ -SPDY_PanicCallback spdyf_panic = &spdyf_panic_std; - - -/** - * Global closure argument for "spdyf_panic". - */ -void *spdyf_panic_cls; - - -/** - * Free resources associated with all closed connections. - * (destroy responses, free buffers, etc.). - * - * @param daemon daemon to clean up - */ -static void -spdyf_cleanup_sessions (struct SPDY_Daemon *daemon) -{ - struct SPDY_Session *session; - - while (NULL != (session = daemon->cleanup_head)) - { - DLL_remove (daemon->cleanup_head, - daemon->cleanup_tail, - session); - - SPDYF_session_destroy(session); - } -} - - -/** - * Closing of all connections handled by the daemon. - * - * @param daemon SPDY daemon - */ -static void -spdyf_close_all_sessions (struct SPDY_Daemon *daemon) -{ - struct SPDY_Session *session; - - while (NULL != (session = daemon->sessions_head)) - { - //prepare GOAWAY frame - SPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_OK, true); - //try to send the frame (it is best effort, so it will maybe sent) - SPDYF_session_write(session,true); - SPDYF_session_close(session); - } - - spdyf_cleanup_sessions(daemon); -} - - -/** - * Parse a list of options given as varargs. - * - * @param daemon the daemon to initialize - * @param valist the options - * @return SPDY_YES on success, SPDY_NO on error - */ -static int -spdyf_parse_options_va (struct SPDY_Daemon *daemon, - va_list valist) -{ - enum SPDY_DAEMON_OPTION opt; - - while (SPDY_DAEMON_OPTION_END != (opt = (enum SPDY_DAEMON_OPTION) va_arg (valist, int))) - { - if(opt & daemon->options) - { - SPDYF_DEBUG("Daemon option %i used twice",opt); - return SPDY_NO; - } - daemon->options |= opt; - - switch (opt) - { - case SPDY_DAEMON_OPTION_SESSION_TIMEOUT: - daemon->session_timeout = va_arg (valist, unsigned int) * 1000; - break; - case SPDY_DAEMON_OPTION_SOCK_ADDR: - daemon->address = va_arg (valist, struct sockaddr *); - break; - case SPDY_DAEMON_OPTION_FLAGS: - daemon->flags = va_arg (valist, enum SPDY_DAEMON_FLAG); - break; - case SPDY_DAEMON_OPTION_IO_SUBSYSTEM: - daemon->io_subsystem = va_arg (valist, enum SPDY_IO_SUBSYSTEM); - break; - case SPDY_DAEMON_OPTION_MAX_NUM_FRAMES: - daemon->max_num_frames = va_arg (valist, uint32_t); - break; - default: - SPDYF_DEBUG("Wrong option for the daemon %i",opt); - return SPDY_NO; - } - } - return SPDY_YES; -} - - -void -SPDY_set_panic_func (SPDY_PanicCallback cb, - void *cls) -{ - spdyf_panic = cb; - spdyf_panic_cls = cls; -} - - -struct SPDY_Daemon * -SPDYF_start_daemon_va (uint16_t port, - const char *certfile, - const char *keyfile, - SPDY_NewSessionCallback nscb, - SPDY_SessionClosedCallback sccb, - SPDY_NewRequestCallback nrcb, - SPDY_NewDataCallback npdcb, - SPDYF_NewStreamCallback fnscb, - SPDYF_NewDataCallback fndcb, - void * cls, - void * fcls, - va_list valist) -{ - struct SPDY_Daemon *daemon = NULL; - int afamily; - int option_on = 1; - int ret; - struct sockaddr_in* servaddr4 = NULL; -#if HAVE_INET6 - struct sockaddr_in6* servaddr6 = NULL; -#endif - socklen_t addrlen; - - if (NULL == (daemon = malloc (sizeof (struct SPDY_Daemon)))) - { - SPDYF_DEBUG("malloc"); - return NULL; - } - memset (daemon, 0, sizeof (struct SPDY_Daemon)); - daemon->socket_fd = -1; - daemon->port = port; - - if(SPDY_YES != spdyf_parse_options_va (daemon, valist)) - { - SPDYF_DEBUG("parse"); - goto free_and_fail; - } - - if(0 == daemon->max_num_frames) - daemon->max_num_frames = SPDYF_NUM_SENT_FRAMES_AT_ONCE; - - if(!port && NULL == daemon->address) - { - SPDYF_DEBUG("Port is 0"); - goto free_and_fail; - } - if(0 == daemon->io_subsystem) - daemon->io_subsystem = SPDY_IO_SUBSYSTEM_OPENSSL; - - if(SPDY_YES != SPDYF_io_set_daemon(daemon, daemon->io_subsystem)) - goto free_and_fail; - - if(SPDY_IO_SUBSYSTEM_RAW != daemon->io_subsystem) - { - if (NULL == certfile - || NULL == (daemon->certfile = strdup (certfile))) - { - SPDYF_DEBUG("strdup (certfile)"); - goto free_and_fail; - } - if (NULL == keyfile - || NULL == (daemon->keyfile = strdup (keyfile))) - { - SPDYF_DEBUG("strdup (keyfile)"); - goto free_and_fail; - } - } - - daemon->new_session_cb = nscb; - daemon->session_closed_cb = sccb; - daemon->new_request_cb = nrcb; - daemon->received_data_cb = npdcb; - daemon->cls = cls; - daemon->fcls = fcls; - daemon->fnew_stream_cb = fnscb; - daemon->freceived_data_cb = fndcb; - -#if HAVE_INET6 - //handling IPv6 - if((daemon->flags & SPDY_DAEMON_FLAG_ONLY_IPV6) - && NULL != daemon->address && AF_INET6 != daemon->address->sa_family) - { - SPDYF_DEBUG("SPDY_DAEMON_FLAG_ONLY_IPV6 set but IPv4 address provided"); - goto free_and_fail; - } - - addrlen = sizeof (struct sockaddr_in6); - - if(NULL == daemon->address) - { - if (NULL == (servaddr6 = malloc (addrlen))) - { - SPDYF_DEBUG("malloc"); - goto free_and_fail; - } - memset (servaddr6, 0, addrlen); - servaddr6->sin6_family = AF_INET6; - servaddr6->sin6_addr = in6addr_any; - servaddr6->sin6_port = htons (port); - daemon->address = (struct sockaddr *) servaddr6; - } - - if(AF_INET6 == daemon->address->sa_family) - { - afamily = PF_INET6; - } - else - { - afamily = PF_INET; - } -#else - //handling IPv4 - if(daemon->flags & SPDY_DAEMON_FLAG_ONLY_IPV6) - { - SPDYF_DEBUG("SPDY_DAEMON_FLAG_ONLY_IPV6 set but no support"); - goto free_and_fail; - } - - addrlen = sizeof (struct sockaddr_in); - - if(NULL == daemon->address) - { - if (NULL == (servaddr4 = malloc (addrlen))) - { - SPDYF_DEBUG("malloc"); - goto free_and_fail; - } - memset (servaddr4, 0, addrlen); - servaddr4->sin_family = AF_INET; - servaddr4->sin_addr = INADDR_ANY; - servaddr4->sin_port = htons (port); - daemon->address = (struct sockaddr *) servaddr4; - } - - afamily = PF_INET; -#endif - - daemon->socket_fd = socket (afamily, SOCK_STREAM, 0); - if (-1 == daemon->socket_fd) - { - SPDYF_DEBUG("sock"); - goto free_and_fail; - } - - //setting option for the socket to reuse address - ret = setsockopt(daemon->socket_fd, SOL_SOCKET, SO_REUSEADDR, &option_on, sizeof(option_on)); - if(ret) - { - SPDYF_DEBUG("WARNING: SO_REUSEADDR was not set for the server"); - } - -#if HAVE_INET6 - if(daemon->flags & SPDY_DAEMON_FLAG_ONLY_IPV6) - { - ret = setsockopt(daemon->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, &option_on, sizeof(option_on)); - if(ret) - { - SPDYF_DEBUG("setsockopt with IPPROTO_IPV6 failed"); - goto free_and_fail; - } - } -#endif - - if (-1 == bind (daemon->socket_fd, daemon->address, addrlen)) - { - SPDYF_DEBUG("bind %i",errno); - goto free_and_fail; - } - - if (listen (daemon->socket_fd, 20) < 0) - { - SPDYF_DEBUG("listen %i",errno); - goto free_and_fail; - } - - if(SPDY_YES != daemon->fio_init(daemon)) - { - SPDYF_DEBUG("tls"); - goto free_and_fail; - } - - return daemon; - - //for GOTO - free_and_fail: - if(daemon->socket_fd > 0) - (void)close (daemon->socket_fd); - - free(servaddr4); -#if HAVE_INET6 - free(servaddr6); -#endif - if(NULL != daemon->certfile) - free(daemon->certfile); - if(NULL != daemon->keyfile) - free(daemon->keyfile); - free (daemon); - - return NULL; -} - - -void -SPDYF_stop_daemon (struct SPDY_Daemon *daemon) -{ - daemon->fio_deinit(daemon); - - shutdown (daemon->socket_fd, SHUT_RDWR); - spdyf_close_all_sessions (daemon); - (void)close (daemon->socket_fd); - - if(!(SPDY_DAEMON_OPTION_SOCK_ADDR & daemon->options)) - free(daemon->address); - - free(daemon->certfile); - free(daemon->keyfile); - - free(daemon); -} - - -int -SPDYF_get_timeout (struct SPDY_Daemon *daemon, - unsigned long long *timeout) -{ - unsigned long long earliest_deadline = 0; - unsigned long long now; - struct SPDY_Session *pos; - bool have_timeout; - - if(0 == daemon->session_timeout) - return SPDY_NO; - - now = SPDYF_monotonic_time(); - have_timeout = false; - for (pos = daemon->sessions_head; NULL != pos; pos = pos->next) - { - if ( (! have_timeout) || - (earliest_deadline > pos->last_activity + daemon->session_timeout) ) - earliest_deadline = pos->last_activity + daemon->session_timeout; - - have_timeout = true; - - if (SPDY_YES == pos->fio_is_pending(pos)) - { - earliest_deadline = 0; - break; - } - } - - if (!have_timeout) - return SPDY_NO; - if (earliest_deadline <= now) - *timeout = 0; - else - *timeout = earliest_deadline - now; - - return SPDY_YES; -} - - -int -SPDYF_get_fdset (struct SPDY_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set, - bool all) -{ - (void)except_fd_set; - struct SPDY_Session *pos; - int fd; - int max_fd = -1; - - fd = daemon->socket_fd; - if (-1 != fd) - { - FD_SET (fd, read_fd_set); - /* update max file descriptor */ - max_fd = fd; - } - - for (pos = daemon->sessions_head; NULL != pos; pos = pos->next) - { - fd = pos->socket_fd; - FD_SET(fd, read_fd_set); - if (all - || (NULL != pos->response_queue_head) //frames pending - || (NULL != pos->write_buffer) //part of last frame pending - || (SPDY_SESSION_STATUS_CLOSING == pos->status) //the session is about to be closed - || (daemon->session_timeout //timeout passed for the session - && (pos->last_activity + daemon->session_timeout < SPDYF_monotonic_time())) - || (SPDY_YES == pos->fio_is_pending(pos)) //data in TLS' read buffer pending - || ((pos->read_buffer_offset - pos->read_buffer_beginning) > 0) // data in lib's read buffer pending - ) - FD_SET(fd, write_fd_set); - if(fd > max_fd) - max_fd = fd; - } - - return max_fd; -} - - -void -SPDYF_run (struct SPDY_Daemon *daemon) -{ - struct SPDY_Session *pos; - struct SPDY_Session *next; - int num_ready; - fd_set rs; - fd_set ws; - fd_set es; - int max; - struct timeval timeout; - int ds; - - timeout.tv_sec = 0; - timeout.tv_usec = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - //here we need really all descriptors to see later which are ready - max = SPDYF_get_fdset(daemon,&rs,&ws,&es, true); - - num_ready = select (max + 1, &rs, &ws, &es, &timeout); - - if(num_ready < 1) - return; - - if ( (-1 != (ds = daemon->socket_fd)) && - (FD_ISSET (ds, &rs)) ){ - SPDYF_session_accept(daemon); - } - - next = daemon->sessions_head; - while (NULL != (pos = next)) - { - next = pos->next; - ds = pos->socket_fd; - if (ds != -1) - { - //fill the read buffer - if (FD_ISSET (ds, &rs) || pos->fio_is_pending(pos)){ - SPDYF_session_read(pos); - } - - //do something with the data in read buffer - if(SPDY_NO == SPDYF_session_idle(pos)) - { - //the session was closed, cannot write anymore - //continue; - } - - //write whatever has been put to the response queue - //during read or idle operation, something might be put - //on the response queue, thus call write operation - if (FD_ISSET (ds, &ws)){ - if(SPDY_NO == SPDYF_session_write(pos, false)) - { - //SPDYF_session_close(pos); - //continue; - } - } - - /* the response queue has been flushed for half closed - * connections, so let close them */ - /*if(pos->read_closed) - { - SPDYF_session_close(pos); - }*/ - } - } - - spdyf_cleanup_sessions(daemon); -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/daemon.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/daemon.h deleted file mode 100644 index cb3ed5fa..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/daemon.h +++ /dev/null @@ -1,130 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file daemon.h - * @brief daemon functionality - * @author Andrey Uzunov - */ - -#ifndef DAEMON_H -#define DAEMON_H - -#include "platform.h" - - -/** - * Global flags containing the initialized IO subsystems. - */ -enum SPDY_IO_SUBSYSTEM spdyf_io_initialized; - - -/** - * Start a SPDDY webserver on the given port. - * - * @param port port to bind to - * @param certfile path to the certificate that will be used by server - * @param keyfile path to the keyfile for the certificate - * @param nscb callback called when a new SPDY session is - * established by a client - * @param sccb callback called when a client closes the session - * @param nrcb callback called when a client sends request - * @param npdcb callback called when HTTP POST params are received - * after request - * @param fnscb callback called when new stream is opened by a client - * @param fndcb callback called when new data -- within a data frame -- - * is received by the server - * @param cls extra argument to all of the callbacks without those - * specific only for the framing layer - * @param fcls extra argument to all of the callbacks, specific only for - * the framing layer (those vars starting with 'f'). - * @param valist va_list of options (type-value pairs, - * terminated with SPDY_DAEMON_OPTION_END). - * @return NULL on error, handle to daemon on success - */ -struct SPDY_Daemon * -SPDYF_start_daemon_va (uint16_t port, - const char *certfile, - const char *keyfile, - SPDY_NewSessionCallback nscb, - SPDY_SessionClosedCallback sccb, - SPDY_NewRequestCallback nrcb, - SPDY_NewDataCallback npdcb, - SPDYF_NewStreamCallback fnscb, - SPDYF_NewDataCallback fndcb, - void * cls, - void * fcls, - va_list valist); - - -/** - * Run webserver operations (without blocking unless - * in client callbacks). This method must be called in the client event - * loop. - * - * @param daemon daemon to run - */ -void -SPDYF_run (struct SPDY_Daemon *daemon); - - -/** - * Obtain timeout value for select for this daemon. The returned value - * is how long select - * should at most block, not the timeout value set for connections. - * - * @param daemon daemon to query for timeout - * @param timeout set to the timeout (in milliseconds) - * @return SPDY_YES on success, SPDY_NO if no connections exist that - * would necessiate the use of a timeout right now - */ -int -SPDYF_get_timeout (struct SPDY_Daemon *daemon, - unsigned long long *timeout); - - -/** - * Obtain the select sets for this daemon. The idea of SPDYF_get_fdset - * is to return such descriptors that the select in the application can - * return and SPDY_run can be called only when this is really needed. - * That means not all sockets will be added to write_fd_set. - * - * @param daemon daemon to get sets from - * @param read_fd_set read set - * @param write_fd_set write set - * @param except_fd_set except set - * @param all add all session's descriptors to write_fd_set or not - * @return largest FD added - */ -int -SPDYF_get_fdset (struct SPDY_Daemon *daemon, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *except_fd_set, - bool all); - - -/** - * Shutdown the daemon. - * - * @param daemon daemon to stop - */ -void -SPDYF_stop_daemon (struct SPDY_Daemon *daemon); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/internal.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/internal.c deleted file mode 100644 index f0d2fc11..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/internal.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file microspdy/internal.c - * @brief internal functions and macros for the framing layer - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "structures.h" - - -unsigned long long -SPDYF_monotonic_time (void) -{ -#ifdef HAVE_CLOCK_GETTIME -#ifdef CLOCK_MONOTONIC - struct timespec ts; - if (0 == clock_gettime (CLOCK_MONOTONIC, &ts)) - return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; -#endif -#endif - return time (NULL) * 1000; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/internal.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/internal.h deleted file mode 100644 index e618a5a7..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/internal.h +++ /dev/null @@ -1,198 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file microspdy/internal.h - * @brief internal functions and macros for the framing layer - * @author Andrey Uzunov - */ - -#ifndef INTERNAL_H_H -#define INTERNAL_H_H - -#include "platform.h" -#include "microspdy.h" - -/** - * size of read buffers for each connection - * must be at least the size of SPDY_MAX_SUPPORTED_FRAME_SIZE - */ -#define SPDYF_BUFFER_SIZE 8192 - -/** - * initial size of window for each stream (this is for the data - * within data frames that can be handled) - */ -#define SPDYF_INITIAL_WINDOW_SIZE 65536 - -/** - * number of frames written to the socket at once. After X frames - * everything should be run again. In this way the application can - * response to more important requests while a big file is still - * being transmitted to the client - */ -#define SPDYF_NUM_SENT_FRAMES_AT_ONCE 10 - - -/** - * Handler for fatal errors. - */ -extern SPDY_PanicCallback spdyf_panic; - - -/** - * Closure argument for "mhd_panic". - */ -extern void *spdyf_panic_cls; - - -/** - * Trigger 'panic' action based on fatal errors. - * - * @param msg error message (const char *) - */ -#define SPDYF_PANIC(msg) \ - spdyf_panic (spdyf_panic_cls, __FILE__, __LINE__, msg) - - -/** - * Asserts the validity of an expression. - * - * @param expr (bool) - * @param msg message to print on error (const char *) - */ -#define SPDYF_ASSERT(expr, msg) \ - if(!(expr)){\ - SPDYF_PANIC(msg);\ - abort();\ - } - - -/** - * Convert 24 bit integer from host byte order to network byte order. - * - * @param n input value (int32_t) - * @return converted value (uint32_t) - */ -#if HAVE_BIG_ENDIAN -#define HTON24(n) n -#else -#define HTON24(n) (((((uint32_t)(n) & 0xFF)) << 16)\ - | (((uint32_t)(n) & 0xFF00))\ - | ((((uint32_t)(n) & 0xFF0000)) >> 16)) -#endif - - -/** - * Convert 24 bit integer from network byte order to host byte order. - * - * @param n input value (int32_t) - * @return converted value (uint32_t) - */ -#if HAVE_BIG_ENDIAN -#define NTOH24(n) n -#else -#define NTOH24(n) (((((uint32_t)(n) & 0xFF)) << 16)\ - | (((uint32_t)(n) & 0xFF00))\ - | ((((uint32_t)(n) & 0xFF0000)) >> 16)) -#endif - - -/** - * Convert 31 bit integer from network byte order to host byte order. - * - * @param n input value (int32_t) - * @return converted value (uint32_t) - */ -#if HAVE_BIG_ENDIAN -#define NTOH31(n) n -#else -#define NTOH31(n) (((((uint32_t)(n) & 0x7F)) << 24) | \ - ((((uint32_t)(n) & 0xFF00)) << 8) | \ - ((((uint32_t)(n) & 0xFF0000)) >> 8) | \ - ((((uint32_t)(n) & 0xFF000000)) >> 24)) -#endif - - -/** - * Convert 31 bit integer from host byte order to network byte order. - * - * @param n input value (int32_t) - * @return converted value (uint32_t) - */ -#if HAVE_BIG_ENDIAN -#define HTON31(n) n -#else -#define HTON31(n) (((((uint32_t)(n) & 0xFF)) << 24) | \ - ((((uint32_t)(n) & 0xFF00)) << 8) | \ - ((((uint32_t)(n) & 0xFF0000)) >> 8) | \ - ((((uint32_t)(n) & 0x7F000000)) >> 24)) -#endif - - -/** - * Print formatted debug value. - * - * @param fmt format (const char *) - * @param ... args for format - */ -#define SPDYF_DEBUG(fmt, ...) do { \ - fprintf (stdout, "%s\n%u: ",__FILE__, __LINE__);\ - fprintf(stdout,fmt,##__VA_ARGS__);\ - fprintf(stdout,"\n");\ - fflush(stdout); } while (0) - - -/** - * Print stream for debuging. - * - * @param strm (void *) - * @param size (int) - */ -#define SPDYF_PRINT_STREAM(strm, size) do { \ - int ___i;\ - for(___i=0;___i. -*/ - -/** - * @file io.c - * @brief Generic functions for IO. - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "structures.h" -#include "internal.h" -#include "io.h" - - -int -SPDYF_io_set_daemon(struct SPDY_Daemon *daemon, - enum SPDY_IO_SUBSYSTEM io_subsystem) -{ - switch(io_subsystem) - { - case SPDY_IO_SUBSYSTEM_OPENSSL: - daemon->fio_init = &SPDYF_openssl_init; - daemon->fio_deinit = &SPDYF_openssl_deinit; - break; - - case SPDY_IO_SUBSYSTEM_RAW: - daemon->fio_init = &SPDYF_raw_init; - daemon->fio_deinit = &SPDYF_raw_deinit; - break; - - case SPDY_IO_SUBSYSTEM_NONE: - default: - SPDYF_DEBUG("Unsupported subsystem"); - return SPDY_NO; - } - - return SPDY_YES; -} - - -int -SPDYF_io_set_session(struct SPDY_Session *session, - enum SPDY_IO_SUBSYSTEM io_subsystem) -{ - switch(io_subsystem) - { - case SPDY_IO_SUBSYSTEM_OPENSSL: - session->fio_new_session = &SPDYF_openssl_new_session; - session->fio_close_session = &SPDYF_openssl_close_session; - session->fio_is_pending = &SPDYF_openssl_is_pending; - session->fio_recv = &SPDYF_openssl_recv; - session->fio_send = &SPDYF_openssl_send; - session->fio_before_write = &SPDYF_openssl_before_write; - session->fio_after_write = &SPDYF_openssl_after_write; - break; - - case SPDY_IO_SUBSYSTEM_RAW: - session->fio_new_session = &SPDYF_raw_new_session; - session->fio_close_session = &SPDYF_raw_close_session; - session->fio_is_pending = &SPDYF_raw_is_pending; - session->fio_recv = &SPDYF_raw_recv; - session->fio_send = &SPDYF_raw_send; - session->fio_before_write = &SPDYF_raw_before_write; - session->fio_after_write = &SPDYF_raw_after_write; - break; - - case SPDY_IO_SUBSYSTEM_NONE: - default: - SPDYF_DEBUG("Unsupported subsystem"); - return SPDY_NO; - } - - return SPDY_YES; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io.h deleted file mode 100644 index c28ba21b..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io.h +++ /dev/null @@ -1,216 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file io.h - * @brief Signatures for IO functions. - * @author Andrey Uzunov - */ - -#ifndef IO_H -#define IO_H - -#include "platform.h" -#include "io_openssl.h" -#include "io_raw.h" - - -/** - * Used for return code when reading and writing to the TLS socket. - */ -enum SPDY_IO_ERROR -{ - /** - * The connection was closed by the other party. - */ - SPDY_IO_ERROR_CLOSED = 0, - - /** - * Any kind of error ocurred. The session has to be closed. - */ - SPDY_IO_ERROR_ERROR = -2, - - /** - * The function had to return without processing any data. The whole - * cycle of events has to be called again (SPDY_run) as something - * either has to be written or read or the the syscall was - * interrupted by a signal. - */ - SPDY_IO_ERROR_AGAIN = -3, -}; - - -/** - * Global initializing. Must be called only once in the program. - * - */ -typedef void -(*SPDYF_IOGlobalInit) (); - - -/** - * Global deinitializing for the whole program. Should be called - * at the end of the program. - * - */ -typedef void -(*SPDYF_IOGlobalDeinit) (); - - -/** - * Initializing of io context for a specific daemon. - * Must be called when the daemon starts. - * - * @param daemon SPDY_Daemon for which io will be used. Daemon's - * certificate and key file are used for tls. - * @return SPDY_YES on success or SPDY_NO on error - */ -typedef int -(*SPDYF_IOInit) (struct SPDY_Daemon *daemon); - - -/** - * Deinitializing io context for a daemon. Should be called - * when the deamon is stopped. - * - * @param daemon SPDY_Daemon which is being stopped - */ -typedef void -(*SPDYF_IODeinit) (struct SPDY_Daemon *daemon); - - -/** - * Initializing io for a specific connection. Must be called - * after the connection has been accepted. - * - * @param session SPDY_Session whose socket will be used - * @return SPDY_NO if some funcs inside fail. SPDY_YES otherwise - */ -typedef int -(*SPDYF_IONewSession) (struct SPDY_Session *session); - - -/** - * Deinitializing io for a specific connection. Should be called - * closing session's socket. - * - * @param session SPDY_Session whose socket is used - */ -typedef void -(*SPDYF_IOCloseSession) (struct SPDY_Session *session); - - -/** - * Reading from session's socket. Reads available data and put it to the - * buffer. - * - * @param session for which data is received - * @param buffer where data from the socket will be written to - * @param size of the buffer - * @return number of bytes (at most size) read from the connection - * 0 if the other party has closed the connection - * SPDY_IO_ERROR code on error - */ -typedef int -(*SPDYF_IORecv) (struct SPDY_Session *session, - void * buffer, - size_t size); - - -/** - * Writing to session's socket. Writes the data given into the buffer to the - * socket. - * - * @param session whose context is used - * @param buffer from where data will be written to the socket - * @param size number of bytes to be taken from the buffer - * @return number of bytes (at most size) from the buffer that has been - * written to the connection - * 0 if the other party has closed the connection - * SPDY_IO_ERROR code on error - */ -typedef int -(*SPDYF_IOSend) (struct SPDY_Session *session, - const void * buffer, - size_t size); - - -/** - * Checks if there is data staying in the buffers of the underlying - * system that waits to be read. In case of TLS, this will call - * something like SSL_pending(). - * - * @param session which is checked - * @return SPDY_YES if data is pending or SPDY_NO otherwise - */ -typedef int -(*SPDYF_IOIsPending) (struct SPDY_Session *session); - - -/** - * Called just before frames are about to be processed and written - * to the socket. - * - * @param session - * @return SPDY_NO if writing must not happen in the call; - * SPDY_YES otherwise - */ -typedef int -(*SPDYF_IOBeforeWrite) (struct SPDY_Session *session); - - -/** - * Called just after frames have been processed and written - * to the socket. - * - * @param session - * @param was_written has the same value as the write function for the - * session will return - * @return returned value will be used by the write function to return - */ -typedef int -(*SPDYF_IOAfterWrite) (struct SPDY_Session *session, - int was_written); - - -/** - * Sets callbacks for the daemon with regard to the IO subsystem. - * - * @param daemon - * @param io_subsystem the IO subsystem that will - * be initialized and used by daemon. - * @return SPDY_YES on success or SPDY_NO otherwise - */ -int -SPDYF_io_set_daemon(struct SPDY_Daemon *daemon, - enum SPDY_IO_SUBSYSTEM io_subsystem); - - -/** - * Sets callbacks for the session with regard to the IO subsystem. - * - * @param session - * @param io_subsystem the IO subsystem that will - * be initialized and used by session. - * @return SPDY_YES on success or SPDY_NO otherwise - */ -int -SPDYF_io_set_session(struct SPDY_Session *session, - enum SPDY_IO_SUBSYSTEM io_subsystem); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_openssl.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_openssl.c deleted file mode 100644 index f71a9230..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_openssl.c +++ /dev/null @@ -1,280 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file io_openssl.c - * @brief TLS handling using libssl. The current code assumes that - * blocking I/O is in use. - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "internal.h" -#include "session.h" -#include "io_openssl.h" - - -/** - * Callback to advertise spdy ver. 3 in Next Protocol Negotiation - * - * @param ssl openssl context for a connection - * @param out must be set to the raw data that is advertised in NPN - * @param outlen must be set to size of out - * @param arg - * @return SSL_TLSEXT_ERR_OK to do advertising - */ -static int -spdyf_next_protos_advertised_cb (SSL *ssl, const unsigned char **out, unsigned int *outlen, void *arg) -{ - (void)ssl; - (void)arg; - static unsigned char npn_spdy3[] = {0x06, // length of "spdy/3" - 0x73,0x70,0x64,0x79,0x2f,0x33};// spdy/3 - - *out = npn_spdy3; - *outlen = 7; // total length of npn_spdy3 - return SSL_TLSEXT_ERR_OK; -} - - -void -SPDYF_openssl_global_init() -{ - //error strings are now not used by the lib - //SSL_load_error_strings(); - //init libssl - SSL_library_init(); //always returns 1 - //the table for looking up algos is not used now by the lib - //OpenSSL_add_all_algorithms(); -} - - -void -SPDYF_openssl_global_deinit() -{ - //if SSL_load_error_strings was called - //ERR_free_strings(); - //if OpenSSL_add_all_algorithms was called - //EVP_cleanup(); -} - - -int -SPDYF_openssl_init(struct SPDY_Daemon *daemon) -{ - int options; - //create ssl context. TLSv1 used - if(NULL == (daemon->io_context = SSL_CTX_new(TLSv1_server_method()))) - { - SPDYF_DEBUG("Couldn't create ssl context"); - return SPDY_NO; - } - //set options for tls - //TODO DH is not enabled for easier debugging - //SSL_CTX_set_options(daemon->io_context, SSL_OP_SINGLE_DH_USE); - - //TODO here session tickets are disabled for easier debuging with - //wireshark when using Chrome - // SSL_OP_NO_COMPRESSION disables TLS compression to avoid CRIME attack - options = SSL_OP_NO_TICKET; -#ifdef SSL_OP_NO_COMPRESSION - options |= SSL_OP_NO_COMPRESSION; -#elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */ - sk_SSL_COMP_zero(SSL_COMP_get_compression_methods()); -#endif - - SSL_CTX_set_options(daemon->io_context, options); - if(1 != SSL_CTX_use_certificate_file(daemon->io_context, daemon->certfile , SSL_FILETYPE_PEM)) - { - SPDYF_DEBUG("Couldn't load the cert file"); - SSL_CTX_free(daemon->io_context); - return SPDY_NO; - } - if(1 != SSL_CTX_use_PrivateKey_file(daemon->io_context, daemon->keyfile, SSL_FILETYPE_PEM)) - { - SPDYF_DEBUG("Couldn't load the name file"); - SSL_CTX_free(daemon->io_context); - return SPDY_NO; - } - SSL_CTX_set_next_protos_advertised_cb(daemon->io_context, &spdyf_next_protos_advertised_cb, NULL); - if (1 != SSL_CTX_set_cipher_list(daemon->io_context, "HIGH")) - { - SPDYF_DEBUG("Couldn't set the desired cipher list"); - SSL_CTX_free(daemon->io_context); - return SPDY_NO; - } - - return SPDY_YES; -} - - -void -SPDYF_openssl_deinit(struct SPDY_Daemon *daemon) -{ - SSL_CTX_free(daemon->io_context); -} - - -int -SPDYF_openssl_new_session(struct SPDY_Session *session) -{ - int ret; - - if(NULL == (session->io_context = SSL_new(session->daemon->io_context))) - { - SPDYF_DEBUG("Couldn't create ssl structure"); - return SPDY_NO; - } - if(1 != (ret = SSL_set_fd(session->io_context, session->socket_fd))) - { - SPDYF_DEBUG("SSL_set_fd %i",ret); - SSL_free(session->io_context); - session->io_context = NULL; - return SPDY_NO; - } - - //for non-blocking I/O SSL_accept may return -1 - //and this function won't work - if(1 != (ret = SSL_accept(session->io_context))) - { - SPDYF_DEBUG("SSL_accept %i",ret); - SSL_free(session->io_context); - session->io_context = NULL; - return SPDY_NO; - } - /* alternatively - SSL_set_accept_state(session->io_context); - * may be called and then the negotiation will be done on reading - */ - - return SPDY_YES; -} - - -void -SPDYF_openssl_close_session(struct SPDY_Session *session) -{ - //SSL_shutdown sends TLS "close notify" as in TLS standard. - //The function may fail as it waits for the other party to also close - //the TLS session. The lib just sends it and will close the socket - //after that because the browsers don't seem to care much about - //"close notify" - SSL_shutdown(session->io_context); - - SSL_free(session->io_context); -} - - -int -SPDYF_openssl_recv(struct SPDY_Session *session, - void * buffer, - size_t size) -{ - int ret; - int n = SSL_read(session->io_context, - buffer, - size); - //if(n > 0) SPDYF_DEBUG("recvd: %i",n); - if (n <= 0) - { - ret = SSL_get_error(session->io_context, n); - switch(ret) - { - case SSL_ERROR_ZERO_RETURN: - return 0; - - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - return SPDY_IO_ERROR_AGAIN; - - case SSL_ERROR_SYSCALL: - if(EINTR == errno) - return SPDY_IO_ERROR_AGAIN; - return SPDY_IO_ERROR_ERROR; - default: - return SPDY_IO_ERROR_ERROR; - } - } - - return n; -} - - -int -SPDYF_openssl_send(struct SPDY_Session *session, - const void * buffer, - size_t size) -{ - int ret; - - int n = SSL_write(session->io_context, - buffer, - size); - //if(n > 0) SPDYF_DEBUG("sent: %i",n); - if (n <= 0) - { - ret = SSL_get_error(session->io_context, n); - switch(ret) - { - case SSL_ERROR_ZERO_RETURN: - return 0; - - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - return SPDY_IO_ERROR_AGAIN; - - case SSL_ERROR_SYSCALL: - if(EINTR == errno) - return SPDY_IO_ERROR_AGAIN; - return SPDY_IO_ERROR_ERROR; - default: - return SPDY_IO_ERROR_ERROR; - } - } - - return n; -} - - -int -SPDYF_openssl_is_pending(struct SPDY_Session *session) -{ - /* From openssl docs: - * BUGS -SSL_pending() takes into account only bytes from the TLS/SSL record that is currently being processed (if any). If the SSL object's read_ahead flag is set, additional protocol bytes may have been read containing more TLS/SSL records; these are ignored by SSL_pending(). - */ - return SSL_pending(session->io_context) > 0 ? SPDY_YES : SPDY_NO; -} - - -int -SPDYF_openssl_before_write(struct SPDY_Session *session) -{ - (void)session; - - return SPDY_YES; -} - - -int -SPDYF_openssl_after_write(struct SPDY_Session *session, int was_written) -{ - (void)session; - - return was_written; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_openssl.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_openssl.h deleted file mode 100644 index a4e94293..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_openssl.h +++ /dev/null @@ -1,166 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file io_openssl.h - * @brief TLS handling. openssl with NPN is used, but as long as the - * functions conform to this interface file, other libraries - * can be used. - * @author Andrey Uzunov - */ - -#ifndef IO_OPENSSL_H -#define IO_OPENSSL_H - -#include "platform.h" -#include "io.h" -#include -#include -#include - - -/** - * Global initializing of openssl. Must be called only once in the program. - * - */ -void -SPDYF_openssl_global_init(); - - -/** - * Global deinitializing of openssl for the whole program. Should be called - * at the end of the program. - * - */ -void -SPDYF_openssl_global_deinit(); - - -/** - * Initializing of openssl for a specific daemon. - * Must be called when the daemon starts. - * - * @param daemon SPDY_Daemon for which openssl will be used. Daemon's - * certificate and key file are used. - * @return SPDY_YES on success or SPDY_NO on error - */ -int -SPDYF_openssl_init(struct SPDY_Daemon *daemon); - - -/** - * Deinitializing openssl for a daemon. Should be called - * when the deamon is stopped. - * - * @param daemon SPDY_Daemon which is being stopped - */ -void -SPDYF_openssl_deinit(struct SPDY_Daemon *daemon); - - -/** - * Initializing openssl for a specific connection. Must be called - * after the connection has been accepted. - * - * @param session SPDY_Session whose socket will be used by openssl - * @return SPDY_NO if some openssl funcs fail. SPDY_YES otherwise - */ -int -SPDYF_openssl_new_session(struct SPDY_Session *session); - - -/** - * Deinitializing openssl for a specific connection. Should be called - * closing session's socket. - * - * @param session SPDY_Session whose socket is used by openssl - */ -void -SPDYF_openssl_close_session(struct SPDY_Session *session); - - -/** - * Reading from a TLS socket. Reads available data and put it to the - * buffer. - * - * @param session for which data is received - * @param buffer where data from the socket will be written to - * @param size of the buffer - * @return number of bytes (at most size) read from the TLS connection - * 0 if the other party has closed the connection - * SPDY_IO_ERROR code on error - */ -int -SPDYF_openssl_recv(struct SPDY_Session *session, - void * buffer, - size_t size); - - -/** - * Writing to a TLS socket. Writes the data given into the buffer to the - * TLS socket. - * - * @param session whose context is used - * @param buffer from where data will be written to the socket - * @param size number of bytes to be taken from the buffer - * @return number of bytes (at most size) from the buffer that has been - * written to the TLS connection - * 0 if the other party has closed the connection - * SPDY_IO_ERROR code on error - */ -int -SPDYF_openssl_send(struct SPDY_Session *session, - const void * buffer, - size_t size); - - -/** - * Checks if there is data staying in the buffers of the underlying - * system that waits to be read. - * - * @param session which is checked - * @return SPDY_YES if data is pending or SPDY_NO otherwise - */ -int -SPDYF_openssl_is_pending(struct SPDY_Session *session); - - -/** - * Nothing. - * - * @param session - * @return SPDY_NO if writing must not happen in the call; - * SPDY_YES otherwise - */ -int -SPDYF_openssl_before_write(struct SPDY_Session *session); - - -/** - * Nothing. - * - * @param session - * @param was_written has the same value as the write function for the - * session will return - * @return returned value will be used by the write function to return - */ -int -SPDYF_openssl_after_write(struct SPDY_Session *session, int was_written); - - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_raw.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_raw.c deleted file mode 100644 index 722f347e..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_raw.c +++ /dev/null @@ -1,194 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file io_raw.c - * @brief IO for SPDY without TLS. - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "internal.h" -#include "session.h" -#include "io_raw.h" -//TODO put in in the right place -#include - - -void -SPDYF_raw_global_init() -{ -} - - -void -SPDYF_raw_global_deinit() -{ -} - - -int -SPDYF_raw_init(struct SPDY_Daemon *daemon) -{ - (void)daemon; - - return SPDY_YES; -} - - -void -SPDYF_raw_deinit(struct SPDY_Daemon *daemon) -{ - (void)daemon; -} - - -int -SPDYF_raw_new_session(struct SPDY_Session *session) -{ - int fd_flags; - int val = 1; - int ret; - - //setting the socket to be non-blocking - fd_flags = fcntl (session->socket_fd, F_GETFL); - if ( -1 == fd_flags - || 0 != fcntl (session->socket_fd, F_SETFL, fd_flags | O_NONBLOCK)) - SPDYF_DEBUG("WARNING: Couldn't set the new connection to be non-blocking"); - - if(SPDY_DAEMON_FLAG_NO_DELAY & session->daemon->flags) - { - ret = setsockopt(session->socket_fd, IPPROTO_TCP, TCP_NODELAY, &val, (socklen_t)sizeof(val)); - if(-1 == ret) - SPDYF_DEBUG("WARNING: Couldn't set the new connection to TCP_NODELAY"); - } - - return SPDY_YES; -} - - -void -SPDYF_raw_close_session(struct SPDY_Session *session) -{ - (void)session; -} - - -int -SPDYF_raw_recv(struct SPDY_Session *session, - void * buffer, - size_t size) -{ - int n = read(session->socket_fd, - buffer, - size); - //if(n > 0) SPDYF_DEBUG("recvd: %i",n); - if (n < 0) - { - switch(errno) - { - case EAGAIN: -#if EAGAIN != EWOULDBLOCK - case EWOULDBLOCK: -#endif - case EINTR: - return SPDY_IO_ERROR_AGAIN; - - default: - return SPDY_IO_ERROR_ERROR; - } - } - - return n; -} - - -int -SPDYF_raw_send(struct SPDY_Session *session, - const void * buffer, - size_t size) -{ - int n = write(session->socket_fd, - buffer, - size); - //if(n > 0) SPDYF_DEBUG("sent: %i",n); - if (n < 0) - { - switch(errno) - { - case EAGAIN: -#if EAGAIN != EWOULDBLOCK - case EWOULDBLOCK: -#endif - case EINTR: - return SPDY_IO_ERROR_AGAIN; - - default: - return SPDY_IO_ERROR_ERROR; - } - } - - return n; -} - - -int -SPDYF_raw_is_pending(struct SPDY_Session *session) -{ - (void)session; - - return SPDY_NO; -} - - -int -SPDYF_raw_before_write(struct SPDY_Session *session) -{ -#if HAVE_DECL_TCP_CORK - if(0 == (SPDY_DAEMON_FLAG_NO_DELAY & session->daemon->flags)) - { - int val = 1; - int ret; - - ret = setsockopt(session->socket_fd, IPPROTO_TCP, TCP_CORK, &val, (socklen_t)sizeof(val)); - if(-1 == ret) - SPDYF_DEBUG("WARNING: Couldn't set the new connection to TCP_CORK"); - } -#endif - - return SPDY_YES; -} - - -int -SPDYF_raw_after_write(struct SPDY_Session *session, int was_written) -{ -#if HAVE_DECL_TCP_CORK - if(SPDY_YES == was_written && 0 == (SPDY_DAEMON_FLAG_NO_DELAY & session->daemon->flags)) - { - int val = 0; - int ret; - - ret = setsockopt(session->socket_fd, IPPROTO_TCP, TCP_CORK, &val, (socklen_t)sizeof(val)); - if(-1 == ret) - SPDYF_DEBUG("WARNING: Couldn't unset the new connection to TCP_CORK"); - } - -#endif - return was_written; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_raw.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_raw.h deleted file mode 100644 index 8ca830bf..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/io_raw.h +++ /dev/null @@ -1,158 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file io_raw.h - * @brief IO for SPDY without TLS. - * @author Andrey Uzunov - */ - -#ifndef IO_RAW_H -#define IO_RAW_H - -#include "platform.h" - - -/** - * Must be called only once in the program. - * - */ -void -SPDYF_raw_global_init(); - - -/** - * Should be called - * at the end of the program. - * - */ -void -SPDYF_raw_global_deinit(); - - -/** - * Must be called when the daemon starts. - * - * @param daemon SPDY_Daemon - * @return SPDY_YES on success or SPDY_NO on error - */ -int -SPDYF_raw_init(struct SPDY_Daemon *daemon); - - -/** - * Should be called - * when the deamon is stopped. - * - * @param daemon SPDY_Daemon which is being stopped - */ -void -SPDYF_raw_deinit(struct SPDY_Daemon *daemon); - - -/** - * Must be called - * after the connection has been accepted. - * - * @param session SPDY_Session whose socket will be used - * @return SPDY_NO if some funcs fail. SPDY_YES otherwise - */ -int -SPDYF_raw_new_session(struct SPDY_Session *session); - - -/** - * Should be called - * closing session's socket. - * - * @param session SPDY_Session whose socket is used - */ -void -SPDYF_raw_close_session(struct SPDY_Session *session); - - -/** - * Reading from socket. Reads available data and put it to the - * buffer. - * - * @param session for which data is received - * @param buffer where data from the socket will be written to - * @param size of the buffer - * @return number of bytes (at most size) read from the connection - * 0 if the other party has closed the connection - * SPDY_IO_ERROR code on error - */ -int -SPDYF_raw_recv(struct SPDY_Session *session, - void * buffer, - size_t size); - - -/** - * Writing to socket. Writes the data given into the buffer to the - * socket. - * - * @param session whose context is used - * @param buffer from where data will be written to the socket - * @param size number of bytes to be taken from the buffer - * @return number of bytes (at most size) from the buffer that has been - * written to the connection - * 0 if the other party has closed the connection - * SPDY_IO_ERROR code on error - */ -int -SPDYF_raw_send(struct SPDY_Session *session, - const void * buffer, - size_t size); - - -/** - * Checks if there is data staying in the buffers of the underlying - * system that waits to be read. Always returns SPDY_NO, as we do not - * use a subsystem here. - * - * @param session which is checked - * @return SPDY_YES if data is pending or SPDY_NO otherwise - */ -int -SPDYF_raw_is_pending(struct SPDY_Session *session); - - -/** - * Sets TCP_CORK. - * - * @param session - * @return SPDY_NO if writing must not happen in the call; - * SPDY_YES otherwise - */ -int -SPDYF_raw_before_write(struct SPDY_Session *session); - - -/** - * Unsets TCP_CORK. - * - * @param session - * @param was_written has the same value as the write function for the - * session will return - * @return returned value will be used by the write function to return - */ -int -SPDYF_raw_after_write(struct SPDY_Session *session, int was_written); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/session.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/session.c deleted file mode 100644 index 3714c25f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/session.c +++ /dev/null @@ -1,1769 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file session.c - * @brief TCP connection/SPDY session handling. So far most of the - * functions for handling SPDY framing layer are here. - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "structures.h" -#include "internal.h" -#include "session.h" -#include "compression.h" -#include "stream.h" -#include "io.h" - - -/** - * Handler for reading the full SYN_STREAM frame after we know that - * the frame is such. - * The function waits for the full frame and then changes status - * of the session. New stream is created. - * - * @param session SPDY_Session whose read buffer is used. - */ -static void -spdyf_handler_read_syn_stream (struct SPDY_Session *session) -{ - size_t name_value_strm_size = 0; - unsigned int compressed_data_size; - int ret; - void *name_value_strm = NULL; - struct SPDYF_Control_Frame *frame; - struct SPDY_NameValue *headers; - - SPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status - || SPDY_SESSION_STATUS_WAIT_FOR_BODY == session->status, - "the function is called wrong"); - - frame = (struct SPDYF_Control_Frame *)session->frame_handler_cls; - - //handle subheaders - if(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status) - { - if(0 == frame->length) - { - //protocol error: incomplete frame - //we just ignore it since there is no stream id for which to - //send RST_STREAM - //TODO maybe GOAWAY and closing session is appropriate - SPDYF_DEBUG("zero long SYN_STREAM received"); - session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER; - free(frame); - return; - } - - if(SPDY_YES != SPDYF_stream_new(session)) - { - /* waiting for some more fields to create new stream - or something went wrong, SPDYF_stream_new has handled the - situation */ - return; - } - - session->current_stream_id = session->streams_head->stream_id; - if(frame->length > SPDY_MAX_SUPPORTED_FRAME_SIZE) - { - //TODO no need to create stream if this happens - session->status = SPDY_SESSION_STATUS_IGNORE_BYTES; - return; - } - else - session->status = SPDY_SESSION_STATUS_WAIT_FOR_BODY; - } - - //handle body - - //start reading the compressed name/value pairs (http headers) - compressed_data_size = frame->length //everything after length field - - 10;//4B stream id, 4B assoc strem id, 2B priority, unused and slot - - if(session->read_buffer_offset - session->read_buffer_beginning < compressed_data_size) - { - // the full frame is not yet here, try later - return; - } - - if ( (compressed_data_size > 0) && - (SPDY_YES != - SPDYF_zlib_inflate(&session->zlib_recv_stream, - session->read_buffer + session->read_buffer_beginning, - compressed_data_size, - &name_value_strm, - &name_value_strm_size)) ) - { - /* something went wrong on inflating, - * the state of the stream for decompression is unknown - * and we may not be able to read anything more received on - * this session, - * so it is better to close the session */ - free(name_value_strm); - free(frame); - - /* mark the session for closing and close it, when - * everything on the output queue is already written */ - session->status = SPDY_SESSION_STATUS_FLUSHING; - - SPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_INTERNAL_ERROR, false); - - return; - } - - if(0 == name_value_strm_size || 0 == compressed_data_size) - { - //Protocol error: send RST_STREAM - if(SPDY_YES != SPDYF_prepare_rst_stream(session, session->streams_head, - SPDY_RST_STREAM_STATUS_PROTOCOL_ERROR)) - { - //no memory, try later to send RST - free(name_value_strm); - return; - } - } - else - { - ret = SPDYF_name_value_from_stream(name_value_strm, name_value_strm_size, &headers); - if(SPDY_NO == ret) - { - //memory error, try later - free(name_value_strm); - return; - } - - session->streams_head->headers = headers; - //inform the application layer for the new stream received - if(SPDY_YES != session->daemon->fnew_stream_cb(session->daemon->fcls, session->streams_head)) - { - //memory error, try later - free(name_value_strm); - return; - } - - session->read_buffer_beginning += compressed_data_size; - } - - //SPDYF_DEBUG("syn_stream received: id %i", session->current_stream_id); - - //change state to wait for new frame - free(name_value_strm); - session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER; - free(frame); -} - - -/** - * Handler for reading the GOAWAY frame after we know that - * the frame is such. - * The function waits for the full frame and then changes status - * of the session. - * - * @param session SPDY_Session whose read buffer is used. - */ -static void -spdyf_handler_read_goaway (struct SPDY_Session *session) -{ - struct SPDYF_Control_Frame *frame; - uint32_t last_good_stream_id; - uint32_t status_int; - enum SPDY_GOAWAY_STATUS status; - - SPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status, - "the function is called wrong"); - - frame = (struct SPDYF_Control_Frame *)session->frame_handler_cls; - - if(frame->length > SPDY_MAX_SUPPORTED_FRAME_SIZE) - { - //this is a protocol error/attack - session->status = SPDY_SESSION_STATUS_IGNORE_BYTES; - return; - } - - if(0 != frame->flags || 8 != frame->length) - { - //this is a protocol error - SPDYF_DEBUG("wrong GOAWAY received"); - //anyway, it will be handled - } - - if((session->read_buffer_offset - session->read_buffer_beginning) < frame->length) - { - //not all fields are received - //try later - return; - } - - //mark that the session is almost closed - session->is_goaway_received = true; - - if(8 == frame->length) - { - memcpy(&last_good_stream_id, session->read_buffer + session->read_buffer_beginning, 4); - last_good_stream_id = NTOH31(last_good_stream_id); - session->read_buffer_beginning += 4; - - memcpy(&status_int, session->read_buffer + session->read_buffer_beginning, 4); - status = ntohl(status_int); - session->read_buffer_beginning += 4; - - //TODO do something with last_good - - //SPDYF_DEBUG("Received GOAWAY; status=%i; lastgood=%i",status,last_good_stream_id); - - //do something according to the status - //TODO - switch(status) - { - case SPDY_GOAWAY_STATUS_OK: - break; - case SPDY_GOAWAY_STATUS_PROTOCOL_ERROR: - break; - case SPDY_GOAWAY_STATUS_INTERNAL_ERROR: - break; - } - - //SPDYF_DEBUG("goaway received: status %i", status); - } - - session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER; - free(frame); -} - - -/** - * Handler for reading RST_STREAM frames. After receiving the frame - * the stream moves into closed state and status - * of the session is changed. Frames, belonging to this stream, which - * are still at the output queue, will be ignored later. - * - * @param session SPDY_Session whose read buffer is used. - */ -static void -spdyf_handler_read_rst_stream (struct SPDY_Session *session) -{ - struct SPDYF_Control_Frame *frame; - uint32_t stream_id; - int32_t status_int; - //enum SPDY_RST_STREAM_STATUS status; //for debug - struct SPDYF_Stream *stream; - - SPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status, - "the function is called wrong"); - - frame = (struct SPDYF_Control_Frame *)session->frame_handler_cls; - - if(0 != frame->flags || 8 != frame->length) - { - //this is a protocol error - SPDYF_DEBUG("wrong RST_STREAM received"); - //ignore as a large frame - session->status = SPDY_SESSION_STATUS_IGNORE_BYTES; - return; - } - - if((session->read_buffer_offset - session->read_buffer_beginning) < frame->length) - { - //not all fields are received - //try later - return; - } - - memcpy(&stream_id, session->read_buffer + session->read_buffer_beginning, 4); - stream_id = NTOH31(stream_id); - session->read_buffer_beginning += 4; - - memcpy(&status_int, session->read_buffer + session->read_buffer_beginning, 4); - //status = ntohl(status_int); //for debug - session->read_buffer_beginning += 4; - - session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER; - free(frame); - - //mark the stream as closed - stream = session->streams_head; - while(NULL != stream) - { - if(stream_id == stream->stream_id) - { - stream->is_in_closed = true; - stream->is_out_closed = true; - break; - } - stream = stream->next; - } - - //SPDYF_DEBUG("Received RST_STREAM; status=%i; id=%i",status,stream_id); - - //do something according to the status - //TODO - /*switch(status) - { - case SPDY_RST_STREAM_STATUS_PROTOCOL_ERROR: - break; - }*/ -} - - -/** - * Handler for reading DATA frames. In requests they are used for POST - * arguments. - * - * @param session SPDY_Session whose read buffer is used. - */ -static void -spdyf_handler_read_data (struct SPDY_Session *session) -{ - int ret; - struct SPDYF_Data_Frame * frame; - struct SPDYF_Stream * stream; - - SPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status - || SPDY_SESSION_STATUS_WAIT_FOR_BODY == session->status, - "the function is called wrong"); - - //SPDYF_DEBUG("DATA frame received (POST?). Ignoring"); - - //SPDYF_SIGINT(""); - - frame = (struct SPDYF_Data_Frame *)session->frame_handler_cls; - - //handle subheaders - if(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status) - { - if(frame->length > SPDY_MAX_SUPPORTED_FRAME_SIZE) - { - session->status = SPDY_SESSION_STATUS_IGNORE_BYTES; - return; - } - else - session->status = SPDY_SESSION_STATUS_WAIT_FOR_BODY; - } - - //handle body - - if(session->read_buffer_offset - session->read_buffer_beginning - >= frame->length) - { - stream = SPDYF_stream_find(frame->stream_id, session); - - if(NULL == stream || stream->is_in_closed || NULL == session->daemon->received_data_cb) - { - if(NULL == session->daemon->received_data_cb) - SPDYF_DEBUG("No callback for DATA frame set; Ignoring DATA frame!"); - - //TODO send error? - - //TODO for now ignore frame - session->read_buffer_beginning += frame->length; - session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER; - free(frame); - return; - } - - ret = session->daemon->freceived_data_cb(session->daemon->cls, - stream, - session->read_buffer + session->read_buffer_beginning, - frame->length, - 0 == (SPDY_DATA_FLAG_FIN & frame->flags)); - - session->read_buffer_beginning += frame->length; - - stream->window_size -= frame->length; - - //TODO close in and send rst maybe - SPDYF_ASSERT(SPDY_YES == ret, "Cancel POST data is not yet implemented"); - - if(SPDY_DATA_FLAG_FIN & frame->flags) - { - stream->is_in_closed = true; - } - else if(stream->window_size < SPDYF_INITIAL_WINDOW_SIZE / 2) - { - //very simple implementation of flow control - //when the window's size is under the half of the initial value, - //increase it again up to the initial value - - //prepare WINDOW_UPDATE - if(SPDY_YES == SPDYF_prepare_window_update(session, stream, - SPDYF_INITIAL_WINDOW_SIZE - stream->window_size)) - { - stream->window_size = SPDYF_INITIAL_WINDOW_SIZE; - } - //else: do it later - } - - //SPDYF_DEBUG("data received: id %i", frame->stream_id); - - session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER; - free(frame); - } -} - - -int -SPDYF_handler_write_syn_reply (struct SPDY_Session *session) -{ - struct SPDYF_Response_Queue *response_queue = session->response_queue_head; - struct SPDYF_Stream *stream = response_queue->stream; - struct SPDYF_Control_Frame control_frame; - void *compressed_headers = NULL; - size_t compressed_headers_size=0; - size_t used_data=0; - size_t total_size; - uint32_t stream_id_nbo; - - SPDYF_ASSERT(NULL == session->write_buffer, "the function is called not in the correct moment"); - - memcpy(&control_frame, response_queue->control_frame, sizeof(control_frame)); - - if(SPDY_YES != SPDYF_zlib_deflate(&session->zlib_send_stream, - response_queue->data, - response_queue->data_size, - &used_data, - &compressed_headers, - &compressed_headers_size)) - { - /* something went wrong on compressing, - * the state of the stream for compression is unknown - * and we may not be able to send anything more on - * this session, - * so it is better to close the session right now */ - session->status = SPDY_SESSION_STATUS_CLOSING; - - free(compressed_headers); - - return SPDY_NO; - } - - //TODO do we need this used_Data - SPDYF_ASSERT(used_data == response_queue->data_size, "not everything was used by zlib"); - - total_size = sizeof(struct SPDYF_Control_Frame) //SPDY header - + 4 // stream id as "subheader" - + compressed_headers_size; - - if(NULL == (session->write_buffer = malloc(total_size))) - { - /* no memory - * since we do not save the compressed data anywhere and - * the sending zlib stream is already in new state, we must - * close the session */ - session->status = SPDY_SESSION_STATUS_CLOSING; - - free(compressed_headers); - - return SPDY_NO; - } - session->write_buffer_beginning = 0; - session->write_buffer_offset = 0; - session->write_buffer_size = total_size; - - control_frame.length = compressed_headers_size + 4; // compressed data + stream_id - SPDYF_CONTROL_FRAME_HTON(&control_frame); - - //put frame headers to write buffer - memcpy(session->write_buffer + session->write_buffer_offset,&control_frame,sizeof(struct SPDYF_Control_Frame)); - session->write_buffer_offset += sizeof(struct SPDYF_Control_Frame); - - //put stream id to write buffer - stream_id_nbo = HTON31(stream->stream_id); - memcpy(session->write_buffer + session->write_buffer_offset, &stream_id_nbo, 4); - session->write_buffer_offset += 4; - - //put compressed name/value pairs to write buffer - memcpy(session->write_buffer + session->write_buffer_offset, compressed_headers, compressed_headers_size); - session->write_buffer_offset += compressed_headers_size; - - SPDYF_ASSERT(0 == session->write_buffer_beginning, "bug1"); - SPDYF_ASSERT(session->write_buffer_offset == session->write_buffer_size, "bug2"); - - //DEBUG CODE, break compression state to see what happens -/* SPDYF_zlib_deflate(&session->zlib_send_stream, - "1234567890", - 10, - &used_data, - &compressed_headers, - &compressed_headers_size); -*/ - free(compressed_headers); - - session->last_replied_to_stream_id = stream->stream_id; - - //SPDYF_DEBUG("syn_reply sent: id %i", stream->stream_id); - - return SPDY_YES; -} - - -int -SPDYF_handler_write_goaway (struct SPDY_Session *session) -{ - struct SPDYF_Response_Queue *response_queue = session->response_queue_head; - struct SPDYF_Control_Frame control_frame; - size_t total_size; - int last_good_stream_id; - - SPDYF_ASSERT(NULL == session->write_buffer, "the function is called not in the correct moment"); - - memcpy(&control_frame, response_queue->control_frame, sizeof(control_frame)); - - session->is_goaway_sent = true; - - total_size = sizeof(struct SPDYF_Control_Frame) //SPDY header - + 4 // last good stream id as "subheader" - + 4; // status code as "subheader" - - if(NULL == (session->write_buffer = malloc(total_size))) - { - return SPDY_NO; - } - session->write_buffer_beginning = 0; - session->write_buffer_offset = 0; - session->write_buffer_size = total_size; - - control_frame.length = 8; // always for GOAWAY - SPDYF_CONTROL_FRAME_HTON(&control_frame); - - //put frame headers to write buffer - memcpy(session->write_buffer + session->write_buffer_offset,&control_frame,sizeof(struct SPDYF_Control_Frame)); - session->write_buffer_offset += sizeof(struct SPDYF_Control_Frame); - - //put last good stream id to write buffer - last_good_stream_id = HTON31(session->last_replied_to_stream_id); - memcpy(session->write_buffer + session->write_buffer_offset, &last_good_stream_id, 4); - session->write_buffer_offset += 4; - - //put "data" to write buffer. This is the status - memcpy(session->write_buffer + session->write_buffer_offset, response_queue->data, 4); - session->write_buffer_offset += 4; - //data is not freed by the destroy function so: - //free(response_queue->data); - - //SPDYF_DEBUG("goaway sent: status %i", NTOH31(*(uint32_t*)(response_queue->data))); - - SPDYF_ASSERT(0 == session->write_buffer_beginning, "bug1"); - SPDYF_ASSERT(session->write_buffer_offset == session->write_buffer_size, "bug2"); - - return SPDY_YES; -} - - -int -SPDYF_handler_write_data (struct SPDY_Session *session) -{ - struct SPDYF_Response_Queue *response_queue = session->response_queue_head; - struct SPDYF_Response_Queue *new_response_queue; - size_t total_size; - struct SPDYF_Data_Frame data_frame; - ssize_t ret; - bool more; - - SPDYF_ASSERT(NULL == session->write_buffer, "the function is called not in the correct moment"); - - memcpy(&data_frame, response_queue->data_frame, sizeof(data_frame)); - - if(NULL == response_queue->response->rcb) - { - //standard response with data into the struct - SPDYF_ASSERT(NULL != response_queue->data, "no data for the response"); - - total_size = sizeof(struct SPDYF_Data_Frame) //SPDY header - + response_queue->data_size; - - if(NULL == (session->write_buffer = malloc(total_size))) - { - return SPDY_NO; - } - session->write_buffer_beginning = 0; - session->write_buffer_offset = 0; - session->write_buffer_size = total_size; - - data_frame.length = response_queue->data_size; - SPDYF_DATA_FRAME_HTON(&data_frame); - - //put SPDY headers to the writing buffer - memcpy(session->write_buffer + session->write_buffer_offset,&data_frame,sizeof(struct SPDYF_Data_Frame)); - session->write_buffer_offset += sizeof(struct SPDYF_Data_Frame); - - //put data to the writing buffer - memcpy(session->write_buffer + session->write_buffer_offset, response_queue->data, response_queue->data_size); - session->write_buffer_offset += response_queue->data_size; - } - else - { - /* response with callbacks. The lib will produce more than 1 - * data frames - */ - - total_size = sizeof(struct SPDYF_Data_Frame) //SPDY header - + SPDY_MAX_SUPPORTED_FRAME_SIZE; //max possible size - - if(NULL == (session->write_buffer = malloc(total_size))) - { - return SPDY_NO; - } - session->write_buffer_beginning = 0; - session->write_buffer_offset = 0; - session->write_buffer_size = total_size; - - ret = response_queue->response->rcb(response_queue->response->rcb_cls, - session->write_buffer + sizeof(struct SPDYF_Data_Frame), - response_queue->response->rcb_block_size, - &more); - - if(ret < 0 || ret > response_queue->response->rcb_block_size) - { - free(session->write_buffer); - session->write_buffer = NULL; - - //send RST_STREAM - if(SPDY_YES == (ret = SPDYF_prepare_rst_stream(session, - response_queue->stream, - SPDY_RST_STREAM_STATUS_INTERNAL_ERROR))) - { - return SPDY_NO; - } - - //else no memory - //for now close session - //TODO what? - session->status = SPDY_SESSION_STATUS_CLOSING; - - return SPDY_NO; - } - if(0 == ret && more) - { - //the app couldn't write anything to buf but later will - free(session->write_buffer); - session->write_buffer = NULL; - session->write_buffer_size = 0; - - if(NULL != response_queue->next) - { - //put the frame at the end of the queue - //otherwise - head of line blocking - session->response_queue_head = response_queue->next; - session->response_queue_head->prev = NULL; - session->response_queue_tail->next = response_queue; - response_queue->prev = session->response_queue_tail; - response_queue->next = NULL; - session->response_queue_tail = response_queue; - } - - return SPDY_YES; - } - - if(more) - { - //create another response queue object to call the user cb again - if(NULL == (new_response_queue = SPDYF_response_queue_create(true, - NULL, - 0, - response_queue->response, - response_queue->stream, - false, - response_queue->frqcb, - response_queue->frqcb_cls, - response_queue->rrcb, - response_queue->rrcb_cls))) - { - //TODO send RST_STREAM - //for now close session - session->status = SPDY_SESSION_STATUS_CLOSING; - - free(session->write_buffer); - session->write_buffer = NULL; - return SPDY_NO; - } - - //put it at second position on the queue - new_response_queue->prev = response_queue; - new_response_queue->next = response_queue->next; - if(NULL == response_queue->next) - { - session->response_queue_tail = new_response_queue; - } - else - { - response_queue->next->prev = new_response_queue; - } - response_queue->next = new_response_queue; - - response_queue->frqcb = NULL; - response_queue->frqcb_cls = NULL; - response_queue->rrcb = NULL; - response_queue->rrcb_cls = NULL; - } - else - { - data_frame.flags |= SPDY_DATA_FLAG_FIN; - } - - data_frame.length = ret; - SPDYF_DATA_FRAME_HTON(&data_frame); - - //put SPDY headers to the writing buffer - memcpy(session->write_buffer + session->write_buffer_offset, - &data_frame, - sizeof(struct SPDYF_Data_Frame)); - session->write_buffer_offset += sizeof(struct SPDYF_Data_Frame); - session->write_buffer_offset += ret; - session->write_buffer_size = session->write_buffer_offset; - } - - //SPDYF_DEBUG("data sent: id %i", NTOH31(data_frame.stream_id)); - - SPDYF_ASSERT(0 == session->write_buffer_beginning, "bug1"); - SPDYF_ASSERT(session->write_buffer_offset == session->write_buffer_size, "bug2"); - - return SPDY_YES; -} - - -int -SPDYF_handler_write_rst_stream (struct SPDY_Session *session) -{ - struct SPDYF_Response_Queue *response_queue = session->response_queue_head; - struct SPDYF_Control_Frame control_frame; - size_t total_size; - - SPDYF_ASSERT(NULL == session->write_buffer, "the function is called not in the correct moment"); - - memcpy(&control_frame, response_queue->control_frame, sizeof(control_frame)); - - total_size = sizeof(struct SPDYF_Control_Frame) //SPDY header - + 4 // stream id as "subheader" - + 4; // status code as "subheader" - - if(NULL == (session->write_buffer = malloc(total_size))) - { - return SPDY_NO; - } - session->write_buffer_beginning = 0; - session->write_buffer_offset = 0; - session->write_buffer_size = total_size; - - control_frame.length = 8; // always for RST_STREAM - SPDYF_CONTROL_FRAME_HTON(&control_frame); - - //put frame headers to write buffer - memcpy(session->write_buffer + session->write_buffer_offset,&control_frame,sizeof(struct SPDYF_Control_Frame)); - session->write_buffer_offset += sizeof(struct SPDYF_Control_Frame); - - //put stream id to write buffer. This is the status - memcpy(session->write_buffer + session->write_buffer_offset, response_queue->data, 8); - session->write_buffer_offset += 8; - //data is not freed by the destroy function so: - //free(response_queue->data); - - //SPDYF_DEBUG("rst_stream sent: id %i", NTOH31((((uint64_t)response_queue->data) & 0xFFFF0000) >> 32)); - - SPDYF_ASSERT(0 == session->write_buffer_beginning, "bug1"); - SPDYF_ASSERT(session->write_buffer_offset == session->write_buffer_size, "bug2"); - - return SPDY_YES; -} - - -int -SPDYF_handler_write_window_update (struct SPDY_Session *session) -{ - struct SPDYF_Response_Queue *response_queue = session->response_queue_head; - struct SPDYF_Control_Frame control_frame; - size_t total_size; - - SPDYF_ASSERT(NULL == session->write_buffer, "the function is called not in the correct moment"); - - memcpy(&control_frame, response_queue->control_frame, sizeof(control_frame)); - - total_size = sizeof(struct SPDYF_Control_Frame) //SPDY header - + 4 // stream id as "subheader" - + 4; // delta-window-size as "subheader" - - if(NULL == (session->write_buffer = malloc(total_size))) - { - return SPDY_NO; - } - session->write_buffer_beginning = 0; - session->write_buffer_offset = 0; - session->write_buffer_size = total_size; - - control_frame.length = 8; // always for WINDOW_UPDATE - SPDYF_CONTROL_FRAME_HTON(&control_frame); - - //put frame headers to write buffer - memcpy(session->write_buffer + session->write_buffer_offset,&control_frame,sizeof(struct SPDYF_Control_Frame)); - session->write_buffer_offset += sizeof(struct SPDYF_Control_Frame); - - //put stream id and delta-window-size to write buffer - memcpy(session->write_buffer + session->write_buffer_offset, response_queue->data, 8); - session->write_buffer_offset += 8; - - //SPDYF_DEBUG("window_update sent: id %i", NTOH31((((uint64_t)response_queue->data) & 0xFFFF0000) >> 32)); - - SPDYF_ASSERT(0 == session->write_buffer_beginning, "bug1"); - SPDYF_ASSERT(session->write_buffer_offset == session->write_buffer_size, "bug2"); - - return SPDY_YES; -} - - -void -SPDYF_handler_ignore_frame (struct SPDY_Session *session) -{ - struct SPDYF_Control_Frame *frame; - - SPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status - || SPDY_SESSION_STATUS_WAIT_FOR_BODY == session->status, - "the function is called wrong"); - - - frame = (struct SPDYF_Control_Frame *)session->frame_handler_cls; - - //handle subheaders - if(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status) - { - if(frame->length > SPDY_MAX_SUPPORTED_FRAME_SIZE) - { - session->status = SPDY_SESSION_STATUS_IGNORE_BYTES; - return; - } - else - session->status = SPDY_SESSION_STATUS_WAIT_FOR_BODY; - } - - //handle body - - if(session->read_buffer_offset - session->read_buffer_beginning - >= frame->length) - { - session->read_buffer_beginning += frame->length; - session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER; - free(frame); - } -} - - -int -SPDYF_session_read (struct SPDY_Session *session) -{ - int bytes_read; - bool reallocate; - size_t actual_buf_size; - - if(SPDY_SESSION_STATUS_CLOSING == session->status - || SPDY_SESSION_STATUS_FLUSHING == session->status) - return SPDY_NO; - - //if the read buffer is full to the end, we need to reallocate space - if (session->read_buffer_size == session->read_buffer_offset) - { - //but only if the state of the session requires it - //i.e. no further proceeding is possible without reallocation - reallocate = false; - actual_buf_size = session->read_buffer_offset - - session->read_buffer_beginning; - switch(session->status) - { - case SPDY_SESSION_STATUS_WAIT_FOR_HEADER: - - case SPDY_SESSION_STATUS_IGNORE_BYTES: - //we need space for a whole control frame header - if(actual_buf_size < sizeof(struct SPDYF_Control_Frame)) - reallocate = true; - break; - - case SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER: - - case SPDY_SESSION_STATUS_WAIT_FOR_BODY: - //we need as many bytes as set in length field of the - //header - SPDYF_ASSERT(NULL != session->frame_handler_cls, - "no frame for session"); - if(session->frame_handler != &spdyf_handler_read_data) - { - if(actual_buf_size - < ((struct SPDYF_Control_Frame *)session->frame_handler_cls)->length) - reallocate = true; - } - else - { - if(actual_buf_size - < ((struct SPDYF_Data_Frame *)session->frame_handler_cls)->length) - reallocate = true; - } - break; - - case SPDY_SESSION_STATUS_CLOSING: - case SPDY_SESSION_STATUS_FLUSHING: - //nothing needed - break; - } - - if(reallocate) - { - //reuse the space in the buffer that was already read by the lib - memmove(session->read_buffer, - session->read_buffer + session->read_buffer_beginning, - session->read_buffer_offset - session->read_buffer_beginning); - - session->read_buffer_offset -= session->read_buffer_beginning; - session->read_buffer_beginning = 0; - } - else - { - //will read next time - //TODO optimize it, memmove more often? - return SPDY_NO; - } - } - - session->last_activity = SPDYF_monotonic_time(); - - //actual read from the TLS socket - bytes_read = session->fio_recv(session, - session->read_buffer + session->read_buffer_offset, - session->read_buffer_size - session->read_buffer_offset); - - switch(bytes_read) - { - case SPDY_IO_ERROR_CLOSED: - //The TLS connection was closed by the other party, clean - //or not - shutdown (session->socket_fd, SHUT_RD); - session->read_closed = true; - session->status = SPDY_SESSION_STATUS_CLOSING; - return SPDY_YES; - - case SPDY_IO_ERROR_ERROR: - //any kind of error in the TLS subsystem - //try to prepare GOAWAY frame - SPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_INTERNAL_ERROR, false); - //try to flush the queue when write is called - session->status = SPDY_SESSION_STATUS_FLUSHING; - return SPDY_YES; - - case SPDY_IO_ERROR_AGAIN: - //read or write should be called again; leave it for the - //next time - return SPDY_NO; - - //default: - //something was really read from the TLS subsystem - //just continue - } - - session->read_buffer_offset += bytes_read; - - return SPDY_YES; -} - - -int -SPDYF_session_write (struct SPDY_Session *session, - bool only_one_frame) -{ - unsigned int i; - int bytes_written; - struct SPDYF_Response_Queue *queue_head; - struct SPDYF_Response_Queue *response_queue; - - if(SPDY_SESSION_STATUS_CLOSING == session->status) - return SPDY_NO; - - if(SPDY_NO == session->fio_before_write(session)) - return SPDY_NO; - - for(i=0; - only_one_frame - ? i < 1 - : i < session->max_num_frames; - ++i) - { - //if the buffer is not null, part of the last frame is still - //pending to be sent - if(NULL == session->write_buffer) - { - //discard frames on closed streams - response_queue = session->response_queue_head; - - while(NULL != response_queue) - { - //if stream is closed, remove not yet sent frames - //associated with it - //GOAWAY frames are not associated to streams - //and still need to be sent - if(NULL == response_queue->stream - || !response_queue->stream->is_out_closed) - break; - - DLL_remove(session->response_queue_head,session->response_queue_tail,response_queue); - - if(NULL != response_queue->frqcb) - { - response_queue->frqcb(response_queue->frqcb_cls, response_queue, SPDY_RESPONSE_RESULT_STREAM_CLOSED); - } - - SPDYF_response_queue_destroy(response_queue); - response_queue = session->response_queue_head; - } - - if(NULL == session->response_queue_head) - break;//nothing on the queue - - //get next data from queue and put it to the write buffer - // to send it - if(SPDY_NO == session->response_queue_head->process_response_handler(session)) - { - //error occured and the handler changed or not the - //session's status appropriately - if(SPDY_SESSION_STATUS_CLOSING == session->status) - { - //try to send GOAWAY first if the current frame is different - if(session->response_queue_head->is_data - || SPDY_CONTROL_FRAME_TYPES_GOAWAY - != session->response_queue_head->control_frame->type) - { - session->status = SPDY_SESSION_STATUS_FLUSHING; - SPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_INTERNAL_ERROR, true); - SPDYF_session_write(session,true); - session->status = SPDY_SESSION_STATUS_CLOSING; - } - return SPDY_YES; - } - - //just return from the loop to return from this function - ++i; - break; - } - - //check if something was prepared for writing - //on respones with callbacks it is possible that their is no - //data available - if(0 == session->write_buffer_size)//nothing to write - { - if(response_queue != session->response_queue_head) - { - //the handler modified the queue - continue; - } - else - { - //no need to try the same frame again - ++i; - break; - } - } - } - - session->last_activity = SPDYF_monotonic_time(); - - //actual write to the IO - bytes_written = session->fio_send(session, - session->write_buffer + session->write_buffer_beginning, - session->write_buffer_offset - session->write_buffer_beginning); - - switch(bytes_written) - { - case SPDY_IO_ERROR_CLOSED: - //The TLS connection was closed by the other party, clean - //or not - shutdown (session->socket_fd, SHUT_RD); - session->read_closed = true; - session->status = SPDY_SESSION_STATUS_CLOSING; - return SPDY_YES; - - case SPDY_IO_ERROR_ERROR: - //any kind of error in the TLS subsystem - //forbid more writing - session->status = SPDY_SESSION_STATUS_CLOSING; - return SPDY_YES; - - case SPDY_IO_ERROR_AGAIN: - //read or write should be called again; leave it for the - //next time; return from the function as we do not now - //whether reading or writing is needed - return i>0 ? SPDY_YES : SPDY_NO; - - //default: - //something was really read from the TLS subsystem - //just continue - } - - session->write_buffer_beginning += bytes_written; - - //check if the full buffer was written - if(session->write_buffer_beginning == session->write_buffer_size) - { - //that response is handled, remove it from queue - free(session->write_buffer); - session->write_buffer = NULL; - session->write_buffer_size = 0; - queue_head = session->response_queue_head; - if(NULL == queue_head->next) - { - session->response_queue_head = NULL; - session->response_queue_tail = NULL; - } - else - { - session->response_queue_head = queue_head->next; - session->response_queue_head->prev = NULL; - } - - //set stream to closed if the frame's fin flag is set - SPDYF_stream_set_flags_on_write(queue_head); - - if(NULL != queue_head->frqcb) - { - //application layer callback to notify sending of the response - queue_head->frqcb(queue_head->frqcb_cls, queue_head, SPDY_RESPONSE_RESULT_SUCCESS); - } - - SPDYF_response_queue_destroy(queue_head); - } - } - - if(SPDY_SESSION_STATUS_FLUSHING == session->status - && NULL == session->response_queue_head) - session->status = SPDY_SESSION_STATUS_CLOSING; - - //return i>0 ? SPDY_YES : SPDY_NO; - return session->fio_after_write(session, i>0 ? SPDY_YES : SPDY_NO); -} - - -int -SPDYF_session_idle (struct SPDY_Session *session) -{ - size_t read_buffer_beginning; - size_t frame_length; - struct SPDYF_Control_Frame* control_frame; - struct SPDYF_Data_Frame *data_frame; - - //prepare session for closing if timeout is used and already passed - if(SPDY_SESSION_STATUS_CLOSING != session->status - && session->daemon->session_timeout - && (session->last_activity + session->daemon->session_timeout < SPDYF_monotonic_time())) - { - session->status = SPDY_SESSION_STATUS_CLOSING; - //best effort for sending GOAWAY - SPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_OK, true); - SPDYF_session_write(session,true); - } - - switch(session->status) - { - //expect new frame to arrive - case SPDY_SESSION_STATUS_WAIT_FOR_HEADER: - session->current_stream_id = 0; - //check if the whole frame header is already here - //both frame types have the same length - if(session->read_buffer_offset - session->read_buffer_beginning - < sizeof(struct SPDYF_Control_Frame)) - return SPDY_NO; - - /* check the first bit to see if it is data or control frame - * and also if the version is supported */ - if(0x80 == *(uint8_t *)(session->read_buffer + session->read_buffer_beginning) - && SPDY_VERSION == *((uint8_t *)session->read_buffer + session->read_buffer_beginning + 1)) - { - //control frame - if(NULL == (control_frame = malloc(sizeof(struct SPDYF_Control_Frame)))) - { - SPDYF_DEBUG("No memory"); - return SPDY_NO; - } - - //get frame headers - memcpy(control_frame, - session->read_buffer + session->read_buffer_beginning, - sizeof(struct SPDYF_Control_Frame)); - session->read_buffer_beginning += sizeof(struct SPDYF_Control_Frame); - SPDYF_CONTROL_FRAME_NTOH(control_frame); - - session->status = SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER; - //assign different frame handler according to frame type - switch(control_frame->type){ - case SPDY_CONTROL_FRAME_TYPES_SYN_STREAM: - session->frame_handler = &spdyf_handler_read_syn_stream; - break; - case SPDY_CONTROL_FRAME_TYPES_GOAWAY: - session->frame_handler = &spdyf_handler_read_goaway; - break; - case SPDY_CONTROL_FRAME_TYPES_RST_STREAM: - session->frame_handler = &spdyf_handler_read_rst_stream; - break; - default: - session->frame_handler = &SPDYF_handler_ignore_frame; - } - session->frame_handler_cls = control_frame; - //DO NOT break the outer case - } - else if(0 == *(uint8_t *)(session->read_buffer + session->read_buffer_beginning)) - { - //needed for POST - //data frame - if(NULL == (data_frame = malloc(sizeof(struct SPDYF_Data_Frame)))) - { - SPDYF_DEBUG("No memory"); - return SPDY_NO; - } - - //get frame headers - memcpy(data_frame, - session->read_buffer + session->read_buffer_beginning, - sizeof(struct SPDYF_Data_Frame)); - session->read_buffer_beginning += sizeof(struct SPDYF_Data_Frame); - SPDYF_DATA_FRAME_NTOH(data_frame); - - session->status = SPDY_SESSION_STATUS_WAIT_FOR_BODY; - session->frame_handler = &spdyf_handler_read_data; - session->frame_handler_cls = data_frame; - //DO NOT brake the outer case - } - else - { - SPDYF_DEBUG("another protocol or version received!"); - - /* According to the draft the lib should send here - * RST_STREAM with status UNSUPPORTED_VERSION. I don't - * see any sense of keeping the session open since - * we don't know how many bytes is the bogus "frame". - * And the latter normally will be HTTP request. - * - */ - - //shutdown(session->socket_fd, SHUT_RD); - session->status = SPDY_SESSION_STATUS_FLUSHING; - SPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_PROTOCOL_ERROR,false); - //SPDYF_session_write(session,false); - /* close connection since the client expects another - protocol from us */ - //SPDYF_session_close(session); - return SPDY_YES; - } - - //expect specific header fields after the standard header - case SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER: - if(NULL!=session->frame_handler) - { - read_buffer_beginning = session->read_buffer_beginning; - //if everything is ok, the "body" will also be processed - //by the handler - session->frame_handler(session); - - if(SPDY_SESSION_STATUS_IGNORE_BYTES == session->status) - { - //check for larger than max supported frame - if(session->frame_handler != &spdyf_handler_read_data) - { - frame_length = ((struct SPDYF_Control_Frame *)session->frame_handler_cls)->length; - } - else - { - frame_length = ((struct SPDYF_Data_Frame *)session->frame_handler_cls)->length; - } - - //if(SPDY_MAX_SUPPORTED_FRAME_SIZE < frame_length) - { - SPDYF_DEBUG("received frame with unsupported size: %zu", frame_length); - //the data being received must be ignored and - //RST_STREAM sent - - //ignore bytes that will arive later - session->read_ignore_bytes = frame_length - + read_buffer_beginning - - session->read_buffer_offset; - //ignore what is already in read buffer - session->read_buffer_beginning = session->read_buffer_offset; - - SPDYF_prepare_rst_stream(session, - session->current_stream_id > 0 ? session->streams_head : NULL, //may be 0 here which is not good - SPDY_RST_STREAM_STATUS_FRAME_TOO_LARGE); - - //actually the read buffer can be bigger than the - //max supported size - session->status = session->read_ignore_bytes - ? SPDY_SESSION_STATUS_IGNORE_BYTES - : SPDY_SESSION_STATUS_WAIT_FOR_HEADER; - - free(session->frame_handler_cls); - } - } - } - - if(SPDY_SESSION_STATUS_IGNORE_BYTES != session->status) - { - break; - } - - //ignoring data in read buffer - case SPDY_SESSION_STATUS_IGNORE_BYTES: - SPDYF_ASSERT(session->read_ignore_bytes > 0, - "Session is in wrong state"); - if(session->read_ignore_bytes - > session->read_buffer_offset - session->read_buffer_beginning) - { - session->read_ignore_bytes -= - session->read_buffer_offset - session->read_buffer_beginning; - session->read_buffer_beginning = session->read_buffer_offset; - } - else - { - session->read_buffer_beginning += session->read_ignore_bytes; - session->read_ignore_bytes = 0; - session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER; - } - break; - - //expect frame body (name/value pairs) - case SPDY_SESSION_STATUS_WAIT_FOR_BODY: - if(NULL!=session->frame_handler) - session->frame_handler(session); - break; - - case SPDY_SESSION_STATUS_FLUSHING: - - return SPDY_NO; - - //because of error the session needs to be closed - case SPDY_SESSION_STATUS_CLOSING: - //error should be already sent to the client - SPDYF_session_close(session); - return SPDY_YES; - } - - return SPDY_YES; -} - - -void -SPDYF_session_close (struct SPDY_Session *session) -{ - struct SPDY_Daemon *daemon = session->daemon; - int by_client = session->read_closed ? SPDY_YES : SPDY_NO; - - //shutdown the tls and deinit the tls context - session->fio_close_session(session); - shutdown (session->socket_fd, - session->read_closed ? SHUT_WR : SHUT_RDWR); - session->read_closed = true; - - //remove session from the list - DLL_remove (daemon->sessions_head, - daemon->sessions_tail, - session); - //add the session for the list for cleaning up - DLL_insert (daemon->cleanup_head, - daemon->cleanup_tail, - session); - - //call callback for closed session - if(NULL != daemon->session_closed_cb) - { - daemon->session_closed_cb(daemon->cls, session, by_client); - } -} - - -int -SPDYF_session_accept(struct SPDY_Daemon *daemon) -{ - int new_socket_fd; - int ret; - struct SPDY_Session *session = NULL; - socklen_t addr_len; - struct sockaddr *addr; - -#if HAVE_INET6 - struct sockaddr_in6 addr6; - - addr = (struct sockaddr *)&addr6; - addr_len = sizeof(addr6); -#else - struct sockaddr_in addr4; - - addr = (struct sockaddr *)&addr4; - addr_len = sizeof(addr6); -#endif - - new_socket_fd = accept (daemon->socket_fd, addr, &addr_len); - - if(new_socket_fd < 1) - return SPDY_NO; - - if (NULL == (session = malloc (sizeof (struct SPDY_Session)))) - { - goto free_and_fail; - } - memset (session, 0, sizeof (struct SPDY_Session)); - - session->daemon = daemon; - session->socket_fd = new_socket_fd; - session->max_num_frames = daemon->max_num_frames; - - ret = SPDYF_io_set_session(session, daemon->io_subsystem); - SPDYF_ASSERT(SPDY_YES == ret, "Somehow daemon->io_subsystem iswrong here"); - - //init TLS context, handshake will be done - if(SPDY_YES != session->fio_new_session(session)) - { - goto free_and_fail; - } - - //read buffer - session->read_buffer_size = SPDYF_BUFFER_SIZE; - if (NULL == (session->read_buffer = malloc (session->read_buffer_size))) - { - session->fio_close_session(session); - goto free_and_fail; - } - - //address of the client - if (NULL == (session->addr = malloc (addr_len))) - { - session->fio_close_session(session); - goto free_and_fail; - } - memcpy (session->addr, addr, addr_len); - - session->addr_len = addr_len; - session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER; - - //init zlib context for the whole session - if(SPDY_YES != SPDYF_zlib_deflate_init(&session->zlib_send_stream)) - { - session->fio_close_session(session); - goto free_and_fail; - } - if(SPDY_YES != SPDYF_zlib_inflate_init(&session->zlib_recv_stream)) - { - session->fio_close_session(session); - SPDYF_zlib_deflate_end(&session->zlib_send_stream); - goto free_and_fail; - } - - //add it to daemon's list - DLL_insert(daemon->sessions_head,daemon->sessions_tail,session); - - session->last_activity = SPDYF_monotonic_time(); - - if(NULL != daemon->new_session_cb) - daemon->new_session_cb(daemon->cls, session); - - return SPDY_YES; - - //for GOTO - free_and_fail: - /* something failed, so shutdown, close and free memory */ - shutdown (new_socket_fd, SHUT_RDWR); - (void)close (new_socket_fd); - - if(NULL != session) - { - if(NULL != session->addr) - free (session->addr); - if(NULL != session->read_buffer) - free (session->read_buffer); - free (session); - } - return SPDY_NO; -} - - -void -SPDYF_queue_response (struct SPDYF_Response_Queue *response_to_queue, - struct SPDY_Session *session, - int consider_priority) -{ - struct SPDYF_Response_Queue *pos; - struct SPDYF_Response_Queue *last; - uint8_t priority; - - SPDYF_ASSERT(SPDY_YES != consider_priority || NULL != response_to_queue->stream, - "called with consider_priority but no stream provided"); - - last = response_to_queue; - while(NULL != last->next) - { - last = last->next; - } - - if(SPDY_NO == consider_priority) - { - //put it at the end of the queue - response_to_queue->prev = session->response_queue_tail; - if (NULL == session->response_queue_head) - session->response_queue_head = response_to_queue; - else - session->response_queue_tail->next = response_to_queue; - session->response_queue_tail = last; - return; - } - else if(-1 == consider_priority) - { - //put it at the head of the queue - last->next = session->response_queue_head; - if (NULL == session->response_queue_tail) - session->response_queue_tail = last; - else - session->response_queue_head->prev = response_to_queue; - session->response_queue_head = response_to_queue; - return; - } - - if(NULL == session->response_queue_tail) - { - session->response_queue_head = response_to_queue; - session->response_queue_tail = last; - return; - } - - //search for the right position to put it - pos = session->response_queue_tail; - priority = response_to_queue->stream->priority; - while(NULL != pos - && pos->stream->priority > priority) - { - pos = pos->prev; - } - - if(NULL == pos) - { - //put it on the head - session->response_queue_head->prev = last; - last->next = session->response_queue_head; - session->response_queue_head = response_to_queue; - } - else if(NULL == pos->next) - { - //put it at the end - response_to_queue->prev = pos; - pos->next = response_to_queue; - session->response_queue_tail = last; - } - else - { - response_to_queue->prev = pos; - last->next = pos->next; - pos->next = response_to_queue; - last->next->prev = last; - } -} - - -void -SPDYF_session_destroy(struct SPDY_Session *session) -{ - struct SPDYF_Stream *stream; - struct SPDYF_Response_Queue *response_queue; - - (void)close (session->socket_fd); - SPDYF_zlib_deflate_end(&session->zlib_send_stream); - SPDYF_zlib_inflate_end(&session->zlib_recv_stream); - - //clean up unsent data in the output queue - while (NULL != (response_queue = session->response_queue_head)) - { - DLL_remove (session->response_queue_head, - session->response_queue_tail, - response_queue); - - if(NULL != response_queue->frqcb) - { - response_queue->frqcb(response_queue->frqcb_cls, response_queue, SPDY_RESPONSE_RESULT_SESSION_CLOSED); - } - - SPDYF_response_queue_destroy(response_queue); - } - - //clean up the streams belonging to this session - while (NULL != (stream = session->streams_head)) - { - DLL_remove (session->streams_head, - session->streams_tail, - stream); - - SPDYF_stream_destroy(stream); - } - - free(session->addr); - free(session->read_buffer); - free(session->write_buffer); - free(session); -} - - -int -SPDYF_prepare_goaway (struct SPDY_Session *session, - enum SPDY_GOAWAY_STATUS status, - bool in_front) -{ - struct SPDYF_Response_Queue *response_to_queue; - struct SPDYF_Control_Frame *control_frame; - uint32_t *data; - - if(NULL == (response_to_queue = malloc(sizeof(struct SPDYF_Response_Queue)))) - { - return SPDY_NO; - } - memset(response_to_queue, 0, sizeof(struct SPDYF_Response_Queue)); - - if(NULL == (control_frame = malloc(sizeof(struct SPDYF_Control_Frame)))) - { - free(response_to_queue); - return SPDY_NO; - } - memset(control_frame, 0, sizeof(struct SPDYF_Control_Frame)); - - if(NULL == (data = malloc(4))) - { - free(control_frame); - free(response_to_queue); - return SPDY_NO; - } - *(data) = htonl(status); - - control_frame->control_bit = 1; - control_frame->version = SPDY_VERSION; - control_frame->type = SPDY_CONTROL_FRAME_TYPES_GOAWAY; - control_frame->flags = 0; - - response_to_queue->control_frame = control_frame; - response_to_queue->process_response_handler = &SPDYF_handler_write_goaway; - response_to_queue->data = data; - response_to_queue->data_size = 4; - - SPDYF_queue_response (response_to_queue, - session, - in_front ? -1 : SPDY_NO); - - return SPDY_YES; -} - - -int -SPDYF_prepare_rst_stream (struct SPDY_Session *session, - struct SPDYF_Stream * stream, - enum SPDY_RST_STREAM_STATUS status) -{ - struct SPDYF_Response_Queue *response_to_queue; - struct SPDYF_Control_Frame *control_frame; - uint32_t *data; - uint32_t stream_id; - - if(NULL == stream) - stream_id = 0; - else - stream_id = stream->stream_id; - - if(NULL == (response_to_queue = malloc(sizeof(struct SPDYF_Response_Queue)))) - { - return SPDY_NO; - } - memset(response_to_queue, 0, sizeof(struct SPDYF_Response_Queue)); - - if(NULL == (control_frame = malloc(sizeof(struct SPDYF_Control_Frame)))) - { - free(response_to_queue); - return SPDY_NO; - } - memset(control_frame, 0, sizeof(struct SPDYF_Control_Frame)); - - if(NULL == (data = malloc(8))) - { - free(control_frame); - free(response_to_queue); - return SPDY_NO; - } - *(data) = HTON31(stream_id); - *(data + 1) = htonl(status); - - control_frame->control_bit = 1; - control_frame->version = SPDY_VERSION; - control_frame->type = SPDY_CONTROL_FRAME_TYPES_RST_STREAM; - control_frame->flags = 0; - - response_to_queue->control_frame = control_frame; - response_to_queue->process_response_handler = &SPDYF_handler_write_rst_stream; - response_to_queue->data = data; - response_to_queue->data_size = 8; - response_to_queue->stream = stream; - - SPDYF_queue_response (response_to_queue, - session, - -1); - - return SPDY_YES; -} - - -int -SPDYF_prepare_window_update (struct SPDY_Session *session, - struct SPDYF_Stream * stream, - int32_t delta_window_size) -{ - struct SPDYF_Response_Queue *response_to_queue; - struct SPDYF_Control_Frame *control_frame; - uint32_t *data; - - SPDYF_ASSERT(NULL != stream, "stream cannot be NULL"); - - if(NULL == (response_to_queue = malloc(sizeof(struct SPDYF_Response_Queue)))) - { - return SPDY_NO; - } - memset(response_to_queue, 0, sizeof(struct SPDYF_Response_Queue)); - - if(NULL == (control_frame = malloc(sizeof(struct SPDYF_Control_Frame)))) - { - free(response_to_queue); - return SPDY_NO; - } - memset(control_frame, 0, sizeof(struct SPDYF_Control_Frame)); - - if(NULL == (data = malloc(8))) - { - free(control_frame); - free(response_to_queue); - return SPDY_NO; - } - *(data) = HTON31(stream->stream_id); - *(data + 1) = HTON31(delta_window_size); - - control_frame->control_bit = 1; - control_frame->version = SPDY_VERSION; - control_frame->type = SPDY_CONTROL_FRAME_TYPES_WINDOW_UPDATE; - control_frame->flags = 0; - - response_to_queue->control_frame = control_frame; - response_to_queue->process_response_handler = &SPDYF_handler_write_window_update; - response_to_queue->data = data; - response_to_queue->data_size = 8; - response_to_queue->stream = stream; - - SPDYF_queue_response (response_to_queue, - session, - -1); - - return SPDY_YES; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/session.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/session.h deleted file mode 100644 index 29ab550f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/session.h +++ /dev/null @@ -1,281 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file session.h - * @brief TCP connection/SPDY session handling - * @author Andrey Uzunov - */ - -#ifndef SESSION_H -#define SESSION_H - -#include "platform.h" -#include "structures.h" - -/** - * Called by the daemon when the socket for the session has available - * data to be read. Reads data from the TLS socket and puts it to the - * session's read buffer. The latte - * - * @param session SPDY_Session for which data will be read. - * @return SPDY_YES if something was read or session's status was - * changed. It is possible that error occurred but was handled - * and the status was therefore changed. - * SPDY_NO if nothing happened, e.g. the subsystem wants read/ - * write to be called again. - */ -int -SPDYF_session_read (struct SPDY_Session *session); - - -/** - * Called by the daemon when the socket for the session is ready for some - * data to be written to it. For one or more objects on the response - * queue tries to fill in the write buffer, based on the frame on the - * queue, and to write data to the TLS socket. - * - * @param session SPDY_Session for which data will be written. - * @param only_one_frame when true, the function will write at most one - * SPDY frame to the underlying IO subsystem; - * when false, the function will write up to - * session->max_num_frames SPDY frames - * @return SPDY_YES if the session's internal writing state has changed: - * something was written and/or session's status was - * changed and/or response callback was called but did not provide - * data. It is possible that error occurred but was handled - * and the status was therefore changed. - * SPDY_NO if nothing happened. However, it is possible that some - * frames were discarded within the call, e.g. frames belonging - * to a closed stream. - */ -int -SPDYF_session_write (struct SPDY_Session *session, - bool only_one_frame); - - -/** - * Called by the daemon on SPDY_run to handle the data in the read and write - * buffer of a session. Based on the state and the content of the read - * buffer new frames are received and interpreted, appropriate user - * callbacks are called and maybe something is put on the response queue - * ready to be handled by session_write. - * - * @param session SPDY_Session which will be handled. - * @return SPDY_YES if something from the read buffers was processed, - * session's status was changed and/or the session was closed. - * SPDY_NO if nothing happened, e.g. the session is in a state, - * not allowing processing read buffers. - */ -int -SPDYF_session_idle (struct SPDY_Session *session); - - -/** - * This function shutdowns the socket, moves the session structure to - * daemon's queue for sessions to be cleaned up. - * - * @param session SPDY_Session which will be handled. - */ -void -SPDYF_session_close (struct SPDY_Session *session); - - -/** - * Called to accept new TCP connection and create SPDY session. - * - * @param daemon SPDY_Daemon whose listening socket is used. - * @return SPDY_NO on any kind of error while accepting new TCP connection - * and initializing new SPDY_Session. - * SPDY_YES otherwise. - */ -int -SPDYF_session_accept(struct SPDY_Daemon *daemon); - - -/** - * Puts SPDYF_Response_Queue object on the queue to be sent to the - * client later. - * - * @param response_to_queue linked list of objects containing SPDY - * frame and data to be added to the queue - * @param session SPDY session for which the response is sent - * @param consider_priority if SPDY_NO, the list will be added to the - * end of the queue. - * If SPDY_YES, the response will be added after - * the last previously added response with priority of the - * request grater or equal to that of the current one. - * If -1, the object will be put at the head of the queue. - */ -void -SPDYF_queue_response (struct SPDYF_Response_Queue *response_to_queue, - struct SPDY_Session *session, - int consider_priority); - - -/** - * Cleans up the TSL context for the session, closes the TCP connection, - * cleans up any data pointed by members of the session structure - * (buffers, queue of responses, etc.) and frees the memory allocated by - * the session itself. - */ -void -SPDYF_session_destroy(struct SPDY_Session *session); - - -/** - * Prepares GOAWAY frame to tell the client to stop creating new streams. - * The session should be closed soon after this call. - * - * @param session SPDY session - * @param status code for the GOAWAY frame - * @param in_front whether or not to put the frame in front of everything - * on the response queue - * @return SPDY_NO on error (not enough memory) or - * SPDY_YES on success - */ -int -SPDYF_prepare_goaway (struct SPDY_Session *session, - enum SPDY_GOAWAY_STATUS status, - bool in_front); - - -/** - * Prepares RST_STREAM frame to terminate a stream. This frame may or - * not indicate an error. The frame will be put at the head of the queue. - * This means that frames for this stream which are still in the queue - * will be discarded soon. - * - * @param session SPDY session - * @param stream stream to terminate - * @param status code for the RST_STREAM frame - * @return SPDY_NO on memory error or - * SPDY_YES on success - */ -int -SPDYF_prepare_rst_stream (struct SPDY_Session *session, - struct SPDYF_Stream * stream, - enum SPDY_RST_STREAM_STATUS status); - - -/** - * Prepares WINDOW_UPDATE frame to tell the other party that more - * data can be sent on the stream. The frame will be put at the head of - * the queue. - * - * @param session SPDY session - * @param stream stream to which the changed window will apply - * @param delta_window_size how much the window grows - * @return SPDY_NO on memory error or - * SPDY_YES on success - */ -int -SPDYF_prepare_window_update (struct SPDY_Session *session, - struct SPDYF_Stream * stream, - int32_t delta_window_size); - - -/** - * Handler called by session_write to fill the write buffer according to - * the data frame waiting in the response queue. - * When response data is given by user callback, the lib does not know - * how many frames are needed. In such case this call produces - * another ResponseQueue object and puts it on the queue while the the - * user callback says that there will be more data. - * - * @return SPDY_NO on error (not enough memory or the user calback for - * providing response data did something wrong). If - * the error is unrecoverable the handler changes session's - * status. - * SPDY_YES on success - */ -int -SPDYF_handler_write_data (struct SPDY_Session *session); - - -/** - * Handler called by session_write to fill the write buffer based on the - * control frame (SYN_REPLY) waiting in the response queue. - * - * @param session SPDY session - * @return SPDY_NO on error (zlib state is broken; the session MUST be - * closed). If - * the error is unrecoverable the handler changes session's - * status. - * SPDY_YES on success - */ -int -SPDYF_handler_write_syn_reply (struct SPDY_Session *session); - - -/** - * Handler called by session_write to fill the write buffer based on the - * control frame (GOAWAY) waiting in the response queue. - * - * @param session SPDY session - * @return SPDY_NO on error (not enough memory; by specification the - * session must be closed - * soon, thus there is no need to handle the error) or - * SPDY_YES on success - */ -int -SPDYF_handler_write_goaway (struct SPDY_Session *session); - - -/** - * Handler called by session_write to fill the write buffer based on the - * control frame (RST_STREAM) waiting in the response queue. - * - * @param session SPDY session - * @return SPDY_NO on error (not enough memory). If - * the error is unrecoverable the handler changes session's - * status. - * SPDY_YES on success - */ -int -SPDYF_handler_write_rst_stream (struct SPDY_Session *session); - - -/** - * Handler called by session_write to fill the write buffer based on the - * control frame (WINDOW_UPDATE) waiting in the response queue. - * - * @param session SPDY session - * @return SPDY_NO on error (not enough memory). If - * the error is unrecoverable the handler changes session's - * status. - * SPDY_YES on success - */ -int -SPDYF_handler_write_window_update (struct SPDY_Session *session); - - -/** - * Carefully ignore the full size of frames which are not yet supported - * by the lib. - * TODO Ignoring frames containing compressed bodies means that the - * compress state will be corrupted on next received frame. According to - * the draft the lib SHOULD try to decompress data also in corrupted - * frames just to keep right compression state. - * - * @param session SPDY_Session whose read buffer is used. - */ -void -SPDYF_handler_ignore_frame (struct SPDY_Session *session); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/stream.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/stream.c deleted file mode 100644 index 9b6dc08d..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/stream.c +++ /dev/null @@ -1,169 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file stream.c - * @brief SPDY streams handling - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "structures.h" -#include "internal.h" -#include "session.h" - - -int -SPDYF_stream_new (struct SPDY_Session *session) -{ - uint32_t stream_id; - uint32_t assoc_stream_id; - uint8_t priority; - uint8_t slot; - size_t buffer_pos = session->read_buffer_beginning; - struct SPDYF_Stream *stream; - struct SPDYF_Control_Frame *frame; - - if((session->read_buffer_offset - session->read_buffer_beginning) < 10) - { - //not all fields are received to create new stream - return SPDY_NO; - } - - frame = (struct SPDYF_Control_Frame *)session->frame_handler_cls; - - //get stream id of the new stream - memcpy(&stream_id, session->read_buffer + session->read_buffer_beginning, 4); - stream_id = NTOH31(stream_id); - session->read_buffer_beginning += 4; - if(stream_id <= session->last_in_stream_id || 0==(stream_id % 2)) - { - //wrong stream id sent by client - //GOAWAY with PROTOCOL_ERROR MUST be sent - //TODO - - //ignore frame - session->frame_handler = &SPDYF_handler_ignore_frame; - return SPDY_NO; - } - else if(session->is_goaway_sent) - { - //the client is not allowed to create new streams anymore - //we MUST ignore the frame - session->frame_handler = &SPDYF_handler_ignore_frame; - return SPDY_NO; - } - - //set highest stream id for session - session->last_in_stream_id = stream_id; - - //get assoc stream id of the new stream - //this value is used with SPDY PUSH, thus nothing to do with it here - memcpy(&assoc_stream_id, session->read_buffer + session->read_buffer_beginning, 4); - assoc_stream_id = NTOH31(assoc_stream_id); - session->read_buffer_beginning += 4; - - //get stream priority (3 bits) - //after it there are 5 bits that are not used - priority = *(uint8_t *)(session->read_buffer + session->read_buffer_beginning) >> 5; - session->read_buffer_beginning++; - - //get slot (see SPDY draft) - slot = *(uint8_t *)(session->read_buffer + session->read_buffer_beginning); - session->read_buffer_beginning++; - - if(NULL == (stream = malloc(sizeof(struct SPDYF_Stream)))) - { - SPDYF_DEBUG("No memory"); - //revert buffer state - session->read_buffer_beginning = buffer_pos; - return SPDY_NO; - } - memset(stream,0, sizeof(struct SPDYF_Stream)); - stream->session = session; - stream->stream_id = stream_id; - stream->assoc_stream_id = assoc_stream_id; - stream->priority = priority; - stream->slot = slot; - stream->is_in_closed = (frame->flags & SPDY_SYN_STREAM_FLAG_FIN) != 0; - stream->flag_unidirectional = (frame->flags & SPDY_SYN_STREAM_FLAG_UNIDIRECTIONAL) != 0; - stream->is_out_closed = stream->flag_unidirectional; - stream->is_server_initiator = false; - stream->window_size = SPDYF_INITIAL_WINDOW_SIZE; - - //put the stream to the list of streams for the session - DLL_insert(session->streams_head, session->streams_tail, stream); - - return SPDY_YES; -} - - -void -SPDYF_stream_destroy(struct SPDYF_Stream *stream) -{ - SPDY_name_value_destroy(stream->headers); - free(stream); - stream = NULL; -} - - -void -SPDYF_stream_set_flags_on_write(struct SPDYF_Response_Queue *response_queue) -{ - struct SPDYF_Stream * stream = response_queue->stream; - - if(NULL != response_queue->data_frame) - { - stream->is_out_closed = (bool)(response_queue->data_frame->flags & SPDY_DATA_FLAG_FIN); - } - else if(NULL != response_queue->control_frame) - { - switch(response_queue->control_frame->type) - { - case SPDY_CONTROL_FRAME_TYPES_SYN_REPLY: - stream->is_out_closed = (bool)(response_queue->control_frame->flags & SPDY_SYN_REPLY_FLAG_FIN); - break; - - case SPDY_CONTROL_FRAME_TYPES_RST_STREAM: - if(NULL != stream) - { - stream->is_out_closed = true; - stream->is_in_closed = true; - } - break; - - } - } -} - - -//TODO add function *on_read - - -struct SPDYF_Stream * -SPDYF_stream_find(uint32_t stream_id, struct SPDY_Session * session) -{ - struct SPDYF_Stream * stream = session->streams_head; - - while(NULL != stream && stream_id != stream->stream_id) - { - stream = stream->next; - } - - return stream; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/stream.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/stream.h deleted file mode 100644 index 220231f4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/stream.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file stream.h - * @brief SPDY streams handling - * @author Andrey Uzunov - */ - -#ifndef STREAM_H -#define STREAM_H - -#include "platform.h" - - -/** - * Reads data from session's read buffer and tries to create a new SPDY - * stream. This function is called after control frame's header has been - * read from the buffer (after the length field). If bogus frame is - * received the function changes the read handler of the session and - * fails, i.e. there is no need of further error handling by the caller. - * - * @param session SPDY_Session whose read buffer is being read - * @return SPDY_YES if a new SPDY stream request was correctly received - * and handled. SPDY_NO if the whole SPDY frame was not yet - * received or memory error occurred. - */ -int -SPDYF_stream_new (struct SPDY_Session *session); - - -/** - * Destroys stream structure and whatever is in it. - * - * @param stream SPDY_Stream to destroy - */ -void -SPDYF_stream_destroy(struct SPDYF_Stream *stream); - - -/** - * Set stream flags if needed based on the type of the frame that was - * just sent (e.g., close stream if it was RST_STREAM). - * - * @param response_queue sent for this stream - */ -void -SPDYF_stream_set_flags_on_write(struct SPDYF_Response_Queue *response_queue); - - -/** - * Find and return a session's stream, based on stream's ID. - * - * @param stream_id to search for - * @param session whose streams are considered - * @return SPDY_Stream with the desired ID. Can be NULL. - */ -struct SPDYF_Stream * -SPDYF_stream_find(uint32_t stream_id, struct SPDY_Session * session); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/structures.c b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/structures.c deleted file mode 100644 index f00806bc..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/structures.c +++ /dev/null @@ -1,638 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file structures.c - * @brief Functions for handling most of the structures in defined - * in structures.h - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "structures.h" -#include "internal.h" -#include "session.h" -//TODO not for here? -#include - - -int -SPDYF_name_value_is_empty(struct SPDY_NameValue *container) -{ - SPDYF_ASSERT(NULL != container, "NULL is not an empty container!"); - return (NULL == container->name && NULL == container->value) ? SPDY_YES : SPDY_NO; -} - -struct SPDY_NameValue * -SPDY_name_value_create () -{ - struct SPDY_NameValue *pair; - - if(NULL == (pair = malloc(sizeof(struct SPDY_NameValue)))) - return NULL; - - memset (pair, 0, sizeof (struct SPDY_NameValue)); - - return pair; -} - - -int -SPDY_name_value_add (struct SPDY_NameValue *container, - const char *name, - const char *value) -{ - unsigned int i; - unsigned int len; - struct SPDY_NameValue *pair; - struct SPDY_NameValue *temp; - char **temp_value; - char *temp_string; - - if(NULL == container || NULL == name || NULL == value || 0 == (len = strlen(name))) - return SPDY_INPUT_ERROR; - //TODO there is old code handling value==NULL - //update it to handle strlen(value)==0 - - for(i=0; iname = strdup (name))) - { - return SPDY_NO; - } - if (NULL == (container->value = malloc(sizeof(char *)))) - { - free(container->name); - return SPDY_NO; - } - /*if(NULL == value) - container->value[0] = NULL; - else */if (NULL == (container->value[0] = strdup (value))) - { - free(container->value); - free(container->name); - return SPDY_NO; - } - container->num_values = 1; - return SPDY_YES; - } - - pair = container; - while(NULL != pair) - { - if(0 == strcmp(pair->name, name)) - { - //the value will be added to this pair - break; - } - pair = pair->next; - } - - if(NULL == pair) - { - //the name doesn't exist in container, add new pair - if(NULL == (pair = malloc(sizeof(struct SPDY_NameValue)))) - return SPDY_NO; - - memset(pair, 0, sizeof(struct SPDY_NameValue)); - - if (NULL == (pair->name = strdup (name))) - { - free(pair); - return SPDY_NO; - } - if (NULL == (pair->value = malloc(sizeof(char *)))) - { - free(pair->name); - free(pair); - return SPDY_NO; - } - /*if(NULL == value) - pair->value[0] = NULL; - else */if (NULL == (pair->value[0] = strdup (value))) - { - free(pair->value); - free(pair->name); - free(pair); - return SPDY_NO; - } - pair->num_values = 1; - - temp = container; - while(NULL != temp->next) - temp = temp->next; - temp->next = pair; - pair->prev = temp; - - return SPDY_YES; - } - - //check for duplication (case sensitive) - for(i=0; inum_values; ++i) - if(0 == strcmp(pair->value[i], value)) - return SPDY_NO; - - if(strlen(pair->value[0]) > 0) - { - //the value will be appended to the others for this name - if (NULL == (temp_value = malloc((pair->num_values + 1) * sizeof(char *)))) - { - return SPDY_NO; - } - memcpy(temp_value, pair->value, pair->num_values * sizeof(char *)); - if (NULL == (temp_value[pair->num_values] = strdup (value))) - { - free(temp_value); - return SPDY_NO; - } - free(pair->value); - pair->value = temp_value; - ++pair->num_values; - return SPDY_YES; - } - - //just replace the empty value - - if (NULL == (temp_string = strdup (value))) - { - return SPDY_NO; - } - free(pair->value[0]); - pair->value[0] = temp_string; - - return SPDY_YES; -} - - -const char * const * -SPDY_name_value_lookup (struct SPDY_NameValue *container, - const char *name, - int *num_values) -{ - struct SPDY_NameValue *temp = container; - - if(NULL == container || NULL == name || NULL == num_values) - return NULL; - if(SPDYF_name_value_is_empty(container)) - return NULL; - - do - { - if(strcmp(name, temp->name) == 0) - { - *num_values = temp->num_values; - return (const char * const *)temp->value; - } - - temp = temp->next; - } - while(NULL != temp); - - return NULL; -} - - -void -SPDY_name_value_destroy (struct SPDY_NameValue *container) -{ - unsigned int i; - struct SPDY_NameValue *temp = container; - - while(NULL != temp) - { - container = container->next; - free(temp->name); - for(i=0; inum_values; ++i) - free(temp->value[i]); - free(temp->value); - free(temp); - temp=container; - } -} - - -int -SPDY_name_value_iterate (struct SPDY_NameValue *container, - SPDY_NameValueIterator iterator, - void *iterator_cls) -{ - int count; - int ret; - struct SPDY_NameValue *temp = container; - - if(NULL == container) - return SPDY_INPUT_ERROR; - - //check if container is an empty struct - if(SPDYF_name_value_is_empty(container)) - return 0; - - count = 0; - - if(NULL == iterator) - { - do - { - ++count; - temp=temp->next; - } - while(NULL != temp); - - return count; - } - - //code duplication for avoiding if here - do - { - ++count; - ret = iterator(iterator_cls, temp->name, (const char * const *)temp->value, temp->num_values); - temp=temp->next; - } - while(NULL != temp && SPDY_YES == ret); - - return count; -} - -void -SPDY_destroy_response(struct SPDY_Response *response) -{ - if(NULL == response) - return; - free(response->data); - free(response->headers); - free(response); -} - - -struct SPDYF_Response_Queue * -SPDYF_response_queue_create(bool is_data, - void *data, - size_t data_size, - struct SPDY_Response *response, - struct SPDYF_Stream *stream, - bool closestream, - SPDYF_ResponseQueueResultCallback frqcb, - void *frqcb_cls, - SPDY_ResponseResultCallback rrcb, - void *rrcb_cls) -{ - struct SPDYF_Response_Queue *head = NULL; - struct SPDYF_Response_Queue *prev; - struct SPDYF_Response_Queue *response_to_queue; - struct SPDYF_Control_Frame *control_frame; - struct SPDYF_Data_Frame *data_frame; - unsigned int i; - bool is_last; - - SPDYF_ASSERT((! is_data) - || ((0 == data_size) && (NULL != response->rcb)) - || ((0 < data_size) && (NULL == response->rcb)), - "either data or request->rcb must not be null"); - - if (is_data && (data_size > SPDY_MAX_SUPPORTED_FRAME_SIZE)) - { - //separate the data in more frames and add them to the queue - - prev=NULL; - for(i = 0; i < data_size; i += SPDY_MAX_SUPPORTED_FRAME_SIZE) - { - is_last = (i + SPDY_MAX_SUPPORTED_FRAME_SIZE) >= data_size; - - if(NULL == (response_to_queue = malloc(sizeof(struct SPDYF_Response_Queue)))) - goto free_and_fail; - - memset(response_to_queue, 0, sizeof(struct SPDYF_Response_Queue)); - if(0 == i) - head = response_to_queue; - - if(NULL == (data_frame = malloc(sizeof(struct SPDYF_Data_Frame)))) - { - free(response_to_queue); - goto free_and_fail; - } - memset(data_frame, 0, sizeof(struct SPDYF_Data_Frame)); - data_frame->control_bit = 0; - data_frame->stream_id = stream->stream_id; - if(is_last && closestream) - data_frame->flags |= SPDY_DATA_FLAG_FIN; - - response_to_queue->data_frame = data_frame; - response_to_queue->process_response_handler = &SPDYF_handler_write_data; - response_to_queue->is_data = is_data; - response_to_queue->stream = stream; - if(is_last) - { - response_to_queue->frqcb = frqcb; - response_to_queue->frqcb_cls = frqcb_cls; - response_to_queue->rrcb = rrcb; - response_to_queue->rrcb_cls = rrcb_cls; - } - response_to_queue->data = data + i; - response_to_queue->data_size = is_last - ? (data_size - 1) % SPDY_MAX_SUPPORTED_FRAME_SIZE + 1 - : SPDY_MAX_SUPPORTED_FRAME_SIZE; - response_to_queue->response = response; - - response_to_queue->prev = prev; - if(NULL != prev) - prev->next = response_to_queue; - prev = response_to_queue; - } - - return head; - - //for GOTO - free_and_fail: - while(NULL != head) - { - response_to_queue = head; - head = head->next; - free(response_to_queue->data_frame); - free(response_to_queue); - } - return NULL; - } - - //create only one frame for data, data with callback or control frame - - if(NULL == (response_to_queue = malloc(sizeof(struct SPDYF_Response_Queue)))) - { - return NULL; - } - memset(response_to_queue, 0, sizeof(struct SPDYF_Response_Queue)); - - if(is_data) - { - if(NULL == (data_frame = malloc(sizeof(struct SPDYF_Data_Frame)))) - { - free(response_to_queue); - return NULL; - } - memset(data_frame, 0, sizeof(struct SPDYF_Data_Frame)); - data_frame->control_bit = 0; - data_frame->stream_id = stream->stream_id; - if(closestream && NULL == response->rcb) - data_frame->flags |= SPDY_DATA_FLAG_FIN; - - response_to_queue->data_frame = data_frame; - response_to_queue->process_response_handler = &SPDYF_handler_write_data; - } - else - { - if(NULL == (control_frame = malloc(sizeof(struct SPDYF_Control_Frame)))) - { - free(response_to_queue); - return NULL; - } - memset(control_frame, 0, sizeof(struct SPDYF_Control_Frame)); - control_frame->control_bit = 1; - control_frame->version = SPDY_VERSION; - control_frame->type = SPDY_CONTROL_FRAME_TYPES_SYN_REPLY; - if(closestream) - control_frame->flags |= SPDY_SYN_REPLY_FLAG_FIN; - - response_to_queue->control_frame = control_frame; - response_to_queue->process_response_handler = &SPDYF_handler_write_syn_reply; - } - - response_to_queue->is_data = is_data; - response_to_queue->stream = stream; - response_to_queue->frqcb = frqcb; - response_to_queue->frqcb_cls = frqcb_cls; - response_to_queue->rrcb = rrcb; - response_to_queue->rrcb_cls = rrcb_cls; - response_to_queue->data = data; - response_to_queue->data_size = data_size; - response_to_queue->response = response; - - return response_to_queue; -} - - -void -SPDYF_response_queue_destroy(struct SPDYF_Response_Queue *response_queue) -{ - //data is not copied to the struct but only linked - //but this is not valid for GOAWAY and RST_STREAM - if(!response_queue->is_data - && (SPDY_CONTROL_FRAME_TYPES_RST_STREAM == response_queue->control_frame->type - || SPDY_CONTROL_FRAME_TYPES_GOAWAY == response_queue->control_frame->type)) - { - free(response_queue->data); - } - if(response_queue->is_data) - free(response_queue->data_frame); - else - free(response_queue->control_frame); - - free(response_queue); -} - - -/* Needed by testcase to be extern -- should this be - in the header? */ -_MHD_EXTERN ssize_t -SPDYF_name_value_to_stream(struct SPDY_NameValue * container[], - int num_containers, - void **stream) -{ - size_t size; - int32_t num_pairs = 0; - int32_t value_size; - int32_t name_size; - int32_t temp; - unsigned int i; - unsigned int offset; - unsigned int value_offset; - struct SPDY_NameValue * iterator; - int j; - - size = 4; //for num pairs - - for(j=0; jname); //length + string - - SPDYF_ASSERT(iterator->num_values>0, "num_values is 0"); - - size += 4; //value length - - for(i=0; inum_values; ++i) - { - //if(NULL == iterator->value[i]) - // continue; - size += strlen(iterator->value[i]); // string - if(i/* || !strlen(iterator->value[i])*/) ++size; //NULL separator - } - - iterator = iterator->next; - } - } - - if(NULL == (*stream = malloc(size))) - { - return -1; - } - - //put num_pairs to the stream - num_pairs = htonl(num_pairs); - memcpy(*stream, &num_pairs, 4); - offset = 4; - - //put all other headers to the stream - for(j=0; jname); - temp = htonl(name_size); - memcpy(*stream + offset, &temp, 4); - offset += 4; - strncpy(*stream + offset, iterator->name, name_size); - offset += name_size; - - value_offset = offset; - offset += 4; - for(i=0; inum_values; ++i) - { - if(i /*|| !strlen(iterator->value[0])*/) - { - memset(*stream + offset, 0, 1); - ++offset; - //if(!i) continue; - } - //else if(NULL != iterator->value[i]) - //{ - strncpy(*stream + offset, iterator->value[i], strlen(iterator->value[i])); - offset += strlen(iterator->value[i]); - //} - } - value_size = offset - value_offset - 4; - value_size = htonl(value_size); - memcpy(*stream + value_offset, &value_size, 4); - - iterator = iterator->next; - } - } - - SPDYF_ASSERT(offset == size,"offset is wrong"); - - return size; -} - - -/* Needed by testcase to be extern -- should this be - in the header? */ -_MHD_EXTERN int -SPDYF_name_value_from_stream(void *stream, - size_t size, - struct SPDY_NameValue ** container) -{ - int32_t num_pairs; - int32_t value_size; - int32_t name_size; - int i; - unsigned int offset = 0; - unsigned int value_end_offset; - char *name; - char *value; - - if(NULL == (*container = SPDY_name_value_create ())) - { - return SPDY_NO; - } - - //get number of pairs - memcpy(&num_pairs, stream, 4); - offset = 4; - num_pairs = ntohl(num_pairs); - - if(num_pairs > 0) - { - for(i = 0; i < num_pairs; ++i) - { - //get name size - memcpy(&name_size, stream + offset, 4); - offset += 4; - name_size = ntohl(name_size); - //get name - if(NULL == (name = strndup(stream + offset, name_size))) - { - SPDY_name_value_destroy(*container); - return SPDY_NO; - } - offset+=name_size; - - //get value size - memcpy(&value_size, stream + offset, 4); - offset += 4; - value_size = ntohl(value_size); - value_end_offset = offset + value_size; - //get value - do - { - if(NULL == (value = strndup(stream + offset, value_size))) - { - free(name); - SPDY_name_value_destroy(*container); - return SPDY_NO; - } - offset += strlen(value); - if(offset < value_end_offset) - ++offset; //NULL separator - - //add name/value to the struct - if(SPDY_YES != SPDY_name_value_add(*container, name, value)) - { - free(name); - free(value); - SPDY_name_value_destroy(*container); - return SPDY_NO; - } - free(value); - } - while(offset < value_end_offset); - - free(name); - - if(offset != value_end_offset) - { - SPDY_name_value_destroy(*container); - return SPDY_INPUT_ERROR; - } - } - } - - if(offset == size) - return SPDY_YES; - - SPDY_name_value_destroy(*container); - return SPDY_INPUT_ERROR; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/structures.h b/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/structures.h deleted file mode 100644 index e1f8797a..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/microspdy/structures.h +++ /dev/null @@ -1,1246 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file structures.h - * @brief internal and public structures -- most of the structs used by - * the library are defined here - * @author Andrey Uzunov - */ - -#ifndef STRUCTURES_H -#define STRUCTURES_H - -#include "platform.h" -#include "microspdy.h" -#include "io.h" - - -/** - * All possible SPDY control frame types. The number is used in the header - * of the control frame. - */ -enum SPDY_CONTROL_FRAME_TYPES -{ - /** - * The SYN_STREAM control frame allows the sender to asynchronously - * create a stream between the endpoints. - */ - SPDY_CONTROL_FRAME_TYPES_SYN_STREAM = 1, - - /** - * SYN_REPLY indicates the acceptance of a stream creation by - * the recipient of a SYN_STREAM frame. - */ - SPDY_CONTROL_FRAME_TYPES_SYN_REPLY = 2, - - /** - * The RST_STREAM frame allows for abnormal termination of a stream. - * When sent by the creator of a stream, it indicates the creator - * wishes to cancel the stream. When sent by the recipient of a - * stream, it indicates an error or that the recipient did not want - * to accept the stream, so the stream should be closed. - */ - SPDY_CONTROL_FRAME_TYPES_RST_STREAM = 3, - - /** - * A SETTINGS frame contains a set of id/value pairs for - * communicating configuration data about how the two endpoints may - * communicate. SETTINGS frames can be sent at any time by either - * endpoint, are optionally sent, and are fully asynchronous. When - * the server is the sender, the sender can request that - * configuration data be persisted by the client across SPDY - * sessions and returned to the server in future communications. - */ - SPDY_CONTROL_FRAME_TYPES_SETTINGS = 4, - - /** - * The PING control frame is a mechanism for measuring a minimal - * round-trip time from the sender. It can be sent from the client - * or the server. Recipients of a PING frame should send an - * identical frame to the sender as soon as possible (if there is - * other pending data waiting to be sent, PING should take highest - * priority). Each ping sent by a sender should use a unique ID. - */ - SPDY_CONTROL_FRAME_TYPES_PING = 6, - - /** - * The GOAWAY control frame is a mechanism to tell the remote side - * of the connection to stop creating streams on this session. It - * can be sent from the client or the server. - */ - SPDY_CONTROL_FRAME_TYPES_GOAWAY = 7, - - /** - * The HEADERS frame augments a stream with additional headers. It - * may be optionally sent on an existing stream at any time. - * Specific application of the headers in this frame is - * application-dependent. The name/value header block within this - * frame is compressed. - */ - SPDY_CONTROL_FRAME_TYPES_HEADERS = 8, - - /** - * The WINDOW_UPDATE control frame is used to implement per stream - * flow control in SPDY. Flow control in SPDY is per hop, that is, - * only between the two endpoints of a SPDY connection. If there are - * one or more intermediaries between the client and the origin - * server, flow control signals are not explicitly forwarded by the - * intermediaries. - */ - SPDY_CONTROL_FRAME_TYPES_WINDOW_UPDATE = 9, - - /** - * The CREDENTIAL control frame is used by the client to send - * additional client certificates to the server. A SPDY client may - * decide to send requests for resources from different origins on - * the same SPDY session if it decides that that server handles both - * origins. For example if the IP address associated with both - * hostnames matches and the SSL server certificate presented in the - * initial handshake is valid for both hostnames. However, because - * the SSL connection can contain at most one client certificate, - * the client needs a mechanism to send additional client - * certificates to the server. - */ - SPDY_CONTROL_FRAME_TYPES_CREDENTIAL = 11 -}; - - -/** - * SPDY_SESSION_STATUS is used to show the current receiving state - * of each session, i.e. what is expected to come now, and how it should - * be handled. - */ -enum SPDY_SESSION_STATUS -{ - /** - * The session is in closing state, do not read read anything from - * it. Do not write anything to it. - */ - SPDY_SESSION_STATUS_CLOSING = 0, - - /** - * Wait for new SPDY frame to come. - */ - SPDY_SESSION_STATUS_WAIT_FOR_HEADER = 1, - - /** - * The standard 8 byte header of the SPDY frame was received and - * handled. Wait for the specific (sub)headers according to the - * frame type. - */ - SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER = 2, - - /** - * The specific (sub)headers were received and handled. Wait for the - * "body", i.e. wait for the name/value pairs compressed by zlib. - */ - SPDY_SESSION_STATUS_WAIT_FOR_BODY = 3, - - /** - * Ignore all the bytes read from the socket, e.g. larger frames. - */ - SPDY_SESSION_STATUS_IGNORE_BYTES= 4, - - /** - * The session is in pre-closing state, do not read read anything - * from it. In this state the output queue will be written to the - * socket. - */ - SPDY_SESSION_STATUS_FLUSHING = 5, -}; - - -/** - * Specific flags for the SYN_STREAM control frame. - */ -enum SPDY_SYN_STREAM_FLAG -{ - /** - * The sender won't send any more frames on this stream. - */ - SPDY_SYN_STREAM_FLAG_FIN = 1, - - /** - * The sender creates this stream as unidirectional. - */ - SPDY_SYN_STREAM_FLAG_UNIDIRECTIONAL = 2 -}; - - -/** - * Specific flags for the SYN_REPLY control frame. - */ -enum SPDY_SYN_REPLY_FLAG -{ - /** - * The sender won't send any more frames on this stream. - */ - SPDY_SYN_REPLY_FLAG_FIN = 1 -}; - - -/** - * Specific flags for the data frame. - */ -enum SPDY_DATA_FLAG -{ - /** - * The sender won't send any more frames on this stream. - */ - SPDY_DATA_FLAG_FIN = 1, - - /** - * The data in the frame is compressed. - * This flag appears only in the draft on ietf.org but not on - * chromium.org. - */ - SPDY_DATA_FLAG_COMPRESS = 2 -}; - -/** - * Status code within RST_STREAM control frame. - */ -enum SPDY_RST_STREAM_STATUS -{ - /** - * This is a generic error, and should only be used if a more - * specific error is not available. - */ - SPDY_RST_STREAM_STATUS_PROTOCOL_ERROR = 1, - - /** - * This is returned when a frame is received for a stream which is - * not active. - */ - SPDY_RST_STREAM_STATUS_INVALID_STREAM = 2, - - /** - * Indicates that the stream was refused before any processing has - * been done on the stream. - */ - SPDY_RST_STREAM_STATUS_REFUSED_STREAM = 3, - - /** - * Indicates that the recipient of a stream does not support the - * SPDY version requested. - */ - SPDY_RST_STREAM_STATUS_UNSUPPORTED_VERSION = 4, - - /** - * Used by the creator of a stream to indicate that the stream is - * no longer needed. - */ - SPDY_RST_STREAM_STATUS_CANCEL = 5, - - /** - * This is a generic error which can be used when the implementation - * has internally failed, not due to anything in the protocol. - */ - SPDY_RST_STREAM_STATUS_INTERNAL_ERROR = 6, - - /** - * The endpoint detected that its peer violated the flow control - * protocol. - */ - SPDY_RST_STREAM_STATUS_FLOW_CONTROL_ERROR = 7, - - /** - * The endpoint received a SYN_REPLY for a stream already open. - */ - SPDY_RST_STREAM_STATUS_STREAM_IN_USE = 8, - - /** - * The endpoint received a data or SYN_REPLY frame for a stream - * which is half closed. - */ - SPDY_RST_STREAM_STATUS_STREAM_ALREADY_CLOSED = 9, - - /** - * The server received a request for a resource whose origin does - * not have valid credentials in the client certificate vector. - */ - SPDY_RST_STREAM_STATUS_INVALID_CREDENTIALS = 10, - - /** - * The endpoint received a frame which this implementation could not - * support. If FRAME_TOO_LARGE is sent for a SYN_STREAM, HEADERS, - * or SYN_REPLY frame without fully processing the compressed - * portion of those frames, then the compression state will be - * out-of-sync with the other endpoint. In this case, senders of - * FRAME_TOO_LARGE MUST close the session. - */ - SPDY_RST_STREAM_STATUS_FRAME_TOO_LARGE = 11 -}; - - -/** - * Status code within GOAWAY control frame. - */ -enum SPDY_GOAWAY_STATUS -{ - /** - * This is a normal session teardown. - */ - SPDY_GOAWAY_STATUS_OK = 0, - - /** - * This is a generic error, and should only be used if a more - * specific error is not available. - */ - SPDY_GOAWAY_STATUS_PROTOCOL_ERROR = 1, - - /** - * This is a generic error which can be used when the implementation - * has internally failed, not due to anything in the protocol. - */ - SPDY_GOAWAY_STATUS_INTERNAL_ERROR = 11 -}; - - -struct SPDYF_Stream; - -struct SPDYF_Response_Queue; - - -/** - * Callback for received new data chunk. - * - * @param cls client-defined closure - * @param stream handler - * @param buf data chunk from the data - * @param size the size of the data chunk 'buf' in bytes - * @param more false if this is the last frame received on this stream. Note: - * true does not mean that more data will come, exceptional - * situation is possible - * @return SPDY_YES to continue calling the function, - * SPDY_NO to stop calling the function for this stream - */ -typedef int -(*SPDYF_NewDataCallback) (void * cls, - struct SPDYF_Stream *stream, - const void * buf, - size_t size, - bool more); - - -/** - * Callback for new stream. To be used in the application layer of the - * lib. - * - * @param cls - * @param stream the new stream - * @return SPDY_YES on success, - * SPDY_NO if error occurs - */ -typedef int -(*SPDYF_NewStreamCallback) (void *cls, - struct SPDYF_Stream * stream); - - -/** - * Callback to be called when the response queue object was handled and - * the data was already sent. - * - * @param cls - * @param response_queue the SPDYF_Response_Queue structure which will - * be cleaned very soon - * @param status shows if actually the response was sent or it was - * discarded by the lib for any reason (e.g., closing session, - * closing stream, stopping daemon, etc.). It is possible that - * status indicates an error but part of the response (in one - * or several frames) was sent to the client. - */ -typedef void -(*SPDYF_ResponseQueueResultCallback) (void * cls, - struct SPDYF_Response_Queue *response_queue, - enum SPDY_RESPONSE_RESULT status); - - -/** - * Representation of the control frame's headers, which are common for - * all types. - */ -struct __attribute__((__packed__)) SPDYF_Control_Frame -{ - uint16_t version : 15; - uint16_t control_bit : 1; /* always 1 for control frames */ - uint16_t type; - uint32_t flags : 8; - uint32_t length : 24; -}; - - -/** - * Representation of the data frame's headers. - */ -struct __attribute__((__packed__)) SPDYF_Data_Frame -{ - uint32_t stream_id : 31; - uint32_t control_bit : 1; /* always 0 for data frames */ - uint32_t flags : 8; - uint32_t length : 24; -}; - - -/** - * Queue of the responses, to be handled (e.g. compressed) and sent later. - */ -struct SPDYF_Response_Queue -{ - /** - * This is a doubly-linked list. - */ - struct SPDYF_Response_Queue *next; - - /** - * This is a doubly-linked list. - */ - struct SPDYF_Response_Queue *prev; - - /** - * Stream (Request) for which is the response. - */ - struct SPDYF_Stream *stream; - - /** - * Response structure with all the data (uncompressed headers) to be sent. - */ - struct SPDY_Response *response; - - /** - * Control frame. The length field should be set after compressing - * the headers! - */ - struct SPDYF_Control_Frame *control_frame; - - /** - * Data frame. The length field should be set after compressing - * the body! - */ - struct SPDYF_Data_Frame *data_frame; - - /** - * Data to be sent: name/value pairs in control frames or body in data frames. - */ - void *data; - - /** - * Specific handler for different frame types. - */ - int (* process_response_handler)(struct SPDY_Session *session); - - /** - * Callback to be called when the last bytes from the response was sent - * to the client. - */ - SPDYF_ResponseQueueResultCallback frqcb; - - /** - * Closure for frqcb. - */ - void *frqcb_cls; - - /** - * Callback to be used by the application layer. - */ - SPDY_ResponseResultCallback rrcb; - - /** - * Closure for rcb. - */ - void *rrcb_cls; - - /** - * Data size. - */ - size_t data_size; - - /** - * True if data frame should be sent. False if control frame should - * be sent. - */ - bool is_data; -}; - - - -/** - * Collection of HTTP headers used in requests and responses. - */ -struct SPDY_NameValue -{ - /** - * This is a doubly-linked list. - */ - struct SPDY_NameValue *next; - - /** - * This is a doubly-linked list. - */ - struct SPDY_NameValue *prev; - - /** - * Null terminated string for name. - */ - char *name; - - /** - * Array of Null terminated strings for value. num_values is the - * length of the array. - */ - char **value; - - /** - * Number of values, this is >= 0. - */ - unsigned int num_values; -}; - - -/** - * Represents a SPDY stream - */ -struct SPDYF_Stream -{ - /** - * This is a doubly-linked list. - */ - struct SPDYF_Stream *next; - - /** - * This is a doubly-linked list. - */ - struct SPDYF_Stream *prev; - - /** - * Reference to the SPDY_Session struct. - */ - struct SPDY_Session *session; - - /** - * Name value pairs, sent within the frame which created the stream. - */ - struct SPDY_NameValue *headers; - - /** - * Any object to be used by the application layer. - */ - void *cls; - - /** - * This stream's ID. - */ - uint32_t stream_id; - - /** - * Stream to which this one is associated. - */ - uint32_t assoc_stream_id; - - /** - * The window of the data within data frames. - */ - uint32_t window_size; - - /** - * Stream priority. 0 is the highest, 7 is the lowest. - */ - uint8_t priority; - - /** - * Integer specifying the index in the server's CREDENTIAL vector of - * the client certificate to be used for this request The value 0 - * means no client certificate should be associated with this stream. - */ - uint8_t slot; - - /** - * If initially the stream was created as unidirectional. - */ - bool flag_unidirectional; - - /** - * If the stream won't be used for receiving frames anymore. The - * client has sent FLAG_FIN or the stream was terminated with - * RST_STREAM. - */ - bool is_in_closed; - - /** - * If the stream won't be used for sending out frames anymore. The - * server has sent FLAG_FIN or the stream was terminated with - * RST_STREAM. - */ - bool is_out_closed; - - /** - * Which entity (server/client) has created the stream. - */ - bool is_server_initiator; -}; - - -/** - * Represents a SPDY session which is just a TCP connection - */ -struct SPDY_Session -{ - /** - * zlib stream for decompressing all the name/pair values from the - * received frames. All the received compressed data must be - * decompressed within one context: this stream. Thus, it should be - * unique for the session and initialized at its creation. - */ - z_stream zlib_recv_stream; - - /** - * zlib stream for compressing all the name/pair values from the - * frames to be sent. All the sent compressed data must be - * compressed within one context: this stream. Thus, it should be - * unique for the session and initialized at its creation. - */ - z_stream zlib_send_stream; - - /** - * This is a doubly-linked list. - */ - struct SPDY_Session *next; - - /** - * This is a doubly-linked list. - */ - struct SPDY_Session *prev; - - /** - * Reference to the SPDY_Daemon struct. - */ - struct SPDY_Daemon *daemon; - - /** - * Foreign address (of length addr_len). - */ - struct sockaddr *addr; - - /** - * Head of doubly-linked list of the SPDY streams belonging to the - * session. - */ - struct SPDYF_Stream *streams_head; - - /** - * Tail of doubly-linked list of the streams. - */ - struct SPDYF_Stream *streams_tail; - - /** - * Unique IO context for the session. Initialized on each creation - * (actually when the TCP connection is established). - */ - void *io_context; - - /** - * Head of doubly-linked list of the responses. - */ - struct SPDYF_Response_Queue *response_queue_head; - - /** - * Tail of doubly-linked list of the responses. - */ - struct SPDYF_Response_Queue *response_queue_tail; - - /** - * Buffer for reading requests. - */ - void *read_buffer; - - /** - * Buffer for writing responses. - */ - void *write_buffer; - - /** - * Specific handler for the frame that is currently being received. - */ - void (*frame_handler) (struct SPDY_Session * session); - - /** - * Closure for frame_handler. - */ - void *frame_handler_cls; - - /** - * Extra field to be used by the user with set/get func for whatever - * purpose he wants. - */ - void *user_cls; - - /** - * Function to initialize the IO context for a new session. - */ - SPDYF_IONewSession fio_new_session; - - /** - * Function to deinitialize the IO context for a session. - */ - SPDYF_IOCloseSession fio_close_session; - - /** - * Function to read data from socket. - */ - SPDYF_IORecv fio_recv; - - /** - * Function to write data to socket. - */ - SPDYF_IOSend fio_send; - - /** - * Function to check for pending data in IO buffers. - */ - SPDYF_IOIsPending fio_is_pending; - - /** - * Function to call before writing set of frames. - */ - SPDYF_IOBeforeWrite fio_before_write; - - /** - * Function to call after writing set of frames. - */ - SPDYF_IOAfterWrite fio_after_write; - - /** - * Number of bytes that the lib must ignore immediately after they - * are read from the TLS socket without adding them to the read buf. - * This is needed, for instance, when receiving frame bigger than - * the buffer to avoid deadlock situations. - */ - size_t read_ignore_bytes; - - /** - * Size of read_buffer (in bytes). This value indicates - * how many bytes we're willing to read into the buffer; - * the real buffer is one byte longer to allow for - * adding zero-termination (when needed). - */ - size_t read_buffer_size; - - /** - * Position where we currently append data in - * read_buffer (last valid position). - */ - size_t read_buffer_offset; - - /** - * Position until where everything was already read - */ - size_t read_buffer_beginning; - - /** - * Size of write_buffer (in bytes). This value indicates - * how many bytes we're willing to prepare for writing. - */ - size_t write_buffer_size; - - /** - * Position where we currently append data in - * write_buffer (last valid position). - */ - size_t write_buffer_offset; - - /** - * Position until where everything was already written to the socket - */ - size_t write_buffer_beginning; - - /** - * Last time this connection had any activity - * (reading or writing). In milliseconds. - */ - unsigned long long last_activity; - - /** - * Socket for this connection. Set to -1 if - * this connection has died (daemon should clean - * up in that case). - */ - int socket_fd; - - /** - * Length of the foreign address. - */ - socklen_t addr_len; - - /** - * The biggest stream ID for this session for streams initiated - * by the client. - */ - uint32_t last_in_stream_id; - - /** - * The biggest stream ID for this session for streams initiated - * by the server. - */ - uint32_t last_out_stream_id; - - /** - * This value is updated whenever SYN_REPLY or RST_STREAM are sent - * and is used later in GOAWAY frame. - * TODO it is not clear in the draft what happens when streams are - * not answered in the order of their IDs. Moreover, why should we - * send GOAWAY with the ID of received bogus SYN_STREAM with huge ID? - */ - uint32_t last_replied_to_stream_id; - - /** - * Shows the stream id of the currently handled frame. This value is - * to be used when sending RST_STREAM in answer to a problematic - * frame, e.g. larger than supported. - */ - uint32_t current_stream_id; - - /** - * Maximum number of frames to be written to the socket at once. The - * library tries to send max_num_frames in a single call to SPDY_run - * for a single session. This means no requests can be received nor - * other sessions can send data as long the current one has enough - * frames to send and there is no error on writing. - */ - uint32_t max_num_frames; - - /** - * Shows the current receiving state the session, i.e. what is - * expected to come now, and how it shold be handled. - */ - enum SPDY_SESSION_STATUS status; - - /** - * Has this socket been closed for reading (i.e. - * other side closed the connection)? If so, - * we must completely close the connection once - * we are done sending our response (and stop - * trying to read from this socket). - */ - bool read_closed; - - /** - * If the server sends GOAWAY, it must ignore all SYN_STREAMS for - * this session. Normally the server will soon close the TCP session. - */ - bool is_goaway_sent; - - /** - * If the server receives GOAWAY, it must not send new SYN_STREAMS - * on this session. Normally the client will soon close the TCP - * session. - */ - bool is_goaway_received; -}; - - -/** - * State and settings kept for each SPDY daemon. - */ -struct SPDY_Daemon -{ - - /** - * Tail of doubly-linked list of our current, active sessions. - */ - struct SPDY_Session *sessions_head; - - /** - * Tail of doubly-linked list of our current, active sessions. - */ - struct SPDY_Session *sessions_tail; - - /** - * Tail of doubly-linked list of connections to clean up. - */ - struct SPDY_Session *cleanup_head; - - /** - * Tail of doubly-linked list of connections to clean up. - */ - struct SPDY_Session *cleanup_tail; - - /** - * Unique IO context for the daemon. Initialized on daemon start. - */ - void *io_context; - - /** - * Certificate file of the server. File path is kept here. - */ - char *certfile; - - /** - * Key file for the certificate of the server. File path is - * kept here. - */ - char *keyfile; - - - /** - * The address to which the listening socket is bound. - */ - struct sockaddr *address; - - /** - * Callback called when a new SPDY session is - * established by a client - */ - SPDY_NewSessionCallback new_session_cb; - - /** - * Callback called when a client closes the session - */ - SPDY_SessionClosedCallback session_closed_cb; - - /** - * Callback called when a client sends request - */ - SPDY_NewRequestCallback new_request_cb; - - /** - * Callback called when HTTP POST params are received - * after request. To be used by the application layer - */ - SPDY_NewDataCallback received_data_cb; - - /** - * Callback called when DATA frame is received. - */ - SPDYF_NewDataCallback freceived_data_cb; - - /** - * Closure argument for all the callbacks that can be used by the client. - */ - void *cls; - - /** - * Callback called when new stream is created. - */ - SPDYF_NewStreamCallback fnew_stream_cb; - - /** - * Closure argument for all the callbacks defined in the framing layer. - */ - void *fcls; - - /** - * Function to initialize the IO context for the daemon. - */ - SPDYF_IOInit fio_init; - - /** - * Function to deinitialize the IO context for the daemon. - */ - SPDYF_IODeinit fio_deinit; - - /** - * After how many milliseconds of inactivity should - * connections time out? Zero for no timeout. - */ - unsigned long long session_timeout; - - /** - * Listen socket. - */ - int socket_fd; - - /** - * This value is inherited by all sessions of the daemon. - * Maximum number of frames to be written to the socket at once. The - * library tries to send max_num_frames in a single call to SPDY_run - * for a single session. This means no requests can be received nor - * other sessions can send data as long the current one has enough - * frames to send and there is no error on writing. - */ - uint32_t max_num_frames; - - /** - * Daemon's options. - */ - enum SPDY_DAEMON_OPTION options; - - /** - * Daemon's flags. - */ - enum SPDY_DAEMON_FLAG flags; - - /** - * IO subsystem type used by daemon and all its sessions. - */ - enum SPDY_IO_SUBSYSTEM io_subsystem; - - /** - * Listen port. - */ - uint16_t port; -}; - - -/** - * Represents a SPDY response. - */ -struct SPDY_Response -{ - /** - * Raw uncompressed stream of the name/value pairs in SPDY frame - * used for the HTTP headers. - */ - void *headers; - - /** - * Raw stream of the data to be sent. Equivalent to the body in HTTP - * response. - */ - void *data; - - /** - * Callback function to be used when the response data is provided - * with callbacks. In this case data must be NULL and data_size must - * be 0. - */ - SPDY_ResponseCallback rcb; - - /** - * Extra argument to rcb. - */ - void *rcb_cls; - - /** - * Length of headers. - */ - size_t headers_size; - - /** - * Length of data. - */ - size_t data_size; - - /** - * The callback func will be called to get that amount of bytes to - * put them into a DATA frame. It is either user preffered or - * the maximum supported by the lib value. - */ - uint32_t rcb_block_size; -}; - - -/* Macros for handling data and structures */ - - -/** - * Insert an element at the head of a DLL. Assumes that head, tail and - * element are structs with prev and next fields. - * - * @param head pointer to the head of the DLL (struct ? *) - * @param tail pointer to the tail of the DLL (struct ? *) - * @param element element to insert (struct ? *) - */ -#define DLL_insert(head,tail,element) do { \ - (element)->next = (head); \ - (element)->prev = NULL; \ - if ((tail) == NULL) \ - (tail) = element; \ - else \ - (head)->prev = element; \ - (head) = (element); } while (0) - - -/** - * Remove an element from a DLL. Assumes - * that head, tail and element are structs - * with prev and next fields. - * - * @param head pointer to the head of the DLL (struct ? *) - * @param tail pointer to the tail of the DLL (struct ? *) - * @param element element to remove (struct ? *) - */ -#define DLL_remove(head,tail,element) do { \ - if ((element)->prev == NULL) \ - (head) = (element)->next; \ - else \ - (element)->prev->next = (element)->next; \ - if ((element)->next == NULL) \ - (tail) = (element)->prev; \ - else \ - (element)->next->prev = (element)->prev; \ - (element)->next = NULL; \ - (element)->prev = NULL; } while (0) - - -/** - * Convert all integers in a SPDY control frame headers structure from - * host byte order to network byte order. - * - * @param frame input and output structure (struct SPDY_Control_Frame *) - */ -#if HAVE_BIG_ENDIAN -#define SPDYF_CONTROL_FRAME_HTON(frame) -#else -#define SPDYF_CONTROL_FRAME_HTON(frame) do { \ - (*((uint16_t *) frame )) = (*((uint8_t *) (frame) +1 )) | ((*((uint8_t *) frame ))<<8);\ - (frame)->type = htons((frame)->type); \ - (frame)->length = HTON24((frame)->length); \ - } while (0) -#endif - - -/** - * Convert all integers in a SPDY control frame headers structure from - * network byte order to host byte order. - * - * @param frame input and output structure (struct SPDY_Control_Frame *) - */ -#if HAVE_BIG_ENDIAN -#define SPDYF_CONTROL_FRAME_NTOH(frame) -#else -#define SPDYF_CONTROL_FRAME_NTOH(frame) do { \ - (*((uint16_t *) frame )) = (*((uint8_t *) (frame) +1 )) | ((*((uint8_t *) frame ))<<8);\ - (frame)->type = ntohs((frame)->type); \ - (frame)->length = NTOH24((frame)->length); \ - } while (0) -#endif - - -/** - * Convert all integers in a SPDY data frame headers structure from - * host byte order to network byte order. - * - * @param frame input and output structure (struct SPDY_Data_Frame *) - */ -#if HAVE_BIG_ENDIAN -#define SPDYF_DATA_FRAME_HTON(frame) -#else -#define SPDYF_DATA_FRAME_HTON(frame) do { \ - *((uint32_t *) frame ) = htonl(*((uint32_t *) frame ));\ - (frame)->length = HTON24((frame)->length); \ - } while (0) -#endif - - -/** - * Convert all integers in a SPDY data frame headers structure from - * network byte order to host byte order. - * - * @param frame input and output structure (struct SPDY_Data_Frame *) - */ -#if HAVE_BIG_ENDIAN -#define SPDYF_DATA_FRAME_NTOH(frame) -#else -#define SPDYF_DATA_FRAME_NTOH(frame) do { \ - *((uint32_t *) frame ) = ntohl(*((uint32_t *) frame ));\ - (frame)->length = NTOH24((frame)->length); \ - } while (0) -#endif - - -/** - * Creates one or more new SPDYF_Response_Queue object to be put on the - * response queue. - * - * @param is_data whether new data frame or new control frame will be - * crerated - * @param data the row stream which will be used as the body of the frame - * @param data_size length of data - * @param response object, part of which is the frame - * @param stream on which data is to be sent - * @param closestream TRUE if the frame must close the stream (with flag) - * @param frqcb callback to notify application layer when the frame - * has been sent or discarded - * @param frqcb_cls closure for frqcb - * @param rrcb callback used by the application layer to notify the - * application when the frame has been sent or discarded. - * frqcb will call it - * @param rrcb_cls closure for rrcb - * @return double linked list of SPDYF_Response_Queue structures: one or - * more frames are returned based on the size of the data - */ -struct SPDYF_Response_Queue * -SPDYF_response_queue_create(bool is_data, - void *data, - size_t data_size, - struct SPDY_Response *response, - struct SPDYF_Stream *stream, - bool closestream, - SPDYF_ResponseQueueResultCallback frqcb, - void *frqcb_cls, - SPDY_ResponseResultCallback rrcb, - void *rrcb_cls); - - -/** - * Destroys SPDYF_Response_Queue structure and whatever is in it. - * - * @param response_queue to destroy - */ -void -SPDYF_response_queue_destroy(struct SPDYF_Response_Queue *response_queue); - - -/** - * Checks if the container is empty, i.e. created but no values were - * added to it. - * - * @param container - * @return SPDY_YES if empty - * SPDY_NO if not - */ -int -SPDYF_name_value_is_empty(struct SPDY_NameValue *container); - - -/** - * Transforms raw binary decomressed stream of headers - * into SPDY_NameValue, containing all of the headers and values. - * - * @param stream that is to be transformed - * @param size length of the stream - * @param container will contain the newly created SPDY_NameValue - * container. Should point to NULL. - * @return SPDY_YES on success - * SPDY_NO on memory error - * SPDY_INPUT_ERROR if the provided stream is not valid - */ -int -SPDYF_name_value_from_stream(void *stream, - size_t size, - struct SPDY_NameValue ** container); - - -/** - * Transforms array of objects of name/values tuples, containing HTTP - * headers, into raw binary stream. The resulting stream is ready to - * be compressed and sent. - * - * @param container one or more SPDY_NameValue objects. Each object - * contains multiple number of name/value tuples. - * @param num_containers length of the array - * @param stream will contain the resulting stream. Should point to NULL. - * @return length of stream or value less than 0 indicating error - */ -ssize_t -SPDYF_name_value_to_stream(struct SPDY_NameValue * container[], - int num_containers, - void **stream); - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/platform/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/src/platform/Makefile.am deleted file mode 100644 index 448efae3..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/platform/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# This Makefile.am is in the public domain -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include - -AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) - -if USE_COVERAGE - AM_CFLAGS += --coverage -endif - -if HAVE_W32 -noinst_LTLIBRARIES = \ - libplatform_interface.la -libplatform_interface_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DBUILDING_MHD_LIB=1 -libplatform_interface_la_SOURCES = \ - w32functions.c -endif - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/platform/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/src/platform/Makefile.in deleted file mode 100644 index 31c85e88..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/platform/Makefile.in +++ /dev/null @@ -1,658 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@USE_COVERAGE_TRUE@am__append_1 = --coverage -subdir = src/platform -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libplatform_interface_la_LIBADD = -am__libplatform_interface_la_SOURCES_DIST = w32functions.c -@HAVE_W32_TRUE@am_libplatform_interface_la_OBJECTS = \ -@HAVE_W32_TRUE@ libplatform_interface_la-w32functions.lo -libplatform_interface_la_OBJECTS = \ - $(am_libplatform_interface_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -@HAVE_W32_TRUE@am_libplatform_interface_la_rpath = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libplatform_interface_la_SOURCES) -DIST_SOURCES = $(am__libplatform_interface_la_SOURCES_DIST) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include - -AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) $(am__append_1) -@HAVE_W32_TRUE@noinst_LTLIBRARIES = \ -@HAVE_W32_TRUE@ libplatform_interface.la - -@HAVE_W32_TRUE@libplatform_interface_la_CPPFLAGS = \ -@HAVE_W32_TRUE@ $(AM_CPPFLAGS) \ -@HAVE_W32_TRUE@ -DBUILDING_MHD_LIB=1 - -@HAVE_W32_TRUE@libplatform_interface_la_SOURCES = \ -@HAVE_W32_TRUE@ w32functions.c - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/platform/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/platform/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libplatform_interface.la: $(libplatform_interface_la_OBJECTS) $(libplatform_interface_la_DEPENDENCIES) $(EXTRA_libplatform_interface_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(am_libplatform_interface_la_rpath) $(libplatform_interface_la_OBJECTS) $(libplatform_interface_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libplatform_interface_la-w32functions.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -libplatform_interface_la-w32functions.lo: w32functions.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libplatform_interface_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libplatform_interface_la-w32functions.lo -MD -MP -MF $(DEPDIR)/libplatform_interface_la-w32functions.Tpo -c -o libplatform_interface_la-w32functions.lo `test -f 'w32functions.c' || echo '$(srcdir)/'`w32functions.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libplatform_interface_la-w32functions.Tpo $(DEPDIR)/libplatform_interface_la-w32functions.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='w32functions.c' object='libplatform_interface_la-w32functions.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libplatform_interface_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libplatform_interface_la-w32functions.lo `test -f 'w32functions.c' || echo '$(srcdir)/'`w32functions.c - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/platform/w32functions.c b/src/hos_libhttpserver/src/libmicrohttpd/src/platform/w32functions.c deleted file mode 100644 index bc42fef4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/platform/w32functions.c +++ /dev/null @@ -1,704 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2014 Karlson2k (Evgeny Grin) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. - If not, see . -*/ - -/** - * @file platform/w32functions.h - * @brief internal functions for W32 systems - * @author Karlson2k (Evgeny Grin) - */ - -#include "w32functions.h" -#include -#include -#include -#include -#include -#include -#include - - -/** - * Return errno equivalent of last winsock error - * @return errno equivalent of last winsock error - */ -int MHD_W32_errno_from_winsock_(void) -{ - switch(WSAGetLastError()) - { - case 0: return 0; - case WSA_INVALID_HANDLE: return EBADF; - case WSA_NOT_ENOUGH_MEMORY: return ENOMEM; - case WSA_INVALID_PARAMETER: return EINVAL; - case WSAEINTR: return EINTR; - case WSAEWOULDBLOCK: return EWOULDBLOCK; - case WSAEINPROGRESS: return EINPROGRESS; - case WSAEALREADY: return EALREADY; - case WSAENOTSOCK: return ENOTSOCK; - case WSAEDESTADDRREQ: return EDESTADDRREQ; - case WSAEMSGSIZE: return EMSGSIZE; - case WSAEPROTOTYPE: return EPROTOTYPE; - case WSAENOPROTOOPT: return ENOPROTOOPT; - case WSAEPROTONOSUPPORT: return EPROTONOSUPPORT; - case WSAESOCKTNOSUPPORT: return ESOCKTNOSUPPORT; - case WSAEOPNOTSUPP: return EOPNOTSUPP; - case WSAEPFNOSUPPORT: return EPFNOSUPPORT; - case WSAEAFNOSUPPORT: return EAFNOSUPPORT; - case WSAEADDRINUSE: return EADDRINUSE; - case WSAEADDRNOTAVAIL: return EADDRNOTAVAIL; - case WSAENETDOWN: return ENETDOWN; - case WSAENETUNREACH: return ENETUNREACH; - case WSAENETRESET: return ENETRESET; - case WSAECONNABORTED: return ECONNABORTED; - case WSAECONNRESET: return ECONNRESET; - case WSAENOBUFS: return ENOBUFS; - case WSAEISCONN: return EISCONN; - case WSAENOTCONN: return ENOTCONN; - case WSAESHUTDOWN: return ESHUTDOWN; - case WSAETOOMANYREFS: return ETOOMANYREFS; - case WSAETIMEDOUT: return ETIMEDOUT; - case WSAECONNREFUSED: return ECONNREFUSED; - case WSAELOOP: return ELOOP; - case WSAENAMETOOLONG: return ENAMETOOLONG; - case WSAEHOSTDOWN: return EHOSTDOWN; - case WSAEHOSTUNREACH: return EHOSTUNREACH; - case WSAENOTEMPTY: return ENOTEMPTY; - case WSAEPROCLIM: return EPROCLIM; - case WSAEUSERS: return EUSERS; - case WSAEDQUOT: return EDQUOT; - case WSAESTALE: return ESTALE; - case WSAEREMOTE: return EREMOTE; - case WSAEINVAL: return EINVAL; - case WSAEFAULT: return EFAULT; - case WSANO_DATA: return ENODATA; - /* Rough equivalents */ - case WSAEDISCON: return ECONNRESET; - case WSAEINVALIDPROCTABLE: return EFAULT; - case WSASYSNOTREADY: - case WSANOTINITIALISED: - case WSASYSCALLFAILURE: return ENOBUFS; - case WSAVERNOTSUPPORTED: return EOPNOTSUPP; - case WSAEREFUSED: return EIO; - } - return EINVAL; -} - -/** - * Return pointer to string description of errnum error - * Works fine with both standard errno errnums - * and errnums from MHD_W32_errno_from_winsock_ - * @param errnum the errno or value from MHD_W32_errno_from_winsock_() - * @return pointer to string description of error - */ -const char* MHD_W32_strerror_(int errnum) -{ - switch(errnum) - { - case 0: - return "No error"; - case EWOULDBLOCK: - return "Operation would block"; - case EINPROGRESS: - return "Connection already in progress"; - case EALREADY: - return "Socket already connected"; - case ENOTSOCK: - return "Socket operation on non-socket"; - case EDESTADDRREQ: - return "Destination address required"; - case EMSGSIZE: - return "Message too long"; - case EPROTOTYPE: - return "Protocol wrong type for socket"; - case ENOPROTOOPT: - return "Protocol not available"; - case EPROTONOSUPPORT: - return "Unknown protocol"; - case ESOCKTNOSUPPORT: - return "Socket type not supported"; - case EOPNOTSUPP: - return "Operation not supported on socket"; - case EPFNOSUPPORT: - return "Protocol family not supported"; - case EAFNOSUPPORT: - return "Address family not supported by protocol family"; - case EADDRINUSE: - return "Address already in use"; - case EADDRNOTAVAIL: - return "Cannot assign requested address"; - case ENETDOWN: - return "Network is down"; - case ENETUNREACH: - return "Network is unreachable"; - case ENETRESET: - return "Network dropped connection on reset"; - case ECONNABORTED: - return "Software caused connection abort"; - case ECONNRESET: - return "Connection reset by peer"; - case ENOBUFS: - return "No system resources available"; - case EISCONN: - return "Socket is already connected"; - case ENOTCONN: - return "Socket is not connected"; - case ESHUTDOWN: - return "Can't send after socket shutdown"; - case ETOOMANYREFS: - return "Too many references: cannot splice"; - case ETIMEDOUT: - return "Connection timed out"; - case ECONNREFUSED: - return "Connection refused"; - case ELOOP: - return "Cannot translate name"; - case EHOSTDOWN: - return "Host is down"; - case EHOSTUNREACH: - return "Host is unreachable"; - case EPROCLIM: - return "Too many processes"; - case EUSERS: - return "Too many users"; - case EDQUOT: - return "Disk quota exceeded"; - case ESTALE: - return "Stale file handle reference"; - case EREMOTE: - return "Resource is remote"; - case ENODATA: - return "No data available"; - } - return strerror(errnum); -} - -/** - * Return pointer to string description of last winsock error - * @return pointer to string description of last winsock error - */ -const char* MHD_W32_strerror_last_winsock_(void) -{ - switch (WSAGetLastError()) - { - case 0: - return "No error"; - case WSA_INVALID_HANDLE: - return "Specified event object handle is invalid"; - case WSA_NOT_ENOUGH_MEMORY: - return "Insufficient memory available"; - case WSA_INVALID_PARAMETER: - return "One or more parameters are invalid"; - case WSA_OPERATION_ABORTED: - return "Overlapped operation aborted"; - case WSA_IO_INCOMPLETE: - return "Overlapped I/O event object not in signaled state"; - case WSA_IO_PENDING: - return "Overlapped operations will complete later"; - case WSAEINTR: - return "Interrupted function call"; - case WSAEBADF: - return "File handle is not valid"; - case WSAEACCES: - return "Permission denied"; - case WSAEFAULT: - return "Bad address"; - case WSAEINVAL: - return "Invalid argument"; - case WSAEMFILE: - return "Too many open files"; - case WSAEWOULDBLOCK: - return "Resource temporarily unavailable"; - case WSAEINPROGRESS: - return "Operation now in progress"; - case WSAEALREADY: - return "Operation already in progress"; - case WSAENOTSOCK: - return "Socket operation on nonsocket"; - case WSAEDESTADDRREQ: - return "Destination address required"; - case WSAEMSGSIZE: - return "Message too long"; - case WSAEPROTOTYPE: - return "Protocol wrong type for socket"; - case WSAENOPROTOOPT: - return "Bad protocol option"; - case WSAEPROTONOSUPPORT: - return "Protocol not supported"; - case WSAESOCKTNOSUPPORT: - return "Socket type not supported"; - case WSAEOPNOTSUPP: - return "Operation not supported"; - case WSAEPFNOSUPPORT: - return "Protocol family not supported"; - case WSAEAFNOSUPPORT: - return "Address family not supported by protocol family"; - case WSAEADDRINUSE: - return "Address already in use"; - case WSAEADDRNOTAVAIL: - return "Cannot assign requested address"; - case WSAENETDOWN: - return "Network is down"; - case WSAENETUNREACH: - return "Network is unreachable"; - case WSAENETRESET: - return "Network dropped connection on reset"; - case WSAECONNABORTED: - return "Software caused connection abort"; - case WSAECONNRESET: - return "Connection reset by peer"; - case WSAENOBUFS: - return "No buffer space available"; - case WSAEISCONN: - return "Socket is already connected"; - case WSAENOTCONN: - return "Socket is not connected"; - case WSAESHUTDOWN: - return "Cannot send after socket shutdown"; - case WSAETOOMANYREFS: - return "Too many references"; - case WSAETIMEDOUT: - return "Connection timed out"; - case WSAECONNREFUSED: - return "Connection refused"; - case WSAELOOP: - return "Cannot translate name"; - case WSAENAMETOOLONG: - return "Name too long"; - case WSAEHOSTDOWN: - return "Host is down"; - case WSAEHOSTUNREACH: - return "No route to host"; - case WSAENOTEMPTY: - return "Directory not empty"; - case WSAEPROCLIM: - return "Too many processes"; - case WSAEUSERS: - return "User quota exceeded"; - case WSAEDQUOT: - return "Disk quota exceeded"; - case WSAESTALE: - return "Stale file handle reference"; - case WSAEREMOTE: - return "Item is remote"; - case WSASYSNOTREADY: - return "Network subsystem is unavailable"; - case WSAVERNOTSUPPORTED: - return "Winsock.dll version out of range"; - case WSANOTINITIALISED: - return "Successful WSAStartup not yet performed"; - case WSAEDISCON: - return "Graceful shutdown in progress"; - case WSAENOMORE: - return "No more results"; - case WSAECANCELLED: - return "Call has been canceled"; - case WSAEINVALIDPROCTABLE: - return "Procedure call table is invalid"; - case WSAEINVALIDPROVIDER: - return "Service provider is invalid"; - case WSAEPROVIDERFAILEDINIT: - return "Service provider failed to initialize"; - case WSASYSCALLFAILURE: - return "System call failure"; - case WSASERVICE_NOT_FOUND: - return "Service not found"; - case WSATYPE_NOT_FOUND: - return "Class type not found"; - case WSA_E_NO_MORE: - return "No more results"; - case WSA_E_CANCELLED: - return "Call was canceled"; - case WSAEREFUSED: - return "Database query was refused"; - case WSAHOST_NOT_FOUND: - return "Host not found"; - case WSATRY_AGAIN: - return "Nonauthoritative host not found"; - case WSANO_RECOVERY: - return "This is a nonrecoverable error"; - case WSANO_DATA: - return "Valid name, no data record of requested type"; - case WSA_QOS_RECEIVERS: - return "QoS receivers"; - case WSA_QOS_SENDERS: - return "QoS senders"; - case WSA_QOS_NO_SENDERS: - return "No QoS senders"; - case WSA_QOS_NO_RECEIVERS: - return "QoS no receivers"; - case WSA_QOS_REQUEST_CONFIRMED: - return "QoS request confirmed"; - case WSA_QOS_ADMISSION_FAILURE: - return "QoS admission error"; - case WSA_QOS_POLICY_FAILURE: - return "QoS policy failure"; - case WSA_QOS_BAD_STYLE: - return "QoS bad style"; - case WSA_QOS_BAD_OBJECT: - return "QoS bad object"; - case WSA_QOS_TRAFFIC_CTRL_ERROR: - return "QoS traffic control error"; - case WSA_QOS_GENERIC_ERROR: - return "QoS generic error"; - case WSA_QOS_ESERVICETYPE: - return "QoS service type error"; - case WSA_QOS_EFLOWSPEC: - return "QoS flowspec error"; - case WSA_QOS_EPROVSPECBUF: - return "Invalid QoS provider buffer"; - case WSA_QOS_EFILTERSTYLE: - return "Invalid QoS filter style"; - case WSA_QOS_EFILTERTYPE: - return "Invalid QoS filter type"; - case WSA_QOS_EFILTERCOUNT: - return "Incorrect QoS filter count"; - case WSA_QOS_EOBJLENGTH: - return "Invalid QoS object length"; - case WSA_QOS_EFLOWCOUNT: - return "Incorrect QoS flow count"; - case WSA_QOS_EUNKOWNPSOBJ: - return "Unrecognized QoS object"; - case WSA_QOS_EPOLICYOBJ: - return "Invalid QoS policy object"; - case WSA_QOS_EFLOWDESC: - return "Invalid QoS flow descriptor"; - case WSA_QOS_EPSFLOWSPEC: - return "Invalid QoS provider-specific flowspec"; - case WSA_QOS_EPSFILTERSPEC: - return "Invalid QoS provider-specific filterspec"; - case WSA_QOS_ESDMODEOBJ: - return "Invalid QoS shape discard mode object"; - case WSA_QOS_ESHAPERATEOBJ: - return "Invalid QoS shaping rate object"; - case WSA_QOS_RESERVED_PETYPE: - return "Reserved policy QoS element type"; - } - return "Unknown winsock error"; -} - -/** - * Set last winsock error to equivalent of given errno value - * @param errnum the errno value to set - */ -void MHD_W32_set_last_winsock_error_(int errnum) -{ - switch (errnum) - { - case 0: - WSASetLastError(0); - break; - case EBADF: - WSASetLastError(WSA_INVALID_HANDLE); - break; - case ENOMEM: - WSASetLastError(WSA_NOT_ENOUGH_MEMORY); - break; - case EINVAL: - WSASetLastError(WSA_INVALID_PARAMETER); - break; - case EINTR: - WSASetLastError(WSAEINTR); - break; - case EWOULDBLOCK: - WSASetLastError(WSAEWOULDBLOCK); - break; - case EINPROGRESS: - WSASetLastError(WSAEINPROGRESS); - break; - case EALREADY: - WSASetLastError(WSAEALREADY); - break; - case ENOTSOCK: - WSASetLastError(WSAENOTSOCK); - break; - case EDESTADDRREQ: - WSASetLastError(WSAEDESTADDRREQ); - break; - case EMSGSIZE: - WSASetLastError(WSAEMSGSIZE); - break; - case EPROTOTYPE: - WSASetLastError(WSAEPROTOTYPE); - break; - case ENOPROTOOPT: - WSASetLastError(WSAENOPROTOOPT); - break; - case EPROTONOSUPPORT: - WSASetLastError(WSAEPROTONOSUPPORT); - break; - case ESOCKTNOSUPPORT: - WSASetLastError(WSAESOCKTNOSUPPORT); - break; - case EOPNOTSUPP: - WSASetLastError(WSAEOPNOTSUPP); - break; - case EPFNOSUPPORT: - WSASetLastError(WSAEPFNOSUPPORT); - break; - case EAFNOSUPPORT: - WSASetLastError(WSAEAFNOSUPPORT); - break; - case EADDRINUSE: - WSASetLastError(WSAEADDRINUSE); - break; - case EADDRNOTAVAIL: - WSASetLastError(WSAEADDRNOTAVAIL); - break; - case ENETDOWN: - WSASetLastError(WSAENETDOWN); - break; - case ENETUNREACH: - WSASetLastError(WSAENETUNREACH); - break; - case ENETRESET: - WSASetLastError(WSAENETRESET); - break; - case ECONNABORTED: - WSASetLastError(WSAECONNABORTED); - break; - case ECONNRESET: - WSASetLastError(WSAECONNRESET); - break; - case ENOBUFS: - WSASetLastError(WSAENOBUFS); - break; - case EISCONN: - WSASetLastError(WSAEISCONN); - break; - case ENOTCONN: - WSASetLastError(WSAENOTCONN); - break; - case ESHUTDOWN: - WSASetLastError(WSAESHUTDOWN); - break; - case ETOOMANYREFS: - WSASetLastError(WSAETOOMANYREFS); - break; - case ETIMEDOUT: - WSASetLastError(WSAETIMEDOUT); - break; - case ECONNREFUSED: - WSASetLastError(WSAECONNREFUSED); - break; - case ELOOP: - WSASetLastError(WSAELOOP); - break; - case ENAMETOOLONG: - WSASetLastError(WSAENAMETOOLONG); - break; - case EHOSTDOWN: - WSASetLastError(WSAEHOSTDOWN); - break; - case EHOSTUNREACH: - WSASetLastError(WSAEHOSTUNREACH); - break; - case ENOTEMPTY: - WSASetLastError(WSAENOTEMPTY); - break; - case EPROCLIM: - WSASetLastError(WSAEPROCLIM); - break; - case EUSERS: - WSASetLastError(WSAEUSERS); - break; - case EDQUOT: - WSASetLastError(WSAEDQUOT); - break; - case ESTALE: - WSASetLastError(WSAESTALE); - break; - case EREMOTE: - WSASetLastError(WSAEREMOTE); - break; - case EFAULT: - WSASetLastError(WSAEFAULT); - break; - case ENODATA: - WSASetLastError(WSANO_DATA); - break; -#if EAGAIN != EWOULDBLOCK - case EAGAIN: - WSASetLastError(WSAEWOULDBLOCK); - break; -#endif - /* Rough equivalent */ - case EIO: - WSASetLastError(WSAEREFUSED); - break; - - default: /* Unmapped errors */ - WSASetLastError(WSAENOBUFS); - break; - } -} - -/** - * Create pair of mutually connected TCP/IP sockets on loopback address - * @param sockets_pair array to receive resulted sockets - * @return zero on success, -1 otherwise - */ -int MHD_W32_pair_of_sockets_(SOCKET sockets_pair[2]) -{ - int i; - if (!sockets_pair) - { - errno = EINVAL; - return -1; - } - -#define PAIRMAXTRYIES 800 - for (i = 0; i < PAIRMAXTRYIES; i++) - { - struct sockaddr_in listen_addr; - SOCKET listen_s; - static const int c_addinlen = sizeof(struct sockaddr_in); /* help compiler to optimize */ - int addr_len = c_addinlen; - int opt = 1; - - listen_s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (INVALID_SOCKET == listen_s) - break; /* can't create even single socket */ - - listen_addr.sin_family = AF_INET; - listen_addr.sin_port = htons(0); - listen_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - if (0 == bind(listen_s, (struct sockaddr*) &listen_addr, c_addinlen) - && 0 == listen(listen_s, 1) - && 0 == getsockname(listen_s, (struct sockaddr*) &listen_addr, - &addr_len)) - { - SOCKET client_s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (INVALID_SOCKET != client_s) - { - if (0 == ioctlsocket(client_s, FIONBIO, (u_long*) &opt) - && (0 == connect(client_s, (struct sockaddr*) &listen_addr, c_addinlen) - || WSAGetLastError() == WSAEWOULDBLOCK)) - { - struct sockaddr_in accepted_from_addr; - addr_len = c_addinlen; - SOCKET server_s = accept(listen_s, - (struct sockaddr*) &accepted_from_addr, &addr_len); - if (INVALID_SOCKET != server_s) - { - struct sockaddr_in client_addr; - addr_len = c_addinlen; - opt = 0; - if (0 == getsockname(client_s, (struct sockaddr*) &client_addr, &addr_len) - && accepted_from_addr.sin_family == client_addr.sin_family - && accepted_from_addr.sin_port == client_addr.sin_port - && accepted_from_addr.sin_addr.s_addr == client_addr.sin_addr.s_addr - && 0 == ioctlsocket(client_s, FIONBIO, (u_long*) &opt) - && 0 == ioctlsocket(server_s, FIONBIO, (u_long*) &opt)) - { - closesocket(listen_s); - sockets_pair[0] = client_s; - sockets_pair[1] = server_s; - return 0; - } - closesocket(server_s); - } - } - closesocket(client_s); - } - } - closesocket(listen_s); - } - - sockets_pair[0] = INVALID_SOCKET; - sockets_pair[1] = INVALID_SOCKET; - return -1; -} - -/** - * Static variable used by pseudo random number generator - */ -static int32_t rnd_val = 0; -/** - * Generate 31-bit pseudo random number. - * Function initialize itself at first call to current time. - * @return 31-bit pseudo random number. - */ -int MHD_W32_random_(void) -{ - if (0 == rnd_val) - rnd_val = (int32_t)time(NULL); - /* stolen from winsup\cygwin\random.cc */ - rnd_val = (16807 * (rnd_val % 127773) - 2836 * (rnd_val / 127773)) - & 0x7fffffff; - return (int)rnd_val; -} - -/* Emulate snprintf function on W32 */ -int W32_snprintf(char *__restrict s, size_t n, const char *__restrict format, ...) -{ - int ret; - va_list args; - if (0 != n && NULL != s ) - { - va_start(args, format); - ret = _vsnprintf(s, n, format, args); - va_end(args); - if (n == ret) - s[n - 1] = 0; - if (ret >= 0) - return ret; - } - va_start(args, format); - ret = _vscprintf(format, args); - va_end(args); - if (0 <= ret && 0 != n && NULL == s) - return -1; - - return ret; -} - -#ifdef _MSC_FULL_VER -/** - * Set thread name - * @param thread_id ID of thread, -1 for current thread - * @param thread_name name to set - */ -void W32_SetThreadName(const DWORD thread_id, const char *thread_name) -{ - static const DWORD VC_SETNAME_EXC = 0x406D1388; -#pragma pack(push,8) - struct thread_info_struct - { - DWORD type; // Must be 0x1000. - LPCSTR name; // Pointer to name (in user address space). - DWORD ID; // Thread ID (-1=caller thread). - DWORD flags; // Reserved for future use, must be zero. - } thread_info; -#pragma pack(pop) - - if (NULL == thread_name) - return; - - thread_info.type = 0x1000; - thread_info.name = thread_name; - thread_info.ID = thread_id; - thread_info.flags = 0; - - __try - { /* This exception is intercepted by debugger */ - RaiseException(VC_SETNAME_EXC, 0, sizeof(thread_info) / sizeof(ULONG_PTR), (ULONG_PTR*)&thread_info); - } - __except (EXCEPTION_EXECUTE_HANDLER) - {} -} -#endif /* _MSC_FULL_VER */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/spdy2http/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/src/spdy2http/Makefile.am deleted file mode 100644 index f7432a9b..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/spdy2http/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# This Makefile.am is in the public domain -SUBDIRS = . - -AM_CFLAGS = - -if USE_COVERAGE - AM_CFLAGS += -fprofile-arcs -ftest-coverage -endif - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/applicationlayer \ - -DDATA_DIR=\"$(top_srcdir)/src/datadir/\" \ - $(LIBCURL_CPPFLAGS) - -if !HAVE_W32 -PERF_GET_CONCURRENT=perf_get_concurrent -endif - -bin_PROGRAMS = \ - microspdy2http - -microspdy2http_SOURCES = \ - proxy.c -microspdy2http_LDADD = \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - -lz \ - $(LIBCURL) diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/spdy2http/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/src/spdy2http/Makefile.in deleted file mode 100644 index ef67ffc8..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/spdy2http/Makefile.in +++ /dev/null @@ -1,813 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@USE_COVERAGE_TRUE@am__append_1 = -fprofile-arcs -ftest-coverage -bin_PROGRAMS = microspdy2http$(EXEEXT) -subdir = src/spdy2http -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) -am_microspdy2http_OBJECTS = proxy.$(OBJEXT) -microspdy2http_OBJECTS = $(am_microspdy2http_OBJECTS) -am__DEPENDENCIES_1 = -microspdy2http_DEPENDENCIES = \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(microspdy2http_SOURCES) -DIST_SOURCES = $(microspdy2http_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -SUBDIRS = . -AM_CFLAGS = $(am__append_1) -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/applicationlayer \ - -DDATA_DIR=\"$(top_srcdir)/src/datadir/\" \ - $(LIBCURL_CPPFLAGS) - -@HAVE_W32_FALSE@PERF_GET_CONCURRENT = perf_get_concurrent -microspdy2http_SOURCES = \ - proxy.c - -microspdy2http_LDADD = \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - -lz \ - $(LIBCURL) - -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/spdy2http/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/spdy2http/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -microspdy2http$(EXEEXT): $(microspdy2http_OBJECTS) $(microspdy2http_DEPENDENCIES) $(EXTRA_microspdy2http_DEPENDENCIES) - @rm -f microspdy2http$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(microspdy2http_OBJECTS) $(microspdy2http_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(PROGRAMS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: install-binPROGRAMS - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-binPROGRAMS - -.MAKE: $(am__recursive_targets) install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-binPROGRAMS clean-generic clean-libtool \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-binPROGRAMS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/spdy2http/proxy.c b/src/hos_libhttpserver/src/libmicrohttpd/src/spdy2http/proxy.c deleted file mode 100644 index 02144ad9..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/spdy2http/proxy.c +++ /dev/null @@ -1,1411 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file proxy.c - * @brief Translates incoming SPDY requests to http server on localhost. - * Uses libcurl. - * No error handling for curl requests. - * TODO: - * - test all options! - * - don't abort on lack of memory - * - Correct recapitalizetion of header names before giving the headers - * to curl. - * - curl does not close sockets when connection is closed and no - * new sockets are opened (they stay in CLOSE_WAIT) - * - add '/' when a user requests http://example.com . Now this is a bad - * request - * - curl returns 0 or 1 ms for timeout even when nothing will be done; - * thus the loop uses CPU for nothing - * @author Andrey Uzunov - */ - -#include "platform.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include "microspdy.h" -#include -#include -#include -#include - -#define ERROR_RESPONSE "502 Bad Gateway" - - -struct global_options -{ - char *http_backend; - char *cert; - char *cert_key; - char *listen_host; - unsigned int timeout; - uint16_t listen_port; - bool verbose; - bool curl_verbose; - bool transparent; - bool http10; - bool notls; - bool nodelay; - bool ipv4; - bool ipv6; -} glob_opt; - - -struct URI -{ - char * full_uri; - char * scheme; - char * host_and_port; - //char * host_and_port_for_connecting; - char * host; - char * path; - char * path_and_more; - char * query; - char * fragment; - uint16_t port; -}; - - -#define PRINT_INFO(msg) do{\ - fprintf(stdout, "%i:%s\n", __LINE__, msg);\ - fflush(stdout);\ - }\ - while(0) - - -#define PRINT_INFO2(fmt, ...) do{\ - fprintf(stdout, "%i\n", __LINE__);\ - fprintf(stdout, fmt,##__VA_ARGS__);\ - fprintf(stdout, "\n");\ - fflush(stdout);\ - }\ - while(0) - - -#define PRINT_VERBOSE(msg) do{\ - if(glob_opt.verbose){\ - fprintf(stdout, "%i:%s\n", __LINE__, msg);\ - fflush(stdout);\ - }\ - }\ - while(0) - - -#define PRINT_VERBOSE2(fmt, ...) do{\ - if(glob_opt.verbose){\ - fprintf(stdout, "%i\n", __LINE__);\ - fprintf(stdout, fmt,##__VA_ARGS__);\ - fprintf(stdout, "\n");\ - fflush(stdout);\ - }\ - }\ - while(0) - - -#define CURL_SETOPT(handle, opt, val) do{\ - int ret; \ - if(CURLE_OK != (ret = curl_easy_setopt(handle, opt, val))) \ - { \ - PRINT_INFO2("curl_easy_setopt failed (%i = %i)", opt, ret); \ - abort(); \ - } \ - }\ - while(0) - - -#define DIE(msg) do{\ - printf("FATAL ERROR (line %i): %s\n", __LINE__, msg);\ - fflush(stdout);\ - exit(EXIT_FAILURE);\ - }\ - while(0) - - -static int loop = 1; - -static CURLM *multi_handle; - -static int still_running = 0; /* keep number of running handles */ - -static regex_t uri_preg; - -static bool call_spdy_run; -static bool call_curl_run; - -int debug_num_curls; - - -struct Proxy -{ - char *url; - struct SPDY_Request *request; - struct SPDY_Response *response; - CURL *curl_handle; - struct curl_slist *curl_headers; - struct SPDY_NameValue *headers; - char *version; - char *status_msg; - void *http_body; - void *received_body; - bool *session_alive; - size_t http_body_size; - size_t received_body_size; - //ssize_t length; - int status; - //bool done; - bool receiving_done; - bool is_curl_read_paused; - bool is_with_body_data; - //bool error; - bool curl_done; - bool curl_error; - bool spdy_done; - bool spdy_error; -}; - - -static void -free_uri(struct URI * uri) -{ - if(NULL != uri) - { - free(uri->full_uri); - free(uri->scheme); - free(uri->host_and_port); - //free(uri->host_and_port_for_connecting); - free(uri->host); - free(uri->path); - free(uri->path_and_more); - free(uri->query); - free(uri->fragment); - uri->port = 0; - free(uri); - } -} - - -static int -init_parse_uri(regex_t * preg) -{ - // RFC 2396 - // ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))? - /* - scheme = $2 - authority = $4 - path = $5 - query = $7 - fragment = $9 - */ - - return regcomp(preg, "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?", REG_EXTENDED); -} - - -static void -deinit_parse_uri(regex_t * preg) -{ - regfree(preg); -} - - -static int -parse_uri(regex_t * preg, const char * full_uri, struct URI ** uri) -{ - //TODO memeory checks - int ret; - char *colon; - long long port; - size_t nmatch = 10; - regmatch_t pmatch[10]; - - if (0 != (ret = regexec(preg, full_uri, nmatch, pmatch, 0))) - return ret; - - *uri = malloc(sizeof(struct URI)); - if(NULL == *uri) - return -200; - - (*uri)->full_uri = strdup(full_uri); - - asprintf(&((*uri)->scheme), - "%.*s", - (int) (pmatch[2].rm_eo - pmatch[2].rm_so), - &full_uri[pmatch[2].rm_so]); - asprintf(&((*uri)->host_and_port), "%.*s", - (int) (pmatch[4].rm_eo - pmatch[4].rm_so), - &full_uri[pmatch[4].rm_so]); - asprintf(&((*uri)->path), - "%.*s", - (int) (pmatch[5].rm_eo - pmatch[5].rm_so), - &full_uri[pmatch[5].rm_so]); - asprintf(&((*uri)->path_and_more), - "%.*s", - (int) (pmatch[9].rm_eo - pmatch[5].rm_so), - &full_uri[pmatch[5].rm_so]); - asprintf(&((*uri)->query), - "%.*s", - (int) (pmatch[7].rm_eo - pmatch[7].rm_so), - &full_uri[pmatch[7].rm_so]); - asprintf(&((*uri)->fragment), - "%.*s", - (int) (pmatch[9].rm_eo - pmatch[9].rm_so), - &full_uri[pmatch[9].rm_so]); - - colon = strrchr((*uri)->host_and_port, ':'); - if(NULL == colon) - { - (*uri)->host = strdup((*uri)->host_and_port); - /*if(0 == strcasecmp("http", uri->scheme)) - { - uri->port = 80; - asprintf(&(uri->host_and_port_for_connecting), "%s:80", uri->host_and_port); - } - else if(0 == strcasecmp("https", uri->scheme)) - { - uri->port = 443; - asprintf(&(uri->host_and_port_for_connecting), "%s:443", uri->host_and_port); - } - else - { - PRINT_INFO("no standard scheme!"); - */(*uri)->port = 0; - /*uri->host_and_port_for_connecting = strdup(uri->host_and_port); - }*/ - return 0; - } - - port = atoi(colon + 1); - if(port<1 || port >= 256 * 256) - { - free_uri(*uri); - return -100; - } - (*uri)->port = port; - asprintf(&((*uri)->host), "%.*s", (int)(colon - (*uri)->host_and_port), (*uri)->host_and_port); - - return 0; -} - - -static bool -store_in_buffer(const void *src, size_t src_size, void **dst, size_t *dst_size) -{ - if(0 == src_size) - return true; - - if(NULL == *dst) - *dst = malloc(src_size); - else - *dst = realloc(*dst, src_size + *dst_size); - if(NULL == *dst) - return false; - - memcpy(*dst + *dst_size, src, src_size); - *dst_size += src_size; - - return true; -} - - -static ssize_t -get_from_buffer(void **src, size_t *src_size, void *dst, size_t max_size) -{ - size_t ret; - void *newbody; - - if(max_size >= *src_size) - { - ret = *src_size; - newbody = NULL; - } - else - { - ret = max_size; - if(NULL == (newbody = malloc(*src_size - max_size))) - return -1; - memcpy(newbody, *src + ret, *src_size - ret); - } - memcpy(dst, *src, ret); - free(*src); - *src = newbody; - *src_size -= ret; - - return ret; -} - - -static void -catch_signal(int signal) -{ - (void)signal; - - loop = 0; -} - -static void -new_session_cb (void * cls, - struct SPDY_Session * session) -{ - (void)cls; - - bool *session_alive; - - PRINT_VERBOSE("new session"); - //TODO clean this memory - if(NULL == (session_alive = malloc(sizeof(bool)))) - { - DIE("no memory"); - } - *session_alive = true; - SPDY_set_cls_to_session(session, - session_alive); -} - -static void -session_closed_cb (void * cls, - struct SPDY_Session * session, - int by_client) -{ - (void)cls; - - bool *session_alive; - - PRINT_VERBOSE2("session closed; by client: %i", by_client); - - session_alive = SPDY_get_cls_from_session(session); - assert(NULL != session_alive); - - *session_alive = false; -} - - -static int -spdy_post_data_cb (void * cls, - struct SPDY_Request *request, - const void * buf, - size_t size, - bool more) -{ - (void)cls; - int ret; - struct Proxy *proxy = (struct Proxy *)SPDY_get_cls_from_request(request); - - if(!store_in_buffer(buf, size, &proxy->received_body, &proxy->received_body_size)) - { - PRINT_INFO("not enough memory (malloc/realloc returned NULL)"); - return 0; - } - - proxy->receiving_done = !more; - - PRINT_VERBOSE2("POST bytes from SPDY: %zu", size); - - call_curl_run = true; - - if(proxy->is_curl_read_paused) - { - if(CURLE_OK != (ret = curl_easy_pause(proxy->curl_handle, CURLPAUSE_CONT))) - { - PRINT_INFO2("curl_easy_pause returned %i", ret); - abort(); - } - PRINT_VERBOSE("curl_read_cb pause resumed"); - } - - return SPDY_YES; -} - - -ssize_t -response_callback (void *cls, - void *buffer, - size_t max, - bool *more) -{ - ssize_t ret; - struct Proxy *proxy = (struct Proxy *)cls; - - *more = true; - - assert(!proxy->spdy_error); - - if(proxy->curl_error) - { - PRINT_VERBOSE("tell spdy about the error"); - return -1; - } - - if(!proxy->http_body_size)//nothing to write now - { - PRINT_VERBOSE("nothing to write now"); - if(proxy->curl_done || proxy->curl_error) *more = false; - return 0; - } - - ret = get_from_buffer(&(proxy->http_body), &(proxy->http_body_size), buffer, max); - if(ret < 0) - { - PRINT_INFO("no memory"); - //TODO error? - return -1; - } - - if((proxy->curl_done || proxy->curl_error) && 0 == proxy->http_body_size) *more = false; - - PRINT_VERBOSE2("given bytes to microspdy: %zd", ret); - - return ret; -} - - -static void -cleanup(struct Proxy *proxy) -{ - int ret; - - //fprintf(stderr, "free proxy for %s\n", proxy->url); - - if(CURLM_OK != (ret = curl_multi_remove_handle(multi_handle, proxy->curl_handle))) - { - PRINT_INFO2("curl_multi_remove_handle failed (%i)", ret); - DIE("bug in cleanup"); - } - debug_num_curls--; - //TODO bug on ku6.com or amazon.cn - // after curl_multi_remove_handle returned CURLM_BAD_EASY_HANDLE - curl_slist_free_all(proxy->curl_headers); - curl_easy_cleanup(proxy->curl_handle); - - free(proxy->url); - free(proxy); -} - - -static void -response_done_callback(void *cls, - struct SPDY_Response *response, - struct SPDY_Request *request, - enum SPDY_RESPONSE_RESULT status, - bool streamopened) -{ - (void)streamopened; - struct Proxy *proxy = (struct Proxy *)cls; - - if(SPDY_RESPONSE_RESULT_SUCCESS != status) - { - free(proxy->http_body); - proxy->http_body = NULL; - proxy->spdy_error = true; - } - cleanup(proxy); - SPDY_destroy_request(request); - SPDY_destroy_response(response); -} - - -static size_t -curl_header_cb(void *ptr, size_t size, size_t nmemb, void *userp) -{ - size_t realsize = size * nmemb; - struct Proxy *proxy = (struct Proxy *)userp; - char *line = (char *)ptr; - char *name; - char *value; - char *status; - unsigned int i; - unsigned int pos; - int ret; - int num_values; - const char * const * values; - bool abort_it; - - //printf("curl_header_cb %s\n", line); - if(!*(proxy->session_alive)) - { - PRINT_VERBOSE("headers received, but session is dead"); - proxy->spdy_error = true; - proxy->curl_error = true; - return 0; - } - - //trailer - if(NULL != proxy->response) return 0; - - if('\r' == line[0] || '\n' == line[0]) - { - //all headers were already handled; prepare spdy frames - if(NULL == (proxy->response = SPDY_build_response_with_callback(proxy->status, - proxy->status_msg, - proxy->version, - proxy->headers, - &response_callback, - proxy, - 0))) - //256))) - DIE("no response"); - - SPDY_name_value_destroy(proxy->headers); - proxy->headers = NULL; - free(proxy->status_msg); - proxy->status_msg = NULL; - free(proxy->version); - proxy->version = NULL; - - if(SPDY_YES != SPDY_queue_response(proxy->request, - proxy->response, - true, - false, - &response_done_callback, - proxy)) - { - //DIE("no queue"); - //TODO right? - proxy->spdy_error = true; - proxy->curl_error = true; - PRINT_VERBOSE2("no queue in curl_header_cb for %s", proxy->url); - SPDY_destroy_response(proxy->response); - proxy->response = NULL; - return 0; - } - - call_spdy_run = true; - - return realsize; - } - - pos = 0; - if(NULL == proxy->version) - { - //first line from headers - //version - for(i=pos; iversion = strndup(line, i - pos))) - DIE("No memory"); - pos = i+1; - - //status (number) - for(i=pos; istatus = atoi(status); - free(status); - if(istatus_msg = strndup(&(line[pos]), i - pos))) - DIE("No memory"); - } - PRINT_VERBOSE2("Header line received '%s' '%i' '%s' ", proxy->version, proxy->status, proxy->status_msg); - return realsize; - } - - //other lines - //header name - for(i=pos; iheaders, name, "")) - DIE("SPDY_name_value_add failed"); - return realsize; - } - - //header value - pos = i+1; - while(posheaders, name, value))) - { - abort_it=true; - if(NULL != (values = SPDY_name_value_lookup(proxy->headers, name, &num_values))) - for(i=0; i<(unsigned int)num_values; ++i) - if(0 == strcasecmp(value, values[i])) - { - abort_it=false; - PRINT_VERBOSE2("header appears more than once with same value '%s: %s'", name, value); - break; - } - - if(abort_it) - { - PRINT_INFO2("SPDY_name_value_add failed (%i) for '%s'", ret, name); - abort(); - } - } - free(name); - free(value); - - return realsize; -} - - -static size_t -curl_write_cb(void *contents, size_t size, size_t nmemb, void *userp) -{ - size_t realsize = size * nmemb; - struct Proxy *proxy = (struct Proxy *)userp; - - //printf("curl_write_cb %i\n", realsize); - if(!*(proxy->session_alive)) - { - PRINT_VERBOSE("data received, but session is dead"); - proxy->spdy_error = true; - proxy->curl_error = true; - return 0; - } - - if(!store_in_buffer(contents, realsize, &proxy->http_body, &proxy->http_body_size)) - { - PRINT_INFO("not enough memory (malloc/realloc returned NULL)"); - proxy->curl_error = true; - return 0; - } - /* - if(NULL == proxy->http_body) - proxy->http_body = malloc(realsize); - else - proxy->http_body = realloc(proxy->http_body, proxy->http_body_size + realsize); - if(NULL == proxy->http_body) - { - PRINT_INFO("not enough memory (realloc returned NULL)"); - return 0; - } - - memcpy(proxy->http_body + proxy->http_body_size, contents, realsize); - proxy->http_body_size += realsize; - */ - - PRINT_VERBOSE2("received bytes from curl: %zu", realsize); - - call_spdy_run = true; - - return realsize; -} - - -static size_t -curl_read_cb(void *ptr, size_t size, size_t nmemb, void *userp) -{ - ssize_t ret; - size_t max = size * nmemb; - struct Proxy *proxy = (struct Proxy *)userp; - //void *newbody; - - - if((proxy->receiving_done && !proxy->received_body_size) || !proxy->is_with_body_data || max < 1) - { - PRINT_VERBOSE("curl_read_cb last call"); - return 0; - } - - if(!*(proxy->session_alive)) - { - PRINT_VERBOSE("POST is still being sent, but session is dead"); - return CURL_READFUNC_ABORT; - } - - if(!proxy->received_body_size)//nothing to write now - { - PRINT_VERBOSE("curl_read_cb called paused"); - proxy->is_curl_read_paused = true; - return CURL_READFUNC_PAUSE;//TODO curl pause should be used - } - - ret = get_from_buffer(&(proxy->received_body), &(proxy->received_body_size), ptr, max); - if(ret < 0) - { - PRINT_INFO("no memory"); - return CURL_READFUNC_ABORT; - } - - /* - if(max >= proxy->received_body_size) - { - ret = proxy->received_body_size; - newbody = NULL; - } - else - { - ret = max; - if(NULL == (newbody = malloc(proxy->received_body_size - max))) - { - PRINT_INFO("no memory"); - return CURL_READFUNC_ABORT; - } - memcpy(newbody, proxy->received_body + max, proxy->received_body_size - max); - } - memcpy(ptr, proxy->received_body, ret); - free(proxy->received_body); - proxy->received_body = newbody; - proxy->received_body_size -= ret; - * */ - - PRINT_VERBOSE2("given POST bytes to curl: %zd", ret); - - return ret; -} - - -static int -iterate_cb (void *cls, const char *name, const char * const * value, int num_values) -{ - struct Proxy *proxy = (struct Proxy *)cls; - struct curl_slist **curl_headers = (&(proxy->curl_headers)); - char *line; - int line_len = strlen(name) + 3; //+ ": \0" - int i; - - for(i=0; isession_alive = SPDY_get_cls_from_session(session); - assert(NULL != proxy->session_alive); - - SPDY_set_cls_to_request(request, proxy); - - proxy->request = request; - proxy->is_with_body_data = more; - if(NULL == (proxy->headers = SPDY_name_value_create())) - DIE("No memory"); - - if(glob_opt.transparent) - { - if(NULL != glob_opt.http_backend) //use always same host - ret = asprintf(&(proxy->url),"%s://%s%s", scheme, glob_opt.http_backend, path); - else //use host header - ret = asprintf(&(proxy->url),"%s://%s%s", scheme, host, path); - if(-1 == ret) - DIE("No memory"); - - ret = parse_uri(&uri_preg, proxy->url, &uri); - if(ret != 0) - DIE("parsing built uri failed"); - } - else - { - ret = parse_uri(&uri_preg, path, &uri); - PRINT_INFO2("path %s '%s' '%s'", path, uri->scheme, uri->host); - if(ret != 0 || !strlen(uri->scheme) || !strlen(uri->host)) - DIE("parsing received uri failed"); - - if(NULL != glob_opt.http_backend) //use backend host - { - ret = asprintf(&(proxy->url),"%s://%s%s", uri->scheme, glob_opt.http_backend, uri->path_and_more); - if(-1 == ret) - DIE("No memory"); - } - else //use request path - if(NULL == (proxy->url = strdup(path))) - DIE("No memory"); - } - - free_uri(uri); - - PRINT_VERBOSE2("curl will request '%s'", proxy->url); - - SPDY_name_value_iterate(headers, &iterate_cb, proxy); - - if(NULL == (proxy->curl_handle = curl_easy_init())) - { - PRINT_INFO("curl_easy_init failed"); - abort(); - } - - if(glob_opt.curl_verbose) - CURL_SETOPT(proxy->curl_handle, CURLOPT_VERBOSE, 1); - - if(0 == strcmp(SPDY_HTTP_METHOD_POST,method)) - { - if(NULL == (proxy->curl_headers = curl_slist_append(proxy->curl_headers, "Expect:"))) - DIE("curl_slist_append failed"); - CURL_SETOPT(proxy->curl_handle, CURLOPT_POST, 1); - CURL_SETOPT(proxy->curl_handle, CURLOPT_READFUNCTION, curl_read_cb); - CURL_SETOPT(proxy->curl_handle, CURLOPT_READDATA, proxy); - } - - if(glob_opt.timeout) - CURL_SETOPT(proxy->curl_handle, CURLOPT_TIMEOUT, glob_opt.timeout); - CURL_SETOPT(proxy->curl_handle, CURLOPT_URL, proxy->url); - if(glob_opt.http10) - CURL_SETOPT(proxy->curl_handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - CURL_SETOPT(proxy->curl_handle, CURLOPT_WRITEFUNCTION, curl_write_cb); - CURL_SETOPT(proxy->curl_handle, CURLOPT_WRITEDATA, proxy); - CURL_SETOPT(proxy->curl_handle, CURLOPT_HEADERFUNCTION, curl_header_cb); - CURL_SETOPT(proxy->curl_handle, CURLOPT_HEADERDATA, proxy); - CURL_SETOPT(proxy->curl_handle, CURLOPT_PRIVATE, proxy); - CURL_SETOPT(proxy->curl_handle, CURLOPT_HTTPHEADER, proxy->curl_headers); - CURL_SETOPT(proxy->curl_handle, CURLOPT_SSL_VERIFYPEER, 0L);//TODO - CURL_SETOPT(proxy->curl_handle, CURLOPT_SSL_VERIFYHOST, 0L); - if(glob_opt.ipv4 && !glob_opt.ipv6) - CURL_SETOPT(proxy->curl_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); - else if(glob_opt.ipv6 && !glob_opt.ipv4) - CURL_SETOPT(proxy->curl_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6); - - if(CURLM_OK != (ret = curl_multi_add_handle(multi_handle, proxy->curl_handle))) - { - PRINT_INFO2("curl_multi_add_handle failed (%i)", ret); - abort(); - } - debug_num_curls++; - - //~5ms additional latency for calling this - if(CURLM_OK != (ret = curl_multi_perform(multi_handle, &still_running)) - && CURLM_CALL_MULTI_PERFORM != ret) - { - PRINT_INFO2("curl_multi_perform failed (%i)", ret); - abort(); - } - - call_curl_run = true; -} - - -static int -run () -{ - unsigned long long timeoutlong = 0; - unsigned long long timeout_spdy = 0; - long timeout_curl = -1; - struct timeval timeout; - int ret; - int ret_curl; - int ret_spdy; - fd_set rs; - fd_set ws; - fd_set es; - int maxfd = -1; - int maxfd_curl = -1; - struct SPDY_Daemon *daemon; - CURLMsg *msg; - int msgs_left; - struct Proxy *proxy; - struct sockaddr_in *addr; - struct addrinfo hints; - char service[NI_MAXSERV]; - struct addrinfo *gai; - enum SPDY_IO_SUBSYSTEM io = glob_opt.notls ? SPDY_IO_SUBSYSTEM_RAW : SPDY_IO_SUBSYSTEM_OPENSSL; - enum SPDY_DAEMON_FLAG flags = SPDY_DAEMON_FLAG_NO; - //struct SPDY_Response *error_response; - char *curl_private; - - signal(SIGPIPE, SIG_IGN); - - if (signal(SIGINT, catch_signal) == SIG_ERR) - PRINT_VERBOSE("signal failed"); - - srand(time(NULL)); - if(init_parse_uri(&uri_preg)) - DIE("Regexp compilation failed"); - - SPDY_init(); - - if(glob_opt.nodelay) - flags |= SPDY_DAEMON_FLAG_NO_DELAY; - - if(NULL == glob_opt.listen_host) - { - daemon = SPDY_start_daemon(glob_opt.listen_port, - glob_opt.cert, - glob_opt.cert_key, - &new_session_cb, - &session_closed_cb, - &standard_request_handler, - &spdy_post_data_cb, - NULL, - SPDY_DAEMON_OPTION_SESSION_TIMEOUT, - 1800, - SPDY_DAEMON_OPTION_IO_SUBSYSTEM, - io, - SPDY_DAEMON_OPTION_FLAGS, - flags, - SPDY_DAEMON_OPTION_END); - } - else - { - snprintf (service, sizeof(service), "%u", glob_opt.listen_port); - memset (&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_INET; - hints.ai_socktype = SOCK_STREAM; - - ret = getaddrinfo(glob_opt.listen_host, service, &hints, &gai); - if(ret != 0) - DIE("problem with specified host"); - - addr = (struct sockaddr_in *) gai->ai_addr; - - daemon = SPDY_start_daemon(0, - glob_opt.cert, - glob_opt.cert_key, - &new_session_cb, - &session_closed_cb, - &standard_request_handler, - &spdy_post_data_cb, - NULL, - SPDY_DAEMON_OPTION_SESSION_TIMEOUT, - 1800, - SPDY_DAEMON_OPTION_IO_SUBSYSTEM, - io, - SPDY_DAEMON_OPTION_FLAGS, - flags, - SPDY_DAEMON_OPTION_SOCK_ADDR, - addr, - //SPDY_DAEMON_OPTION_MAX_NUM_FRAMES, - //1, - SPDY_DAEMON_OPTION_END); - } - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - multi_handle = curl_multi_init(); - if(NULL==multi_handle) - DIE("no multi_handle"); - - timeout.tv_usec = 0; - - do - { - FD_ZERO(&rs); - FD_ZERO(&ws); - FD_ZERO(&es); - - PRINT_VERBOSE2("num curls %i", debug_num_curls); - - ret_spdy = SPDY_get_timeout(daemon, &timeout_spdy); - if(SPDY_NO == ret_spdy || timeout_spdy > 5000) - timeoutlong = 5000; - else - timeoutlong = timeout_spdy; - PRINT_VERBOSE2("SPDY timeout %lld; %i", timeout_spdy, ret_spdy); - - if(CURLM_OK != (ret_curl = curl_multi_timeout(multi_handle, &timeout_curl))) - { - PRINT_VERBOSE2("curl_multi_timeout failed (%i)", ret_curl); - //curl_timeo = timeoutlong; - } - else if(timeout_curl >= 0 && timeoutlong > (unsigned long)timeout_curl) - timeoutlong = (unsigned long)timeout_curl; - - PRINT_VERBOSE2("curl timeout %ld", timeout_curl); - - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - - maxfd = SPDY_get_fdset (daemon, - &rs, - &ws, - &es); - assert(-1 != maxfd); - - if(CURLM_OK != (ret = curl_multi_fdset(multi_handle, &rs, - &ws, - &es, &maxfd_curl))) - { - PRINT_INFO2("curl_multi_fdset failed (%i)", ret); - abort(); - } - - if(maxfd_curl > maxfd) - maxfd = maxfd_curl; - - PRINT_VERBOSE2("timeout before %lld %lld", (unsigned long long)timeout.tv_sec, (unsigned long long)timeout.tv_usec); - ret = select(maxfd+1, &rs, &ws, &es, &timeout); - PRINT_VERBOSE2("timeout after %lld %lld; ret is %i", (unsigned long long)timeout.tv_sec, (unsigned long long)timeout.tv_usec, ret); - - /*switch(ret) { - case -1: - PRINT_INFO2("select error: %i", errno); - break; - case 0: - break; - default:*/ - - //the second part should not happen with current implementation - if(ret > 0 || (SPDY_YES == ret_spdy && 0 == timeout_spdy)) - { - PRINT_VERBOSE("run spdy"); - SPDY_run(daemon); - call_spdy_run = false; - } - - //if(ret > 0 || (CURLM_OK == ret_curl && 0 == timeout_curl) || call_curl_run) - { - PRINT_VERBOSE("run curl"); - if(CURLM_OK != (ret = curl_multi_perform(multi_handle, &still_running)) - && CURLM_CALL_MULTI_PERFORM != ret) - { - PRINT_INFO2("curl_multi_perform failed (%i)", ret); - abort(); - } - call_curl_run = false; - } - /*break; - }*/ - - while ((msg = curl_multi_info_read(multi_handle, &msgs_left))) { - if (msg->msg == CURLMSG_DONE) { - PRINT_VERBOSE("A curl handler is done"); - if(CURLE_OK != (ret = curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &curl_private))) - { - PRINT_INFO2("err %i",ret); - abort(); - } - assert(NULL != curl_private); - proxy = (struct Proxy *)curl_private; - if(CURLE_OK == msg->data.result) - { - proxy->curl_done = true; - call_spdy_run = true; - //TODO what happens with proxy when the client resets a stream - //and response_done is not yet set for the last frame? is it - //possible? - } - else - { - PRINT_VERBOSE2("bad curl result (%i) for '%s'", msg->data.result, proxy->url); - if(proxy->spdy_done || proxy->spdy_error || (NULL == proxy->response && !*(proxy->session_alive))) - { - PRINT_VERBOSE("cleaning"); - SPDY_name_value_destroy(proxy->headers); - SPDY_destroy_request(proxy->request); - SPDY_destroy_response(proxy->response); - cleanup(proxy); - } - else if(NULL == proxy->response && *(proxy->session_alive)) - { - //generate error for the client - PRINT_VERBOSE("will send Bad Gateway"); - SPDY_name_value_destroy(proxy->headers); - proxy->headers = NULL; - if(NULL == (proxy->response = SPDY_build_response(SPDY_HTTP_BAD_GATEWAY, - NULL, - SPDY_HTTP_VERSION_1_1, - NULL, - ERROR_RESPONSE, - strlen(ERROR_RESPONSE)))) - DIE("no response"); - if(SPDY_YES != SPDY_queue_response(proxy->request, - proxy->response, - true, - false, - &response_done_callback, - proxy)) - { - //clean and forget - PRINT_VERBOSE("cleaning"); - SPDY_destroy_request(proxy->request); - SPDY_destroy_response(proxy->response); - cleanup(proxy); - } - } - else - { - proxy->curl_error = true; - } - call_spdy_run = true; - //TODO spdy should be notified to send RST_STREAM - } - } - else PRINT_INFO("shouldn't happen"); - } - - if(call_spdy_run) - { - PRINT_VERBOSE("second call to SPDY_run"); - SPDY_run(daemon); - call_spdy_run = false; - } - - if(glob_opt.verbose) - { - -#ifdef HAVE_CLOCK_GETTIME -#ifdef CLOCK_MONOTONIC - struct timespec ts; - - if (0 == clock_gettime(CLOCK_MONOTONIC, &ts)) - PRINT_VERBOSE2 ("time now %lld %lld", - (unsigned long long) ts.tv_sec, - (unsigned long long) ts.tv_nsec); -#endif -#endif - } - - } - while(loop); - - SPDY_stop_daemon(daemon); - - curl_multi_cleanup(multi_handle); - - SPDY_deinit(); - - deinit_parse_uri(&uri_preg); - - return 0; -} - - -static void -display_usage() -{ - printf( - "Usage: microspdy2http -p [-c ] [-k ]\n" - " [-rvh0DtT] [-b ] [-l ]\n\n" - "OPTIONS:\n" - " -p, --port Listening port.\n" - " -l, --host Listening host. If not set, will listen on [::]\n" - " -c, --certificate Path to a certificate file. Requiered if\n" - " --no-tls is not set.\n" - " -k, --certificate-key Path to a key file for the certificate.\n" - " Requiered if --no-tls is not set.\n" - " -b, --backend-server If set, the proxy will connect always to it.\n" - " Otherwise the proxy will connect to the URL\n" - " which is specified in the path or 'Host:'.\n" - " -v, --verbose Print debug information.\n" - " -r, --no-tls Do not use TLS. Client must use SPDY/3.\n" - " -h, --curl-verbose Print debug information for curl.\n" - " -0, --http10 Prefer HTTP/1.0 connections to the next hop.\n" - " -D, --no-delay This makes sense only if --no-tls is used.\n" - " TCP_NODELAY will be used for all sessions' sockets.\n" - " -4, --curl-ipv4 Curl may use IPv4 to connect to the final destination.\n" - " -6, --curl-ipv6 Curl may use IPv6 to connect to the final destination.\n" - " If neither --curl-ipv4 nor --curl-ipv6 is set,\n" - " both will be used by default.\n" - " -T, --timeout Maximum time in seconds for each HTTP transfer.\n" - " Use 0 for no timeout; this is the default value.\n" - " -t, --transparent If set, the proxy will fetch an URL which\n" - " is based on 'Host:' header and requested path.\n" - " Otherwise, full URL in the requested path is required.\n\n" - - ); -} - - -int -main (int argc, char *const *argv) -{ - - int getopt_ret; - int option_index; - struct option long_options[] = { - {"port", required_argument, 0, 'p'}, - {"certificate", required_argument, 0, 'c'}, - {"certificate-key", required_argument, 0, 'k'}, - {"backend-server", required_argument, 0, 'b'}, - {"no-tls", no_argument, 0, 'r'}, - {"verbose", no_argument, 0, 'v'}, - {"curl-verbose", no_argument, 0, 'h'}, - {"http10", no_argument, 0, '0'}, - {"no-delay", no_argument, 0, 'D'}, - {"transparent", no_argument, 0, 't'}, - {"curl-ipv4", no_argument, 0, '4'}, - {"curl-ipv6", no_argument, 0, '6'}, - {"timeout", required_argument, 0, 'T'}, - {0, 0, 0, 0} - }; - - while (1) - { - getopt_ret = getopt_long( argc, argv, "p:l:c:k:b:rv0Dth46T:", long_options, &option_index); - if (getopt_ret == -1) - break; - - switch(getopt_ret) - { - case 'p': - glob_opt.listen_port = atoi(optarg); - break; - - case 'l': - glob_opt.listen_host= strdup(optarg); - if(NULL == glob_opt.listen_host) - return 1; - break; - - case 'c': - glob_opt.cert = strdup(optarg); - break; - - case 'k': - glob_opt.cert_key = strdup(optarg); - break; - - case 'b': - glob_opt.http_backend = strdup(optarg); - if(NULL == glob_opt.http_backend) - return 1; - break; - - case 'r': - glob_opt.notls = true; - break; - - case 'v': - glob_opt.verbose = true; - break; - - case 'h': - glob_opt.curl_verbose = true; - break; - - case '0': - glob_opt.http10 = true; - break; - - case 'D': - glob_opt.nodelay = true; - break; - - case 't': - glob_opt.transparent = true; - break; - - case '4': - glob_opt.ipv4 = true; - break; - - case '6': - glob_opt.ipv6 = true; - break; - - case 'T': - glob_opt.timeout = atoi(optarg); - break; - - case 0: - PRINT_INFO("0 from getopt"); - break; - - case '?': - display_usage(); - return 1; - - default: - DIE("default from getopt"); - } - } - - if( - 0 == glob_opt.listen_port - || (!glob_opt.notls && (NULL == glob_opt.cert || NULL == glob_opt.cert_key)) - //|| !glob_opt.transparent && NULL != glob_opt.http_backend - ) - { - display_usage(); - return 1; - } - - return run(); -} - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/Makefile.am deleted file mode 100644 index eb165bd4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/Makefile.am +++ /dev/null @@ -1,310 +0,0 @@ -# This Makefile.am is in the public domain -SUBDIRS = . - -if USE_COVERAGE - AM_CFLAGS = -fprofile-arcs -ftest-coverage -endif - -if ENABLE_HTTPS - SUBDIRS += https -endif - -AM_CPPFLAGS = \ --DCPU_COUNT=$(CPU_COUNT) \ --I$(top_srcdir) \ --I$(top_srcdir)/src/microhttpd \ --I$(top_srcdir)/src/include \ -$(LIBCURL_CPPFLAGS) - -if !HAVE_W32 -PERF_GET_CONCURRENT=perf_get_concurrent -TEST_CONCURRENT_STOP=test_concurrent_stop -if HAVE_CURL_BINARY -CURL_FORK_TEST = test_get_response_cleanup -endif -endif - -if HAVE_CURL -check_PROGRAMS = \ - test_start_stop \ - test_get \ - test_get_sendfile \ - test_urlparse \ - test_put \ - $(TEST_CONCURRENT_STOP) \ - test_process_headers \ - test_process_arguments \ - test_parse_cookies \ - test_large_put \ - test_get11 \ - test_get_sendfile11 \ - test_put11 \ - test_large_put11 \ - test_long_header \ - test_long_header11 \ - test_get_chunked \ - test_put_chunked \ - test_iplimit11 \ - test_termination \ - test_timeout \ - test_callback \ - $(CURL_FORK_TEST) \ - perf_get $(PERF_GET_CONCURRENT) - -if HAVE_POSIX_THREADS -check_PROGRAMS += \ - test_quiesce -endif - -if HAVE_POSTPROCESSOR - check_PROGRAMS += \ - test_post \ - test_postform \ - test_post_loop \ - test_post11 \ - test_postform11 \ - test_post_loop11 -endif - -noinst_PROGRAMS = \ - test_options - -if ENABLE_DAUTH - check_PROGRAMS += \ - test_digestauth test_digestauth_with_arguments -endif - -TESTS = $(check_PROGRAMS) - -noinst_LIBRARIES = libcurl_version_check.a -endif - -libcurl_version_check_a_SOURCES = \ - curl_version_check.c - -test_start_stop_SOURCES = \ - test_start_stop.c -test_start_stop_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -test_concurrent_stop_SOURCES = \ - test_concurrent_stop.c -test_concurrent_stop_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_options_SOURCES = \ - test_options.c -test_options_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -test_get_SOURCES = \ - test_get.c -test_get_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_quiesce_SOURCES = \ - test_quiesce.c -test_quiesce_CFLAGS = \ - $(PTHREAD_CFLAGS) $(AM_CFLAGS) -test_quiesce_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(PTHREAD_LIBS) @LIBCURL@ - -test_callback_SOURCES = \ - test_callback.c -test_callback_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -perf_get_SOURCES = \ - perf_get.c \ - gauger.h -perf_get_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -perf_get_concurrent_SOURCES = \ - perf_get_concurrent.c \ - gauger.h -perf_get_concurrent_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_digestauth_SOURCES = \ - test_digestauth.c -test_digestauth_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_digestauth_with_arguments_SOURCES = \ - test_digestauth_with_arguments.c -test_digestauth_with_arguments_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_get_sendfile_SOURCES = \ - test_get_sendfile.c -test_get_sendfile_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ -test_get_sendfile_DEPENDENCIES = - -if HAVE_W32 -test_get_sendfile_LDADD += \ - $(top_builddir)/src/platform/libplatform_interface.la -test_get_sendfile_DEPENDENCIES += \ - $(top_builddir)/src/platform/libplatform_interface.la -endif - -test_urlparse_SOURCES = \ - test_urlparse.c -test_urlparse_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_get_response_cleanup_SOURCES = \ - test_get_response_cleanup.c -test_get_response_cleanup_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -test_get_chunked_SOURCES = \ - test_get_chunked.c -test_get_chunked_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_post_SOURCES = \ - test_post.c -test_post_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_process_headers_SOURCES = \ - test_process_headers.c -test_process_headers_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_parse_cookies_SOURCES = \ - test_parse_cookies.c -test_parse_cookies_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_process_arguments_SOURCES = \ - test_process_arguments.c -test_process_arguments_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_postform_SOURCES = \ - test_postform.c -test_postform_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_post_loop_SOURCES = \ - test_post_loop.c -test_post_loop_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put_SOURCES = \ - test_put.c -test_put_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put_chunked_SOURCES = \ - test_put_chunked.c -test_put_chunked_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_get11_SOURCES = \ - test_get.c -test_get11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_get_sendfile11_SOURCES = \ - test_get_sendfile.c -test_get_sendfile11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ -test_get_sendfile11_DEPENDENCIES = - -if HAVE_W32 -test_get_sendfile11_LDADD += \ - $(top_builddir)/src/platform/libplatform_interface.la -test_get_sendfile11_DEPENDENCIES += \ - $(top_builddir)/src/platform/libplatform_interface.la -endif - -test_post11_SOURCES = \ - test_post.c -test_post11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_postform11_SOURCES = \ - test_postform.c -test_postform11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_post_loop11_SOURCES = \ - test_post_loop.c -test_post_loop11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put11_SOURCES = \ - test_put.c -test_put11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_large_put_SOURCES = \ - test_large_put.c -test_large_put_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_large_put11_SOURCES = \ - test_large_put.c -test_large_put11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_long_header_SOURCES = \ - test_long_header.c -test_long_header_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_long_header11_SOURCES = \ - test_long_header.c -test_long_header11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_iplimit11_SOURCES = \ - test_iplimit.c -test_iplimit11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_termination_SOURCES = \ - test_termination.c -test_termination_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_timeout_SOURCES = \ - test_timeout.c -test_timeout_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/Makefile.in deleted file mode 100644 index 937bf263..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/Makefile.in +++ /dev/null @@ -1,2059 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@ENABLE_HTTPS_TRUE@am__append_1 = https -@HAVE_CURL_TRUE@check_PROGRAMS = test_start_stop$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_get$(EXEEXT) test_get_sendfile$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_urlparse$(EXEEXT) test_put$(EXEEXT) \ -@HAVE_CURL_TRUE@ $(am__EXEEXT_1) test_process_headers$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_process_arguments$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_parse_cookies$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_large_put$(EXEEXT) test_get11$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_get_sendfile11$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_put11$(EXEEXT) test_large_put11$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_long_header$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_long_header11$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_get_chunked$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_put_chunked$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_iplimit11$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_termination$(EXEEXT) \ -@HAVE_CURL_TRUE@ test_timeout$(EXEEXT) test_callback$(EXEEXT) \ -@HAVE_CURL_TRUE@ $(am__EXEEXT_2) perf_get$(EXEEXT) \ -@HAVE_CURL_TRUE@ $(am__EXEEXT_3) $(am__EXEEXT_4) \ -@HAVE_CURL_TRUE@ $(am__EXEEXT_5) $(am__EXEEXT_6) -@HAVE_CURL_TRUE@@HAVE_POSIX_THREADS_TRUE@am__append_2 = \ -@HAVE_CURL_TRUE@@HAVE_POSIX_THREADS_TRUE@ test_quiesce - -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@am__append_3 = \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_post \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_postform \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_post_loop \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_post11 \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_postform11 \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_post_loop11 - -@HAVE_CURL_TRUE@noinst_PROGRAMS = test_options$(EXEEXT) -@ENABLE_DAUTH_TRUE@@HAVE_CURL_TRUE@am__append_4 = \ -@ENABLE_DAUTH_TRUE@@HAVE_CURL_TRUE@ test_digestauth test_digestauth_with_arguments - -@HAVE_W32_TRUE@am__append_5 = \ -@HAVE_W32_TRUE@ $(top_builddir)/src/platform/libplatform_interface.la - -@HAVE_W32_TRUE@am__append_6 = \ -@HAVE_W32_TRUE@ $(top_builddir)/src/platform/libplatform_interface.la - -@HAVE_W32_TRUE@am__append_7 = \ -@HAVE_W32_TRUE@ $(top_builddir)/src/platform/libplatform_interface.la - -@HAVE_W32_TRUE@am__append_8 = \ -@HAVE_W32_TRUE@ $(top_builddir)/src/platform/libplatform_interface.la - -subdir = src/testcurl -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp $(top_srcdir)/test-driver -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -AM_V_AR = $(am__v_AR_@AM_V@) -am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -am__v_AR_1 = -libcurl_version_check_a_AR = $(AR) $(ARFLAGS) -libcurl_version_check_a_LIBADD = -am_libcurl_version_check_a_OBJECTS = curl_version_check.$(OBJEXT) -libcurl_version_check_a_OBJECTS = \ - $(am_libcurl_version_check_a_OBJECTS) -@HAVE_W32_FALSE@am__EXEEXT_1 = test_concurrent_stop$(EXEEXT) -@HAVE_CURL_BINARY_TRUE@@HAVE_W32_FALSE@am__EXEEXT_2 = test_get_response_cleanup$(EXEEXT) -@HAVE_W32_FALSE@am__EXEEXT_3 = perf_get_concurrent$(EXEEXT) -@HAVE_CURL_TRUE@@HAVE_POSIX_THREADS_TRUE@am__EXEEXT_4 = test_quiesce$(EXEEXT) -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@am__EXEEXT_5 = \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_post$(EXEEXT) \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_postform$(EXEEXT) \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_post_loop$(EXEEXT) \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_post11$(EXEEXT) \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_postform11$(EXEEXT) \ -@HAVE_CURL_TRUE@@HAVE_POSTPROCESSOR_TRUE@ test_post_loop11$(EXEEXT) -@ENABLE_DAUTH_TRUE@@HAVE_CURL_TRUE@am__EXEEXT_6 = \ -@ENABLE_DAUTH_TRUE@@HAVE_CURL_TRUE@ test_digestauth$(EXEEXT) \ -@ENABLE_DAUTH_TRUE@@HAVE_CURL_TRUE@ test_digestauth_with_arguments$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) -am_perf_get_OBJECTS = perf_get.$(OBJEXT) -perf_get_OBJECTS = $(am_perf_get_OBJECTS) -perf_get_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -am_perf_get_concurrent_OBJECTS = perf_get_concurrent.$(OBJEXT) -perf_get_concurrent_OBJECTS = $(am_perf_get_concurrent_OBJECTS) -perf_get_concurrent_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_callback_OBJECTS = test_callback.$(OBJEXT) -test_callback_OBJECTS = $(am_test_callback_OBJECTS) -test_callback_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_concurrent_stop_OBJECTS = test_concurrent_stop.$(OBJEXT) -test_concurrent_stop_OBJECTS = $(am_test_concurrent_stop_OBJECTS) -test_concurrent_stop_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_digestauth_OBJECTS = test_digestauth.$(OBJEXT) -test_digestauth_OBJECTS = $(am_test_digestauth_OBJECTS) -test_digestauth_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_digestauth_with_arguments_OBJECTS = \ - test_digestauth_with_arguments.$(OBJEXT) -test_digestauth_with_arguments_OBJECTS = \ - $(am_test_digestauth_with_arguments_OBJECTS) -test_digestauth_with_arguments_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_get_OBJECTS = test_get.$(OBJEXT) -test_get_OBJECTS = $(am_test_get_OBJECTS) -test_get_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_get11_OBJECTS = test_get.$(OBJEXT) -test_get11_OBJECTS = $(am_test_get11_OBJECTS) -test_get11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_get_chunked_OBJECTS = test_get_chunked.$(OBJEXT) -test_get_chunked_OBJECTS = $(am_test_get_chunked_OBJECTS) -test_get_chunked_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_get_response_cleanup_OBJECTS = \ - test_get_response_cleanup.$(OBJEXT) -test_get_response_cleanup_OBJECTS = \ - $(am_test_get_response_cleanup_OBJECTS) -test_get_response_cleanup_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_get_sendfile_OBJECTS = test_get_sendfile.$(OBJEXT) -test_get_sendfile_OBJECTS = $(am_test_get_sendfile_OBJECTS) -am_test_get_sendfile11_OBJECTS = test_get_sendfile.$(OBJEXT) -test_get_sendfile11_OBJECTS = $(am_test_get_sendfile11_OBJECTS) -am_test_iplimit11_OBJECTS = test_iplimit.$(OBJEXT) -test_iplimit11_OBJECTS = $(am_test_iplimit11_OBJECTS) -test_iplimit11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_large_put_OBJECTS = test_large_put.$(OBJEXT) -test_large_put_OBJECTS = $(am_test_large_put_OBJECTS) -test_large_put_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_large_put11_OBJECTS = test_large_put.$(OBJEXT) -test_large_put11_OBJECTS = $(am_test_large_put11_OBJECTS) -test_large_put11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_long_header_OBJECTS = test_long_header.$(OBJEXT) -test_long_header_OBJECTS = $(am_test_long_header_OBJECTS) -test_long_header_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_long_header11_OBJECTS = test_long_header.$(OBJEXT) -test_long_header11_OBJECTS = $(am_test_long_header11_OBJECTS) -test_long_header11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_options_OBJECTS = test_options.$(OBJEXT) -test_options_OBJECTS = $(am_test_options_OBJECTS) -test_options_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_parse_cookies_OBJECTS = test_parse_cookies.$(OBJEXT) -test_parse_cookies_OBJECTS = $(am_test_parse_cookies_OBJECTS) -test_parse_cookies_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_post_OBJECTS = test_post.$(OBJEXT) -test_post_OBJECTS = $(am_test_post_OBJECTS) -test_post_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_post11_OBJECTS = test_post.$(OBJEXT) -test_post11_OBJECTS = $(am_test_post11_OBJECTS) -test_post11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_post_loop_OBJECTS = test_post_loop.$(OBJEXT) -test_post_loop_OBJECTS = $(am_test_post_loop_OBJECTS) -test_post_loop_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_post_loop11_OBJECTS = test_post_loop.$(OBJEXT) -test_post_loop11_OBJECTS = $(am_test_post_loop11_OBJECTS) -test_post_loop11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_postform_OBJECTS = test_postform.$(OBJEXT) -test_postform_OBJECTS = $(am_test_postform_OBJECTS) -test_postform_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_postform11_OBJECTS = test_postform.$(OBJEXT) -test_postform11_OBJECTS = $(am_test_postform11_OBJECTS) -test_postform11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_process_arguments_OBJECTS = test_process_arguments.$(OBJEXT) -test_process_arguments_OBJECTS = $(am_test_process_arguments_OBJECTS) -test_process_arguments_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_process_headers_OBJECTS = test_process_headers.$(OBJEXT) -test_process_headers_OBJECTS = $(am_test_process_headers_OBJECTS) -test_process_headers_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_put_OBJECTS = test_put.$(OBJEXT) -test_put_OBJECTS = $(am_test_put_OBJECTS) -test_put_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_put11_OBJECTS = test_put.$(OBJEXT) -test_put11_OBJECTS = $(am_test_put11_OBJECTS) -test_put11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_put_chunked_OBJECTS = test_put_chunked.$(OBJEXT) -test_put_chunked_OBJECTS = $(am_test_put_chunked_OBJECTS) -test_put_chunked_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_quiesce_OBJECTS = test_quiesce-test_quiesce.$(OBJEXT) -test_quiesce_OBJECTS = $(am_test_quiesce_OBJECTS) -am__DEPENDENCIES_1 = -test_quiesce_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) -test_quiesce_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_quiesce_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_test_start_stop_OBJECTS = test_start_stop.$(OBJEXT) -test_start_stop_OBJECTS = $(am_test_start_stop_OBJECTS) -test_start_stop_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_termination_OBJECTS = test_termination.$(OBJEXT) -test_termination_OBJECTS = $(am_test_termination_OBJECTS) -test_termination_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_timeout_OBJECTS = test_timeout.$(OBJEXT) -test_timeout_OBJECTS = $(am_test_timeout_OBJECTS) -test_timeout_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_urlparse_OBJECTS = test_urlparse.$(OBJEXT) -test_urlparse_OBJECTS = $(am_test_urlparse_OBJECTS) -test_urlparse_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libcurl_version_check_a_SOURCES) $(perf_get_SOURCES) \ - $(perf_get_concurrent_SOURCES) $(test_callback_SOURCES) \ - $(test_concurrent_stop_SOURCES) $(test_digestauth_SOURCES) \ - $(test_digestauth_with_arguments_SOURCES) $(test_get_SOURCES) \ - $(test_get11_SOURCES) $(test_get_chunked_SOURCES) \ - $(test_get_response_cleanup_SOURCES) \ - $(test_get_sendfile_SOURCES) $(test_get_sendfile11_SOURCES) \ - $(test_iplimit11_SOURCES) $(test_large_put_SOURCES) \ - $(test_large_put11_SOURCES) $(test_long_header_SOURCES) \ - $(test_long_header11_SOURCES) $(test_options_SOURCES) \ - $(test_parse_cookies_SOURCES) $(test_post_SOURCES) \ - $(test_post11_SOURCES) $(test_post_loop_SOURCES) \ - $(test_post_loop11_SOURCES) $(test_postform_SOURCES) \ - $(test_postform11_SOURCES) $(test_process_arguments_SOURCES) \ - $(test_process_headers_SOURCES) $(test_put_SOURCES) \ - $(test_put11_SOURCES) $(test_put_chunked_SOURCES) \ - $(test_quiesce_SOURCES) $(test_start_stop_SOURCES) \ - $(test_termination_SOURCES) $(test_timeout_SOURCES) \ - $(test_urlparse_SOURCES) -DIST_SOURCES = $(libcurl_version_check_a_SOURCES) $(perf_get_SOURCES) \ - $(perf_get_concurrent_SOURCES) $(test_callback_SOURCES) \ - $(test_concurrent_stop_SOURCES) $(test_digestauth_SOURCES) \ - $(test_digestauth_with_arguments_SOURCES) $(test_get_SOURCES) \ - $(test_get11_SOURCES) $(test_get_chunked_SOURCES) \ - $(test_get_response_cleanup_SOURCES) \ - $(test_get_sendfile_SOURCES) $(test_get_sendfile11_SOURCES) \ - $(test_iplimit11_SOURCES) $(test_large_put_SOURCES) \ - $(test_large_put11_SOURCES) $(test_long_header_SOURCES) \ - $(test_long_header11_SOURCES) $(test_options_SOURCES) \ - $(test_parse_cookies_SOURCES) $(test_post_SOURCES) \ - $(test_post11_SOURCES) $(test_post_loop_SOURCES) \ - $(test_post_loop11_SOURCES) $(test_postform_SOURCES) \ - $(test_postform11_SOURCES) $(test_process_arguments_SOURCES) \ - $(test_process_headers_SOURCES) $(test_put_SOURCES) \ - $(test_put11_SOURCES) $(test_put_chunked_SOURCES) \ - $(test_quiesce_SOURCES) $(test_start_stop_SOURCES) \ - $(test_termination_SOURCES) $(test_timeout_SOURCES) \ - $(test_urlparse_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - check recheck distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -am__tty_colors_dummy = \ - mgn= red= grn= lgn= blu= brg= std=; \ - am__color_tests=no -am__tty_colors = { \ - $(am__tty_colors_dummy); \ - if test "X$(AM_COLOR_TESTS)" = Xno; then \ - am__color_tests=no; \ - elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ - am__color_tests=yes; \ - elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ - am__color_tests=yes; \ - fi; \ - if test $$am__color_tests = yes; then \ - red=''; \ - grn=''; \ - lgn=''; \ - blu=''; \ - mgn=''; \ - brg=''; \ - std=''; \ - fi; \ -} -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__recheck_rx = ^[ ]*:recheck:[ ]* -am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* -am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* -# A command that, given a newline-separated list of test names on the -# standard input, print the name of the tests that are to be re-run -# upon "make recheck". -am__list_recheck_tests = $(AWK) '{ \ - recheck = 1; \ - while ((rc = (getline line < ($$0 ".trs"))) != 0) \ - { \ - if (rc < 0) \ - { \ - if ((getline line2 < ($$0 ".log")) < 0) \ - recheck = 0; \ - break; \ - } \ - else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ - { \ - recheck = 0; \ - break; \ - } \ - else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ - { \ - break; \ - } \ - }; \ - if (recheck) \ - print $$0; \ - close ($$0 ".trs"); \ - close ($$0 ".log"); \ -}' -# A command that, given a newline-separated list of test names on the -# standard input, create the global log from their .trs and .log files. -am__create_global_log = $(AWK) ' \ -function fatal(msg) \ -{ \ - print "fatal: making $@: " msg | "cat >&2"; \ - exit 1; \ -} \ -function rst_section(header) \ -{ \ - print header; \ - len = length(header); \ - for (i = 1; i <= len; i = i + 1) \ - printf "="; \ - printf "\n\n"; \ -} \ -{ \ - copy_in_global_log = 1; \ - global_test_result = "RUN"; \ - while ((rc = (getline line < ($$0 ".trs"))) != 0) \ - { \ - if (rc < 0) \ - fatal("failed to read from " $$0 ".trs"); \ - if (line ~ /$(am__global_test_result_rx)/) \ - { \ - sub("$(am__global_test_result_rx)", "", line); \ - sub("[ ]*$$", "", line); \ - global_test_result = line; \ - } \ - else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ - copy_in_global_log = 0; \ - }; \ - if (copy_in_global_log) \ - { \ - rst_section(global_test_result ": " $$0); \ - while ((rc = (getline line < ($$0 ".log"))) != 0) \ - { \ - if (rc < 0) \ - fatal("failed to read from " $$0 ".log"); \ - print line; \ - }; \ - printf "\n"; \ - }; \ - close ($$0 ".trs"); \ - close ($$0 ".log"); \ -}' -# Restructured Text title. -am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } -# Solaris 10 'make', and several other traditional 'make' implementations, -# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it -# by disabling -e (using the XSI extension "set +e") if it's set. -am__sh_e_setup = case $$- in *e*) set +e;; esac -# Default flags passed to test drivers. -am__common_driver_flags = \ - --color-tests "$$am__color_tests" \ - --enable-hard-errors "$$am__enable_hard_errors" \ - --expect-failure "$$am__expect_failure" -# To be inserted before the command running the test. Creates the -# directory for the log if needed. Stores in $dir the directory -# containing $f, in $tst the test, in $log the log. Executes the -# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and -# passes TESTS_ENVIRONMENT. Set up options for the wrapper that -# will run the test scripts (or their associated LOG_COMPILER, if -# thy have one). -am__check_pre = \ -$(am__sh_e_setup); \ -$(am__vpath_adj_setup) $(am__vpath_adj) \ -$(am__tty_colors); \ -srcdir=$(srcdir); export srcdir; \ -case "$@" in \ - */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ - *) am__odir=.;; \ -esac; \ -test "x$$am__odir" = x"." || test -d "$$am__odir" \ - || $(MKDIR_P) "$$am__odir" || exit $$?; \ -if test -f "./$$f"; then dir=./; \ -elif test -f "$$f"; then dir=; \ -else dir="$(srcdir)/"; fi; \ -tst=$$dir$$f; log='$@'; \ -if test -n '$(DISABLE_HARD_ERRORS)'; then \ - am__enable_hard_errors=no; \ -else \ - am__enable_hard_errors=yes; \ -fi; \ -case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ - am__expect_failure=yes;; \ - *) \ - am__expect_failure=no;; \ -esac; \ -$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) -# A shell command to get the names of the tests scripts with any registered -# extension removed (i.e., equivalently, the names of the test logs, with -# the '.log' extension removed). The result is saved in the shell variable -# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, -# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", -# since that might cause problem with VPATH rewrites for suffix-less tests. -# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. -am__set_TESTS_bases = \ - bases='$(TEST_LOGS)'; \ - bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ - bases=`echo $$bases` -RECHECK_LOGS = $(TEST_LOGS) -TEST_SUITE_LOG = test-suite.log -TEST_EXTENSIONS = @EXEEXT@ .test -LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver -LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) -am__set_b = \ - case '$@' in \ - */*) \ - case '$*' in \ - */*) b='$*';; \ - *) b=`echo '$@' | sed 's/\.log$$//'`; \ - esac;; \ - *) \ - b='$*';; \ - esac -am__test_logs1 = $(TESTS:=.log) -am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) -TEST_LOGS = $(am__test_logs2:.test.log=.log) -TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver -TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ - $(TEST_LOG_FLAGS) -DIST_SUBDIRS = . https -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -SUBDIRS = . $(am__append_1) -@USE_COVERAGE_TRUE@AM_CFLAGS = -fprofile-arcs -ftest-coverage -AM_CPPFLAGS = \ --DCPU_COUNT=$(CPU_COUNT) \ --I$(top_srcdir) \ --I$(top_srcdir)/src/microhttpd \ --I$(top_srcdir)/src/include \ -$(LIBCURL_CPPFLAGS) - -@HAVE_W32_FALSE@PERF_GET_CONCURRENT = perf_get_concurrent -@HAVE_W32_FALSE@TEST_CONCURRENT_STOP = test_concurrent_stop -@HAVE_CURL_BINARY_TRUE@@HAVE_W32_FALSE@CURL_FORK_TEST = test_get_response_cleanup -@HAVE_CURL_TRUE@TESTS = $(check_PROGRAMS) -@HAVE_CURL_TRUE@noinst_LIBRARIES = libcurl_version_check.a -libcurl_version_check_a_SOURCES = \ - curl_version_check.c - -test_start_stop_SOURCES = \ - test_start_stop.c - -test_start_stop_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -test_concurrent_stop_SOURCES = \ - test_concurrent_stop.c - -test_concurrent_stop_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_options_SOURCES = \ - test_options.c - -test_options_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -test_get_SOURCES = \ - test_get.c - -test_get_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_quiesce_SOURCES = \ - test_quiesce.c - -test_quiesce_CFLAGS = \ - $(PTHREAD_CFLAGS) $(AM_CFLAGS) - -test_quiesce_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(PTHREAD_LIBS) @LIBCURL@ - -test_callback_SOURCES = \ - test_callback.c - -test_callback_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -perf_get_SOURCES = \ - perf_get.c \ - gauger.h - -perf_get_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -perf_get_concurrent_SOURCES = \ - perf_get_concurrent.c \ - gauger.h - -perf_get_concurrent_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_digestauth_SOURCES = \ - test_digestauth.c - -test_digestauth_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_digestauth_with_arguments_SOURCES = \ - test_digestauth_with_arguments.c - -test_digestauth_with_arguments_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_get_sendfile_SOURCES = \ - test_get_sendfile.c - -test_get_sendfile_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la @LIBCURL@ \ - $(am__append_5) -test_get_sendfile_DEPENDENCIES = $(am__append_6) -test_urlparse_SOURCES = \ - test_urlparse.c - -test_urlparse_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_get_response_cleanup_SOURCES = \ - test_get_response_cleanup.c - -test_get_response_cleanup_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la - -test_get_chunked_SOURCES = \ - test_get_chunked.c - -test_get_chunked_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_post_SOURCES = \ - test_post.c - -test_post_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_process_headers_SOURCES = \ - test_process_headers.c - -test_process_headers_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_parse_cookies_SOURCES = \ - test_parse_cookies.c - -test_parse_cookies_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_process_arguments_SOURCES = \ - test_process_arguments.c - -test_process_arguments_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_postform_SOURCES = \ - test_postform.c - -test_postform_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_post_loop_SOURCES = \ - test_post_loop.c - -test_post_loop_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put_SOURCES = \ - test_put.c - -test_put_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put_chunked_SOURCES = \ - test_put_chunked.c - -test_put_chunked_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_get11_SOURCES = \ - test_get.c - -test_get11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_get_sendfile11_SOURCES = \ - test_get_sendfile.c - -test_get_sendfile11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la @LIBCURL@ \ - $(am__append_7) -test_get_sendfile11_DEPENDENCIES = $(am__append_8) -test_post11_SOURCES = \ - test_post.c - -test_post11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_postform11_SOURCES = \ - test_postform.c - -test_postform11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_post_loop11_SOURCES = \ - test_post_loop.c - -test_post_loop11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put11_SOURCES = \ - test_put.c - -test_put11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_large_put_SOURCES = \ - test_large_put.c - -test_large_put_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_large_put11_SOURCES = \ - test_large_put.c - -test_large_put11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_long_header_SOURCES = \ - test_long_header.c - -test_long_header_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_long_header11_SOURCES = \ - test_long_header.c - -test_long_header11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_iplimit11_SOURCES = \ - test_iplimit.c - -test_iplimit11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_termination_SOURCES = \ - test_termination.c - -test_termination_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_timeout_SOURCES = \ - test_timeout.c - -test_timeout_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/testcurl/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/testcurl/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) - -libcurl_version_check.a: $(libcurl_version_check_a_OBJECTS) $(libcurl_version_check_a_DEPENDENCIES) $(EXTRA_libcurl_version_check_a_DEPENDENCIES) - $(AM_V_at)-rm -f libcurl_version_check.a - $(AM_V_AR)$(libcurl_version_check_a_AR) libcurl_version_check.a $(libcurl_version_check_a_OBJECTS) $(libcurl_version_check_a_LIBADD) - $(AM_V_at)$(RANLIB) libcurl_version_check.a - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -perf_get$(EXEEXT): $(perf_get_OBJECTS) $(perf_get_DEPENDENCIES) $(EXTRA_perf_get_DEPENDENCIES) - @rm -f perf_get$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(perf_get_OBJECTS) $(perf_get_LDADD) $(LIBS) - -perf_get_concurrent$(EXEEXT): $(perf_get_concurrent_OBJECTS) $(perf_get_concurrent_DEPENDENCIES) $(EXTRA_perf_get_concurrent_DEPENDENCIES) - @rm -f perf_get_concurrent$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(perf_get_concurrent_OBJECTS) $(perf_get_concurrent_LDADD) $(LIBS) - -test_callback$(EXEEXT): $(test_callback_OBJECTS) $(test_callback_DEPENDENCIES) $(EXTRA_test_callback_DEPENDENCIES) - @rm -f test_callback$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_callback_OBJECTS) $(test_callback_LDADD) $(LIBS) - -test_concurrent_stop$(EXEEXT): $(test_concurrent_stop_OBJECTS) $(test_concurrent_stop_DEPENDENCIES) $(EXTRA_test_concurrent_stop_DEPENDENCIES) - @rm -f test_concurrent_stop$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_concurrent_stop_OBJECTS) $(test_concurrent_stop_LDADD) $(LIBS) - -test_digestauth$(EXEEXT): $(test_digestauth_OBJECTS) $(test_digestauth_DEPENDENCIES) $(EXTRA_test_digestauth_DEPENDENCIES) - @rm -f test_digestauth$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_digestauth_OBJECTS) $(test_digestauth_LDADD) $(LIBS) - -test_digestauth_with_arguments$(EXEEXT): $(test_digestauth_with_arguments_OBJECTS) $(test_digestauth_with_arguments_DEPENDENCIES) $(EXTRA_test_digestauth_with_arguments_DEPENDENCIES) - @rm -f test_digestauth_with_arguments$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_digestauth_with_arguments_OBJECTS) $(test_digestauth_with_arguments_LDADD) $(LIBS) - -test_get$(EXEEXT): $(test_get_OBJECTS) $(test_get_DEPENDENCIES) $(EXTRA_test_get_DEPENDENCIES) - @rm -f test_get$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_get_OBJECTS) $(test_get_LDADD) $(LIBS) - -test_get11$(EXEEXT): $(test_get11_OBJECTS) $(test_get11_DEPENDENCIES) $(EXTRA_test_get11_DEPENDENCIES) - @rm -f test_get11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_get11_OBJECTS) $(test_get11_LDADD) $(LIBS) - -test_get_chunked$(EXEEXT): $(test_get_chunked_OBJECTS) $(test_get_chunked_DEPENDENCIES) $(EXTRA_test_get_chunked_DEPENDENCIES) - @rm -f test_get_chunked$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_get_chunked_OBJECTS) $(test_get_chunked_LDADD) $(LIBS) - -test_get_response_cleanup$(EXEEXT): $(test_get_response_cleanup_OBJECTS) $(test_get_response_cleanup_DEPENDENCIES) $(EXTRA_test_get_response_cleanup_DEPENDENCIES) - @rm -f test_get_response_cleanup$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_get_response_cleanup_OBJECTS) $(test_get_response_cleanup_LDADD) $(LIBS) - -test_get_sendfile$(EXEEXT): $(test_get_sendfile_OBJECTS) $(test_get_sendfile_DEPENDENCIES) $(EXTRA_test_get_sendfile_DEPENDENCIES) - @rm -f test_get_sendfile$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_get_sendfile_OBJECTS) $(test_get_sendfile_LDADD) $(LIBS) - -test_get_sendfile11$(EXEEXT): $(test_get_sendfile11_OBJECTS) $(test_get_sendfile11_DEPENDENCIES) $(EXTRA_test_get_sendfile11_DEPENDENCIES) - @rm -f test_get_sendfile11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_get_sendfile11_OBJECTS) $(test_get_sendfile11_LDADD) $(LIBS) - -test_iplimit11$(EXEEXT): $(test_iplimit11_OBJECTS) $(test_iplimit11_DEPENDENCIES) $(EXTRA_test_iplimit11_DEPENDENCIES) - @rm -f test_iplimit11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_iplimit11_OBJECTS) $(test_iplimit11_LDADD) $(LIBS) - -test_large_put$(EXEEXT): $(test_large_put_OBJECTS) $(test_large_put_DEPENDENCIES) $(EXTRA_test_large_put_DEPENDENCIES) - @rm -f test_large_put$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_large_put_OBJECTS) $(test_large_put_LDADD) $(LIBS) - -test_large_put11$(EXEEXT): $(test_large_put11_OBJECTS) $(test_large_put11_DEPENDENCIES) $(EXTRA_test_large_put11_DEPENDENCIES) - @rm -f test_large_put11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_large_put11_OBJECTS) $(test_large_put11_LDADD) $(LIBS) - -test_long_header$(EXEEXT): $(test_long_header_OBJECTS) $(test_long_header_DEPENDENCIES) $(EXTRA_test_long_header_DEPENDENCIES) - @rm -f test_long_header$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_long_header_OBJECTS) $(test_long_header_LDADD) $(LIBS) - -test_long_header11$(EXEEXT): $(test_long_header11_OBJECTS) $(test_long_header11_DEPENDENCIES) $(EXTRA_test_long_header11_DEPENDENCIES) - @rm -f test_long_header11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_long_header11_OBJECTS) $(test_long_header11_LDADD) $(LIBS) - -test_options$(EXEEXT): $(test_options_OBJECTS) $(test_options_DEPENDENCIES) $(EXTRA_test_options_DEPENDENCIES) - @rm -f test_options$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_options_OBJECTS) $(test_options_LDADD) $(LIBS) - -test_parse_cookies$(EXEEXT): $(test_parse_cookies_OBJECTS) $(test_parse_cookies_DEPENDENCIES) $(EXTRA_test_parse_cookies_DEPENDENCIES) - @rm -f test_parse_cookies$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_parse_cookies_OBJECTS) $(test_parse_cookies_LDADD) $(LIBS) - -test_post$(EXEEXT): $(test_post_OBJECTS) $(test_post_DEPENDENCIES) $(EXTRA_test_post_DEPENDENCIES) - @rm -f test_post$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_post_OBJECTS) $(test_post_LDADD) $(LIBS) - -test_post11$(EXEEXT): $(test_post11_OBJECTS) $(test_post11_DEPENDENCIES) $(EXTRA_test_post11_DEPENDENCIES) - @rm -f test_post11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_post11_OBJECTS) $(test_post11_LDADD) $(LIBS) - -test_post_loop$(EXEEXT): $(test_post_loop_OBJECTS) $(test_post_loop_DEPENDENCIES) $(EXTRA_test_post_loop_DEPENDENCIES) - @rm -f test_post_loop$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_post_loop_OBJECTS) $(test_post_loop_LDADD) $(LIBS) - -test_post_loop11$(EXEEXT): $(test_post_loop11_OBJECTS) $(test_post_loop11_DEPENDENCIES) $(EXTRA_test_post_loop11_DEPENDENCIES) - @rm -f test_post_loop11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_post_loop11_OBJECTS) $(test_post_loop11_LDADD) $(LIBS) - -test_postform$(EXEEXT): $(test_postform_OBJECTS) $(test_postform_DEPENDENCIES) $(EXTRA_test_postform_DEPENDENCIES) - @rm -f test_postform$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_postform_OBJECTS) $(test_postform_LDADD) $(LIBS) - -test_postform11$(EXEEXT): $(test_postform11_OBJECTS) $(test_postform11_DEPENDENCIES) $(EXTRA_test_postform11_DEPENDENCIES) - @rm -f test_postform11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_postform11_OBJECTS) $(test_postform11_LDADD) $(LIBS) - -test_process_arguments$(EXEEXT): $(test_process_arguments_OBJECTS) $(test_process_arguments_DEPENDENCIES) $(EXTRA_test_process_arguments_DEPENDENCIES) - @rm -f test_process_arguments$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_process_arguments_OBJECTS) $(test_process_arguments_LDADD) $(LIBS) - -test_process_headers$(EXEEXT): $(test_process_headers_OBJECTS) $(test_process_headers_DEPENDENCIES) $(EXTRA_test_process_headers_DEPENDENCIES) - @rm -f test_process_headers$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_process_headers_OBJECTS) $(test_process_headers_LDADD) $(LIBS) - -test_put$(EXEEXT): $(test_put_OBJECTS) $(test_put_DEPENDENCIES) $(EXTRA_test_put_DEPENDENCIES) - @rm -f test_put$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_put_OBJECTS) $(test_put_LDADD) $(LIBS) - -test_put11$(EXEEXT): $(test_put11_OBJECTS) $(test_put11_DEPENDENCIES) $(EXTRA_test_put11_DEPENDENCIES) - @rm -f test_put11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_put11_OBJECTS) $(test_put11_LDADD) $(LIBS) - -test_put_chunked$(EXEEXT): $(test_put_chunked_OBJECTS) $(test_put_chunked_DEPENDENCIES) $(EXTRA_test_put_chunked_DEPENDENCIES) - @rm -f test_put_chunked$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_put_chunked_OBJECTS) $(test_put_chunked_LDADD) $(LIBS) - -test_quiesce$(EXEEXT): $(test_quiesce_OBJECTS) $(test_quiesce_DEPENDENCIES) $(EXTRA_test_quiesce_DEPENDENCIES) - @rm -f test_quiesce$(EXEEXT) - $(AM_V_CCLD)$(test_quiesce_LINK) $(test_quiesce_OBJECTS) $(test_quiesce_LDADD) $(LIBS) - -test_start_stop$(EXEEXT): $(test_start_stop_OBJECTS) $(test_start_stop_DEPENDENCIES) $(EXTRA_test_start_stop_DEPENDENCIES) - @rm -f test_start_stop$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_start_stop_OBJECTS) $(test_start_stop_LDADD) $(LIBS) - -test_termination$(EXEEXT): $(test_termination_OBJECTS) $(test_termination_DEPENDENCIES) $(EXTRA_test_termination_DEPENDENCIES) - @rm -f test_termination$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_termination_OBJECTS) $(test_termination_LDADD) $(LIBS) - -test_timeout$(EXEEXT): $(test_timeout_OBJECTS) $(test_timeout_DEPENDENCIES) $(EXTRA_test_timeout_DEPENDENCIES) - @rm -f test_timeout$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_timeout_OBJECTS) $(test_timeout_LDADD) $(LIBS) - -test_urlparse$(EXEEXT): $(test_urlparse_OBJECTS) $(test_urlparse_DEPENDENCIES) $(EXTRA_test_urlparse_DEPENDENCIES) - @rm -f test_urlparse$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_urlparse_OBJECTS) $(test_urlparse_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curl_version_check.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perf_get.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perf_get_concurrent.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_callback.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_concurrent_stop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_digestauth.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_digestauth_with_arguments.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_get.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_get_chunked.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_get_response_cleanup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_get_sendfile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_iplimit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_large_put.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_long_header.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_options.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_parse_cookies.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_post.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_post_loop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_postform.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_process_arguments.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_process_headers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_put.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_put_chunked.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_quiesce-test_quiesce.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_start_stop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_termination.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_timeout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_urlparse.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -test_quiesce-test_quiesce.o: test_quiesce.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_quiesce_CFLAGS) $(CFLAGS) -MT test_quiesce-test_quiesce.o -MD -MP -MF $(DEPDIR)/test_quiesce-test_quiesce.Tpo -c -o test_quiesce-test_quiesce.o `test -f 'test_quiesce.c' || echo '$(srcdir)/'`test_quiesce.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_quiesce-test_quiesce.Tpo $(DEPDIR)/test_quiesce-test_quiesce.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_quiesce.c' object='test_quiesce-test_quiesce.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_quiesce_CFLAGS) $(CFLAGS) -c -o test_quiesce-test_quiesce.o `test -f 'test_quiesce.c' || echo '$(srcdir)/'`test_quiesce.c - -test_quiesce-test_quiesce.obj: test_quiesce.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_quiesce_CFLAGS) $(CFLAGS) -MT test_quiesce-test_quiesce.obj -MD -MP -MF $(DEPDIR)/test_quiesce-test_quiesce.Tpo -c -o test_quiesce-test_quiesce.obj `if test -f 'test_quiesce.c'; then $(CYGPATH_W) 'test_quiesce.c'; else $(CYGPATH_W) '$(srcdir)/test_quiesce.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_quiesce-test_quiesce.Tpo $(DEPDIR)/test_quiesce-test_quiesce.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_quiesce.c' object='test_quiesce-test_quiesce.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_quiesce_CFLAGS) $(CFLAGS) -c -o test_quiesce-test_quiesce.obj `if test -f 'test_quiesce.c'; then $(CYGPATH_W) 'test_quiesce.c'; else $(CYGPATH_W) '$(srcdir)/test_quiesce.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -# Recover from deleted '.trs' file; this should ensure that -# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create -# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells -# to avoid problems with "make -n". -.log.trs: - rm -f $< $@ - $(MAKE) $(AM_MAKEFLAGS) $< - -# Leading 'am--fnord' is there to ensure the list of targets does not -# expand to empty, as could happen e.g. with make check TESTS=''. -am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) -am--force-recheck: - @: - -$(TEST_SUITE_LOG): $(TEST_LOGS) - @$(am__set_TESTS_bases); \ - am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ - redo_bases=`for i in $$bases; do \ - am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ - done`; \ - if test -n "$$redo_bases"; then \ - redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ - redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ - if $(am__make_dryrun); then :; else \ - rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ - fi; \ - fi; \ - if test -n "$$am__remaking_logs"; then \ - echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ - "recursion detected" >&2; \ - else \ - am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ - fi; \ - if $(am__make_dryrun); then :; else \ - st=0; \ - errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ - for i in $$redo_bases; do \ - test -f $$i.trs && test -r $$i.trs \ - || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ - test -f $$i.log && test -r $$i.log \ - || { echo "$$errmsg $$i.log" >&2; st=1; }; \ - done; \ - test $$st -eq 0 || exit 1; \ - fi - @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ - ws='[ ]'; \ - results=`for b in $$bases; do echo $$b.trs; done`; \ - test -n "$$results" || results=/dev/null; \ - all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ - pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ - fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ - skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ - xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ - xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ - error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ - if test `expr $$fail + $$xpass + $$error` -eq 0; then \ - success=true; \ - else \ - success=false; \ - fi; \ - br='==================='; br=$$br$$br$$br$$br; \ - result_count () \ - { \ - if test x"$$1" = x"--maybe-color"; then \ - maybe_colorize=yes; \ - elif test x"$$1" = x"--no-color"; then \ - maybe_colorize=no; \ - else \ - echo "$@: invalid 'result_count' usage" >&2; exit 4; \ - fi; \ - shift; \ - desc=$$1 count=$$2; \ - if test $$maybe_colorize = yes && test $$count -gt 0; then \ - color_start=$$3 color_end=$$std; \ - else \ - color_start= color_end=; \ - fi; \ - echo "$${color_start}# $$desc $$count$${color_end}"; \ - }; \ - create_testsuite_report () \ - { \ - result_count $$1 "TOTAL:" $$all "$$brg"; \ - result_count $$1 "PASS: " $$pass "$$grn"; \ - result_count $$1 "SKIP: " $$skip "$$blu"; \ - result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ - result_count $$1 "FAIL: " $$fail "$$red"; \ - result_count $$1 "XPASS:" $$xpass "$$red"; \ - result_count $$1 "ERROR:" $$error "$$mgn"; \ - }; \ - { \ - echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ - $(am__rst_title); \ - create_testsuite_report --no-color; \ - echo; \ - echo ".. contents:: :depth: 2"; \ - echo; \ - for b in $$bases; do echo $$b; done \ - | $(am__create_global_log); \ - } >$(TEST_SUITE_LOG).tmp || exit 1; \ - mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ - if $$success; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ - fi; \ - echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ - echo "$${col}$$br$${std}"; \ - create_testsuite_report --maybe-color; \ - echo "$$col$$br$$std"; \ - if $$success; then :; else \ - echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ - if test -n "$(PACKAGE_BUGREPORT)"; then \ - echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ - fi; \ - echo "$$col$$br$$std"; \ - fi; \ - $$success || exit 1 - -check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - log_list=`for i in $$bases; do echo $$i.log; done`; \ - trs_list=`for i in $$bases; do echo $$i.trs; done`; \ - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; -recheck: all $(check_PROGRAMS) - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ - | $(am__list_recheck_tests)` || exit 1; \ - log_list=`for i in $$bases; do echo $$i.log; done`; \ - log_list=`echo $$log_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ - am__force_recheck=am--force-recheck \ - TEST_LOGS="$$log_list"; \ - exit $$? -test_start_stop.log: test_start_stop$(EXEEXT) - @p='test_start_stop$(EXEEXT)'; \ - b='test_start_stop'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_get.log: test_get$(EXEEXT) - @p='test_get$(EXEEXT)'; \ - b='test_get'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_get_sendfile.log: test_get_sendfile$(EXEEXT) - @p='test_get_sendfile$(EXEEXT)'; \ - b='test_get_sendfile'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_urlparse.log: test_urlparse$(EXEEXT) - @p='test_urlparse$(EXEEXT)'; \ - b='test_urlparse'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_put.log: test_put$(EXEEXT) - @p='test_put$(EXEEXT)'; \ - b='test_put'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_concurrent_stop.log: test_concurrent_stop$(EXEEXT) - @p='test_concurrent_stop$(EXEEXT)'; \ - b='test_concurrent_stop'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_process_headers.log: test_process_headers$(EXEEXT) - @p='test_process_headers$(EXEEXT)'; \ - b='test_process_headers'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_process_arguments.log: test_process_arguments$(EXEEXT) - @p='test_process_arguments$(EXEEXT)'; \ - b='test_process_arguments'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_parse_cookies.log: test_parse_cookies$(EXEEXT) - @p='test_parse_cookies$(EXEEXT)'; \ - b='test_parse_cookies'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_large_put.log: test_large_put$(EXEEXT) - @p='test_large_put$(EXEEXT)'; \ - b='test_large_put'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_get11.log: test_get11$(EXEEXT) - @p='test_get11$(EXEEXT)'; \ - b='test_get11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_get_sendfile11.log: test_get_sendfile11$(EXEEXT) - @p='test_get_sendfile11$(EXEEXT)'; \ - b='test_get_sendfile11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_put11.log: test_put11$(EXEEXT) - @p='test_put11$(EXEEXT)'; \ - b='test_put11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_large_put11.log: test_large_put11$(EXEEXT) - @p='test_large_put11$(EXEEXT)'; \ - b='test_large_put11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_long_header.log: test_long_header$(EXEEXT) - @p='test_long_header$(EXEEXT)'; \ - b='test_long_header'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_long_header11.log: test_long_header11$(EXEEXT) - @p='test_long_header11$(EXEEXT)'; \ - b='test_long_header11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_get_chunked.log: test_get_chunked$(EXEEXT) - @p='test_get_chunked$(EXEEXT)'; \ - b='test_get_chunked'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_put_chunked.log: test_put_chunked$(EXEEXT) - @p='test_put_chunked$(EXEEXT)'; \ - b='test_put_chunked'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_iplimit11.log: test_iplimit11$(EXEEXT) - @p='test_iplimit11$(EXEEXT)'; \ - b='test_iplimit11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_termination.log: test_termination$(EXEEXT) - @p='test_termination$(EXEEXT)'; \ - b='test_termination'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_timeout.log: test_timeout$(EXEEXT) - @p='test_timeout$(EXEEXT)'; \ - b='test_timeout'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_callback.log: test_callback$(EXEEXT) - @p='test_callback$(EXEEXT)'; \ - b='test_callback'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_get_response_cleanup.log: test_get_response_cleanup$(EXEEXT) - @p='test_get_response_cleanup$(EXEEXT)'; \ - b='test_get_response_cleanup'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -perf_get.log: perf_get$(EXEEXT) - @p='perf_get$(EXEEXT)'; \ - b='perf_get'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -perf_get_concurrent.log: perf_get_concurrent$(EXEEXT) - @p='perf_get_concurrent$(EXEEXT)'; \ - b='perf_get_concurrent'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_quiesce.log: test_quiesce$(EXEEXT) - @p='test_quiesce$(EXEEXT)'; \ - b='test_quiesce'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_post.log: test_post$(EXEEXT) - @p='test_post$(EXEEXT)'; \ - b='test_post'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_postform.log: test_postform$(EXEEXT) - @p='test_postform$(EXEEXT)'; \ - b='test_postform'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_post_loop.log: test_post_loop$(EXEEXT) - @p='test_post_loop$(EXEEXT)'; \ - b='test_post_loop'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_post11.log: test_post11$(EXEEXT) - @p='test_post11$(EXEEXT)'; \ - b='test_post11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_postform11.log: test_postform11$(EXEEXT) - @p='test_postform11$(EXEEXT)'; \ - b='test_postform11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_post_loop11.log: test_post_loop11$(EXEEXT) - @p='test_post_loop11$(EXEEXT)'; \ - b='test_post_loop11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_digestauth.log: test_digestauth$(EXEEXT) - @p='test_digestauth$(EXEEXT)'; \ - b='test_digestauth'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_digestauth_with_arguments.log: test_digestauth_with_arguments$(EXEEXT) - @p='test_digestauth_with_arguments$(EXEEXT)'; \ - b='test_digestauth_with_arguments'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -.test.log: - @p='$<'; \ - $(am__set_b); \ - $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -@am__EXEEXT_TRUE@.test$(EXEEXT).log: -@am__EXEEXT_TRUE@ @p='$<'; \ -@am__EXEEXT_TRUE@ $(am__set_b); \ -@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ -@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ -@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ -@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-recursive -all-am: Makefile $(LIBRARIES) $(PROGRAMS) -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) - -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) - -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstLIBRARIES clean-noinstPROGRAMS mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) check-am install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ - clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am recheck tags tags-am uninstall \ - uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/curl_version_check.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/curl_version_check.c deleted file mode 100644 index 518cb867..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/curl_version_check.c +++ /dev/null @@ -1,176 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file curl_version_check.c - * @brief verify required cURL version is available to run tests - * @author Sagie Amir - */ - -#include "MHD_config.h" -#include "platform.h" -#include - -#ifndef WINDOWS -#include -#endif - -static int -parse_version_number (const char **s) -{ - int i = 0; - char num[17]; - - while (i < 16 && ((**s >= '0') & (**s <= '9'))) - { - num[i] = **s; - (*s)++; - i++; - } - - num[i] = '\0'; - - return atoi (num); -} - -const char * -parse_version_string (const char *s, int *major, int *minor, int *micro) -{ - if (!s) - return NULL; - *major = parse_version_number (&s); - if (*s != '.') - return NULL; - s++; - *minor = parse_version_number (&s); - if (*s != '.') - return NULL; - s++; - *micro = parse_version_number (&s); - return s; -} - -#if HTTPS_SUPPORT -int -curl_uses_nss_ssl() -{ - return (strstr(curl_version(), " NSS/") != NULL) ? 0 : -1; -} -#endif - -/* - * check local libcurl version matches required version - */ -int -curl_check_version (const char *req_version) -{ - const char *ver; - const char *curl_ver; -#if HTTPS_SUPPORT - const char *ssl_ver; - const char *req_ssl_ver; -#endif - - int loc_major, loc_minor, loc_micro; - int rq_major, rq_minor, rq_micro; - - ver = curl_version (); -#if HAVE_MESSAGES - fprintf (stderr, "curl version: %s\n", ver); -#endif - /* - * this call relies on the cURL string to be of the exact following format : - * 'libcurl/7.16.4 OpenSSL/0.9.8g zlib/1.2.3.3 libidn/0.6.5' OR - * 'libcurl/7.18.2 GnuTLS/2.4.0 zlib/1.2.3.3 libidn/0.6.5' - */ - curl_ver = strchr (ver, '/'); - if (curl_ver == NULL) - return -1; - curl_ver++; - /* Parse version numbers */ - if ( (NULL == parse_version_string (req_version, &rq_major, &rq_minor, &rq_micro)) || - (NULL == parse_version_string (curl_ver, &loc_major, &loc_minor, &loc_micro)) ) - return -1; - - /* Compare version numbers. */ - if ((loc_major > rq_major - || (loc_major == rq_major && loc_minor > rq_minor) - || (loc_major == rq_major && loc_minor == rq_minor - && loc_micro > rq_micro) || (loc_major == rq_major - && loc_minor == rq_minor - && loc_micro == rq_micro)) == 0) - { - fprintf (stderr, - "Error: running curl test depends on local libcurl version > %s\n", - req_version); - return -1; - } - - /* - * enforce required gnutls/openssl version. - * TODO use curl version string to assert use of gnutls - */ -#if HTTPS_SUPPORT - ssl_ver = strchr (curl_ver, ' '); - if (ssl_ver == NULL) - return -1; - ssl_ver++; - if (strncmp ("GnuTLS", ssl_ver, strlen ("GNUtls")) == 0) - { - ssl_ver = strchr (ssl_ver, '/'); - req_ssl_ver = MHD_REQ_CURL_GNUTLS_VERSION; - } - else if (strncmp ("OpenSSL", ssl_ver, strlen ("OpenSSL")) == 0) - { - ssl_ver = strchr (ssl_ver, '/'); - req_ssl_ver = MHD_REQ_CURL_OPENSSL_VERSION; - } - else if (strncmp ("NSS", ssl_ver, strlen ("NSS")) == 0) - { - ssl_ver = strchr (ssl_ver, '/'); - req_ssl_ver = MHD_REQ_CURL_NSS_VERSION; - } - else - { - fprintf (stderr, "Error: unrecognized curl ssl library\n"); - return -1; - } - if (ssl_ver == NULL) - return -1; - ssl_ver++; - if ( (NULL == parse_version_string (req_ssl_ver, &rq_major, &rq_minor, &rq_micro)) || - (NULL == parse_version_string (ssl_ver, &loc_major, &loc_minor, &loc_micro)) ) - return -1; - - if ((loc_major > rq_major - || (loc_major == rq_major && loc_minor > rq_minor) - || (loc_major == rq_major && loc_minor == rq_minor - && loc_micro > rq_micro) || (loc_major == rq_major - && loc_minor == rq_minor - && loc_micro == rq_micro)) == 0) - { - fprintf (stderr, - "Error: running curl test depends on local libcurl SSL version > %s\n", - req_ssl_ver); - return -1; - } -#endif - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/gauger.h b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/gauger.h deleted file mode 100644 index 3a0dd220..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/gauger.h +++ /dev/null @@ -1,86 +0,0 @@ -/** --------------------------------------------------------------------------- - * This software is in the public domain, furnished "as is", without technical - * support, and with no warranty, express or implied, as to its usefulness for - * any purpose. - * - * gauger.h - * Interface for C programs to log remotely to a gauger server - * - * Author: Bartlomiej Polot - * -------------------------------------------------------------------------*/ -#ifndef __GAUGER_H__ -#define __GAUGER_H__ - -#ifndef WINDOWS - -#include -#include -#include - -#define GAUGER(category, counter, value, unit)\ -{\ - const char * __gauger_v[10]; \ - char __gauger_s[32];\ - pid_t __gauger_p;\ - if(!(__gauger_p=fork())){\ - if(!fork()){ \ - sprintf(__gauger_s,"%Lf", (long double) (value));\ - __gauger_v[0] = "gauger";\ - __gauger_v[1] = "-n";\ - __gauger_v[2] = counter; \ - __gauger_v[3] = "-d";\ - __gauger_v[4] = __gauger_s;\ - __gauger_v[5] = "-u";\ - __gauger_v[6] = unit; \ - __gauger_v[7] = "-c";\ - __gauger_v[8] = category; \ - __gauger_v[9] = (char *)NULL;\ - execvp("gauger", (char*const*) __gauger_v); \ - _exit(1);\ - }else{\ - _exit(0);\ - }\ - }else{\ - waitpid(__gauger_p,NULL,0);\ - }\ -} - -#define GAUGER_ID(category, counter, value, unit, id)\ -{\ - char* __gauger_v[12];\ - char __gauger_s[32];\ - pid_t __gauger_p;\ - if(!(__gauger_p=fork())){\ - if(!fork()){\ - sprintf(__gauger_s,"%Lf", (long double) (value));\ - __gauger_v[0] = "gauger";\ - __gauger_v[1] = "-n";\ - __gauger_v[2] = counter;\ - __gauger_v[3] = "-d";\ - __gauger_v[4] = __gauger_s;\ - __gauger_v[5] = "-u";\ - __gauger_v[6] = unit;\ - __gauger_v[7] = "-i";\ - __gauger_v[8] = id;\ - __gauger_v[9] = "-c";\ - __gauger_v[10] = category;\ - __gauger_v[11] = (char *)NULL;\ - execvp("gauger",__gauger_v);\ - perror("gauger");\ - _exit(1);\ - }else{\ - _exit(0);\ - }\ - }else{\ - waitpid(__gauger_p,NULL,0);\ - }\ -} - -#else - -#define GAUGER_ID(category, counter, value, unit, id) {} -#define GAUGER(category, counter, value, unit) {} - -#endif // WINDOWS - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/Makefile.am deleted file mode 100644 index 47deb708..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/Makefile.am +++ /dev/null @@ -1,153 +0,0 @@ -# This Makefile.am is in the public domain -SUBDIRS = . - -if USE_COVERAGE - AM_CFLAGS = --coverage -endif - -if HAVE_GNUTLS_SNI - TEST_HTTPS_SNI = test_https_sni -endif - -if HAVE_POSIX_THREADS - HTTPS_PARALLEL_TESTS = test_https_get_parallel \ - test_https_get_parallel_threads -endif - -CPU_COUNT_DEF = -DCPU_COUNT=$(CPU_COUNT) - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/microhttpd \ - -I$(top_srcdir)/src/platform \ - $(LIBCURL_CPPFLAGS) $(GNUTLS_CPPFLAGS) - -check_PROGRAMS = \ - test_tls_options \ - test_tls_authentication \ - test_https_multi_daemon \ - test_https_get \ - $(TEST_HTTPS_SNI) \ - test_https_get_select \ - $(HTTPS_PARALLEL_TESTS) \ - test_https_session_info \ - test_https_time_out \ - test_empty_response - -EXTRA_DIST = cert.pem key.pem tls_test_keys.h tls_test_common.h \ - host1.crt host1.key host2.crt host2.key - -TESTS = \ - test_tls_options \ - test_https_multi_daemon \ - test_https_get \ - $(TEST_HTTPS_SNI) \ - test_https_get_select \ - $(HTTPS_PARALLEL_TESTS) \ - test_https_session_info \ - test_https_time_out \ - test_tls_authentication \ - test_empty_response - - -test_https_time_out_SOURCES = \ - test_https_time_out.c \ - tls_test_common.c -test_https_time_out_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_tls_options_SOURCES = \ - test_tls_options.c \ - tls_test_common.c -test_tls_options_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_get_parallel_SOURCES = \ - test_https_get_parallel.c \ - tls_test_common.c -test_https_get_parallel_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) -test_https_get_parallel_CFLAGS = \ - $(PTHREAD_CFLAGS) $(AM_CFLAGS) -test_https_get_parallel_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(PTHREAD_LIBS) $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_empty_response_SOURCES = \ - test_empty_response.c \ - tls_test_common.c -test_empty_response_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_get_parallel_threads_SOURCES = \ - test_https_get_parallel_threads.c \ - tls_test_common.c -test_https_get_parallel_threads_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) -test_https_get_parallel_threads_CFLAGS = \ - $(PTHREAD_CFLAGS) $(AM_CFLAGS) -test_https_get_parallel_threads_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(PTHREAD_LIBS) $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_tls_authentication_SOURCES = \ - test_tls_authentication.c \ - tls_test_common.c -test_tls_authentication_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_session_info_SOURCES = \ - test_https_session_info.c \ - tls_test_common.c -test_https_session_info_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_multi_daemon_SOURCES = \ - test_https_multi_daemon.c \ - tls_test_common.c -test_https_multi_daemon_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_get_SOURCES = \ - test_https_get.c \ - tls_test_common.c -test_https_get_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -if HAVE_GNUTLS_SNI -test_https_sni_SOURCES = \ - test_https_sni.c \ - tls_test_common.c -test_https_sni_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DABS_SRCDIR=\"$(abs_srcdir)\" -test_https_sni_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ -endif - -test_https_get_select_SOURCES = \ - test_https_get_select.c \ - tls_test_common.c -test_https_get_select_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/Makefile.in deleted file mode 100644 index 8815b218..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/Makefile.in +++ /dev/null @@ -1,1578 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -check_PROGRAMS = test_tls_options$(EXEEXT) \ - test_tls_authentication$(EXEEXT) \ - test_https_multi_daemon$(EXEEXT) test_https_get$(EXEEXT) \ - $(am__EXEEXT_1) test_https_get_select$(EXEEXT) $(am__EXEEXT_2) \ - test_https_session_info$(EXEEXT) test_https_time_out$(EXEEXT) \ - test_empty_response$(EXEEXT) -TESTS = test_tls_options$(EXEEXT) test_https_multi_daemon$(EXEEXT) \ - test_https_get$(EXEEXT) $(am__EXEEXT_1) \ - test_https_get_select$(EXEEXT) $(am__EXEEXT_2) \ - test_https_session_info$(EXEEXT) test_https_time_out$(EXEEXT) \ - test_tls_authentication$(EXEEXT) test_empty_response$(EXEEXT) -subdir = src/testcurl/https -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp $(top_srcdir)/test-driver -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -@HAVE_GNUTLS_SNI_TRUE@am__EXEEXT_1 = test_https_sni$(EXEEXT) -@HAVE_POSIX_THREADS_TRUE@am__EXEEXT_2 = \ -@HAVE_POSIX_THREADS_TRUE@ test_https_get_parallel$(EXEEXT) \ -@HAVE_POSIX_THREADS_TRUE@ test_https_get_parallel_threads$(EXEEXT) -am_test_empty_response_OBJECTS = test_empty_response.$(OBJEXT) \ - tls_test_common.$(OBJEXT) -test_empty_response_OBJECTS = $(am_test_empty_response_OBJECTS) -am__DEPENDENCIES_1 = -test_empty_response_DEPENDENCIES = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -am_test_https_get_OBJECTS = test_https_get.$(OBJEXT) \ - tls_test_common.$(OBJEXT) -test_https_get_OBJECTS = $(am_test_https_get_OBJECTS) -test_https_get_DEPENDENCIES = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_test_https_get_parallel_OBJECTS = \ - test_https_get_parallel-test_https_get_parallel.$(OBJEXT) \ - test_https_get_parallel-tls_test_common.$(OBJEXT) -test_https_get_parallel_OBJECTS = \ - $(am_test_https_get_parallel_OBJECTS) -test_https_get_parallel_DEPENDENCIES = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -test_https_get_parallel_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(test_https_get_parallel_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -am_test_https_get_parallel_threads_OBJECTS = test_https_get_parallel_threads-test_https_get_parallel_threads.$(OBJEXT) \ - test_https_get_parallel_threads-tls_test_common.$(OBJEXT) -test_https_get_parallel_threads_OBJECTS = \ - $(am_test_https_get_parallel_threads_OBJECTS) -test_https_get_parallel_threads_DEPENDENCIES = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -test_https_get_parallel_threads_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(test_https_get_parallel_threads_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_test_https_get_select_OBJECTS = test_https_get_select.$(OBJEXT) \ - tls_test_common.$(OBJEXT) -test_https_get_select_OBJECTS = $(am_test_https_get_select_OBJECTS) -test_https_get_select_DEPENDENCIES = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_test_https_multi_daemon_OBJECTS = \ - test_https_multi_daemon.$(OBJEXT) tls_test_common.$(OBJEXT) -test_https_multi_daemon_OBJECTS = \ - $(am_test_https_multi_daemon_OBJECTS) -test_https_multi_daemon_DEPENDENCIES = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_test_https_session_info_OBJECTS = \ - test_https_session_info.$(OBJEXT) tls_test_common.$(OBJEXT) -test_https_session_info_OBJECTS = \ - $(am_test_https_session_info_OBJECTS) -test_https_session_info_DEPENDENCIES = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am__test_https_sni_SOURCES_DIST = test_https_sni.c tls_test_common.c -@HAVE_GNUTLS_SNI_TRUE@am_test_https_sni_OBJECTS = \ -@HAVE_GNUTLS_SNI_TRUE@ test_https_sni-test_https_sni.$(OBJEXT) \ -@HAVE_GNUTLS_SNI_TRUE@ test_https_sni-tls_test_common.$(OBJEXT) -test_https_sni_OBJECTS = $(am_test_https_sni_OBJECTS) -@HAVE_GNUTLS_SNI_TRUE@test_https_sni_DEPENDENCIES = $(top_builddir)/src/testcurl/libcurl_version_check.a \ -@HAVE_GNUTLS_SNI_TRUE@ $(top_builddir)/src/microhttpd/libmicrohttpd.la \ -@HAVE_GNUTLS_SNI_TRUE@ $(am__DEPENDENCIES_1) \ -@HAVE_GNUTLS_SNI_TRUE@ $(am__DEPENDENCIES_1) -am_test_https_time_out_OBJECTS = test_https_time_out.$(OBJEXT) \ - tls_test_common.$(OBJEXT) -test_https_time_out_OBJECTS = $(am_test_https_time_out_OBJECTS) -test_https_time_out_DEPENDENCIES = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_test_tls_authentication_OBJECTS = \ - test_tls_authentication.$(OBJEXT) tls_test_common.$(OBJEXT) -test_tls_authentication_OBJECTS = \ - $(am_test_tls_authentication_OBJECTS) -test_tls_authentication_DEPENDENCIES = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_test_tls_options_OBJECTS = test_tls_options.$(OBJEXT) \ - tls_test_common.$(OBJEXT) -test_tls_options_OBJECTS = $(am_test_tls_options_OBJECTS) -test_tls_options_DEPENDENCIES = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(test_empty_response_SOURCES) $(test_https_get_SOURCES) \ - $(test_https_get_parallel_SOURCES) \ - $(test_https_get_parallel_threads_SOURCES) \ - $(test_https_get_select_SOURCES) \ - $(test_https_multi_daemon_SOURCES) \ - $(test_https_session_info_SOURCES) $(test_https_sni_SOURCES) \ - $(test_https_time_out_SOURCES) \ - $(test_tls_authentication_SOURCES) $(test_tls_options_SOURCES) -DIST_SOURCES = $(test_empty_response_SOURCES) \ - $(test_https_get_SOURCES) $(test_https_get_parallel_SOURCES) \ - $(test_https_get_parallel_threads_SOURCES) \ - $(test_https_get_select_SOURCES) \ - $(test_https_multi_daemon_SOURCES) \ - $(test_https_session_info_SOURCES) \ - $(am__test_https_sni_SOURCES_DIST) \ - $(test_https_time_out_SOURCES) \ - $(test_tls_authentication_SOURCES) $(test_tls_options_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - check recheck distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -am__tty_colors_dummy = \ - mgn= red= grn= lgn= blu= brg= std=; \ - am__color_tests=no -am__tty_colors = { \ - $(am__tty_colors_dummy); \ - if test "X$(AM_COLOR_TESTS)" = Xno; then \ - am__color_tests=no; \ - elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ - am__color_tests=yes; \ - elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ - am__color_tests=yes; \ - fi; \ - if test $$am__color_tests = yes; then \ - red=''; \ - grn=''; \ - lgn=''; \ - blu=''; \ - mgn=''; \ - brg=''; \ - std=''; \ - fi; \ -} -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__recheck_rx = ^[ ]*:recheck:[ ]* -am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* -am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* -# A command that, given a newline-separated list of test names on the -# standard input, print the name of the tests that are to be re-run -# upon "make recheck". -am__list_recheck_tests = $(AWK) '{ \ - recheck = 1; \ - while ((rc = (getline line < ($$0 ".trs"))) != 0) \ - { \ - if (rc < 0) \ - { \ - if ((getline line2 < ($$0 ".log")) < 0) \ - recheck = 0; \ - break; \ - } \ - else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ - { \ - recheck = 0; \ - break; \ - } \ - else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ - { \ - break; \ - } \ - }; \ - if (recheck) \ - print $$0; \ - close ($$0 ".trs"); \ - close ($$0 ".log"); \ -}' -# A command that, given a newline-separated list of test names on the -# standard input, create the global log from their .trs and .log files. -am__create_global_log = $(AWK) ' \ -function fatal(msg) \ -{ \ - print "fatal: making $@: " msg | "cat >&2"; \ - exit 1; \ -} \ -function rst_section(header) \ -{ \ - print header; \ - len = length(header); \ - for (i = 1; i <= len; i = i + 1) \ - printf "="; \ - printf "\n\n"; \ -} \ -{ \ - copy_in_global_log = 1; \ - global_test_result = "RUN"; \ - while ((rc = (getline line < ($$0 ".trs"))) != 0) \ - { \ - if (rc < 0) \ - fatal("failed to read from " $$0 ".trs"); \ - if (line ~ /$(am__global_test_result_rx)/) \ - { \ - sub("$(am__global_test_result_rx)", "", line); \ - sub("[ ]*$$", "", line); \ - global_test_result = line; \ - } \ - else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ - copy_in_global_log = 0; \ - }; \ - if (copy_in_global_log) \ - { \ - rst_section(global_test_result ": " $$0); \ - while ((rc = (getline line < ($$0 ".log"))) != 0) \ - { \ - if (rc < 0) \ - fatal("failed to read from " $$0 ".log"); \ - print line; \ - }; \ - printf "\n"; \ - }; \ - close ($$0 ".trs"); \ - close ($$0 ".log"); \ -}' -# Restructured Text title. -am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } -# Solaris 10 'make', and several other traditional 'make' implementations, -# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it -# by disabling -e (using the XSI extension "set +e") if it's set. -am__sh_e_setup = case $$- in *e*) set +e;; esac -# Default flags passed to test drivers. -am__common_driver_flags = \ - --color-tests "$$am__color_tests" \ - --enable-hard-errors "$$am__enable_hard_errors" \ - --expect-failure "$$am__expect_failure" -# To be inserted before the command running the test. Creates the -# directory for the log if needed. Stores in $dir the directory -# containing $f, in $tst the test, in $log the log. Executes the -# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and -# passes TESTS_ENVIRONMENT. Set up options for the wrapper that -# will run the test scripts (or their associated LOG_COMPILER, if -# thy have one). -am__check_pre = \ -$(am__sh_e_setup); \ -$(am__vpath_adj_setup) $(am__vpath_adj) \ -$(am__tty_colors); \ -srcdir=$(srcdir); export srcdir; \ -case "$@" in \ - */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ - *) am__odir=.;; \ -esac; \ -test "x$$am__odir" = x"." || test -d "$$am__odir" \ - || $(MKDIR_P) "$$am__odir" || exit $$?; \ -if test -f "./$$f"; then dir=./; \ -elif test -f "$$f"; then dir=; \ -else dir="$(srcdir)/"; fi; \ -tst=$$dir$$f; log='$@'; \ -if test -n '$(DISABLE_HARD_ERRORS)'; then \ - am__enable_hard_errors=no; \ -else \ - am__enable_hard_errors=yes; \ -fi; \ -case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ - am__expect_failure=yes;; \ - *) \ - am__expect_failure=no;; \ -esac; \ -$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) -# A shell command to get the names of the tests scripts with any registered -# extension removed (i.e., equivalently, the names of the test logs, with -# the '.log' extension removed). The result is saved in the shell variable -# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, -# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", -# since that might cause problem with VPATH rewrites for suffix-less tests. -# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. -am__set_TESTS_bases = \ - bases='$(TEST_LOGS)'; \ - bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ - bases=`echo $$bases` -RECHECK_LOGS = $(TEST_LOGS) -TEST_SUITE_LOG = test-suite.log -TEST_EXTENSIONS = @EXEEXT@ .test -LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver -LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) -am__set_b = \ - case '$@' in \ - */*) \ - case '$*' in \ - */*) b='$*';; \ - *) b=`echo '$@' | sed 's/\.log$$//'`; \ - esac;; \ - *) \ - b='$*';; \ - esac -am__test_logs1 = $(TESTS:=.log) -am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) -TEST_LOGS = $(am__test_logs2:.test.log=.log) -TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver -TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ - $(TEST_LOG_FLAGS) -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -SUBDIRS = . -@USE_COVERAGE_TRUE@AM_CFLAGS = --coverage -@HAVE_GNUTLS_SNI_TRUE@TEST_HTTPS_SNI = test_https_sni -@HAVE_POSIX_THREADS_TRUE@HTTPS_PARALLEL_TESTS = test_https_get_parallel \ -@HAVE_POSIX_THREADS_TRUE@ test_https_get_parallel_threads - -CPU_COUNT_DEF = -DCPU_COUNT=$(CPU_COUNT) -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/microhttpd \ - -I$(top_srcdir)/src/platform \ - $(LIBCURL_CPPFLAGS) $(GNUTLS_CPPFLAGS) - -EXTRA_DIST = cert.pem key.pem tls_test_keys.h tls_test_common.h \ - host1.crt host1.key host2.crt host2.key - -test_https_time_out_SOURCES = \ - test_https_time_out.c \ - tls_test_common.c - -test_https_time_out_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_tls_options_SOURCES = \ - test_tls_options.c \ - tls_test_common.c - -test_tls_options_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_get_parallel_SOURCES = \ - test_https_get_parallel.c \ - tls_test_common.c - -test_https_get_parallel_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) - -test_https_get_parallel_CFLAGS = \ - $(PTHREAD_CFLAGS) $(AM_CFLAGS) - -test_https_get_parallel_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(PTHREAD_LIBS) $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_empty_response_SOURCES = \ - test_empty_response.c \ - tls_test_common.c - -test_empty_response_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_get_parallel_threads_SOURCES = \ - test_https_get_parallel_threads.c \ - tls_test_common.c - -test_https_get_parallel_threads_CPPFLAGS = \ - $(AM_CPPFLAGS) $(CPU_COUNT_DEF) - -test_https_get_parallel_threads_CFLAGS = \ - $(PTHREAD_CFLAGS) $(AM_CFLAGS) - -test_https_get_parallel_threads_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(PTHREAD_LIBS) $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_tls_authentication_SOURCES = \ - test_tls_authentication.c \ - tls_test_common.c - -test_tls_authentication_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_session_info_SOURCES = \ - test_https_session_info.c \ - tls_test_common.c - -test_https_session_info_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_multi_daemon_SOURCES = \ - test_https_multi_daemon.c \ - tls_test_common.c - -test_https_multi_daemon_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_get_SOURCES = \ - test_https_get.c \ - tls_test_common.c - -test_https_get_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -@HAVE_GNUTLS_SNI_TRUE@test_https_sni_SOURCES = \ -@HAVE_GNUTLS_SNI_TRUE@ test_https_sni.c \ -@HAVE_GNUTLS_SNI_TRUE@ tls_test_common.c - -@HAVE_GNUTLS_SNI_TRUE@test_https_sni_CPPFLAGS = \ -@HAVE_GNUTLS_SNI_TRUE@ $(AM_CPPFLAGS) \ -@HAVE_GNUTLS_SNI_TRUE@ -DABS_SRCDIR=\"$(abs_srcdir)\" - -@HAVE_GNUTLS_SNI_TRUE@test_https_sni_LDADD = \ -@HAVE_GNUTLS_SNI_TRUE@ $(top_builddir)/src/testcurl/libcurl_version_check.a \ -@HAVE_GNUTLS_SNI_TRUE@ $(top_builddir)/src/microhttpd/libmicrohttpd.la \ -@HAVE_GNUTLS_SNI_TRUE@ $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -test_https_get_select_SOURCES = \ - test_https_get_select.c \ - tls_test_common.c - -test_https_get_select_LDADD = \ - $(top_builddir)/src/testcurl/libcurl_version_check.a \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ - -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/testcurl/https/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/testcurl/https/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -test_empty_response$(EXEEXT): $(test_empty_response_OBJECTS) $(test_empty_response_DEPENDENCIES) $(EXTRA_test_empty_response_DEPENDENCIES) - @rm -f test_empty_response$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_empty_response_OBJECTS) $(test_empty_response_LDADD) $(LIBS) - -test_https_get$(EXEEXT): $(test_https_get_OBJECTS) $(test_https_get_DEPENDENCIES) $(EXTRA_test_https_get_DEPENDENCIES) - @rm -f test_https_get$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_https_get_OBJECTS) $(test_https_get_LDADD) $(LIBS) - -test_https_get_parallel$(EXEEXT): $(test_https_get_parallel_OBJECTS) $(test_https_get_parallel_DEPENDENCIES) $(EXTRA_test_https_get_parallel_DEPENDENCIES) - @rm -f test_https_get_parallel$(EXEEXT) - $(AM_V_CCLD)$(test_https_get_parallel_LINK) $(test_https_get_parallel_OBJECTS) $(test_https_get_parallel_LDADD) $(LIBS) - -test_https_get_parallel_threads$(EXEEXT): $(test_https_get_parallel_threads_OBJECTS) $(test_https_get_parallel_threads_DEPENDENCIES) $(EXTRA_test_https_get_parallel_threads_DEPENDENCIES) - @rm -f test_https_get_parallel_threads$(EXEEXT) - $(AM_V_CCLD)$(test_https_get_parallel_threads_LINK) $(test_https_get_parallel_threads_OBJECTS) $(test_https_get_parallel_threads_LDADD) $(LIBS) - -test_https_get_select$(EXEEXT): $(test_https_get_select_OBJECTS) $(test_https_get_select_DEPENDENCIES) $(EXTRA_test_https_get_select_DEPENDENCIES) - @rm -f test_https_get_select$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_https_get_select_OBJECTS) $(test_https_get_select_LDADD) $(LIBS) - -test_https_multi_daemon$(EXEEXT): $(test_https_multi_daemon_OBJECTS) $(test_https_multi_daemon_DEPENDENCIES) $(EXTRA_test_https_multi_daemon_DEPENDENCIES) - @rm -f test_https_multi_daemon$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_https_multi_daemon_OBJECTS) $(test_https_multi_daemon_LDADD) $(LIBS) - -test_https_session_info$(EXEEXT): $(test_https_session_info_OBJECTS) $(test_https_session_info_DEPENDENCIES) $(EXTRA_test_https_session_info_DEPENDENCIES) - @rm -f test_https_session_info$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_https_session_info_OBJECTS) $(test_https_session_info_LDADD) $(LIBS) - -test_https_sni$(EXEEXT): $(test_https_sni_OBJECTS) $(test_https_sni_DEPENDENCIES) $(EXTRA_test_https_sni_DEPENDENCIES) - @rm -f test_https_sni$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_https_sni_OBJECTS) $(test_https_sni_LDADD) $(LIBS) - -test_https_time_out$(EXEEXT): $(test_https_time_out_OBJECTS) $(test_https_time_out_DEPENDENCIES) $(EXTRA_test_https_time_out_DEPENDENCIES) - @rm -f test_https_time_out$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_https_time_out_OBJECTS) $(test_https_time_out_LDADD) $(LIBS) - -test_tls_authentication$(EXEEXT): $(test_tls_authentication_OBJECTS) $(test_tls_authentication_DEPENDENCIES) $(EXTRA_test_tls_authentication_DEPENDENCIES) - @rm -f test_tls_authentication$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_tls_authentication_OBJECTS) $(test_tls_authentication_LDADD) $(LIBS) - -test_tls_options$(EXEEXT): $(test_tls_options_OBJECTS) $(test_tls_options_DEPENDENCIES) $(EXTRA_test_tls_options_DEPENDENCIES) - @rm -f test_tls_options$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_tls_options_OBJECTS) $(test_tls_options_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_empty_response.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_get.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_get_parallel-test_https_get_parallel.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_get_parallel-tls_test_common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_get_parallel_threads-test_https_get_parallel_threads.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_get_parallel_threads-tls_test_common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_get_select.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_multi_daemon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_session_info.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_sni-test_https_sni.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_sni-tls_test_common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_https_time_out.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tls_authentication.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tls_options.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tls_test_common.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -test_https_get_parallel-test_https_get_parallel.o: test_https_get_parallel.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_CFLAGS) $(CFLAGS) -MT test_https_get_parallel-test_https_get_parallel.o -MD -MP -MF $(DEPDIR)/test_https_get_parallel-test_https_get_parallel.Tpo -c -o test_https_get_parallel-test_https_get_parallel.o `test -f 'test_https_get_parallel.c' || echo '$(srcdir)/'`test_https_get_parallel.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_get_parallel-test_https_get_parallel.Tpo $(DEPDIR)/test_https_get_parallel-test_https_get_parallel.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_https_get_parallel.c' object='test_https_get_parallel-test_https_get_parallel.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_CFLAGS) $(CFLAGS) -c -o test_https_get_parallel-test_https_get_parallel.o `test -f 'test_https_get_parallel.c' || echo '$(srcdir)/'`test_https_get_parallel.c - -test_https_get_parallel-test_https_get_parallel.obj: test_https_get_parallel.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_CFLAGS) $(CFLAGS) -MT test_https_get_parallel-test_https_get_parallel.obj -MD -MP -MF $(DEPDIR)/test_https_get_parallel-test_https_get_parallel.Tpo -c -o test_https_get_parallel-test_https_get_parallel.obj `if test -f 'test_https_get_parallel.c'; then $(CYGPATH_W) 'test_https_get_parallel.c'; else $(CYGPATH_W) '$(srcdir)/test_https_get_parallel.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_get_parallel-test_https_get_parallel.Tpo $(DEPDIR)/test_https_get_parallel-test_https_get_parallel.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_https_get_parallel.c' object='test_https_get_parallel-test_https_get_parallel.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_CFLAGS) $(CFLAGS) -c -o test_https_get_parallel-test_https_get_parallel.obj `if test -f 'test_https_get_parallel.c'; then $(CYGPATH_W) 'test_https_get_parallel.c'; else $(CYGPATH_W) '$(srcdir)/test_https_get_parallel.c'; fi` - -test_https_get_parallel-tls_test_common.o: tls_test_common.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_CFLAGS) $(CFLAGS) -MT test_https_get_parallel-tls_test_common.o -MD -MP -MF $(DEPDIR)/test_https_get_parallel-tls_test_common.Tpo -c -o test_https_get_parallel-tls_test_common.o `test -f 'tls_test_common.c' || echo '$(srcdir)/'`tls_test_common.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_get_parallel-tls_test_common.Tpo $(DEPDIR)/test_https_get_parallel-tls_test_common.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tls_test_common.c' object='test_https_get_parallel-tls_test_common.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_CFLAGS) $(CFLAGS) -c -o test_https_get_parallel-tls_test_common.o `test -f 'tls_test_common.c' || echo '$(srcdir)/'`tls_test_common.c - -test_https_get_parallel-tls_test_common.obj: tls_test_common.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_CFLAGS) $(CFLAGS) -MT test_https_get_parallel-tls_test_common.obj -MD -MP -MF $(DEPDIR)/test_https_get_parallel-tls_test_common.Tpo -c -o test_https_get_parallel-tls_test_common.obj `if test -f 'tls_test_common.c'; then $(CYGPATH_W) 'tls_test_common.c'; else $(CYGPATH_W) '$(srcdir)/tls_test_common.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_get_parallel-tls_test_common.Tpo $(DEPDIR)/test_https_get_parallel-tls_test_common.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tls_test_common.c' object='test_https_get_parallel-tls_test_common.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_CFLAGS) $(CFLAGS) -c -o test_https_get_parallel-tls_test_common.obj `if test -f 'tls_test_common.c'; then $(CYGPATH_W) 'tls_test_common.c'; else $(CYGPATH_W) '$(srcdir)/tls_test_common.c'; fi` - -test_https_get_parallel_threads-test_https_get_parallel_threads.o: test_https_get_parallel_threads.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_threads_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_threads_CFLAGS) $(CFLAGS) -MT test_https_get_parallel_threads-test_https_get_parallel_threads.o -MD -MP -MF $(DEPDIR)/test_https_get_parallel_threads-test_https_get_parallel_threads.Tpo -c -o test_https_get_parallel_threads-test_https_get_parallel_threads.o `test -f 'test_https_get_parallel_threads.c' || echo '$(srcdir)/'`test_https_get_parallel_threads.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_get_parallel_threads-test_https_get_parallel_threads.Tpo $(DEPDIR)/test_https_get_parallel_threads-test_https_get_parallel_threads.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_https_get_parallel_threads.c' object='test_https_get_parallel_threads-test_https_get_parallel_threads.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_threads_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_threads_CFLAGS) $(CFLAGS) -c -o test_https_get_parallel_threads-test_https_get_parallel_threads.o `test -f 'test_https_get_parallel_threads.c' || echo '$(srcdir)/'`test_https_get_parallel_threads.c - -test_https_get_parallel_threads-test_https_get_parallel_threads.obj: test_https_get_parallel_threads.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_threads_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_threads_CFLAGS) $(CFLAGS) -MT test_https_get_parallel_threads-test_https_get_parallel_threads.obj -MD -MP -MF $(DEPDIR)/test_https_get_parallel_threads-test_https_get_parallel_threads.Tpo -c -o test_https_get_parallel_threads-test_https_get_parallel_threads.obj `if test -f 'test_https_get_parallel_threads.c'; then $(CYGPATH_W) 'test_https_get_parallel_threads.c'; else $(CYGPATH_W) '$(srcdir)/test_https_get_parallel_threads.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_get_parallel_threads-test_https_get_parallel_threads.Tpo $(DEPDIR)/test_https_get_parallel_threads-test_https_get_parallel_threads.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_https_get_parallel_threads.c' object='test_https_get_parallel_threads-test_https_get_parallel_threads.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_threads_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_threads_CFLAGS) $(CFLAGS) -c -o test_https_get_parallel_threads-test_https_get_parallel_threads.obj `if test -f 'test_https_get_parallel_threads.c'; then $(CYGPATH_W) 'test_https_get_parallel_threads.c'; else $(CYGPATH_W) '$(srcdir)/test_https_get_parallel_threads.c'; fi` - -test_https_get_parallel_threads-tls_test_common.o: tls_test_common.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_threads_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_threads_CFLAGS) $(CFLAGS) -MT test_https_get_parallel_threads-tls_test_common.o -MD -MP -MF $(DEPDIR)/test_https_get_parallel_threads-tls_test_common.Tpo -c -o test_https_get_parallel_threads-tls_test_common.o `test -f 'tls_test_common.c' || echo '$(srcdir)/'`tls_test_common.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_get_parallel_threads-tls_test_common.Tpo $(DEPDIR)/test_https_get_parallel_threads-tls_test_common.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tls_test_common.c' object='test_https_get_parallel_threads-tls_test_common.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_threads_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_threads_CFLAGS) $(CFLAGS) -c -o test_https_get_parallel_threads-tls_test_common.o `test -f 'tls_test_common.c' || echo '$(srcdir)/'`tls_test_common.c - -test_https_get_parallel_threads-tls_test_common.obj: tls_test_common.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_threads_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_threads_CFLAGS) $(CFLAGS) -MT test_https_get_parallel_threads-tls_test_common.obj -MD -MP -MF $(DEPDIR)/test_https_get_parallel_threads-tls_test_common.Tpo -c -o test_https_get_parallel_threads-tls_test_common.obj `if test -f 'tls_test_common.c'; then $(CYGPATH_W) 'tls_test_common.c'; else $(CYGPATH_W) '$(srcdir)/tls_test_common.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_get_parallel_threads-tls_test_common.Tpo $(DEPDIR)/test_https_get_parallel_threads-tls_test_common.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tls_test_common.c' object='test_https_get_parallel_threads-tls_test_common.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_get_parallel_threads_CPPFLAGS) $(CPPFLAGS) $(test_https_get_parallel_threads_CFLAGS) $(CFLAGS) -c -o test_https_get_parallel_threads-tls_test_common.obj `if test -f 'tls_test_common.c'; then $(CYGPATH_W) 'tls_test_common.c'; else $(CYGPATH_W) '$(srcdir)/tls_test_common.c'; fi` - -test_https_sni-test_https_sni.o: test_https_sni.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_sni_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_https_sni-test_https_sni.o -MD -MP -MF $(DEPDIR)/test_https_sni-test_https_sni.Tpo -c -o test_https_sni-test_https_sni.o `test -f 'test_https_sni.c' || echo '$(srcdir)/'`test_https_sni.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_sni-test_https_sni.Tpo $(DEPDIR)/test_https_sni-test_https_sni.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_https_sni.c' object='test_https_sni-test_https_sni.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_sni_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_https_sni-test_https_sni.o `test -f 'test_https_sni.c' || echo '$(srcdir)/'`test_https_sni.c - -test_https_sni-test_https_sni.obj: test_https_sni.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_sni_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_https_sni-test_https_sni.obj -MD -MP -MF $(DEPDIR)/test_https_sni-test_https_sni.Tpo -c -o test_https_sni-test_https_sni.obj `if test -f 'test_https_sni.c'; then $(CYGPATH_W) 'test_https_sni.c'; else $(CYGPATH_W) '$(srcdir)/test_https_sni.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_sni-test_https_sni.Tpo $(DEPDIR)/test_https_sni-test_https_sni.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_https_sni.c' object='test_https_sni-test_https_sni.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_sni_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_https_sni-test_https_sni.obj `if test -f 'test_https_sni.c'; then $(CYGPATH_W) 'test_https_sni.c'; else $(CYGPATH_W) '$(srcdir)/test_https_sni.c'; fi` - -test_https_sni-tls_test_common.o: tls_test_common.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_sni_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_https_sni-tls_test_common.o -MD -MP -MF $(DEPDIR)/test_https_sni-tls_test_common.Tpo -c -o test_https_sni-tls_test_common.o `test -f 'tls_test_common.c' || echo '$(srcdir)/'`tls_test_common.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_sni-tls_test_common.Tpo $(DEPDIR)/test_https_sni-tls_test_common.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tls_test_common.c' object='test_https_sni-tls_test_common.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_sni_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_https_sni-tls_test_common.o `test -f 'tls_test_common.c' || echo '$(srcdir)/'`tls_test_common.c - -test_https_sni-tls_test_common.obj: tls_test_common.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_sni_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_https_sni-tls_test_common.obj -MD -MP -MF $(DEPDIR)/test_https_sni-tls_test_common.Tpo -c -o test_https_sni-tls_test_common.obj `if test -f 'tls_test_common.c'; then $(CYGPATH_W) 'tls_test_common.c'; else $(CYGPATH_W) '$(srcdir)/tls_test_common.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_https_sni-tls_test_common.Tpo $(DEPDIR)/test_https_sni-tls_test_common.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tls_test_common.c' object='test_https_sni-tls_test_common.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_https_sni_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_https_sni-tls_test_common.obj `if test -f 'tls_test_common.c'; then $(CYGPATH_W) 'tls_test_common.c'; else $(CYGPATH_W) '$(srcdir)/tls_test_common.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -# Recover from deleted '.trs' file; this should ensure that -# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create -# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells -# to avoid problems with "make -n". -.log.trs: - rm -f $< $@ - $(MAKE) $(AM_MAKEFLAGS) $< - -# Leading 'am--fnord' is there to ensure the list of targets does not -# expand to empty, as could happen e.g. with make check TESTS=''. -am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) -am--force-recheck: - @: - -$(TEST_SUITE_LOG): $(TEST_LOGS) - @$(am__set_TESTS_bases); \ - am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ - redo_bases=`for i in $$bases; do \ - am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ - done`; \ - if test -n "$$redo_bases"; then \ - redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ - redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ - if $(am__make_dryrun); then :; else \ - rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ - fi; \ - fi; \ - if test -n "$$am__remaking_logs"; then \ - echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ - "recursion detected" >&2; \ - else \ - am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ - fi; \ - if $(am__make_dryrun); then :; else \ - st=0; \ - errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ - for i in $$redo_bases; do \ - test -f $$i.trs && test -r $$i.trs \ - || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ - test -f $$i.log && test -r $$i.log \ - || { echo "$$errmsg $$i.log" >&2; st=1; }; \ - done; \ - test $$st -eq 0 || exit 1; \ - fi - @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ - ws='[ ]'; \ - results=`for b in $$bases; do echo $$b.trs; done`; \ - test -n "$$results" || results=/dev/null; \ - all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ - pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ - fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ - skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ - xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ - xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ - error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ - if test `expr $$fail + $$xpass + $$error` -eq 0; then \ - success=true; \ - else \ - success=false; \ - fi; \ - br='==================='; br=$$br$$br$$br$$br; \ - result_count () \ - { \ - if test x"$$1" = x"--maybe-color"; then \ - maybe_colorize=yes; \ - elif test x"$$1" = x"--no-color"; then \ - maybe_colorize=no; \ - else \ - echo "$@: invalid 'result_count' usage" >&2; exit 4; \ - fi; \ - shift; \ - desc=$$1 count=$$2; \ - if test $$maybe_colorize = yes && test $$count -gt 0; then \ - color_start=$$3 color_end=$$std; \ - else \ - color_start= color_end=; \ - fi; \ - echo "$${color_start}# $$desc $$count$${color_end}"; \ - }; \ - create_testsuite_report () \ - { \ - result_count $$1 "TOTAL:" $$all "$$brg"; \ - result_count $$1 "PASS: " $$pass "$$grn"; \ - result_count $$1 "SKIP: " $$skip "$$blu"; \ - result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ - result_count $$1 "FAIL: " $$fail "$$red"; \ - result_count $$1 "XPASS:" $$xpass "$$red"; \ - result_count $$1 "ERROR:" $$error "$$mgn"; \ - }; \ - { \ - echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ - $(am__rst_title); \ - create_testsuite_report --no-color; \ - echo; \ - echo ".. contents:: :depth: 2"; \ - echo; \ - for b in $$bases; do echo $$b; done \ - | $(am__create_global_log); \ - } >$(TEST_SUITE_LOG).tmp || exit 1; \ - mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ - if $$success; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ - fi; \ - echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ - echo "$${col}$$br$${std}"; \ - create_testsuite_report --maybe-color; \ - echo "$$col$$br$$std"; \ - if $$success; then :; else \ - echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ - if test -n "$(PACKAGE_BUGREPORT)"; then \ - echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ - fi; \ - echo "$$col$$br$$std"; \ - fi; \ - $$success || exit 1 - -check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - log_list=`for i in $$bases; do echo $$i.log; done`; \ - trs_list=`for i in $$bases; do echo $$i.trs; done`; \ - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; -recheck: all $(check_PROGRAMS) - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ - | $(am__list_recheck_tests)` || exit 1; \ - log_list=`for i in $$bases; do echo $$i.log; done`; \ - log_list=`echo $$log_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ - am__force_recheck=am--force-recheck \ - TEST_LOGS="$$log_list"; \ - exit $$? -test_tls_options.log: test_tls_options$(EXEEXT) - @p='test_tls_options$(EXEEXT)'; \ - b='test_tls_options'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_https_multi_daemon.log: test_https_multi_daemon$(EXEEXT) - @p='test_https_multi_daemon$(EXEEXT)'; \ - b='test_https_multi_daemon'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_https_get.log: test_https_get$(EXEEXT) - @p='test_https_get$(EXEEXT)'; \ - b='test_https_get'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_https_sni.log: test_https_sni$(EXEEXT) - @p='test_https_sni$(EXEEXT)'; \ - b='test_https_sni'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_https_get_select.log: test_https_get_select$(EXEEXT) - @p='test_https_get_select$(EXEEXT)'; \ - b='test_https_get_select'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_https_get_parallel.log: test_https_get_parallel$(EXEEXT) - @p='test_https_get_parallel$(EXEEXT)'; \ - b='test_https_get_parallel'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_https_get_parallel_threads.log: test_https_get_parallel_threads$(EXEEXT) - @p='test_https_get_parallel_threads$(EXEEXT)'; \ - b='test_https_get_parallel_threads'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_https_session_info.log: test_https_session_info$(EXEEXT) - @p='test_https_session_info$(EXEEXT)'; \ - b='test_https_session_info'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_https_time_out.log: test_https_time_out$(EXEEXT) - @p='test_https_time_out$(EXEEXT)'; \ - b='test_https_time_out'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_tls_authentication.log: test_tls_authentication$(EXEEXT) - @p='test_tls_authentication$(EXEEXT)'; \ - b='test_tls_authentication'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_empty_response.log: test_empty_response$(EXEEXT) - @p='test_empty_response$(EXEEXT)'; \ - b='test_empty_response'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -.test.log: - @p='$<'; \ - $(am__set_b); \ - $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -@am__EXEEXT_TRUE@.test$(EXEEXT).log: -@am__EXEEXT_TRUE@ @p='$<'; \ -@am__EXEEXT_TRUE@ $(am__set_b); \ -@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ -@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ -@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ -@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) - -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) - -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) check-am install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ - clean-libtool cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ - uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/cert.pem b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/cert.pem deleted file mode 100644 index 2c766dff..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/cert.pem +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICpjCCAZCgAwIBAgIESEPtjjALBgkqhkiG9w0BAQUwADAeFw0wODA2MDIxMjU0 -MzhaFw0wOTA2MDIxMjU0NDZaMAAwggEfMAsGCSqGSIb3DQEBAQOCAQ4AMIIBCQKC -AQC03TyUvK5HmUAirRp067taIEO4bibh5nqolUoUdo/LeblMQV+qnrv/RNAMTx5X -fNLZ45/kbM9geF8qY0vsPyQvP4jumzK0LOJYuIwmHaUm9vbXnYieILiwCuTgjaud -3VkZDoQ9fteIo+6we9UTpVqZpxpbLulBMh/VsvX0cPJ1VFC7rT59o9hAUlFf9jX/ -GmKdYI79MtgVx0OPBjmmSD6kicBBfmfgkO7bIGwlRtsIyMznxbHu6VuoX/eVxrTv -rmCwgEXLWRZ6ru8MQl5YfqeGXXRVwMeXU961KefbuvmEPccgCxm8FZ1C1cnDHFXh -siSgAzMBjC/b6KVhNQ4KnUdZAgMBAAGjLzAtMAwGA1UdEwEB/wQCMAAwHQYDVR0O -BBYEFJcUvpjvE5fF/yzUshkWDpdYiQh/MAsGCSqGSIb3DQEBBQOCAQEARP7eKSB2 -RNd6XjEjK0SrxtoTnxS3nw9sfcS7/qD1+XHdObtDFqGNSjGYFB3Gpx8fpQhCXdoN -8QUs3/5ZVa5yjZMQewWBgz8kNbnbH40F2y81MHITxxCe1Y+qqHWwVaYLsiOTqj2/ -0S3QjEJ9tvklmg7JX09HC4m5QRYfWBeQLD1u8ZjA1Sf1xJriomFVyRLI2VPO2bNe -JDMXWuP+8kMC7gEvUnJ7A92Y2yrhu3QI3bjPk8uSpHea19Q77tul1UVBJ5g+zpH3 -OsF5p0MyaVf09GTzcLds5nE/osTdXGUyHJapWReVmPm3Zn6gqYlnzD99z+DPIgIV -RhZvQx74NQnS6g== ------END CERTIFICATE----- diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host1.crt b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host1.crt deleted file mode 100644 index d9b8b999..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host1.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWTCCAcICCQDc4McLp7j56DANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJa -WjETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 -cyBQdHkgTHRkMQ4wDAYDVQQDDAVob3N0MTEZMBcGCSqGSIb3DQEJARYKdGVzdEBo -b3N0MTAgFw0xMzExMTcxNTE2MzdaGA8yMTEzMTAyNDE1MTYzN1owcDELMAkGA1UE -BhMCWloxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdp -ZGdpdHMgUHR5IEx0ZDEOMAwGA1UEAwwFaG9zdDExGTAXBgkqhkiG9w0BCQEWCnRl -c3RAaG9zdDEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKxYiRUzfQnekQn3 -6e+hP/mt/JEkiFzX5TV+E19ue2v4tc7lf+SoLEk2dVt5tGQkHjIGeFFNwCLrgXoi -h3KfP4R1IYe7NFbM+lFVwPceF3inJ75dZD80BxaXQANeh0yC/DhaVJUFNaof2S4+ -7xd8zTL6M11gME+XmR8uaDvW7EBtAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAf62m -Nstj9p9u8T5A5fRnJWfoglH/zfm7IHzht0Wi047O3NFZJ0pOPqV97HuErUA5oBGg -qswnyRGyGMcvL08Bki7Q6NkY7K0ON3lq+ofTkIAHlOKMF+Y/otbjuIDHBfo63tmE -uOcr8XDQGu9R0cfh+qLgicJQd/8cFBhxsL0ls6I= ------END CERTIFICATE----- diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host1.key b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host1.key deleted file mode 100644 index f549a4dc..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host1.key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQCsWIkVM30J3pEJ9+nvoT/5rfyRJIhc1+U1fhNfbntr+LXO5X/k -qCxJNnVbebRkJB4yBnhRTcAi64F6Iodynz+EdSGHuzRWzPpRVcD3Hhd4pye+XWQ/ -NAcWl0ADXodMgvw4WlSVBTWqH9kuPu8XfM0y+jNdYDBPl5kfLmg71uxAbQIDAQAB -AoGBAJvq9QmjLSnymtCj4pYSEai2iNpebKdiAlEkoC4j67DArupgohWhN398ryt0 -rYgzTMYBKHSVnI969AYkmtlNzM1yNckRQb/G/tWrkl9re28y2nbAExtHbvLoTk2C -a/EEl1Op+JZNzLoSje7IQMVZoArD3d4aUbfux4XzlO2eRNmZAkEA2pV49QgcOTOJ -PrR5cgekonNdeMtkbZm9dhxgDk9IsYkC0iOxjn/IbeCQN3wuTQ5/yLoiiQ/CQ8w5 -JndF/XpICwJBAMnY37BSRb+XKZeJWP0yjqyFJwzHXkh6IsoSF2OOXSixdiMpthLh -IPzvo6Qxsnha4VvwuDxljHzQFPgMT//CTGcCQQDMs9S+LKU50JDEX4Goj43X8RBl -cp0Poz3yYap3XDqowLYalADRgcvzUq3cuHgoA98Z3W9ASrjUg2o2ItcyBhV3AkAK -bCBgwl7Hnc6P/I+Tw2CKl/WEO2cq5uOU+4opodg9maw39JdqMiW56cXRXJ+Sh17L -mIpq0/OFHll21WvsEORRAkAnDDn/vmW25PSxPVY7tKKJCCkmtBeLQpySfpDgBF+O -QvvokKs2COivc50rmOYNvD1WSsAOspdaSoZUgFw5ikti ------END RSA PRIVATE KEY----- diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host2.crt b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host2.crt deleted file mode 100644 index ac28b0e9..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host2.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWTCCAcICCQCJ9nhDYTUBKjANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJa -WjETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 -cyBQdHkgTHRkMQ4wDAYDVQQDDAVob3N0MjEZMBcGCSqGSIb3DQEJARYKdGVzdEBo -b3N0MjAgFw0xMzExMTcxNTE2NDNaGA8yMTEzMTAyNDE1MTY0M1owcDELMAkGA1UE -BhMCWloxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdp -ZGdpdHMgUHR5IEx0ZDEOMAwGA1UEAwwFaG9zdDIxGTAXBgkqhkiG9w0BCQEWCnRl -c3RAaG9zdDIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALVK8QKMvU96iNL2 -66PKm6xXw9NPHDn+o1TLF1CQRxXMrBYUrObk0961+3n3Z3BXOFHKfSV4E55CpVyz -D1Wcadlt3B9z3ke3HOi0lEa1xNJTMQK/QT3Fx/NURmNg5s9HAsqY4ocb9KHaF5Ex -0TgC0L0aRP0cK1x2TgPEHBNcgGl9AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAEXOi -9rSmVrTN5olIdowctr1vWbGwRCjCnAFXDsqakcDASNthr15LB5kr/mrA3olJjbZh -o+JDvWMY6FN8r1QXW0RL9/obbHxtJpwvAmYVMY9jrR8Rpo38p4RfXlN85g3q9PVx -5IGLaOqLf4hSnKArFL/fzXwxX9b5HBCKlXfiuqM= ------END CERTIFICATE----- diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host2.key b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host2.key deleted file mode 100644 index 4bbd6178..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/host2.key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQC1SvECjL1PeojS9uujypusV8PTTxw5/qNUyxdQkEcVzKwWFKzm -5NPetft592dwVzhRyn0leBOeQqVcsw9VnGnZbdwfc95HtxzotJRGtcTSUzECv0E9 -xcfzVEZjYObPRwLKmOKHG/Sh2heRMdE4AtC9GkT9HCtcdk4DxBwTXIBpfQIDAQAB -AoGAR5Do6TfDt69IefdNeCAQKg2PWUg+fUpfEacGciAyX5GnUSQiSReF58HxHumi -ZL+ZlPgZRQRMwknO23Q4FnSjd66A3E9iHLqkWxRFJWME6E7zgtBrIjctnNu9uYM9 -cw4R6qmXOL7C5sK00KXF2ep8+s+JjrZz61o85QnGGRYA94ECQQDbG6f1B8NKY9T1 -1GDR/++rJbdTVQlZQcKSXMumpU6V3mEV0O9GkYaZzoYvWa3kx6c0np4karrm3QWa -u5E0q1YdAkEA09FPcmzVvIR0+sMWca8QJ/tJUxD6qYo8vLOpO4wt4iTPhGBEU+Q5 -cgXmde3/plVsp0vYxK/NG5XZkoC1fbuC4QJATRGxRlLwsl3jLoUBeVxY5Q5jKYCj -xS2ITwss5vUGa1jJNW9EesH9YmRudoFI1UwU2EFixtRz4Xik3ARV0vzhUQJAfabT -50ASxqMYtczW2peMEPurMqCG4d4ES7iUMqPkcBuAErn8rntbbH19igWmOyi/rLp8 -m6jiFnQdPiAmCbEbYQJAFAKiQl2ZOe3gkSh8MaQilD8Ppog6rod4SQiSmRNsDWPi -IxqXneaGDWhzynC9xr4SwuJ9D5VxW1phNyiveDuYXw== ------END RSA PRIVATE KEY----- diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/key.pem b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/key.pem deleted file mode 100644 index a5848eed..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAtN08lLyuR5lAIq0adOu7WiBDuG4m4eZ6qJVKFHaPy3m5TEFf -qp67/0TQDE8eV3zS2eOf5GzPYHhfKmNL7D8kLz+I7psytCziWLiMJh2lJvb2152I -niC4sArk4I2rnd1ZGQ6EPX7XiKPusHvVE6VamacaWy7pQTIf1bL19HDydVRQu60+ -faPYQFJRX/Y1/xpinWCO/TLYFcdDjwY5pkg+pInAQX5n4JDu2yBsJUbbCMjM58Wx -7ulbqF/3lca0765gsIBFy1kWeq7vDEJeWH6nhl10VcDHl1PetSnn27r5hD3HIAsZ -vBWdQtXJwxxV4bIkoAMzAYwv2+ilYTUOCp1HWQIDAQABAoIBAArOQv3R7gmqDspj -lDaTFOz0C4e70QfjGMX0sWnakYnDGn6DU19iv3GnX1S072ejtgc9kcJ4e8VUO79R -EmqpdRR7k8dJr3RTUCyjzf/C+qiCzcmhCFYGN3KRHA6MeEnkvRuBogX4i5EG1k5l -/5t+YBTZBnqXKWlzQLKoUAiMLPg0eRWh+6q7H4N7kdWWBmTpako7TEqpIwuEnPGx -u3EPuTR+LN6lF55WBePbCHccUHUQaXuav18NuDkcJmCiMArK9SKb+h0RqLD6oMI/ -dKD6n8cZXeMBkK+C8U/K0sN2hFHACsu30b9XfdnljgP9v+BP8GhnB0nCB6tNBCPo -32srOwECgYEAxWh3iBT4lWqL6bZavVbnhmvtif4nHv2t2/hOs/CAq8iLAw0oWGZc -+JEZTUDMvFRlulr0kcaWra+4fN3OmJnjeuFXZq52lfMgXBIKBmoSaZpIh2aDY1Rd -RbEse7nQl9hTEPmYspiXLGtnAXW7HuWqVfFFP3ya8rUS3t4d07Hig8ECgYEA6ou6 -OHiBRTbtDqLIv8NghARc/AqwNWgEc9PelCPe5bdCOLBEyFjqKiT2MttnSSUc2Zob -XhYkHC6zN1Mlq30N0e3Q61YK9LxMdU1vsluXxNq2rfK1Scb1oOlOOtlbV3zA3VRF -hV3t1nOA9tFmUrwZi0CUMWJE/zbPAyhwWotKyZkCgYEAh0kFicPdbABdrCglXVae -SnfSjVwYkVuGd5Ze0WADvjYsVkYBHTvhgRNnRJMg+/vWz3Sf4Ps4rgUbqK8Vc20b -AU5G6H6tlCvPRGm0ZxrwTWDHTcuKRVs+pJE8C/qWoklE/AAhjluWVoGwUMbPGuiH -6Gf1bgHF6oj/Sq7rv/VLZ8ECgYBeq7ml05YyLuJutuwa4yzQ/MXfghzv4aVyb0F3 -QCdXR6o2IYgR6jnSewrZKlA9aPqFJrwHNR6sNXlnSmt5Fcf/RWO/qgJQGLUv3+rG -7kuLTNDR05azSdiZc7J89ID3Bkb+z2YkV+6JUiPq/Ei1+nDBEXb/m+/HqALU/nyj -P3gXeQKBgBusb8Rbd+KgxSA0hwY6aoRTPRt8LNvXdsB9vRcKKHUFQvxUWiUSS+L9 -/Qu1sJbrUquKOHqksV5wCnWnAKyJNJlhHuBToqQTgKXjuNmVdYSe631saiI7PHyC -eRJ6DxULPxABytJrYCRrNqmXi5TCiqR2mtfalEMOPxz8rUU8dYyx ------END RSA PRIVATE KEY----- diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_empty_response.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_empty_response.c deleted file mode 100644 index f9f8001f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_empty_response.c +++ /dev/null @@ -1,201 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2013 Christian Grothoff - - libmicrohttpd 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 3, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - -/** - * @file test_empty_response.c - * @brief Testcase for libmicrohttpd HTTPS GET operations with emtpy reply - * @author Christian Grothoff - */ -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include -#include -#include "tls_test_common.h" - -extern const char srv_key_pem[]; -extern const char srv_self_signed_cert_pem[]; -extern const char srv_signed_cert_pem[]; -extern const char srv_signed_key_pem[]; - -static int oneone; - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - struct MHD_Response *response; - int ret; - - response = MHD_create_response_from_buffer (0, NULL, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -static int -testInternalSelectGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL | MHD_USE_SELECT_INTERNALLY, - 1082, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_END); - if (d == NULL) - return 256; - - char *aes256_sha = "AES256-SHA"; - if (curl_uses_nss_ssl() == 0) - { - aes256_sha = "rsa_aes_256_sha"; - } - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "https://127.0.0.1:1082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - /* TLS options */ - curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); - curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, aes256_sha); - curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != 0) - return 8192; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - if (0 != curl_global_init (CURL_GLOBAL_ALL)) - { - fprintf (stderr, "Error: %s\n", strerror (errno)); - return -1; - } - if (0 != (errorCount = testInternalSelectGet ())) - fprintf (stderr, "Fail: %d\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get.c deleted file mode 100644 index f7957c33..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get.c +++ /dev/null @@ -1,130 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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 3, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_https_get.c - * @brief Testcase for libmicrohttpd HTTPS GET operations - * @author Sagie Amir - */ - -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include -#include -#include "tls_test_common.h" - -extern const char srv_key_pem[]; -extern const char srv_self_signed_cert_pem[]; -extern const char srv_signed_cert_pem[]; -extern const char srv_signed_key_pem[]; - - -static int -test_cipher_option (FILE * test_fd, - const char *cipher_suite, - int proto_version) -{ - - int ret; - struct MHD_Daemon *d; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | - MHD_USE_DEBUG, 4233, - NULL, NULL, &http_ahc, NULL, - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_END); - - if (d == NULL) - { - fprintf (stderr, MHD_E_SERVER_INIT); - return -1; - } - - ret = test_https_transfer (test_fd, cipher_suite, proto_version); - - MHD_stop_daemon (d); - return ret; -} - - -/* perform a HTTP GET request via SSL/TLS */ -static int -test_secure_get (FILE * test_fd, - const char *cipher_suite, - int proto_version) -{ - int ret; - struct MHD_Daemon *d; - - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | - MHD_USE_DEBUG, 4233, - NULL, NULL, &http_ahc, NULL, - MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem, - MHD_OPTION_END); - - if (d == NULL) - { - fprintf (stderr, MHD_E_SERVER_INIT); - return -1; - } - - ret = test_https_transfer (test_fd, cipher_suite, proto_version); - - MHD_stop_daemon (d); - return ret; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - const char *aes256_sha_tlsv1 = "AES256-SHA"; - const char *des_cbc3_sha_tlsv1 = "DES-CBC3-SHA"; - - gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif - if (0 != curl_global_init (CURL_GLOBAL_ALL)) - { - fprintf (stderr, "Error: %s\n", strerror (errno)); - return -1; - } - - if (curl_uses_nss_ssl() == 0) - { - aes256_sha_tlsv1 = "rsa_aes_256_sha"; - des_cbc3_sha_tlsv1 = "rsa_aes_128_sha"; - } - - errorCount += - test_secure_get (NULL, aes256_sha_tlsv1, CURL_SSLVERSION_TLSv1); - errorCount += - test_cipher_option (NULL, des_cbc3_sha_tlsv1, CURL_SSLVERSION_TLSv1); - print_test_result (errorCount, argv[0]); - - curl_global_cleanup (); - - return errorCount != 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get_parallel.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get_parallel.c deleted file mode 100644 index 166e400f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get_parallel.c +++ /dev/null @@ -1,185 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_https_get_parallel.c - * @brief Testcase for libmicrohttpd HTTPS GET operations - * @author Sagie Amir - * @author Christian Grothoff - */ - -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include -#include -#include -#include "tls_test_common.h" - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 4 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 4 -#endif - -extern const char srv_key_pem[]; -extern const char srv_self_signed_cert_pem[]; - -int curl_check_version (const char *req_version, ...); - - -/** - * used when spawning multiple threads executing curl server requests - * - */ -static void * -https_transfer_thread_adapter (void *args) -{ - static int nonnull; - struct https_test_data *cargs = args; - int ret; - - /* time spread incomming requests */ - usleep ((useconds_t) 10.0 * ((double) rand ()) / ((double) RAND_MAX)); - ret = test_https_transfer (NULL, - cargs->cipher_suite, cargs->proto_version); - if (ret == 0) - return NULL; - return &nonnull; -} - - -/** - * Test non-parallel requests. - * - * @return: 0 upon all client requests returning '0', -1 otherwise. - * - * TODO : make client_count a parameter - number of curl client threads to spawn - */ -static int -test_single_client (void *cls, const char *cipher_suite, - int curl_proto_version) -{ - void *client_thread_ret; - struct https_test_data client_args = - { NULL, cipher_suite, curl_proto_version }; - - client_thread_ret = https_transfer_thread_adapter (&client_args); - if (client_thread_ret != NULL) - return -1; - return 0; -} - - -/** - * Test parallel request handling. - * - * @return: 0 upon all client requests returning '0', -1 otherwise. - * - * TODO : make client_count a parameter - numver of curl client threads to spawn - */ -static int -test_parallel_clients (void * cls, const char *cipher_suite, - int curl_proto_version) -{ - int i; - int client_count = (CPU_COUNT - 1); - void *client_thread_ret; - pthread_t client_arr[client_count]; - struct https_test_data client_args = - { NULL, cipher_suite, curl_proto_version }; - - for (i = 0; i < client_count; ++i) - { - if (pthread_create (&client_arr[i], NULL, - &https_transfer_thread_adapter, &client_args) != 0) - { - fprintf (stderr, "Error: failed to spawn test client threads.\n"); - return -1; - } - } - - /* check all client requests fulfilled correctly */ - for (i = 0; i < client_count; ++i) - { - if ((pthread_join (client_arr[i], &client_thread_ret) != 0) || - (client_thread_ret != NULL)) - return -1; - } - - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - const char *aes256_sha = "AES256-SHA"; - - /* initialize random seed used by curl clients */ - unsigned int iseed = (unsigned int) time (NULL); - srand (iseed); - if (0 != curl_global_init (CURL_GLOBAL_ALL)) - { - fprintf (stderr, "Error: %s\n", strerror (errno)); - return -1; - } - - if (curl_uses_nss_ssl() == 0) - aes256_sha = "rsa_aes_256_sha"; -#if EPOLL_SUPPORT - errorCount += - test_wrap ("single threaded daemon, single client, epoll", &test_single_client, - NULL, - MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL | MHD_USE_DEBUG | MHD_USE_EPOLL_LINUX_ONLY, - aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, - srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, - srv_self_signed_cert_pem, MHD_OPTION_END); -#endif - errorCount += - test_wrap ("single threaded daemon, single client", &test_single_client, - NULL, - MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL | MHD_USE_DEBUG, - aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, - srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, - srv_self_signed_cert_pem, MHD_OPTION_END); -#if EPOLL_SUPPORT - errorCount += - test_wrap ("single threaded daemon, parallel clients, epoll", - &test_parallel_clients, NULL, - MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL | MHD_USE_DEBUG | MHD_USE_EPOLL_LINUX_ONLY, - aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, - srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, - srv_self_signed_cert_pem, MHD_OPTION_END); -#endif - errorCount += - test_wrap ("single threaded daemon, parallel clients", - &test_parallel_clients, NULL, - MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL | MHD_USE_DEBUG, - aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, - srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, - srv_self_signed_cert_pem, MHD_OPTION_END); - - curl_global_cleanup (); - return errorCount != 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get_parallel_threads.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get_parallel_threads.c deleted file mode 100644 index 4cb2128e..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get_parallel_threads.c +++ /dev/null @@ -1,191 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file tls_thread_mode_test.c - * @brief Testcase for libmicrohttpd HTTPS GET operations - * @author Sagie Amir - * @author Christian Grothoff - * - * TODO: add test for external select! - */ - -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include -#include -#include -#include "tls_test_common.h" - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 4 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 4 -#endif - -extern const char srv_key_pem[]; -extern const char srv_self_signed_cert_pem[]; - -int curl_check_version (const char *req_version, ...); - -/** - * used when spawning multiple threads executing curl server requests - * - */ -static void * -https_transfer_thread_adapter (void *args) -{ - static int nonnull; - struct https_test_data *cargs = args; - int ret; - - /* time spread incomming requests */ - usleep ((useconds_t) 10.0 * ((double) rand ()) / ((double) RAND_MAX)); - ret = test_https_transfer (cargs->cls, - cargs->cipher_suite, cargs->proto_version); - if (ret == 0) - return NULL; - return &nonnull; -} - -/** - * Test non-parallel requests. - * - * @return: 0 upon all client requests returning '0', -1 otherwise. - * - * TODO : make client_count a parameter - numver of curl client threads to spawn - */ -static int -test_single_client (void *cls, const char *cipher_suite, - int curl_proto_version) -{ - void *client_thread_ret; - struct https_test_data client_args = - { NULL, cipher_suite, curl_proto_version }; - - client_thread_ret = https_transfer_thread_adapter (&client_args); - if (client_thread_ret != NULL) - return -1; - return 0; -} - - -/** - * Test parallel request handling. - * - * @return: 0 upon all client requests returning '0', -1 otherwise. - * - * TODO : make client_count a parameter - numver of curl client threads to spawn - */ -static int -test_parallel_clients (void *cls, const char *cipher_suite, - int curl_proto_version) -{ - int i; - int client_count = (CPU_COUNT - 1); - void *client_thread_ret; - pthread_t client_arr[client_count]; - struct https_test_data client_args = - { NULL, cipher_suite, curl_proto_version }; - - for (i = 0; i < client_count; ++i) - { - if (pthread_create (&client_arr[i], NULL, - &https_transfer_thread_adapter, &client_args) != 0) - { - fprintf (stderr, "Error: failed to spawn test client threads.\n"); - - return -1; - } - } - - /* check all client requests fulfilled correctly */ - for (i = 0; i < client_count; ++i) - { - if ((pthread_join (client_arr[i], &client_thread_ret) != 0) || - (client_thread_ret != NULL)) - return -1; - } - - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - const char *ssl_version; - - /* initialize random seed used by curl clients */ - unsigned int iseed = (unsigned int) time (NULL); - -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif - srand (iseed); - ssl_version = curl_version_info (CURLVERSION_NOW)->ssl_version; - if (NULL == ssl_version) - { - fprintf (stderr, "Curl does not support SSL. Cannot run the test.\n"); - return 0; - } - if (0 != strncmp (ssl_version, "GnuTLS", 6)) - { - fprintf (stderr, "This test can be run only with libcurl-gnutls.\n"); - return 0; - } - if (0 != curl_global_init (CURL_GLOBAL_ALL)) - { - fprintf (stderr, "Error: %s\n", strerror (errno)); - return -1; - } - - char *aes256_sha = "AES256-SHA"; - if (curl_uses_nss_ssl() == 0) - { - aes256_sha = "rsa_aes_256_sha"; - } - - errorCount += - test_wrap ("multi threaded daemon, single client", &test_single_client, - NULL, - MHD_USE_SSL | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION, - aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, - srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, - srv_self_signed_cert_pem, MHD_OPTION_END); - - errorCount += - test_wrap ("multi threaded daemon, parallel client", - &test_parallel_clients, NULL, - MHD_USE_SSL | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION, - aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, - srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, - srv_self_signed_cert_pem, MHD_OPTION_END); - - if (errorCount != 0) - fprintf (stderr, "Failed test: %s.\n", argv[0]); - - curl_global_cleanup (); - return errorCount != 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get_select.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get_select.c deleted file mode 100644 index 9f9ba99f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_get_select.c +++ /dev/null @@ -1,228 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - -/** - * @file test_https_get_select.c - * @brief Testcase for libmicrohttpd HTTPS GET operations - * @author Sagie Amir - */ - -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include -#include -#include "tls_test_common.h" - -extern const char srv_key_pem[]; -extern const char srv_self_signed_cert_pem[]; -extern const char srv_signed_cert_pem[]; -extern const char srv_signed_key_pem[]; - -static int oneone; - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static int -testExternalGet (int flags) -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - const char *aes256_sha = "AES256-SHA"; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL | flags, - 1082, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_END); - if (d == NULL) - return 256; - - if (curl_uses_nss_ssl() == 0) - aes256_sha = "rsa_aes_256_sha"; - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "https://127.0.0.1:1082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - /* TLS options */ - curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); - curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, aes256_sha); - curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 8192; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - if (0 != curl_global_init (CURL_GLOBAL_ALL)) - { - fprintf (stderr, "Error: %s\n", strerror (errno)); - return -1; - } -#if EPOLL_SUPPORT - if (0 != (errorCount = testExternalGet (MHD_USE_EPOLL_LINUX_ONLY))) - fprintf (stderr, "Fail: %d\n", errorCount); -#endif - if (0 != (errorCount = testExternalGet (0))) - fprintf (stderr, "Fail: %d\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_multi_daemon.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_multi_daemon.c deleted file mode 100644 index 293aff4e..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_multi_daemon.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - -/** - * @file mhds_multi_daemon_test.c - * @brief Testcase for libmicrohttpd multiple HTTPS daemon scenario - * @author Sagie Amir - */ - -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include -#include -#include "tls_test_common.h" - -extern int curl_check_version (const char *req_version, ...); -extern const char srv_key_pem[]; -extern const char srv_self_signed_cert_pem[]; - -/* - * assert initiating two separate daemons and having one shut down - * doesn't affect the other - */ -static int -test_concurent_daemon_pair (void *cls, - const char *cipher_suite, - int proto_version) -{ - - int ret; - struct MHD_Daemon *d1; - struct MHD_Daemon *d2; - - d1 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | - MHD_USE_DEBUG, DEAMON_TEST_PORT, - NULL, NULL, &http_ahc, NULL, - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_END); - - if (d1 == NULL) - { - fprintf (stderr, MHD_E_SERVER_INIT); - return -1; - } - - d2 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | - MHD_USE_DEBUG, DEAMON_TEST_PORT + 1, - NULL, NULL, &http_ahc, NULL, - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_END); - - if (d2 == NULL) - { - MHD_stop_daemon (d1); - fprintf (stderr, MHD_E_SERVER_INIT); - return -1; - } - - ret = - test_daemon_get (NULL, cipher_suite, proto_version, DEAMON_TEST_PORT, 0); - ret += - test_daemon_get (NULL, cipher_suite, proto_version, - DEAMON_TEST_PORT + 1, 0); - - MHD_stop_daemon (d2); - ret += - test_daemon_get (NULL, cipher_suite, proto_version, DEAMON_TEST_PORT, 0); - MHD_stop_daemon (d1); - return ret; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - FILE *cert; - - gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif - if (0 != curl_global_init (CURL_GLOBAL_ALL)) - { - fprintf (stderr, "Error (code: %u). l:%d f:%s\n", errorCount, __LINE__, - __FUNCTION__); - return -1; - } - if ((cert = setup_ca_cert ()) == NULL) - { - fprintf (stderr, MHD_E_TEST_FILE_CREAT); - return -1; - } - - const char *aes256_sha = "AES256-SHA"; - if (curl_uses_nss_ssl() == 0) - { - aes256_sha = "rsa_aes_256_sha"; - } - - errorCount += - test_concurent_daemon_pair (NULL, aes256_sha, CURL_SSLVERSION_TLSv1); - - print_test_result (errorCount, "concurent_daemon_pair"); - - curl_global_cleanup (); - fclose (cert); - if (0 != remove (ca_cert_file_name)) - fprintf (stderr, - "Failed to remove `%s'\n", - ca_cert_file_name); - return errorCount != 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_session_info.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_session_info.c deleted file mode 100644 index 8dac2533..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_session_info.c +++ /dev/null @@ -1,186 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - -/** - * @file mhds_session_info_test.c - * @brief Testcase for libmicrohttpd HTTPS connection querying operations - * @author Sagie Amir - */ - -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include "tls_test_common.h" - -extern int curl_check_version (const char *req_version, ...); -extern const char srv_key_pem[]; -extern const char srv_self_signed_cert_pem[]; - -struct MHD_Daemon *d; - -/* - * HTTP access handler call back - * used to query negotiated security parameters - */ -static int -query_session_ahc (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, - const char *upload_data, const char *version, - size_t *upload_data_size, void **ptr) -{ - struct MHD_Response *response; - int ret; - - if (NULL == *ptr) - { - *ptr = &query_session_ahc; - return MHD_YES; - } - - if (GNUTLS_TLS1_1 != - (ret = MHD_get_connection_info - (connection, - MHD_CONNECTION_INFO_PROTOCOL)->protocol)) - { - if (GNUTLS_TLS1_2 == ret) - { - /* as usual, TLS implementations sometimes don't - quite do what was asked, just mildly complain... */ - fprintf (stderr, - "Warning: requested TLS 1.1, got TLS 1.2\n"); - } - else - { - /* really different version... */ - fprintf (stderr, - "Error: requested protocol mismatch (wanted %d, got %d)\n", - GNUTLS_TLS1_1, - ret); - return -1; - } - } - - response = MHD_create_response_from_buffer (strlen (EMPTY_PAGE), - (void *) EMPTY_PAGE, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -/** - * negotiate a secure connection with server & query negotiated security parameters - */ -static int -test_query_session () -{ - CURL *c; - struct CBC cbc; - CURLcode errornum; - char url[256]; - - if (NULL == (cbc.buf = malloc (sizeof (char) * 255))) - return 16; - cbc.size = 255; - cbc.pos = 0; - - gen_test_file_url (url, DEAMON_TEST_PORT); - - /* setup test */ - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | - MHD_USE_DEBUG, DEAMON_TEST_PORT, - NULL, NULL, &query_session_ahc, NULL, - MHD_OPTION_HTTPS_PRIORITIES, "NORMAL:+ARCFOUR-128", - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_END); - - if (d == NULL) - return 2; - - const char *aes256_sha = "AES256-SHA"; - if (curl_uses_nss_ssl() == 0) - { - aes256_sha = "rsa_aes_256_sha"; - } - - c = curl_easy_init (); -#if DEBUG_HTTPS_TEST - curl_easy_setopt (c, CURLOPT_VERBOSE, 1); -#endif - curl_easy_setopt (c, CURLOPT_URL, url); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 10L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 10L); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_FILE, &cbc); - /* TLS options */ - curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_1); - curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, aes256_sha); - /* currently skip any peer authentication */ - curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - - MHD_stop_daemon (d); - curl_easy_cleanup (c); - free (cbc.buf); - return -1; - } - - curl_easy_cleanup (c); - MHD_stop_daemon (d); - free (cbc.buf); - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif - if (0 != curl_global_init (CURL_GLOBAL_ALL)) - { - fprintf (stderr, "Error (code: %u)\n", errorCount); - return -1; - } - errorCount += test_query_session (); - print_test_result (errorCount, argv[0]); - curl_global_cleanup (); - if (errorCount > 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - return errorCount; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_sni.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_sni.c deleted file mode 100644 index 8c4dea66..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_sni.c +++ /dev/null @@ -1,291 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2013 Christian Grothoff - - libmicrohttpd 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 3, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_https_sni.c - * @brief Testcase for libmicrohttpd HTTPS with SNI operations - * @author Christian Grothoff - */ -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include -#include -#include "tls_test_common.h" -#include - -/* This test only works with GnuTLS >= 3.0 */ -#if GNUTLS_VERSION_MAJOR >= 3 - -#include - -/** - * A hostname, server key and certificate. - */ -struct Hosts -{ - struct Hosts *next; - const char *hostname; - gnutls_pcert_st pcrt; - gnutls_privkey_t key; -}; - - -/** - * Linked list of supported TLDs and respective certificates. - */ -static struct Hosts *hosts; - -/* Load the certificate and the private key. - * (This code is largely taken from GnuTLS). - */ -static void -load_keys(const char *hostname, - const char *CERT_FILE, - const char *KEY_FILE) -{ - int ret; - gnutls_datum_t data; - struct Hosts *host; - - host = malloc (sizeof (struct Hosts)); - if (NULL == host) - abort (); - host->hostname = hostname; - host->next = hosts; - hosts = host; - - ret = gnutls_load_file (CERT_FILE, &data); - if (ret < 0) - { - fprintf (stderr, - "*** Error loading certificate file %s.\n", - CERT_FILE); - exit (1); - } - ret = - gnutls_pcert_import_x509_raw (&host->pcrt, &data, GNUTLS_X509_FMT_PEM, - 0); - if (ret < 0) - { - fprintf (stderr, - "*** Error loading certificate file: %s\n", - gnutls_strerror (ret)); - exit (1); - } - gnutls_free (data.data); - - ret = gnutls_load_file (KEY_FILE, &data); - if (ret < 0) - { - fprintf (stderr, - "*** Error loading key file %s.\n", - KEY_FILE); - exit (1); - } - - gnutls_privkey_init (&host->key); - ret = - gnutls_privkey_import_x509_raw (host->key, - &data, GNUTLS_X509_FMT_PEM, - NULL, 0); - if (ret < 0) - { - fprintf (stderr, - "*** Error loading key file: %s\n", - gnutls_strerror (ret)); - exit (1); - } - gnutls_free (data.data); -} - - - -/** - * @param session the session we are giving a cert for - * @param req_ca_dn NULL on server side - * @param nreqs length of req_ca_dn, and thus 0 on server side - * @param pk_algos NULL on server side - * @param pk_algos_length 0 on server side - * @param pcert list of certificates (to be set) - * @param pcert_length length of pcert (to be set) - * @param pkey the private key (to be set) - */ -static int -sni_callback (gnutls_session_t session, - const gnutls_datum_t* req_ca_dn, - int nreqs, - const gnutls_pk_algorithm_t* pk_algos, - int pk_algos_length, - gnutls_pcert_st** pcert, - unsigned int *pcert_length, - gnutls_privkey_t * pkey) -{ - char name[256]; - size_t name_len; - struct Hosts *host; - unsigned int type; - - name_len = sizeof (name); - if (GNUTLS_E_SUCCESS != - gnutls_server_name_get (session, - name, - &name_len, - &type, - 0 /* index */)) - return -1; - for (host = hosts; NULL != host; host = host->next) - if (0 == strncmp (name, host->hostname, name_len)) - break; - if (NULL == host) - { - fprintf (stderr, - "Need certificate for %.*s\n", - (int) name_len, - name); - return -1; - } -#if 0 - fprintf (stderr, - "Returning certificate for %.*s\n", - (int) name_len, - name); -#endif - *pkey = host->key; - *pcert_length = 1; - *pcert = &host->pcrt; - return 0; -} - - -/* perform a HTTP GET request via SSL/TLS */ -static int -do_get (const char *url) -{ - CURL *c; - struct CBC cbc; - CURLcode errornum; - size_t len; - struct curl_slist *dns_info; - - len = strlen (test_data); - if (NULL == (cbc.buf = malloc (sizeof (char) * len))) - { - fprintf (stderr, MHD_E_MEM); - return -1; - } - cbc.size = len; - cbc.pos = 0; - - c = curl_easy_init (); -#if DEBUG_HTTPS_TEST - curl_easy_setopt (c, CURLOPT_VERBOSE, 1); -#endif - curl_easy_setopt (c, CURLOPT_URL, url); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 10L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 10L); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_FILE, &cbc); - - /* perform peer authentication */ - /* TODO merge into send_curl_req */ - curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 2); - dns_info = curl_slist_append (NULL, "host1:4233:127.0.0.1"); - dns_info = curl_slist_append (dns_info, "host2:4233:127.0.0.1"); - curl_easy_setopt (c, CURLOPT_RESOLVE, dns_info); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - free (cbc.buf); - curl_slist_free_all (dns_info); - return errornum; - } - - curl_easy_cleanup (c); - curl_slist_free_all (dns_info); - if (memcmp (cbc.buf, test_data, len) != 0) - { - fprintf (stderr, "Error: local file & received file differ.\n"); - free (cbc.buf); - return -1; - } - - free (cbc.buf); - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int error_count = 0; - struct MHD_Daemon *d; - - gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif - if (0 != curl_global_init (CURL_GLOBAL_ALL)) - { - fprintf (stderr, "Error: %s\n", strerror (errno)); - return -1; - } - load_keys ("host1", ABS_SRCDIR "/host1.crt", ABS_SRCDIR "/host1.key"); - load_keys ("host2", ABS_SRCDIR "/host2.crt", ABS_SRCDIR "/host2.key"); - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | MHD_USE_DEBUG, - 4233, - NULL, NULL, - &http_ahc, NULL, - MHD_OPTION_HTTPS_CERT_CALLBACK, &sni_callback, - MHD_OPTION_END); - if (d == NULL) - { - fprintf (stderr, MHD_E_SERVER_INIT); - return -1; - } - error_count += do_get ("https://host1:4233/"); - error_count += do_get ("https://host2:4233/"); - - MHD_stop_daemon (d); - curl_global_cleanup (); - return error_count != 0; -} - - -#else - -int main () -{ - fprintf (stderr, - "SNI not supported by GnuTLS < 3.0\n"); - return 0; -} -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_time_out.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_time_out.c deleted file mode 100644 index 124a2804..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_https_time_out.c +++ /dev/null @@ -1,146 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - -/** - * @file mhds_get_test.c - * @brief: daemon TLS alert response test-case - * - * @author Sagie Amir - */ - -#include "platform.h" -#include "microhttpd.h" -#include "internal.h" -#include "tls_test_common.h" -#include - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif - -extern const char srv_key_pem[]; -extern const char srv_self_signed_cert_pem[]; - -static const int TIME_OUT = 3; - -static int -test_tls_session_time_out (gnutls_session_t session) -{ - int ret; - MHD_socket sd; - struct sockaddr_in sa; - - sd = socket (AF_INET, SOCK_STREAM, 0); - if (sd == -1) - { - fprintf (stderr, "Failed to create socket: %s\n", strerror (errno)); - return -1; - } - - memset (&sa, '\0', sizeof (struct sockaddr_in)); - sa.sin_family = AF_INET; - sa.sin_port = htons (DEAMON_TEST_PORT); - sa.sin_addr.s_addr = htonl (INADDR_LOOPBACK); - - gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) (intptr_t) sd); - - ret = connect (sd, &sa, sizeof (struct sockaddr_in)); - - if (ret < 0) - { - fprintf (stderr, "Error: %s\n", MHD_E_FAILED_TO_CONNECT); - close (sd); - return -1; - } - - ret = gnutls_handshake (session); - if (ret < 0) - { - fprintf (stderr, "Handshake failed\n"); - close (sd); - return -1; - } - - sleep (TIME_OUT + 1); - - /* check that server has closed the connection */ - /* TODO better RST trigger */ - if (send (sd, "", 1, 0) == 0) - { - fprintf (stderr, "Connection failed to time-out\n"); - close (sd); - return -1; - } - - close (sd); - return 0; -} - - -int -main (int argc, char *const *argv) -{ - int errorCount = 0;; - struct MHD_Daemon *d; - gnutls_session_t session; - gnutls_datum_t key; - gnutls_datum_t cert; - gnutls_certificate_credentials_t xcred; - - - gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif - gnutls_global_init (); - gnutls_global_set_log_level (11); - - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | - MHD_USE_DEBUG, DEAMON_TEST_PORT, - NULL, NULL, &http_dummy_ahc, NULL, - MHD_OPTION_CONNECTION_TIMEOUT, TIME_OUT, - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_END); - - if (d == NULL) - { - fprintf (stderr, MHD_E_SERVER_INIT); - return -1; - } - - if (0 != setup_session (&session, &key, &cert, &xcred)) - { - fprintf (stderr, "failed to setup session\n"); - return 1; - } - errorCount += test_tls_session_time_out (session); - teardown_session (session, &key, &cert, xcred); - - print_test_result (errorCount, argv[0]); - - MHD_stop_daemon (d); - gnutls_global_deinit (); - - return errorCount != 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_tls_authentication.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_tls_authentication.c deleted file mode 100644 index cc9c76d7..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_tls_authentication.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - -/** - * @file tls_authentication_test.c - * @brief Testcase for libmicrohttpd HTTPS GET operations - * @author Sagie Amir - */ - -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include -#include -#include "tls_test_common.h" - -extern int curl_check_version (const char *req_version, ...); -extern const char test_file_data[]; - -extern const char ca_key_pem[]; -extern const char ca_cert_pem[]; -extern const char srv_signed_cert_pem[]; -extern const char srv_signed_key_pem[]; - - - -/* perform a HTTP GET request via SSL/TLS */ -static int -test_secure_get (void * cls, char *cipher_suite, int proto_version) -{ - int ret; - struct MHD_Daemon *d; - - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | - MHD_USE_DEBUG, DEAMON_TEST_PORT, - NULL, NULL, &http_ahc, NULL, - MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem, - MHD_OPTION_END); - - if (d == NULL) - { - fprintf (stderr, MHD_E_SERVER_INIT); - return -1; - } - - ret = test_daemon_get (NULL, cipher_suite, proto_version, DEAMON_TEST_PORT, 0); - - MHD_stop_daemon (d); - return ret; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif - if (setup_ca_cert () == NULL) - { - fprintf (stderr, MHD_E_TEST_FILE_CREAT); - return -1; - } - - if (0 != curl_global_init (CURL_GLOBAL_ALL)) - { - fprintf (stderr, "Error (code: %u)\n", errorCount); - return -1; - } - - char *aes256_sha = "AES256-SHA"; - if (curl_uses_nss_ssl() == 0) - { - aes256_sha = "rsa_aes_256_sha"; - } - - errorCount += - test_secure_get (NULL, aes256_sha, CURL_SSLVERSION_TLSv1); - - print_test_result (errorCount, argv[0]); - - curl_global_cleanup (); - if (0 != remove (ca_cert_file_name)) - fprintf (stderr, - "Failed to remove `%s'\n", - ca_cert_file_name); - return errorCount != 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_tls_options.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_tls_options.c deleted file mode 100644 index 7dd01a72..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/test_tls_options.c +++ /dev/null @@ -1,155 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2010 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file tls_daemon_options_test.c - * @brief Testcase for libmicrohttpd HTTPS GET operations - * @author Sagie Amir - */ - -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include -#include "tls_test_common.h" - -extern const char srv_key_pem[]; -extern const char srv_self_signed_cert_pem[]; - -int curl_check_version (const char *req_version, ...); - -/** - * test server refuses to negotiate connections with unsupported protocol versions - * - */ -static int -test_unmatching_ssl_version (void * cls, const char *cipher_suite, - int curl_req_ssl_version) -{ - struct CBC cbc; - if (NULL == (cbc.buf = malloc (sizeof (char) * 256))) - { - fprintf (stderr, "Error: failed to allocate: %s\n", - strerror (errno)); - return -1; - } - cbc.size = 256; - cbc.pos = 0; - - char url[255]; - if (gen_test_file_url (url, DEAMON_TEST_PORT)) - { - free (cbc.buf); - fprintf (stderr, "Internal error in gen_test_file_url\n"); - return -1; - } - - /* assert daemon *rejected* request */ - if (CURLE_OK == - send_curl_req (url, &cbc, cipher_suite, curl_req_ssl_version)) - { - free (cbc.buf); - fprintf (stderr, "cURL failed to reject request despite SSL version missmatch!\n"); - return -1; - } - - free (cbc.buf); - return 0; -} - - -/* setup a temporary transfer test file */ -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - const char *ssl_version; - int daemon_flags = - MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | MHD_USE_DEBUG; - - gcry_control (GCRYCTL_DISABLE_SECMEM, 0); - gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif - if (curl_check_version (MHD_REQ_CURL_VERSION)) - { - return 0; - } - ssl_version = curl_version_info (CURLVERSION_NOW)->ssl_version; - if (NULL == ssl_version) - { - fprintf (stderr, "Curl does not support SSL. Cannot run the test.\n"); - return 0; - } - if (0 != strncmp (ssl_version, "GnuTLS", 6)) - { - fprintf (stderr, "This test can be run only with libcurl-gnutls.\n"); - return 0; - } - - if (0 != curl_global_init (CURL_GLOBAL_ALL)) - { - fprintf (stderr, "Error: %s\n", strerror (errno)); - return 0; - } - - const char *aes128_sha = "AES128-SHA"; - const char *aes256_sha = "AES256-SHA"; - if (curl_uses_nss_ssl() == 0) - { - aes128_sha = "rsa_aes_128_sha"; - aes256_sha = "rsa_aes_256_sha"; - } - - - if (0 != - test_wrap ("TLS1.0-AES-SHA1", - &test_https_transfer, NULL, daemon_flags, - aes128_sha, - CURL_SSLVERSION_TLSv1, - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_HTTPS_PRIORITIES, "NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+RSA:+COMP-NULL", - MHD_OPTION_END)) - { - fprintf (stderr, "TLS1.0-AES-SHA1 test failed\n"); - errorCount++; - } - fprintf (stderr, - "The following handshake should fail (and print an error message)...\n"); - if (0 != - test_wrap ("TLS1.0 vs SSL3", - &test_unmatching_ssl_version, NULL, daemon_flags, - aes256_sha, - CURL_SSLVERSION_SSLv3, - MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, - MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, - MHD_OPTION_HTTPS_PRIORITIES, "NONE:+VERS-TLS1.0:+AES-256-CBC:+SHA1:+RSA:+COMP-NULL", - MHD_OPTION_END)) - { - fprintf (stderr, "TLS1.0 vs SSL3 test failed\n"); - errorCount++; - } - curl_global_cleanup (); - - return errorCount != 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/tls_test_common.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/tls_test_common.c deleted file mode 100644 index f9175828..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/tls_test_common.c +++ /dev/null @@ -1,484 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - -/** - * @file tls_test_common.c - * @brief Common tls test functions - * @author Sagie Amir - */ -#include "tls_test_common.h" -#include "tls_test_keys.h" - - -int curl_check_version (const char *req_version, ...); - -FILE * -setup_ca_cert () -{ - FILE *cert_fd; - - if (NULL == (cert_fd = fopen (ca_cert_file_name, "wb+"))) - { - fprintf (stderr, "Error: failed to open `%s': %s\n", - ca_cert_file_name, strerror (errno)); - return NULL; - } - if (fwrite (ca_cert_pem, sizeof (char), strlen (ca_cert_pem) + 1, cert_fd) - != strlen (ca_cert_pem) + 1) - { - fprintf (stderr, "Error: failed to write `%s. %s'\n", - ca_cert_file_name, strerror (errno)); - fclose (cert_fd); - return NULL; - } - if (fflush (cert_fd)) - { - fprintf (stderr, "Error: failed to flush ca cert file stream. %s\n", - strerror (errno)); - fclose (cert_fd); - return NULL; - } - return cert_fd; -} - - -/* - * test HTTPS transfer - */ -int -test_daemon_get (void *cls, - const char *cipher_suite, int proto_version, - int port, - int ver_peer) -{ - CURL *c; - struct CBC cbc; - CURLcode errornum; - char url[255]; - size_t len; - - len = strlen (test_data); - if (NULL == (cbc.buf = malloc (sizeof (char) * len))) - { - fprintf (stderr, MHD_E_MEM); - return -1; - } - cbc.size = len; - cbc.pos = 0; - - /* construct url - this might use doc_path */ - gen_test_file_url (url, port); - - c = curl_easy_init (); -#if DEBUG_HTTPS_TEST - curl_easy_setopt (c, CURLOPT_VERBOSE, 1); -#endif - curl_easy_setopt (c, CURLOPT_URL, url); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 10L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 10L); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_FILE, &cbc); - - /* TLS options */ - curl_easy_setopt (c, CURLOPT_SSLVERSION, proto_version); - curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, cipher_suite); - - /* perform peer authentication */ - /* TODO merge into send_curl_req */ - curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, ver_peer); - curl_easy_setopt (c, CURLOPT_CAINFO, ca_cert_file_name); - curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - free (cbc.buf); - return errornum; - } - - curl_easy_cleanup (c); - - if (memcmp (cbc.buf, test_data, len) != 0) - { - fprintf (stderr, "Error: local file & received file differ.\n"); - free (cbc.buf); - return -1; - } - - free (cbc.buf); - return 0; -} - - -void -print_test_result (int test_outcome, char *test_name) -{ -#if 0 - if (test_outcome != 0) - fprintf (stderr, "running test: %s [fail]\n", test_name); - else - fprintf (stdout, "running test: %s [pass]\n", test_name); -#endif -} - -size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -/** - * HTTP access handler call back - */ -int -http_ahc (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, const char *upload_data, - const char *version, size_t *upload_data_size, void **ptr) -{ - static int aptr; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (method, MHD_HTTP_METHOD_GET)) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - *ptr = NULL; /* reset when done */ - response = MHD_create_response_from_buffer (strlen (test_data), - (void *) test_data, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - -/* HTTP access handler call back */ -int -http_dummy_ahc (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, const char *upload_data, - const char *version, size_t *upload_data_size, - void **ptr) -{ - return 0; -} - -/** - * send a test http request to the daemon - * @param url - * @param cbc - may be null - * @param cipher_suite - * @param proto_version - * @return - */ -/* TODO have test wrap consider a NULL cbc */ -int -send_curl_req (char *url, struct CBC * cbc, const char *cipher_suite, - int proto_version) -{ - CURL *c; - CURLcode errornum; - c = curl_easy_init (); -#if DEBUG_HTTPS_TEST - curl_easy_setopt (c, CURLOPT_VERBOSE, CURL_VERBOS_LEVEL); -#endif - curl_easy_setopt (c, CURLOPT_URL, url); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 60L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 60L); - - if (cbc != NULL) - { - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_FILE, cbc); - } - - /* TLS options */ - curl_easy_setopt (c, CURLOPT_SSLVERSION, proto_version); - curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, cipher_suite); - - /* currently skip any peer authentication */ - curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0); - - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - return errornum; - } - curl_easy_cleanup (c); - - return CURLE_OK; -} - - -/** - * compile test file url pointing to the current running directory path - * - * @param url - char buffer into which the url is compiled - * @param port port to use for the test - * @return -1 on error - */ -int -gen_test_file_url (char *url, int port) -{ - int ret = 0; - char *doc_path; - size_t doc_path_len; - /* setup test file path, url */ - doc_path_len = PATH_MAX > 4096 ? 4096 : PATH_MAX; - if (NULL == (doc_path = malloc (doc_path_len))) - { - fprintf (stderr, MHD_E_MEM); - return -1; - } - if (getcwd (doc_path, doc_path_len) == NULL) - { - fprintf (stderr, "Error: failed to get working directory. %s\n", - strerror (errno)); - ret = -1; - } -#ifdef WINDOWS - { - int i; - for (i = 0; i < doc_path_len; i++) - { - if (doc_path[i] == 0) - break; - if (doc_path[i] == '\\') - { - doc_path[i] = '/'; - } - if (doc_path[i] != ':') - continue; - if (i == 0) - break; - doc_path[i] = doc_path[i - 1]; - doc_path[i - 1] = '/'; - } - } -#endif - /* construct url - this might use doc_path */ - if (sprintf (url, "%s:%d%s/%s", "https://127.0.0.1", port, - doc_path, "urlpath") < 0) - ret = -1; - - free (doc_path); - return ret; -} - -/** - * test HTTPS file transfer - */ -int -test_https_transfer (void *cls, const char *cipher_suite, int proto_version) -{ - int len; - int ret = 0; - struct CBC cbc; - char url[255]; - - len = strlen (test_data); - if (NULL == (cbc.buf = malloc (sizeof (char) * len))) - { - fprintf (stderr, MHD_E_MEM); - return -1; - } - cbc.size = len; - cbc.pos = 0; - - if (gen_test_file_url (url, DEAMON_TEST_PORT)) - { - ret = -1; - goto cleanup; - } - - if (CURLE_OK != send_curl_req (url, &cbc, cipher_suite, proto_version)) - { - ret = -1; - goto cleanup; - } - - /* compare test file & daemon responce */ - if ( (len != strlen (test_data)) || - (memcmp (cbc.buf, - test_data, - len) != 0) ) - { - fprintf (stderr, "Error: local file & received file differ.\n"); - ret = -1; - } -cleanup: - free (cbc.buf); - return ret; -} - -/** - * setup test case - * - * @param d - * @param daemon_flags - * @param arg_list - * @return - */ -int -setup_testcase (struct MHD_Daemon **d, int daemon_flags, va_list arg_list) -{ - *d = MHD_start_daemon_va (daemon_flags, DEAMON_TEST_PORT, - NULL, NULL, &http_ahc, NULL, arg_list); - - if (*d == NULL) - { - fprintf (stderr, MHD_E_SERVER_INIT); - return -1; - } - - return 0; -} - -void -teardown_testcase (struct MHD_Daemon *d) -{ - MHD_stop_daemon (d); -} - -int -setup_session (gnutls_session_t * session, - gnutls_datum_t * key, - gnutls_datum_t * cert, - gnutls_certificate_credentials_t * xcred) -{ - int ret; - const char *err_pos; - - gnutls_certificate_allocate_credentials (xcred); - key->size = strlen (srv_key_pem) + 1; - key->data = malloc (key->size); - if (NULL == key->data) - { - gnutls_certificate_free_credentials (*xcred); - return -1; - } - memcpy (key->data, srv_key_pem, key->size); - cert->size = strlen (srv_self_signed_cert_pem) + 1; - cert->data = malloc (cert->size); - if (NULL == cert->data) - { - gnutls_certificate_free_credentials (*xcred); - free (key->data); - return -1; - } - memcpy (cert->data, srv_self_signed_cert_pem, cert->size); - gnutls_certificate_set_x509_key_mem (*xcred, cert, key, - GNUTLS_X509_FMT_PEM); - gnutls_init (session, GNUTLS_CLIENT); - ret = gnutls_priority_set_direct (*session, - "NORMAL", &err_pos); - if (ret < 0) - { - gnutls_deinit (*session); - gnutls_certificate_free_credentials (*xcred); - free (key->data); - return -1; - } - gnutls_credentials_set (*session, - GNUTLS_CRD_CERTIFICATE, - *xcred); - return 0; -} - -int -teardown_session (gnutls_session_t session, - gnutls_datum_t * key, - gnutls_datum_t * cert, - gnutls_certificate_credentials_t xcred) -{ - free (key->data); - key->data = NULL; - key->size = 0; - free (cert->data); - cert->data = NULL; - cert->size = 0; - gnutls_deinit (session); - gnutls_certificate_free_credentials (xcred); - return 0; -} - -/* TODO test_wrap: change sig to (setup_func, test, va_list test_arg) */ -int -test_wrap (const char *test_name, int - (*test_function) (void * cls, const char *cipher_suite, - int proto_version), void * cls, - int daemon_flags, const char *cipher_suite, int proto_version, ...) -{ - int ret; - va_list arg_list; - struct MHD_Daemon *d; - - va_start (arg_list, proto_version); - if (setup_testcase (&d, daemon_flags, arg_list) != 0) - { - va_end (arg_list); - fprintf (stderr, "Failed to setup testcase %s\n", test_name); - return -1; - } -#if 0 - fprintf (stdout, "running test: %s ", test_name); -#endif - ret = test_function (NULL, cipher_suite, proto_version); -#if 0 - if (ret == 0) - { - fprintf (stdout, "[pass]\n"); - } - else - { - fprintf (stdout, "[fail]\n"); - } -#endif - teardown_testcase (d); - va_end (arg_list); - return ret; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/tls_test_common.h b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/tls_test_common.h deleted file mode 100644 index 20198f7b..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/tls_test_common.h +++ /dev/null @@ -1,141 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - -#ifndef TLS_TEST_COMMON_H_ -#define TLS_TEST_COMMON_H_ - -#include "platform.h" -#include "microhttpd.h" -#include -#include -#include -#include - -/* this enables verbos CURL version checking */ -#define DEBUG_HTTPS_TEST 0 -#define CURL_VERBOS_LEVEL 0 - -#define DEAMON_TEST_PORT 4233 - -#define test_data "Hello World\n" -#define ca_cert_file_name "tmp_ca_cert.pem" - -#define EMPTY_PAGE "Empty pageEmpty page" -#define PAGE_NOT_FOUND "File not foundFile not found" - -#define MHD_E_MEM "Error: memory error\n" -#define MHD_E_SERVER_INIT "Error: failed to start server\n" -#define MHD_E_TEST_FILE_CREAT "Error: failed to setup test file\n" -#define MHD_E_CERT_FILE_CREAT "Error: failed to setup test certificate\n" -#define MHD_E_KEY_FILE_CREAT "Error: failed to setup test certificate\n" -#define MHD_E_FAILED_TO_CONNECT "Error: server connection could not be established\n" - -/* TODO rm if unused */ -struct https_test_data -{ - void *cls; - const char *cipher_suite; - int proto_version; -}; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -struct CipherDef -{ - int options[2]; - char *curlname; -}; - - -int curl_check_version (const char *req_version, ...); -int curl_uses_nss_ssl (); - - -FILE * -setup_ca_cert (); - -/** - * perform cURL request for file - */ -int -test_daemon_get (void * cls, - const char *cipher_suite, int proto_version, - int port, int ver_peer); - -void print_test_result (int test_outcome, char *test_name); - -size_t copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx); - -int -http_ahc (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, const char *upload_data, - const char *version, size_t *upload_data_size, void **ptr); - -int -http_dummy_ahc (void *cls, struct MHD_Connection *connection, - const char *url, const char *method, const char *upload_data, - const char *version, size_t *upload_data_size, - void **ptr); - - -/** - * compile test file url pointing to the current running directory path - * - * @param url - char buffer into which the url is compiled - * @param port port to use for the test - * @return -1 on error - */ -int gen_test_file_url (char *url, int port); - -int -send_curl_req (char *url, struct CBC *cbc, const char *cipher_suite, - int proto_version); - -int -test_https_transfer (void *cls, const char *cipher_suite, int proto_version); - -int -setup_testcase (struct MHD_Daemon **d, int daemon_flags, va_list arg_list); - -void teardown_testcase (struct MHD_Daemon *d); - -int -setup_session (gnutls_session_t * session, - gnutls_datum_t * key, - gnutls_datum_t * cert, - gnutls_certificate_credentials_t * xcred); - -int -teardown_session (gnutls_session_t session, - gnutls_datum_t * key, - gnutls_datum_t * cert, - gnutls_certificate_credentials_t xcred); - -int -test_wrap (const char *test_name, int - (*test_function) (void * cls, const char *cipher_suite, - int proto_version), void *test_function_cls, - int daemon_flags, const char *cipher_suite, int proto_version, ...); -#endif /* TLS_TEST_COMMON_H_ */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/tls_test_keys.h b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/tls_test_keys.h deleted file mode 100644 index b6e37eec..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/https/tls_test_keys.h +++ /dev/null @@ -1,173 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2006, 2007, 2008 Christian Grothoff (and other contributing authors) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef MHD_TLS_TEST_KEYS_H -#define MHD_TLS_TEST_KEYS_H - -/* Test Certificates */ - -/* Certificate Authority key */ -const char ca_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n" - "MIIEowIBAAKCAQEA0EdlP613rjFvEj93tGo9fzBoKWU3CW+AbbfcJ397C89MyZ9J\n" - "rlxyLGfa6qVX7CFVNmzgWWfcl2tHlw/fZmWtf/SFgrlkldvuGyY8H3n2HuMsWz/E\n" - "h7n5VgwBX8NsP4eZNmikepxpr1mYx25K8FjnsKjAR9jGUSV8UfZ7VLIY0x/yqe+3\n" - "32oqc4D/wJbV1AwwvC5Xf9rvHJwcZg57eqbDCL/4GDDk7d9Gark4XK6ZG+FnnxQn\n" - "4a4jIdf4FoPp9s0EieHrHwYzs/uBqmfCSF4wXiaO8bmEwtbAsVbZH74Le7ggUbEe\n" - "o+jan9XK0dE88AIImGzgoBnlic/Rr7J8OWA+iwIDAQABAoIBAEICZqXkUdpsw2F6\n" - "qPMOergNPO3lrKg6ZO8hBs6j2fj3tcPuzljK5sqJDboxNejZ9Zo+rmnXf3Oj5fgL\n" - "6UcYMYEsm4W/QRA3uEJ1fzeQnT7Ty9KNprlHaSzquCLEGlIWJSo3xu0vFlWjJUcL\n" - "fwemfaOhD/OVUeEU6s5FOngwy6pZUsOajs3fNRtwBGuuXjniKZZlpSf2Wqu3xpHZ\n" - "31OF1V0ycUCGPPFtpmUCtnZhS9L8QBTkNtfTIdXv6SfoBRFm0oXb0uL5HGft6yc7\n" - "eYRXIscllQciqG3ymJ/y9o0E3A0YsBVauQyi7OEk+Kg8uoYOBkZCIY69hoN2Znlk\n" - "OY5S5Z0CgYEA3j8pRAJzvc827KcX4vJf05HYD4aCyaI80fNmx1DgXfglTSGLQ361\n" - "6i05YW8WtIvgkma3wF+jJOckBCW/7iq8wAX7Kz75WKGRyyTEb0wSfjx0G8grxX4d\n" - "7sTIAAOnQj5WT6E/bkqxQZAYnVtIPxKtSlwts0H/bjPVYwSFchHK7t8CgYEA7+ks\n" - "C0EMjF8CDeCfvbOUGiiqAvU3G20LEC3WlJM3AU+J9Jzp6AMkgaIA8J5oNdsbFBn4\n" - "N12JPOO+7WRUk6Av8bsh4faE36ThnHohgAL8guRU7jIXvsFyO5yiY7/o/0lES0/V\n" - "6xkh/Epj4MReuCGkiD9ifCVAo+dhHskeE9qbYdUCgYA4yBpa7eV0UUTPIcHQkew5\n" - "ucFh9hPkQDcZzP4tXlR0rbmaAz/5dp4zvmoyopdCeZpezS+VTtn3y7Y/+QUYbILc\n" - "7KpHWkeKhX0iUbp+VQlEh12C25mTU62CG3SdzFEnc5XJsoDqRNsUzSP80B2dP8BW\n" - "h0aFzg7csRGLwtP1WOZoMQKBgQCrgsKd+Q8Dexh421DXyX3jhZalLrEKxlXWZy60\n" - "YNo98aLqYRNHbpe2pR6O5nARsGYXZMlyq0flY9um0sc0Epyz79g1NoufZrxzpUw1\n" - "u+zRlnKxJtaa5KjJvRzKuvPTLYnJXXXM8Na/Cl+E3F3qvQJm9QlvPyKLCmsAGz+J\n" - "agsTUQKBgC0wqqJ6b1tbrAD8AVeeAn/IiP1rxYpc3x2s6ikFO2FMHXHC9wgrRPOc\n" - "mkokV+DrUOv3I/7jG8wQA/FmBUPy562a1bObIKzg6CPXzrN68AmNnOIVU+H8fdxI\n" - "iGyfT8WNpcRmtN11v34qXHwOWGQhpyyk2yNa8VIBSpkShq/EseZ1\n" - "-----END RSA PRIVATE KEY-----\n"; - -/* Certificate Authority cert */ -const char ca_cert_pem[] = "-----BEGIN CERTIFICATE-----\n" - "MIIC6DCCAdKgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n" - "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n" - "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n" - "0EdlP613rjFvEj93tGo9fzBoKWU3CW+AbbfcJ397C89MyZ9JrlxyLGfa6qVX7CFV\n" - "NmzgWWfcl2tHlw/fZmWtf/SFgrlkldvuGyY8H3n2HuMsWz/Eh7n5VgwBX8NsP4eZ\n" - "Nmikepxpr1mYx25K8FjnsKjAR9jGUSV8UfZ7VLIY0x/yqe+332oqc4D/wJbV1Aww\n" - "vC5Xf9rvHJwcZg57eqbDCL/4GDDk7d9Gark4XK6ZG+FnnxQn4a4jIdf4FoPp9s0E\n" - "ieHrHwYzs/uBqmfCSF4wXiaO8bmEwtbAsVbZH74Le7ggUbEeo+jan9XK0dE88AII\n" - "mGzgoBnlic/Rr7J8OWA+iwIDAQABo0MwQTAPBgNVHRMBAf8EBTADAQH/MA8GA1Ud\n" - "DwEB/wQFAwMHBAAwHQYDVR0OBBYEFP2olB4s2T/xuoQ5pT2RKojFwZo2MAsGCSqG\n" - "SIb3DQEBBQOCAQEAebD5m+vZkVXa8y+QZ5GtsiR9gpH+LKtdWBjk1kmfSgvQI/xA\n" - "aDCV/9BhdNGIBOTYGkln8urWd7g2Mj3TwKEAfNTUFpAsrBAlSSLTGYCSt72S2NsS\n" - "L/qUxmj1W6X95UHXCo49mSZx3LlaY3mz1L87gq/kK0XpzA3g2uF25jt84RvshsXy\n" - "clOc+eRrVETqFZqer96WB7kzFTv+qmROQKmW8X4a2A5r5Jl4vRwOz5/rEeB9Qs0K\n" - "rmK8+5HgvWd80WB8BtfFtZfoY/hHVM8nLD3ELVJrOKiTeIACunQFyT5lV0QkdmSA\n" - "CGInU7jzs8nu+s2avf6j+eVZUbVJ+dFMApTJgg==\n" - "-----END CERTIFICATE-----\n"; - -/* test server CA signed certificates */ -const char srv_signed_cert_pem[] = "-----BEGIN CERTIFICATE-----\n" - "MIIDGzCCAgWgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n" - "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n" - "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n" - "vfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW+K03KwEku55QvnUn\n" - "dwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8ILq4sw32vo0fbMu5BZ\n" - "F49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ020Q5EAAEseD1YtWC\n" - "IpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6QYGGh1QmHRPAy3CB\n" - "II6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6xyoOl204xuekZOaG9\n" - "RUPId74Rtmwfi1TLbBzo2wIDAQABo3YwdDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQM\n" - "MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHIAAwHQYDVR0OBBYEFOFi4ilKOP1d\n" - "XHlWCMwmVKr7mgy8MB8GA1UdIwQYMBaAFP2olB4s2T/xuoQ5pT2RKojFwZo2MAsG\n" - "CSqGSIb3DQEBBQOCAQEAHVWPxazupbOkG7Did+dY9z2z6RjTzYvurTtEKQgzM2Vz\n" - "GQBA+3pZ3c5mS97fPIs9hZXfnQeelMeZ2XP1a+9vp35bJjZBBhVH+pqxjCgiUflg\n" - "A3Zqy0XwwVCgQLE2HyaU3DLUD/aeIFK5gJaOSdNTXZLv43K8kl4cqDbMeRpVTbkt\n" - "YmG4AyEOYRNKGTqMEJXJoxD5E3rBUNrVI/XyTjYrulxbNPcMWEHKNeeqWpKDYTFo\n" - "Bb01PCthGXiq/4A2RLAFosadzRa8SBpoSjPPfZ0b2w4MJpReHqKbR5+T2t6hzml6\n" - "4ToyOKPDmamiTuN5KzLN3cw7DQlvWMvqSOChPLnA3Q==\n" - "-----END CERTIFICATE-----\n"; - -/* test server key */ -const char srv_signed_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n" - "MIIEowIBAAKCAQEAvfTdv+3fgvVTKRnP/HVNG81cr8TrUP/iiyuve/THMzvFXhCW\n" - "+K03KwEku55QvnUndwBfU/ROzLlv+5hotgiDRNFT3HxurmhouySBrJNJv7qWp8IL\n" - "q4sw32vo0fbMu5BZF49bUXK9L3kW2PdhTtSQPWHEzNrCxO+YgCilKHkY3vQNfdJ0\n" - "20Q5EAAEseD1YtWCIpRvJzYlZMpjYB1ubTl24kwrgOKUJYKqM4jmF4DVQp4oOK/6\n" - "QYGGh1QmHRPAy3CBII6sbb+sZT9cAqU6GYQVB35lm4XAgibXV6KgmpVxVQQ69U6x\n" - "yoOl204xuekZOaG9RUPId74Rtmwfi1TLbBzo2wIDAQABAoIBADu09WSICNq5cMe4\n" - "+NKCLlgAT1NiQpLls1gKRbDhKiHU9j8QWNvWWkJWrCya4QdUfLCfeddCMeiQmv3K\n" - "lJMvDs+5OjJSHFoOsGiuW2Ias7IjnIojaJalfBml6frhJ84G27IXmdz6gzOiTIer\n" - "DjeAgcwBaKH5WwIay2TxIaScl7AwHBauQkrLcyb4hTmZuQh6ArVIN6+pzoVuORXM\n" - "bpeNWl2l/HSN3VtUN6aCAKbN/X3o0GavCCMn5Fa85uJFsab4ss/uP+2PusU71+zP\n" - "sBm6p/2IbGvF5k3VPDA7X5YX61sukRjRBihY8xSnNYx1UcoOsX6AiPnbhifD8+xQ\n" - "Tlf8oJUCgYEA0BTfzqNpr9Wxw5/QXaSdw7S/0eP5a0C/nwURvmfSzuTD4equzbEN\n" - "d+dI/s2JMxrdj/I4uoAfUXRGaabevQIjFzC9uyE3LaOyR2zhuvAzX+vVcs6bSXeU\n" - "pKpCAcN+3Z3evMaX2f+z/nfSUAl2i4J2R+/LQAWJW4KwRky/m+cxpfUCgYEA6bN1\n" - "b73bMgM8wpNt6+fcmS+5n0iZihygQ2U2DEud8nZJL4Nrm1dwTnfZfJBnkGj6+0Q0\n" - "cOwj2KS0/wcEdJBP0jucU4v60VMhp75AQeHqidIde0bTViSRo3HWKXHBIFGYoU3T\n" - "LyPyKndbqsOObnsFXHn56Nwhr2HLf6nw4taGQY8CgYBoSW36FLCNbd6QGvLFXBGt\n" - "2lMhEM8az/K58kJ4WXSwOLtr6MD/WjNT2tkcy0puEJLm6BFCd6A6pLn9jaKou/92\n" - "SfltZjJPb3GUlp9zn5tAAeSSi7YMViBrfuFiHObij5LorefBXISLjuYbMwL03MgH\n" - "Ocl2JtA2ywMp2KFXs8GQWQKBgFyIVv5ogQrbZ0pvj31xr9HjqK6d01VxIi+tOmpB\n" - "4ocnOLEcaxX12BzprW55ytfOCVpF1jHD/imAhb3YrHXu0fwe6DXYXfZV4SSG2vB7\n" - "IB9z14KBN5qLHjNGFpMQXHSMek+b/ftTU0ZnPh9uEM5D3YqRLVd7GcdUhHvG8P8Q\n" - "C9aXAoGBAJtID6h8wOGMP0XYX5YYnhlC7dOLfk8UYrzlp3xhqVkzKthTQTj6wx9R\n" - "GtC4k7U1ki8oJsfcIlBNXd768fqDVWjYju5rzShMpo8OCTS6ipAblKjCxPPVhIpv\n" - "tWPlbSn1qj6wylstJ5/3Z+ZW5H4wIKp5jmLiioDhcP0L/Ex3Zx8O\n" - "-----END RSA PRIVATE KEY-----\n"; - -/* test server self signed certificates */ -const char srv_self_signed_cert_pem[] = "-----BEGIN CERTIFICATE-----\n" - "MIIC+jCCAeSgAwIBAgIES0KCvTALBgkqhkiG9w0BAQUwFzEVMBMGA1UEAxMMdGVz\n" - "dF9jYV9jZXJ0MB4XDTEwMDEwNTAwMDcyNVoXDTQ1MDMxMjAwMDcyNVowFzEVMBMG\n" - "A1UEAxMMdGVzdF9jYV9jZXJ0MIIBHzALBgkqhkiG9w0BAQEDggEOADCCAQkCggEA\n" - "tDEagv3p9OUhUL55jMucxjNK9N5cuozhcnrwDfBSU6oVrqm5kPqO1I7Cggzw68Y5\n" - "jhTcBi4FXmYOZppm1R3MhSJ5JSi/67Q7X4J5rnJLXYGN27qjMpnoGQ/2xmsNG/is\n" - "i+h/2vbtPU+WP9SEJnTfPLLpZ7KqCAk7FUUzKsuLx3/SOKtdkrWxPKwYTgnDEN6D\n" - "JL7tEzCnG5DFc4mQ7YW9PaRdC3rS1T8PvQ3jB2BUnohM0cFvKRuiU35tU7h7CPbL\n" - "4L66VglXoiwqmgcrwI2U968bD0+wRQ5c5bzNoshJOzN6CTMh1IhbklSh/Z6FA/e8\n" - "hj0yVo2tdllXuJGVs3PIEwIDAQABo1UwUzAMBgNVHRMBAf8EAjAAMBMGA1UdJQQM\n" - "MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHIAAwHQYDVR0OBBYEFDfU7pAv9LYn\n" - "n7jb4WHl4+Vgi2FnMAsGCSqGSIb3DQEBBQOCAQEAkaembPQMmv6OOjbIod8zTatr\n" - "x5Bwkwp3TOE1NRyy2OytzFIYRUkNrZYlcmrxcbNNycIK41CNVXbriFCF8gcmIq9y\n" - "vaKZn8Gcy+vGggv+1BP9IAPBGKRwSi0wmq9JoGE8hx+qqTpRSdfbM/cps/09hicO\n" - "0EIR7kWEbvnpMBcMKYOtYE9Gce7rdSMWVAsKc174xn8vW6TxCUvmWFv5DPg5HG1v\n" - "y1SUX73qafRo+W6FN4UC/DHfwRhF8RSKEnVbmgDVCs6GHdKBjU2qRgYyj6nWZqK1\n" - "XFUTWgia+Fl3D9vlsXaFcSZKA0Bq1eojl0B0AfeYAxTFwPWXscKvt/bXZfH8bg==\n" - "-----END CERTIFICATE-----\n"; - -/* test server key */ -const char srv_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n" - "MIIEpAIBAAKCAQEAtDEagv3p9OUhUL55jMucxjNK9N5cuozhcnrwDfBSU6oVrqm5\n" - "kPqO1I7Cggzw68Y5jhTcBi4FXmYOZppm1R3MhSJ5JSi/67Q7X4J5rnJLXYGN27qj\n" - "MpnoGQ/2xmsNG/isi+h/2vbtPU+WP9SEJnTfPLLpZ7KqCAk7FUUzKsuLx3/SOKtd\n" - "krWxPKwYTgnDEN6DJL7tEzCnG5DFc4mQ7YW9PaRdC3rS1T8PvQ3jB2BUnohM0cFv\n" - "KRuiU35tU7h7CPbL4L66VglXoiwqmgcrwI2U968bD0+wRQ5c5bzNoshJOzN6CTMh\n" - "1IhbklSh/Z6FA/e8hj0yVo2tdllXuJGVs3PIEwIDAQABAoIBAAEtcg+LFLGtoxjq\n" - "b+tFttBJfbRcfdG6ocYqBGmUXF+MgFs573DHX3sHNOQxlaNHtSgIclF1eYgNZFFt\n" - "VLIoBFTzfEQXoFosPUDoEuqVMeXLttmD7P2jwL780XJLZ4Xj6GY07npq1iGBcEZf\n" - "yCcdoyGkr9jgc5Auyis8DStGg/jfUBC4NBvF0GnuuNPAdYRPKUpKw9EatI+FdMjy\n" - "BuroD90fhdkK8EwMEVb9P17bdIc1MCIZFpUE9YHjVdK/oxCUhQ8KRfdbI4JU5Zh3\n" - "UtO6Jm2wFuP3VmeVpPvE/C2rxI70pyl6HMSiFGNc0rhJYCQ+yhohWj7nZ67H4vLx\n" - "plv5LxkCgYEAz7ewou8oFafDAMNoxaqKudvUg+lxXewdLDKaYBF5ACi9uAPCJ+v7\n" - "M5c/fvPFn/XHzo7xaXbtTAH3Z5xzBs+80OsvL+e1Ut4xR+ELRkybknh/s2wQeABk\n" - "Kb0vA59ukQGj12LV5phZMaVoXe6KJ7hZnN62d3K6m1wGE/k58i4pPLUCgYEA3hN8\n" - "G95zW7g0jVdSr+KUeVmephph9yh8Yb+3I3ojwOIv6d45TopGx8pFZlnBAMZf1ZQx\n" - "DIhzJNnaqZy/4w7RNaOGWnPA/5f+MIoHBiLGEEmfHC3lt087Yp9OuwDUHwpETYdV\n" - "o+KBCvVh60Et3bZUgF/1k/3YXxn8J5dsmJsjNqcCgYBLflyRa1BrRnTGMz9CEDCp\n" - "Si9b3h1Y4Hbd2GppHhCXMTd6yMrpDYhYANGQB3M9Juv+s88j4JhwNoq/uonH4Pqk\n" - "B8Y3qAQr4RuSH0WkwDUOsALhqBX4N1QwI1USAQEDbNAqeP5698X7GD3tXcQSmZrg\n" - "O8WfdjBCRNjkq4EW9xX/vQKBgQDONtmwJ0iHiu2BseyeVo/4fzfKlgUSNQ4K1rOA\n" - "xhIdMeu8Bxa/z7caHsGC4SVPSuYCtbE2Kh6BwapChcPJXCD45fgEViiJLuJiwEj1\n" - "caTpyvNsf1IoffJvCe9ZxtMyX549P8ZOgC3Dt0hN5CBrGLwu2Ox5l+YrqT10pi+5\n" - "JZX1UQKBgQCrcXrdkkDAc/a4+PxNRpJRLcU4fhv8/lr+UWItE8eUe7bd25bTQfQm\n" - "VpNKc/kAJ66PjIED6fy3ADhd2y4naT2a24uAgQ/M494J68qLnGh6K4JU/09uxR2v\n" - "1i2q/4FNLdFFk1XP4iNnTHRLZ+NYr2p5Y9RcvQfTjOauz8Ahav0lyg==\n" - "-----END RSA PRIVATE KEY-----\n"; - -#endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/perf_get.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/perf_get.c deleted file mode 100644 index 1e42f7d0..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/perf_get.c +++ /dev/null @@ -1,532 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2009, 2011 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file perf_get.c - * @brief benchmark simple GET operations (sequential access). - * Note that we run libcurl in the same process at the - * same time, so the execution time given is the combined - * time for both MHD and libcurl; it is quite possible - * that more time is spend with libcurl than with MHD, - * so the performance scores calculated with this code - * should NOT be used to compare with other HTTP servers - * (since MHD is actually better); only the relative - * scores between MHD versions are meaningful. - * Furthermore, this code ONLY tests MHD processing - * a single request at a time. This is again - * not universally meaningful (i.e. when comparing - * multithreaded vs. single-threaded or select/poll). - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include -#include "gauger.h" - -#ifndef WINDOWS -#include -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -/** - * How many rounds of operations do we do for each - * test? - */ -#define ROUNDS 500 - -/** - * Do we use HTTP 1.1? - */ -static int oneone; - -/** - * Response to return (re-used). - */ -static struct MHD_Response *response; - -/** - * Time this round was started. - */ -static unsigned long long start_time; - - -/** - * Get the current timestamp - * - * @return current time in ms - */ -static unsigned long long -now () -{ - struct timeval tv; - - gettimeofday (&tv, NULL); - return (((unsigned long long) tv.tv_sec * 1000LL) + - ((unsigned long long) tv.tv_usec / 1000LL)); -} - - -/** - * Start the timer. - */ -static void -start_timer() -{ - start_time = now (); -} - - -/** - * Stop the timer and report performance - * - * @param desc description of the threading mode we used - */ -static void -stop (const char *desc) -{ - double rps = ((double) (ROUNDS * 1000)) / ((double) (now() - start_time)); - - fprintf (stderr, - "Sequential GETs using %s: %f %s\n", - desc, - rps, - "requests/s"); - GAUGER (desc, - "Sequential GETs", - rps, - "requests/s"); -} - - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - - -static size_t -copyBuffer (void *ptr, - size_t size, size_t nmemb, - void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static int -testInternalGet (int port, int poll_flag) -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - unsigned int i; - char url[64]; - - sprintf(url, "http://127.0.0.1:%d/hello_world", port); - - cbc.buf = buf; - cbc.size = 2048; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, - port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 1; - start_timer (); - for (i=0;imsg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - c = NULL; - } - } - /* two possibilities here; as select sets are - tiny, this makes virtually no difference - in actual runtime right now, even though the - number of select calls is virtually cut in half - (and 'select' is the most expensive of our system - calls according to 'strace') */ - if (0) - MHD_run (d); - else - MHD_run_from_select (d, &rs, &ws, &es); - } - if (NULL != c) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - fprintf (stderr, "Timeout!?\n"); - } - } - stop ("external select"); - if (multi != NULL) - { - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 8192; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - int port = 1081; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - response = MHD_create_response_from_buffer (strlen ("/hello_world"), - "/hello_world", - MHD_RESPMEM_MUST_COPY); - errorCount += testExternalGet (port++); - errorCount += testInternalGet (port++, 0); - errorCount += testMultithreadedGet (port++, 0); - errorCount += testMultithreadedPoolGet (port++, 0); - if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL)) - { - errorCount += testInternalGet(port++, MHD_USE_POLL); - errorCount += testMultithreadedGet(port++, MHD_USE_POLL); - errorCount += testMultithreadedPoolGet(port++, MHD_USE_POLL); - } - if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL)) - { - errorCount += testInternalGet(port++, MHD_USE_EPOLL_LINUX_ONLY); - errorCount += testMultithreadedPoolGet(port++, MHD_USE_EPOLL_LINUX_ONLY); - } - MHD_destroy_response (response); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/perf_get_concurrent.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/perf_get_concurrent.c deleted file mode 100644 index 28559ee0..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/perf_get_concurrent.c +++ /dev/null @@ -1,364 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2009, 2011 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file perf_get_concurrent.c - * @brief benchmark concurrent GET operations - * Note that we run libcurl on the machine at the - * same time, so the execution time may be influenced - * by the concurrent activity; it is quite possible - * that more time is spend with libcurl than with MHD, - * so the performance scores calculated with this code - * should NOT be used to compare with other HTTP servers - * (since MHD is actually better); only the relative - * scores between MHD versions are meaningful. - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include -#include "gauger.h" - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -/** - * How many rounds of operations do we do for each - * test (total number of requests will be ROUNDS * PAR). - */ -#define ROUNDS 500 - -/** - * How many requests do we do in parallel? - */ -#define PAR CPU_COUNT - -/** - * Do we use HTTP 1.1? - */ -static int oneone; - -/** - * Response to return (re-used). - */ -static struct MHD_Response *response; - -/** - * Time this round was started. - */ -static unsigned long long start_time; - - -/** - * Get the current timestamp - * - * @return current time in ms - */ -static unsigned long long -now () -{ - struct timeval tv; - - gettimeofday (&tv, NULL); - return (((unsigned long long) tv.tv_sec * 1000LL) + - ((unsigned long long) tv.tv_usec / 1000LL)); -} - - -/** - * Start the timer. - */ -static void -start_timer() -{ - start_time = now (); -} - - -/** - * Stop the timer and report performance - * - * @param desc description of the threading mode we used - */ -static void -stop (const char *desc) -{ - double rps = ((double) (PAR * ROUNDS * 1000)) / ((double) (now() - start_time)); - - fprintf (stderr, - "Parallel GETs using %s: %f %s\n", - desc, - rps, - "requests/s"); - GAUGER (desc, - "Parallel GETs", - rps, - "requests/s"); -} - - -static size_t -copyBuffer (void *ptr, - size_t size, size_t nmemb, - void *ctx) -{ - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static pid_t -do_gets (int port) -{ - pid_t ret; - CURL *c; - CURLcode errornum; - unsigned int i; - unsigned int j; - pid_t par[PAR]; - char url[64]; - - sprintf(url, "http://127.0.0.1:%d/hello_world", port); - - ret = fork (); - if (ret == -1) abort (); - if (ret != 0) - return ret; - for (j=0;j -#include - -struct callback_closure { - unsigned int called; -}; - - -static ssize_t -called_twice(void *cls, uint64_t pos, char *buf, size_t max) -{ - struct callback_closure *cls2 = cls; - - if (cls2->called == 0) - { - memset(buf, 0, max); - strcat(buf, "test"); - cls2->called = 1; - return strlen(buf); - } - if (cls2->called == 1) - { - cls2->called = 2; - return MHD_CONTENT_READER_END_OF_STREAM; - } - fprintf(stderr, - "Handler called after returning END_OF_STREAM!\n"); - return MHD_CONTENT_READER_END_WITH_ERROR; -} - - -static int -callback(void *cls, struct MHD_Connection *connection, const char *url, - const char *method, const char *version, const char *upload_data, - size_t *upload_data_size, void **con_cls) { - struct callback_closure *cbc = calloc(1, sizeof(struct callback_closure)); - struct MHD_Response *r; - - r = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, 1024, - &called_twice, cbc, - &free); - MHD_queue_response(connection, 200, r); - MHD_destroy_response(r); - return MHD_YES; -} - - -static size_t -discard_buffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - return size * nmemb; -} - - -int main(int argc, char **argv) -{ - struct MHD_Daemon *d; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - CURL *c; - CURLM *multi; - CURLMcode mret; - struct CURLMsg *msg; - int running; - struct timeval tv; - int extra; - - d = MHD_start_daemon(0, - 8000, - NULL, - NULL, - callback, - NULL, - MHD_OPTION_END); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:8000/"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &discard_buffer); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - extra = 10; - while ( (c != NULL) || (--extra > 0) ) - { - max = MHD_INVALID_SOCKET; - FD_ZERO(&ws); - FD_ZERO(&rs); - FD_ZERO(&es); - curl_multi_perform (multi, &running); - if (NULL != multi) - { - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 3; - } - } - if (MHD_YES != - MHD_get_fdset(d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select(max + 1, &rs, &ws, &es, &tv); - if (NULL != multi) - { - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - } - MHD_run(d); - } - MHD_stop_daemon(d); - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_concurrent_stop.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_concurrent_stop.c deleted file mode 100644 index 60cc98db..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_concurrent_stop.c +++ /dev/null @@ -1,228 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2009, 2011, 2015 Christian Grothoff - - libmicrohttpd 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 3, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_concurrent_stop.c - * @brief test stopping server while concurrent GETs are ongoing - * @author Christian Grothoff - */ -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include -#include "gauger.h" - -#ifdef CPU_COUNT -#undef CPU_COUNT -#endif -#define CPU_COUNT 40 - - -/** - * How many rounds of operations do we do for each - * test (total number of requests will be ROUNDS * PAR). - */ -#define ROUNDS 50000 - -/** - * How many requests do we do in parallel? - */ -#define PAR CPU_COUNT - -/** - * Do we use HTTP 1.1? - */ -static int oneone; - -/** - * Response to return (re-used). - */ -static struct MHD_Response *response; - - -static size_t -copyBuffer (void *ptr, - size_t size, size_t nmemb, - void *ctx) -{ - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - ret = MHD_queue_response (connection, - MHD_HTTP_OK, - response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static pid_t -do_gets (int port) -{ - pid_t ret; - CURL *c; - CURLcode errornum; - unsigned int i; - unsigned int j; - pid_t par[PAR]; - char url[64]; - - sprintf(url, "http://127.0.0.1:%d/hello_world", port); - - ret = fork (); - if (ret == -1) abort (); - if (ret != 0) - return ret; - for (j=0;j -#include -#include -#include -#include -#ifdef HAVE_GCRYPT_H -#include -#endif - -#ifndef WINDOWS -#include -#include -#else -#include -#endif - -#define PAGE "libmicrohttpd demoAccess granted" - -#define DENIED "libmicrohttpd demoAccess denied" - -#define MY_OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4" - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - struct MHD_Response *response; - char *username; - const char *password = "testpass"; - const char *realm = "test@example.com"; - int ret; - - username = MHD_digest_auth_get_username(connection); - if ( (username == NULL) || - (0 != strcmp (username, "testuser")) ) - { - response = MHD_create_response_from_buffer(strlen (DENIED), - DENIED, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_auth_fail_response(connection, realm, - MY_OPAQUE, - response, - MHD_NO); - MHD_destroy_response(response); - return ret; - } - ret = MHD_digest_auth_check(connection, realm, - username, - password, - 300); - free(username); - if ( (ret == MHD_INVALID_NONCE) || - (ret == MHD_NO) ) - { - response = MHD_create_response_from_buffer(strlen (DENIED), - DENIED, - MHD_RESPMEM_PERSISTENT); - if (NULL == response) - return MHD_NO; - ret = MHD_queue_auth_fail_response(connection, realm, - MY_OPAQUE, - response, - (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO); - MHD_destroy_response(response); - return ret; - } - response = MHD_create_response_from_buffer(strlen(PAGE), PAGE, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response(connection, MHD_HTTP_OK, response); - MHD_destroy_response(response); - return ret; -} - - -static int -testDigestAuth () -{ - int fd; - CURL *c; - CURLcode errornum; - struct MHD_Daemon *d; - struct CBC cbc; - size_t len; - size_t off = 0; - char buf[2048]; - char rnd[8]; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; -#ifndef WINDOWS - fd = open("/dev/urandom", O_RDONLY); - if (-1 == fd) - { - fprintf(stderr, "Failed to open `%s': %s\n", - "/dev/urandom", - strerror(errno)); - return 1; - } - while (off < 8) - { - len = read(fd, rnd, 8); - if (len == -1) - { - fprintf(stderr, "Failed to read `%s': %s\n", - "/dev/urandom", - strerror(errno)); - (void) close(fd); - return 1; - } - off += len; - } - (void) close(fd); -#else - { - HCRYPTPROV cc; - BOOL b; - b = CryptAcquireContext (&cc, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - if (b == 0) - { - fprintf (stderr, "Failed to acquire crypto provider context: %lu\n", - GetLastError ()); - return 1; - } - b = CryptGenRandom (cc, 8, rnd); - if (b == 0) - { - fprintf (stderr, "Failed to generate 8 random bytes: %lu\n", - GetLastError ()); - } - CryptReleaseContext (cc, 0); - if (b == 0) - return 1; - } -#endif - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1337, NULL, NULL, &ahc_echo, PAGE, - MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof (rnd), rnd, - MHD_OPTION_NONCE_NC_SIZE, 300, - MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1337/"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST); - curl_easy_setopt (c, CURLOPT_USERPWD, "testuser:testpass"); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system!*/ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen (PAGE)) - return 4; - if (0 != strncmp (PAGE, cbc.buf, strlen (PAGE))) - return 8; - return 0; -} - - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - -#ifdef HAVE_GCRYPT_H - gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif -#endif -if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testDigestAuth (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c deleted file mode 100644 index 51868abd..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c +++ /dev/null @@ -1,245 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2010, 2012 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_digestauth_with_arguments.c - * @brief Testcase for libmicrohttpd Digest Auth with arguments - * @author Amr Ali - */ -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include -#ifdef HAVE_GCRYPT_H -#include -#endif - -#ifndef WINDOWS -#include -#include -#else -#include -#endif - -#define PAGE "libmicrohttpd demoAccess granted" - -#define DENIED "libmicrohttpd demoAccess denied" - -#define MY_OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4" - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - struct MHD_Response *response; - char *username; - const char *password = "testpass"; - const char *realm = "test@example.com"; - int ret; - - username = MHD_digest_auth_get_username(connection); - if ( (username == NULL) || - (0 != strcmp (username, "testuser")) ) - { - response = MHD_create_response_from_buffer(strlen (DENIED), - DENIED, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_auth_fail_response(connection, realm, - MY_OPAQUE, - response, - MHD_NO); - MHD_destroy_response(response); - return ret; - } - ret = MHD_digest_auth_check(connection, realm, - username, - password, - 300); - free(username); - if ( (ret == MHD_INVALID_NONCE) || - (ret == MHD_NO) ) - { - response = MHD_create_response_from_buffer(strlen (DENIED), - DENIED, - MHD_RESPMEM_PERSISTENT); - if (NULL == response) - return MHD_NO; - ret = MHD_queue_auth_fail_response(connection, realm, - MY_OPAQUE, - response, - (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO); - MHD_destroy_response(response); - return ret; - } - response = MHD_create_response_from_buffer(strlen(PAGE), PAGE, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response(connection, MHD_HTTP_OK, response); - MHD_destroy_response(response); - return ret; -} - - -static int -testDigestAuth () -{ - int fd; - CURL *c; - CURLcode errornum; - struct MHD_Daemon *d; - struct CBC cbc; - size_t len; - size_t off = 0; - char buf[2048]; - char rnd[8]; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; -#ifndef WINDOWS - fd = open("/dev/urandom", O_RDONLY); - if (-1 == fd) - { - fprintf(stderr, "Failed to open `%s': %s\n", - "/dev/urandom", - strerror(errno)); - return 1; - } - while (off < 8) - { - len = read(fd, rnd, 8); - if (len == -1) - { - fprintf(stderr, "Failed to read `%s': %s\n", - "/dev/urandom", - strerror(errno)); - (void) close(fd); - return 1; - } - off += len; - } - (void) close(fd); -#else - { - HCRYPTPROV cc; - BOOL b; - b = CryptAcquireContext (&cc, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - if (b == 0) - { - fprintf (stderr, "Failed to acquire crypto provider context: %lu\n", - GetLastError ()); - return 1; - } - b = CryptGenRandom (cc, 8, rnd); - if (b == 0) - { - fprintf (stderr, "Failed to generate 8 random bytes: %lu\n", - GetLastError ()); - } - CryptReleaseContext (cc, 0); - if (b == 0) - return 1; - } -#endif - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1337, NULL, NULL, &ahc_echo, PAGE, - MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof (rnd), rnd, - MHD_OPTION_NONCE_NC_SIZE, 300, - MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1337/foo?key=value"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST); - curl_easy_setopt (c, CURLOPT_USERPWD, "testuser:testpass"); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system!*/ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen (PAGE)) - return 4; - if (0 != strncmp (PAGE, cbc.buf, strlen (PAGE))) - return 8; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - -#ifdef HAVE_GCRYPT_H - gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif -#endif - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testDigestAuth (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get.c deleted file mode 100644 index e4c531d6..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get.c +++ /dev/null @@ -1,640 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2009, 2011 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_get.c - * @brief Testcase for libmicrohttpd GET operations - * TODO: test parsing of query - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include "platform_interface.h" -#include -#include -#include -#include -#include - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif - -#ifndef WINDOWS -#include -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static int -testInternalGet (int poll_flag) -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:11080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system!*/ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 4; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 8; - return 0; -} - - -static int -testMultithreadedGet (int poll_flag) -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | poll_flag, - 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - return 0; -} - - -static int -testMultithreadedPoolGet (int poll_flag) -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, - 1081, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system!*/ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - return 0; -} - - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 8192; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - -static int -testUnknownPortGet (int poll_flag) -{ - struct MHD_Daemon *d; - const union MHD_DaemonInfo *di; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - struct sockaddr_in addr; - socklen_t addr_len = sizeof(addr); - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = 0; - addr.sin_addr.s_addr = INADDR_ANY; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, - 1, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_SOCK_ADDR, &addr, - MHD_OPTION_END); - if (d == NULL) - return 32768; - - di = MHD_get_daemon_info (d, MHD_DAEMON_INFO_LISTEN_FD); - if (di == NULL) - return 65536; - - if (0 != getsockname(di->listen_fd, (struct sockaddr *) &addr, &addr_len)) - return 131072; - - if (addr.sin_family != AF_INET) - return 26214; - - snprintf(buf, sizeof(buf), "http://127.0.0.1:%hu/hello_world", - ntohs(addr.sin_port)); - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, buf); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 524288; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 1048576; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 2097152; - return 0; -} - - -static int -testStopRace (int poll_flag) -{ - struct sockaddr_in sin; - MHD_socket fd; - struct MHD_Daemon *d; - - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | poll_flag, - 1081, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_CONNECTION_TIMEOUT, 5, MHD_OPTION_END); - if (d == NULL) - return 16; - - fd = socket (PF_INET, SOCK_STREAM, 0); - if (fd == MHD_INVALID_SOCKET) - { - fprintf(stderr, "socket error\n"); - return 256; - } - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_port = htons(1081); - sin.sin_addr.s_addr = htonl(0x7f000001); - - if (connect (fd, (struct sockaddr *)(&sin), sizeof(sin)) < 0) - { - fprintf(stderr, "connect error\n"); - MHD_socket_close_ (fd); - return 512; - } - - /* printf("Waiting\n"); */ - /* Let the thread get going. */ - usleep(500000); - - /* printf("Stopping daemon\n"); */ - MHD_stop_daemon (d); - - MHD_socket_close_ (fd); - - /* printf("good\n"); */ - return 0; -} - - -static int -ahc_empty (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - struct MHD_Response *response; - int ret; - - if (0 != strcmp ("GET", method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - response = MHD_create_response_from_buffer (0, - NULL, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static int -curlExcessFound(CURL *c, curl_infotype type, char *data, size_t size, void *cls) -{ - static const char *excess_found = "Excess found"; - const size_t str_size = strlen (excess_found); - - if (CURLINFO_TEXT == type - && size >= str_size - && 0 == strncmp(excess_found, data, str_size)) - *(int *)cls = 1; - return 0; -} - - -static int -testEmptyGet (int poll_flag) -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - int excess_found = 0; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, - 11081, NULL, NULL, &ahc_empty, NULL, MHD_OPTION_END); - if (d == NULL) - return 4194304; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_DEBUGFUNCTION, &curlExcessFound); - curl_easy_setopt (c, CURLOPT_DEBUGDATA, &excess_found); - curl_easy_setopt (c, CURLOPT_VERBOSE, 1); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system!*/ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 8388608; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != 0) - return 16777216; - if (excess_found) - return 33554432; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalGet (0); - errorCount += testMultithreadedGet (0); - errorCount += testMultithreadedPoolGet (0); - errorCount += testUnknownPortGet (0); - errorCount += testStopRace (0); - errorCount += testExternalGet (); - errorCount += testEmptyGet (0); - if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL)) - { - errorCount += testInternalGet(MHD_USE_POLL); - errorCount += testMultithreadedGet(MHD_USE_POLL); - errorCount += testMultithreadedPoolGet(MHD_USE_POLL); - errorCount += testUnknownPortGet(MHD_USE_POLL); - errorCount += testStopRace(MHD_USE_POLL); - errorCount += testEmptyGet(MHD_USE_POLL); - } - if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL)) - { - errorCount += testInternalGet(MHD_USE_EPOLL_LINUX_ONLY); - errorCount += testMultithreadedPoolGet(MHD_USE_EPOLL_LINUX_ONLY); - errorCount += testUnknownPortGet(MHD_USE_EPOLL_LINUX_ONLY); - errorCount += testEmptyGet(MHD_USE_EPOLL_LINUX_ONLY); - } - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get_chunked.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get_chunked.c deleted file mode 100644 index 3b8bf397..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get_chunked.c +++ /dev/null @@ -1,414 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_get_chunked.c - * @brief Testcase for libmicrohttpd GET operations with chunked content encoding - * TODO: - * - how to test that chunking was actually used? - * - use CURLOPT_HEADERFUNCTION to validate - * footer was sent - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -/** - * MHD content reader callback that returns - * data in chunks. - */ -static ssize_t -crc (void *cls, uint64_t pos, char *buf, size_t max) -{ - struct MHD_Response **responseptr = cls; - - if (pos == 128 * 10) - { - MHD_add_response_header (*responseptr, "Footer", "working"); - return MHD_CONTENT_READER_END_OF_STREAM; - } - if (max < 128) - abort (); /* should not happen in this testcase... */ - memset (buf, 'A' + (pos / 128), 128); - return 128; -} - -/** - * Dummy function that does nothing. - */ -static void -crcf (void *ptr) -{ - free (ptr); -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - static int aptr; - const char *me = cls; - struct MHD_Response *response; - struct MHD_Response **responseptr; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - responseptr = malloc (sizeof (struct MHD_Response *)); - if (responseptr == NULL) - return MHD_NO; - response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, - 1024, - &crc, responseptr, &crcf); - *responseptr = response; - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - -static int -validate (struct CBC cbc, int ebase) -{ - int i; - char buf[128]; - - if (cbc.pos != 128 * 10) - return ebase; - - for (i = 0; i < 10; i++) - { - memset (buf, 'A' + i, 128); - if (0 != memcmp (buf, &cbc.buf[i * 128], 128)) - { - fprintf (stderr, - "Got `%.*s'\nWant `%.*s'\n", - 128, buf, 128, &cbc.buf[i * 128]); - return ebase * 2; - } - } - return 0; -} - -static int -testInternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return validate (cbc, 4); -} - -static int -testMultithreadedGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return validate (cbc, 64); -} - -static int -testMultithreadedPoolGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return validate (cbc, 64); -} - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 5L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - return validate (cbc, 8192); -} - - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalGet (); - errorCount += testMultithreadedGet (); - errorCount += testMultithreadedPoolGet (); - errorCount += testExternalGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get_response_cleanup.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get_response_cleanup.c deleted file mode 100644 index f8817464..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get_response_cleanup.c +++ /dev/null @@ -1,302 +0,0 @@ -/* DO NOT CHANGE THIS LINE */ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2009 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_get_response_cleanup.c - * @brief Testcase for libmicrohttpd response cleanup - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#include -#endif - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -#define TESTSTR "/* DO NOT CHANGE THIS LINE */" - -static int oneone; - -static int ok; - - -static pid_t -fork_curl (const char *url) -{ - pid_t ret; - - ret = fork(); - if (ret != 0) - return ret; - execlp ("curl", "curl", "-s", "-N", "-o", "/dev/null", "-GET", url, NULL); - fprintf (stderr, - "Failed to exec curl: %s\n", - strerror (errno)); - _exit (-1); -} - -static void -kill_curl (pid_t pid) -{ - int status; - - //fprintf (stderr, "Killing curl\n"); - kill (pid, SIGTERM); - waitpid (pid, &status, 0); -} - - -static ssize_t -push_callback (void *cls, uint64_t pos, char *buf, size_t max) -{ - if (max == 0) - return 0; - buf[0] = 'd'; - return 1; -} - -static void -push_free_callback (void *cls) -{ - int *ok = cls; - - //fprintf (stderr, "Cleanup callback called!\n"); - *ok = 0; -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - - //fprintf (stderr, "In CB: %s!\n", method); - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, - 32 * 1024, - &push_callback, - &ok, - &push_free_callback); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static int -testInternalGet () -{ - struct MHD_Daemon *d; - pid_t curl; - - ok = 1; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 1; - curl = fork_curl ("http://127.0.0.1:11080/"); - sleep (1); - kill_curl (curl); - sleep (1); - // fprintf (stderr, "Stopping daemon!\n"); - MHD_stop_daemon (d); - if (ok != 0) - return 2; - return 0; -} - -static int -testMultithreadedGet () -{ - struct MHD_Daemon *d; - pid_t curl; - - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 2, - MHD_OPTION_END); - if (d == NULL) - return 16; - ok = 1; - //fprintf (stderr, "Forking cURL!\n"); - curl = fork_curl ("http://127.0.0.1:1081/"); - sleep (1); - kill_curl (curl); - sleep (1); - curl = fork_curl ("http://127.0.0.1:1081/"); - sleep (1); - if (ok != 0) - { - kill_curl (curl); - MHD_stop_daemon (d); - return 64; - } - kill_curl (curl); - sleep (1); - //fprintf (stderr, "Stopping daemon!\n"); - MHD_stop_daemon (d); - if (ok != 0) - return 32; - - return 0; -} - -static int -testMultithreadedPoolGet () -{ - struct MHD_Daemon *d; - pid_t curl; - - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); - if (d == NULL) - return 64; - ok = 1; - curl = fork_curl ("http://127.0.0.1:1081/"); - sleep (1); - kill_curl (curl); - sleep (1); - //fprintf (stderr, "Stopping daemon!\n"); - MHD_stop_daemon (d); - if (ok != 0) - return 128; - return 0; -} - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - time_t start; - struct timeval tv; - pid_t curl; - - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 256; - curl = fork_curl ("http://127.0.0.1:1082/"); - - start = time (NULL); - while ((time (NULL) - start < 2)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - MHD_run (d); - } - kill_curl (curl); - start = time (NULL); - while ((time (NULL) - start < 2)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - MHD_run (d); - } - // fprintf (stderr, "Stopping daemon!\n"); - MHD_stop_daemon (d); - if (ok != 0) - return 1024; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - errorCount += testInternalGet (); - errorCount += testMultithreadedGet (); - errorCount += testMultithreadedPoolGet (); - errorCount += testExternalGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get_sendfile.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get_sendfile.c deleted file mode 100644 index f0853b27..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_get_sendfile.c +++ /dev/null @@ -1,500 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2009 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_get_sendfile.c - * @brief Testcase for libmicrohttpd response from FD - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include "platform_interface.h" -#include -#include -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -#define TESTSTR "This is the content of the test file we are sending using sendfile (if available)" - -char *sourcefile; - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - int fd; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - fd = open (sourcefile, O_RDONLY); - if (fd == -1) - { - fprintf (stderr, "Failed to open `%s': %s\n", - sourcefile, - MHD_strerror_ (errno)); - exit (1); - } - response = MHD_create_response_from_fd (strlen (TESTSTR), fd); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static int -testInternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:11080/"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system!*/ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen (TESTSTR)) - return 4; - if (0 != strncmp (TESTSTR, cbc.buf, strlen (TESTSTR))) - return 8; - return 0; -} - -static int -testMultithreadedGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen (TESTSTR)) - return 64; - if (0 != strncmp (TESTSTR, cbc.buf, strlen (TESTSTR))) - return 128; - return 0; -} - -static int -testMultithreadedPoolGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system!*/ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen (TESTSTR)) - return 64; - if (0 != strncmp (TESTSTR, cbc.buf, strlen (TESTSTR))) - return 128; - return 0; -} - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1082/"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen (TESTSTR)) - return 8192; - if (0 != strncmp (TESTSTR, cbc.buf, strlen (TESTSTR))) - return 16384; - return 0; -} - -static int -testUnknownPortGet () -{ - struct MHD_Daemon *d; - const union MHD_DaemonInfo *di; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - struct sockaddr_in addr; - socklen_t addr_len = sizeof(addr); - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = 0; - addr.sin_addr.s_addr = INADDR_ANY; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_SOCK_ADDR, &addr, - MHD_OPTION_END); - if (d == NULL) - return 32768; - - di = MHD_get_daemon_info (d, MHD_DAEMON_INFO_LISTEN_FD); - if (di == NULL) - return 65536; - - if (0 != getsockname(di->listen_fd, (struct sockaddr *) &addr, &addr_len)) - return 131072; - - if (addr.sin_family != AF_INET) - return 26214; - - snprintf(buf, sizeof(buf), "http://127.0.0.1:%hu/", - ntohs(addr.sin_port)); - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, buf); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 524288; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen (TESTSTR)) - return 1048576; - if (0 != strncmp (TESTSTR, cbc.buf, strlen (TESTSTR))) - return 2097152; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - const char *tmp; - FILE *f; - - if ( (NULL == (tmp = getenv ("TMPDIR"))) && - (NULL == (tmp = getenv ("TMP"))) && - (NULL == (tmp = getenv ("TEMP"))) ) - tmp = "/tmp"; - sourcefile = malloc (strlen (tmp) + 32); - sprintf (sourcefile, - "%s/%s", - tmp, - "test-mhd-sendfile"); - f = fopen (sourcefile, "w"); - if (NULL == f) - { - fprintf (stderr, "failed to write test file\n"); - free (sourcefile); - return 1; - } - fwrite (TESTSTR, strlen (TESTSTR), 1, f); - fclose (f); - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalGet (); - errorCount += testMultithreadedGet (); - errorCount += testMultithreadedPoolGet (); - errorCount += testExternalGet (); - errorCount += testUnknownPortGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - unlink (sourcefile); - free (sourcefile); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_iplimit.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_iplimit.c deleted file mode 100644 index 813fc8b4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_iplimit.c +++ /dev/null @@ -1,313 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_iplimit.c - * @brief Testcase for libmicrohttpd GET operations - * TODO: test parsing of query - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - -static int -testMultithreadedGet () -{ - struct MHD_Daemon *d; - char buf[2048]; - int k; - unsigned int success; - unsigned int failure; - - /* Test only valid for HTTP/1.1 (uses persistent connections) */ - if (!oneone) - return 0; - - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1081, NULL, NULL, - &ahc_echo, "GET", - MHD_OPTION_PER_IP_CONNECTION_LIMIT, 2, - MHD_OPTION_END); - if (d == NULL) - return 16; - - for (k = 0; k < 3; ++k) - { - struct CBC cbc[3]; - CURL *cenv[3]; - int i; - - success = 0; - failure = 0; - for (i = 0; i < 3; ++i) - { - CURL *c; - CURLcode errornum; - - cenv[i] = c = curl_easy_init (); - cbc[i].buf = buf; - cbc[i].size = 2048; - cbc[i].pos = 0; - - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc[i]); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_FORBID_REUSE, 0L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - errornum = curl_easy_perform (c); - if (CURLE_OK == errornum) - success++; - else - failure++; - } - - /* Cleanup the environments */ - for (i = 0; i < 3; ++i) - curl_easy_cleanup (cenv[i]); - if ( (2 != success) || - (1 != failure) ) - { - fprintf (stderr, - "Unexpected number of success (%u) or failure (%u)\n", - success, - failure); - MHD_stop_daemon (d); - return 32; - } - - sleep(2); - - for (i = 0; i < 2; ++i) - { - if (cbc[i].pos != strlen ("/hello_world")) - { - MHD_stop_daemon (d); - return 64; - } - if (0 != strncmp ("/hello_world", cbc[i].buf, strlen ("/hello_world"))) - { - MHD_stop_daemon (d); - return 128; - } - } - } - MHD_stop_daemon (d); - return 0; -} - -static int -testMultithreadedPoolGet () -{ - struct MHD_Daemon *d; - char buf[2048]; - int k; - - /* Test only valid for HTTP/1.1 (uses persistent connections) */ - if (!oneone) - return 0; - - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_PER_IP_CONNECTION_LIMIT, 2, - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, - MHD_OPTION_END); - if (d == NULL) - return 16; - - for (k = 0; k < 3; ++k) - { - struct CBC cbc[3]; - CURL *cenv[3]; - int i; - - for (i = 0; i < 3; ++i) - { - CURL *c; - CURLcode errornum; - - cenv[i] = c = curl_easy_init (); - cbc[i].buf = buf; - cbc[i].size = 2048; - cbc[i].pos = 0; - - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc[i]); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_FORBID_REUSE, 0L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - errornum = curl_easy_perform (c); - if ( ( (CURLE_OK != errornum) && (i < 2) ) || - ( (CURLE_OK == errornum) && (i == 2) ) ) - { - int j; - - /* First 2 should succeed */ - if (i < 2) - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - - /* Last request should have failed */ - else - fprintf (stderr, - "No error on IP address over limit\n"); - - for (j = 0; j < i; ++j) - curl_easy_cleanup (cenv[j]); - MHD_stop_daemon (d); - return 32; - } - } - - /* Cleanup the environments */ - for (i = 0; i < 3; ++i) - curl_easy_cleanup (cenv[i]); - - sleep(2); - - for (i = 0; i < 2; ++i) - { - if (cbc[i].pos != strlen ("/hello_world")) - { - MHD_stop_daemon (d); - return 64; - } - if (0 != strncmp ("/hello_world", cbc[i].buf, strlen ("/hello_world"))) - { - MHD_stop_daemon (d); - return 128; - } - } - - - } - MHD_stop_daemon (d); - return 0; -} - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount |= testMultithreadedGet (); - errorCount |= testMultithreadedPoolGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_large_put.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_large_put.c deleted file mode 100644 index ec0022ee..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_large_put.c +++ /dev/null @@ -1,479 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_large_put.c - * @brief Testcase for libmicrohttpd PUT operations - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -static int oneone; - -/** - * Do not make this much larger since we will hit the - * MHD default buffer limit and the test code is not - * written for incremental upload processing... - * (larger values will likely cause MHD to generate - * an internal server error -- which would be avoided - * by writing the putBuffer method in a more general - * fashion). - */ -#define PUT_SIZE (256 * 1024) - -static char *put_buffer; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -putBuffer (void *stream, size_t size, size_t nmemb, void *ptr) -{ - unsigned int *pos = ptr; - unsigned int wrt; - - wrt = size * nmemb; - if (wrt > PUT_SIZE - (*pos)) - wrt = PUT_SIZE - (*pos); - memcpy (stream, &put_buffer[*pos], wrt); - (*pos) += wrt; - return wrt; -} - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - int *done = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp ("PUT", method)) - return MHD_NO; /* unexpected method */ - if ((*done) == 0) - { - if (*upload_data_size != PUT_SIZE) - { -#if 0 - fprintf (stderr, - "Waiting for more data (%u/%u)...\n", - *upload_data_size, PUT_SIZE); -#endif - return MHD_YES; /* not yet ready */ - } - if (0 == memcmp (upload_data, put_buffer, PUT_SIZE)) - { - *upload_data_size = 0; - } - else - { - printf ("Invalid upload data!\n"); - return MHD_NO; - } - *done = 1; - return MHD_YES; - } - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -static int -testInternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - char buf[2048]; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1080, - NULL, NULL, &ahc_echo, &done_flag, - MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (1024*1024), - MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE, (long) PUT_SIZE); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 4; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 8; - return 0; -} - -static int -testMultithreadedPut () -{ - struct MHD_Daemon *d; - CURL *c; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - char buf[2048]; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 1081, - NULL, NULL, &ahc_echo, &done_flag, - MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (1024*1024), - MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE, (long) PUT_SIZE); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - { - fprintf (stderr, "Got invalid response `%.*s'\n", (int)cbc.pos, cbc.buf); - return 64; - } - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - return 0; -} - -static int -testMultithreadedPoolPut () -{ - struct MHD_Daemon *d; - CURL *c; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - char buf[2048]; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1081, - NULL, NULL, &ahc_echo, &done_flag, - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, - MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (1024*1024), - MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE, (long) PUT_SIZE); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - { - fprintf (stderr, "Got invalid response `%.*s'\n", (int)cbc.pos, cbc.buf); - return 64; - } - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - return 0; -} - -static int -testExternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - unsigned int pos = 0; - int done_flag = 0; - char buf[2048]; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - multi = NULL; - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, - NULL, NULL, &ahc_echo, &done_flag, - MHD_OPTION_CONNECTION_MEMORY_LIMIT, - (size_t) (PUT_SIZE * 4), MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE, (long) PUT_SIZE); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - { - fprintf (stderr, "Got invalid response `%.*s'\n", (int)cbc.pos, cbc.buf); - return 8192; - } - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - put_buffer = malloc (PUT_SIZE); - if (NULL == put_buffer) return 1; - memset (put_buffer, 1, PUT_SIZE); - errorCount += testInternalPut (); - errorCount += testMultithreadedPut (); - errorCount += testMultithreadedPoolPut (); - errorCount += testExternalPut (); - free (put_buffer); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_long_header.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_long_header.c deleted file mode 100644 index e1e024b1..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_long_header.c +++ /dev/null @@ -1,253 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_long_header.c - * @brief Testcase for libmicrohttpd handling of very long headers - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -/** - * We will set the memory available per connection to - * half of this value, so the actual value does not have - * to be big at all... - */ -#define VERY_LONG (1024*10) - -static int oneone; - -static int -apc_all (void *cls, const struct sockaddr *addr, socklen_t addrlen) -{ - return MHD_YES; -} - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - const char *me = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -static int -testLongUrlGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - char *url; - long code; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , - 1080, - &apc_all, - NULL, - &ahc_echo, - "GET", - MHD_OPTION_CONNECTION_MEMORY_LIMIT, - (size_t) (VERY_LONG / 2), MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - url = malloc (VERY_LONG); - if (url == NULL) - { - MHD_stop_daemon (d); - return 1; - } - memset (url, 'a', VERY_LONG); - url[VERY_LONG - 1] = '\0'; - memcpy (url, "http://127.0.0.1:1080/", strlen ("http://127.0.0.1:1080/")); - curl_easy_setopt (c, CURLOPT_URL, url); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK == curl_easy_perform (c)) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - free (url); - return 2; - } - if (CURLE_OK != curl_easy_getinfo (c, CURLINFO_RESPONSE_CODE, &code)) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - free (url); - return 4; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - free (url); - if (code != MHD_HTTP_REQUEST_URI_TOO_LONG) - return 8; - return 0; -} - - -static int -testLongHeaderGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - char *url; - long code; - struct curl_slist *header = NULL; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , - 1080, - &apc_all, - NULL, - &ahc_echo, - "GET", - MHD_OPTION_CONNECTION_MEMORY_LIMIT, - (size_t) (VERY_LONG / 2), MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - url = malloc (VERY_LONG); - if (url == NULL) - { - MHD_stop_daemon (d); - return 16; - } - memset (url, 'a', VERY_LONG); - url[VERY_LONG - 1] = '\0'; - url[VERY_LONG / 2] = ':'; - url[VERY_LONG / 2 + 1] = ' '; - header = curl_slist_append (header, url); - - curl_easy_setopt (c, CURLOPT_HTTPHEADER, header); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK == curl_easy_perform (c)) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - curl_slist_free_all (header); - free (url); - return 32; - } - if (CURLE_OK != curl_easy_getinfo (c, CURLINFO_RESPONSE_CODE, &code)) - { - curl_slist_free_all (header); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - free (url); - return 64; - } - curl_slist_free_all (header); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - free (url); - if (code != MHD_HTTP_REQUEST_ENTITY_TOO_LARGE) - return 128; - return 0; -} - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testLongUrlGet (); - errorCount += testLongHeaderGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_options.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_options.c deleted file mode 100644 index 4afe3d43..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_options.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - -/** - * @file mhds_get_test.c - * @brief Testcase for libmicrohttpd HTTPS GET operations - * @author Sagie Amir - */ - -#include "platform.h" -#include "microhttpd.h" - -#define MHD_E_MEM "Error: memory error\n" -#define MHD_E_SERVER_INIT "Error: failed to start server\n" - -const int DEBUG_GNUTLS_LOG_LEVEL = 0; -const char *test_file_name = "https_test_file"; -const char test_file_data[] = "Hello World\n"; - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - return 0; -} - -int -test_wrap (char *test_name, int (*test) (void)) -{ - int ret; - - fprintf (stdout, "running test: %s ", test_name); - ret = test (); - if (ret == 0) - { - fprintf (stdout, "[pass]\n"); - } - else - { - fprintf (stdout, "[fail]\n"); - } - return ret; -} - - -/** - * Test daemon initialization with the MHD_OPTION_SOCK_ADDR option - */ -static int -test_ip_addr_option () -{ - struct MHD_Daemon *d; - struct sockaddr_in daemon_ip_addr; -#if HAVE_INET6 - struct sockaddr_in6 daemon_ip_addr6; -#endif - - memset (&daemon_ip_addr, 0, sizeof (struct sockaddr_in)); - daemon_ip_addr.sin_family = AF_INET; - daemon_ip_addr.sin_port = htons (4233); - daemon_ip_addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); - -#if HAVE_INET6 - memset (&daemon_ip_addr6, 0, sizeof (struct sockaddr_in6)); - daemon_ip_addr6.sin6_family = AF_INET6; - daemon_ip_addr6.sin6_port = htons (4233); - daemon_ip_addr6.sin6_addr = in6addr_loopback; -#endif - - d = MHD_start_daemon (MHD_USE_DEBUG, 4233, - NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR, - &daemon_ip_addr, MHD_OPTION_END); - - if (d == 0) - return -1; - - MHD_stop_daemon (d); - -#if HAVE_INET6 - d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_IPv6, 4233, - NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR, - &daemon_ip_addr6, MHD_OPTION_END); - - if (d == 0) - return -1; - - MHD_stop_daemon (d); -#endif - - return 0; -} - -/* setup a temporary transfer test file */ -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - errorCount += test_wrap ("ip addr option", &test_ip_addr_option); - - return errorCount != 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_parse_cookies.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_parse_cookies.c deleted file mode 100644 index 7d70867e..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_parse_cookies.c +++ /dev/null @@ -1,250 +0,0 @@ - -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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 3, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_parse_cookies.c - * @brief Testcase for HTTP cookie parsing - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - const char *hdr; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - ret = 0; - - hdr = MHD_lookup_connection_value (connection, MHD_COOKIE_KIND, "name1"); - if ((hdr == NULL) || (0 != strcmp (hdr, "var1"))) - abort (); - hdr = MHD_lookup_connection_value (connection, MHD_COOKIE_KIND, "name2"); - if ((hdr == NULL) || (0 != strcmp (hdr, "var2"))) - abort (); - hdr = MHD_lookup_connection_value (connection, MHD_COOKIE_KIND, "name3"); - if ((hdr == NULL) || (0 != strcmp (hdr, ""))) - abort (); - hdr = MHD_lookup_connection_value (connection, MHD_COOKIE_KIND, "name4"); - if ((hdr == NULL) || (0 != strcmp (hdr, "var4 with spaces"))) - abort (); - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:21080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - /* note that the string below intentionally uses the - various ways cookies can be specified to exercise the - parser! Do not change! */ - curl_easy_setopt (c, CURLOPT_COOKIE, - "name1=var1; name2=var2,name3 ;name4=\"var4 with spaces\";"); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 8192; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testExternalGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_post.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_post.c deleted file mode 100644 index 49bf30ae..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_post.c +++ /dev/null @@ -1,654 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_post.c - * @brief Testcase for libmicrohttpd POST operations using URL-encoding - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -#define POST_DATA "name=daniel&project=curl" - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - - -static void -completed_cb (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct MHD_PostProcessor *pp = *con_cls; - - if (NULL != pp) - MHD_destroy_post_processor (pp); - *con_cls = NULL; -} - - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - - -/** - * Note that this post_iterator is not perfect - * in that it fails to support incremental processing. - * (to be fixed in the future) - */ -static int -post_iterator (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *value, uint64_t off, size_t size) -{ - int *eok = cls; - - if ((0 == strcmp (key, "name")) && - (size == strlen ("daniel")) && (0 == strncmp (value, "daniel", size))) - (*eok) |= 1; - if ((0 == strcmp (key, "project")) && - (size == strlen ("curl")) && (0 == strncmp (value, "curl", size))) - (*eok) |= 2; - return MHD_YES; -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int eok; - struct MHD_Response *response; - struct MHD_PostProcessor *pp; - int ret; - - if (0 != strcmp ("POST", method)) - { - printf ("METHOD: %s\n", method); - return MHD_NO; /* unexpected method */ - } - pp = *unused; - if (pp == NULL) - { - eok = 0; - pp = MHD_create_post_processor (connection, 1024, &post_iterator, &eok); - *unused = pp; - } - MHD_post_process (pp, upload_data, *upload_data_size); - if ((eok == 3) && (0 == *upload_data_size)) - { - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - MHD_destroy_post_processor (pp); - *unused = NULL; - return ret; - } - *upload_data_size = 0; - return MHD_YES; -} - - -static int -testInternalPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1080, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 4; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 8; - return 0; -} - -static int -testMultithreadedPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - return 0; -} - -static int -testMultithreadedPoolPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - return 0; -} - -static int -testExternalPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 8192; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - -static int -ahc_cancel (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - struct MHD_Response *response; - int ret; - - if (0 != strcmp ("POST", method)) - { - fprintf (stderr, - "Unexpected method `%s'\n", method); - return MHD_NO; - } - - if (*unused == NULL) - { - *unused = "wibble"; - /* We don't want the body. Send a 500. */ - response = MHD_create_response_from_buffer (0, NULL, - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response(connection, 500, response); - if (ret != MHD_YES) - fprintf(stderr, "Failed to queue response\n"); - MHD_destroy_response(response); - return ret; - } - else - { - fprintf(stderr, - "In ahc_cancel again. This should not happen.\n"); - return MHD_NO; - } -} - -struct CRBC -{ - const char *buffer; - size_t size; - size_t pos; -}; - - -static size_t -readBuffer(void *p, size_t size, size_t nmemb, void *opaque) -{ - struct CRBC *data = opaque; - size_t required = size * nmemb; - size_t left = data->size - data->pos; - - if (required > left) - required = left; - - memcpy(p, data->buffer + data->pos, required); - data->pos += required; - - return required/size; -} - - -static size_t -slowReadBuffer(void *p, size_t size, size_t nmemb, void *opaque) -{ - sleep(1); - return readBuffer(p, size, nmemb, opaque); -} - - -#define FLAG_EXPECT_CONTINUE 1 -#define FLAG_CHUNKED 2 -#define FLAG_FORM_DATA 4 -#define FLAG_SLOW_READ 8 -#define FLAG_COUNT 16 - - -static int -testMultithreadedPostCancelPart(int flags) -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - struct curl_slist *headers = NULL; - long response_code; - CURLcode cc; - int result = 0; - struct CRBC crbc; - - /* Don't test features that aren't available with HTTP/1.0 in - * HTTP/1.0 mode. */ - if (!oneone && (flags & (FLAG_EXPECT_CONTINUE | FLAG_CHUNKED))) - return 0; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_cancel, NULL, - MHD_OPTION_END); - if (d == NULL) - return 32768; - - crbc.buffer = "Test content"; - crbc.size = strlen(crbc.buffer); - crbc.pos = 0; - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, (flags & FLAG_SLOW_READ) ? &slowReadBuffer : &readBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &crbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, NULL); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, crbc.size); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - if (flags & FLAG_CHUNKED) - headers = curl_slist_append(headers, "Transfer-Encoding: chunked"); - if (!(flags & FLAG_FORM_DATA)) - headers = curl_slist_append(headers, "Content-Type: application/octet-stream"); - if (flags & FLAG_EXPECT_CONTINUE) - headers = curl_slist_append(headers, "Expect: 100-Continue"); - curl_easy_setopt(c, CURLOPT_HTTPHEADER, headers); - - if (CURLE_HTTP_RETURNED_ERROR != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "flibbet curl_easy_perform didn't fail as expected: `%s' %d\n", - curl_easy_strerror (errornum), errornum); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - curl_slist_free_all(headers); - return 65536; - } - - if (CURLE_OK != (cc = curl_easy_getinfo(c, CURLINFO_RESPONSE_CODE, &response_code))) - { - fprintf(stderr, "curl_easy_getinfo failed: '%s'\n", curl_easy_strerror(errornum)); - result = 65536; - } - - if (!result && (response_code != 500)) - { - fprintf(stderr, "Unexpected response code: %ld\n", response_code); - result = 131072; - } - - if (!result && (cbc.pos != 0)) - result = 262144; - - curl_easy_cleanup (c); - MHD_stop_daemon (d); - curl_slist_free_all(headers); - return result; -} - - -static int -testMultithreadedPostCancel() -{ - int result = 0; - int flags; - for(flags = 0; flags < FLAG_COUNT; ++flags) - result |= testMultithreadedPostCancelPart(flags); - return result; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testMultithreadedPostCancel (); - errorCount += testInternalPost (); - errorCount += testMultithreadedPost (); - errorCount += testMultithreadedPoolPost (); - errorCount += testExternalPost (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_post_loop.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_post_loop.c deleted file mode 100644 index fe8d25c9..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_post_loop.c +++ /dev/null @@ -1,531 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_post_loop.c - * @brief Testcase for libmicrohttpd POST operations using URL-encoding - * @author Christian Grothoff (inspired by bug report #1296) - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -#define POST_DATA "\n\n1\n\n" - -#define LOOPCOUNT 1000 - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **mptr) -{ - static int marker; - struct MHD_Response *response; - int ret; - - if (0 != strcmp ("POST", method)) - { - printf ("METHOD: %s\n", method); - return MHD_NO; /* unexpected method */ - } - if ((*mptr != NULL) && (0 == *upload_data_size)) - { - if (*mptr != &marker) - abort (); - response = MHD_create_response_from_buffer (2, "OK", - MHD_RESPMEM_PERSISTENT); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - *mptr = NULL; - return ret; - } - if (strlen (POST_DATA) != *upload_data_size) - return MHD_YES; - *upload_data_size = 0; - *mptr = ▮ - return MHD_YES; -} - - -static int -testInternalPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - int i; - char url[1024]; - - cbc.buf = buf; - cbc.size = 2048; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1080, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); - if (d == NULL) - return 1; - for (i = 0; i < LOOPCOUNT; i++) - { - if (99 == i % 100) - fprintf (stderr, "."); - c = curl_easy_init (); - cbc.pos = 0; - buf[0] = '\0'; - sprintf (url, "http://127.0.0.1:1080/hw%d", i); - curl_easy_setopt (c, CURLOPT_URL, url); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - if ((buf[0] != 'O') || (buf[1] != 'K')) - { - MHD_stop_daemon (d); - return 4; - } - } - MHD_stop_daemon (d); - if (LOOPCOUNT >= 99) - fprintf (stderr, "\n"); - return 0; -} - -static int -testMultithreadedPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - int i; - char url[1024]; - - cbc.buf = buf; - cbc.size = 2048; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); - if (d == NULL) - return 16; - for (i = 0; i < LOOPCOUNT; i++) - { - if (99 == i % 100) - fprintf (stderr, "."); - c = curl_easy_init (); - cbc.pos = 0; - buf[0] = '\0'; - sprintf (url, "http://127.0.0.1:1081/hw%d", i); - curl_easy_setopt (c, CURLOPT_URL, url); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - if ((buf[0] != 'O') || (buf[1] != 'K')) - { - MHD_stop_daemon (d); - return 64; - } - } - MHD_stop_daemon (d); - if (LOOPCOUNT >= 99) - fprintf (stderr, "\n"); - return 0; -} - -static int -testMultithreadedPoolPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - int i; - char url[1024]; - - cbc.buf = buf; - cbc.size = 2048; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); - if (d == NULL) - return 16; - for (i = 0; i < LOOPCOUNT; i++) - { - if (99 == i % 100) - fprintf (stderr, "."); - c = curl_easy_init (); - cbc.pos = 0; - buf[0] = '\0'; - sprintf (url, "http://127.0.0.1:1081/hw%d", i); - curl_easy_setopt (c, CURLOPT_URL, url); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - if ((buf[0] != 'O') || (buf[1] != 'K')) - { - MHD_stop_daemon (d); - return 64; - } - } - MHD_stop_daemon (d); - if (LOOPCOUNT >= 99) - fprintf (stderr, "\n"); - return 0; -} - -static int -testExternalPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - int i; - unsigned long long timeout; - long ctimeout; - char url[1024]; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); - if (d == NULL) - return 256; - multi = curl_multi_init (); - if (multi == NULL) - { - MHD_stop_daemon (d); - return 512; - } - for (i = 0; i < LOOPCOUNT; i++) - { - if (99 == i % 100) - fprintf (stderr, "."); - c = curl_easy_init (); - cbc.pos = 0; - buf[0] = '\0'; - sprintf (url, "http://127.0.0.1:1082/hw%d", i); - curl_easy_setopt (c, CURLOPT_URL, url); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - while (CURLM_CALL_MULTI_PERFORM == - curl_multi_perform (multi, &running)); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - if (MHD_NO == MHD_get_timeout (d, &timeout)) - timeout = 100; /* 100ms == INFTY -- CURL bug... */ - if ((CURLM_OK == curl_multi_timeout (multi, &ctimeout)) && - (ctimeout < timeout) && (ctimeout >= 0)) - timeout = ctimeout; - if ( (c == NULL) || (running == 0) ) - timeout = 0; /* terminate quickly... */ - tv.tv_sec = timeout / 1000; - tv.tv_usec = (timeout % 1000) * 1000; - if (-1 == select (max + 1, &rs, &ws, &es, &tv)) - { - if (EINTR == errno) - continue; - fprintf (stderr, - "select failed: %s\n", - strerror (errno)); - break; - } - while (CURLM_CALL_MULTI_PERFORM == - curl_multi_perform (multi, &running)); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - c = NULL; - } - } - MHD_run (d); - } - if (c != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - } - if ((buf[0] != 'O') || (buf[1] != 'K')) - { - curl_multi_cleanup (multi); - MHD_stop_daemon (d); - return 8192; - } - } - curl_multi_cleanup (multi); - MHD_stop_daemon (d); - if (LOOPCOUNT >= 99) - fprintf (stderr, "\n"); - return 0; -} - - -/** - * Time this round was started. - */ -static unsigned long long start_time; - - -/** - * Get the current timestamp - * - * @return current time in ms - */ -static unsigned long long -now () -{ - struct timeval tv; - - gettimeofday (&tv, NULL); - return (((unsigned long long) tv.tv_sec * 1000LL) + - ((unsigned long long) tv.tv_usec / 1000LL)); -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - start_time = now(); - errorCount += testInternalPost (); - fprintf (stderr, - oneone ? "%s: Sequential POSTs (http/1.1) %f/s\n" : "%s: Sequential POSTs (http/1.0) %f/s\n", - "internal select", - (double) 1000 * LOOPCOUNT / (now() - start_time + 1.0)); - GAUGER ("internal select", - oneone ? "Sequential POSTs (http/1.1)" : "Sequential POSTs (http/1.0)", - (double) 1000 * LOOPCOUNT / (now() - start_time + 1.0), - "requests/s"); - start_time = now(); - errorCount += testMultithreadedPost (); - fprintf (stderr, - oneone ? "%s: Sequential POSTs (http/1.1) %f/s\n" : "%s: Sequential POSTs (http/1.0) %f/s\n", - "multithreaded post", - (double) 1000 * LOOPCOUNT / (now() - start_time + 1.0)); - GAUGER ("Multithreaded select", - oneone ? "Sequential POSTs (http/1.1)" : "Sequential POSTs (http/1.0)", - (double) 1000 * LOOPCOUNT / (now() - start_time + 1.0), - "requests/s"); - start_time = now(); - errorCount += testMultithreadedPoolPost (); - fprintf (stderr, - oneone ? "%s: Sequential POSTs (http/1.1) %f/s\n" : "%s: Sequential POSTs (http/1.0) %f/s\n", - "thread with pool", - (double) 1000 * LOOPCOUNT / (now() - start_time + 1.0)); - GAUGER ("thread with pool", - oneone ? "Sequential POSTs (http/1.1)" : "Sequential POSTs (http/1.0)", - (double) 1000 * LOOPCOUNT / (now() - start_time + 1.0), - "requests/s"); - start_time = now(); - errorCount += testExternalPost (); - fprintf (stderr, - oneone ? "%s: Sequential POSTs (http/1.1) %f/s\n" : "%s: Sequential POSTs (http/1.0) %f/s\n", - "external select", - (double) 1000 * LOOPCOUNT / (now() - start_time + 1.0)); - GAUGER ("external select", - oneone ? "Sequential POSTs (http/1.1)" : "Sequential POSTs (http/1.0)", - (double) 1000 * LOOPCOUNT / (now() - start_time + 1.0), - "requests/s"); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_postform.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_postform.c deleted file mode 100644 index 450eb6ff..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_postform.c +++ /dev/null @@ -1,498 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_postform.c - * @brief Testcase for libmicrohttpd POST operations using multipart/postform data - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include -#ifdef HAVE_GCRYPT_H -#include -#endif - -#ifndef WINDOWS -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - - -static void -completed_cb (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct MHD_PostProcessor *pp = *con_cls; - - if (NULL != pp) - MHD_destroy_post_processor (pp); - *con_cls = NULL; -} - - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - - -/** - * Note that this post_iterator is not perfect - * in that it fails to support incremental processing. - * (to be fixed in the future) - */ -static int -post_iterator (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *value, uint64_t off, size_t size) -{ - int *eok = cls; - -#if 0 - fprintf (stderr, "PI sees %s-%.*s\n", key, size, value); -#endif - if ((0 == strcmp (key, "name")) && - (size == strlen ("daniel")) && (0 == strncmp (value, "daniel", size))) - (*eok) |= 1; - if ((0 == strcmp (key, "project")) && - (size == strlen ("curl")) && (0 == strncmp (value, "curl", size))) - (*eok) |= 2; - return MHD_YES; -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int eok; - struct MHD_Response *response; - struct MHD_PostProcessor *pp; - int ret; - - if (0 != strcmp ("POST", method)) - { - printf ("METHOD: %s\n", method); - return MHD_NO; /* unexpected method */ - } - pp = *unused; - if (pp == NULL) - { - eok = 0; - pp = MHD_create_post_processor (connection, 1024, &post_iterator, &eok); - if (pp == NULL) - abort (); - *unused = pp; - } - MHD_post_process (pp, upload_data, *upload_data_size); - if ((eok == 3) && (0 == *upload_data_size)) - { - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - MHD_destroy_post_processor (pp); - *unused = NULL; - return ret; - } - *upload_data_size = 0; - return MHD_YES; -} - -static struct curl_httppost * -make_form () -{ - struct curl_httppost *post = NULL; - struct curl_httppost *last = NULL; - - curl_formadd (&post, &last, CURLFORM_COPYNAME, "name", - CURLFORM_COPYCONTENTS, "daniel", CURLFORM_END); - curl_formadd (&post, &last, CURLFORM_COPYNAME, "project", - CURLFORM_COPYCONTENTS, "curl", CURLFORM_END); - return post; -} - - -static int -testInternalPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - struct curl_httppost *pd; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1080, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - pd = make_form (); - curl_easy_setopt (c, CURLOPT_HTTPPOST, pd); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - curl_formfree (pd); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - curl_formfree (pd); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 4; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 8; - return 0; -} - -static int -testMultithreadedPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - struct curl_httppost *pd; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - pd = make_form (); - curl_easy_setopt (c, CURLOPT_HTTPPOST, pd); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 5L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - curl_formfree (pd); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - curl_formfree (pd); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - return 0; -} - -static int -testMultithreadedPoolPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - struct curl_httppost *pd; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1081, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - pd = make_form (); - curl_easy_setopt (c, CURLOPT_HTTPPOST, pd); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 5L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - curl_formfree (pd); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - curl_formfree (pd); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - return 0; -} - -static int -testExternalPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - struct curl_httppost *pd; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - pd = make_form (); - curl_easy_setopt (c, CURLOPT_HTTPPOST, pd); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - curl_formfree (pd); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_formfree (pd); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - curl_formfree (pd); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - curl_formfree (pd); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - curl_formfree (pd); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 8192; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - -#ifdef HAVE_GCRYPT_H - gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#ifdef GCRYCTL_INITIALIZATION_FINISHED - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif -#endif - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalPost (); - errorCount += testMultithreadedPost (); - errorCount += testMultithreadedPoolPost (); - errorCount += testExternalPost (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_process_arguments.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_process_arguments.c deleted file mode 100644 index a3e58418..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_process_arguments.c +++ /dev/null @@ -1,249 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2013 Christian Grothoff - - libmicrohttpd 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 3, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_process_arguments.c - * @brief Testcase for HTTP URI arguments - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - const char *hdr; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - hdr = MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, "k"); - if ((hdr == NULL) || (0 != strcmp (hdr, "v x"))) - abort (); - hdr = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, "hash"); - if ((hdr == NULL) || (0 != strcmp (hdr, "#foo"))) - abort (); - hdr = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, "space"); - if ((hdr == NULL) || (0 != strcmp (hdr, "\240bar"))) - abort (); - if (3 != MHD_get_connection_values (connection, - MHD_GET_ARGUMENT_KIND, - NULL, NULL)) - abort (); - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, - "http://127.0.0.1:21080/hello+world?k=v+x&hash=%23foo&space=%A0bar"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello+world")) - return 8192; - if (0 != strncmp ("/hello+world", cbc.buf, strlen ("/hello+world"))) - return 16384; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testExternalGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_process_headers.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_process_headers.c deleted file mode 100644 index 4a219fb4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_process_headers.c +++ /dev/null @@ -1,434 +0,0 @@ - -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_process_headers.c - * @brief Testcase for HTTP header access - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -kv_cb (void *cls, enum MHD_ValueKind kind, const char *key, const char *value) -{ - if ((0 == strcmp (key, MHD_HTTP_HEADER_HOST)) && - (0 == strcmp (value, "127.0.0.1:21080")) && (kind == MHD_HEADER_KIND)) - { - *((int *) cls) = 1; - return MHD_NO; - } - return MHD_YES; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - const char *hdr; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - ret = 0; - MHD_get_connection_values (connection, MHD_HEADER_KIND, &kv_cb, &ret); - if (ret != 1) - abort (); - hdr = MHD_lookup_connection_value (connection, MHD_HEADER_KIND, "NotFound"); - if (hdr != NULL) - abort (); - hdr = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, MHD_HTTP_HEADER_ACCEPT); - if ((hdr == NULL) || (0 != strcmp (hdr, "*/*"))) - abort (); - hdr = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, MHD_HTTP_HEADER_HOST); - if ((hdr == NULL) || (0 != strcmp (hdr, "127.0.0.1:21080"))) - abort (); - MHD_set_connection_value (connection, - MHD_HEADER_KIND, "FakeHeader", "NowPresent"); - hdr = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, "FakeHeader"); - if ((hdr == NULL) || (0 != strcmp (hdr, "NowPresent"))) - abort (); - - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - MHD_add_response_header (response, "MyHeader", "MyValue"); - hdr = MHD_get_response_header (response, "MyHeader"); - if (0 != strcmp ("MyValue", hdr)) - abort (); - MHD_add_response_header (response, "MyHeader", "MyValueToo"); - if (MHD_YES != MHD_del_response_header (response, "MyHeader", "MyValue")) - abort (); - hdr = MHD_get_response_header (response, "MyHeader"); - if (0 != strcmp ("MyValueToo", hdr)) - abort (); - if (1 != MHD_get_response_headers (response, NULL, NULL)) - abort (); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static int -testInternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:21080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 4; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 8; - return 0; -} - -static int -testMultithreadedGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:21080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - return 0; -} - -static int -testMultithreadedPoolGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 21080, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:21080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - return 0; -} - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:21080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system! */ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 8192; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - errorCount += testMultithreadedGet (); - errorCount += testMultithreadedPoolGet (); - errorCount += testExternalGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_put.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_put.c deleted file mode 100644 index fe1d8dbe..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_put.c +++ /dev/null @@ -1,440 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_put.c - * @brief Testcase for libmicrohttpd PUT operations - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -putBuffer (void *stream, size_t size, size_t nmemb, void *ptr) -{ - unsigned int *pos = ptr; - unsigned int wrt; - - wrt = size * nmemb; - if (wrt > 8 - (*pos)) - wrt = 8 - (*pos); - memcpy (stream, &("Hello123"[*pos]), wrt); - (*pos) += wrt; - return wrt; -} - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - int *done = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp ("PUT", method)) - return MHD_NO; /* unexpected method */ - if ((*done) == 0) - { - if (*upload_data_size != 8) - return MHD_YES; /* not yet ready */ - if (0 == memcmp (upload_data, "Hello123", 8)) - { - *upload_data_size = 0; - } - else - { - printf ("Invalid upload data `%8s'!\n", upload_data); - return MHD_NO; - } - *done = 1; - return MHD_YES; - } - response = MHD_create_response_from_buffer (strlen (url), (void*) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -static int -testInternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1080, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 4; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 8; - return 0; -} - -static int -testMultithreadedPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 1081, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - - return 0; -} - -static int -testMultithreadedPoolPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1081, - NULL, NULL, &ahc_echo, &done_flag, - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - - return 0; -} - - -static int -testExternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - unsigned int pos = 0; - int done_flag = 0; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 8192; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalPut (); - errorCount += testMultithreadedPut (); - errorCount += testMultithreadedPoolPut (); - errorCount += testExternalPut (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_put_chunked.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_put_chunked.c deleted file mode 100644 index b2fa3229..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_put_chunked.c +++ /dev/null @@ -1,448 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_put_chunked.c - * @brief Testcase for libmicrohttpd PUT operations with chunked encoding - * for the upload data - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -putBuffer (void *stream, size_t size, size_t nmemb, void *ptr) -{ - unsigned int *pos = ptr; - unsigned int wrt; - - wrt = size * nmemb; - if (wrt > 8 - (*pos)) - wrt = 8 - (*pos); - if (wrt > 4) - wrt = 4; /* only send half at first => force multiple chunks! */ - memcpy (stream, &("Hello123"[*pos]), wrt); - (*pos) += wrt; - return wrt; -} - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - int *done = cls; - struct MHD_Response *response; - int ret; - int have; - - if (0 != strcmp ("PUT", method)) - return MHD_NO; /* unexpected method */ - if ((*done) < 8) - { - have = *upload_data_size; - if (have + *done > 8) - { - printf ("Invalid upload data `%8s'!\n", upload_data); - return MHD_NO; - } - if (0 == memcmp (upload_data, &"Hello123"[*done], have)) - { - *done += have; - *upload_data_size = 0; - } - else - { - printf ("Invalid upload data `%8s'!\n", upload_data); - return MHD_NO; - } -#if 0 - fprintf (stderr, "Not ready for response: %u/%u\n", *done, 8); -#endif - return MHD_YES; - } - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -static int -testInternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 11080, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:11080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - /* - // by not giving the file size, we force chunking! - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - */ - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 4; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 8; - return 0; -} - -static int -testMultithreadedPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 11081, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - /* - // by not giving the file size, we force chunking! - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - */ - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - - return 0; -} - -static int -testMultithreadedPoolPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 11081, - NULL, NULL, &ahc_echo, &done_flag, - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - /* - // by not giving the file size, we force chunking! - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - */ - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - - return 0; -} - - -static int -testExternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - unsigned int pos = 0; - int done_flag = 0; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 11082, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:11082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - /* - // by not giving the file size, we force chunking! - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - */ - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 8192; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalPut (); - errorCount += testMultithreadedPut (); - errorCount += testMultithreadedPoolPut (); - errorCount += testExternalPut (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_quiesce.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_quiesce.c deleted file mode 100644 index 17adcb25..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_quiesce.c +++ /dev/null @@ -1,457 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2013, 2015 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ -/** - * @file test_quiesce.c - * @brief Testcase for libmicrohttpd quiescing - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include "platform_interface.h" -#include -#include -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#include -#endif - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static void -request_completed (void *cls, struct MHD_Connection *connection, - void **con_cls, enum MHD_RequestTerminationCode code) -{ - int *done = (int *)cls; - *done = 1; -} - - -static void * -ServeOneRequest(void *param) -{ - struct MHD_Daemon *d; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket fd, max; - time_t start; - struct timeval tv; - int done = 0; - - fd = (MHD_socket) (intptr_t) param; - - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_LISTEN_SOCKET, fd, - MHD_OPTION_NOTIFY_COMPLETED, &request_completed, &done, - MHD_OPTION_END); - if (d == NULL) - return "MHD_start_daemon() failed"; - - start = time (NULL); - while ((time (NULL) - start < 5) && done == 0) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - MHD_stop_daemon (d); - MHD_socket_close_(fd); - return "MHD_get_fdset() failed"; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - MHD_SYS_select_ (max + 1, &rs, &ws, &es, &tv); - MHD_run (d); - } - MHD_stop_daemon (d); - MHD_socket_close_(fd); - return NULL; -} - - -static CURL * -setupCURL (void *cbc) -{ - CURL *c; - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:11080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system!*/ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - return c; -} - - -static int -testGet (int type, int pool_count, int poll_flag) -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - MHD_socket fd; - pthread_t thrd; - const char *thrdRet; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - if (pool_count > 0) { - d = MHD_start_daemon (type | MHD_USE_DEBUG | MHD_USE_PIPE_FOR_SHUTDOWN | poll_flag, - 11080, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_THREAD_POOL_SIZE, pool_count, MHD_OPTION_END); - - } else { - d = MHD_start_daemon (type | MHD_USE_DEBUG | MHD_USE_PIPE_FOR_SHUTDOWN | poll_flag, - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - } - if (d == NULL) - return 1; - - c = setupCURL(&cbc); - - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - - if (cbc.pos != strlen ("/hello_world")) { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4; - } - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 8; - } - - fd = MHD_quiesce_daemon (d); - if (0 != pthread_create(&thrd, NULL, &ServeOneRequest, (void*)(intptr_t) fd)) - { - fprintf (stderr, "pthread_create failed\n"); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 16; - } - - cbc.pos = 0; - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - - if (0 != pthread_join(thrd, (void**)&thrdRet)) - { - fprintf (stderr, "pthread_join failed\n"); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 16; - } - if (NULL != thrdRet) - { - fprintf (stderr, "ServeOneRequest() error: %s\n", thrdRet); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 16; - } - - if (cbc.pos != strlen ("/hello_world")) - { - fprintf(stderr, "%s\n", cbc.buf); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - MHD_socket_close_(fd); - return 4; - } - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - { - fprintf(stderr, "%s\n", cbc.buf); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - MHD_socket_close_(fd); - return 8; - } - - /* at this point, the forked server quit, and the new - * server has quiesced, so new requests should fail - */ - if (CURLE_OK == (errornum = curl_easy_perform (c))) - { - fprintf (stderr, "curl_easy_perform should fail\n"); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - MHD_socket_close_(fd); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - MHD_socket_close_(fd); - - return 0; -} - - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - MHD_socket max; - int running; - struct CURLMsg *msg; - time_t start; - struct timeval tv; - int i; - MHD_socket fd; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 256; - c = setupCURL(&cbc); - - multi = curl_multi_init (); - if (multi == NULL) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 512; - } - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 1024; - } - - for (i = 0; i < 2; i++) { - start = time (NULL); - while ((time (NULL) - start < 5) && (multi != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - msg = curl_multi_info_read (multi, &running); - if (msg == NULL) - break; - if (msg->msg == CURLMSG_DONE) - { - if (i == 0 && msg->data.result != CURLE_OK) - printf ("%s failed at %s:%d: `%s'\n", - "curl_multi_perform", - __FILE__, - __LINE__, curl_easy_strerror (msg->data.result)); - else if (i == 1 && msg->data.result == CURLE_OK) - printf ("%s should have failed at %s:%d\n", - "curl_multi_perform", - __FILE__, - __LINE__); - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - c = NULL; - multi = NULL; - } - } - MHD_run (d); - } - - if (i == 0) { - /* quiesce the daemon on the 1st iteration, so the 2nd should fail */ - fd = MHD_quiesce_daemon(d); - if (MHD_INVALID_SOCKET == fd) - abort (); - MHD_socket_close_ (fd); - c = setupCURL (&cbc); - multi = curl_multi_init (); - mret = curl_multi_add_handle (multi, c); - } - } - if (multi != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - curl_multi_cleanup (multi); - } - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 8192; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 16384; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testGet (MHD_USE_SELECT_INTERNALLY, 0, 0); - errorCount += testGet (MHD_USE_THREAD_PER_CONNECTION, 0, 0); - errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT, 0); - errorCount += testExternalGet (); - if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL)) - { - errorCount += testGet(MHD_USE_SELECT_INTERNALLY, 0, MHD_USE_POLL); - errorCount += testGet (MHD_USE_THREAD_PER_CONNECTION, 0, MHD_USE_POLL); - errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT, MHD_USE_POLL); - } - if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL)) - { - errorCount += testGet (MHD_USE_SELECT_INTERNALLY, 0, MHD_USE_EPOLL_LINUX_ONLY); - errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT, MHD_USE_EPOLL_LINUX_ONLY); - } - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_start_stop.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_start_stop.c deleted file mode 100644 index a7083410..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_start_stop.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2011 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_start_stop.c - * @brief test for #1901 (start+stop) - * @author Christian Grothoff - */ -#include "MHD_config.h" -#include "platform.h" -#include -#include - -#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 -#undef CPU_COUNT -#endif -#if !defined(CPU_COUNT) -#define CPU_COUNT 2 -#endif - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - return MHD_NO; -} - - -static int -testInternalGet (int poll_flag) -{ - struct MHD_Daemon *d; - - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 1; - MHD_stop_daemon (d); - return 0; -} - -static int -testMultithreadedGet (int poll_flag) -{ - struct MHD_Daemon *d; - - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | poll_flag, - 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 2; - MHD_stop_daemon (d); - return 0; -} - -static int -testMultithreadedPoolGet (int poll_flag) -{ - struct MHD_Daemon *d; - - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, - 1081, NULL, NULL, &ahc_echo, "GET", - MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); - if (d == NULL) - return 4; - MHD_stop_daemon (d); - return 0; -} - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - - d = MHD_start_daemon (MHD_USE_DEBUG, - 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 8; - MHD_stop_daemon (d); - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - errorCount += testInternalGet (0); - errorCount += testMultithreadedGet (0); - errorCount += testMultithreadedPoolGet (0); - errorCount += testExternalGet (); - if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL)) - { - errorCount += testInternalGet(MHD_USE_POLL); - errorCount += testMultithreadedGet(MHD_USE_POLL); - errorCount += testMultithreadedPoolGet(MHD_USE_POLL); - } - if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL)) - { - errorCount += testInternalGet(MHD_USE_EPOLL_LINUX_ONLY); - errorCount += testMultithreadedPoolGet(MHD_USE_EPOLL_LINUX_ONLY); - } - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_termination.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_termination.c deleted file mode 100644 index 25f9e61c..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_termination.c +++ /dev/null @@ -1,125 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2009 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_termination.c - * @brief Testcase for libmicrohttpd tolerating client not closing immediately - * @author hollosig - */ -#define PORT 12345 - -#include "platform.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef __MINGW32__ -#include -#include -#endif - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif - -static int -connection_handler (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t * upload_data_size, - void **ptr) -{ - static int i; - - if (*ptr == NULL) - { - *ptr = &i; - return MHD_YES; - } - - if (*upload_data_size != 0) - { - (*upload_data_size) = 0; - return MHD_YES; - } - - struct MHD_Response *response = - MHD_create_response_from_buffer (strlen ("Response"), "Response", - MHD_RESPMEM_PERSISTENT); - int ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - - return ret; -} - -static size_t -write_data (void *ptr, size_t size, size_t nmemb, void *stream) -{ - return size * nmemb; -} - -int -main () -{ - struct MHD_Daemon *daemon; - - daemon = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - PORT, - NULL, - NULL, connection_handler, NULL, MHD_OPTION_END); - - if (daemon == NULL) - { - fprintf (stderr, "Daemon cannot be started!"); - exit (1); - } - - CURL *curl = curl_easy_init (); - //curl_easy_setopt(curl, CURLOPT_POST, 1L); - char url[255]; - sprintf (url, "http://127.0.0.1:%d", PORT); - curl_easy_setopt (curl, CURLOPT_URL, url); - curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, write_data); - - CURLcode success = curl_easy_perform (curl); - if (success != 0) - { - fprintf (stderr, "CURL Error"); - exit (1); - } - /* CPU used to go crazy here */ - sleep (1); - - curl_easy_cleanup (curl); - MHD_stop_daemon (daemon); - - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_timeout.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_timeout.c deleted file mode 100644 index 006c1a80..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_timeout.c +++ /dev/null @@ -1,294 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_timeout.c - * @brief Testcase for libmicrohttpd PUT operations - * @author Matthias Wachs - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -static int oneone; - -static int withTimeout = 1; - -static int withoutTimeout = 1; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - - -static void -termination_cb (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - int *test = cls; - - switch (toe) - { - case MHD_REQUEST_TERMINATED_COMPLETED_OK : - if (test == &withoutTimeout) - { - withoutTimeout = 0; - } - break; - case MHD_REQUEST_TERMINATED_WITH_ERROR : - case MHD_REQUEST_TERMINATED_READ_ERROR : - break; - case MHD_REQUEST_TERMINATED_TIMEOUT_REACHED : - if (test == &withTimeout) - { - withTimeout = 0; - } - break; - case MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN: - break; - case MHD_REQUEST_TERMINATED_CLIENT_ABORT: - break; - } -} - - -static size_t -putBuffer (void *stream, size_t size, size_t nmemb, void *ptr) -{ - unsigned int *pos = ptr; - unsigned int wrt; - - wrt = size * nmemb; - if (wrt > 8 - (*pos)) - wrt = 8 - (*pos); - memcpy (stream, &("Hello123"[*pos]), wrt); - (*pos) += wrt; - return wrt; -} - - -static size_t -putBuffer_fail (void *stream, size_t size, size_t nmemb, void *ptr) -{ - return 0; -} - - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - int *done = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp ("PUT", method)) - return MHD_NO; /* unexpected method */ - if ((*done) == 0) - { - if (*upload_data_size != 8) - return MHD_YES; /* not yet ready */ - if (0 == memcmp (upload_data, "Hello123", 8)) - { - *upload_data_size = 0; - } - else - { - printf ("Invalid upload data `%8s'!\n", upload_data); - return MHD_NO; - } - *done = 1; - return MHD_YES; - } - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -static int -testWithoutTimeout () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1080, - NULL, NULL, &ahc_echo, &done_flag, - MHD_OPTION_CONNECTION_TIMEOUT, 2, - MHD_OPTION_NOTIFY_COMPLETED, &termination_cb, &withTimeout, - MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 4; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 8; - return 0; -} - -static int -testWithTimeout () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - int done_flag = 0; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 1080, - NULL, NULL, &ahc_echo, &done_flag, - MHD_OPTION_CONNECTION_TIMEOUT, 2, - MHD_OPTION_NOTIFY_COMPLETED, &termination_cb, &withoutTimeout, - MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer_fail); - curl_easy_setopt (c, CURLOPT_READDATA, &testWithTimeout); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (errornum == CURLE_GOT_NOTHING) - /* mhd had the timeout */ - return 0; - else - /* curl had the timeout first */ - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 64; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 16; - errorCount += testWithoutTimeout (); - errorCount += testWithTimeout (); - if (errorCount != 0) - fprintf (stderr, - "Error during test execution (code: %u)\n", - errorCount); - curl_global_cleanup (); - if ((withTimeout == 0) && (withoutTimeout == 0)) - return 0; - else - return errorCount; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_urlparse.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_urlparse.c deleted file mode 100644 index c48bff20..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testcurl/test_urlparse.c +++ /dev/null @@ -1,191 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2009, 2011 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_urlparse.c - * @brief Testcase for libmicrohttpd url parsing - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif - -#ifndef WINDOWS -#include -#include -#endif - -static int oneone; - -static int matches; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -test_values (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *value) -{ - if ( (0 == strcmp (key, "a")) && - (0 == strcmp (value, "b")) ) - matches += 1; - if ( (0 == strcmp (key, "c")) && - (0 == strcmp (value, "")) ) - matches += 2; - if ( (0 == strcmp (key, "d")) && - (NULL == value) ) - matches += 4; - return MHD_YES; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - MHD_get_connection_values (connection, - MHD_GET_ARGUMENT_KIND, - &test_values, - NULL); - *unused = NULL; - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static int -testInternalGet (int poll_flag) -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:11080/hello_world?a=b&c=&d"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - /* NOTE: use of CONNECTTIMEOUT without also - setting NOSIGNAL results in really weird - crashes on my system!*/ - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 2; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 4; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 8; - if (matches != 7) - return 16; - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalGet (0); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/Makefile.am b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/Makefile.am deleted file mode 100644 index 9d78bec1..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/Makefile.am +++ /dev/null @@ -1,115 +0,0 @@ -# This Makefile.am is in the public domain -SUBDIRS = . - -AM_CFLAGS = -DDATA_DIR=\"$(top_srcdir)/src/datadir/\" - -if USE_COVERAGE - AM_CFLAGS += -fprofile-arcs -ftest-coverage -endif - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/applicationlayer \ - $(LIBCURL_CPPFLAGS) - -if !HAVE_W32 -PERF_GET_CONCURRENT=perf_get_concurrent -endif - -if ENABLE_SPDY -if HAVE_OPENSSL -check_PROGRAMS = \ - test_daemon_start_stop \ - test_daemon_start_stop_many \ - test_struct_namevalue - -if HAVE_SPDYLAY -check_PROGRAMS += \ - test_new_connection \ - test_request_response \ - test_notls \ - test_request_response_with_callback \ - test_misc \ - test_session_timeout - #test_requests_with_assets -if HAVE_CURL_BINARY -check_PROGRAMS += \ - test_proxies -endif -endif -endif -endif - - -TESTS = $(check_PROGRAMS) - - -SPDY_SOURCES= \ - common.h common.c - -SPDY_LDADD= \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - -lz - -test_daemon_start_stop_SOURCES = \ - test_daemon_start_stop.c \ - $(SPDY_SOURCES) -test_daemon_start_stop_LDADD = $(SPDY_LDADD) - -test_daemon_start_stop_many_SOURCES = \ - test_daemon_start_stop_many.c \ - $(SPDY_SOURCES) -test_daemon_start_stop_many_LDADD = $(SPDY_LDADD) - -test_struct_namevalue_SOURCES = \ - test_struct_namevalue.c \ - $(SPDY_SOURCES) -test_struct_namevalue_LDADD = $(SPDY_LDADD) - -if HAVE_SPDYLAY -test_new_connection_SOURCES = \ - test_new_connection.c \ - $(SPDY_SOURCES) -test_new_connection_LDADD = $(SPDY_LDADD) \ - -lspdylay - -test_request_response_SOURCES = \ - test_request_response.c \ - $(SPDY_SOURCES) -test_request_response_LDADD = $(SPDY_LDADD) \ - -lspdylay - -test_notls_SOURCES = \ - test_notls.c \ - $(SPDY_SOURCES) -test_notls_LDADD = $(SPDY_LDADD) \ - -lspdylay - -test_request_response_with_callback_SOURCES = \ - test_request_response_with_callback.c \ - $(SPDY_SOURCES) -test_request_response_with_callback_LDADD = $(SPDY_LDADD) - -#test_requests_with_assets_SOURCES = \ -# test_requests_with_assets.c \ -# $(SPDY_SOURCES) -#test_requests_with_assets_LDADD = $(SPDY_LDADD) - -test_misc_SOURCES = \ - test_misc.c \ - $(SPDY_SOURCES) -test_misc_LDADD = $(SPDY_LDADD) - -test_session_timeout_SOURCES = \ - test_session_timeout.c \ - $(SPDY_SOURCES) -test_session_timeout_LDADD = $(SPDY_LDADD) - - -test_proxies_SOURCES = \ - test_proxies.c \ - $(SPDY_SOURCES) -test_proxies_LDADD = $(SPDY_LDADD) - -endif diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/Makefile.in b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/Makefile.in deleted file mode 100644 index 937e793b..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/Makefile.in +++ /dev/null @@ -1,1402 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@USE_COVERAGE_TRUE@am__append_1 = -fprofile-arcs -ftest-coverage -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@check_PROGRAMS = test_daemon_start_stop$(EXEEXT) \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@ test_daemon_start_stop_many$(EXEEXT) \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@ test_struct_namevalue$(EXEEXT) \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@ $(am__EXEEXT_1) \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@ $(am__EXEEXT_2) -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@am__append_2 = \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_new_connection \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_request_response \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_notls \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_request_response_with_callback \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_misc \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_session_timeout - -@ENABLE_SPDY_TRUE@@HAVE_CURL_BINARY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@am__append_3 = \ -@ENABLE_SPDY_TRUE@@HAVE_CURL_BINARY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_proxies - -subdir = src/testspdy -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp $(top_srcdir)/test-driver -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@am__EXEEXT_1 = test_new_connection$(EXEEXT) \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_request_response$(EXEEXT) \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_notls$(EXEEXT) \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_request_response_with_callback$(EXEEXT) \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_misc$(EXEEXT) \ -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ test_session_timeout$(EXEEXT) -@ENABLE_SPDY_TRUE@@HAVE_CURL_BINARY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@am__EXEEXT_2 = test_proxies$(EXEEXT) -am__objects_1 = common.$(OBJEXT) -am_test_daemon_start_stop_OBJECTS = test_daemon_start_stop.$(OBJEXT) \ - $(am__objects_1) -test_daemon_start_stop_OBJECTS = $(am_test_daemon_start_stop_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/src/microspdy/libmicrospdy.la -test_daemon_start_stop_DEPENDENCIES = $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -am_test_daemon_start_stop_many_OBJECTS = \ - test_daemon_start_stop_many.$(OBJEXT) $(am__objects_1) -test_daemon_start_stop_many_OBJECTS = \ - $(am_test_daemon_start_stop_many_OBJECTS) -test_daemon_start_stop_many_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__test_misc_SOURCES_DIST = test_misc.c common.h common.c -@HAVE_SPDYLAY_TRUE@am_test_misc_OBJECTS = test_misc.$(OBJEXT) \ -@HAVE_SPDYLAY_TRUE@ $(am__objects_1) -test_misc_OBJECTS = $(am_test_misc_OBJECTS) -@HAVE_SPDYLAY_TRUE@test_misc_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__test_new_connection_SOURCES_DIST = test_new_connection.c common.h \ - common.c -@HAVE_SPDYLAY_TRUE@am_test_new_connection_OBJECTS = \ -@HAVE_SPDYLAY_TRUE@ test_new_connection.$(OBJEXT) \ -@HAVE_SPDYLAY_TRUE@ $(am__objects_1) -test_new_connection_OBJECTS = $(am_test_new_connection_OBJECTS) -@HAVE_SPDYLAY_TRUE@test_new_connection_DEPENDENCIES = \ -@HAVE_SPDYLAY_TRUE@ $(am__DEPENDENCIES_1) -am__test_notls_SOURCES_DIST = test_notls.c common.h common.c -@HAVE_SPDYLAY_TRUE@am_test_notls_OBJECTS = test_notls.$(OBJEXT) \ -@HAVE_SPDYLAY_TRUE@ $(am__objects_1) -test_notls_OBJECTS = $(am_test_notls_OBJECTS) -@HAVE_SPDYLAY_TRUE@test_notls_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__test_proxies_SOURCES_DIST = test_proxies.c common.h common.c -@HAVE_SPDYLAY_TRUE@am_test_proxies_OBJECTS = test_proxies.$(OBJEXT) \ -@HAVE_SPDYLAY_TRUE@ $(am__objects_1) -test_proxies_OBJECTS = $(am_test_proxies_OBJECTS) -@HAVE_SPDYLAY_TRUE@test_proxies_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__test_request_response_SOURCES_DIST = test_request_response.c \ - common.h common.c -@HAVE_SPDYLAY_TRUE@am_test_request_response_OBJECTS = \ -@HAVE_SPDYLAY_TRUE@ test_request_response.$(OBJEXT) \ -@HAVE_SPDYLAY_TRUE@ $(am__objects_1) -test_request_response_OBJECTS = $(am_test_request_response_OBJECTS) -@HAVE_SPDYLAY_TRUE@test_request_response_DEPENDENCIES = \ -@HAVE_SPDYLAY_TRUE@ $(am__DEPENDENCIES_1) -am__test_request_response_with_callback_SOURCES_DIST = \ - test_request_response_with_callback.c common.h common.c -@HAVE_SPDYLAY_TRUE@am_test_request_response_with_callback_OBJECTS = test_request_response_with_callback.$(OBJEXT) \ -@HAVE_SPDYLAY_TRUE@ $(am__objects_1) -test_request_response_with_callback_OBJECTS = \ - $(am_test_request_response_with_callback_OBJECTS) -@HAVE_SPDYLAY_TRUE@test_request_response_with_callback_DEPENDENCIES = \ -@HAVE_SPDYLAY_TRUE@ $(am__DEPENDENCIES_1) -am__test_session_timeout_SOURCES_DIST = test_session_timeout.c \ - common.h common.c -@HAVE_SPDYLAY_TRUE@am_test_session_timeout_OBJECTS = \ -@HAVE_SPDYLAY_TRUE@ test_session_timeout.$(OBJEXT) \ -@HAVE_SPDYLAY_TRUE@ $(am__objects_1) -test_session_timeout_OBJECTS = $(am_test_session_timeout_OBJECTS) -@HAVE_SPDYLAY_TRUE@test_session_timeout_DEPENDENCIES = \ -@HAVE_SPDYLAY_TRUE@ $(am__DEPENDENCIES_1) -am_test_struct_namevalue_OBJECTS = test_struct_namevalue.$(OBJEXT) \ - $(am__objects_1) -test_struct_namevalue_OBJECTS = $(am_test_struct_namevalue_OBJECTS) -test_struct_namevalue_DEPENDENCIES = $(am__DEPENDENCIES_1) -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(test_daemon_start_stop_SOURCES) \ - $(test_daemon_start_stop_many_SOURCES) $(test_misc_SOURCES) \ - $(test_new_connection_SOURCES) $(test_notls_SOURCES) \ - $(test_proxies_SOURCES) $(test_request_response_SOURCES) \ - $(test_request_response_with_callback_SOURCES) \ - $(test_session_timeout_SOURCES) \ - $(test_struct_namevalue_SOURCES) -DIST_SOURCES = $(test_daemon_start_stop_SOURCES) \ - $(test_daemon_start_stop_many_SOURCES) \ - $(am__test_misc_SOURCES_DIST) \ - $(am__test_new_connection_SOURCES_DIST) \ - $(am__test_notls_SOURCES_DIST) \ - $(am__test_proxies_SOURCES_DIST) \ - $(am__test_request_response_SOURCES_DIST) \ - $(am__test_request_response_with_callback_SOURCES_DIST) \ - $(am__test_session_timeout_SOURCES_DIST) \ - $(test_struct_namevalue_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - check recheck distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -am__tty_colors_dummy = \ - mgn= red= grn= lgn= blu= brg= std=; \ - am__color_tests=no -am__tty_colors = { \ - $(am__tty_colors_dummy); \ - if test "X$(AM_COLOR_TESTS)" = Xno; then \ - am__color_tests=no; \ - elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ - am__color_tests=yes; \ - elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ - am__color_tests=yes; \ - fi; \ - if test $$am__color_tests = yes; then \ - red=''; \ - grn=''; \ - lgn=''; \ - blu=''; \ - mgn=''; \ - brg=''; \ - std=''; \ - fi; \ -} -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__recheck_rx = ^[ ]*:recheck:[ ]* -am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* -am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* -# A command that, given a newline-separated list of test names on the -# standard input, print the name of the tests that are to be re-run -# upon "make recheck". -am__list_recheck_tests = $(AWK) '{ \ - recheck = 1; \ - while ((rc = (getline line < ($$0 ".trs"))) != 0) \ - { \ - if (rc < 0) \ - { \ - if ((getline line2 < ($$0 ".log")) < 0) \ - recheck = 0; \ - break; \ - } \ - else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ - { \ - recheck = 0; \ - break; \ - } \ - else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ - { \ - break; \ - } \ - }; \ - if (recheck) \ - print $$0; \ - close ($$0 ".trs"); \ - close ($$0 ".log"); \ -}' -# A command that, given a newline-separated list of test names on the -# standard input, create the global log from their .trs and .log files. -am__create_global_log = $(AWK) ' \ -function fatal(msg) \ -{ \ - print "fatal: making $@: " msg | "cat >&2"; \ - exit 1; \ -} \ -function rst_section(header) \ -{ \ - print header; \ - len = length(header); \ - for (i = 1; i <= len; i = i + 1) \ - printf "="; \ - printf "\n\n"; \ -} \ -{ \ - copy_in_global_log = 1; \ - global_test_result = "RUN"; \ - while ((rc = (getline line < ($$0 ".trs"))) != 0) \ - { \ - if (rc < 0) \ - fatal("failed to read from " $$0 ".trs"); \ - if (line ~ /$(am__global_test_result_rx)/) \ - { \ - sub("$(am__global_test_result_rx)", "", line); \ - sub("[ ]*$$", "", line); \ - global_test_result = line; \ - } \ - else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ - copy_in_global_log = 0; \ - }; \ - if (copy_in_global_log) \ - { \ - rst_section(global_test_result ": " $$0); \ - while ((rc = (getline line < ($$0 ".log"))) != 0) \ - { \ - if (rc < 0) \ - fatal("failed to read from " $$0 ".log"); \ - print line; \ - }; \ - printf "\n"; \ - }; \ - close ($$0 ".trs"); \ - close ($$0 ".log"); \ -}' -# Restructured Text title. -am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } -# Solaris 10 'make', and several other traditional 'make' implementations, -# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it -# by disabling -e (using the XSI extension "set +e") if it's set. -am__sh_e_setup = case $$- in *e*) set +e;; esac -# Default flags passed to test drivers. -am__common_driver_flags = \ - --color-tests "$$am__color_tests" \ - --enable-hard-errors "$$am__enable_hard_errors" \ - --expect-failure "$$am__expect_failure" -# To be inserted before the command running the test. Creates the -# directory for the log if needed. Stores in $dir the directory -# containing $f, in $tst the test, in $log the log. Executes the -# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and -# passes TESTS_ENVIRONMENT. Set up options for the wrapper that -# will run the test scripts (or their associated LOG_COMPILER, if -# thy have one). -am__check_pre = \ -$(am__sh_e_setup); \ -$(am__vpath_adj_setup) $(am__vpath_adj) \ -$(am__tty_colors); \ -srcdir=$(srcdir); export srcdir; \ -case "$@" in \ - */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ - *) am__odir=.;; \ -esac; \ -test "x$$am__odir" = x"." || test -d "$$am__odir" \ - || $(MKDIR_P) "$$am__odir" || exit $$?; \ -if test -f "./$$f"; then dir=./; \ -elif test -f "$$f"; then dir=; \ -else dir="$(srcdir)/"; fi; \ -tst=$$dir$$f; log='$@'; \ -if test -n '$(DISABLE_HARD_ERRORS)'; then \ - am__enable_hard_errors=no; \ -else \ - am__enable_hard_errors=yes; \ -fi; \ -case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ - am__expect_failure=yes;; \ - *) \ - am__expect_failure=no;; \ -esac; \ -$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) -# A shell command to get the names of the tests scripts with any registered -# extension removed (i.e., equivalently, the names of the test logs, with -# the '.log' extension removed). The result is saved in the shell variable -# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, -# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", -# since that might cause problem with VPATH rewrites for suffix-less tests. -# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. -am__set_TESTS_bases = \ - bases='$(TEST_LOGS)'; \ - bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ - bases=`echo $$bases` -RECHECK_LOGS = $(TEST_LOGS) -TEST_SUITE_LOG = test-suite.log -TEST_EXTENSIONS = @EXEEXT@ .test -LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver -LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) -am__set_b = \ - case '$@' in \ - */*) \ - case '$*' in \ - */*) b='$*';; \ - *) b=`echo '$@' | sed 's/\.log$$//'`; \ - esac;; \ - *) \ - b='$*';; \ - esac -am__test_logs1 = $(TESTS:=.log) -am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) -TEST_LOGS = $(am__test_logs2:.test.log=.log) -TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver -TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ - $(TEST_LOG_FLAGS) -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -SUBDIRS = . -AM_CFLAGS = -DDATA_DIR=\"$(top_srcdir)/src/datadir/\" $(am__append_1) -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/applicationlayer \ - $(LIBCURL_CPPFLAGS) - -@HAVE_W32_FALSE@PERF_GET_CONCURRENT = perf_get_concurrent -TESTS = $(check_PROGRAMS) -SPDY_SOURCES = \ - common.h common.c - -SPDY_LDADD = \ - $(top_builddir)/src/microspdy/libmicrospdy.la \ - -lz - -test_daemon_start_stop_SOURCES = \ - test_daemon_start_stop.c \ - $(SPDY_SOURCES) - -test_daemon_start_stop_LDADD = $(SPDY_LDADD) -test_daemon_start_stop_many_SOURCES = \ - test_daemon_start_stop_many.c \ - $(SPDY_SOURCES) - -test_daemon_start_stop_many_LDADD = $(SPDY_LDADD) -test_struct_namevalue_SOURCES = \ - test_struct_namevalue.c \ - $(SPDY_SOURCES) - -test_struct_namevalue_LDADD = $(SPDY_LDADD) -@HAVE_SPDYLAY_TRUE@test_new_connection_SOURCES = \ -@HAVE_SPDYLAY_TRUE@ test_new_connection.c \ -@HAVE_SPDYLAY_TRUE@ $(SPDY_SOURCES) - -@HAVE_SPDYLAY_TRUE@test_new_connection_LDADD = $(SPDY_LDADD) \ -@HAVE_SPDYLAY_TRUE@ -lspdylay - -@HAVE_SPDYLAY_TRUE@test_request_response_SOURCES = \ -@HAVE_SPDYLAY_TRUE@ test_request_response.c \ -@HAVE_SPDYLAY_TRUE@ $(SPDY_SOURCES) - -@HAVE_SPDYLAY_TRUE@test_request_response_LDADD = $(SPDY_LDADD) \ -@HAVE_SPDYLAY_TRUE@ -lspdylay - -@HAVE_SPDYLAY_TRUE@test_notls_SOURCES = \ -@HAVE_SPDYLAY_TRUE@ test_notls.c \ -@HAVE_SPDYLAY_TRUE@ $(SPDY_SOURCES) - -@HAVE_SPDYLAY_TRUE@test_notls_LDADD = $(SPDY_LDADD) \ -@HAVE_SPDYLAY_TRUE@ -lspdylay - -@HAVE_SPDYLAY_TRUE@test_request_response_with_callback_SOURCES = \ -@HAVE_SPDYLAY_TRUE@ test_request_response_with_callback.c \ -@HAVE_SPDYLAY_TRUE@ $(SPDY_SOURCES) - -@HAVE_SPDYLAY_TRUE@test_request_response_with_callback_LDADD = $(SPDY_LDADD) - -#test_requests_with_assets_SOURCES = \ -# test_requests_with_assets.c \ -# $(SPDY_SOURCES) -#test_requests_with_assets_LDADD = $(SPDY_LDADD) -@HAVE_SPDYLAY_TRUE@test_misc_SOURCES = \ -@HAVE_SPDYLAY_TRUE@ test_misc.c \ -@HAVE_SPDYLAY_TRUE@ $(SPDY_SOURCES) - -@HAVE_SPDYLAY_TRUE@test_misc_LDADD = $(SPDY_LDADD) -@HAVE_SPDYLAY_TRUE@test_session_timeout_SOURCES = \ -@HAVE_SPDYLAY_TRUE@ test_session_timeout.c \ -@HAVE_SPDYLAY_TRUE@ $(SPDY_SOURCES) - -@HAVE_SPDYLAY_TRUE@test_session_timeout_LDADD = $(SPDY_LDADD) -@HAVE_SPDYLAY_TRUE@test_proxies_SOURCES = \ -@HAVE_SPDYLAY_TRUE@ test_proxies.c \ -@HAVE_SPDYLAY_TRUE@ $(SPDY_SOURCES) - -@HAVE_SPDYLAY_TRUE@test_proxies_LDADD = $(SPDY_LDADD) -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/testspdy/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/testspdy/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -test_daemon_start_stop$(EXEEXT): $(test_daemon_start_stop_OBJECTS) $(test_daemon_start_stop_DEPENDENCIES) $(EXTRA_test_daemon_start_stop_DEPENDENCIES) - @rm -f test_daemon_start_stop$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_daemon_start_stop_OBJECTS) $(test_daemon_start_stop_LDADD) $(LIBS) - -test_daemon_start_stop_many$(EXEEXT): $(test_daemon_start_stop_many_OBJECTS) $(test_daemon_start_stop_many_DEPENDENCIES) $(EXTRA_test_daemon_start_stop_many_DEPENDENCIES) - @rm -f test_daemon_start_stop_many$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_daemon_start_stop_many_OBJECTS) $(test_daemon_start_stop_many_LDADD) $(LIBS) - -test_misc$(EXEEXT): $(test_misc_OBJECTS) $(test_misc_DEPENDENCIES) $(EXTRA_test_misc_DEPENDENCIES) - @rm -f test_misc$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_misc_OBJECTS) $(test_misc_LDADD) $(LIBS) - -test_new_connection$(EXEEXT): $(test_new_connection_OBJECTS) $(test_new_connection_DEPENDENCIES) $(EXTRA_test_new_connection_DEPENDENCIES) - @rm -f test_new_connection$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_new_connection_OBJECTS) $(test_new_connection_LDADD) $(LIBS) - -test_notls$(EXEEXT): $(test_notls_OBJECTS) $(test_notls_DEPENDENCIES) $(EXTRA_test_notls_DEPENDENCIES) - @rm -f test_notls$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_notls_OBJECTS) $(test_notls_LDADD) $(LIBS) - -test_proxies$(EXEEXT): $(test_proxies_OBJECTS) $(test_proxies_DEPENDENCIES) $(EXTRA_test_proxies_DEPENDENCIES) - @rm -f test_proxies$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_proxies_OBJECTS) $(test_proxies_LDADD) $(LIBS) - -test_request_response$(EXEEXT): $(test_request_response_OBJECTS) $(test_request_response_DEPENDENCIES) $(EXTRA_test_request_response_DEPENDENCIES) - @rm -f test_request_response$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_request_response_OBJECTS) $(test_request_response_LDADD) $(LIBS) - -test_request_response_with_callback$(EXEEXT): $(test_request_response_with_callback_OBJECTS) $(test_request_response_with_callback_DEPENDENCIES) $(EXTRA_test_request_response_with_callback_DEPENDENCIES) - @rm -f test_request_response_with_callback$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_request_response_with_callback_OBJECTS) $(test_request_response_with_callback_LDADD) $(LIBS) - -test_session_timeout$(EXEEXT): $(test_session_timeout_OBJECTS) $(test_session_timeout_DEPENDENCIES) $(EXTRA_test_session_timeout_DEPENDENCIES) - @rm -f test_session_timeout$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_session_timeout_OBJECTS) $(test_session_timeout_LDADD) $(LIBS) - -test_struct_namevalue$(EXEEXT): $(test_struct_namevalue_OBJECTS) $(test_struct_namevalue_DEPENDENCIES) $(EXTRA_test_struct_namevalue_DEPENDENCIES) - @rm -f test_struct_namevalue$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_struct_namevalue_OBJECTS) $(test_struct_namevalue_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_daemon_start_stop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_daemon_start_stop_many.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_misc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_new_connection.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_notls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_proxies.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_request_response.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_request_response_with_callback.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_session_timeout.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_struct_namevalue.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -# Recover from deleted '.trs' file; this should ensure that -# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create -# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells -# to avoid problems with "make -n". -.log.trs: - rm -f $< $@ - $(MAKE) $(AM_MAKEFLAGS) $< - -# Leading 'am--fnord' is there to ensure the list of targets does not -# expand to empty, as could happen e.g. with make check TESTS=''. -am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) -am--force-recheck: - @: - -$(TEST_SUITE_LOG): $(TEST_LOGS) - @$(am__set_TESTS_bases); \ - am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ - redo_bases=`for i in $$bases; do \ - am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ - done`; \ - if test -n "$$redo_bases"; then \ - redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ - redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ - if $(am__make_dryrun); then :; else \ - rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ - fi; \ - fi; \ - if test -n "$$am__remaking_logs"; then \ - echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ - "recursion detected" >&2; \ - else \ - am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ - fi; \ - if $(am__make_dryrun); then :; else \ - st=0; \ - errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ - for i in $$redo_bases; do \ - test -f $$i.trs && test -r $$i.trs \ - || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ - test -f $$i.log && test -r $$i.log \ - || { echo "$$errmsg $$i.log" >&2; st=1; }; \ - done; \ - test $$st -eq 0 || exit 1; \ - fi - @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ - ws='[ ]'; \ - results=`for b in $$bases; do echo $$b.trs; done`; \ - test -n "$$results" || results=/dev/null; \ - all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ - pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ - fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ - skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ - xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ - xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ - error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ - if test `expr $$fail + $$xpass + $$error` -eq 0; then \ - success=true; \ - else \ - success=false; \ - fi; \ - br='==================='; br=$$br$$br$$br$$br; \ - result_count () \ - { \ - if test x"$$1" = x"--maybe-color"; then \ - maybe_colorize=yes; \ - elif test x"$$1" = x"--no-color"; then \ - maybe_colorize=no; \ - else \ - echo "$@: invalid 'result_count' usage" >&2; exit 4; \ - fi; \ - shift; \ - desc=$$1 count=$$2; \ - if test $$maybe_colorize = yes && test $$count -gt 0; then \ - color_start=$$3 color_end=$$std; \ - else \ - color_start= color_end=; \ - fi; \ - echo "$${color_start}# $$desc $$count$${color_end}"; \ - }; \ - create_testsuite_report () \ - { \ - result_count $$1 "TOTAL:" $$all "$$brg"; \ - result_count $$1 "PASS: " $$pass "$$grn"; \ - result_count $$1 "SKIP: " $$skip "$$blu"; \ - result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ - result_count $$1 "FAIL: " $$fail "$$red"; \ - result_count $$1 "XPASS:" $$xpass "$$red"; \ - result_count $$1 "ERROR:" $$error "$$mgn"; \ - }; \ - { \ - echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ - $(am__rst_title); \ - create_testsuite_report --no-color; \ - echo; \ - echo ".. contents:: :depth: 2"; \ - echo; \ - for b in $$bases; do echo $$b; done \ - | $(am__create_global_log); \ - } >$(TEST_SUITE_LOG).tmp || exit 1; \ - mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ - if $$success; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ - fi; \ - echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ - echo "$${col}$$br$${std}"; \ - create_testsuite_report --maybe-color; \ - echo "$$col$$br$$std"; \ - if $$success; then :; else \ - echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ - if test -n "$(PACKAGE_BUGREPORT)"; then \ - echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ - fi; \ - echo "$$col$$br$$std"; \ - fi; \ - $$success || exit 1 - -check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - log_list=`for i in $$bases; do echo $$i.log; done`; \ - trs_list=`for i in $$bases; do echo $$i.trs; done`; \ - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; -recheck: all $(check_PROGRAMS) - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ - | $(am__list_recheck_tests)` || exit 1; \ - log_list=`for i in $$bases; do echo $$i.log; done`; \ - log_list=`echo $$log_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ - am__force_recheck=am--force-recheck \ - TEST_LOGS="$$log_list"; \ - exit $$? -test_daemon_start_stop.log: test_daemon_start_stop$(EXEEXT) - @p='test_daemon_start_stop$(EXEEXT)'; \ - b='test_daemon_start_stop'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_daemon_start_stop_many.log: test_daemon_start_stop_many$(EXEEXT) - @p='test_daemon_start_stop_many$(EXEEXT)'; \ - b='test_daemon_start_stop_many'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_struct_namevalue.log: test_struct_namevalue$(EXEEXT) - @p='test_struct_namevalue$(EXEEXT)'; \ - b='test_struct_namevalue'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_new_connection.log: test_new_connection$(EXEEXT) - @p='test_new_connection$(EXEEXT)'; \ - b='test_new_connection'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_request_response.log: test_request_response$(EXEEXT) - @p='test_request_response$(EXEEXT)'; \ - b='test_request_response'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_notls.log: test_notls$(EXEEXT) - @p='test_notls$(EXEEXT)'; \ - b='test_notls'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_request_response_with_callback.log: test_request_response_with_callback$(EXEEXT) - @p='test_request_response_with_callback$(EXEEXT)'; \ - b='test_request_response_with_callback'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_misc.log: test_misc$(EXEEXT) - @p='test_misc$(EXEEXT)'; \ - b='test_misc'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_session_timeout.log: test_session_timeout$(EXEEXT) - @p='test_session_timeout$(EXEEXT)'; \ - b='test_session_timeout'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_proxies.log: test_proxies$(EXEEXT) - @p='test_proxies$(EXEEXT)'; \ - b='test_proxies'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -.test.log: - @p='$<'; \ - $(am__set_b); \ - $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -@am__EXEEXT_TRUE@.test$(EXEEXT).log: -@am__EXEEXT_TRUE@ @p='$<'; \ -@am__EXEEXT_TRUE@ $(am__set_b); \ -@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ -@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ -@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ -@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) - -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) - -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) check-am install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ - clean-libtool cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ - uninstall uninstall-am - -@ENABLE_SPDY_TRUE@@HAVE_OPENSSL_TRUE@@HAVE_SPDYLAY_TRUE@ #test_requests_with_assets - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/common.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/common.c deleted file mode 100644 index e150209e..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/common.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file common.c - * @brief Common functions used by the tests. - * @author Andrey Uzunov - */ - - -#include "common.h" -#include - -#ifdef __GNUC__ -#define FUNC_CONSTRUCTOR(f) static void __attribute__ ((constructor)) f -#define FUNC_DESTRUCTOR(f) static void __attribute__ ((destructor)) f -#else // !__GNUC__ -#define FUNC_CONSTRUCTOR(f) _MHD_EXTERN void f -#define FUNC_DESTRUCTOR(f) _MHD_EXTERN void f -#endif // __GNUC__ - -FUNC_CONSTRUCTOR (constructor)() -{ - printf("\nTEST START -------------------------------------------------------\n"); -} - -FUNC_DESTRUCTOR (destructor)() -{ - printf("------------------------------------------------------- TEST END\n"); -} - -uint16_t -get_port(uint16_t min) -{ - struct timeval tv; - gettimeofday(&tv, NULL); - if(2 > min) min=2; - uint16_t port = min + (tv.tv_usec+10) % ((1 << 16) - min); - - //port = 12345; - printf("Port used: %i\n", port); - - return port; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/common.h b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/common.h deleted file mode 100644 index 70ee2614..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/common.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file common.h - * @brief Common functions used by the tests. - * @author Andrey Uzunov - */ - -#include -#include -#include -#include - -#define FAIL_TEST(msg) do{\ - printf("%i:%s\n", __LINE__, msg);\ - fflush(stdout);\ - exit(-10);\ - }\ - while(0) - -uint16_t -get_port(uint16_t min); diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_daemon_start_stop.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_daemon_start_stop.c deleted file mode 100644 index d3aec6a1..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_daemon_start_stop.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file daemon_start_stop.c - * @brief starts and stops a SPDY daemon - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "microspdy.h" -#include "common.h" - -int -main() -{ - SPDY_init(); - - struct SPDY_Daemon *daemon = SPDY_start_daemon(get_port(16123), - DATA_DIR "cert-and-key.pem", - DATA_DIR "cert-and-key.pem", - NULL,NULL,NULL,NULL,NULL,SPDY_DAEMON_OPTION_END); - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - SPDY_stop_daemon(daemon); - - SPDY_deinit(); - - return 0; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_daemon_start_stop_many.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_daemon_start_stop_many.c deleted file mode 100644 index b8788def..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_daemon_start_stop_many.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file daemon_start_stop_many.c - * @brief starts and stops several SPDY daemons, reusing port numbers - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "microspdy.h" -#include "common.h" - -int -main() -{ - int i; - int j; - int num_daemons = 3; - int num_tries = 5; - int port = get_port(15123); - struct SPDY_Daemon *daemon[num_daemons]; - - SPDY_init(); - - for(i=0; i. -*/ - -/** - * @file misc.c - * @brief tests a lot of small calls and callbacks. TODO mention what - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "microspdy.h" -#include "stdio.h" -#include -#include "common.h" - -int port; - -#define HTML "\ -\ -This is libmicrospdy" - -#define CSS "body{font-size:15px}" - -#define SESSION_CLS "1234567890" - -#define REQUEST_CLS "1234567890REQ" - -pid_t parent; -pid_t child; - -struct SPDY_Session *session1; -struct SPDY_Session *session2; - -void -killchild() -{ - kill(child, SIGKILL); - exit(1); -} - -void -killparent() -{ - kill(parent, SIGKILL); - _exit(1); -} - - -void -create_child() -{ - parent = getpid(); - - child = fork(); - if (-1 == child) - { - fprintf(stderr, "can't fork, error %d\n", errno); - exit(EXIT_FAILURE); - } - - if (child == 0) - { - int devnull; - char *uri; - fflush(stdout); - devnull = open("/dev/null", O_WRONLY); - if (-1 == devnull) - abort (); - if (1 != devnull) - { - dup2(devnull, 1); - close(devnull); - } - asprintf(&uri,"https://127.0.0.1:%i/",port); - execlp("spdycat", "spdycat","-anv",uri,NULL ); - printf("execlp failed\n"); - killparent(); - } -} - -void -response_done_callback(void *cls, - struct SPDY_Response * response, - struct SPDY_Request * request, - enum SPDY_RESPONSE_RESULT status, - bool streamopened) -{ - (void)status; - (void)streamopened; - - if(strcmp(cls,"/main.css")) - { - session1 = SPDY_get_session_for_request(request); - if(NULL == session1) - { - printf("SPDY_get_session_for_request failed\n"); - killchild(); - } - - char *session_cls = strdup(SESSION_CLS); - SPDY_set_cls_to_session(session1,session_cls); - } - else - { - session2 = SPDY_get_session_for_request(request); - if(session1 != session2) - { - printf("SPDY_get_session_for_request failed the second time\n"); - killchild(); - } - printf("SPDY_get_session_for_request tested...\n"); - - void *session_cls = SPDY_get_cls_from_session(session2); - if(NULL == session_cls || strcmp(session_cls, SESSION_CLS)) - { - printf("SPDY_get_cls_from_session failed\n"); - killchild(); - } - printf("SPDY_set_cls_to_session tested...\n"); - printf("SPDY_get_cls_from_session tested...\n"); - - void *request_cls = SPDY_get_cls_from_request(request); - if(NULL == request_cls || strcmp(request_cls, REQUEST_CLS)) - { - printf("SPDY_get_cls_from_request failed\n"); - killchild(); - } - printf("SPDY_set_cls_to_request tested...\n"); - printf("SPDY_get_cls_from_request tested...\n"); - } - - SPDY_destroy_request(request); - SPDY_destroy_response(response); - free(cls); -} - -void -standard_request_handler(void *cls, - struct SPDY_Request * request, - uint8_t priority, - const char *method, - const char *path, - const char *version, - const char *host, - const char *scheme, - struct SPDY_NameValue * headers, - bool more) -{ - (void)cls; - (void)request; - (void)priority; - (void)host; - (void)scheme; - (void)headers; - (void)method; - (void)version; - (void)more; - - struct SPDY_Response *response=NULL; - char *cls_path = strdup(path); - - if(strcmp(path,"/main.css")==0) - { - char *request_cls = strdup(REQUEST_CLS); - SPDY_set_cls_to_request(request,request_cls); - response = SPDY_build_response(200,NULL,SPDY_HTTP_VERSION_1_1,NULL,CSS,strlen(CSS)); - } - else - { - response = SPDY_build_response(200,NULL,SPDY_HTTP_VERSION_1_1,NULL,HTML,strlen(HTML)); - } - - if(NULL==response){ - fprintf(stdout,"no response obj\n"); - killchild(); - } - - if(SPDY_queue_response(request,response,true,false,&response_done_callback,cls_path)!=SPDY_YES) - { - fprintf(stdout,"queue\n"); - killchild(); - } -} - -int -parentproc() -{ - int childstatus; - unsigned long long timeoutlong=0; - struct timeval timeout; - int ret; - fd_set read_fd_set; - fd_set write_fd_set; - fd_set except_fd_set; - int maxfd = -1; - struct SPDY_Daemon *daemon; - - daemon = SPDY_start_daemon(port, - DATA_DIR "cert-and-key.pem", - DATA_DIR "cert-and-key.pem", - NULL, - NULL, - &standard_request_handler, - NULL, - NULL, - SPDY_DAEMON_OPTION_SESSION_TIMEOUT, - 1800, - SPDY_DAEMON_OPTION_END); - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - create_child(); - - do - { - FD_ZERO(&read_fd_set); - FD_ZERO(&write_fd_set); - FD_ZERO(&except_fd_set); - - ret = SPDY_get_timeout(daemon, &timeoutlong); - if(SPDY_NO == ret || timeoutlong > 1000) - { - timeout.tv_sec = 1; - timeout.tv_usec = 0; - } - else - { - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - } - - maxfd = SPDY_get_fdset (daemon, - &read_fd_set, - &write_fd_set, - &except_fd_set); - - ret = select(maxfd+1, &read_fd_set, &write_fd_set, &except_fd_set, &timeout); - - switch(ret) { - case -1: - printf("select error: %i\n", errno); - break; - case 0: - - break; - default: - SPDY_run(daemon); - - break; - } - } - while(waitpid(child,&childstatus,WNOHANG) != child); - - SPDY_stop_daemon(daemon); - - return WEXITSTATUS(childstatus); -} - - -int -main() -{ - port = get_port(13123); - SPDY_init(); - - int ret = parentproc(); - - SPDY_deinit(); - - return ret; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_new_connection.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_new_connection.c deleted file mode 100644 index b8485724..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_new_connection.c +++ /dev/null @@ -1,1009 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file request_response.c - * @brief tests new connection callback. spdycli.c - * code is reused here - * @author Andrey Uzunov - * @author Tatsuhiro Tsujikawa - */ - -//TODO child exits with ret val 1 sometimes - -#include "platform.h" -#include "microspdy.h" -#include -#include "common.h" - -#define RESPONSE_BODY "Hi, this is libmicrospdy!" - -#define CLS "anything" - -int port; -int loop = 1; - -pid_t parent; -pid_t child; - -int -spdylay_printf(const char *format, ...) -{ - (void)format; - - return 0; -} - -int -spdylay_fprintf(FILE *stream, const char *format, ...) -{ - (void)stream; - (void)format; - - return 0; -} - -void -killchild(int pid, char *message) -{ - printf("%s\n",message); - kill(pid, SIGKILL); - exit(1); -} - -void -killparent(int pid, char *message) -{ - printf("%s\n",message); - kill(pid, SIGKILL); - _exit(2); -} - - -/***** - * start of code needed to utilize spdylay - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -enum { - IO_NONE, - WANT_READ, - WANT_WRITE -}; - -struct Connection { - SSL *ssl; - spdylay_session *session; - /* WANT_READ if SSL connection needs more input; or WANT_WRITE if it - needs more output; or IO_NONE. This is necessary because SSL/TLS - re-negotiation is possible at any time. Spdylay API offers - similar functions like spdylay_session_want_read() and - spdylay_session_want_write() but they do not take into account - SSL connection. */ - int want_io; -}; - -struct Request { - char *host; - uint16_t port; - /* In this program, path contains query component as well. */ - char *path; - /* This is the concatenation of host and port with ":" in - between. */ - char *hostport; - /* Stream ID for this request. */ - int32_t stream_id; - /* The gzip stream inflater for the compressed response. */ - spdylay_gzip *inflater; -}; - -struct URI { - const char *host; - size_t hostlen; - uint16_t port; - /* In this program, path contains query component as well. */ - const char *path; - size_t pathlen; - const char *hostport; - size_t hostportlen; -}; - -/* - * Returns copy of string |s| with the length |len|. The returned - * string is NULL-terminated. - */ -static char* strcopy(const char *s, size_t len) -{ - char *dst; - dst = malloc(len+1); - if (NULL == dst) - abort (); - memcpy(dst, s, len); - dst[len] = '\0'; - return dst; -} - -/* - * Prints error message |msg| and exit. - */ -static void die(const char *msg) -{ - fprintf(stderr, "FATAL: %s\n", msg); - exit(EXIT_FAILURE); -} - -/* - * Prints error containing the function name |func| and message |msg| - * and exit. - */ -static void dief(const char *func, const char *msg) -{ - fprintf(stderr, "FATAL: %s: %s\n", func, msg); - exit(EXIT_FAILURE); -} - -/* - * Prints error containing the function name |func| and error code - * |error_code| and exit. - */ -static void diec(const char *func, int error_code) -{ - fprintf(stderr, "FATAL: %s: error_code=%d, msg=%s\n", func, error_code, - spdylay_strerror(error_code)); - exit(EXIT_FAILURE); -} - -/* - * Check response is content-encoding: gzip. We need this because SPDY - * client is required to support gzip. - */ -static void check_gzip(struct Request *req, char **nv) -{ - int gzip = 0; - size_t i; - for(i = 0; nv[i]; i += 2) { - if(strcmp("content-encoding", nv[i]) == 0) { - gzip = strcmp("gzip", nv[i+1]) == 0; - break; - } - } - if(gzip) { - int rv; - if(req->inflater) { - return; - } - rv = spdylay_gzip_inflate_new(&req->inflater); - if(rv != 0) { - die("Can't allocate inflate stream."); - } - } -} - -/* - * The implementation of spdylay_send_callback type. Here we write - * |data| with size |length| to the network and return the number of - * bytes actually written. See the documentation of - * spdylay_send_callback for the details. - */ -static ssize_t send_callback(spdylay_session *session, - const uint8_t *data, size_t length, int flags, - void *user_data) -{ - (void)session; - (void)flags; - - struct Connection *connection; - ssize_t rv; - connection = (struct Connection*)user_data; - connection->want_io = IO_NONE; - ERR_clear_error(); - rv = SSL_write(connection->ssl, data, length); - if(rv < 0) { - int err = SSL_get_error(connection->ssl, rv); - if(err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) { - connection->want_io = (err == SSL_ERROR_WANT_READ ? - WANT_READ : WANT_WRITE); - rv = SPDYLAY_ERR_WOULDBLOCK; - } else { - rv = SPDYLAY_ERR_CALLBACK_FAILURE; - } - } - return rv; -} - -/* - * The implementation of spdylay_recv_callback type. Here we read data - * from the network and write them in |buf|. The capacity of |buf| is - * |length| bytes. Returns the number of bytes stored in |buf|. See - * the documentation of spdylay_recv_callback for the details. - */ -static ssize_t recv_callback(spdylay_session *session, - uint8_t *buf, size_t length, int flags, - void *user_data) -{ - (void)session; - (void)flags; - - struct Connection *connection; - ssize_t rv; - connection = (struct Connection*)user_data; - connection->want_io = IO_NONE; - ERR_clear_error(); - rv = SSL_read(connection->ssl, buf, length); - if(rv < 0) { - int err = SSL_get_error(connection->ssl, rv); - if(err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) { - connection->want_io = (err == SSL_ERROR_WANT_READ ? - WANT_READ : WANT_WRITE); - rv = SPDYLAY_ERR_WOULDBLOCK; - } else { - rv = SPDYLAY_ERR_CALLBACK_FAILURE; - } - } else if(rv == 0) { - rv = SPDYLAY_ERR_EOF; - } - return rv; -} - -/* - * The implementation of spdylay_before_ctrl_send_callback type. We - * use this function to get stream ID of the request. This is because - * stream ID is not known when we submit the request - * (spdylay_submit_request). - */ -static void before_ctrl_send_callback(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, - void *user_data) -{ - (void)user_data; - - if(type == SPDYLAY_SYN_STREAM) { - struct Request *req; - int stream_id = frame->syn_stream.stream_id; - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req && req->stream_id == -1) { - req->stream_id = stream_id; - spdylay_printf("[INFO] Stream ID = %d\n", stream_id); - } - } -} - -static void on_ctrl_send_callback(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, void *user_data) -{ - (void)user_data; - - char **nv; - const char *name = NULL; - int32_t stream_id; - size_t i; - switch(type) { - case SPDYLAY_SYN_STREAM: - nv = frame->syn_stream.nv; - name = "SYN_STREAM"; - stream_id = frame->syn_stream.stream_id; - break; - default: - break; - } - if(name && spdylay_session_get_stream_user_data(session, stream_id)) { - spdylay_printf("[INFO] C ----------------------------> S (%s)\n", name); - for(i = 0; nv[i]; i += 2) { - spdylay_printf(" %s: %s\n", nv[i], nv[i+1]); - } - } -} - -static void on_ctrl_recv_callback(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, void *user_data) -{ - (void)user_data; - - struct Request *req; - char **nv; - const char *name = NULL; - int32_t stream_id; - size_t i; - switch(type) { - case SPDYLAY_SYN_REPLY: - nv = frame->syn_reply.nv; - name = "SYN_REPLY"; - stream_id = frame->syn_reply.stream_id; - break; - case SPDYLAY_HEADERS: - nv = frame->headers.nv; - name = "HEADERS"; - stream_id = frame->headers.stream_id; - break; - default: - break; - } - if(!name) { - return; - } - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req) { - check_gzip(req, nv); - spdylay_printf("[INFO] C <---------------------------- S (%s)\n", name); - for(i = 0; nv[i]; i += 2) { - spdylay_printf(" %s: %s\n", nv[i], nv[i+1]); - } - } -} - -/* - * The implementation of spdylay_on_stream_close_callback type. We use - * this function to know the response is fully received. Since we just - * fetch 1 resource in this program, after reception of the response, - * we submit GOAWAY and close the session. - */ -static void on_stream_close_callback(spdylay_session *session, - int32_t stream_id, - spdylay_status_code status_code, - void *user_data) -{ - (void)user_data; - (void)status_code; - struct Request *req; - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req) { - int rv; - rv = spdylay_submit_goaway(session, SPDYLAY_GOAWAY_OK); - if(rv != 0) { - diec("spdylay_submit_goaway", rv); - } - } -} - -#define MAX_OUTLEN 4096 - -/* - * The implementation of spdylay_on_data_chunk_recv_callback type. We - * use this function to print the received response body. - */ -static void on_data_chunk_recv_callback(spdylay_session *session, uint8_t flags, - int32_t stream_id, - const uint8_t *data, size_t len, - void *user_data) -{ - (void)user_data; - (void)flags; - - struct Request *req; - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req) { - spdylay_printf("[INFO] C <---------------------------- S (DATA)\n"); - spdylay_printf(" %lu bytes\n", (unsigned long int)len); - if(req->inflater) { - while(len > 0) { - uint8_t out[MAX_OUTLEN]; - size_t outlen = MAX_OUTLEN; - size_t tlen = len; - int rv; - rv = spdylay_gzip_inflate(req->inflater, out, &outlen, data, &tlen); - if(rv == -1) { - spdylay_submit_rst_stream(session, stream_id, SPDYLAY_INTERNAL_ERROR); - break; - } - fwrite(out, 1, outlen, stdout); - data += tlen; - len -= tlen; - } - } else { - /* TODO add support gzip */ - fwrite(data, 1, len, stdout); - - //check if the data is correct - if(strcmp(RESPONSE_BODY, (char *)data) != 0) - killparent(parent, "\nreceived data is not the same"); - } - spdylay_printf("\n"); - } -} - -/* - * Setup callback functions. Spdylay API offers many callback - * functions, but most of them are optional. The send_callback is - * always required. Since we use spdylay_session_recv(), the - * recv_callback is also required. - */ -static void setup_spdylay_callbacks(spdylay_session_callbacks *callbacks) -{ - memset(callbacks, 0, sizeof(spdylay_session_callbacks)); - callbacks->send_callback = send_callback; - callbacks->recv_callback = recv_callback; - callbacks->before_ctrl_send_callback = before_ctrl_send_callback; - callbacks->on_ctrl_send_callback = on_ctrl_send_callback; - callbacks->on_ctrl_recv_callback = on_ctrl_recv_callback; - callbacks->on_stream_close_callback = on_stream_close_callback; - callbacks->on_data_chunk_recv_callback = on_data_chunk_recv_callback; -} - -/* - * Callback function for SSL/TLS NPN. Since this program only supports - * SPDY protocol, if server does not offer SPDY protocol the Spdylay - * library supports, we terminate program. - */ -static int select_next_proto_cb(SSL* ssl, - unsigned char **out, unsigned char *outlen, - const unsigned char *in, unsigned int inlen, - void *arg) -{ - (void)ssl; - - int rv; - uint16_t *spdy_proto_version; - /* spdylay_select_next_protocol() selects SPDY protocol version the - Spdylay library supports. */ - rv = spdylay_select_next_protocol(out, outlen, in, inlen); - if(rv <= 0) { - die("Server did not advertise spdy/2 or spdy/3 protocol."); - } - spdy_proto_version = (uint16_t*)arg; - *spdy_proto_version = rv; - return SSL_TLSEXT_ERR_OK; -} - -/* - * Setup SSL context. We pass |spdy_proto_version| to get negotiated - * SPDY protocol version in NPN callback. - */ -static void init_ssl_ctx(SSL_CTX *ssl_ctx, uint16_t *spdy_proto_version) -{ - /* Disable SSLv2 and enable all workarounds for buggy servers */ - SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL|SSL_OP_NO_SSLv2); - SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY); - SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS); - /* Set NPN callback */ - SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, - spdy_proto_version); -} - -static void ssl_handshake(SSL *ssl, int fd) -{ - int rv; - if(SSL_set_fd(ssl, fd) == 0) { - dief("SSL_set_fd", ERR_error_string(ERR_get_error(), NULL)); - } - ERR_clear_error(); - rv = SSL_connect(ssl); - if(rv <= 0) { - dief("SSL_connect", ERR_error_string(ERR_get_error(), NULL)); - } -} - -/* - * Connects to the host |host| and port |port|. This function returns - * the file descriptor of the client socket. - */ -static int connect_to(const char *host, uint16_t port) -{ - struct addrinfo hints; - int fd = -1; - int rv; - char service[NI_MAXSERV]; - struct addrinfo *res, *rp; - snprintf(service, sizeof(service), "%u", port); - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - rv = getaddrinfo(host, service, &hints, &res); - if(rv != 0) { - dief("getaddrinfo", gai_strerror(rv)); - } - for(rp = res; rp; rp = rp->ai_next) { - fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); - if(fd == -1) { - continue; - } - while((rv = connect(fd, rp->ai_addr, rp->ai_addrlen)) == -1 && - errno == EINTR); - if(rv == 0) { - break; - } - close(fd); - fd = -1; - } - freeaddrinfo(res); - return fd; -} - -static void make_non_block(int fd) -{ - int flags, rv; - while((flags = fcntl(fd, F_GETFL, 0)) == -1 && errno == EINTR); - if(flags == -1) { - dief("fcntl", strerror(errno)); - } - while((rv = fcntl(fd, F_SETFL, flags | O_NONBLOCK)) == -1 && errno == EINTR); - if(rv == -1) { - dief("fcntl", strerror(errno)); - } -} - -/* - * Setting TCP_NODELAY is not mandatory for the SPDY protocol. - */ -static void set_tcp_nodelay(int fd) -{ - int val = 1; - int rv; - rv = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, (socklen_t)sizeof(val)); - if(rv == -1) { - dief("setsockopt", strerror(errno)); - } -} - -/* - * Update |pollfd| based on the state of |connection|. - */ -static void ctl_poll(struct pollfd *pollfd, struct Connection *connection) -{ - pollfd->events = 0; - if(spdylay_session_want_read(connection->session) || - connection->want_io == WANT_READ) { - pollfd->events |= POLLIN; - } - if(spdylay_session_want_write(connection->session) || - connection->want_io == WANT_WRITE) { - pollfd->events |= POLLOUT; - } -} - -/* - * Submits the request |req| to the connection |connection|. This - * function does not send packets; just append the request to the - * internal queue in |connection->session|. - */ -static void submit_request(struct Connection *connection, struct Request *req) -{ - int pri = 0; - int rv; - const char *nv[15]; - /* We always use SPDY/3 style header even if the negotiated protocol - version is SPDY/2. The library translates the header name as - necessary. Make sure that the last item is NULL! */ - nv[0] = ":method"; nv[1] = "GET"; - nv[2] = ":path"; nv[3] = req->path; - nv[4] = ":version"; nv[5] = "HTTP/1.1"; - nv[6] = ":scheme"; nv[7] = "https"; - nv[8] = ":host"; nv[9] = req->hostport; - nv[10] = "accept"; nv[11] = "*/*"; - nv[12] = "user-agent"; nv[13] = "spdylay/"SPDYLAY_VERSION; - nv[14] = NULL; - rv = spdylay_submit_request(connection->session, pri, nv, NULL, req); - if(rv != 0) { - diec("spdylay_submit_request", rv); - } -} - -/* - * Performs the network I/O. - */ -static void exec_io(struct Connection *connection) -{ - int rv; - rv = spdylay_session_recv(connection->session); - if(rv != 0) { - diec("spdylay_session_recv", rv); - } - rv = spdylay_session_send(connection->session); - if(rv != 0) { - diec("spdylay_session_send", rv); - } -} - -static void request_init(struct Request *req, const struct URI *uri) -{ - req->host = strcopy(uri->host, uri->hostlen); - req->port = uri->port; - req->path = strcopy(uri->path, uri->pathlen); - req->hostport = strcopy(uri->hostport, uri->hostportlen); - req->stream_id = -1; - req->inflater = NULL; -} - -static void request_free(struct Request *req) -{ - free(req->host); - free(req->path); - free(req->hostport); - spdylay_gzip_inflate_del(req->inflater); -} - -/* - * Fetches the resource denoted by |uri|. - */ -static void fetch_uri(const struct URI *uri) -{ - spdylay_session_callbacks callbacks; - int fd; - SSL_CTX *ssl_ctx; - SSL *ssl; - struct Request req; - struct Connection connection; - int rv; - nfds_t npollfds = 1; - struct pollfd pollfds[1]; - uint16_t spdy_proto_version; - - request_init(&req, uri); - - setup_spdylay_callbacks(&callbacks); - - /* Establish connection and setup SSL */ - fd = connect_to(req.host, req.port); - if (-1 == fd) - abort (); - ssl_ctx = SSL_CTX_new(SSLv23_client_method()); - if(ssl_ctx == NULL) { - dief("SSL_CTX_new", ERR_error_string(ERR_get_error(), NULL)); - } - init_ssl_ctx(ssl_ctx, &spdy_proto_version); - ssl = SSL_new(ssl_ctx); - if(ssl == NULL) { - dief("SSL_new", ERR_error_string(ERR_get_error(), NULL)); - } - /* To simplify the program, we perform SSL/TLS handshake in blocking - I/O. */ - ssl_handshake(ssl, fd); - - connection.ssl = ssl; - connection.want_io = IO_NONE; - - /* Here make file descriptor non-block */ - make_non_block(fd); - set_tcp_nodelay(fd); - - spdylay_printf("[INFO] SPDY protocol version = %d\n", spdy_proto_version); - rv = spdylay_session_client_new(&connection.session, spdy_proto_version, - &callbacks, &connection); - if(rv != 0) { - diec("spdylay_session_client_new", rv); - } - - /* Submit the HTTP request to the outbound queue. */ - submit_request(&connection, &req); - - pollfds[0].fd = fd; - ctl_poll(pollfds, &connection); - - /* Event loop */ - while(spdylay_session_want_read(connection.session) || - spdylay_session_want_write(connection.session)) { - int nfds = poll(pollfds, npollfds, -1); - if(nfds == -1) { - dief("poll", strerror(errno)); - } - if(pollfds[0].revents & (POLLIN | POLLOUT)) { - exec_io(&connection); - } - if((pollfds[0].revents & POLLHUP) || (pollfds[0].revents & POLLERR)) { - die("Connection error"); - } - ctl_poll(pollfds, &connection); - } - - /* Resource cleanup */ - spdylay_session_del(connection.session); - SSL_shutdown(ssl); - SSL_free(ssl); - SSL_CTX_free(ssl_ctx); - shutdown(fd, SHUT_WR); - close(fd); - request_free(&req); -} - -static int parse_uri(struct URI *res, const char *uri) -{ - /* We only interested in https */ - size_t len, i, offset; - memset(res, 0, sizeof(struct URI)); - len = strlen(uri); - if(len < 9 || memcmp("https://", uri, 8) != 0) { - return -1; - } - offset = 8; - res->host = res->hostport = &uri[offset]; - res->hostlen = 0; - if(uri[offset] == '[') { - /* IPv6 literal address */ - ++offset; - ++res->host; - for(i = offset; i < len; ++i) { - if(uri[i] == ']') { - res->hostlen = i-offset; - offset = i+1; - break; - } - } - } else { - const char delims[] = ":/?#"; - for(i = offset; i < len; ++i) { - if(strchr(delims, uri[i]) != NULL) { - break; - } - } - res->hostlen = i-offset; - offset = i; - } - if(res->hostlen == 0) { - return -1; - } - /* Assuming https */ - res->port = 443; - if(offset < len) { - if(uri[offset] == ':') { - /* port */ - const char delims[] = "/?#"; - int port = 0; - ++offset; - for(i = offset; i < len; ++i) { - if(strchr(delims, uri[i]) != NULL) { - break; - } - if('0' <= uri[i] && uri[i] <= '9') { - port *= 10; - port += uri[i]-'0'; - if(port > 65535) { - return -1; - } - } else { - return -1; - } - } - if(port == 0) { - return -1; - } - offset = i; - res->port = port; - } - } - res->hostportlen = uri+offset-res->host; - for(i = offset; i < len; ++i) { - if(uri[i] == '#') { - break; - } - } - if(i-offset == 0) { - res->path = "/"; - res->pathlen = 1; - } else { - res->path = &uri[offset]; - res->pathlen = i-offset; - } - return 0; -} - - -/***** - * end of code needed to utilize spdylay - */ - - -/***** - * start of code needed to utilize microspdy - */ - -void -new_session_callback (void *cls, - struct SPDY_Session * session) -{ - char ipstr[1024]; - - struct sockaddr *addr; - socklen_t addr_len = SPDY_get_remote_addr(session, &addr); - - if(!addr_len) - { - printf("SPDY_get_remote_addr"); - abort(); - } - - if(strcmp(CLS,cls)!=0) - { - killchild(child,"wrong cls"); - } - - if(AF_INET == addr->sa_family) - { - struct sockaddr_in * addr4 = (struct sockaddr_in *) addr; - if(NULL == inet_ntop(AF_INET, &(addr4->sin_addr), ipstr, sizeof(ipstr))) - { - killchild(child,"inet_ntop"); - } - printf("New connection from: %s:%i\n", ipstr, ntohs(addr4->sin_port)); - - loop = 0; - } -#if HAVE_INET6 - else if(AF_INET6 == addr->sa_family) - { - struct sockaddr_in6 * addr6 = (struct sockaddr_in6 *) addr; - if(NULL == inet_ntop(AF_INET6, &(addr6->sin6_addr), ipstr, sizeof(ipstr))) - { - killchild(child,"inet_ntop"); - } - printf("New connection from: %s:%i\n", ipstr, ntohs(addr6->sin6_port)); - - loop = 0; - } -#endif - else - { - killchild(child,"wrong family"); - } -} - -/***** - * end of code needed to utilize microspdy - */ - -//child process -void -childproc(int parent) -{ - struct URI uri; - struct sigaction act; - int rv; - char *uristr; - - memset(&act, 0, sizeof(struct sigaction)); - act.sa_handler = SIG_IGN; - sigaction(SIGPIPE, &act, 0); - - asprintf(&uristr, "https://127.0.0.1:%i/",port); - - SSL_load_error_strings(); - SSL_library_init(); - - rv = parse_uri(&uri, uristr); - if(rv != 0) { - killparent(parent,"parse_uri failed"); - } - fetch_uri(&uri); -} - -//parent proc -int -parentproc(int child) -{ - int childstatus = 0; - unsigned long long timeoutlong=0; - struct timeval timeout; - int ret; - fd_set read_fd_set; - fd_set write_fd_set; - fd_set except_fd_set; - int maxfd = -1; - struct SPDY_Daemon *daemon; - - SPDY_init(); - - daemon = SPDY_start_daemon(port, - DATA_DIR "cert-and-key.pem", - DATA_DIR "cert-and-key.pem", - &new_session_callback,NULL,NULL,NULL,CLS,SPDY_DAEMON_OPTION_END); - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - do - { - FD_ZERO(&read_fd_set); - FD_ZERO(&write_fd_set); - FD_ZERO(&except_fd_set); - - ret = SPDY_get_timeout(daemon, &timeoutlong); - if(SPDY_NO == ret || timeoutlong > 1000) - { - timeout.tv_sec = 1; - timeout.tv_usec = 0; - } - else - { - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - } - - maxfd = SPDY_get_fdset (daemon, - &read_fd_set, - &write_fd_set, - &except_fd_set); - - ret = select(maxfd+1, &read_fd_set, &write_fd_set, &except_fd_set, &timeout); - - switch(ret) { - case -1: - printf("select error: %i\n", errno); - killchild(child, "select error"); - break; - case 0: - - break; - default: - SPDY_run(daemon); - - break; - } - } - while(loop && waitpid(child,&childstatus,WNOHANG) != child); - - SPDY_stop_daemon(daemon); - - SPDY_deinit(); - - if(loop) - return WEXITSTATUS(childstatus); - if(waitpid(child,&childstatus,WNOHANG) == child) - return WEXITSTATUS(childstatus); - - kill(child,SIGKILL); - - waitpid(child,&childstatus,0); - - return 0; -} - -int main() -{ - port = get_port(14123); - parent = getpid(); - - child = fork(); - if (child == -1) - { - fprintf(stderr, "can't fork, error %d\n", errno); - exit(EXIT_FAILURE); - } - - if (child == 0) - { - childproc(parent); - _exit(0); - } - else - { - int ret = parentproc(child); - exit(ret); - } - return 1; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_notls.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_notls.c deleted file mode 100644 index 3f44d965..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_notls.c +++ /dev/null @@ -1,973 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file request_response.c - * @brief tests receiving request and sending response. spdycli.c (spdylay) - * code is reused here - * @author Andrey Uzunov - * @author Tatsuhiro Tsujikawa - */ - -#include "platform.h" -#include "microspdy.h" -#include -#include "common.h" - -#define RESPONSE_BODY "Hi, this is libmicrospdy!" - -#define CLS "anything" - -pid_t parent; -pid_t child; -char *rcvbuf; -int rcvbuf_c = 0; - -int session_closed_called = 0; - -void -killchild(int pid, char *message) -{ - printf("%s\n",message); - kill(pid, SIGKILL); - exit(1); -} - -void -killparent(int pid, char *message) -{ - printf("%s\n",message); - kill(pid, SIGKILL); - _exit(1); -} - - -/***** - * start of code needed to utilize spdylay - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -enum { - IO_NONE, - WANT_READ, - WANT_WRITE -}; - -struct Connection { - spdylay_session *session; - /* WANT_READ if SSL connection needs more input; or WANT_WRITE if it - needs more output; or IO_NONE. This is necessary because SSL/TLS - re-negotiation is possible at any time. Spdylay API offers - similar functions like spdylay_session_want_read() and - spdylay_session_want_write() but they do not take into account - SSL connection. */ - int want_io; - int fd; -}; - -struct Request { - char *host; - uint16_t port; - /* In this program, path contains query component as well. */ - char *path; - /* This is the concatenation of host and port with ":" in - between. */ - char *hostport; - /* Stream ID for this request. */ - int32_t stream_id; - /* The gzip stream inflater for the compressed response. */ - spdylay_gzip *inflater; -}; - -struct URI { - const char *host; - size_t hostlen; - uint16_t port; - /* In this program, path contains query component as well. */ - const char *path; - size_t pathlen; - const char *hostport; - size_t hostportlen; -}; - -/* - * Returns copy of string |s| with the length |len|. The returned - * string is NULL-terminated. - */ -static char* strcopy(const char *s, size_t len) -{ - char *dst; - dst = malloc(len+1); - if (NULL == dst) - abort (); - memcpy(dst, s, len); - dst[len] = '\0'; - return dst; -} - -/* - * Prints error message |msg| and exit. - */ -static void die(const char *msg) -{ - fprintf(stderr, "FATAL: %s\n", msg); - exit(EXIT_FAILURE); -} - -/* - * Prints error containing the function name |func| and message |msg| - * and exit. - */ -static void dief(const char *func, const char *msg) -{ - fprintf(stderr, "FATAL: %s: %s\n", func, msg); - exit(EXIT_FAILURE); -} - -/* - * Prints error containing the function name |func| and error code - * |error_code| and exit. - */ -static void diec(const char *func, int error_code) -{ - fprintf(stderr, "FATAL: %s: error_code=%d, msg=%s\n", func, error_code, - spdylay_strerror(error_code)); - exit(EXIT_FAILURE); -} - -/* - * Check response is content-encoding: gzip. We need this because SPDY - * client is required to support gzip. - */ -static void check_gzip(struct Request *req, char **nv) -{ - int gzip = 0; - size_t i; - for(i = 0; nv[i]; i += 2) { - if(strcmp("content-encoding", nv[i]) == 0) { - gzip = strcmp("gzip", nv[i+1]) == 0; - break; - } - } - if(gzip) { - int rv; - if(req->inflater) { - return; - } - rv = spdylay_gzip_inflate_new(&req->inflater); - if(rv != 0) { - die("Can't allocate inflate stream."); - } - } -} - -/* - * The implementation of spdylay_send_callback type. Here we write - * |data| with size |length| to the network and return the number of - * bytes actually written. See the documentation of - * spdylay_send_callback for the details. - */ -static ssize_t send_callback(spdylay_session *session, - const uint8_t *data, size_t length, int flags, - void *user_data) -{ - (void)session; - (void)flags; - - struct Connection *connection; - ssize_t rv; - connection = (struct Connection*)user_data; - connection->want_io = IO_NONE; - - rv = write(connection->fd, - data, - length); - - if (rv < 0) - { - switch(errno) - { - case EAGAIN: - #if EAGAIN != EWOULDBLOCK - case EWOULDBLOCK: - #endif - connection->want_io = WANT_WRITE; - rv = SPDYLAY_ERR_WOULDBLOCK; - break; - - default: - rv = SPDYLAY_ERR_CALLBACK_FAILURE; - } - } - return rv; -} - -/* - * The implementation of spdylay_recv_callback type. Here we read data - * from the network and write them in |buf|. The capacity of |buf| is - * |length| bytes. Returns the number of bytes stored in |buf|. See - * the documentation of spdylay_recv_callback for the details. - */ -static ssize_t recv_callback(spdylay_session *session, - uint8_t *buf, size_t length, int flags, - void *user_data) -{ - (void)session; - (void)flags; - - struct Connection *connection; - ssize_t rv; - connection = (struct Connection*)user_data; - connection->want_io = IO_NONE; - - rv = read(connection->fd, - buf, - length); - - if (rv < 0) - { - switch(errno) - { - case EAGAIN: - #if EAGAIN != EWOULDBLOCK - case EWOULDBLOCK: - #endif - connection->want_io = WANT_READ; - rv = SPDYLAY_ERR_WOULDBLOCK; - break; - - default: - rv = SPDYLAY_ERR_CALLBACK_FAILURE; - } - } - else if(rv == 0) - rv = SPDYLAY_ERR_EOF; - return rv; -} - -/* - * The implementation of spdylay_before_ctrl_send_callback type. We - * use this function to get stream ID of the request. This is because - * stream ID is not known when we submit the request - * (spdylay_submit_request). - */ -static void before_ctrl_send_callback(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, - void *user_data) -{ - (void)user_data; - - if(type == SPDYLAY_SYN_STREAM) { - struct Request *req; - int stream_id = frame->syn_stream.stream_id; - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req && req->stream_id == -1) { - req->stream_id = stream_id; - printf("[INFO] Stream ID = %d\n", stream_id); - } - } -} - -static void on_ctrl_send_callback(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, void *user_data) -{ - (void)user_data; - - char **nv; - const char *name = NULL; - int32_t stream_id; - size_t i; - switch(type) { - case SPDYLAY_SYN_STREAM: - nv = frame->syn_stream.nv; - name = "SYN_STREAM"; - stream_id = frame->syn_stream.stream_id; - break; - default: - break; - } - if(name && spdylay_session_get_stream_user_data(session, stream_id)) { - printf("[INFO] C ----------------------------> S (%s)\n", name); - for(i = 0; nv[i]; i += 2) { - printf(" %s: %s\n", nv[i], nv[i+1]); - } - } -} - -static void on_ctrl_recv_callback(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, void *user_data) -{ - (void)user_data; - - struct Request *req; - char **nv; - const char *name = NULL; - int32_t stream_id; - size_t i; - switch(type) { - case SPDYLAY_SYN_REPLY: - nv = frame->syn_reply.nv; - name = "SYN_REPLY"; - stream_id = frame->syn_reply.stream_id; - break; - case SPDYLAY_HEADERS: - nv = frame->headers.nv; - name = "HEADERS"; - stream_id = frame->headers.stream_id; - break; - default: - break; - } - if(!name) { - return; - } - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req) { - check_gzip(req, nv); - printf("[INFO] C <---------------------------- S (%s)\n", name); - for(i = 0; nv[i]; i += 2) { - printf(" %s: %s\n", nv[i], nv[i+1]); - } - } -} - -/* - * The implementation of spdylay_on_stream_close_callback type. We use - * this function to know the response is fully received. Since we just - * fetch 1 resource in this program, after reception of the response, - * we submit GOAWAY and close the session. - */ -static void on_stream_close_callback(spdylay_session *session, - int32_t stream_id, - spdylay_status_code status_code, - void *user_data) -{ - (void)status_code; - (void)user_data; - - struct Request *req; - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req) { - int rv; - rv = spdylay_submit_goaway(session, SPDYLAY_GOAWAY_OK); - if(rv != 0) { - diec("spdylay_submit_goaway", rv); - } - } -} - -#define MAX_OUTLEN 4096 - -/* - * The implementation of spdylay_on_data_chunk_recv_callback type. We - * use this function to print the received response body. - */ -static void on_data_chunk_recv_callback(spdylay_session *session, uint8_t flags, - int32_t stream_id, - const uint8_t *data, size_t len, - void *user_data) -{ - (void)flags; - (void)user_data; - - struct Request *req; - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req) { - printf("[INFO] C <---------------------------- S (DATA)\n"); - printf(" %lu bytes\n", (unsigned long int)len); - if(req->inflater) { - while(len > 0) { - uint8_t out[MAX_OUTLEN]; - size_t outlen = MAX_OUTLEN; - size_t tlen = len; - int rv; - rv = spdylay_gzip_inflate(req->inflater, out, &outlen, data, &tlen); - if(rv == -1) { - spdylay_submit_rst_stream(session, stream_id, SPDYLAY_INTERNAL_ERROR); - break; - } - fwrite(out, 1, outlen, stdout); - data += tlen; - len -= tlen; - } - } else { - /* TODO add support gzip */ - fwrite(data, 1, len, stdout); - - //check if the data is correct - //if(strcmp(RESPONSE_BODY, data) != 0) - //killparent(parent, "\nreceived data is not the same"); - if(len + rcvbuf_c > strlen(RESPONSE_BODY)) - killparent(parent, "\nreceived data is not the same"); - - strcpy(rcvbuf + rcvbuf_c,(char*)data); - rcvbuf_c+=len; - } - printf("\n"); - } -} - -/* - * Setup callback functions. Spdylay API offers many callback - * functions, but most of them are optional. The send_callback is - * always required. Since we use spdylay_session_recv(), the - * recv_callback is also required. - */ -static void setup_spdylay_callbacks(spdylay_session_callbacks *callbacks) -{ - memset(callbacks, 0, sizeof(spdylay_session_callbacks)); - callbacks->send_callback = send_callback; - callbacks->recv_callback = recv_callback; - callbacks->before_ctrl_send_callback = before_ctrl_send_callback; - callbacks->on_ctrl_send_callback = on_ctrl_send_callback; - callbacks->on_ctrl_recv_callback = on_ctrl_recv_callback; - callbacks->on_stream_close_callback = on_stream_close_callback; - callbacks->on_data_chunk_recv_callback = on_data_chunk_recv_callback; -} - - -/* - * Connects to the host |host| and port |port|. This function returns - * the file descriptor of the client socket. - */ -static int connect_to(const char *host, uint16_t port) -{ - struct addrinfo hints; - int fd = -1; - int rv; - char service[NI_MAXSERV]; - struct addrinfo *res, *rp; - snprintf(service, sizeof(service), "%u", port); - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - rv = getaddrinfo(host, service, &hints, &res); - if(rv != 0) { - dief("getaddrinfo", gai_strerror(rv)); - } - for(rp = res; rp; rp = rp->ai_next) { - fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); - if(fd == -1) { - continue; - } - while((rv = connect(fd, rp->ai_addr, rp->ai_addrlen)) == -1 && - errno == EINTR); - if(rv == 0) { - break; - } - close(fd); - fd = -1; - dief("connect", strerror(errno)); - } - freeaddrinfo(res); - return fd; -} - -static void make_non_block(int fd) -{ - int flags, rv; - while((flags = fcntl(fd, F_GETFL, 0)) == -1 && errno == EINTR); - if(flags == -1) { - dief("fcntl1", strerror(errno)); - } - while((rv = fcntl(fd, F_SETFL, flags | O_NONBLOCK)) == -1 && errno == EINTR); - if(rv == -1) { - dief("fcntl2", strerror(errno)); - } -} - -/* - * Setting TCP_NODELAY is not mandatory for the SPDY protocol. - */ -static void set_tcp_nodelay(int fd) -{ - int val = 1; - int rv; - rv = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, (socklen_t)sizeof(val)); - if(rv == -1) { - dief("setsockopt", strerror(errno)); - } -} - -/* - * Update |pollfd| based on the state of |connection|. - */ -static void ctl_poll(struct pollfd *pollfd, struct Connection *connection) -{ - pollfd->events = 0; - if(spdylay_session_want_read(connection->session) || - connection->want_io == WANT_READ) { - pollfd->events |= POLLIN; - } - if(spdylay_session_want_write(connection->session) || - connection->want_io == WANT_WRITE) { - pollfd->events |= POLLOUT; - } -} - -/* - * Submits the request |req| to the connection |connection|. This - * function does not send packets; just append the request to the - * internal queue in |connection->session|. - */ -static void submit_request(struct Connection *connection, struct Request *req) -{ - int pri = 0; - int rv; - const char *nv[15]; - /* We always use SPDY/3 style header even if the negotiated protocol - version is SPDY/2. The library translates the header name as - necessary. Make sure that the last item is NULL! */ - nv[0] = ":method"; nv[1] = "GET"; - nv[2] = ":path"; nv[3] = req->path; - nv[4] = ":version"; nv[5] = "HTTP/1.1"; - nv[6] = ":scheme"; nv[7] = "https"; - nv[8] = ":host"; nv[9] = req->hostport; - nv[10] = "accept"; nv[11] = "*/*"; - nv[12] = "user-agent"; nv[13] = "spdylay/"SPDYLAY_VERSION; - nv[14] = NULL; - rv = spdylay_submit_request(connection->session, pri, nv, NULL, req); - if(rv != 0) { - diec("spdylay_submit_request", rv); - } -} - -/* - * Performs the network I/O. - */ -static void exec_io(struct Connection *connection) -{ - int rv; - rv = spdylay_session_recv(connection->session); - if(rv != 0) { - diec("spdylay_session_recv", rv); - } - rv = spdylay_session_send(connection->session); - if(rv != 0) { - diec("spdylay_session_send", rv); - } -} - -static void request_init(struct Request *req, const struct URI *uri) -{ - req->host = strcopy(uri->host, uri->hostlen); - req->port = uri->port; - req->path = strcopy(uri->path, uri->pathlen); - req->hostport = strcopy(uri->hostport, uri->hostportlen); - req->stream_id = -1; - req->inflater = NULL; -} - -static void request_free(struct Request *req) -{ - free(req->host); - free(req->path); - free(req->hostport); - spdylay_gzip_inflate_del(req->inflater); -} - -/* - * Fetches the resource denoted by |uri|. - */ -static void fetch_uri(const struct URI *uri) -{ - spdylay_session_callbacks callbacks; - int fd; - struct Request req; - struct Connection connection; - int rv; - nfds_t npollfds = 1; - struct pollfd pollfds[1]; - uint16_t spdy_proto_version = 3; - - request_init(&req, uri); - - setup_spdylay_callbacks(&callbacks); - - /* Establish connection and setup SSL */ - fd = connect_to(req.host, req.port); - if (-1 == fd) - abort (); - - connection.fd = fd; - connection.want_io = IO_NONE; - - /* Here make file descriptor non-block */ - make_non_block(fd); - set_tcp_nodelay(fd); - - printf("[INFO] SPDY protocol version = %d\n", spdy_proto_version); - rv = spdylay_session_client_new(&connection.session, spdy_proto_version, - &callbacks, &connection); - if(rv != 0) { - diec("spdylay_session_client_new", rv); - } - - /* Submit the HTTP request to the outbound queue. */ - submit_request(&connection, &req); - - pollfds[0].fd = fd; - ctl_poll(pollfds, &connection); - - /* Event loop */ - while(spdylay_session_want_read(connection.session) || - spdylay_session_want_write(connection.session)) { - int nfds = poll(pollfds, npollfds, -1); - if(nfds == -1) { - dief("poll", strerror(errno)); - } - if(pollfds[0].revents & (POLLIN | POLLOUT)) { - exec_io(&connection); - } - if((pollfds[0].revents & POLLHUP) || (pollfds[0].revents & POLLERR)) { - die("Connection error"); - } - ctl_poll(pollfds, &connection); - } - - /* Resource cleanup */ - spdylay_session_del(connection.session); - shutdown(fd, SHUT_WR); - close(fd); - request_free(&req); -} - -static int parse_uri(struct URI *res, const char *uri) -{ - /* We only interested in https */ - size_t len, i, offset; - memset(res, 0, sizeof(struct URI)); - len = strlen(uri); - if(len < 9 || memcmp("https://", uri, 8) != 0) { - return -1; - } - offset = 8; - res->host = res->hostport = &uri[offset]; - res->hostlen = 0; - if(uri[offset] == '[') { - /* IPv6 literal address */ - ++offset; - ++res->host; - for(i = offset; i < len; ++i) { - if(uri[i] == ']') { - res->hostlen = i-offset; - offset = i+1; - break; - } - } - } else { - const char delims[] = ":/?#"; - for(i = offset; i < len; ++i) { - if(strchr(delims, uri[i]) != NULL) { - break; - } - } - res->hostlen = i-offset; - offset = i; - } - if(res->hostlen == 0) { - return -1; - } - /* Assuming https */ - res->port = 443; - if(offset < len) { - if(uri[offset] == ':') { - /* port */ - const char delims[] = "/?#"; - int port = 0; - ++offset; - for(i = offset; i < len; ++i) { - if(strchr(delims, uri[i]) != NULL) { - break; - } - if('0' <= uri[i] && uri[i] <= '9') { - port *= 10; - port += uri[i]-'0'; - if(port > 65535) { - return -1; - } - } else { - return -1; - } - } - if(port == 0) { - return -1; - } - offset = i; - res->port = port; - } - } - res->hostportlen = uri+offset-res->host; - for(i = offset; i < len; ++i) { - if(uri[i] == '#') { - break; - } - } - if(i-offset == 0) { - res->path = "/"; - res->pathlen = 1; - } else { - res->path = &uri[offset]; - res->pathlen = i-offset; - } - return 0; -} - - -/***** - * end of code needed to utilize spdylay - */ - - -/***** - * start of code needed to utilize microspdy - */ - - -void -standard_request_handler(void *cls, - struct SPDY_Request * request, - uint8_t priority, - const char *method, - const char *path, - const char *version, - const char *host, - const char *scheme, - struct SPDY_NameValue * headers, - bool more) -{ - (void)cls; - (void)request; - (void)priority; - (void)host; - (void)scheme; - (void)headers; - (void)method; - (void)version; - (void)more; - - struct SPDY_Response *response=NULL; - - if(strcmp(CLS,cls)!=0) - { - killchild(child,"wrong cls"); - } - - response = SPDY_build_response(200,NULL,SPDY_HTTP_VERSION_1_1,NULL,RESPONSE_BODY,strlen(RESPONSE_BODY)); - - if(NULL==response){ - fprintf(stdout,"no response obj\n"); - exit(3); - } - - if(SPDY_queue_response(request,response,true,false,NULL,(void*)strdup(path))!=SPDY_YES) - { - fprintf(stdout,"queue\n"); - exit(4); - } -} - -void -session_closed_handler (void *cls, - struct SPDY_Session * session, - int by_client) -{ - printf("session_closed_handler called\n"); - - if(strcmp(CLS,cls)!=0) - { - killchild(child,"wrong cls"); - } - - if(SPDY_YES != by_client) - { - //killchild(child,"wrong by_client"); - printf("session closed by server\n"); - } - else - { - printf("session closed by client\n"); - } - - if(NULL == session) - { - killchild(child,"session is NULL"); - } - - session_closed_called = 1; -} - - -/***** - * end of code needed to utilize microspdy - */ - -//child process -void -childproc(int port) -{ - struct URI uri; - struct sigaction act; - int rv; - char *uristr; - - memset(&act, 0, sizeof(struct sigaction)); - act.sa_handler = SIG_IGN; - sigaction(SIGPIPE, &act, 0); - - usleep(10000); - asprintf(&uristr, "https://127.0.0.1:%i/",port); - if(NULL == (rcvbuf = malloc(strlen(RESPONSE_BODY)+1))) - killparent(parent,"no memory"); - - rv = parse_uri(&uri, uristr); - if(rv != 0) { - killparent(parent,"parse_uri failed"); - } - fetch_uri(&uri); - - if(strcmp(rcvbuf, RESPONSE_BODY)) - killparent(parent,"received data is different"); -} - -//parent proc -int -parentproc( int port) -{ - int childstatus; - unsigned long long timeoutlong=0; - struct timeval timeout; - int ret; - fd_set read_fd_set; - fd_set write_fd_set; - fd_set except_fd_set; - int maxfd = -1; - struct SPDY_Daemon *daemon; - - SPDY_init(); - - daemon = SPDY_start_daemon(port, - NULL, - NULL, - NULL,&session_closed_handler,&standard_request_handler,NULL,CLS, - SPDY_DAEMON_OPTION_IO_SUBSYSTEM, SPDY_IO_SUBSYSTEM_RAW, - SPDY_DAEMON_OPTION_FLAGS, SPDY_DAEMON_FLAG_NO_DELAY, - SPDY_DAEMON_OPTION_END); - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - do - { - FD_ZERO(&read_fd_set); - FD_ZERO(&write_fd_set); - FD_ZERO(&except_fd_set); - - ret = SPDY_get_timeout(daemon, &timeoutlong); - if(SPDY_NO == ret || timeoutlong > 1000) - { - timeout.tv_sec = 1; - timeout.tv_usec = 0; - } - else - { - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - } - - maxfd = SPDY_get_fdset (daemon, - &read_fd_set, - &write_fd_set, - &except_fd_set); - - ret = select(maxfd+1, &read_fd_set, &write_fd_set, &except_fd_set, &timeout); - - switch(ret) { - case -1: - printf("select error: %i\n", errno); - killchild(child, "select error"); - break; - case 0: - - break; - default: - SPDY_run(daemon); - - break; - } - } - while(waitpid(child,&childstatus,WNOHANG) != child); - - //give chance to the client to close socket and handle this in run - usleep(100000); - SPDY_run(daemon); - - SPDY_stop_daemon(daemon); - - SPDY_deinit(); - - return WEXITSTATUS(childstatus); -} - -int main() -{ - int port = get_port(12123); - parent = getpid(); - - child = fork(); - if (child == -1) - { - fprintf(stderr, "can't fork, error %d\n", errno); - exit(EXIT_FAILURE); - } - - if (child == 0) - { - childproc(port); - _exit(0); - } - else - { - int ret = parentproc(port); - if(1 == session_closed_called && 0 == ret) - exit(0); - else - exit(ret ? ret : 21); - } - return 1; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_proxies.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_proxies.c deleted file mode 100644 index 44a0c1bd..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_proxies.c +++ /dev/null @@ -1,255 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file test_proxies.c - * @brief test curl > mhd2spdylay > microspdy2http > mhd - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "microspdy.h" -#include "common.h" -#include -#include /* printf, stderr, fprintf */ -#include /* pid_t */ -#include /* _exit, fork */ -#include /* exit */ -#include /* errno */ -#include /* pid_t */ -#include "common.h" - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif - -#define EXPECTED_BODY "libmicrohttpd demolibmicrohttpd demo" - - -pid_t parent; - pid_t child_mhd; - pid_t child_spdy2http; - pid_t child_mhd2spdy; - pid_t child_curl; - - uint16_t mhd_port; - uint16_t spdy2http_port; - uint16_t mhd2spdy_port; - -void -killproc(int pid, const char *message) -{ - printf("%s\nkilling %i\n",message,pid); - kill(pid, SIGKILL); -} - - -void killchildren() -{ - if(0 != child_mhd) - killproc(child_mhd,"kill mhd\n"); - if(0 != child_spdy2http) - killproc(child_spdy2http,"kill spdy2http\n"); - if(0 != child_mhd2spdy) - killproc(child_mhd2spdy,"kill mhd2spdy\n"); - if(0 != child_curl) - killproc(child_curl,"kill curl\n"); -} - -pid_t au_fork() -{ - pid_t child = fork(); - if (child == -1) - { - killchildren(); - - killproc(parent,"fork failed\n"); - } - - return child; -} - - -int main() -{ - //pid_t child; - int childstatus; - pid_t wpid; - - parent = getpid(); - mhd_port = get_port(4000); - spdy2http_port = get_port(4100); - mhd2spdy_port = get_port(4200); - - child_mhd = au_fork(); - if (child_mhd == 0) - { - //run MHD - pid_t devnull; - char *port_s; - - close(1); - devnull = open("/dev/null", O_WRONLY); - if (-1 == devnull) - abort(); - if (1 != devnull) - { - dup2(devnull, 1); - close(devnull); - } - asprintf(&port_s, "%i", mhd_port); - execlp ("../examples/minimal_example", "minimal_example", port_s, NULL); - fprintf(stderr, "executing mhd failed\nFor this test 'make' must be run before 'make check'!\n"); - //killchildren(); - _exit(1); - } - - - child_spdy2http = au_fork(); - if (child_spdy2http == 0) - { - //run spdy2http - pid_t devnull; - char *port_s; - //char *url; - - close(1); - devnull = open("/dev/null", O_WRONLY); - if (-1 == devnull) - abort(); - if (1 != devnull) - { - dup2(devnull, 1); - close(devnull); - } - //asprintf(&url, "127.0.0.1:%i", mhd_port); - asprintf(&port_s, "%i", spdy2http_port); - sleep(1); - execlp ("../spdy2http/microspdy2http", "microspdy2http", "-v4rtT", "10", "-p", port_s, NULL); - fprintf(stderr, "executing microspdy2http failed\n"); - //killchildren(); - _exit(1); - } - - child_mhd2spdy = au_fork(); - if (child_mhd2spdy == 0) - { - //run MHD2sdpy - pid_t devnull; - char *port_s; - char *url; - - close(1); - devnull = open("/dev/null", O_WRONLY); - if (-1 == devnull) - abort(); - if (1 != devnull) - { - dup2(devnull, 1); - close(devnull); - } - asprintf(&url, "http://127.0.0.1:%i", spdy2http_port); - asprintf(&port_s, "%i", mhd2spdy_port); - sleep(2); - execlp ("../examples/mhd2spdy", "mhd2spdy", "-vosb", url, "-p", port_s, NULL); - fprintf(stderr, "executing mhd2spdy failed\n"); - //killchildren(); - _exit(1); - } - - child_curl = au_fork(); - if (child_curl == 0) - { - //run curl - FILE *p; - pid_t devnull; - char *cmd; - unsigned int i; - int retc; - char buf[strlen(EXPECTED_BODY) + 1]; - - close(1); - devnull = open("/dev/null", O_WRONLY); - if (-1 == devnull) - abort (); - if (1 != devnull) - { - dup2(devnull, 1); - close(devnull); - } - - asprintf (&cmd, "curl --proxy http://127.0.0.1:%i http://127.0.0.1:%i/", mhd2spdy_port, mhd_port); - sleep(3); - p = popen(cmd, "r"); - if (p != NULL) - { - for (i = 0; i < strlen(EXPECTED_BODY) && !feof(p); i++) - { - retc = fgetc (p); - if (EOF == retc) - abort (); /* what did feof(p) do there!? */ - buf[i] = (char) retc; - } - - pclose(p); - buf[i] = 0; - _exit(strcmp(EXPECTED_BODY, buf)); - } - fprintf(stderr, "executing curl failed\n"); - //killchildren(); - _exit(1); - } - - do - { - wpid = waitpid(child_mhd,&childstatus,WNOHANG); - if(wpid == child_mhd) - { - fprintf(stderr, "mhd died unexpectedly\n"); - killchildren(); - return 1; - } - - wpid = waitpid(child_spdy2http,&childstatus,WNOHANG); - if(wpid == child_spdy2http) - { - fprintf(stderr, "spdy2http died unexpectedly\n"); - killchildren(); - return 1; - } - - wpid = waitpid(child_mhd2spdy,&childstatus,WNOHANG); - if(wpid == child_mhd2spdy) - { - fprintf(stderr, "mhd2spdy died unexpectedly\n"); - killchildren(); - return 1; - } - - if(waitpid(child_curl,&childstatus,WNOHANG) == child_curl) - { - killchildren(); - return WEXITSTATUS(childstatus); - } - sleep(1); - } - while(true); -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_request_response.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_request_response.c deleted file mode 100644 index 093da03f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_request_response.c +++ /dev/null @@ -1,1029 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file request_response.c - * @brief tests receiving request and sending response. spdycli.c (spdylay) - * code is reused here - * @author Andrey Uzunov - * @author Tatsuhiro Tsujikawa - */ - -#include "platform.h" -#include "microspdy.h" -#include -#include "common.h" - -#define RESPONSE_BODY "Hi, this is libmicrospdy!" - -#define CLS "anything" - -pid_t parent; -pid_t child; -char *rcvbuf; -int rcvbuf_c = 0; - -int session_closed_called = 0; - -void -killchild(int pid, char *message) -{ - printf("%s\n",message); - kill(pid, SIGKILL); - exit(1); -} - -void -killparent(int pid, char *message) -{ - printf("%s\n",message); - kill(pid, SIGKILL); - _exit(1); -} - - -/***** - * start of code needed to utilize spdylay - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -enum { - IO_NONE, - WANT_READ, - WANT_WRITE -}; - -struct Connection { - SSL *ssl; - spdylay_session *session; - /* WANT_READ if SSL connection needs more input; or WANT_WRITE if it - needs more output; or IO_NONE. This is necessary because SSL/TLS - re-negotiation is possible at any time. Spdylay API offers - similar functions like spdylay_session_want_read() and - spdylay_session_want_write() but they do not take into account - SSL connection. */ - int want_io; -}; - -struct Request { - char *host; - uint16_t port; - /* In this program, path contains query component as well. */ - char *path; - /* This is the concatenation of host and port with ":" in - between. */ - char *hostport; - /* Stream ID for this request. */ - int32_t stream_id; - /* The gzip stream inflater for the compressed response. */ - spdylay_gzip *inflater; -}; - -struct URI { - const char *host; - size_t hostlen; - uint16_t port; - /* In this program, path contains query component as well. */ - const char *path; - size_t pathlen; - const char *hostport; - size_t hostportlen; -}; - -/* - * Returns copy of string |s| with the length |len|. The returned - * string is NULL-terminated. - */ -static char* strcopy(const char *s, size_t len) -{ - char *dst; - dst = malloc(len+1); - if (NULL == dst) - abort (); - memcpy(dst, s, len); - dst[len] = '\0'; - return dst; -} - -/* - * Prints error message |msg| and exit. - */ -static void die(const char *msg) -{ - fprintf(stderr, "FATAL: %s\n", msg); - exit(EXIT_FAILURE); -} - -/* - * Prints error containing the function name |func| and message |msg| - * and exit. - */ -static void dief(const char *func, const char *msg) -{ - fprintf(stderr, "FATAL: %s: %s\n", func, msg); - exit(EXIT_FAILURE); -} - -/* - * Prints error containing the function name |func| and error code - * |error_code| and exit. - */ -static void diec(const char *func, int error_code) -{ - fprintf(stderr, "FATAL: %s: error_code=%d, msg=%s\n", func, error_code, - spdylay_strerror(error_code)); - exit(EXIT_FAILURE); -} - -/* - * Check response is content-encoding: gzip. We need this because SPDY - * client is required to support gzip. - */ -static void check_gzip(struct Request *req, char **nv) -{ - int gzip = 0; - size_t i; - for(i = 0; nv[i]; i += 2) { - if(strcmp("content-encoding", nv[i]) == 0) { - gzip = strcmp("gzip", nv[i+1]) == 0; - break; - } - } - if(gzip) { - int rv; - if(req->inflater) { - return; - } - rv = spdylay_gzip_inflate_new(&req->inflater); - if(rv != 0) { - die("Can't allocate inflate stream."); - } - } -} - -/* - * The implementation of spdylay_send_callback type. Here we write - * |data| with size |length| to the network and return the number of - * bytes actually written. See the documentation of - * spdylay_send_callback for the details. - */ -static ssize_t send_callback(spdylay_session *session, - const uint8_t *data, size_t length, int flags, - void *user_data) -{ - (void)session; - (void)flags; - - struct Connection *connection; - ssize_t rv; - connection = (struct Connection*)user_data; - connection->want_io = IO_NONE; - ERR_clear_error(); - rv = SSL_write(connection->ssl, data, length); - if(rv < 0) { - int err = SSL_get_error(connection->ssl, rv); - if(err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) { - connection->want_io = (err == SSL_ERROR_WANT_READ ? - WANT_READ : WANT_WRITE); - rv = SPDYLAY_ERR_WOULDBLOCK; - } else { - rv = SPDYLAY_ERR_CALLBACK_FAILURE; - } - } - return rv; -} - -/* - * The implementation of spdylay_recv_callback type. Here we read data - * from the network and write them in |buf|. The capacity of |buf| is - * |length| bytes. Returns the number of bytes stored in |buf|. See - * the documentation of spdylay_recv_callback for the details. - */ -static ssize_t recv_callback(spdylay_session *session, - uint8_t *buf, size_t length, int flags, - void *user_data) -{ - (void)session; - (void)flags; - - struct Connection *connection; - ssize_t rv; - connection = (struct Connection*)user_data; - connection->want_io = IO_NONE; - ERR_clear_error(); - rv = SSL_read(connection->ssl, buf, length); - if(rv < 0) { - int err = SSL_get_error(connection->ssl, rv); - if(err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) { - connection->want_io = (err == SSL_ERROR_WANT_READ ? - WANT_READ : WANT_WRITE); - rv = SPDYLAY_ERR_WOULDBLOCK; - } else { - rv = SPDYLAY_ERR_CALLBACK_FAILURE; - } - } else if(rv == 0) { - rv = SPDYLAY_ERR_EOF; - } - return rv; -} - -/* - * The implementation of spdylay_before_ctrl_send_callback type. We - * use this function to get stream ID of the request. This is because - * stream ID is not known when we submit the request - * (spdylay_submit_request). - */ -static void before_ctrl_send_callback(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, - void *user_data) -{ - (void)user_data; - - if(type == SPDYLAY_SYN_STREAM) { - struct Request *req; - int stream_id = frame->syn_stream.stream_id; - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req && req->stream_id == -1) { - req->stream_id = stream_id; - printf("[INFO] Stream ID = %d\n", stream_id); - } - } -} - -static void on_ctrl_send_callback(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, void *user_data) -{ - (void)user_data; - - char **nv; - const char *name = NULL; - int32_t stream_id; - size_t i; - switch(type) { - case SPDYLAY_SYN_STREAM: - nv = frame->syn_stream.nv; - name = "SYN_STREAM"; - stream_id = frame->syn_stream.stream_id; - break; - default: - break; - } - if(name && spdylay_session_get_stream_user_data(session, stream_id)) { - printf("[INFO] C ----------------------------> S (%s)\n", name); - for(i = 0; nv[i]; i += 2) { - printf(" %s: %s\n", nv[i], nv[i+1]); - } - } -} - -static void on_ctrl_recv_callback(spdylay_session *session, - spdylay_frame_type type, - spdylay_frame *frame, void *user_data) -{ - (void)user_data; - - struct Request *req; - char **nv; - const char *name = NULL; - int32_t stream_id; - size_t i; - switch(type) { - case SPDYLAY_SYN_REPLY: - nv = frame->syn_reply.nv; - name = "SYN_REPLY"; - stream_id = frame->syn_reply.stream_id; - break; - case SPDYLAY_HEADERS: - nv = frame->headers.nv; - name = "HEADERS"; - stream_id = frame->headers.stream_id; - break; - default: - break; - } - if(!name) { - return; - } - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req) { - check_gzip(req, nv); - printf("[INFO] C <---------------------------- S (%s)\n", name); - for(i = 0; nv[i]; i += 2) { - printf(" %s: %s\n", nv[i], nv[i+1]); - } - } -} - -/* - * The implementation of spdylay_on_stream_close_callback type. We use - * this function to know the response is fully received. Since we just - * fetch 1 resource in this program, after reception of the response, - * we submit GOAWAY and close the session. - */ -static void on_stream_close_callback(spdylay_session *session, - int32_t stream_id, - spdylay_status_code status_code, - void *user_data) -{ - (void)user_data; - (void)status_code; - - struct Request *req; - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req) { - int rv; - rv = spdylay_submit_goaway(session, SPDYLAY_GOAWAY_OK); - if(rv != 0) { - diec("spdylay_submit_goaway", rv); - } - } -} - -#define MAX_OUTLEN 4096 - -/* - * The implementation of spdylay_on_data_chunk_recv_callback type. We - * use this function to print the received response body. - */ -static void on_data_chunk_recv_callback(spdylay_session *session, uint8_t flags, - int32_t stream_id, - const uint8_t *data, size_t len, - void *user_data) -{ - (void)user_data; - (void)flags; - - struct Request *req; - req = spdylay_session_get_stream_user_data(session, stream_id); - if(req) { - printf("[INFO] C <---------------------------- S (DATA)\n"); - printf(" %lu bytes\n", (unsigned long int)len); - if(req->inflater) { - while(len > 0) { - uint8_t out[MAX_OUTLEN]; - size_t outlen = MAX_OUTLEN; - size_t tlen = len; - int rv; - rv = spdylay_gzip_inflate(req->inflater, out, &outlen, data, &tlen); - if(rv == -1) { - spdylay_submit_rst_stream(session, stream_id, SPDYLAY_INTERNAL_ERROR); - break; - } - fwrite(out, 1, outlen, stdout); - data += tlen; - len -= tlen; - } - } else { - /* TODO add support gzip */ - fwrite(data, 1, len, stdout); - - //check if the data is correct - //if(strcmp(RESPONSE_BODY, data) != 0) - //killparent(parent, "\nreceived data is not the same"); - if(len + rcvbuf_c > strlen(RESPONSE_BODY)) - killparent(parent, "\nreceived data is not the same"); - - strcpy(rcvbuf + rcvbuf_c,(char*)data); - rcvbuf_c+=len; - } - printf("\n"); - } -} - -/* - * Setup callback functions. Spdylay API offers many callback - * functions, but most of them are optional. The send_callback is - * always required. Since we use spdylay_session_recv(), the - * recv_callback is also required. - */ -static void setup_spdylay_callbacks(spdylay_session_callbacks *callbacks) -{ - memset(callbacks, 0, sizeof(spdylay_session_callbacks)); - callbacks->send_callback = send_callback; - callbacks->recv_callback = recv_callback; - callbacks->before_ctrl_send_callback = before_ctrl_send_callback; - callbacks->on_ctrl_send_callback = on_ctrl_send_callback; - callbacks->on_ctrl_recv_callback = on_ctrl_recv_callback; - callbacks->on_stream_close_callback = on_stream_close_callback; - callbacks->on_data_chunk_recv_callback = on_data_chunk_recv_callback; -} - -/* - * Callback function for SSL/TLS NPN. Since this program only supports - * SPDY protocol, if server does not offer SPDY protocol the Spdylay - * library supports, we terminate program. - */ -static int select_next_proto_cb(SSL* ssl, - unsigned char **out, unsigned char *outlen, - const unsigned char *in, unsigned int inlen, - void *arg) -{ - (void)ssl; - - int rv; - uint16_t *spdy_proto_version; - /* spdylay_select_next_protocol() selects SPDY protocol version the - Spdylay library supports. */ - rv = spdylay_select_next_protocol(out, outlen, in, inlen); - if(rv <= 0) { - die("Server did not advertise spdy/2 or spdy/3 protocol."); - } - spdy_proto_version = (uint16_t*)arg; - *spdy_proto_version = rv; - return SSL_TLSEXT_ERR_OK; -} - -/* - * Setup SSL context. We pass |spdy_proto_version| to get negotiated - * SPDY protocol version in NPN callback. - */ -static void init_ssl_ctx(SSL_CTX *ssl_ctx, uint16_t *spdy_proto_version) -{ - /* Disable SSLv2 and enable all workarounds for buggy servers */ - SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL|SSL_OP_NO_SSLv2); - SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY); - SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS); - /* Set NPN callback */ - SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, - spdy_proto_version); -} - -static void ssl_handshake(SSL *ssl, int fd) -{ - int rv; - if(SSL_set_fd(ssl, fd) == 0) { - dief("SSL_set_fd", ERR_error_string(ERR_get_error(), NULL)); - } - ERR_clear_error(); - rv = SSL_connect(ssl); - if(rv <= 0) { - dief("SSL_connect", ERR_error_string(ERR_get_error(), NULL)); - } -} - -/* - * Connects to the host |host| and port |port|. This function returns - * the file descriptor of the client socket. - */ -static int connect_to(const char *host, uint16_t port) -{ - struct addrinfo hints; - int fd = -1; - int rv; - char service[NI_MAXSERV]; - struct addrinfo *res, *rp; - snprintf(service, sizeof(service), "%u", port); - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - rv = getaddrinfo(host, service, &hints, &res); - if(rv != 0) { - dief("getaddrinfo", gai_strerror(rv)); - } - for(rp = res; rp; rp = rp->ai_next) { - fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); - if(fd == -1) { - continue; - } - while((rv = connect(fd, rp->ai_addr, rp->ai_addrlen)) == -1 && - errno == EINTR); - if(rv == 0) { - break; - } - close(fd); - fd = -1; - } - freeaddrinfo(res); - return fd; -} - -static void make_non_block(int fd) -{ - int flags, rv; - while((flags = fcntl(fd, F_GETFL, 0)) == -1 && errno == EINTR); - if(flags == -1) { - dief("fcntl", strerror(errno)); - } - while((rv = fcntl(fd, F_SETFL, flags | O_NONBLOCK)) == -1 && errno == EINTR); - if(rv == -1) { - dief("fcntl", strerror(errno)); - } -} - -/* - * Setting TCP_NODELAY is not mandatory for the SPDY protocol. - */ -static void set_tcp_nodelay(int fd) -{ - int val = 1; - int rv; - rv = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, (socklen_t)sizeof(val)); - if(rv == -1) { - dief("setsockopt", strerror(errno)); - } -} - -/* - * Update |pollfd| based on the state of |connection|. - */ -static void ctl_poll(struct pollfd *pollfd, struct Connection *connection) -{ - pollfd->events = 0; - if(spdylay_session_want_read(connection->session) || - connection->want_io == WANT_READ) { - pollfd->events |= POLLIN; - } - if(spdylay_session_want_write(connection->session) || - connection->want_io == WANT_WRITE) { - pollfd->events |= POLLOUT; - } -} - -/* - * Submits the request |req| to the connection |connection|. This - * function does not send packets; just append the request to the - * internal queue in |connection->session|. - */ -static void submit_request(struct Connection *connection, struct Request *req) -{ - int pri = 0; - int rv; - const char *nv[15]; - /* We always use SPDY/3 style header even if the negotiated protocol - version is SPDY/2. The library translates the header name as - necessary. Make sure that the last item is NULL! */ - nv[0] = ":method"; nv[1] = "GET"; - nv[2] = ":path"; nv[3] = req->path; - nv[4] = ":version"; nv[5] = "HTTP/1.1"; - nv[6] = ":scheme"; nv[7] = "https"; - nv[8] = ":host"; nv[9] = req->hostport; - nv[10] = "accept"; nv[11] = "*/*"; - nv[12] = "user-agent"; nv[13] = "spdylay/"SPDYLAY_VERSION; - nv[14] = NULL; - rv = spdylay_submit_request(connection->session, pri, nv, NULL, req); - if(rv != 0) { - diec("spdylay_submit_request", rv); - } -} - -/* - * Performs the network I/O. - */ -static void exec_io(struct Connection *connection) -{ - int rv; - rv = spdylay_session_recv(connection->session); - if(rv != 0) { - diec("spdylay_session_recv", rv); - } - rv = spdylay_session_send(connection->session); - if(rv != 0) { - diec("spdylay_session_send", rv); - } -} - -static void request_init(struct Request *req, const struct URI *uri) -{ - req->host = strcopy(uri->host, uri->hostlen); - req->port = uri->port; - req->path = strcopy(uri->path, uri->pathlen); - req->hostport = strcopy(uri->hostport, uri->hostportlen); - req->stream_id = -1; - req->inflater = NULL; -} - -static void request_free(struct Request *req) -{ - free(req->host); - free(req->path); - free(req->hostport); - spdylay_gzip_inflate_del(req->inflater); -} - -/* - * Fetches the resource denoted by |uri|. - */ -static void fetch_uri(const struct URI *uri) -{ - spdylay_session_callbacks callbacks; - int fd; - SSL_CTX *ssl_ctx; - SSL *ssl; - struct Request req; - struct Connection connection; - int rv; - nfds_t npollfds = 1; - struct pollfd pollfds[1]; - uint16_t spdy_proto_version; - - request_init(&req, uri); - - setup_spdylay_callbacks(&callbacks); - - /* Establish connection and setup SSL */ - fd = connect_to(req.host, req.port); - if (-1 == fd) - abort (); - ssl_ctx = SSL_CTX_new(SSLv23_client_method()); - if(ssl_ctx == NULL) { - dief("SSL_CTX_new", ERR_error_string(ERR_get_error(), NULL)); - } - init_ssl_ctx(ssl_ctx, &spdy_proto_version); - ssl = SSL_new(ssl_ctx); - if(ssl == NULL) { - dief("SSL_new", ERR_error_string(ERR_get_error(), NULL)); - } - /* To simplify the program, we perform SSL/TLS handshake in blocking - I/O. */ - ssl_handshake(ssl, fd); - - connection.ssl = ssl; - connection.want_io = IO_NONE; - - /* Here make file descriptor non-block */ - make_non_block(fd); - set_tcp_nodelay(fd); - - printf("[INFO] SPDY protocol version = %d\n", spdy_proto_version); - rv = spdylay_session_client_new(&connection.session, spdy_proto_version, - &callbacks, &connection); - if(rv != 0) { - diec("spdylay_session_client_new", rv); - } - - /* Submit the HTTP request to the outbound queue. */ - submit_request(&connection, &req); - - pollfds[0].fd = fd; - ctl_poll(pollfds, &connection); - - /* Event loop */ - while(spdylay_session_want_read(connection.session) || - spdylay_session_want_write(connection.session)) { - int nfds = poll(pollfds, npollfds, -1); - if(nfds == -1) { - dief("poll", strerror(errno)); - } - if(pollfds[0].revents & (POLLIN | POLLOUT)) { - exec_io(&connection); - } - if((pollfds[0].revents & POLLHUP) || (pollfds[0].revents & POLLERR)) { - die("Connection error"); - } - ctl_poll(pollfds, &connection); - } - - /* Resource cleanup */ - spdylay_session_del(connection.session); - SSL_shutdown(ssl); - SSL_free(ssl); - SSL_CTX_free(ssl_ctx); - shutdown(fd, SHUT_WR); - close(fd); - request_free(&req); -} - -static int parse_uri(struct URI *res, const char *uri) -{ - /* We only interested in https */ - size_t len, i, offset; - memset(res, 0, sizeof(struct URI)); - len = strlen(uri); - if(len < 9 || memcmp("https://", uri, 8) != 0) { - return -1; - } - offset = 8; - res->host = res->hostport = &uri[offset]; - res->hostlen = 0; - if(uri[offset] == '[') { - /* IPv6 literal address */ - ++offset; - ++res->host; - for(i = offset; i < len; ++i) { - if(uri[i] == ']') { - res->hostlen = i-offset; - offset = i+1; - break; - } - } - } else { - const char delims[] = ":/?#"; - for(i = offset; i < len; ++i) { - if(strchr(delims, uri[i]) != NULL) { - break; - } - } - res->hostlen = i-offset; - offset = i; - } - if(res->hostlen == 0) { - return -1; - } - /* Assuming https */ - res->port = 443; - if(offset < len) { - if(uri[offset] == ':') { - /* port */ - const char delims[] = "/?#"; - int port = 0; - ++offset; - for(i = offset; i < len; ++i) { - if(strchr(delims, uri[i]) != NULL) { - break; - } - if('0' <= uri[i] && uri[i] <= '9') { - port *= 10; - port += uri[i]-'0'; - if(port > 65535) { - return -1; - } - } else { - return -1; - } - } - if(port == 0) { - return -1; - } - offset = i; - res->port = port; - } - } - res->hostportlen = uri+offset-res->host; - for(i = offset; i < len; ++i) { - if(uri[i] == '#') { - break; - } - } - if(i-offset == 0) { - res->path = "/"; - res->pathlen = 1; - } else { - res->path = &uri[offset]; - res->pathlen = i-offset; - } - return 0; -} - - -/***** - * end of code needed to utilize spdylay - */ - - -/***** - * start of code needed to utilize microspdy - */ - - -void -standard_request_handler(void *cls, - struct SPDY_Request * request, - uint8_t priority, - const char *method, - const char *path, - const char *version, - const char *host, - const char *scheme, - struct SPDY_NameValue * headers, - bool more) -{ - (void)cls; - (void)request; - (void)priority; - (void)host; - (void)scheme; - (void)headers; - (void)method; - (void)version; - - struct SPDY_Response *response=NULL; - - if(strcmp(CLS,cls)!=0) - { - killchild(child,"wrong cls"); - } - - if(false != more){ - fprintf(stdout,"more has wrong value\n"); - exit(5); - } - - response = SPDY_build_response(200,NULL,SPDY_HTTP_VERSION_1_1,NULL,RESPONSE_BODY,strlen(RESPONSE_BODY)); - - if(NULL==response){ - fprintf(stdout,"no response obj\n"); - exit(3); - } - - if(SPDY_queue_response(request,response,true,false,NULL,(void*)strdup(path))!=SPDY_YES) - { - fprintf(stdout,"queue\n"); - exit(4); - } -} - -void -session_closed_handler (void *cls, - struct SPDY_Session * session, - int by_client) -{ - printf("session_closed_handler called\n"); - - if(strcmp(CLS,cls)!=0) - { - killchild(child,"wrong cls"); - } - - if(SPDY_YES != by_client) - { - //killchild(child,"wrong by_client"); - printf("session closed by server\n"); - } - else - { - printf("session closed by client\n"); - } - - if(NULL == session) - { - killchild(child,"session is NULL"); - } - - session_closed_called = 1; -} - - -/***** - * end of code needed to utilize microspdy - */ - -//child process -void -childproc(int port) -{ - struct URI uri; - struct sigaction act; - int rv; - char *uristr; - - memset(&act, 0, sizeof(struct sigaction)); - act.sa_handler = SIG_IGN; - sigaction(SIGPIPE, &act, 0); - - asprintf(&uristr, "https://127.0.0.1:%i/",port); - if(NULL == (rcvbuf = malloc(strlen(RESPONSE_BODY)+1))) - killparent(parent,"no memory"); - - SSL_load_error_strings(); - SSL_library_init(); - - rv = parse_uri(&uri, uristr); - if(rv != 0) { - killparent(parent,"parse_uri failed"); - } - fetch_uri(&uri); - - if(strcmp(rcvbuf, RESPONSE_BODY)) - killparent(parent,"received data is different"); -} - -//parent proc -int -parentproc( int port) -{ - int childstatus; - unsigned long long timeoutlong=0; - struct timeval timeout; - int ret; - fd_set read_fd_set; - fd_set write_fd_set; - fd_set except_fd_set; - int maxfd = -1; - struct SPDY_Daemon *daemon; - - SPDY_init(); - - daemon = SPDY_start_daemon(port, - DATA_DIR "cert-and-key.pem", - DATA_DIR "cert-and-key.pem", - NULL,&session_closed_handler,&standard_request_handler,NULL,CLS,SPDY_DAEMON_OPTION_END); - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - do - { - FD_ZERO(&read_fd_set); - FD_ZERO(&write_fd_set); - FD_ZERO(&except_fd_set); - - ret = SPDY_get_timeout(daemon, &timeoutlong); - if(SPDY_NO == ret || timeoutlong > 1000) - { - timeout.tv_sec = 1; - timeout.tv_usec = 0; - } - else - { - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - } - - maxfd = SPDY_get_fdset (daemon, - &read_fd_set, - &write_fd_set, - &except_fd_set); - - ret = select(maxfd+1, &read_fd_set, &write_fd_set, &except_fd_set, &timeout); - - switch(ret) { - case -1: - printf("select error: %i\n", errno); - killchild(child, "select error"); - break; - case 0: - - break; - default: - SPDY_run(daemon); - - break; - } - } - while(waitpid(child,&childstatus,WNOHANG) != child); - - //give chance to the client to close socket and handle this in run - usleep(100000); - SPDY_run(daemon); - - SPDY_stop_daemon(daemon); - - SPDY_deinit(); - - return WEXITSTATUS(childstatus); -} - -int main() -{ - int port = get_port(12123); - parent = getpid(); - - child = fork(); - if (child == -1) - { - fprintf(stderr, "can't fork, error %d\n", errno); - exit(EXIT_FAILURE); - } - - if (child == 0) - { - childproc(port); - _exit(0); - } - else - { - int ret = parentproc(port); - if(1 == session_closed_called && 0 == ret) - exit(0); - else - exit(ret ? ret : 21); - } - return 1; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_request_response_with_callback.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_request_response_with_callback.c deleted file mode 100644 index 95fc263d..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_request_response_with_callback.c +++ /dev/null @@ -1,320 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file request_response_with_callback.c - * @brief tests responses with callbacks - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "microspdy.h" -#include "stdio.h" -#include -#include -#include "common.h" -#include -#include - -int port; - -pid_t parent; -pid_t child; - -int run = 1; -int chunk_size=1; - -void -killchild() -{ - kill(child, SIGKILL); - exit(1); -} - -void -killparent() -{ - kill(parent, SIGKILL); - _exit(1); -} - -ssize_t -response_callback (void *cls, - void *buffer, - size_t max, - bool *more) -{ - FILE *fd =(FILE*)cls; - - size_t n; - if(chunk_size % 2) - n = chunk_size; - else - n = max - chunk_size; - - if(n < 1) n = 1; - else if (n > max) n=max; - chunk_size++; - - int ret = fread(buffer,1,n,fd); - *more = feof(fd) == 0; - - //printf("more is %i\n",*more); - - if(!(*more)) - fclose(fd); - - return ret; -} - - -void -response_done_callback(void *cls, - struct SPDY_Response * response, - struct SPDY_Request * request, - enum SPDY_RESPONSE_RESULT status, - bool streamopened) -{ - (void)status; - (void)streamopened; - - printf("answer for %s was sent\n", (char*)cls); - - SPDY_destroy_request(request); - SPDY_destroy_response(response); - free(cls); - - run = 0; -} - -void -standard_request_handler(void *cls, - struct SPDY_Request * request, - uint8_t priority, - const char *method, - const char *path, - const char *version, - const char *host, - const char *scheme, - struct SPDY_NameValue * headers, - bool more) -{ - (void)cls; - (void)request; - (void)priority; - (void)host; - (void)scheme; - (void)headers; - (void)method; - (void)version; - (void)more; - - struct SPDY_Response *response=NULL; - struct SPDY_NameValue *resp_headers; - - printf("received request for '%s %s %s'\n", method, path, version); - - FILE *fd = fopen(DATA_DIR "spdy-draft.txt","r"); - - if(NULL == (resp_headers = SPDY_name_value_create())) - { - fprintf(stdout,"SPDY_name_value_create failed\n"); - killchild(); - } - if(SPDY_YES != SPDY_name_value_add(resp_headers,SPDY_HTTP_HEADER_CONTENT_TYPE,"text/plain")) - { - fprintf(stdout,"SPDY_name_value_add failed\n"); - killchild(); - } - - response = SPDY_build_response_with_callback(200,NULL, - SPDY_HTTP_VERSION_1_1,resp_headers,&response_callback,fd,SPDY_MAX_SUPPORTED_FRAME_SIZE); - SPDY_name_value_destroy(resp_headers); - - if(NULL==response){ - fprintf(stdout,"no response obj\n"); - killchild(); - } - - void *clspath = strdup(path); - - if(SPDY_queue_response(request,response,true,false,&response_done_callback,clspath)!=SPDY_YES) - { - fprintf(stdout,"queue\n"); - killchild(); - } -} - -int -parentproc() -{ - int childstatus; - unsigned long long timeoutlong=0; - struct timeval timeout; - int ret; - fd_set read_fd_set; - fd_set write_fd_set; - fd_set except_fd_set; - int maxfd = -1; - struct SPDY_Daemon *daemon; - - SPDY_init(); - - daemon = SPDY_start_daemon(port, - DATA_DIR "cert-and-key.pem", - DATA_DIR "cert-and-key.pem", - NULL, - NULL, - &standard_request_handler, - NULL, - NULL, - SPDY_DAEMON_OPTION_SESSION_TIMEOUT, - 1800, - SPDY_DAEMON_OPTION_END); - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - do - { - FD_ZERO(&read_fd_set); - FD_ZERO(&write_fd_set); - FD_ZERO(&except_fd_set); - - ret = SPDY_get_timeout(daemon, &timeoutlong); - if(SPDY_NO == ret || timeoutlong > 1000) - { - timeout.tv_sec = 1; - timeout.tv_usec = 0; - } - else - { - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - } - - maxfd = SPDY_get_fdset (daemon, - &read_fd_set, - &write_fd_set, - &except_fd_set); - - ret = select(maxfd+1, &read_fd_set, &write_fd_set, &except_fd_set, &timeout); - - switch(ret) { - case -1: - printf("select error: %i\n", errno); - break; - case 0: - - break; - default: - SPDY_run(daemon); - - break; - } - } - while(waitpid(child,&childstatus,WNOHANG) != child); - - SPDY_stop_daemon(daemon); - - SPDY_deinit(); - - return WEXITSTATUS(childstatus); -} - -#define MD5_LEN 32 - -int -md5(char *cmd, char *md5_sum) -{ - FILE *p = popen(cmd, "r"); - if (p == NULL) return 0; - - int i, ch; - for (i = 0; i < MD5_LEN && isxdigit(ch = fgetc(p)); i++) { - *md5_sum++ = ch; - } - - *md5_sum = '\0'; - pclose(p); - return i == MD5_LEN; -} - -int -childproc() -{ - char *cmd1; - char *cmd2; - char md5_sum1[33]; - char md5_sum2[33]; - int ret; - struct timeval tv1; - struct timeval tv2; - struct stat st; - //int secs; - uint64_t usecs; - - asprintf(&cmd1, "spdycat https://127.0.0.1:%i/ | md5sum",port); - asprintf(&cmd2, "md5sum " DATA_DIR "spdy-draft.txt"); - - gettimeofday(&tv1, NULL); - md5(cmd1,md5_sum1); - gettimeofday(&tv2, NULL); - md5(cmd2,md5_sum2); - - printf("downloaded file md5: %s\n", md5_sum1); - printf("original file md5: %s\n", md5_sum2); - ret = strcmp(md5_sum1, md5_sum2); - - if(0 == ret && 0 == stat(DATA_DIR "spdy-draft.txt", &st)) - { - usecs = (uint64_t)1000000 * (uint64_t)(tv2.tv_sec - tv1.tv_sec) + tv2.tv_usec - tv1.tv_usec; - printf("%lld bytes read in %llu usecs\n", (long long)st.st_size, (long long unsigned )usecs); - } - - return ret; -} - - -int -main() -{ - port = get_port(11123); - parent = getpid(); - - child = fork(); - if (-1 == child) - { - fprintf(stderr, "can't fork, error %d\n", errno); - exit(EXIT_FAILURE); - } - - if (child == 0) - { - int ret = childproc(); - _exit(ret); - } - else - { - int ret = parentproc(); - exit(ret); - } - return 1; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_session_timeout.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_session_timeout.c deleted file mode 100644 index ec1eced5..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_session_timeout.c +++ /dev/null @@ -1,338 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2013 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file session_timeout.c - * @brief tests closing sessions after set timeout. Openssl is used for - * client - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "microspdy.h" -#include "stdio.h" -#include -#include -#include "common.h" -#include -#include -#include "../microspdy/internal.h" - -#define TIMEOUT 2 -#define SELECT_MS_TIMEOUT 20 - -int port; - -pid_t parent; -pid_t child; - -int run = 1; -int chunk_size=1; -int new_session; -int closed_session; -int do_sleep; - - - -static unsigned long long -monotonic_time (void) -{ -#ifdef HAVE_CLOCK_GETTIME -#ifdef CLOCK_MONOTONIC - struct timespec ts; - if (0 == clock_gettime (CLOCK_MONOTONIC, &ts)) - return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; -#endif -#endif - return time (NULL) * 1000; -} - - -static void -killchild(char *msg) -{ - printf("%s\n",msg); - kill(child, SIGKILL); - exit(1); -} - - -static void -killparent(char *msg) -{ - printf("%s\n",msg); - kill(parent, SIGKILL); - _exit(1); -} - - -static void -new_session_cb (void *cls, - struct SPDY_Session * session) -{ - (void)cls; - (void)session; - - if(!new_session)do_sleep = 1; - new_session = 1; - printf("new session\n"); -} - - -static void -closed_session_cb (void *cls, - struct SPDY_Session * session, - int by_client) -{ - (void)cls; - (void)session; - - printf("closed_session_cb called\n"); - - if(SPDY_YES == by_client) - { - killchild("closed by the client"); - } - if(closed_session) - { - killchild("closed_session_cb called twice"); - } - - closed_session = 1; -} - - -static int -parentproc() -{ - int childstatus; - unsigned long long timeoutlong=0; - struct timeval timeout; - int ret; - fd_set read_fd_set; - fd_set write_fd_set; - fd_set except_fd_set; - int maxfd = -1; - struct SPDY_Daemon *daemon; - unsigned long long beginning = 0; - unsigned long long now; - - SPDY_init(); - - daemon = SPDY_start_daemon(port, - DATA_DIR "cert-and-key.pem", - DATA_DIR "cert-and-key.pem", - &new_session_cb, - &closed_session_cb, - NULL, - NULL, - NULL, - SPDY_DAEMON_OPTION_SESSION_TIMEOUT, - TIMEOUT, - SPDY_DAEMON_OPTION_END); - - if(NULL==daemon){ - printf("no daemon\n"); - return 1; - } - - do - { - do_sleep=0; - FD_ZERO(&read_fd_set); - FD_ZERO(&write_fd_set); - FD_ZERO(&except_fd_set); - - ret = SPDY_get_timeout(daemon, &timeoutlong); - - if(new_session && !closed_session) - { - if(SPDY_NO == ret) - { - killchild("SPDY_get_timeout returned wrong SPDY_NO"); - } - /*if(timeoutlong) - { - killchild("SPDY_get_timeout returned wrong timeout"); - }*/ - now = monotonic_time (); - if(now - beginning > TIMEOUT*1000 + SELECT_MS_TIMEOUT) - { - printf("Started at: %llums\n",beginning); - printf("Now is: %llums\n",now); - printf("Timeout is: %i\n",TIMEOUT); - printf("Select Timeout is: %ims\n",SELECT_MS_TIMEOUT); - printf("SPDY_get_timeout gave: %llums\n",timeoutlong); - killchild("Timeout passed but session was not closed"); - } - if(timeoutlong > beginning + TIMEOUT *1000) - { - printf("Started at: %llums\n",beginning); - printf("Now is: %llums\n",now); - printf("Timeout is: %i\n",TIMEOUT); - printf("Select Timeout is: %ims\n",SELECT_MS_TIMEOUT); - printf("SPDY_get_timeout gave: %llums\n",timeoutlong); - killchild("SPDY_get_timeout returned wrong timeout"); - } - } - else - { - if(SPDY_YES == ret) - { - killchild("SPDY_get_timeout returned wrong SPDY_YES"); - } - } - - if(SPDY_NO == ret || timeoutlong >= 1000) - { - timeout.tv_sec = 1; - timeout.tv_usec = 0; - } - else - { - timeout.tv_sec = timeoutlong / 1000; - timeout.tv_usec = (timeoutlong % 1000) * 1000; - } - - //ignore values - timeout.tv_sec = 0; - timeout.tv_usec = SELECT_MS_TIMEOUT * 1000; - - maxfd = SPDY_get_fdset (daemon, - &read_fd_set, - &write_fd_set, - &except_fd_set); - - ret = select(maxfd+1, &read_fd_set, &write_fd_set, &except_fd_set, &timeout); - - switch(ret) { - case -1: - printf("select error: %i\n", errno); - break; - case 0: - /*if(new_session) - { - killchild("select returned wrong number"); - }*/ - break; - default: - SPDY_run(daemon); - if(0 == beginning) - { - beginning = monotonic_time (); - } - /*if(do_sleep) - { - sleep(TIMEOUT); - do_sleep = 0; - }*/ - break; - } - } - while(waitpid(child,&childstatus,WNOHANG) != child); - - if(!new_session || !closed_session) - { - killchild("child is dead, callback wasn't called"); - } - - ret = SPDY_get_timeout(daemon, &timeoutlong); - - if(SPDY_YES == ret) - { - killchild("SPDY_get_timeout returned wrong SPDY_YES after child died"); - } - - SPDY_stop_daemon(daemon); - - SPDY_deinit(); - - return 0; -} - - -static int -childproc() -{ - pid_t devnull; - int out; - - out=dup(1); - if (-1 == out) - abort(); - //close(0); - close(1); - close(2); - /*devnull = open("/dev/null", O_RDONLY); - if (0 != devnull) - { - dup2(devnull, 0); - close(devnull); - }*/ - devnull = open("/dev/null", O_WRONLY); - if (-1 == devnull) - abort (); - if (1 != devnull) - { - dup2(devnull, 1); - close(devnull); - } - devnull = open("/dev/null", O_WRONLY); - if (-1 == devnull) - abort (); - if (2 != devnull) - { - dup2(devnull, 2); - close(devnull); - } - char *uri; - asprintf (&uri, "127.0.0.1:%i", port); - execlp ("openssl", "openssl", "s_client", "-connect", uri, NULL); - close(1); - dup2(out,1); - close(out); - killparent ("executing openssl failed"); - return 1; -} - - -int -main() -{ - port = get_port(11123); - parent = getpid(); - - child = fork(); - if (-1 == child) - { - fprintf(stderr, "can't fork, error %d\n", errno); - exit(EXIT_FAILURE); - } - - if (child == 0) - { - int ret = childproc(); - _exit(ret); - } - else - { - int ret = parentproc(); - exit(ret); - } - return 1; -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_struct_namevalue.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_struct_namevalue.c deleted file mode 100644 index 54e79349..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testspdy/test_struct_namevalue.c +++ /dev/null @@ -1,346 +0,0 @@ -/* - This file is part of libmicrospdy - Copyright Copyright (C) 2012 Andrey Uzunov - - 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 3 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, see . -*/ - -/** - * @file struct_namevalue.c - * @brief tests all the API functions for handling struct SPDY_NameValue - * @author Andrey Uzunov - */ - -#include "platform.h" -#include "microspdy.h" -#include "common.h" -#include "../microspdy/structures.h" -#include "../microspdy/alstructures.h" - -char *pairs[] = {"one","1","two","2","three","3","four","4","five","5"}; -char *pairs_with_dups[] = {"one","1","two","2","one","11","two","22","three","3","two","222","two","2222","four","","five","5"};//82 -char *pairs_with_empty[] = {"name","","name","value"}; -char *pairs_different[] = {"30","thirty","40","fouthy"}; -int size; -int size2; -int brake_at = 3; -bool flag; - - -int -iterate_cb (void *cls, const char *name, const char * const * value, int num_values) -{ - int *c = (int*)cls; - - if(*c < 0 || *c > size) - exit(11); - - if(strcmp(name,pairs[*c]) != 0) - { - FAIL_TEST("name is wrong\n"); - } - - if(1 != num_values) - { - FAIL_TEST("num_values is wrong\n"); - } - - if(strcmp(value[0],pairs[(*c)+1]) != 0) - { - FAIL_TEST("value is wrong\n"); - } - - (*c)+=2; - - return SPDY_YES; -} - -int -iterate_brake_cb (void *cls, const char *name, const char * const *value, int num_values) -{ - (void)name; - (void)value; - (void)num_values; - - int *c = (int*)cls; - - if(*c < 0 || *c >= brake_at) - { - FAIL_TEST("iteration was not interrupted\n"); - } - - (*c)++; - - if(*c == brake_at) return SPDY_NO; - - return SPDY_YES; -} - -int -main() -{ - SPDY_init(); - - const char *const*value; - const char *const*value2; - int i; - int j; - int cls = 0; - int ret; - int ret2; - void *ob1; - void *ob2; - void *ob3; - void *stream; - char data[] = "anything"; - struct SPDY_NameValue *container; - struct SPDY_NameValue *container2; - struct SPDY_NameValue *container3; - struct SPDY_NameValue *container_arr[2]; - - size = sizeof(pairs)/sizeof(pairs[0]); - - if(NULL == (container = SPDY_name_value_create ())) - { - FAIL_TEST("SPDY_name_value_create failed\n"); - } - - if(NULL != SPDY_name_value_lookup (container, "anything", &ret)) - { - FAIL_TEST("SPDY_name_value_lookup failed\n"); - } - - if(SPDY_name_value_iterate (container, NULL, NULL) != 0) - { - FAIL_TEST("SPDY_name_value_iterate failed\n"); - } - - for(i=0;i= 0; i-=2) - { - value = SPDY_name_value_lookup(container,pairs[i], &ret); - if(NULL == value || 1 !=ret || strcmp(value[0], pairs[i+1]) != 0) - { - printf("%p; %i; %i\n", value, ret, - (NULL == value) ? -1 : strcmp(value[0], pairs[i+1])); - FAIL_TEST("SPDY_name_value_lookup failed\n"); - } - } - - SPDY_name_value_iterate (container, &iterate_cb, &cls); - - cls = 0; - if(SPDY_name_value_iterate (container, &iterate_brake_cb, &cls) != brake_at) - { - FAIL_TEST("SPDY_name_value_iterate with brake failed\n"); - } - - SPDY_name_value_destroy(container); - - //check everything with NULL values - for(i=0; i<7; ++i) - { - printf("%i ",i); - ob1 = (i & 4) ? data : NULL; - ob2 = (i & 2) ? data : NULL; - ob3 = (i & 1) ? data : NULL; - if(SPDY_INPUT_ERROR != SPDY_name_value_add(ob1,ob2,ob3)) - { - FAIL_TEST("SPDY_name_value_add with NULLs failed\n"); - } - } - printf("\n"); - fflush(stdout); - - if(SPDY_INPUT_ERROR != SPDY_name_value_iterate(NULL,NULL,NULL)) - { - FAIL_TEST("SPDY_name_value_iterate with NULLs failed\n"); - } - - for(i=0; i<7; ++i) - { - printf("%i ",i); - ob1 = (i & 4) ? data : NULL; - ob2 = (i & 2) ? data : NULL; - ob3 = (i & 1) ? data : NULL; - if(NULL != SPDY_name_value_lookup(ob1,ob2,ob3)) - { - FAIL_TEST("SPDY_name_value_lookup with NULLs failed\n"); - } - } - printf("\n"); - SPDY_name_value_destroy(NULL); - - if(NULL == (container = SPDY_name_value_create ())) - { - FAIL_TEST("SPDY_name_value_create failed\n"); - } - - size = sizeof(pairs_with_dups)/sizeof(pairs_with_dups[0]); - - for(i=0;i= 0; i-=2) - { - value = SPDY_name_value_lookup(container,pairs_with_dups[i], &ret); - if(NULL == value) - { - FAIL_TEST("SPDY_name_value_lookup failed\n"); - } - flag = false; - for(j=0; j (ret = SPDYF_name_value_to_stream(container_arr, 2, &stream)) || NULL == stream) - FAIL_TEST("SPDYF_name_value_to_stream failed\n"); - ret = SPDYF_name_value_from_stream(stream, ret, &container3); - if(SPDY_YES != ret) - FAIL_TEST("SPDYF_name_value_from_stream failed\n"); - - if(SPDY_name_value_iterate(container3, NULL, NULL) - != (SPDY_name_value_iterate(container, NULL, NULL) + SPDY_name_value_iterate(container2, NULL, NULL))) - FAIL_TEST("SPDYF_name_value_from_stream failed\n"); - - for(i=size - 2; i >= 0; i-=2) - { - value = SPDY_name_value_lookup(container,pairs_with_dups[i], &ret); - if(NULL == value) - FAIL_TEST("SPDY_name_value_lookup failed\n"); - value2 = SPDY_name_value_lookup(container3,pairs_with_dups[i], &ret2); - if(NULL == value2) - FAIL_TEST("SPDY_name_value_lookup failed\n"); - - for(j=0; j= 0; i-=2) - { - value = SPDY_name_value_lookup(container2,pairs_different[i], &ret); - if(NULL == value) - FAIL_TEST("SPDY_name_value_lookup failed\n"); - value2 = SPDY_name_value_lookup(container3,pairs_different[i], &ret2); - if(NULL == value2) - FAIL_TEST("SPDY_name_value_lookup failed\n"); - - for(j=0; j&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -check_PROGRAMS = test_get$(EXEEXT) test_get_chunked$(EXEEXT) \ - test_post$(EXEEXT) test_post_form$(EXEEXT) test_put$(EXEEXT) \ - test_put_chunked$(EXEEXT) test_put_large$(EXEEXT) \ - test_get11$(EXEEXT) test_post11$(EXEEXT) \ - test_post_form11$(EXEEXT) test_put11$(EXEEXT) \ - test_put_large11$(EXEEXT) test_long_header$(EXEEXT) -subdir = src/testzzuf -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp $(top_srcdir)/test-driver README -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ - $(top_srcdir)/m4/ax_append_flag.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ - $(top_srcdir)/m4/ax_check_link_flag.m4 \ - $(top_srcdir)/m4/ax_check_openssl.m4 \ - $(top_srcdir)/m4/ax_count_cpus.m4 \ - $(top_srcdir)/m4/ax_have_epoll.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/MHD_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am_test_get_OBJECTS = test_get.$(OBJEXT) -test_get_OBJECTS = $(am_test_get_OBJECTS) -test_get_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -am_test_get11_OBJECTS = test_get.$(OBJEXT) -test_get11_OBJECTS = $(am_test_get11_OBJECTS) -test_get11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_get_chunked_OBJECTS = test_get_chunked.$(OBJEXT) -test_get_chunked_OBJECTS = $(am_test_get_chunked_OBJECTS) -test_get_chunked_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_long_header_OBJECTS = test_long_header.$(OBJEXT) -test_long_header_OBJECTS = $(am_test_long_header_OBJECTS) -test_long_header_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_post_OBJECTS = test_post.$(OBJEXT) -test_post_OBJECTS = $(am_test_post_OBJECTS) -test_post_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_post11_OBJECTS = test_post.$(OBJEXT) -test_post11_OBJECTS = $(am_test_post11_OBJECTS) -test_post11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_post_form_OBJECTS = test_post_form.$(OBJEXT) -test_post_form_OBJECTS = $(am_test_post_form_OBJECTS) -test_post_form_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_post_form11_OBJECTS = test_post_form.$(OBJEXT) -test_post_form11_OBJECTS = $(am_test_post_form11_OBJECTS) -test_post_form11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_put_OBJECTS = test_put.$(OBJEXT) -test_put_OBJECTS = $(am_test_put_OBJECTS) -test_put_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_put11_OBJECTS = test_put.$(OBJEXT) -test_put11_OBJECTS = $(am_test_put11_OBJECTS) -test_put11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_put_chunked_OBJECTS = test_put_chunked.$(OBJEXT) -test_put_chunked_OBJECTS = $(am_test_put_chunked_OBJECTS) -test_put_chunked_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_put_large_OBJECTS = test_put_large.$(OBJEXT) -test_put_large_OBJECTS = $(am_test_put_large_OBJECTS) -test_put_large_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -am_test_put_large11_OBJECTS = test_put_large.$(OBJEXT) -test_put_large11_OBJECTS = $(am_test_put_large11_OBJECTS) -test_put_large11_DEPENDENCIES = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(test_get_SOURCES) $(test_get11_SOURCES) \ - $(test_get_chunked_SOURCES) $(test_long_header_SOURCES) \ - $(test_post_SOURCES) $(test_post11_SOURCES) \ - $(test_post_form_SOURCES) $(test_post_form11_SOURCES) \ - $(test_put_SOURCES) $(test_put11_SOURCES) \ - $(test_put_chunked_SOURCES) $(test_put_large_SOURCES) \ - $(test_put_large11_SOURCES) -DIST_SOURCES = $(test_get_SOURCES) $(test_get11_SOURCES) \ - $(test_get_chunked_SOURCES) $(test_long_header_SOURCES) \ - $(test_post_SOURCES) $(test_post11_SOURCES) \ - $(test_post_form_SOURCES) $(test_post_form11_SOURCES) \ - $(test_put_SOURCES) $(test_put11_SOURCES) \ - $(test_put_chunked_SOURCES) $(test_put_large_SOURCES) \ - $(test_put_large11_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - check recheck distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -am__tty_colors_dummy = \ - mgn= red= grn= lgn= blu= brg= std=; \ - am__color_tests=no -am__tty_colors = { \ - $(am__tty_colors_dummy); \ - if test "X$(AM_COLOR_TESTS)" = Xno; then \ - am__color_tests=no; \ - elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ - am__color_tests=yes; \ - elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ - am__color_tests=yes; \ - fi; \ - if test $$am__color_tests = yes; then \ - red=''; \ - grn=''; \ - lgn=''; \ - blu=''; \ - mgn=''; \ - brg=''; \ - std=''; \ - fi; \ -} -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__recheck_rx = ^[ ]*:recheck:[ ]* -am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* -am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* -# A command that, given a newline-separated list of test names on the -# standard input, print the name of the tests that are to be re-run -# upon "make recheck". -am__list_recheck_tests = $(AWK) '{ \ - recheck = 1; \ - while ((rc = (getline line < ($$0 ".trs"))) != 0) \ - { \ - if (rc < 0) \ - { \ - if ((getline line2 < ($$0 ".log")) < 0) \ - recheck = 0; \ - break; \ - } \ - else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ - { \ - recheck = 0; \ - break; \ - } \ - else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ - { \ - break; \ - } \ - }; \ - if (recheck) \ - print $$0; \ - close ($$0 ".trs"); \ - close ($$0 ".log"); \ -}' -# A command that, given a newline-separated list of test names on the -# standard input, create the global log from their .trs and .log files. -am__create_global_log = $(AWK) ' \ -function fatal(msg) \ -{ \ - print "fatal: making $@: " msg | "cat >&2"; \ - exit 1; \ -} \ -function rst_section(header) \ -{ \ - print header; \ - len = length(header); \ - for (i = 1; i <= len; i = i + 1) \ - printf "="; \ - printf "\n\n"; \ -} \ -{ \ - copy_in_global_log = 1; \ - global_test_result = "RUN"; \ - while ((rc = (getline line < ($$0 ".trs"))) != 0) \ - { \ - if (rc < 0) \ - fatal("failed to read from " $$0 ".trs"); \ - if (line ~ /$(am__global_test_result_rx)/) \ - { \ - sub("$(am__global_test_result_rx)", "", line); \ - sub("[ ]*$$", "", line); \ - global_test_result = line; \ - } \ - else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ - copy_in_global_log = 0; \ - }; \ - if (copy_in_global_log) \ - { \ - rst_section(global_test_result ": " $$0); \ - while ((rc = (getline line < ($$0 ".log"))) != 0) \ - { \ - if (rc < 0) \ - fatal("failed to read from " $$0 ".log"); \ - print line; \ - }; \ - printf "\n"; \ - }; \ - close ($$0 ".trs"); \ - close ($$0 ".log"); \ -}' -# Restructured Text title. -am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } -# Solaris 10 'make', and several other traditional 'make' implementations, -# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it -# by disabling -e (using the XSI extension "set +e") if it's set. -am__sh_e_setup = case $$- in *e*) set +e;; esac -# Default flags passed to test drivers. -am__common_driver_flags = \ - --color-tests "$$am__color_tests" \ - --enable-hard-errors "$$am__enable_hard_errors" \ - --expect-failure "$$am__expect_failure" -# To be inserted before the command running the test. Creates the -# directory for the log if needed. Stores in $dir the directory -# containing $f, in $tst the test, in $log the log. Executes the -# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and -# passes TESTS_ENVIRONMENT. Set up options for the wrapper that -# will run the test scripts (or their associated LOG_COMPILER, if -# thy have one). -am__check_pre = \ -$(am__sh_e_setup); \ -$(am__vpath_adj_setup) $(am__vpath_adj) \ -$(am__tty_colors); \ -srcdir=$(srcdir); export srcdir; \ -case "$@" in \ - */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ - *) am__odir=.;; \ -esac; \ -test "x$$am__odir" = x"." || test -d "$$am__odir" \ - || $(MKDIR_P) "$$am__odir" || exit $$?; \ -if test -f "./$$f"; then dir=./; \ -elif test -f "$$f"; then dir=; \ -else dir="$(srcdir)/"; fi; \ -tst=$$dir$$f; log='$@'; \ -if test -n '$(DISABLE_HARD_ERRORS)'; then \ - am__enable_hard_errors=no; \ -else \ - am__enable_hard_errors=yes; \ -fi; \ -case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ - am__expect_failure=yes;; \ - *) \ - am__expect_failure=no;; \ -esac; \ -$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) -# A shell command to get the names of the tests scripts with any registered -# extension removed (i.e., equivalently, the names of the test logs, with -# the '.log' extension removed). The result is saved in the shell variable -# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, -# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", -# since that might cause problem with VPATH rewrites for suffix-less tests. -# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. -am__set_TESTS_bases = \ - bases='$(TEST_LOGS)'; \ - bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ - bases=`echo $$bases` -RECHECK_LOGS = $(TEST_LOGS) -TEST_SUITE_LOG = test-suite.log -TEST_EXTENSIONS = @EXEEXT@ .test -LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver -LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) -am__set_b = \ - case '$@' in \ - */*) \ - case '$*' in \ - */*) b='$*';; \ - *) b=`echo '$@' | sed 's/\.log$$//'`; \ - esac;; \ - *) \ - b='$*';; \ - esac -am__test_logs1 = $(TESTS:=.log) -am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) -TEST_LOGS = $(am__test_logs2:.test.log=.log) -TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver -TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ - $(TEST_LOG_FLAGS) -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPU_COUNT = @CPU_COUNT@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ -GNUTLS_CPPFLAGS = @GNUTLS_CPPFLAGS@ -GNUTLS_LDFLAGS = @GNUTLS_LDFLAGS@ -GNUTLS_LIBS = @GNUTLS_LIBS@ -GREP = @GREP@ -HAVE_CURL_BINARY = @HAVE_CURL_BINARY@ -HAVE_MAKEINFO_BINARY = @HAVE_MAKEINFO_BINARY@ -HIDDEN_VISIBILITY_CFLAGS = @HIDDEN_VISIBILITY_CFLAGS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL = @LIBCURL@ -LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ -LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBSPDY_VERSION_AGE = @LIBSPDY_VERSION_AGE@ -LIBSPDY_VERSION_CURRENT = @LIBSPDY_VERSION_CURRENT@ -LIBSPDY_VERSION_REVISION = @LIBSPDY_VERSION_REVISION@ -LIBTOOL = @LIBTOOL@ -LIB_VERSION_AGE = @LIB_VERSION_AGE@ -LIB_VERSION_CURRENT = @LIB_VERSION_CURRENT@ -LIB_VERSION_REVISION = @LIB_VERSION_REVISION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MHD_LIBDEPS = @MHD_LIBDEPS@ -MHD_LIBDEPS_PKGCFG = @MHD_LIBDEPS_PKGCFG@ -MHD_LIB_CFLAGS = @MHD_LIB_CFLAGS@ -MHD_LIB_CPPFLAGS = @MHD_LIB_CPPFLAGS@ -MHD_LIB_LDFLAGS = @MHD_LIB_LDFLAGS@ -MHD_REQ_PRIVATE = @MHD_REQ_PRIVATE@ -MKDIR_P = @MKDIR_P@ -MS_LIB_TOOL = @MS_LIB_TOOL@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCLUDES = @OPENSSL_INCLUDES@ -OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ -PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ -PACKAGE_VERSION_SUBMINOR = @PACKAGE_VERSION_SUBMINOR@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPDY_LIBDEPS = @SPDY_LIBDEPS@ -SPDY_LIB_CFLAGS = @SPDY_LIB_CFLAGS@ -SPDY_LIB_CPPFLAGS = @SPDY_LIB_CPPFLAGS@ -SPDY_LIB_LDFLAGS = @SPDY_LIB_LDFLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -_libcurl_config = @_libcurl_config@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -ax_pthread_config = @ax_pthread_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -have_socat = @have_socat@ -have_zzuf = @have_zzuf@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_cv_objdir = @lt_cv_objdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# This Makefile.am is in the public domain -SUBDIRS = . -@USE_COVERAGE_TRUE@AM_CFLAGS = -fprofile-arcs -ftest-coverage -AM_CPPFLAGS = -I$(top_srcdir)/src/include \ - $(LIBCURL_CPPFLAGS) - -EXTRA_DIST = README socat.c -TESTS = $(check_PROGRAMS) -test_get_SOURCES = \ - test_get.c - -test_get_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_get_chunked_SOURCES = \ - test_get_chunked.c - -test_get_chunked_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_post_SOURCES = \ - test_post.c - -test_post_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_post_form_SOURCES = \ - test_post_form.c - -test_post_form_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put_SOURCES = \ - test_put.c - -test_put_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put_chunked_SOURCES = \ - test_put_chunked.c - -test_put_chunked_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put_large_SOURCES = \ - test_put_large.c - -test_put_large_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_get11_SOURCES = \ - test_get.c - -test_get11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_post11_SOURCES = \ - test_post.c - -test_post11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_post_form11_SOURCES = \ - test_post_form.c - -test_post_form11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put11_SOURCES = \ - test_put.c - -test_put11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_put_large11_SOURCES = \ - test_put_large.c - -test_put_large11_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -test_long_header_SOURCES = \ - test_long_header.c - -test_long_header_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la \ - @LIBCURL@ - -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/testzzuf/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/testzzuf/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -test_get$(EXEEXT): $(test_get_OBJECTS) $(test_get_DEPENDENCIES) $(EXTRA_test_get_DEPENDENCIES) - @rm -f test_get$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_get_OBJECTS) $(test_get_LDADD) $(LIBS) - -test_get11$(EXEEXT): $(test_get11_OBJECTS) $(test_get11_DEPENDENCIES) $(EXTRA_test_get11_DEPENDENCIES) - @rm -f test_get11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_get11_OBJECTS) $(test_get11_LDADD) $(LIBS) - -test_get_chunked$(EXEEXT): $(test_get_chunked_OBJECTS) $(test_get_chunked_DEPENDENCIES) $(EXTRA_test_get_chunked_DEPENDENCIES) - @rm -f test_get_chunked$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_get_chunked_OBJECTS) $(test_get_chunked_LDADD) $(LIBS) - -test_long_header$(EXEEXT): $(test_long_header_OBJECTS) $(test_long_header_DEPENDENCIES) $(EXTRA_test_long_header_DEPENDENCIES) - @rm -f test_long_header$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_long_header_OBJECTS) $(test_long_header_LDADD) $(LIBS) - -test_post$(EXEEXT): $(test_post_OBJECTS) $(test_post_DEPENDENCIES) $(EXTRA_test_post_DEPENDENCIES) - @rm -f test_post$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_post_OBJECTS) $(test_post_LDADD) $(LIBS) - -test_post11$(EXEEXT): $(test_post11_OBJECTS) $(test_post11_DEPENDENCIES) $(EXTRA_test_post11_DEPENDENCIES) - @rm -f test_post11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_post11_OBJECTS) $(test_post11_LDADD) $(LIBS) - -test_post_form$(EXEEXT): $(test_post_form_OBJECTS) $(test_post_form_DEPENDENCIES) $(EXTRA_test_post_form_DEPENDENCIES) - @rm -f test_post_form$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_post_form_OBJECTS) $(test_post_form_LDADD) $(LIBS) - -test_post_form11$(EXEEXT): $(test_post_form11_OBJECTS) $(test_post_form11_DEPENDENCIES) $(EXTRA_test_post_form11_DEPENDENCIES) - @rm -f test_post_form11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_post_form11_OBJECTS) $(test_post_form11_LDADD) $(LIBS) - -test_put$(EXEEXT): $(test_put_OBJECTS) $(test_put_DEPENDENCIES) $(EXTRA_test_put_DEPENDENCIES) - @rm -f test_put$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_put_OBJECTS) $(test_put_LDADD) $(LIBS) - -test_put11$(EXEEXT): $(test_put11_OBJECTS) $(test_put11_DEPENDENCIES) $(EXTRA_test_put11_DEPENDENCIES) - @rm -f test_put11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_put11_OBJECTS) $(test_put11_LDADD) $(LIBS) - -test_put_chunked$(EXEEXT): $(test_put_chunked_OBJECTS) $(test_put_chunked_DEPENDENCIES) $(EXTRA_test_put_chunked_DEPENDENCIES) - @rm -f test_put_chunked$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_put_chunked_OBJECTS) $(test_put_chunked_LDADD) $(LIBS) - -test_put_large$(EXEEXT): $(test_put_large_OBJECTS) $(test_put_large_DEPENDENCIES) $(EXTRA_test_put_large_DEPENDENCIES) - @rm -f test_put_large$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_put_large_OBJECTS) $(test_put_large_LDADD) $(LIBS) - -test_put_large11$(EXEEXT): $(test_put_large11_OBJECTS) $(test_put_large11_DEPENDENCIES) $(EXTRA_test_put_large11_DEPENDENCIES) - @rm -f test_put_large11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_put_large11_OBJECTS) $(test_put_large11_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_get.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_get_chunked.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_long_header.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_post.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_post_form.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_put.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_put_chunked.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_put_large.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -# Recover from deleted '.trs' file; this should ensure that -# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create -# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells -# to avoid problems with "make -n". -.log.trs: - rm -f $< $@ - $(MAKE) $(AM_MAKEFLAGS) $< - -# Leading 'am--fnord' is there to ensure the list of targets does not -# expand to empty, as could happen e.g. with make check TESTS=''. -am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) -am--force-recheck: - @: - -$(TEST_SUITE_LOG): $(TEST_LOGS) - @$(am__set_TESTS_bases); \ - am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ - redo_bases=`for i in $$bases; do \ - am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ - done`; \ - if test -n "$$redo_bases"; then \ - redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ - redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ - if $(am__make_dryrun); then :; else \ - rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ - fi; \ - fi; \ - if test -n "$$am__remaking_logs"; then \ - echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ - "recursion detected" >&2; \ - else \ - am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ - fi; \ - if $(am__make_dryrun); then :; else \ - st=0; \ - errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ - for i in $$redo_bases; do \ - test -f $$i.trs && test -r $$i.trs \ - || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ - test -f $$i.log && test -r $$i.log \ - || { echo "$$errmsg $$i.log" >&2; st=1; }; \ - done; \ - test $$st -eq 0 || exit 1; \ - fi - @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ - ws='[ ]'; \ - results=`for b in $$bases; do echo $$b.trs; done`; \ - test -n "$$results" || results=/dev/null; \ - all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ - pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ - fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ - skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ - xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ - xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ - error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ - if test `expr $$fail + $$xpass + $$error` -eq 0; then \ - success=true; \ - else \ - success=false; \ - fi; \ - br='==================='; br=$$br$$br$$br$$br; \ - result_count () \ - { \ - if test x"$$1" = x"--maybe-color"; then \ - maybe_colorize=yes; \ - elif test x"$$1" = x"--no-color"; then \ - maybe_colorize=no; \ - else \ - echo "$@: invalid 'result_count' usage" >&2; exit 4; \ - fi; \ - shift; \ - desc=$$1 count=$$2; \ - if test $$maybe_colorize = yes && test $$count -gt 0; then \ - color_start=$$3 color_end=$$std; \ - else \ - color_start= color_end=; \ - fi; \ - echo "$${color_start}# $$desc $$count$${color_end}"; \ - }; \ - create_testsuite_report () \ - { \ - result_count $$1 "TOTAL:" $$all "$$brg"; \ - result_count $$1 "PASS: " $$pass "$$grn"; \ - result_count $$1 "SKIP: " $$skip "$$blu"; \ - result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ - result_count $$1 "FAIL: " $$fail "$$red"; \ - result_count $$1 "XPASS:" $$xpass "$$red"; \ - result_count $$1 "ERROR:" $$error "$$mgn"; \ - }; \ - { \ - echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ - $(am__rst_title); \ - create_testsuite_report --no-color; \ - echo; \ - echo ".. contents:: :depth: 2"; \ - echo; \ - for b in $$bases; do echo $$b; done \ - | $(am__create_global_log); \ - } >$(TEST_SUITE_LOG).tmp || exit 1; \ - mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ - if $$success; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ - fi; \ - echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ - echo "$${col}$$br$${std}"; \ - create_testsuite_report --maybe-color; \ - echo "$$col$$br$$std"; \ - if $$success; then :; else \ - echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ - if test -n "$(PACKAGE_BUGREPORT)"; then \ - echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ - fi; \ - echo "$$col$$br$$std"; \ - fi; \ - $$success || exit 1 - -check-TESTS: - @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list - @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - log_list=`for i in $$bases; do echo $$i.log; done`; \ - trs_list=`for i in $$bases; do echo $$i.trs; done`; \ - log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ - exit $$?; -recheck: all $(check_PROGRAMS) - @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - @set +e; $(am__set_TESTS_bases); \ - bases=`for i in $$bases; do echo $$i; done \ - | $(am__list_recheck_tests)` || exit 1; \ - log_list=`for i in $$bases; do echo $$i.log; done`; \ - log_list=`echo $$log_list`; \ - $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ - am__force_recheck=am--force-recheck \ - TEST_LOGS="$$log_list"; \ - exit $$? -test_get.log: test_get$(EXEEXT) - @p='test_get$(EXEEXT)'; \ - b='test_get'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_get_chunked.log: test_get_chunked$(EXEEXT) - @p='test_get_chunked$(EXEEXT)'; \ - b='test_get_chunked'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_post.log: test_post$(EXEEXT) - @p='test_post$(EXEEXT)'; \ - b='test_post'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_post_form.log: test_post_form$(EXEEXT) - @p='test_post_form$(EXEEXT)'; \ - b='test_post_form'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_put.log: test_put$(EXEEXT) - @p='test_put$(EXEEXT)'; \ - b='test_put'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_put_chunked.log: test_put_chunked$(EXEEXT) - @p='test_put_chunked$(EXEEXT)'; \ - b='test_put_chunked'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_put_large.log: test_put_large$(EXEEXT) - @p='test_put_large$(EXEEXT)'; \ - b='test_put_large'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_get11.log: test_get11$(EXEEXT) - @p='test_get11$(EXEEXT)'; \ - b='test_get11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_post11.log: test_post11$(EXEEXT) - @p='test_post11$(EXEEXT)'; \ - b='test_post11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_post_form11.log: test_post_form11$(EXEEXT) - @p='test_post_form11$(EXEEXT)'; \ - b='test_post_form11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_put11.log: test_put11$(EXEEXT) - @p='test_put11$(EXEEXT)'; \ - b='test_put11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_put_large11.log: test_put_large11$(EXEEXT) - @p='test_put_large11$(EXEEXT)'; \ - b='test_put_large11'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test_long_header.log: test_long_header$(EXEEXT) - @p='test_long_header$(EXEEXT)'; \ - b='test_long_header'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -.test.log: - @p='$<'; \ - $(am__set_b); \ - $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -@am__EXEEXT_TRUE@.test$(EXEEXT).log: -@am__EXEEXT_TRUE@ @p='$<'; \ -@am__EXEEXT_TRUE@ $(am__set_b); \ -@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ -@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ -@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ -@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) - -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) - -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) check-am install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ - clean-libtool cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ - uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/README b/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/README deleted file mode 100644 index 5ee15698..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/README +++ /dev/null @@ -1,13 +0,0 @@ -Testcases in this directory require zzuf and socat. - -zzuf is used to randomly mess with the TCP connection between the CURL -clients and the MHD server. The goal is to expose problems in MHD's -error handling (by introducing random syntax errors). socat is -used to listen on port 11081 and forward the randomzied stream to -port 11080 where MHD is waiting. - -As a result, the testcases in this directory do NOT check that -whatever CURL returns is what was expected -- random modifications to -the TCP stream can have random effects ;-). Testcases "fail" if the -code crashes or hangs indefinitely. - diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/socat.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/socat.c deleted file mode 100644 index 8743dc9b..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/socat.c +++ /dev/null @@ -1,114 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file socat.c - * @brief Code to fork-exec zzuf and start the socat process - * @author Christian Grothoff - */ - -#include -#include -#include -#include - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif /* !WIN32_LEAN_AND_MEAN */ -#include -#endif - - -/** - * A larger loop count will run more random tests -- - * which would be good, except that it may take too - * long for most user's patience. So this small - * value is the default. - */ -#define LOOP_COUNT 10 - -#define CURL_TIMEOUT 50L - -static pid_t zzuf_pid; - -static void -zzuf_socat_start () -{ - int status; - char *const args[] = { - "zzuf", - "--ratio=0.0:0.75", - "-n", - "-A", - "--", - "socat", - "-lf", - "/dev/null", - "TCP4-LISTEN:11081,reuseaddr,fork", - "TCP4:127.0.0.1:11080", - NULL, - }; - zzuf_pid = fork (); - if (zzuf_pid == -1) - { - fprintf (stderr, "fork failed: %s\n", strerror (errno)); - exit (1); - } - if (zzuf_pid != 0) - { - sleep (1); /* allow zzuf and socat to start */ - status = 0; - if (0 < waitpid (zzuf_pid, &status, WNOHANG)) - { - if (WIFEXITED (status)) - fprintf (stderr, - "zzuf died with status code %d!\n", - WEXITSTATUS (status)); - if (WIFSIGNALED (status)) - fprintf (stderr, - "zzuf died from signal %d!\n", WTERMSIG (status)); - exit (1); - } - return; - } - setpgrp (); - execvp ("zzuf", args); - fprintf (stderr, "execution of `zzuf' failed: %s\n", strerror (errno)); - zzuf_pid = 0; /* fork failed */ - exit (1); -} - - -static void -zzuf_socat_stop () -{ - int status; - if (zzuf_pid != 0) - { - if (0 != killpg (zzuf_pid, SIGINT)) - fprintf (stderr, "Failed to killpg: %s\n", strerror (errno)); - kill (zzuf_pid, SIGINT); - waitpid (zzuf_pid, &status, 0); - sleep (1); /* allow socat to also die in peace */ - } -} - -/* end of socat.c */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_get.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_get.c deleted file mode 100644 index 47cbe120..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_get.c +++ /dev/null @@ -1,314 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_get.c - * @brief Testcase for libmicrohttpd GET operations - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#include "socat.c" - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int ptr; - const char *me = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&ptr != *unused) - { - *unused = &ptr; - return MHD_YES; - } - *unused = NULL; - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - if (ret == MHD_NO) - abort (); - return ret; -} - - -static int -testInternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 1; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - -static int -testMultithreadedGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION /* | MHD_USE_DEBUG */ , - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 16; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - int max; - int running; - time_t start; - struct timeval tv; - int i; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ , - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 256; - multi = curl_multi_init (); - if (multi == NULL) - { - MHD_stop_daemon (d); - return 512; - } - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (c != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - curl_multi_info_read (multi, &running); - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - c = NULL; - } - MHD_run (d); - } - if (c != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - } - } - fprintf (stderr, "\n"); - curl_multi_cleanup (multi); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalGet (); - errorCount += testMultithreadedGet (); - errorCount += testExternalGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_get_chunked.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_get_chunked.c deleted file mode 100644 index faa2632f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_get_chunked.c +++ /dev/null @@ -1,330 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_get_chunked.c - * @brief Testcase for libmicrohttpd GET operations with chunked content encoding - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#include "socat.c" - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -/** - * MHD content reader callback that returns - * data in chunks. - */ -static ssize_t -crc (void *cls, uint64_t pos, char *buf, size_t max) -{ - struct MHD_Response **responseptr = cls; - - if (pos == 128 * 10) - { - MHD_add_response_header (*responseptr, "Footer", "working"); - return MHD_CONTENT_READER_END_OF_STREAM; - } - if (max < 128) - abort (); /* should not happen in this testcase... */ - memset (buf, 'A' + (pos / 128), 128); - return 128; -} - -/** - * Dummy function that does nothing. - */ -static void -crcf (void *ptr) -{ - free (ptr); -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, void **ptr) -{ - static int aptr; - const char *me = cls; - struct MHD_Response *response; - struct MHD_Response **responseptr; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - if (&aptr != *ptr) - { - /* do never respond on first call */ - *ptr = &aptr; - return MHD_YES; - } - responseptr = malloc (sizeof (struct MHD_Response *)); - response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, - 1024, - &crc, responseptr, &crcf); - *responseptr = response; - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - -static int -testInternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 1; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - -static int -testMultithreadedGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION /* | MHD_USE_DEBUG */ , - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 16; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - - -static int -testExternalGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - int max; - int running; - time_t start; - struct timeval tv; - int i; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ , - 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); - if (d == NULL) - return 256; - multi = curl_multi_init (); - if (multi == NULL) - { - MHD_stop_daemon (d); - return 512; - } - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (c != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - curl_multi_info_read (multi, &running); - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - c = NULL; - } - MHD_run (d); - } - if (c != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - } - } - fprintf (stderr, "\n"); - curl_multi_cleanup (multi); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalGet (); - errorCount += testMultithreadedGet (); - errorCount += testExternalGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_long_header.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_long_header.c deleted file mode 100644 index 20041380..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_long_header.c +++ /dev/null @@ -1,234 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_long_header.c - * @brief Testcase for libmicrohttpd handling of very long headers - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#include "socat.c" - -/** - * We will set the memory available per connection to - * half of this value, so the actual value does not have - * to be big at all... - */ -#define VERY_LONG (1024*10) - -static int oneone; - -static int -apc_all (void *cls, const struct sockaddr *addr, socklen_t addrlen) -{ - return MHD_YES; -} - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - const char *me = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp (me, method)) - return MHD_NO; /* unexpected method */ - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -static int -testLongUrlGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - char *url; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , - 11080, - &apc_all, - NULL, - &ahc_echo, - "GET", - MHD_OPTION_CONNECTION_MEMORY_LIMIT, - (size_t) (VERY_LONG / 2), MHD_OPTION_END); - - if (d == NULL) - return 1; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - - c = curl_easy_init (); - url = malloc (VERY_LONG); - memset (url, 'a', VERY_LONG); - url[VERY_LONG - 1] = '\0'; - memcpy (url, "http://localhost:11081/", - strlen ("http://localhost:11081/")); - curl_easy_setopt (c, CURLOPT_URL, url); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - - MHD_stop_daemon (d); - free (url); - return 0; -} - - -static int -testLongHeaderGet () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - char *url; - struct curl_slist *header = NULL; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , - 11080, - &apc_all, - NULL, - &ahc_echo, - "GET", - MHD_OPTION_CONNECTION_MEMORY_LIMIT, - (size_t) (VERY_LONG / 2), MHD_OPTION_END); - if (d == NULL) - return 16; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - url = malloc (VERY_LONG); - memset (url, 'a', VERY_LONG); - url[VERY_LONG - 1] = '\0'; - url[VERY_LONG / 2] = ':'; - url[VERY_LONG / 2 + 1] = ' '; - header = curl_slist_append (header, url); - - curl_easy_setopt (c, CURLOPT_HTTPHEADER, header); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_slist_free_all (header); - header = NULL; - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - - MHD_stop_daemon (d); - free (url); - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testLongUrlGet (); - errorCount += testLongHeaderGet (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_post.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_post.c deleted file mode 100644 index 632609fb..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_post.c +++ /dev/null @@ -1,394 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_post.c - * @brief Testcase for libmicrohttpd POST operations using URL-encoding - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - - -#include "socat.c" - -#define POST_DATA "name=daniel&project=curl" - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - - -static void -completed_cb (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct MHD_PostProcessor *pp = *con_cls; - - if (NULL != pp) - MHD_destroy_post_processor (pp); - *con_cls = NULL; -} - - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - - -/** - * Note that this post_iterator is not perfect - * in that it fails to support incremental processing. - * (to be fixed in the future) - */ -static int -post_iterator (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *value, uint64_t off, size_t size) -{ - int *eok = cls; - - if ((0 == strcmp (key, "name")) && - (size == strlen ("daniel")) && (0 == strncmp (value, "daniel", size))) - (*eok) |= 1; - if ((0 == strcmp (key, "project")) && - (size == strlen ("curl")) && (0 == strncmp (value, "curl", size))) - (*eok) |= 2; - return MHD_YES; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int eok; - struct MHD_Response *response; - struct MHD_PostProcessor *pp; - int ret; - - if (0 != strcmp ("POST", method)) - { - return MHD_NO; /* unexpected method */ - } - pp = *unused; - if (pp == NULL) - { - eok = 0; - pp = MHD_create_post_processor (connection, 1024, &post_iterator, &eok); - *unused = pp; - } - MHD_post_process (pp, upload_data, *upload_data_size); - if ((eok == 3) && (0 == *upload_data_size)) - { - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - MHD_destroy_post_processor (pp); - *unused = NULL; - return ret; - } - *upload_data_size = 0; - return MHD_YES; -} - - -static int -testInternalPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , - 11080, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 1; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - - return 0; -} - -static int -testMultithreadedPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION /* | MHD_USE_DEBUG */ , - 11080, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 16; - - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - - MHD_stop_daemon (d); - return 0; -} - - -static int -testExternalPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - int max; - int running; - time_t start; - struct timeval tv; - int i; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ , - 1082, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 256; - multi = curl_multi_init (); - if (multi == NULL) - { - MHD_stop_daemon (d); - return 512; - } - - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:1082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_POSTFIELDS, POST_DATA); - curl_easy_setopt (c, CURLOPT_POSTFIELDSIZE, strlen (POST_DATA)); - curl_easy_setopt (c, CURLOPT_POST, 1L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (c != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - curl_multi_info_read (multi, &running); - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - c = NULL; - } - MHD_run (d); - } - if (c != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - } - - } - fprintf (stderr, "\n"); - curl_multi_cleanup (multi); - zzuf_socat_stop (); - - MHD_stop_daemon (d); - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalPost (); - errorCount += testMultithreadedPost (); - errorCount += testExternalPost (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_post_form.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_post_form.c deleted file mode 100644 index 3e2cdffe..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_post_form.c +++ /dev/null @@ -1,410 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_post_form.c - * @brief Testcase for libmicrohttpd POST operations using multipart/postform data - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - - -#include "socat.c" - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - - -static void -completed_cb (void *cls, - struct MHD_Connection *connection, - void **con_cls, - enum MHD_RequestTerminationCode toe) -{ - struct MHD_PostProcessor *pp = *con_cls; - - if (NULL != pp) - MHD_destroy_post_processor (pp); - *con_cls = NULL; -} - - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -/** - * Note that this post_iterator is not perfect - * in that it fails to support incremental processing. - * (to be fixed in the future) - */ -static int -post_iterator (void *cls, - enum MHD_ValueKind kind, - const char *key, - const char *filename, - const char *content_type, - const char *transfer_encoding, - const char *value, uint64_t off, size_t size) -{ - int *eok = cls; - - if (key == NULL) - return MHD_YES; -#if 0 - fprintf (stderr, "PI sees %s-%.*s\n", key, size, value); -#endif - if ((0 == strcmp (key, "name")) && - (size == strlen ("daniel")) && (0 == strncmp (value, "daniel", size))) - (*eok) |= 1; - if ((0 == strcmp (key, "project")) && - (size == strlen ("curl")) && (0 == strncmp (value, "curl", size))) - (*eok) |= 2; - return MHD_YES; -} - - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - static int eok; - struct MHD_Response *response; - struct MHD_PostProcessor *pp; - int ret; - - if (0 != strcmp ("POST", method)) - { - return MHD_NO; /* unexpected method */ - } - pp = *unused; - if (pp == NULL) - { - eok = 0; - pp = MHD_create_post_processor (connection, 1024, &post_iterator, &eok); - if (pp == NULL) - return MHD_NO; - *unused = pp; - } - MHD_post_process (pp, upload_data, *upload_data_size); - if ((eok == 3) && (0 == *upload_data_size)) - { - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - MHD_destroy_post_processor (pp); - *unused = NULL; - return ret; - } - *upload_data_size = 0; - return MHD_YES; -} - -static struct curl_httppost * -make_form () -{ - struct curl_httppost *post = NULL; - struct curl_httppost *last = NULL; - - curl_formadd (&post, &last, CURLFORM_COPYNAME, "name", - CURLFORM_COPYCONTENTS, "daniel", CURLFORM_END); - curl_formadd (&post, &last, CURLFORM_COPYNAME, "project", - CURLFORM_COPYCONTENTS, "curl", CURLFORM_END); - return post; -} - - -static int -testInternalPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - int i; - struct curl_httppost *pd; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , - 11080, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 1; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - pd = make_form (); - curl_easy_setopt (c, CURLOPT_HTTPPOST, pd); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - curl_formfree (pd); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - - -static int -testMultithreadedPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - int i; - struct curl_httppost *pd; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION /* | MHD_USE_DEBUG */ , - 11080, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 16; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - pd = make_form (); - curl_easy_setopt (c, CURLOPT_HTTPPOST, pd); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - curl_formfree (pd); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - - -static int -testExternalPost () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - int max; - int running; - time_t start; - struct timeval tv; - struct curl_httppost *pd; - int i; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ , - 1082, NULL, NULL, &ahc_echo, NULL, - MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, - MHD_OPTION_END); - if (d == NULL) - return 256; - multi = curl_multi_init (); - if (multi == NULL) - { - MHD_stop_daemon (d); - return 512; - } - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:1082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - pd = make_form (); - curl_easy_setopt (c, CURLOPT_HTTPPOST, pd); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_formfree (pd); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (c != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - curl_formfree (pd); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - curl_formfree (pd); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - curl_multi_info_read (multi, &running); - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - c = NULL; - } - MHD_run (d); - } - if (c != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - } - curl_formfree (pd); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - - MHD_stop_daemon (d); - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalPost (); - errorCount += testMultithreadedPost (); - errorCount += testExternalPost (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_put.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_put.c deleted file mode 100644 index c6240c44..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_put.c +++ /dev/null @@ -1,361 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_put.c - * @brief Testcase for libmicrohttpd PUT operations - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - - -#include "socat.c" - -static int oneone; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -putBuffer (void *stream, size_t size, size_t nmemb, void *ptr) -{ - unsigned int *pos = ptr; - unsigned int wrt; - - wrt = size * nmemb; - if (wrt > 8 - (*pos)) - wrt = 8 - (*pos); - memcpy (stream, &("Hello123"[*pos]), wrt); - (*pos) += wrt; - return wrt; -} - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - int *done = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp ("PUT", method)) - return MHD_NO; /* unexpected method */ - if ((*done) == 0) - { - if (*upload_data_size != 8) - return MHD_YES; /* not yet ready */ - if (0 == memcmp (upload_data, "Hello123", 8)) - { - *upload_data_size = 0; - } - else - { - printf ("Invalid upload data `%8s'!\n", upload_data); - return MHD_NO; - } - *done = 1; - return MHD_YES; - } - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -static int -testInternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , - 11080, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 1; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - -static int -testMultithreadedPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION /* | MHD_USE_DEBUG */ , - 11080, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 16; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - - -static int -testExternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - int max; - int running; - time_t start; - struct timeval tv; - unsigned int pos = 0; - int done_flag = 0; - int i; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ , - 11080, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 256; - multi = curl_multi_init (); - if (multi == NULL) - { - MHD_stop_daemon (d); - return 512; - } - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (c != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - curl_multi_info_read (multi, &running); - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - c = NULL; - } - MHD_run (d); - } - if (c != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - } - } - fprintf (stderr, "\n"); - curl_multi_cleanup (multi); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalPut (); - errorCount += testMultithreadedPut (); - errorCount += testExternalPut (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_put_chunked.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_put_chunked.c deleted file mode 100644 index c023c5ee..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_put_chunked.c +++ /dev/null @@ -1,371 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file daemontest_put_chunked.c - * @brief Testcase for libmicrohttpd PUT operations with chunked encoding - * for the upload data - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#include "socat.c" - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -putBuffer (void *stream, size_t size, size_t nmemb, void *ptr) -{ - unsigned int *pos = ptr; - unsigned int wrt; - - wrt = size * nmemb; - if (wrt > 8 - (*pos)) - wrt = 8 - (*pos); - if (wrt > 4) - wrt = 4; /* only send half at first => force multiple chunks! */ - memcpy (stream, &("Hello123"[*pos]), wrt); - (*pos) += wrt; - return wrt; -} - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - int *done = cls; - struct MHD_Response *response; - int ret; - int have; - - if (0 != strcmp ("PUT", method)) - return MHD_NO; /* unexpected method */ - if ((*done) < 8) - { - have = *upload_data_size; - if (have + *done > 8) - { - return MHD_NO; - } - if (0 == memcmp (upload_data, &"Hello123"[*done], have)) - { - *done += have; - *upload_data_size = 0; - } - else - { - return MHD_NO; - } -#if 0 - fprintf (stderr, "Not ready for response: %u/%u\n", *done, 8); -#endif - return MHD_YES; - } - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -static int -testInternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, - 11080, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 1; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11080/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - /* - // by not giving the file size, we force chunking! - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - */ - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - -static int -testMultithreadedPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - CURLcode errornum; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, - 11081, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 16; - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - /* - // by not giving the file size, we force chunking! - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - */ - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - if (CURLE_OK != (errornum = curl_easy_perform (c))) - { - fprintf (stderr, - "curl_easy_perform failed: `%s'\n", - curl_easy_strerror (errornum)); - curl_easy_cleanup (c); - MHD_stop_daemon (d); - return 32; - } - curl_easy_cleanup (c); - MHD_stop_daemon (d); - if (cbc.pos != strlen ("/hello_world")) - return 64; - if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world"))) - return 128; - - return 0; -} - - -static int -testExternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - char buf[2048]; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - int max; - int running; - time_t start; - struct timeval tv; - unsigned int pos = 0; - int done_flag = 0; - int i; - - multi = NULL; - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_DEBUG, - 11082, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 256; - - multi = curl_multi_init (); - if (multi == NULL) - { - MHD_stop_daemon (d); - return 512; - } - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11082/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - /* - // by not giving the file size, we force chunking! - curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); - */ - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (c != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - curl_multi_info_read (multi, &running); - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - c = NULL; - } - MHD_run (d); - } - if (c != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - } - } - fprintf (stderr, "\n"); - curl_multi_cleanup (multi); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - errorCount += testInternalPut (); - errorCount += testMultithreadedPut (); - errorCount += testExternalPut (); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_put_large.c b/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_put_large.c deleted file mode 100644 index 1fdc92a9..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/src/testzzuf/test_put_large.c +++ /dev/null @@ -1,382 +0,0 @@ -/* - This file is part of libmicrohttpd - Copyright (C) 2007, 2008 Christian Grothoff - - libmicrohttpd 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, or (at your - option) any later version. - - libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -/** - * @file test_put_large.c - * @brief Testcase for libmicrohttpd PUT operations - * @author Christian Grothoff - */ - -#include "MHD_config.h" -#include "platform.h" -#include -#include -#include -#include -#include - -#ifndef WINDOWS -#include -#endif - -#include "socat.c" - -static int oneone; - -/** - * Do not make this much larger since we will hit the - * MHD default buffer limit and the test code is not - * written for incremental upload processing... - */ -#define PUT_SIZE (256 * 1024) - -static char *put_buffer; - -struct CBC -{ - char *buf; - size_t pos; - size_t size; -}; - -static size_t -putBuffer (void *stream, size_t size, size_t nmemb, void *ptr) -{ - unsigned int *pos = ptr; - unsigned int wrt; - - wrt = size * nmemb; - if (wrt > PUT_SIZE - (*pos)) - wrt = PUT_SIZE - (*pos); - memcpy (stream, &put_buffer[*pos], wrt); - (*pos) += wrt; - return wrt; -} - -static size_t -copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) -{ - struct CBC *cbc = ctx; - - if (cbc->pos + size * nmemb > cbc->size) - return 0; /* overflow */ - memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb); - cbc->pos += size * nmemb; - return size * nmemb; -} - -static int -ahc_echo (void *cls, - struct MHD_Connection *connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, size_t *upload_data_size, - void **unused) -{ - int *done = cls; - struct MHD_Response *response; - int ret; - - if (0 != strcmp ("PUT", method)) - return MHD_NO; /* unexpected method */ - if ((*done) == 0) - { - if (*upload_data_size != PUT_SIZE) - { -#if 0 - fprintf (stderr, - "Waiting for more data (%u/%u)...\n", - *upload_data_size, PUT_SIZE); -#endif - return MHD_YES; /* not yet ready */ - } - if (0 == memcmp (upload_data, put_buffer, PUT_SIZE)) - { - *upload_data_size = 0; - } - else - { - return MHD_NO; - } - *done = 1; - return MHD_YES; - } - response = MHD_create_response_from_buffer (strlen (url), - (void *) url, - MHD_RESPMEM_MUST_COPY); - ret = MHD_queue_response (connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return ret; -} - - -static int -testInternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - char buf[2048]; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , - 11080, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 1; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE, (long) PUT_SIZE); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - -static int -testMultithreadedPut () -{ - struct MHD_Daemon *d; - CURL *c; - struct CBC cbc; - unsigned int pos = 0; - int done_flag = 0; - char buf[2048]; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION /* | MHD_USE_DEBUG */ , - 11080, - NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); - if (d == NULL) - return 16; - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE, (long) PUT_SIZE); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - curl_easy_perform (c); - curl_easy_cleanup (c); - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 0; -} - - -static int -testExternalPut () -{ - struct MHD_Daemon *d; - CURL *c; - struct CBC cbc; - CURLM *multi; - CURLMcode mret; - fd_set rs; - fd_set ws; - fd_set es; - int max; - int running; - time_t start; - struct timeval tv; - unsigned int pos = 0; - int done_flag = 0; - char buf[2048]; - int i; - - cbc.buf = buf; - cbc.size = 2048; - cbc.pos = 0; - multi = NULL; - d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */, - 11080, - NULL, NULL, &ahc_echo, &done_flag, - MHD_OPTION_CONNECTION_MEMORY_LIMIT, - (size_t) (PUT_SIZE * 4), MHD_OPTION_END); - if (d == NULL) - return 256; - multi = curl_multi_init (); - if (multi == NULL) - { - MHD_stop_daemon (d); - return 512; - } - zzuf_socat_start (); - for (i = 0; i < LOOP_COUNT; i++) - { - fprintf (stderr, "."); - - c = curl_easy_init (); - curl_easy_setopt (c, CURLOPT_URL, "http://localhost:11081/hello_world"); - curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); - curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); - curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); - curl_easy_setopt (c, CURLOPT_READDATA, &pos); - curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (c, CURLOPT_INFILESIZE, (long) PUT_SIZE); - curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); - if (oneone) - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); - else - curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); - curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); - // NOTE: use of CONNECTTIMEOUT without also - // setting NOSIGNAL results in really weird - // crashes on my system! - curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); - - - - mret = curl_multi_add_handle (multi, c); - if (mret != CURLM_OK) - { - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 1024; - } - start = time (NULL); - while ((time (NULL) - start < 5) && (c != NULL)) - { - max = 0; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); - if (mret != CURLM_OK) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 2048; - } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) - { - curl_multi_remove_handle (multi, c); - curl_multi_cleanup (multi); - curl_easy_cleanup (c); - zzuf_socat_stop (); - MHD_stop_daemon (d); - return 4096; - } - tv.tv_sec = 0; - tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); - curl_multi_perform (multi, &running); - if (running == 0) - { - curl_multi_info_read (multi, &running); - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - c = NULL; - } - MHD_run (d); - } - if (c != NULL) - { - curl_multi_remove_handle (multi, c); - curl_easy_cleanup (c); - } - } - fprintf (stderr, "\n"); - zzuf_socat_stop (); - curl_multi_cleanup (multi); - MHD_stop_daemon (d); - return 0; -} - - -int -main (int argc, char *const *argv) -{ - unsigned int errorCount = 0; - - oneone = (NULL != strrchr (argv[0], (int) '/')) ? - (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; - if (0 != curl_global_init (CURL_GLOBAL_WIN32)) - return 2; - put_buffer = malloc (PUT_SIZE); - memset (put_buffer, 1, PUT_SIZE); - errorCount += testInternalPut (); - errorCount += testMultithreadedPut (); - errorCount += testExternalPut (); - free (put_buffer); - if (errorCount != 0) - fprintf (stderr, "Error (code: %u)\n", errorCount); - curl_global_cleanup (); - return errorCount != 0; /* 0 == pass */ -} diff --git a/src/hos_libhttpserver/src/libmicrohttpd/test-driver b/src/hos_libhttpserver/src/libmicrohttpd/test-driver deleted file mode 100755 index d3060566..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/test-driver +++ /dev/null @@ -1,139 +0,0 @@ -#! /bin/sh -# test-driver - basic testsuite driver script. - -scriptversion=2013-07-13.22; # UTC - -# Copyright (C) 2011-2013 Free Software Foundation, Inc. -# -# 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, 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, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -# Make unconditional expansion of undefined variables an error. This -# helps a lot in preventing typo-related bugs. -set -u - -usage_error () -{ - echo "$0: $*" >&2 - print_usage >&2 - exit 2 -} - -print_usage () -{ - cat <$log_file 2>&1 -estatus=$? -if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 -fi - -case $estatus:$expect_failure in - 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; - 0:*) col=$grn res=PASS recheck=no gcopy=no;; - 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; - 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; - *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; - *:*) col=$red res=FAIL recheck=yes gcopy=yes;; -esac - -# Report outcome to console. -echo "${col}${res}${std}: $test_name" - -# Register the test result, and other relevant metadata. -echo ":test-result: $res" > $trs_file -echo ":global-test-result: $res" >> $trs_file -echo ":recheck: $recheck" >> $trs_file -echo ":copy-in-global-log: $gcopy" >> $trs_file - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/MHD_config.h b/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/MHD_config.h deleted file mode 100644 index 07f1fbbb..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/MHD_config.h +++ /dev/null @@ -1,134 +0,0 @@ -/* MHD_config.h for W32 */ -/* Created manually. */ - -/* *** Basic OS/compiler information *** */ - -/* This is a Windows system */ -#define WINDOWS 1 - -/* Define if MS VC compiler is used */ -#define MSVC 1 - -/* *** MHD configuration *** */ -/* Undef to disable feature */ - -/* Enable basic Auth support */ -#define BAUTH_SUPPORT 1 - -/* Enable digest Auth support */ -#define DAUTH_SUPPORT 1 - -/* Enable postprocessor.c */ -#define HAVE_POSTPROCESSOR 1 - -/* Enable error messages */ -#define HAVE_MESSAGES 1 - -/* Disable HTTPS support */ -#define HTTPS_SUPPORT 0 - - -/* *** OS features *** */ - -/* Provides IPv6 headers */ -#define HAVE_INET6 1 - -/* Define to use pair of sockets instead of pipes for signaling */ -#define MHD_DONT_USE_PIPES 1 - -/* define to use W32 threads */ -#define MHD_USE_W32_THREADS 1 - -#ifndef _WIN32_WINNT -/* MHD supports Windows XP and later W32 systems*/ -#define _WIN32_WINNT 0x0501 -#endif /* _WIN32_WINNT */ - -/* winsock poll is available only on Vista and later */ -#if _WIN32_WINNT >= 0x0600 -#define HAVE_POLL 1 -#endif /* _WIN32_WINNT >= 0x0600 */ - -/* define to 0 to disable epoll support */ -#define EPOLL_SUPPORT 0 - -/* Define to 1 if you have the header file. */ -#define HAVE_WINSOCK2_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_WS2TCPIP_H 1 - -/* Define to 1 if you have the declaration of `SOCK_NONBLOCK', and to 0 if you - don't. */ -#define HAVE_DECL_SOCK_NONBLOCK 0 - -/* Define to 1 if you have the declaration of `TCP_CORK', and to 0 if you - don't. */ -#define HAVE_DECL_TCP_CORK 0 - -/* Define to 1 if you have the declaration of `TCP_NOPUSH', and to 0 if you - don't. */ -#define HAVE_DECL_TCP_NOPUSH 0 - - -/* *** Headers information *** */ -/* Not really important as not used by code currently */ - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MATH_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_PTHREAD_H 0 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDIO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_TIME_H 1 - - -/* *** Other useful staff *** */ - -#define _GNU_SOURCE 1 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - - -/* End of MHD_config.h */ diff --git a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/gen_dll_res.ps1 b/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/gen_dll_res.ps1 deleted file mode 100644 index e51d1034..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/gen_dll_res.ps1 +++ /dev/null @@ -1,38 +0,0 @@ -param ([string]$BasePath = ".\") - -$Host.SetShouldExit(111) # Set non-zero return code until task successfully finished -$ErrorActionPreference = "Stop" # Stop on any error - -Remove-Variable MHD_ver,MHD_ver_major,MHD_ver_minor,MHD_ver_patchlev -ErrorAction:SilentlyContinue - -Write-Output "Processing: ${BasePath}..\..\configure.ac" -foreach($line in Get-Content "${BasePath}..\..\configure.ac") -{ - if ($line -match '^AC_INIT\(\[libmicrohttpd\],\[((\d+).(\d+).(\d+))\]') - { - [string]$MHD_ver = $Matches[1].ToString() - [string]$MHD_ver_major = $Matches[2].ToString() - [string]$MHD_ver_minor = $Matches[3].ToString() - [string]$MHD_ver_patchlev = $Matches[4].ToString() - break - } -} -if ("$MHD_ver" -eq "" -or "$MHD_ver_major" -eq "" -or "$MHD_ver_minor" -eq "" -or "$MHD_ver_patchlev" -eq "") -{ - Throw "Can't find MHD version in ${BasePath}..\..\configure.ac" -} - -Write-Output "Detected MHD version: $MHD_ver" - -Write-Output "Generating ${BasePath}microhttpd_dll_res_vc.rc" -Get-Content "${BasePath}microhttpd_dll_res_vc.rc.in" | ForEach-Object { - $_ -replace '@PACKAGE_VERSION_MAJOR@',"$MHD_ver_major" ` - -replace '@PACKAGE_VERSION_MINOR@', "$MHD_ver_minor" ` - -replace '@PACKAGE_VERSION_SUBMINOR@', "$MHD_ver_patchlev" ` - -replace '@PACKAGE_VERSION@', "$MHD_ver" -} | Out-File -FilePath "${BasePath}microhttpd_dll_res_vc.rc" -Force - -$Host.SetShouldExit(0) # Reset return code - -Write-Output "${BasePath}microhttpd_dll_res_vc.rc was generated " -exit 0 # Exit with success code diff --git a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/hellobrowser.vcxproj b/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/hellobrowser.vcxproj deleted file mode 100644 index df9d826f..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/hellobrowser.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - Debug-dll - Win32 - - - Debug-dll - x64 - - - Debug-static - Win32 - - - Debug-static - x64 - - - Release-dll - Win32 - - - Release-dll - x64 - - - Release-static - Win32 - - - Release-static - x64 - - - - - - - {310F39BD-A2D6-44FF-8344-37ADD0524CBD} - Win32Proj - hellobrowser - - - - Application - true - v120 - Unicode - - - Application - true - v120 - Unicode - - - Application - false - v120 - true - Unicode - - - Application - false - v120 - true - Unicode - - - - - - - - - - $(SolutionDir)..\..\src\include;$(SolutionDir);$(IncludePath) - - - $(SolutionDir)$(ProjectName)\$(Configuration)\ - $(SolutionDir)\Output\ - - - $(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\ - $(SolutionDir)\Output\$(Platform)\ - - - true - - - false - - - $(ProjectName)_d - - - $(ProjectName)-dll_d - - - $(ProjectName) - - - $(ProjectName)-dll - - - - NotUsing - Level3 - WIN32;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - - - - - - MaxSpeed - true - true - NDEBUG;%(PreprocessorDefinitions) - - - true - true - - - - - - MultiThreadedDebug - - - libmicrohttpd_d.lib;%(AdditionalDependencies) - - - - - - MultiThreadedDebugDLL - - - libmicrohttpd-dll_d.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - MultiThreaded - - - libmicrohttpd.lib;%(AdditionalDependencies) - - - - - MultiThreadedDLL - - - libmicrohttpd-dll.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - \ No newline at end of file diff --git a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/hellobrowser.vcxproj.filters b/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/hellobrowser.vcxproj.filters deleted file mode 100644 index 0e1e02f4..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/hellobrowser.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/libmicrohttpd.sln b/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/libmicrohttpd.sln deleted file mode 100644 index 3a18af3d..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/libmicrohttpd.sln +++ /dev/null @@ -1,101 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmicrohttpd", "libmicrohttpd.vcxproj", "{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hellobrowser", "hellobrowser.vcxproj", "{310F39BD-A2D6-44FF-8344-37ADD0524CBD}" - ProjectSection(ProjectDependencies) = postProject - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A} = {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug-dll|Win32 = Debug-dll|Win32 - Debug-dll|x64 = Debug-dll|x64 - Debug-dll-xp|Win32 = Debug-dll-xp|Win32 - Debug-dll-xp|x64 = Debug-dll-xp|x64 - Debug-static|Win32 = Debug-static|Win32 - Debug-static|x64 = Debug-static|x64 - Debug-static-xp|Win32 = Debug-static-xp|Win32 - Debug-static-xp|x64 = Debug-static-xp|x64 - Release-dll|Win32 = Release-dll|Win32 - Release-dll|x64 = Release-dll|x64 - Release-dll-xp|Win32 = Release-dll-xp|Win32 - Release-dll-xp|x64 = Release-dll-xp|x64 - Release-static|Win32 = Release-static|Win32 - Release-static|x64 = Release-static|x64 - Release-static-xp|Win32 = Release-static-xp|Win32 - Release-static-xp|x64 = Release-static-xp|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll|Win32.ActiveCfg = Debug-dll|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll|Win32.Build.0 = Debug-dll|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll|x64.ActiveCfg = Debug-dll|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll|x64.Build.0 = Debug-dll|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|Win32.ActiveCfg = Debug-dll-xp|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|Win32.Build.0 = Debug-dll-xp|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|x64.ActiveCfg = Debug-dll-xp|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|x64.Build.0 = Debug-dll-xp|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|Win32.ActiveCfg = Debug-static|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|Win32.Build.0 = Debug-static|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.ActiveCfg = Release-static|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.Build.0 = Release-static|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|Win32.ActiveCfg = Debug-static-xp|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|Win32.Build.0 = Debug-static-xp|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|x64.ActiveCfg = Debug-static-xp|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|x64.Build.0 = Debug-static-xp|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll|Win32.ActiveCfg = Release-dll|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll|Win32.Build.0 = Release-dll|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll|x64.ActiveCfg = Release-dll|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll|x64.Build.0 = Release-dll|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll-xp|Win32.ActiveCfg = Release-dll-xp|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll-xp|Win32.Build.0 = Release-dll-xp|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll-xp|x64.ActiveCfg = Release-dll-xp|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-dll-xp|x64.Build.0 = Release-dll-xp|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static|Win32.ActiveCfg = Release-static|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static|Win32.Build.0 = Release-static|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static|x64.ActiveCfg = Release-static|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static|x64.Build.0 = Release-static|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static-xp|Win32.ActiveCfg = Release-static-xp|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static-xp|Win32.Build.0 = Release-static-xp|Win32 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static-xp|x64.ActiveCfg = Release-static-xp|x64 - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Release-static-xp|x64.Build.0 = Release-static-xp|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll|Win32.ActiveCfg = Debug-dll|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll|Win32.Build.0 = Debug-dll|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll|x64.ActiveCfg = Debug-dll|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll|x64.Build.0 = Debug-dll|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|Win32.ActiveCfg = Debug-dll|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|Win32.Build.0 = Debug-dll|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|x64.ActiveCfg = Debug-dll|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|x64.Build.0 = Debug-dll|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|Win32.ActiveCfg = Debug-static|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|Win32.Build.0 = Debug-static|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.ActiveCfg = Release-static|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.Build.0 = Release-static|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|Win32.ActiveCfg = Debug-static|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|Win32.Build.0 = Debug-static|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|x64.ActiveCfg = Debug-static|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|x64.Build.0 = Debug-static|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll|Win32.ActiveCfg = Release-dll|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll|Win32.Build.0 = Release-dll|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll|x64.ActiveCfg = Release-dll|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll|x64.Build.0 = Release-dll|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll-xp|Win32.ActiveCfg = Release-dll|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll-xp|Win32.Build.0 = Release-dll|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll-xp|x64.ActiveCfg = Release-dll|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-dll-xp|x64.Build.0 = Release-dll|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static|Win32.ActiveCfg = Release-static|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static|Win32.Build.0 = Release-static|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static|x64.ActiveCfg = Release-static|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static|x64.Build.0 = Release-static|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static-xp|Win32.ActiveCfg = Release-static|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static-xp|Win32.Build.0 = Release-static|Win32 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static-xp|x64.ActiveCfg = Release-static|x64 - {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Release-static-xp|x64.Build.0 = Release-static|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj b/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj deleted file mode 100644 index 827f9b35..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj +++ /dev/null @@ -1,385 +0,0 @@ - - - - - Debug-dll-xp - Win32 - - - Debug-dll-xp - x64 - - - Debug-dll - Win32 - - - Debug-dll - x64 - - - Debug-static-xp - Win32 - - - Debug-static-xp - x64 - - - Debug-static - Win32 - - - Debug-static - x64 - - - Release-dll-xp - Win32 - - - Release-dll-xp - x64 - - - Release-dll - Win32 - - - Release-dll - x64 - - - Release-static-xp - Win32 - - - Release-static-xp - x64 - - - Release-static - Win32 - - - Release-static - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - true - true - - - - - true - true - true - true - true - true - true - true - false - false - false - false - false - false - false - false - Document - PowerShell.exe -Version 3.0 -NonInteractive -NoProfile -ExecutionPolicy Bypass -File "$(SolutionDir)gen_dll_res.ps1" -BasePath $(SolutionDir) - Generating .dll description resource - $(SolutionDir)microhttpd_dll_res_vc.rc - $(SolutionDir)gen_dll_res.ps1;$(SolutionDir).\..\..\configure.ac - - - - {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A} - Win32Proj - libmicrohttpd - - - - StaticLibrary - true - v120 - Unicode - - - StaticLibrary - true - v120_xp - Unicode - - - DynamicLibrary - true - v120 - Unicode - - - DynamicLibrary - true - v120_xp - Unicode - - - StaticLibrary - false - v120 - true - Unicode - - - StaticLibrary - false - v120_xp - true - Unicode - - - DynamicLibrary - false - v120 - true - Unicode - - - DynamicLibrary - false - v120_xp - true - Unicode - - - - - - - - - - $(SolutionDir)..\..\src\include;$(SolutionDir);$(IncludePath) - ResourceCompile - - - $(SolutionDir)$(ProjectName)\$(Configuration)\ - $(SolutionDir)\Output\ - - - $(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\ - $(SolutionDir)\Output\$(Platform)\ - - - $(ProjectName)_d - - - $(ProjectName)_d - - - $(ProjectName)-dll_d - - - $(ProjectName)-dll_d - - - $(ProjectName) - - - $(ProjectName) - - - $(ProjectName)-dll - - - $(ProjectName)-dll - - - - NotUsing - Level3 - Disabled - WIN32;BUILDING_MHD_LIB;MHD_W32LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4996 - 4013 - $(IntDir)$(TargetName).pdb - - - WINDOWS - true - - - Copy headers to output - xcopy /F /I /Y $(SolutionDir)\..\..\src\include\microhttpd.h $(OutputPath) - $(OutputPath)microhttpd.h;%(Outputs) - $(SolutionDir)\..\..\src\include\microhttpd.h - - - - - _WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - - - 6.00 - /SUBSYSTEM:WINDOWS,6.00 %(AdditionalOptions) - - - 6.00 - /SUBSYSTEM:WINDOWS,6.00 %(AdditionalOptions) - - - - - _WIN32_WINNT=0x0501;%(PreprocessorDefinitions) - - - 5.01 - /SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions) - - - 5.01 - /SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions) - - - - - _LIB;BUILDING_MHD_LIB;MHD_W32LIB;%(PreprocessorDefinitions) - - - Ws2_32.lib - - - xcopy /F /I /Y $(IntermediateOutputPath)$(TargetName).pdb $(OutputPath) - Copy .pdb to output directory - - - - - _USRDLL;BUILDING_MHD_LIB;MHD_W32DLL;%(PreprocessorDefinitions) - - - Ws2_32.lib;%(AdditionalDependencies) - - - - - Disabled - true - - - _DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - - - - Full - true - true - AnySuitable - Speed - true - - - true - true - true - - - NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - - - - MultiThreadedDebug - - - - - MultiThreadedDebug - - - - - MultiThreadedDLL - - - - - MultiThreadedDLL - - - - - MultiThreadedDebug - - - - - MultiThreadedDebug - - - - - MultiThreaded - - - - - MultiThreaded - - - - - MultiThreadedDLL - - - - - MultiThreadedDLL - - - - - - \ No newline at end of file diff --git a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj.filters b/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj.filters deleted file mode 100644 index cbe63801..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj.filters +++ /dev/null @@ -1,119 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {af799bf7-9787-4134-8e56-9e5aae50c7e3} - - - {df5ad836-e372-437b-a0e3-299d3675d6b4} - in - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\platform_interface - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Source Files - - - Header Files - - - - - Resource Files - - - - - Template Files - - - \ No newline at end of file diff --git a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/microhttpd_dll_res_vc.rc.in b/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/microhttpd_dll_res_vc.rc.in deleted file mode 100644 index 19eb37cb..00000000 --- a/src/hos_libhttpserver/src/libmicrohttpd/w32/VS2013/microhttpd_dll_res_vc.rc.in +++ /dev/null @@ -1,42 +0,0 @@ -/* W32 resources for .dll */ - -#include - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -VS_VERSION_INFO VERSIONINFO - FILEVERSION @PACKAGE_VERSION_MAJOR@,@PACKAGE_VERSION_MINOR@,@PACKAGE_VERSION_SUBMINOR@,0 - PRODUCTVERSION @PACKAGE_VERSION_MAJOR@,@PACKAGE_VERSION_MINOR@,@PACKAGE_VERSION_SUBMINOR@,0 - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#if defined(_DEBUG) - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0 -#endif - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "04090000" /* Lang = US English, Charset = ASCII */ - BEGIN - VALUE "ProductName", "GNU libmicrohttpd\0" - VALUE "ProductVersion", "@PACKAGE_VERSION@\0" - VALUE "FileVersion", "@PACKAGE_VERSION@\0" - VALUE "FileDescription", "GNU libmicrohttpd dll for Windows (VC build)\0" - VALUE "InternalName", "libmicrohttpd\0" -#if defined(_DEBUG) - VALUE "OriginalFilename", "libmicrohttpd_d.dll\0" -#else - VALUE "OriginalFilename", "libmicrohttpd.dll\0" -#endif - VALUE "CompanyName", "Free Software Foundation\0" - VALUE "LegalCopyright", "Copyright (C) 2007-2015 Christian Grothoff and project contributors\0" - VALUE "Comments", "http://www.gnu.org/software/libmicrohttpd/\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 0 /* US English, ASCII */ - END -END diff --git a/src/hos_libvariant/CMakeLists.txt b/src/hos_libvariant/CMakeLists.txt deleted file mode 100644 index 1db044d6..00000000 --- a/src/hos_libvariant/CMakeLists.txt +++ /dev/null @@ -1,209 +0,0 @@ -cmake_minimum_required(VERSION 2.8.3) -project(hos_libvariant) - -## Find catkin macros and libraries -## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) -## is used, also find other catkin packages -find_package(catkin REQUIRED COMPONENTS - roscpp -) - -## System dependencies are found with CMake's conventions -# find_package(Boost REQUIRED COMPONENTS system) - - -## Uncomment this if the package has a setup.py. This macro ensures -## modules and global scripts declared therein get installed -## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html -# catkin_python_setup() - -################################################ -## Declare ROS messages, services and actions ## -################################################ - -## To declare and build messages, services or actions from within this -## package, follow these steps: -## * Let MSG_DEP_SET be the set of packages whose message types you use in -## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...). -## * In the file package.xml: -## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET -## * If MSG_DEP_SET isn't empty the following dependencies might have been -## pulled in transitively but can be declared for certainty nonetheless: -## * add a build_depend tag for "message_generation" -## * add a run_depend tag for "message_runtime" -## * In this file (CMakeLists.txt): -## * add "message_generation" and every package in MSG_DEP_SET to -## find_package(catkin REQUIRED COMPONENTS ...) -## * add "message_runtime" and every package in MSG_DEP_SET to -## catkin_package(CATKIN_DEPENDS ...) -## * uncomment the add_*_files sections below as needed -## and list every .msg/.srv/.action file to be processed -## * uncomment the generate_messages entry below -## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...) - -## Generate messages in the 'msg' folder -# add_message_files( -# FILES -# Message1.msg -# Message2.msg -# ) - -## Generate services in the 'srv' folder -# add_service_files( -# FILES -# Service1.srv -# Service2.srv -# ) - -## Generate actions in the 'action' folder -# add_action_files( -# FILES -# Action1.action -# Action2.action -# ) - -## Generate added messages and services with any dependencies listed here -# generate_messages( -# DEPENDENCIES -# std_msgs # Or other packages containing msgs -# ) - -################################### -## catkin specific configuration ## -################################### -## The catkin_package macro generates cmake config files for your package -## Declare things to be passed to dependent projects -## INCLUDE_DIRS: uncomment this if you package contains header files -## LIBRARIES: libraries you create in this project that dependent projects also need -## CATKIN_DEPENDS: catkin_packages dependent projects also need -## DEPENDS: system dependencies of this project that dependent projects also need -catkin_package( - INCLUDE_DIRS include/hos_libvariant - LIBRARIES Variant hos_cpp_json - CATKIN_DEPENDS roscpp -# DEPENDS system_lib -) - -########### -## Build ## -########### - -include(ExternalProject) - -ExternalProject_Add( libvariant_project - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libvariant - CONFIGURE_COMMAND cmake ${CMAKE_CURRENT_SOURCE_DIR}/src/libvariant - -DCMAKE_INSTALL_PREFIX=${CATKIN_DEVEL_PREFIX} - -DBUILD_SHARED_LIBS=TRUE - -DLIBVARIANT_BUILD_EXAMPLES=FALSE - -DLIBVARIANT_BUILD_TESTS=FALSE - -DLIBVARIANT_BUILD_WALL=TRUE - -DLIBVARIANT_ENABLE_CURL=TRUE - -DLIBVARIANT_ENABLE_MSGPACK=FALSE - -DLIBVARIANT_ENABLE_XML=TRUE - -DLIBVARIANT_ENABLE_YAML=TRUE - BUILD_COMMAND make all - INSTALL_COMMAND make install -) - -add_definitions( - -std=c++11 - -fPIC -) - -include_directories( - ${catkin_INCLUDE_DIRS} - include - include/hos_libvariant -) - -add_library( Variant SHARED IMPORTED ) -set_property( TARGET Variant PROPERTY IMPORTED_LOCATION "${CATKIN_DEVEL_PREFIX}/lib/libVariant.so") -add_dependencies( Variant libvariant_project ) - -## Specify additional locations of header files -## Your package locations should be listed before other locations -# include_directories(include) - -## Declare a cpp library -add_library(hos_cpp_json STATIC - src/HosSchemaLoader/HosSchemaLoader.cpp -) -target_link_libraries(hos_cpp_json - ${catkin_LIBRARIES} -) - -## Declare a cpp executable -# add_executable(hos_libvariant_node src/hos_libvariant_node.cpp) - -## Add cmake target dependencies of the executable/library -## as an example, message headers may need to be generated before nodes -# add_dependencies(hos_libvariant_node hos_libvariant_generate_messages_cpp) - -## Specify libraries to link a library or executable target against -# target_link_libraries(hos_libvariant_node -# ${catkin_LIBRARIES} -# ) - -############# -## Install ## -############# - -install(DIRECTORY include/${PROJECT_NAME}/ - DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} -) -install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/lib/ - DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -) -install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/bin/ - DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} - USE_SOURCE_PERMISSIONS -) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/cmake - FILES_MATCHING PATTERN "*.cmake" -) - -# all install targets should use catkin DESTINATION variables -# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html - -## Mark executable scripts (Python etc.) for installation -## in contrast to setup.py, you can choose the destination -# install(PROGRAMS -# scripts/my_python_script -# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -# ) - -## Mark executables and/or libraries for installation -install(TARGETS hos_cpp_json - ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -) - -## Mark cpp header files for installation -# install(DIRECTORY include/${PROJECT_NAME}/ -# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} -# FILES_MATCHING PATTERN "*.h" -# PATTERN ".svn" EXCLUDE -# ) - -## Mark other files for installation (e.g. launch and bag files, etc.) -# install(FILES -# # myfile1 -# # myfile2 -# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -# ) - -############# -## Testing ## -############# - -## Add gtest based cpp test target and link libraries -# catkin_add_gtest(${PROJECT_NAME}-test test/test_hos_libvariant.cpp) -# if(TARGET ${PROJECT_NAME}-test) -# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) -# endif() - -## Add folders to be run by python nosetests -# catkin_add_nosetests(test) diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/ArgParse.h b/src/hos_libvariant/include/hos_libvariant/Variant/ArgParse.h deleted file mode 100644 index 97e0a17b..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/ArgParse.h +++ /dev/null @@ -1,301 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_ARGPARSER_H -#define VARIANT_ARGPARSER_H -#pragma once -#include -#include -#include -namespace libvariant { - - - enum ArgParseAction { - ARGACTION_UNKNOWN, // Unknown action (invalid) - ARGACTION_STORE, // Interpret the option argument and store it at the path - ARGACTION_STORE_CONST, // Store const into the path - ARGACTION_STORE_TRUE, // Store true into the path - ARGACTION_STORE_FALSE, // Store false into the path - ARGACTION_APPEND, // Append the option argument to the list at path - ARGACTION_COUNT, // Make the value at path be the count of this options occurrences - ARGACTION_HELP, // Print out the help text and exit - ARGACTION_ADVHELP, // Print the advanced help and exit - ARGACTION_CONFIG, // Consider the option argument a filename to be loaded and parsed as a config - ARGACTION_CONFIG_JSON, // force parser to use jscn - ARGACTION_CONFIG_YAML, // force parser to use yaml - ARGACTION_CONFIG_PLIST, // force parser to use xmlplist - ARGACTION_PRINT_CONFIG // At the end of parsing print out the resulting config and exit. - }; - - // A constrained list of only the valid types for ArgParse - enum ArgParseType { - ARGTYPE_GUESS = Variant::NullType, // No type specification, guess, uses deserialize machinery - ARGTYPE_INT = Variant::IntegerType, // Error if it cannot be turned into an integer - ARGTYPE_UINT = Variant::UnsignedType, // Error if it cannot be turned into a unsigned - ARGTYPE_FLOAT = Variant::FloatType, // Error if it cannot be turned into a float - ARGTYPE_STRING = Variant::StringType, // store as string - ARGTYPE_BOOL = Variant::BoolType // Error if it cannot be turned into a boolean type - // it treats 0 or the strings 'false' and 'no' or any substring ignoring case as false - // and everything else as true - }; - - //! Valid values are: - // This is used for converting the enum to a Variant and back for - // ArgParse::GetDescription and ArgParse::Merge - // store -- store the value into the key (default) - // store_const -- store const (see Const) into the key - // store_true -- store true into the key (i.e. no option argument) - // store_false -- store false into the key - // append -- make the value a list of instances of the option - // count -- count the number of instances of this argument - // help -- display the help text and exit - // config -- load a file and merge it into the result (uses GuessFormat) - // config_json -- same as config, force to use json parser - // config_yaml -- same as config, force to use yaml parser - // config_plist -- same as config, force to use xml-plist parser - // config_print -- when finished parsing, print out the config and exit - ArgParseAction ArgParseActionFromStr(const std::string &action); - std::string ArgParseActionToStr(ArgParseAction action); - - class ArgParse; - struct ArgParseImpl; - struct ArgParseOptImpl; - struct ArgParseGroupImpl; - - //! ArgParseOption is a part of class ArgParse. - // ArgParseOption is the interface that ArgParse provides to the user to be able - // to conveniently set the options for an option. - class ArgParseOption { - public: - - //! Set the title of this option. The title is used - // as an argument placeholder string. - ArgParseOption &Title(const std::string &title); - - //! What action to perform when this option is encountered. - // See ArgParseAction above for a list of actions. - ArgParseOption &Action(ArgParseAction action); - DEPRECATED ArgParseOption &Action(const std::string &action); - - //! Set the type parsing and validation. - // If set and the argument is not of this type, then it is invalid. - // Default: ARGTYPE_GUESS - // If type is ARGTYPE_GUESS then ArgParse attempts to parse the - // argument with the same machinery that is used by the deserializers - // to figure out the type of a scalar. - // ARGTYPE_UINT is the same as ARGTYPE_INT but with - // Minimum set to 0. - // See ArgParseType for the list of valid types. - ArgParseOption &Type(ArgParseType type); - // Same as above but throws on invalid type - DEPRECATED ArgParseOption &Type(Variant::Type_t type); - // String version of the above - // Valid types are "string", "number", "integer", "boolean", or "null". - // Default type is "null". - DEPRECATED ArgParseOption &Type(const std::string &type); - - //! Set the const value for "store_const" - ArgParseOption &Const(Variant val); - - //! Set the default value used when the option is not set. - ArgParseOption &Default(Variant val); - - //! Set the environment variable name to check for a value for this option. - // When the environment variable is present this acts like Default was set - // to the environment variable's value. I.e., this overrides default, - // command line arguments override this. - ArgParseOption &Env(const char *env); - - //! If the resulting value is a number, require to be at least this minimum. - ArgParseOption &Minimum(Variant val); - - //! If the resulting value is a number, require to be at most this maximum. - ArgParseOption &Maximum(Variant val); - - //! Add choices. - // If a choice is added, the value of the option must be one of the choices. - ArgParseOption &AddChoice(Variant val); - - //! Set choices (old ones forgotten) from a vector. - ArgParseOption &SetChoices(const std::vector &val); - - //! Return the vector of choices set. - const std::vector &GetChoices(); - - //! Is this option required? - ArgParseOption &Required(bool req=true); - - //! Set the help text for this option. - ArgParseOption &Help(const std::string &helptxt); - - //! If this option is a string, it must match the regex in pattern. - ArgParseOption &Pattern(const std::string &pattern); - - //! If this option is a string, it must be no longer than maxLength. - ArgParseOption &MaxLength(unsigned l); - - //! If this option is a string, it must be no shorter than minLength. - ArgParseOption &MinLength(unsigned l); - - //! If this option can be specified multiple times, it must be - // specified minArgs times at least. - // A value of 0 means zero arguments is valid. - ArgParseOption &MinArgs(unsigned l); - - //! If this option can be specified multiple times, it cannot be - // specified more than maxArgs. - // A value of 0 means any number - ArgParseOption &MaxArgs(unsigned l); - - //! Specify that this argument must be present l times. - // Sets both minArgs and maxArgs to l - ArgParseOption &NumArgs(unsigned l); - - //! Adds this option to group gname. If gname does not exist, - //it will be created with an empty title and description. - ArgParseOption &Group(const std::string &gname); - - //! Sets this argument to be an advanced option - // This hides the option when not printing advanced options - ArgParseOption &Advanced(bool adv = true); - - private: - ArgParseOption(ArgParseOptImpl *i) : impl(i) {} - ArgParseOptImpl *impl; - friend class ArgParse; - }; - - //! Groups are a way to organize the option and to provide mutual exclusion - //of option. An argument may be part of more than one group, but may only - //be part of one group that has a non-empty title and description. An - //attempt is made to order the help text so that options within the same - //group appear together and if a group has a title and/or description the - //options are placed within a subsection headed with the title and - //description. - class OptionGroup { - public: - //! Set the title for this group - OptionGroup &Title(const std::string &t); - //! Set the description for this group - OptionGroup &Description(const std::string &d); - //! Set that the options in this group are mutually exclusive - OptionGroup &MutuallyExclusive(bool exclusive=true); - //! Set that at least one option in this group is required. - //Has no meaning when the group is not mutually exclusive. - OptionGroup &Required(bool req=true); - - OptionGroup &Add(const std::string &keypath); - OptionGroup &Add(const Path &keypath); - - //! Sets this option group to be advanced - // Hide the group when not printing advanced options. - // This only hides the group when it has a title or description - OptionGroup &Advanced(bool adv=true); - private: - OptionGroup(ArgParseGroupImpl *i) : impl(i) {} - ArgParseGroupImpl *impl; - friend class ArgParse; - }; - - class ArgParse { - public: - //! addhelp true causes AddHelp to be called. - ArgParse(bool addhelp=true); - ArgParse(const std::string &pname, bool addhelp=true); - - //! Add the option and configure it as an option that takes an argument. - //The default action will be "store" and type will be unspecified - // - // keypath must be a valid path as defined in Path.h - // - // For no short option, shortOpt may be 0, and for no long option, longOpt may be - // the empty string. If both shortOpt is 0 and longOpt is empty then this option - // is hidden unless Env is also set for the option. - ArgParseOption AddOption(const std::string &keypath, int shortOpt, const std::string &longOpt="", - const std::string &helptxt=""); - - //! Convenience methods for getting an existing option. - // ArgParse args(argv[0]); - // args.AddOption("key1", 'k', "key1", "how many things").Type("integer"); - // args.AddOption("key2", 'K', "key2", "what to name it").Type("string"); - // (... some intermediate code ...) - // args.At("key1").Default(42); - // args["key2"].Default("foo"); - ArgParseOption At(const std::string &keypath); - ArgParseOption operator[](const std::string &keypath) { return At(keypath); } - - //! Add the option and configure it as an option that is default false and - //if present sets to true - //i.e., same as: - // AddOption(keypath, shortOpt, longOpt, helptxt).Type("boolean") - // .Action("store_true").Default(false); - ArgParseOption AddFlag(const std::string &keypath, int shortOpt, const std::string &longOpt="", - const std::string &helptxt=""); - - //! Adds the group name. - OptionGroup AddGroup(const std::string &name, const std::string &title="", const std::string &description=""); - //! Returns the group name. - OptionGroup GetGroup(const std::string &name); - - //! Add a positional argument. - // By default the new positional argument will have NumArgs as 1. - // Arguments are processed in the order they are added. - // If maxArgs is 0, then no positional arguments after this one will - // be processed. - // Default action is store. - ArgParseOption AddArgument(const std::string &keypath, const std::string &helptxt=""); - - //! Convenience methods for getting an existing argument. - // ArgParse args(argv[0]); - // args.AddArgument("arg0", "pick one").AddChoice("AAA").AddChoice("BBB"); - // args.AddArgument("arg1", "scale factor").Type("float"); - // (... some intermediate code ...) - // args.At(0).AddChoice("CCC"); - // args[1].Default(0.456); - ArgParseOption At(size_t argumentIndex); - ArgParseOption operator[](size_t argumentIndex) { return At(argumentIndex); } - - //! When this is on, trying to add a second option with the same short option - //will cause the second option to act as though it had no short option specified. - void ConflictResolution(bool resolve=true); - - //! Add a --config and --print-config option - // --config is set with action ARGACTION_CONFIG and - // --print-config is set with action ARGACTION_PRINT_CONFIG - void AddConfigDefaults(); - - //! Add -h,--help option with action ARGACTION_HELP - void AddHelp(); - - //! Set the description text that follows the usage message. - void SetDescription(const std::string &txt); - //! Set the epilog text at the end of help. - void SetEpilog(const std::string &txt); - //! Override the default program name. - void SetProgramName(const std::string &pname, bool do_basename=true); - std::string GetProgramName() const; - - void Merge(Variant newopts); - void Merge(const ArgParse &other); - - //! Validate the argparse description against the internal schema - void Validate() const; - - //! Parse the arguments with the internal description - Variant Parse(int argc, char *const *argv); - - //! Print the help message and exit. - void PrintHelp(bool advanced=false) const; - - //! Return the Variant that describes the arguments - Variant GetDescription() const; - - //! Generate a schema for the Variant returned by Parse from the argument description - Variant GenerateSchema() const; - - private: - shared_ptr impl; - }; -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/Blob.h b/src/hos_libvariant/include/hos_libvariant/Variant/Blob.h deleted file mode 100644 index 11d7bf65..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/Blob.h +++ /dev/null @@ -1,62 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_BLOB_H -#define VARIANT_BLOB_H -#pragma once -#include -#include -#include - -namespace libvariant { - class Blob; - typedef shared_ptr BlobPtr; - typedef shared_ptr ConstBlobPtr; - - typedef void (*BlobFreeFunc)(void *ptr, void *ctx); - - class Blob { - public: - - /// Reference the buffer and call ffunc when Blob no longer references it - static BlobPtr Create(void *ptr, unsigned len, BlobFreeFunc ffunc, void *context); - /// Will call ffunc on each buffer in iov - static BlobPtr Create(struct iovec *iov, unsigned iov_len, BlobFreeFunc ffunc, void *context); - /// Copy the data into a newly allocatd buffer - static BlobPtr CreateCopy(const void *ptr, unsigned len); - static BlobPtr CreateCopy(const struct iovec *iov, unsigned iov_len); - /// Reference the buffer and when done call free to free the buffer - static BlobPtr CreateFree(void *ptr, unsigned len); - static BlobPtr CreateFree(struct iovec *iov, unsigned iov_len); - /// Reference the buffer, assume static or other allocation lifetime where - // calling a free function is not required - static BlobPtr CreateReferenced(void *ptr, unsigned len); - static BlobPtr CreateReferenced(struct iovec *iov, unsigned iov_len); - ~Blob(); - - BlobPtr Copy() const; - - void *GetPtr(unsigned i) { return iov[i].iov_base; } - const void *GetPtr(unsigned i) const { return iov[i].iov_base; } - unsigned GetLength(unsigned i) const { return iov[i].iov_len; } - struct iovec *GetIOVec() { return &iov[0]; } - const struct iovec *GetIOVec() const { return &iov[0]; } - unsigned GetNumBuffers() const { return iov.size(); } - unsigned GetTotalLength() const; - - int Compare(ConstBlobPtr other) const; - - private: - Blob(); - Blob(const Blob&); - Blob(struct iovec *v, unsigned l, BlobFreeFunc f, void *c); - Blob operator=(const Blob&); - - std::vector iov; - BlobFreeFunc free_func; - void *ctx; - }; - -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/Config.h b/src/hos_libvariant/include/hos_libvariant/Variant/Config.h deleted file mode 100644 index 32f40d22..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/Config.h +++ /dev/null @@ -1,13 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_CONFIG_H -#define VARIANT_CONFIG_H -#pragma once - -/* #undef HAVE_CXX11_SHAREDPTR */ -#define HAVE_TR1_SHAREDPTR 1 -/* #undef USE_BOOST_SHAREDPTR */ - -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/Emitter.h b/src/hos_libvariant/include/hos_libvariant/Variant/Emitter.h deleted file mode 100644 index adff3528..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/Emitter.h +++ /dev/null @@ -1,225 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_EMITTER_H -#define VARIANT_EMITTER_H -#pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace libvariant { - - /** - * Class to override to implement an Emitter - */ - class EmitterImpl { - public: - virtual ~EmitterImpl(); - - virtual void BeginDocument() = 0; - virtual void EndDocument() = 0; - virtual void BeginMap(int length) = 0; - virtual void EndMap() = 0; - virtual void BeginList(int length) = 0; - virtual void EndList() = 0; - - virtual void EmitNull() = 0; - virtual void EmitTrue() = 0; - virtual void EmitFalse() = 0; - virtual void Emit(const char *v) = 0; - virtual void Emit(intmax_t v) = 0; - virtual void Emit(uintmax_t v) = 0; - virtual void Emit(double v) = 0; - virtual void Emit(ConstBlobPtr b) = 0; - - virtual void Flush() = 0; - virtual void Close() = 0; - - virtual Variant GetParam(const std::string &key) = 0; - virtual Variant GetParams() = 0; - virtual void SetParam(const std::string &key, Variant value) = 0; - virtual void SetParams(Variant params); - }; - - /** - * Actual emitter class. - */ - class Emitter { - public: - Emitter(); - Emitter(shared_ptr i); - ~Emitter(); - - Emitter &BeginDocument(); - Emitter &EndDocument(); - - //Some emitter implementations require the length of the map at the - //beginning. Such implementations should buffer events if length == -1 - //Implementations are free to ignore the length. - Emitter &BeginMap() { return BeginMap(-1); } - Emitter &BeginMap(int length); - Emitter &EndMap(); - //Some emitter implementations require the length of the list at the - //beginning. Such implementations should buffer events if length == -1 - Emitter &BeginList() { return BeginList(-1); } - Emitter &BeginList(int length); - Emitter &EndList(); - - Emitter &EmitNull(); - Emitter &EmitTrue(); - Emitter &EmitFalse(); - Emitter &Emit(bool v) { return (v ? EmitTrue() : EmitFalse()); } - Emitter &Emit(const std::string &v); - Emitter &Emit(const char *v); - Emitter &Emit(intmax_t v); - Emitter &Emit(uintmax_t v); - Emitter &Emit(double v); - Emitter &Emit(ConstBlobPtr b); - - void Flush(); - void Close(); - - /// Get the value of parameters of the parser (e.g. pretty printing, - // styles, etc.) - // See individual emitter below for supported values. - Variant GetParam(const std::string &key); - /// Get a dict of all parameters - Variant GetParams(); - /// Set the value of parameters. - // See individual emitter below for supported values. - void SetParam(const std::string &key, Variant value); - /// Set all parameters from a dict - void SetParams(Variant params); - /// Internal/advanced function to get the underlying implementation - shared_ptr GetImpl() { return impl; } - private: - shared_ptr impl; - }; - - template - inline Emitter &operator<<(Emitter &e, const std::vector &v) { - e.BeginList(v.size()); - for (typename std::vector::const_iterator i(v.begin()), end(v.end()); i!=end; i++) { - e << *i; - } - e.EndList(); - return e; - } - - template - inline Emitter &operator<<(Emitter &e, const std::map &v) { - e.BeginMap(v.size()); - for (typename std::map::const_iterator i(v.begin()), end(v.end()); i!=end; ++i) { - e.Emit(i->first); - e << i->second; - } - e.EndMap(); - return e; - } - inline Emitter &operator<<(Emitter &e, bool v) { e.Emit(v); return e; } - inline Emitter &operator<<(Emitter &e, char v) { e.Emit(intmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, short v) { e.Emit(intmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, int v) { e.Emit(intmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, long v) { e.Emit(intmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, long long v) { e.Emit(intmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, unsigned char v) { e.Emit(uintmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, unsigned short v) { e.Emit(uintmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, unsigned int v) { e.Emit(uintmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, unsigned long v) { e.Emit(uintmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, unsigned long long v) { e.Emit(uintmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, const char *v) { e.Emit(v); return e; } - inline Emitter &operator<<(Emitter &e, const std::string &v) { e.Emit(v); return e; } - inline Emitter &operator<<(Emitter &e, float v) { e.Emit(double(v)); return e; } - inline Emitter &operator<<(Emitter &e, double v) { e.Emit(v); return e; } - inline Emitter &operator<<(Emitter &e, ConstBlobPtr v) { e.Emit(v); return e; } - - shared_ptr CreateEmitterOutput(void *ptr, unsigned len, unsigned *out_len=0); - shared_ptr CreateEmitterOutput(const char *filename); - shared_ptr CreateEmitterOutput(FILE *f); - shared_ptr CreateEmitterOutput(std::streambuf *sb); - - /** - * Create an Emiter that Emits the format specified by type. - * Supported parameters are dependent on type (see below). - */ - Emitter CreateEmitter(shared_ptr o, SerializeType type, Variant params = Variant::NullType); - - /** - * Create an Emitter that Emits the JSON format. - * - * Supported parameters are: - * "pretty": boolean - * "indent": integer (number of spaces to indent when pretty is on, - * default 4) - * "precision": integer (number of digits for floats) - * "strict": be more strict about emitting correct json - */ - Emitter JSONEmitter(shared_ptr o, Variant params = Variant::NullType); - - /** - * Supported parameters are (first is default): - * - * "scalar_style": "any"|"plain"|"single quoted"|"double - * quoted"|"literal"|"folded" - * - * "map_style": "any"|"block"|"flow" - * - * "list_style": "any"|"block"|"flow" - * - * "implicit_document_begin": false|true - * - * "implicit_document_end": false|true - * - * "indent": integer (number of spaces to indent) - * - * "width": integer (set prefered line width) - * - * "precision": integer (number of digits for floats) - */ - Emitter YAMLEmitter(shared_ptr o, Variant params = Variant::NullType); - - /** - * Supported params are: - * - * "pretty": true|false - * "indent": integer (amount to indent for pretty) - * "precision": integer (number of digits for floats) - */ - Emitter XMLPLISTEmitter(shared_ptr o, Variant params = Variant::NullType); - /** - * Supported params are: - * - * "precision": integer (number of digits for floats) - */ - Emitter BundleHdrEmitter(shared_ptr o, Variant params = Variant::NullType); - - /** - * No parameters supported. - */ - Emitter MsgPackEmitter(shared_ptr o, Variant params = Variant::NullType); -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/EmitterOutput.h b/src/hos_libvariant/include/hos_libvariant/Variant/EmitterOutput.h deleted file mode 100644 index ffc5b1e8..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/EmitterOutput.h +++ /dev/null @@ -1,87 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - * - * The end user should not need to look at this file unless they are - * creating custom outputs for the emitters. - */ -#ifndef VARIANT_EMITTEROUTPUT_H -#define VARIANT_EMITTEROUTPUT_H -#pragma once -#include -#include - -namespace libvariant { - - class EmitterOutput { - public: - virtual ~EmitterOutput(); - /// Return the number of bytes written, or throw an exception - virtual unsigned Write(const void *ptr, unsigned len) = 0; - virtual void Flush() {} - virtual unsigned NumBytesWritten() const = 0; - }; - - class EmitterFileOutput : public EmitterOutput { - public: - EmitterFileOutput(FILE *f, bool c); - ~EmitterFileOutput(); - virtual unsigned Write(const void *ptr, unsigned len); - virtual void Flush(); - virtual unsigned NumBytesWritten() const { return num_bytes; } - protected: - FILE *file; - unsigned num_bytes; - bool cls; - }; - - class EmitterFilenameOutput : public EmitterFileOutput { - public: - EmitterFilenameOutput(const char *filename, const char *mode="w"); - }; - - class EmitterStreambufOutput : public EmitterOutput { - public: - EmitterStreambufOutput(std::streambuf *sb, bool d); - ~EmitterStreambufOutput(); - virtual unsigned Write(const void *ptr, unsigned len); - virtual void Flush(); - virtual unsigned NumBytesWritten() const { return num_bytes; } - protected: - std::streambuf *streambuf; - unsigned num_bytes; - bool del; - }; - - class EmitterMemoryOutput : public EmitterOutput { - public: - EmitterMemoryOutput(void *ptr, unsigned len, unsigned *out_len = 0); - - virtual unsigned Write(const void *ptr, unsigned len); - - virtual unsigned NumBytesWritten() const { return *out_length; } - protected: - void *data_ptr; - unsigned length; - unsigned out_length_dummy; - unsigned *out_length; - }; - -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/Exceptions.h b/src/hos_libvariant/include/hos_libvariant/Variant/Exceptions.h deleted file mode 100644 index da59c286..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/Exceptions.h +++ /dev/null @@ -1,87 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_EXCEPTIONS_H -#define VARIANT_EXCEPTIONS_H -#include -#include -#include -#include -namespace libvariant { - - /// \brief Exception thrown when a key does not exist. - class KeyError : public std::runtime_error { - public: - KeyError(const std::string &key) throw(); - }; - - /// \brief Exception thrown when internal state is corrupt. - class UnknownTypeError : public std::runtime_error { - public: - UnknownTypeError(VariantDefines::Type_t type) throw(); - }; - - /// \brief Exception thrown when a function expects a specific type but the action type conflicts. - class UnexpectedTypeError : public std::runtime_error { - public: - UnexpectedTypeError(VariantDefines::Type_t expected, VariantDefines::Type_t value) throw(); - UnexpectedTypeError(const std::vector &expected, VariantDefines::Type_t value) throw(); - }; - - /// \brief Exception thrown when a function cannot convert the Variant to an acceptable type for the routine. - class UnableToConvertError : public std::runtime_error { - public: - UnableToConvertError(VariantDefines::Type_t sourcetype, const std::string &targettype) throw(); - }; - - /// \brief Exception thrown when trying to index a type other than map or list. - class TypeNotIndexableError : public std::runtime_error { - public: - TypeNotIndexableError(VariantDefines::Type_t type) throw(); - }; - - /// \brief Exception thrown when attempting a numeric operation on a non numeric type. - class NotNumericTypeError : public std::runtime_error { - public: - NotNumericTypeError(VariantDefines::Type_t type) throw(); - }; - - /// \brief Exception thrown from path functions - class BadPathError : public std::runtime_error { - public: - BadPathError(VariantDefines::Type_t type) throw(); - BadPathError(const std::string &msg) throw(); - }; - - class InvalidReferenceError : public std::runtime_error { - public: - InvalidReferenceError(const std::string &msg) throw(); - }; - - class InvalidOperationError : public std::runtime_error { - public: - InvalidOperationError(VariantDefines::Type_t type, const std::string &opname) throw(); - }; - - std::ostream &operator <<(std::ostream &os, VariantDefines::Type_t type); - - void AddStackTrace(std::ostream &os, int level); -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/Extensions.h b/src/hos_libvariant/include/hos_libvariant/Variant/Extensions.h deleted file mode 100644 index 83e2a726..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/Extensions.h +++ /dev/null @@ -1,92 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author Josh Staley - * \brief Useful extension functions for Variant - */ - -#ifndef VARIANT_EXTENSIONS_H -#define VARIANT_EXTENSIONS_H - -#include - -namespace libvariant { - - /// \brief Returns a default parameters for use with FlattenPath and ExpandPath functions. - Variant ExtensionParams(); - - /// \brief Sets any missing Extension parameters to 'params' for use with FlattenPath and ExpandPath functions. - void ExtensionParams( VariantRef params ); - - /// \brief Returns a version of 'var' with flat paths based on 'params' - Variant FlattenPath( const Variant &var, Variant params = ExtensionParams() ); - - /// \brief Returns a version of 'var' with expanded paths based on 'params' - Variant ExpandPath( const Variant &var, Variant params = ExtensionParams() ); - - /// \brief Flattens 'var' paths to 'flat' based on 'params' - void FlattenPathTo( VariantRef flat, const Variant &var, Variant params = ExtensionParams(), std::string prefix = "" ); - - /// \brief Expands 'var' paths to 'expand' based on 'params' - void ExpandPathTo( VariantRef expand, const Variant &var, Variant params = ExtensionParams() ); - - /// \brief Returns a string string map representation of 'var' based on 'params' - std::map - FlattenPathToStrStrMap( const Variant &var, Variant params = ExtensionParams() ); - - /// \brief Returns a variant representing elements in 'compare' that differ from 'base' recursively - Variant RDiff( const Variant &base, const Variant &compare ); - - /// \brief Sets elements into 'diff' from 'compare' that differ from 'base' recursively - void RDiff( VariantRef diff, const Variant &base, const Variant &compare ); - - /// \brief Updates 'base' with entries in 'update' recursively - void RUpdate( VariantRef base, const Variant &update ); - - /// Perform an operations on v according to RFC6901 and RFC6902. - // Note that JSON Pointer is ambiguous without the presence of a document. - // These function throw if the lookup fails because of incorrect types or - // on ambiguity. - // On return (or throw) the operation will have either succedded or no - // change will have been made. - - /// Add data to v at the spot specified by pointer - void JSONPointerAdd(const std::string &pointer, VariantRef v, Variant data); - /// Remove the element in v at the spot specified by pointer - void JSONPointerRemove(const std::string &pointer, VariantRef v); - /// Replace the value at pointer with data, error if the location does not already exist - void JSONPointerReplace(const std::string &pointer, VariantRef v, Variant data); - /// Move the value from src to dst (equivalent to get(src), remove(src), add(dst) - void JSONPointerMove(const std::string &src, const std::string &dst, VariantRef v); - /// Copy the value from src to dst (equivalent to add(dst, get(src).Copy())) - void JSONPointerCopy(const std::string &src, const std::string &dst, VariantRef v); - /// Perform a lookup into v according to RFC6901, return a reference to the value at the location - VariantRef JSONPointerLookup(const std::string &pointer, VariantRef v); - - std::string FormJSONPointer(const Path &path); - - /// Perform a patch operation on v with the patch as described by diff according to RFC6902 - // Returns true if the patch is applied and all tests pass, - // false if any tests failed and no patch is applied - std::pair JSONPatch(VariantRef v, const Variant &diff); - - /// Create a diff suitable to give to JSONPatch to transform src into dst. - Variant JSONDiff(const Variant &src, const Variant &dst); - -} // namespace libvariant - -#endif /*#ifndef VARIANT_EXTENSIONS_H*/ diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/GuessFormat.h b/src/hos_libvariant/include/hos_libvariant/Variant/GuessFormat.h deleted file mode 100644 index aba94ea9..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/GuessFormat.h +++ /dev/null @@ -1,22 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_GUESSFORMAT_H -#define VARIANT_GUESSFORMAT_H -#pragma once -#include -#include -namespace libvariant { - - /// - // Try to guess the format of the input without removing any - // input from the input object. - // - // Currently only looks at the first non-whitespace character - // and if it is '<' then says XMLPLIST, otherwise says YAML - // if enabled otherwise JSON. - // - SerializeType GuessFormat(ParserInput* in); -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/Parser.h b/src/hos_libvariant/include/hos_libvariant/Variant/Parser.h deleted file mode 100644 index 1c6478a3..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/Parser.h +++ /dev/null @@ -1,157 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_PARSER_H -#define VARIANT_PARSER_H -#pragma once -#include -#include -#include -#include -#include -#include - -namespace libvariant { - - class ParserImpl; - - class ParserActions { - public: - virtual ~ParserActions(); - virtual void BeginDocument(ParserImpl *p) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void EndDocument(ParserImpl *p) - { throw std::runtime_error("Parser: Unexpected event"); } - // If length < 0, unknown length - virtual void BeginMap(ParserImpl *p, int length, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void EndMap(ParserImpl *p) - { throw std::runtime_error("Parser: Unexpected event"); } - // If length < 0, unknown length - virtual void BeginList(ParserImpl *p, int length, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void EndList(ParserImpl *p) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Alias(ParserImpl *p, const char *anchor) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, double v, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, const char *str, unsigned length, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, bool v, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Null(ParserImpl *p, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, intmax_t v, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, uintmax_t v, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, BlobPtr b, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - }; - - /// The class that parser implementations override - class ParserImpl { - public: - virtual ~ParserImpl(); - /** - * Attempt to parse some actions. - * At least one ParserActions should be on the action stack. - * - * Run is not guaranteed to be recursively callable from inside a - * ParserActions callback. Do not do that. - * - * return 0 on success - * return 1 when done - * return -1 if needing more data is detected (not all parsers support this; can be treated as an error) - * throw on error - */ - virtual int Run() = 0; - - /** - * Push a new ParserActions handler onto the action handler stack. - */ - virtual void PushAction(shared_ptr action) { action_stack.push_back(action); } - - /** - * Pop the top ParserActions handler off the action handler stack and - * return it. - */ - virtual shared_ptr PopAction() { - if (action_stack.empty()) - { throw std::runtime_error("Parser: Attempting to parse an actions without any action handlers"); } - shared_ptr ret = action_stack.back(); - action_stack.pop_back(); - return ret; - } - - /** - * Access the top ParserActions - */ - ParserActions *TopAction() { - if (action_stack.empty()) - { throw std::runtime_error("Parser: Attempting to parse an actions without any action handlers"); } - return action_stack.back().get(); - } - - /** These three functiosn can be used to query the state - * later. - * Done means that a call to Process will immediately return 1 - * Error if Process threw an exception last - * Ok if everything looks good (Process never been called, or last return 0 or possibly -1) - */ - virtual bool Done() const = 0; - virtual bool Error() const = 0; - virtual bool Ok() const = 0; - /// Return a string describing the last error suitable for presentation to a user - virtual std::string ErrorStr() const = 0; - /// Reset the parser - virtual void Reset() = 0; - protected: - std::deque< shared_ptr< ParserActions > > action_stack; - }; - - class Parser { - public: - Parser(); - Parser(shared_ptr pi); - ~Parser(); - /// 0 on success, 1 when done, -1 other problem, throw on error - int Run() { return impl->Run(); } - /// Push an action handler onto the action stack. - void PushAction(shared_ptr action) { impl->PushAction(action); } - /// Pop the top action handler off the stack. - shared_ptr PopAction() { return impl->PopAction(); } - - /// Query state - bool Done() const { return impl->Done(); } - bool Error() const { return impl->Error(); } - bool Ok() const { return impl->Ok(); } - /// Return a string describing the last error suitable for presentation to a user - std::string ErrorStr() const { return impl->ErrorStr(); } - /// Reset the parser if applicable (some types will throw) - void Reset() { impl->Reset(); } - - /// Internal/advanced function to get the underlying implementation - shared_ptr GetImpl() { return impl; } - private: - shared_ptr impl; - }; - - shared_ptr CreateParserInput(const std::string &str); - shared_ptr CreateParserInput(const char *str); - shared_ptr CreateParserInput(const void *ptr, unsigned len); - shared_ptr CreateParserInputFile(const char *filename); - shared_ptr CreateParserInputFile(FILE *f); - shared_ptr CreateParserInputFile(std::streambuf *sb); - - Parser CreateParser(shared_ptr i, SerializeType type); - Parser CreateParserGuess(shared_ptr i); - Parser JSONParser(shared_ptr i); - Parser YAMLParser(shared_ptr i); - Parser XMLPLISTParser(shared_ptr i); - Parser BundleHdrParser(shared_ptr i); - Parser MsgPackParser(shared_ptr i); -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/ParserInput.h b/src/hos_libvariant/include/hos_libvariant/Variant/ParserInput.h deleted file mode 100644 index 5fa66311..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/ParserInput.h +++ /dev/null @@ -1,104 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_PARSERINPUT_H -#define VARIANT_PARSERINPUT_H -#pragma once -#include -#include -#include -#include - -namespace libvariant { - - class ParserInput { - public: - virtual ~ParserInput(); - // Get a pointer and length to the unprocessed data that is available - // (return null on end of data) len being an in/out parameter, - // the initial value of len is how much the parser wants. An input value of zero - // in means give whatever is currently available. - virtual const void *GetPtr(unsigned &len) = 0; - - // Tell the input that the parser is done with len bytes from the last - // GetPtr - virtual void Release(unsigned len) = 0; - }; - - class ParserStreamInput : public ParserInput { - public: - ParserStreamInput(unsigned buffer_len); - virtual const void *GetPtr(unsigned &len); - virtual void Release(unsigned len); - /// return number of bytes read into ptr, 0 on EOF - // and throw on error - virtual unsigned Read(void *ptr, unsigned len) = 0; - protected: - std::vector buffer; - unsigned num; - unsigned offset; - bool eof; - }; - - class ParserMemoryInput : public ParserInput { - public: - ParserMemoryInput(const void *ptr, unsigned len); - virtual const void *GetPtr(unsigned &len); - virtual void Release(unsigned len); - protected: - const void *data_ptr; - unsigned data_len; - unsigned offset; - }; - - class ParserStringInput : public ParserInput { - public: - ParserStringInput(const std::string &str); - virtual const void *GetPtr(unsigned &len); - virtual void Release(unsigned len); - protected: - const std::string val; - unsigned offset; - }; - - class ParserFileInput : public ParserStreamInput { - public: - ParserFileInput(FILE *f); - virtual unsigned Read(void *ptr, unsigned len); - protected: - FILE *file; - }; - - class ParserFilenameInput : public ParserFileInput { - public: - ParserFilenameInput(const char *filename, const char *mode = "r"); - ~ParserFilenameInput(); - }; - - class ParserStreambufInput : public ParserStreamInput { - public: - ParserStreambufInput(std::streambuf *sb); - unsigned Read(void *ptr, unsigned len); - protected: - std::streambuf *streambuf; - }; - -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/Path.h b/src/hos_libvariant/include/hos_libvariant/Variant/Path.h deleted file mode 100644 index 6c38c5c3..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/Path.h +++ /dev/null @@ -1,99 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_PATH_H -#define VARIANT_PATH_H -#pragma once -#include -#include -#include -namespace libvariant { - - // A simple xpath like path functionality for Variant - // - // Map keys are specified using a "/" then the key. - // List indeces are specified using [index] - // A "/" at the end of the path is ignored. - // Characters "\/[]" must all be escaped with "\" - // - // For example: - // { - // "key1": [ 1, 2, 3, { "blork": true } ], - // "key2": { - // "subkey": [ "a", { "furple": 1 }, 2 ], - // "sub/key2": true - // } - // } - // - // Then all paths enumerated are: - // Path Value - // "/" Identity - // "/key1" [ 1, 2, 3, { "blork": true } ], - // "/key1[0]" 1 - // "/key1[1]" 2 - // "/key1[2]" 3 - // "/key1[3]" { "blork": true } - // "/key1[3]/blork" true - // "/key2" { "subkey": [ "a", { "furple": 1 }, 2 ], "sub/key2": true } - // "/key2/subkey" [ "a", { "furple": 1 }, 2 ] - // "/key2/subkey[0]" "a" - // "/key2/subkey[1]" { "furple": 1 } - // "/key2/subkey[1]/furple" 1 - // "/key2/subkey[2]" 2 - // "/key2/sub\/key2" true - // - // For all these functions PathList must act like a vector - // It may be of some other type (like deque) - - class PathElement { - public: - enum Type_t { INDEX, KEY }; - PathElement(const std::string &k) : type(KEY), key(k) {} - PathElement(const char *k) : type(KEY), key(k) {} - PathElement(unsigned i) : type(INDEX), index(i) {} - - bool IsNumber() const { return type == INDEX; } - unsigned AsUnsigned() const { - if (type != INDEX) throw BadPathError("Variant path element is not a number"); - return index; - } - bool IsString() const { return type == KEY; } - const std::string &AsString() const { - if (type != KEY) throw BadPathError("Variant path element is not a key"); - return key; - } - private: - Type_t type; - unsigned index; - std::string key; - }; - - typedef std::deque Path; - - //! - // Parse the path string into path tokens. - void ParsePath(Path &parsed_path, const std::string &path); - Path ParsePath(const std::string &path); - - //! Take the set of path tokens and turn it into a path string - std::string PathString(const Path &path); - -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/Payload.h b/src/hos_libvariant/include/hos_libvariant/Variant/Payload.h deleted file mode 100644 index bcb213b5..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/Payload.h +++ /dev/null @@ -1,129 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_PAYLOAD_H -#define VARIANT_PAYLOAD_H -#pragma once -#include -#include -#include -namespace libvariant { - - // Serialize and Deserialize a header, null byte, and a binary payload - // - // All restrictions of the given serialization format are required. - // - // Parameters for payload data location: - // "length_path": path to where the payload length should be - // placed for serialization and where the payload length should be read - // from for deserialization - // Defaults to: -#define VARIANT_PAYLOAD_LENGTH_PATH "payload/length" -#define VARIANT_BUNDLE_PAYLOAD_LENGTH_PATH "payload.length" - // "data_path": path to where the payload is located for - // serialization and path to store payload for deserialization - // Defaults to: -#define VARIANT_PAYLOAD_DATA_PATH "payload/data" -#define VARIANT_BUNDLE_PAYLOAD_DATA_PATH "payload.data" - // The defaults are the values for compatibility with the bundle format. - // - // Serialize only parameters: - // "ignore_payload": true|false (default false) - // Don't output the payload, only the header, alignment and null byte. - // If the payload exists in the Variant, use the length for the payload length - // value, if not look in parameters for the payload length value, if not there - // look in the Variant for the payload length. - // "payload_length": num - // Payload length override, put this number in as the payload length - // regardless of what size the blob is. - // Note that unless ingnore_payload is true, the emitter will try to output the whole - // payload (and no more) regardless of what this number is. - - void SerializeWithPayload(shared_ptr out, Variant v, SerializeType type, - Variant params = Variant::NullType); - Variant DeserializeWithPayload(shared_ptr in, SerializeType type, - Variant params = Variant::NullType, bool be_safe=true); - - std::string SerializeWithPayload(Variant v, SerializeType type, Variant params = Variant::NullType); - void SerializeWithPayload(const std::string &filename, Variant v, SerializeType type, - Variant params = Variant::NullType); - void SerializeWithPayload(FILE *f, Variant v, SerializeType type, - Variant params = Variant::NullType); - void SerializeWithPayload(std::streambuf *sb, Variant v, SerializeType type, - Variant params = Variant::NullType); - unsigned SerializeWithPayload(void *ptr, unsigned len, Variant v, SerializeType type, - Variant params = Variant::NullType); - - Variant DeserializeWithPayload(const std::string &str, SerializeType type, - Variant params = Variant::NullType); - /// If the be_safe parameter is false, then it is considered OK - // to __/NOT/__ copy the payload and just reference it in the BlobPtr. - // This is only safe when you know your buffer is going to stick around - // until after your done with the resulting Variant. - // (This is to support zero copy) - // No null terminated string version provided as these formats contain nulls. - Variant DeserializeWithPayload(const void *ptr, unsigned len, SerializeType type, - Variant params = Variant::NullType, bool be_safe=true); - Variant DeserializeWithPayloadFile(const char *filename, SerializeType type, - Variant params = Variant::NullType); - Variant DeserializeWithPayloadFile(FILE *f, SerializeType type, - Variant params = Variant::NullType); - Variant DeserializeWithPayloadFile(std::streambuf *sb, SerializeType type, - Variant params = Variant::NullType); - - - /// Bundle is a simple format used internally at ARL for passing around - // a textual key value map plus a binary payload. The payload is often a very large - // array of numbers that would produce unacceptable overhead to serialize into text. - // These serialize routines assume that the passed in Variant is of MapType - // and if a key named "payload.data" exists it is to be written as the payload - // of the Bundle. - // - // If a key "payload.data" does not exist, these are almost the same as using the BundleHdrEmitter - // except it adds a null byte at the end. - inline std::string SerializeBundle(Variant v) - { return SerializeWithPayload(v, SERIALIZE_BUNDLEHDR); } - inline void SerializeBundle(const std::string &filename, Variant v) - { SerializeWithPayload(filename, v, SERIALIZE_BUNDLEHDR); } - inline void SerializeBundle(FILE *f, Variant v) - { SerializeWithPayload(f, v, SERIALIZE_BUNDLEHDR); } - inline void SerializeBundle(std::streambuf *sb, Variant v) - { SerializeWithPayload(sb, v, SERIALIZE_BUNDLEHDR); } - inline unsigned SerializeBundle(void *ptr, unsigned len, Variant v) - { return SerializeWithPayload(ptr, len, v, SERIALIZE_BUNDLEHDR); } - - inline Variant DeserializeBundle(const std::string &str) - { return DeserializeWithPayload(str, SERIALIZE_BUNDLEHDR); } - /// If the be_safe parameter is false, then it is considered OK - // to __/NOT/__ copy the payload and just reference it in the BlobPtr. - // This is only safe when you know your buffer is going to stick around - // until after your done with the resulting Variant. - // (This is to support zero copy) - // No null terminated string version provided as bundles contain nulls. - inline Variant DeserializeBundle(const void *ptr, unsigned len, bool be_safe=true) - { return DeserializeWithPayload(ptr, len, SERIALIZE_BUNDLEHDR, Variant::NullType, be_safe); } - inline Variant DeserializeBundleFile(const char *filename) - { return DeserializeWithPayloadFile(filename, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleFile(FILE *f) { return DeserializeWithPayloadFile(f, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleFile(std::streambuf *sb) - { return DeserializeWithPayloadFile(sb, SERIALIZE_BUNDLEHDR); } - -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/Schema.h b/src/hos_libvariant/include/hos_libvariant/Variant/Schema.h deleted file mode 100644 index fd0d3d39..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/Schema.h +++ /dev/null @@ -1,174 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief A schema validator. - * - * This code is based on the public domain JSONv4 validator tv4. - * tv4 is available at http://geraintluff.github.com/tv4/ - */ -#ifndef VARIANT_SCHEMA_H -#define VARIANT_SCHEMA_H -#pragma once -#include -#include -#include -#include -#include -namespace libvariant { - - class SchemaResult; - - class ValidationError { - public: - ValidationError(const std::string &m, const Path &dpath, - const Path &spath); - - void AddSubError(const SchemaResult &err); - - const std::string &GetMessage() const { return message; } - const Path &GetDataPath() const { return data_path; } - std::string GetDataPathStr() const; - const Path &GetSchemaPath() const { return schema_path; } - std::string GetSchemaPathStr() const; - const std::vector &GetSubErrors() const { return sub_errors; } - - std::string PrettyPrintMessage() const; - void PrettyPrintMessage(std::ostream &os, unsigned indent=0) const; - private: - std::string message; - Path data_path; - Path schema_path; - std::vector sub_errors; - }; - - class SchemaError { - public: - SchemaError(const std::string &m, const Path &spath); - - const std::string &GetMessage() const { return message; } - const Path &GetSchemaPath() const { return schema_path; } - std::string GetSchemaPathStr() const; - - std::string PrettyPrintMessage() const; - void PrettyPrintMessage(std::ostream &os, unsigned indent=0) const; - private: - std::string message; - Path schema_path; - }; - - class SchemaResult { - public: - SchemaResult(); - - void AddError(const ValidationError &err); - void AddSchemaError(const SchemaError &err); - - bool Error() const { return !errors.empty() || !schema_errors.empty(); } - bool ValidationErrors() const { return !errors.empty(); } - bool SchemaErrors() const { return !schema_errors.empty(); } - - const std::vector &GetErrors() const { return errors; } - const std::vector &GetSchemaErrors() const { return schema_errors; } - - std::string PrettyPrintMessage() const; - void PrettyPrintMessage(std::ostream &os, unsigned indent=0) const; - private: - std::vector errors; - std::vector schema_errors; - }; - - inline std::ostream &operator<<(std::ostream &os, const SchemaResult &sr) { - sr.PrettyPrintMessage(os); - return os; - } - - class SchemaLoader { - public: - class LoaderError { - public: - LoaderError(); - ~LoaderError(); - void AddError(const std::string &uri, const std::string &msg); - std::string GetErrorMessage() const { return erross.str(); } - private: - std::ostringstream erross; - }; - - typedef bool (*MissingHandlerType)(SchemaLoader*,const std::string&,LoaderError &,void*); - SchemaLoader(); - SchemaLoader(SchemaLoader *b); - virtual ~SchemaLoader(); - // Get the schema at the uri specified. - // Internal lookup first, then call HandleMissing if the uri is not internally available. - // If the schema then is still not available return Variant::NullType. - virtual Variant GetSchema(const std::string &uri); - // Add a schema to the loader at the uri specified. - // returns the schema(s) added with the corresponding uri(s) - virtual std::map AddSchema(const std::string &uri, Variant schema); - // Forget a schema with the specified uri. - virtual void ForgetSchema(const std::string &uri); - // Called when a schema is not in the loader. - // Default implementation is to call the missing handler - // or add a not found error to the LoaderError and return false - // Return true on success, otherwise false, any errors are filled into the LoaderError - virtual bool HandleMissing(const std::string &uri, LoaderError &error); - void SetMissingHandler(MissingHandlerType, void *ctx); - - static void NormSchema(Variant &schema, const std::string &uri); - //! - // A realpath function for schema URIs. - // href is the "current working directory" and base is - // possibly a relative path. - static std::string ResolveURI(const std::string &base, const std::string &href); - - struct URIInfo { - std::string href; // EX: the whole uri if matched - std::string protocol; // EX: http:// - std::string authority; // user:host@hostname:port - std::string pathname; // The path segment - std::string search; // ?q=234 - std::string hash; // #tag - }; - - //! Break a uri into its components and store them into the URIInfo struct - //! returns true if the parsing was successful - static bool ParseURI(URIInfo &info, const std::string &uri); - protected: - - static void SearchForTrustedSchemas(std::map &m, Variant schema, const std::string &uri); - MissingHandlerType missingHandler; - void *missingctx; - std::map schemas; - SchemaLoader *base; - }; - - //! Validate data against a schema. - //! - //! The schema parameter is either a schema, a string uri to a schema, or null. - //! If it is a schema then data is validated against it. - //! If it is a string then it calls loader->GetSchema() and validates data against the result. - //! If schema is null, then look for a key "$schema" in data, set schema to it and proceed as above. - SchemaResult SchemaValidate(Variant schema, Variant data, SchemaLoader *loader=0); - - //! Add the defaults specified in schema to data if they do not exist. - //! Ignores default in some combinations and types that could match multiple entries (not, - //! additionalProperties, patternProperties, etc.) - //! schema is processed the same as for SchemaValidate - void AddSchemaDefaults(Variant schema, VariantRef data, SchemaLoader *loader=0); -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/SchemaLoader.h b/src/hos_libvariant/include/hos_libvariant/Variant/SchemaLoader.h deleted file mode 100644 index 54dfe55a..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/SchemaLoader.h +++ /dev/null @@ -1,53 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief An advanced schema loader. - */ -#ifndef VARIANT_SCHEMALOADER_H -#define VARIANT_SCHEMALOADER_H -#pragma once - -#include - -namespace libvariant { - - //! The advanced schema loader will try to load missing schemas from - //! the file system and optionally curl if built. - //! If the url begins with file:// it will always use LoadFromFile - //! otherwise if the protocol is empty it will try loading from a file - //! then try loading from curl. Otherwise if the protocol is not file:// - //! it will try to load from curl. - class AdvSchemaLoader : public SchemaLoader { - public: - - //! The advanced schema loader will search for a schema in the paths - //! added to it on the file system. If the schema uri looks like a - //! relative path, then it will be searched for in the paths set with - //! this function. If no paths are added, then only absolute paths will - //! be looked up in the file system. - // - void AddPath(const std::string &path); - - virtual bool HandleMissing(const std::string &uri, LoaderError &error); - protected: - bool LoadFromFile(URIInfo &info, LoaderError &error); - bool LoadFromCurl(URIInfo &info, LoaderError &error); - std::vector< std::string > paths; - }; -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/SharedPtr.h b/src/hos_libvariant/include/hos_libvariant/Variant/SharedPtr.h deleted file mode 100644 index 9fe22a68..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/SharedPtr.h +++ /dev/null @@ -1,40 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_SHAREDPTR_H -#define VARIANT_SHAREDPTR_H -#pragma once -#include - -#if defined(__GXX_EXPERIMENTAL_CXX0X) || __cplusplus >= 201103L || defined(HAVE_CXX11_SHAREDPTR) -// The C++11 implementation is available -#include -namespace libvariant { - using std::shared_ptr; - using std::dynamic_pointer_cast; -} - -#elif defined(HAVE_TR1_SHAREDPTR) -// Use the tr1 implementation -#include -namespace libvariant { - using std::tr1::shared_ptr; - using std::tr1::dynamic_pointer_cast; -} - -#elif defined(USE_BOOST_SHAREDPTR) -// Use the boost implementation -#include -namespace libvariant { - using boost::shared_ptr; - using boost::dynamic_pointer_cast; -} - -#else - -#error libvariant requires a shared_ptr implementation - -#endif - -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/Variant.h b/src/hos_libvariant/include/hos_libvariant/Variant/Variant.h deleted file mode 100644 index a01d2380..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/Variant.h +++ /dev/null @@ -1,815 +0,0 @@ -// vim: foldmethod=marker -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= - -/** \file - * - * \brief Main implementation file for Variant and related functions - */ - - -#ifndef VARIANT_VARIANT_H -#define VARIANT_VARIANT_H -#pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace libvariant { - - /** \brief The Variant class. - * This is a variant type inspired by types from several different - * scripting languages. - * - * \author John Bridgman - * - * This class gives the power and convenience of a scripting language variable - * to C++ with all the same /downsides/ that such a variable has as well. The - * main idea is that things should be simple, lists are behind the scenes an - * std::vector and maps are an std::map. - * - * A Variant may be null, a number, a string, a boolean, a reference to a list, - * or a reference to a map. This means that const Variant of a map is not a - * const map but a const reference. Lists and maps are reference counted. If - * one wants to copy use the Copy member function. - * - * If you need a reference to a Variant to assign to it or change its type, - * use VariantRef. - * A const Variant & should be used for an immutable reference. - * E.g., void foo(VariantRef inout_param, const Variant &in_param); - * That is to say, if you think you want Variant &, you don't, you want - * VariantRef. - * The library is written so that: - * Variant v; - * void bar(Variant &); - * bar(v["foo"]); - * is a compile error. - * But - * Variant v; - * void moo(const Variant &); - * moo(v["moo"]); - * is correct. - * - * - * Note that this implementation will let you create a back reference (i.e., a - * map with itself as a member) but unless the user explicitly breaks it, it - * will result in a memory leak. Checking for this case was deemed too - * expensive. - * - * A Variant will only change its own type if the type is null. That is to say - * that a null Variant that gets treated as a map will become a map. But, a - * Variant of any other type will never automatically convert. - * - */ - class Variant : protected Internal::Data, public VariantDefines { - public: - - typedef VariantRefImpl VariantRef; - - typedef std::vector List; - typedef std::map Map; - - typedef Map::iterator MapIterator; - typedef Map::const_iterator ConstMapIterator; - typedef List::iterator ListIterator; - typedef List::const_iterator ConstListIterator; - - Variant() {} - Variant(VariantDefines::Type_t type) { Assign(type); } - Variant(bool v) { Assign(v); } - - Variant(int v) { Assign(v); } - Variant(unsigned v) { Assign(v); } - Variant(long v) { Assign(v); } - Variant(unsigned long v) { Assign(v); } - Variant(long long v) { Assign(v); } - Variant(unsigned long long v) { Assign(v); } - Variant(double v) { Assign(v); } - Variant(long double v) { Assign(v); } - - Variant(BlobPtr b) { Assign(b); } - - Variant(const std::string &v) { Assign(v); } - Variant(const char *v) { Assign(v); } - Variant(const Variant &v) { Assign(v); } - Variant(const VariantRefImpl &v) { Assign(v); } - - /// Construct a list from a std::vector. - template - Variant(const std::vector &v) { Assign(v); } - - /// Construct a map from a std::map. - template - Variant(const std::map &v) { Assign(v); } - - ~Variant(); - - Variant &operator=(const Variant &o) { Assign(o); return *this; } - - Variant &operator=(VariantDefines::Type_t v) { Assign(v); return *this; } - Variant &operator=(bool v) { Assign(v); return *this; } - Variant &operator=(int v) { Assign(v); return *this; } - Variant &operator=(unsigned v) { Assign(v); return *this; } - Variant &operator=(long v) { Assign(v); return *this; } - Variant &operator=(unsigned long v) { Assign(v); return *this; } - Variant &operator=(long long v) { Assign(v); return *this; } - Variant &operator=(unsigned long long v) { Assign(v); return *this; } - Variant &operator=(double v) { Assign(v); return *this; } - Variant &operator=(long double v) { Assign(v); return *this; } - Variant &operator=(BlobPtr v) { Assign(v); return *this; } - Variant &operator=(const std::string & v) { Assign(v); return *this; } - Variant &operator=(const char * v) { Assign(v); return *this; } - - template - Variant &operator=(const std::vector &v) { Assign(v); return *this; } - template - Variant &operator=(const std::map &v) { Assign(v); return *this; } - - // Type query functions - - Type_t GetType() const; ///< Return the type of this Variant - - bool IsNull() const { return NullType == GetType(); } - bool IsBool() const { return BoolType == GetType(); } - bool IsTrue() const { return (BoolType == GetType()) && AsBool(); } - bool IsFalse() const { return (BoolType == GetType()) && !AsBool(); } - bool IsNumber() const - { return IntegerType == GetType() || UnsignedType == GetType() || FloatType == GetType(); } - bool IsInt() const { return IntegerType == GetType(); } - bool IsUnsigned() const { return UnsignedType == GetType(); } - bool IsFloat() const { return FloatType == GetType(); } - bool IsString() const { return StringType == GetType(); } - bool IsList() const { return ListType == GetType(); } - bool IsMap() const { return MapType == GetType(); } - bool IsBlob() const { return BlobType == GetType(); } - - - // Accessor functions - - bool AsBool() const; ///< Return the value as a bool - long double AsLongDouble() const; ///< Return the value as a long double - double AsDouble() const { return (double)AsLongDouble(); } - uintmax_t AsUnsigned() const; ///< Return the value as an unsigned - intmax_t AsInt() const; ///< Return the value as an integer - template - T AsNumber() const { return static_cast(AsLongDouble()); } - std::string AsString() const; ///< Return the value as a string - BlobPtr AsBlob(); - ConstBlobPtr AsBlob() const; - - template - T As() const; - - /// \brief If the type is string, list, map or blob returns its size, - /// otherwise throws an exception - unsigned Size() const; - - /// \brief If the type is string, list or map return if size == 0 otherwise - /// throw an exception - bool Empty() const; - - /// \brief If the type is string, list or map, empty the container otherwise - /// set type to NullType - void Clear(); - - // List specific accessors - List &AsList(); - const List &AsList() const; - ListIterator ListBegin() ///< Equivalent to AsList().begin() - { return AsList().begin(); } - ConstListIterator ListBegin() const ///< Equivalent to AsList().begin() - { return AsList().begin(); } - ListIterator ListEnd() ///< Equivalent to AsList().end() - { return AsList().end(); } - ConstListIterator ListEnd() const ///< Equivalent to AsList().end() - { return AsList().end(); } - VariantRef At(unsigned i); //< Return a proxy/reference to the element at index i - VariantRef At(unsigned i, Variant def); //< sets to def if doesn't exist - const Variant &At(unsigned i) const; - Variant Get(unsigned i) const; //< Return the element at index i or throw - Variant Get(unsigned i, Variant def) const; //< Return the element at index i or return def - Variant &Set(unsigned i, Variant v); //< Set the element at index i to v - /// \brief Only valid when of type ListType Returns *this, so you can - /// do Variant().Append(v1).Append(v2)... - Variant &Append(Variant value); - - /// \brief If list return true if list is at least i in size, if map then convert i - /// to a string, otherwise throw - bool Contains(unsigned i) const; - /// \brief Return the index hat v is at. - /// If v is not contained in the list it return this->Size() - unsigned Index(Variant v) const; - - /// \brief If list set index i to null, if index at end, reduce size by 1 - /// throw if not a list - void Erase(unsigned i); - - // Map specific accessors - Map &AsMap(); - const Map &AsMap() const; - MapIterator MapBegin() ///< Equivalent to AsMap().begin() - { return AsMap().begin(); } - ConstMapIterator MapBegin() const ///< Equivalent to AsMap().begin() - { return AsMap().begin(); } - MapIterator MapEnd() ///< Equivalent to AsMap().end() - { return AsMap().end(); } - ConstMapIterator MapEnd() const ///< Equivalent to AsMap().end() - { return AsMap().end(); } - VariantRef At(const std::string &s); // Return a proxy/reference to the element at key s - VariantRef At(const std::string &s, Variant def); //< Sets to def if doesn't exist and return a reference to it - const Variant &At(const std::string &s) const; - - /// \brief If s in *this: return this->At(s); else throw; - Variant Get(const std::string &s) const; - /// \brief If s in *this: return this->At(s); else return def - /// Only works if type is map - Variant Get(const std::string &s, Variant def) const; - - /// \brief Set the key s to v - // returns *this - Variant &Set(const std::string &s, Variant v); - - /// \brief If map return true if s is a key in the map, if list then convert - /// s to an unsigned and the above Contains, otherwise throw - bool Contains(const std::string &s) const; - /// \brief Erase a key in a map, throws if type is not MapType - void Erase(const std::string &key); - - VariantRef operator[](int i) { return At(i); } - const Variant &operator[](int i) const { return At(i); } - - VariantRef operator[](unsigned i) { return At(i); } - const Variant &operator[](unsigned i) const { return At(i); } - - VariantRef operator[](const std::string &s) { return At(s); } - const Variant &operator[](const std::string &s) const { return At(s); } - - // Path related accessors - // These are the same as the non-path functions but take a path instead. - VariantRef AtPath(const Path &path); - VariantRef AtPath(const std::string &path) { return AtPath(ParsePath(path)); } - VariantRef AtPath(const Path &path, Variant def); - VariantRef AtPath(const std::string &path, Variant def) { return AtPath(ParsePath(path), def); } - const Variant &AtPath(const Path &path) const; - const Variant &AtPath(const std::string &path) const { return AtPath(ParsePath(path)); } - - /// \brief Like Variant::Get but it takes a path instead. - Variant GetPath(const Path &path) const; - Variant GetPath(const std::string &path) const { return GetPath(ParsePath(path)); } - /// \brief Like Variant::Get but it takes a path instead. The path is - /// very like xpath, /key[index]/key/key. See Variant/Path.h - Variant GetPath(const Path &path, Variant def) const; - Variant GetPath(const std::string &path, Variant def) const { return GetPath(ParsePath(path), def); } - - /// \brief Set the value at the path, creating elements if they do not - /// exist. throws if an intermediate path element exists but is not a - /// map or list. returns *this - Variant &SetPath(const Path &path, Variant val); - Variant &SetPath(const std::string &path, Variant val) { return SetPath(ParsePath(path), val); } - - /// \brief Erase a value at a path, if remove_empty is false only erase the very end - /// otherwise erase empty lists and maps in the path. returns *this - Variant &ErasePath(const Path &path, bool remove_empty=false); - Variant &ErasePath(const std::string &path, bool remove_empty=false) - { return ErasePath(ParsePath(path), remove_empty); } - - /// \brief Tester functions for paths, returns true if path is valid and exists. - bool HasPath(const Path &path) const; - bool HasPath(const std::string &path) const { return HasPath(ParsePath(path)); } - - /// \brief Just like Variant::Get except a reference to the value to - /// set is passed in and Variant does the casting. - template - void GetInto(T &lvalue, const std::string &s) const; - - /// \brief An into version of GetPath - template - void GetPathInto(T &lvalue, const Path &path) const; - template - void GetPathInto(T &lvalue, const std::string &path) const - { GetPathInto(lvalue, ParsePath(path)); } - - /// \brief Just like Variant::Get except a reference to the value to - /// set is passed in and Variant does the casting. - template - void GetInto(T &lvalue, const std::string &s, const T &def) const; - - /// \brief An into version of GetPath - template - void GetPathInto(T &lvalue, const Path &path, const T &def) const; - template - void GetPathInto(T &lvalue, const std::string &path, const T &def) const - { GetPathInto(lvalue, ParsePath(path), def); } - - /// \brief This type and other type must be MapType. - /// for (k, v) in other: this[k] = v - void Merge(Variant other); - - /// \brief Comparison operator - /// Returns -1 if we are less than other - /// 0 if we are equal - /// 1 if we are greater than - /// This function always returns 1 if Comparable returns false - /// This compare is not completely consistent - /// i.e. it can be such that two Variants are - /// both < and > (ex map and list types) - int Compare(const Variant &other) const; - - /// \brief Return true if this and other are comparable. Two types are - /// considered comparable if they have the same type or if they are both - /// number types. - bool Comparable(const Variant &other) const; - - void Incr(); - void Decr(); - void Add(const Variant &o); - void Sub(const Variant &o); - void Mul(const Variant &o); - void Div(const Variant &o); - void Rem(const Variant &o); - - Variant Neg() const; - - Variant &operator++() { Incr(); return *this; } - Variant &operator--() { Decr(); return *this; } - Variant operator++(int) { Variant tmp = *this; ++(*this); return tmp; } - Variant operator--(int) { Variant tmp = *this; --(*this); return tmp; } - Variant operator-() const { return Neg(); } - Variant operator+() const { return *this; } - - Variant &operator+=(const Variant &o) { Add(o); return *this; } - Variant &operator-=(const Variant &o) { Sub(o); return *this; } - Variant &operator*=(const Variant &o) { Mul(o); return *this; } - Variant &operator/=(const Variant &o) { Div(o); return *this; } - Variant &operator%=(const Variant &o) { Rem(o); return *this; } - - VariantRef Ref(); //< Return a new VariantRef to this Variant - Variant Copy() const; //< Return a copy of this Variant - Variant &Resolve(); //< Return *this or return the Variant this is a reference to - const Variant &Resolve() const; - /// Return *this or Variant referenced to if exists, otherwise create it with def. - Variant &Resolve(const Variant &def); - /// Return weather or not Resolve() const would throw. - bool Exists() const; - - /// Make this equal other. - void Assign(const Variant &other); - - void Assign(VariantDefines::Type_t type); - void Assign(bool v); - void Assign(int v); - void Assign(unsigned v); - void Assign(long v); - void Assign(unsigned long v); - void Assign(long long v); - void Assign(unsigned long long v); - void Assign(double v); - void Assign(long double v); - void Assign(BlobPtr b); - void Assign(const std::string &v); - void Assign(const char *v); - - template - void Assign(const std::vector &v) { - Assign(VariantDefines::ListType); - AsList().assign(v.begin(), v.end()); - } - - template - void Assign(const std::map &v) { - Assign(VariantDefines::MapType); - AsMap().insert(v.begin(), v.end()); - } - - protected: - Variant(const RefTag &, const Variant &o); - Variant(const RefTag &, Variant &o, Path::const_iterator b, Path::const_iterator e); - /// Reassing this reference, only available through the VariantRef interface. - /// The regular Assign makes what this is refering to equal the new value, this - /// function makes this reference refer to the new value. - void ReassignRef(const Variant &o); - friend class Internal::VTable; - }; - - typedef VariantRefImpl VariantRef; - - inline bool operator==(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) == 0; } - inline bool operator!=(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) != 0; } - inline bool operator<(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) < 0; } - inline bool operator>(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) > 0; } - inline bool operator<=(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) <= 0; } - inline bool operator>=(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) >= 0; } - - inline Variant operator+(const Variant &lhs, const Variant &rhs) { - Variant ret = lhs; - return ret += rhs; - } - inline Variant operator-(const Variant &lhs, const Variant &rhs) { - Variant ret = lhs; - return ret -= rhs; - } - inline Variant operator*(const Variant &lhs, const Variant &rhs) { - Variant ret = lhs; - return ret *= rhs; - } - inline Variant operator/(const Variant &lhs, const Variant &rhs) { - Variant ret = lhs; - return ret /= rhs; - } - inline Variant operator%(const Variant &lhs, const Variant &rhs) { - Variant ret = lhs; - return ret %= rhs; - } - - /// \defgroup variant_cast Template casting operators. - /// These are for use inside templates to extract the value of a Variant into - /// a templated type. - /// @{ - - template - struct VariantCaster { - static T Cast(const Variant &v); - }; - - // Default - template inline T VariantCaster::Cast(const Variant &v) { return T(v); } - - template - inline T variant_cast(const Variant &v) { return VariantCaster::Cast(v); } - - // Provide specializations for all the basic types - template<> inline bool VariantCaster::Cast(const Variant &v) { return v.AsBool(); } - template<> inline char VariantCaster::Cast(const Variant &v) { return (char)v.AsInt(); } - template<> inline unsigned char VariantCaster::Cast(const Variant &v) { return (unsigned char)v.AsUnsigned(); } - template<> inline signed char VariantCaster::Cast(const Variant &v) { return (signed char)v.AsUnsigned(); } - template<> inline short VariantCaster::Cast(const Variant &v) { return (short)v.AsInt(); } - template<> inline unsigned short VariantCaster::Cast(const Variant &v) { return (unsigned short)v.AsUnsigned(); } - template<> inline int VariantCaster::Cast(const Variant &v) { return (int)v.AsInt(); } - template<> inline unsigned VariantCaster::Cast(const Variant &v) { return (unsigned)v.AsUnsigned(); } - template<> inline long VariantCaster::Cast(const Variant &v) { return (long)v.AsInt(); } - template<> inline unsigned long VariantCaster::Cast(const Variant &v) { return (unsigned long)v.AsUnsigned(); } - template<> inline long long VariantCaster::Cast(const Variant &v) { return (long long)v.AsInt(); } - template<> inline unsigned long long VariantCaster::Cast(const Variant &v) { return (unsigned long long)v.AsUnsigned(); } - template<> inline float VariantCaster::Cast(const Variant &v) { return (float)v.AsDouble(); } - template<> inline double VariantCaster::Cast(const Variant &v) { return v.AsDouble(); } - template<> inline long double VariantCaster::Cast(const Variant &v) { return v.AsLongDouble(); } - template<> inline std::string VariantCaster::Cast(const Variant &v) { return v.AsString(); } - - // Allow things like variant_cast< std::vector >(v) to work - template - struct VariantCaster< std::vector > { - static std::vector Cast(const Variant &v); - }; - - template - inline std::vector VariantCaster< std::vector >::Cast(const Variant &v) { - std::vector ret; - for (Variant::ConstListIterator i(v.ListBegin()), e(v.ListEnd()); i != e; ++i) { - ret.push_back( variant_cast( *i ) ); - } - return ret; - } - - template<> inline Variant::List VariantCaster::Cast(const Variant &v) { return v.AsList(); } - - // allow things like variant_cast< std::map >(v) - // to work - template - struct VariantCaster< std::map > { - static std::map Cast(const Variant &v); - }; - - template - inline std::map VariantCaster< std::map >::Cast(const Variant &v) { - std::map ret; - for (Variant::ConstMapIterator i(v.MapBegin()), e(v.MapEnd()); i != e; ++i) { - ret.insert( std::make_pair( i->first, variant_cast( i->second ) ) ); - } - return ret; - } - - template<> inline Variant::Map VariantCaster::Cast(const Variant &v) { return v.AsMap(); } - - template - struct VariantCaster< std::complex > { - static std::complex Cast(const Variant &v); - }; - - template - std::complex VariantCaster< std::complex >::Cast(const Variant &v) { - if (v.IsNull()) { - return std::complex(); - } else if (v.IsNumber()) { - return std::complex(v.As(), T()); - } else if (v.IsMap()) { - T r = variant_cast(v.Get("real", T())); - T c = variant_cast(v.Get("imag", T())); - return std::complex(r, c); - } else if (v.IsList()) { - if (v.Size() > 1) { - return std::complex(v[0].As(), v[1].As()); - } else if (v.Size() > 0) { - return std::complex(v[0].As(), T()); - } else { - return std::complex(); - } - } - throw UnableToConvertError(v.GetType(), "std::complex"); - } - - /// @} - - template - T Variant::As() const { return variant_cast(*this); } - - template - void Variant::GetInto(T &lvalue, const std::string &s) const { - lvalue = variant_cast(Get(s)); - } - - template - void Variant::GetPathInto(T &lvalue, const Path &p) const { - lvalue = variant_cast(GetPath(p)); - } - - template - void Variant::GetInto(T &lvalue, const std::string &s, const T &def) const { - if (Contains(s)) { lvalue = variant_cast(Get(s)); } - else { lvalue = def; } - } - - template - void Variant::GetPathInto(T &lvalue, const Path &p, const T &def) const { - lvalue = variant_cast(GetPath(p, def)); - } - - class Parser; - /// \brief Takes a parser and produces a Variant from it. - Variant ParseVariant(Parser &p); - - class Emitter; - /// Takes a Variant and Emitter and emits the Variant. - Emitter &operator<<(Emitter &e, const Variant &v); - - /// \brief The different types of serialization supported. - enum SerializeType { - // Attempt to guess the format - // Cannot be specified as an output format. - SERIALIZE_GUESS = 0x0, - - // Built in text formats - SERIALIZE_JSON = 0x00000001, - SERIALIZE_YAML, - SERIALIZE_XMLPLIST, - SERIALIZE_BUNDLEHDR, - - // Built in binary formats - SERIALIZE_MSGPACK = 0x000000FF, - - }; - - - /// \brief An iterator that iterates over all documents that the parser will generate - class LoadAllIterator { - public: - typedef Variant value_type; - typedef ptrdiff_t difference_type; - typedef Variant* pointer; - typedef Variant& reference; - typedef std::forward_iterator_tag iterator_category; - - LoadAllIterator(); - explicit LoadAllIterator(Parser &parser); - Variant &operator*() { return Get(); } - Variant *operator->() { return &Get(); } - Variant &Get(); - void Next(); - LoadAllIterator &operator++() { - Next(); - return *this; - } - LoadAllIterator operator++(int) { - LoadAllIterator copy = *this; - Next(); - return copy; - } - bool operator==(const LoadAllIterator &that) const; - bool operator!=(const LoadAllIterator &that) const { return !(*this == that); } - private: - class Impl; - shared_ptr impl; - struct Value; - shared_ptr value; - }; - - // Some convenience functions - // A version is provided that will go to/from a string, - // a memory buffer, a file name, an open FILE*, and - // a streambuf* (usually acquired through iostream.rdbuf()). - - /// \brief Serialize a Variant to a string using format type. - std::string Serialize(Variant v, SerializeType type, Variant params = Variant::NullType); - /// \brief Serialize a Variant to a file using format type. - void Serialize(const std::string &filename, Variant v, SerializeType type, - Variant params = Variant::NullType); - /// \brief Serialize a Variant to a FILE pointer using format type. - void Serialize(FILE *f, Variant v, SerializeType type, - Variant params = Variant::NullType); - /// \brief Serialize a Variant to a streambuf* (iostrem.rdbuf()) using format type. - void Serialize(std::streambuf *sb, Variant v, SerializeType type, - Variant params = Variant::NullType); - /// \brief Serialize a Variant to a memory buffer of length len, using format type - //and return how many bytes produced. - unsigned Serialize(void *ptr, unsigned len, Variant v, SerializeType type, - Variant params = Variant::NullType); - - // The basic deserializing functions - - /// \brief Attempt to deserialize a string in format type to a Variant - Variant Deserialize(const std::string &str, SerializeType type); - /// \brief Attempt to deserialize a null terminated string in format type to a Variant - Variant Deserialize(const char *str, SerializeType type); - /// \brief Attempt to deserialize a pointer and length in format type to a Variant - Variant Deserialize(const void *ptr, unsigned len, SerializeType type); - /// \brief Attempt to deserialize the file to a Variant in format type - Variant DeserializeFile(const char *filename, SerializeType type); - /// \brief Deserialize from a FILE pointer to a Variant in format type - Variant DeserializeFile(FILE *f, SerializeType type); - /// \brief Deserialize from a streambuf to a Variant in format type - Variant DeserializeFile(std::streambuf *sb, SerializeType type); - - /// \defgroup deserialize_guess Guess format - /// These functions attempt to guess the type of the input. The guessing - /// function only looks at the first non-whitespace character to make the - /// decision. As such on sufficiently badly behaved input can select the - /// wrong format. - /// @{ - Variant DeserializeGuess(const std::string &str); - Variant DeserializeGuess(const char *str); - Variant DeserializeGuess(const void *ptr, unsigned len); - Variant DeserializeGuessFile(const char *filename); - Variant DeserializeGuessFile(FILE *f); - Variant DeserializeGuessFile(std::streambuf *sb); - /// @} - - /// \defgroup deserialize_all Deserialize all elements - /// These functions return an iterator. These are for format types that - /// support multiple documents in one stream. Otherwise same as Deserialize - /// functions above. - /// @{ - LoadAllIterator DeserializeAll(const std::string &str, SerializeType type); - LoadAllIterator DeserializeAll(const char *str, SerializeType type); - LoadAllIterator DeserializeAll(const void *ptr, unsigned len, SerializeType type); - LoadAllIterator DeserializeAllFile(const char *filename, SerializeType type); - /// File must remain open for as long as the iterator is referenced - LoadAllIterator DeserializeAllFile(FILE *f, SerializeType type); - /// Streambuf must exist for as long as the iterator is referenced - LoadAllIterator DeserializeAllFile(std::streambuf *sb, SerializeType type); - /// @} - - - // Serialize and Deserializing JSON - // - inline std::string SerializeJSON(Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - return Serialize(v, SERIALIZE_JSON, param); - } - inline void SerializeJSON(const std::string &filename, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(filename, v, SERIALIZE_JSON, param); - } - inline void SerializeJSON(FILE *f, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(f, v, SERIALIZE_JSON, param); - } - inline void SerializeJSON(std::streambuf *sb, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(sb, v, SERIALIZE_JSON, param); - } - inline unsigned SerializeJSON(void *ptr, unsigned len, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - return Serialize(ptr, len, v, SERIALIZE_JSON, param); - } - inline Variant DeserializeJSON(const std::string &str) { return Deserialize(str, SERIALIZE_JSON); } - inline Variant DeserializeJSON(const char *str) { return Deserialize(str, SERIALIZE_JSON); } - inline Variant DeserializeJSON(const void *ptr, unsigned len) { return Deserialize(ptr, len, SERIALIZE_JSON); } - inline Variant DeserializeJSONFile(const char *filename) { return DeserializeFile(filename, SERIALIZE_JSON); } - inline Variant DeserializeJSONFile(FILE *f) { return DeserializeFile(f, SERIALIZE_JSON); } - inline Variant DeserializeJSONFile(std::streambuf *sb) { return DeserializeFile(sb, SERIALIZE_JSON); } - - //Serialize and Deserialize YAML - // - inline std::string SerializeYAML(Variant v) { return Serialize(v, SERIALIZE_YAML); } - inline void SerializeYAML(const std::string &filename, Variant v) { Serialize(filename, v, SERIALIZE_YAML); } - inline void SerializeYAML(FILE *f, Variant v) { Serialize(f, v, SERIALIZE_YAML); } - inline void SerializeYAML(std::streambuf *sb, Variant v) { Serialize(sb, v, SERIALIZE_YAML); } - inline unsigned SerializeYAML(void *ptr, unsigned len, Variant v) { return Serialize(ptr, len, v, SERIALIZE_YAML); } - - inline Variant DeserializeYAML(const std::string &str) { return Deserialize(str, SERIALIZE_YAML); } - inline Variant DeserializeYAML(const char *str) { return Deserialize(str, SERIALIZE_YAML); } - inline Variant DeserializeYAML(const void *ptr, unsigned len) { return Deserialize(ptr, len, SERIALIZE_YAML); } - inline Variant DeserializeYAMLFile(const char *filename) { return DeserializeFile(filename, SERIALIZE_YAML); } - inline Variant DeserializeYAMLFile(FILE *f) { return DeserializeFile(f, SERIALIZE_YAML); } - inline Variant DeserializeYAMLFile(std::streambuf *sb) { return DeserializeFile(sb, SERIALIZE_YAML); } - - inline LoadAllIterator DeserializeYAMLAll(const std::string &str) { return DeserializeAll(str, SERIALIZE_YAML); } - inline LoadAllIterator DeserializeYAMLAll(const char *str) { return DeserializeAll(str, SERIALIZE_YAML); } - inline LoadAllIterator DeserializeYAMLAll(const void *ptr, unsigned len) { return DeserializeAll(ptr, len, SERIALIZE_YAML); } - inline LoadAllIterator DeserializeYAMLAllFile(const char *filename) { return DeserializeAllFile(filename, SERIALIZE_YAML); } - inline LoadAllIterator DeserializeYAMLAllFile(FILE *f) { return DeserializeAllFile(f, SERIALIZE_YAML); } - inline LoadAllIterator DeserializeYAMLAllFile(std::streambuf *sb) { return DeserializeAllFile(sb, SERIALIZE_YAML); } - - //Serialize and Deserialize XML plist - // - inline std::string SerializeXMLPLIST(Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - return Serialize(v, SERIALIZE_XMLPLIST, param); - } - inline void SerializeXMLPLIST(const std::string &filename, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(filename, v, SERIALIZE_XMLPLIST, param); - } - inline void SerializeXMLPLIST(FILE *f, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(f, v, SERIALIZE_XMLPLIST, param); - } - inline void SerializeXMLPLIST(std::streambuf *sb, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(sb, v, SERIALIZE_XMLPLIST, param); - } - inline unsigned SerializeXMLPLIST(void *ptr, unsigned len, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - return Serialize(ptr, len, v, SERIALIZE_XMLPLIST, param); - } - - inline Variant DeserializeXMLPLIST(const std::string &str) { return Deserialize(str, SERIALIZE_XMLPLIST); } - inline Variant DeserializeXMLPLIST(const char *str) { return Deserialize(str, SERIALIZE_XMLPLIST); } - inline Variant DeserializeXMLPLIST(const void *ptr, unsigned len) { return Deserialize(ptr, len, SERIALIZE_XMLPLIST); } - inline Variant DeserializeXMLPLISTFile(const char *filename) { return DeserializeFile(filename, SERIALIZE_XMLPLIST); } - inline Variant DeserializeXMLPLISTFile(FILE *f) { return DeserializeFile(f, SERIALIZE_XMLPLIST); } - inline Variant DeserializeXMLPLISTFile(std::streambuf *sb) { return DeserializeFile(sb, SERIALIZE_XMLPLIST); } - - //Serialize and Deserialize BundleHdr - // - // BundleHdr requires the root element to be of MapType and - // no submaps exist. - // - // Note that these do not add a null byte to the end. - // Use SerializeBundle for that. - - inline std::string SerializeBundleHdr(Variant v) { - Variant param = Variant::MapType; - return Serialize(v, SERIALIZE_BUNDLEHDR, param); - } - inline void SerializeBundleHdr(const std::string &filename, Variant v) { - Variant param = Variant::MapType; - Serialize(filename, v, SERIALIZE_BUNDLEHDR, param); - } - inline void SerializeBundleHdr(FILE *f, Variant v) { - Variant param = Variant::MapType; - Serialize(f, v, SERIALIZE_BUNDLEHDR, param); - } - inline void SerializeBundleHdr(std::streambuf *sb, Variant v) { - Variant param = Variant::MapType; - Serialize(sb, v, SERIALIZE_BUNDLEHDR, param); - } - inline unsigned SerializeBundleHdr(void *ptr, unsigned len, Variant v) { - Variant param = Variant::MapType; - return Serialize(ptr, len, v, SERIALIZE_BUNDLEHDR, param); - } - - inline Variant DeserializeBundleHdr(const std::string &str) { return Deserialize(str, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleHdr(const char *str) { return Deserialize(str, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleHdr(const void *ptr, unsigned len) { return Deserialize(ptr, len, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleHdrFile(const char *filename) { return DeserializeFile(filename, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleHdrFile(FILE *f) { return DeserializeFile(f, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleHdrFile(std::streambuf *sb) { return DeserializeFile(sb, SERIALIZE_BUNDLEHDR); } - -} - -/// Debug function not inside the namespace to print out a variant (calls SerializeJSON) -void VariantPrint(const libvariant::Variant v); - -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/VariantDefines.h b/src/hos_libvariant/include/hos_libvariant/Variant/VariantDefines.h deleted file mode 100644 index 6a6df997..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/VariantDefines.h +++ /dev/null @@ -1,50 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_DEFINES_H -#define VARIANT_DEFINES_H - -#ifdef __GNUC__ -#define DEPRECATED __attribute__((deprecated)) -#elif defined(_MSC_VER) -#define DEPRECATED __declspec(deprecated) -#else -#pragma message("WARNING: You need to implement DEPRECATED for this compiler") -#define DEPRECATED -#endif - -namespace libvariant { - class VariantDefines { - public: - enum Type_t { - NullType = 0, // Explicitly defined as 0 - BoolType, - IntegerType, - UnsignedType, - FloatType, - StringType, - ListType, - MapType, - BlobType - }; - - }; -} -#endif diff --git a/src/hos_libvariant/include/hos_libvariant/Variant/VariantInternal.h b/src/hos_libvariant/include/hos_libvariant/Variant/VariantInternal.h deleted file mode 100644 index 5d9ed0f3..00000000 --- a/src/hos_libvariant/include/hos_libvariant/Variant/VariantInternal.h +++ /dev/null @@ -1,95 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_BASE_H -#define VARIANT_BASE_H -#include -#include -#include -#include -#include -#include -#include -#include -namespace libvariant { - - struct RefTag {}; - - class Variant; - template class VariantRefImpl; - - - /** - * Action implementation for the VariantRef class. - */ - template - class VariantRefImpl : public Base { - public: - VariantRefImpl(const Variant &o) : Base(RefTag(), o) {} - VariantRefImpl(Variant &o, const Path &path) - : Base(RefTag(), o, path.begin(), path.end()) {} - VariantRefImpl(Variant &o, Path::const_iterator b, Path::const_iterator e) - : Base(RefTag(), o, b, e) {} - VariantRefImpl(const VariantRefImpl &o) - : Base(RefTag(), o) {} - - using Base::operator=; - using Base::As; - using Base::AsNumber; - using Base::GetInto; - using Base::GetPathInto; - using Base::Assign; - - using Base::ReassignRef; - }; - - namespace Internal { - - class VTable; - struct Storage; - struct MapStorage; - struct ListStorage; - struct ProxyStorage; - struct RefData; - - struct Data { - Data(); - const VTable *vtable; - union { - bool b; - long double f; - intmax_t i; - uintmax_t u; - std::string *s; - MapStorage *m; - ListStorage *l; - BlobPtr *blob; - Data *ref; - ProxyStorage *proxy; - }; - shared_ptr ref_data; - shared_ptr storage; - }; - } - - - -} -#endif diff --git a/src/hos_libvariant/package.xml b/src/hos_libvariant/package.xml deleted file mode 100644 index c180d622..00000000 --- a/src/hos_libvariant/package.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - hos_libvariant - 0.0.0 - The hos_libvariant package - - - - - matzman - - - - - - TODO - - - - - - - - - - - - - - - - - - - - roscpp - - - - - roscpp - - - catkin - - - - - - - - \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/.hg/00changelog.i b/src/hos_libvariant/src/libvariant/.hg/00changelog.i deleted file mode 100644 index d3a83110..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/00changelog.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/branch b/src/hos_libvariant/src/libvariant/.hg/branch deleted file mode 100644 index 4ad96d51..00000000 --- a/src/hos_libvariant/src/libvariant/.hg/branch +++ /dev/null @@ -1 +0,0 @@ -default diff --git a/src/hos_libvariant/src/libvariant/.hg/cache/branch2-served b/src/hos_libvariant/src/libvariant/.hg/cache/branch2-served deleted file mode 100644 index 3fe9b174..00000000 --- a/src/hos_libvariant/src/libvariant/.hg/cache/branch2-served +++ /dev/null @@ -1,2 +0,0 @@ -055488b93468e27c2893da3834e86506b1cd4b10 4 -055488b93468e27c2893da3834e86506b1cd4b10 o default diff --git a/src/hos_libvariant/src/libvariant/.hg/dirstate b/src/hos_libvariant/src/libvariant/.hg/dirstate deleted file mode 100644 index 105dbfaa..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/dirstate and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/hgrc b/src/hos_libvariant/src/libvariant/.hg/hgrc deleted file mode 100644 index 383f66f2..00000000 --- a/src/hos_libvariant/src/libvariant/.hg/hgrc +++ /dev/null @@ -1,2 +0,0 @@ -[paths] -default = https://bitbucket.org/gallen/libvariant diff --git a/src/hos_libvariant/src/libvariant/.hg/requires b/src/hos_libvariant/src/libvariant/.hg/requires deleted file mode 100644 index f634f664..00000000 --- a/src/hos_libvariant/src/libvariant/.hg/requires +++ /dev/null @@ -1,4 +0,0 @@ -dotencode -fncache -revlogv1 -store diff --git a/src/hos_libvariant/src/libvariant/.hg/store/00changelog.i b/src/hos_libvariant/src/libvariant/.hg/store/00changelog.i deleted file mode 100644 index bba22b48..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/00changelog.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/00manifest.i b/src/hos_libvariant/src/libvariant/.hg/store/00manifest.i deleted file mode 100644 index 0abb1db3..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/00manifest.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/_c_make_lists.txt.i b/src/hos_libvariant/src/libvariant/.hg/store/data/_c_make_lists.txt.i deleted file mode 100644 index bd21e021..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/_c_make_lists.txt.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/_config.h.in.i b/src/hos_libvariant/src/libvariant/.hg/store/data/_config.h.in.i deleted file mode 100644 index 8a20bbb9..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/_config.h.in.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/_doxyfile.in.i b/src/hos_libvariant/src/libvariant/.hg/store/data/_doxyfile.in.i deleted file mode 100644 index 04d86a43..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/_doxyfile.in.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/_l_i_c_e_n_s_e.i b/src/hos_libvariant/src/libvariant/.hg/store/data/_l_i_c_e_n_s_e.i deleted file mode 100644 index b5d8a843..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/_l_i_c_e_n_s_e.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/_lib_variant_build_tree_settings.cmake.in.i b/src/hos_libvariant/src/libvariant/.hg/store/data/_lib_variant_build_tree_settings.cmake.in.i deleted file mode 100644 index e3a6505b..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/_lib_variant_build_tree_settings.cmake.in.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/_lib_variant_config.cmake.in.i b/src/hos_libvariant/src/libvariant/.hg/store/data/_lib_variant_config.cmake.in.i deleted file mode 100644 index 409a060f..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/_lib_variant_config.cmake.in.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/_lib_variant_config_version.cmake.in.i b/src/hos_libvariant/src/libvariant/.hg/store/data/_lib_variant_config_version.cmake.in.i deleted file mode 100644 index 741dcd29..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/_lib_variant_config_version.cmake.in.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/_r_e_a_d_m_e.i b/src/hos_libvariant/src/libvariant/.hg/store/data/_r_e_a_d_m_e.i deleted file mode 100644 index a9cf8614..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/_r_e_a_d_m_e.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/_r_e_a_d_m_e.md.i b/src/hos_libvariant/src/libvariant/.hg/store/data/_r_e_a_d_m_e.md.i deleted file mode 100644 index 73a2c22e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/_r_e_a_d_m_e.md.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/cmake/_modules/_find_lib_y_a_m_l.cmake.i b/src/hos_libvariant/src/libvariant/.hg/store/data/cmake/_modules/_find_lib_y_a_m_l.cmake.i deleted file mode 100644 index 2aeff885..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/cmake/_modules/_find_lib_y_a_m_l.cmake.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/cmake/_modules/_find_msg_pack.cmake.i b/src/hos_libvariant/src/libvariant/.hg/store/data/cmake/_modules/_find_msg_pack.cmake.i deleted file mode 100644 index 8289cdf8..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/cmake/_modules/_find_msg_pack.cmake.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/cmake/_modules/_make_t_b_z2.cmake.i b/src/hos_libvariant/src/libvariant/.hg/store/data/cmake/_modules/_make_t_b_z2.cmake.i deleted file mode 100644 index 7b78398f..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/cmake/_modules/_make_t_b_z2.cmake.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/_c_make_lists.txt.i b/src/hos_libvariant/src/libvariant/.hg/store/data/examples/_c_make_lists.txt.i deleted file mode 100644 index e8da8afc..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/_c_make_lists.txt.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/_r_e_a_d_m_e.i b/src/hos_libvariant/src/libvariant/.hg/store/data/examples/_r_e_a_d_m_e.i deleted file mode 100644 index dfea5a7a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/_r_e_a_d_m_e.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/arg__parse.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/examples/arg__parse.cc.i deleted file mode 100644 index d02c9324..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/arg__parse.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/convert.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/examples/convert.cc.i deleted file mode 100644 index 282fa997..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/convert.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/example1.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/examples/example1.cc.i deleted file mode 100644 index e391ac4a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/example1.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/example2.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/examples/example2.cc.i deleted file mode 100644 index 2df50ca1..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/example2.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/list__example.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/examples/list__example.cc.i deleted file mode 100644 index 3e99f72e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/list__example.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/map__example.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/examples/map__example.cc.i deleted file mode 100644 index 8abf93d3..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/map__example.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/pretty__print.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/examples/pretty__print.cc.i deleted file mode 100644 index 2d53158b..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/examples/pretty__print.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_arg_parse.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_arg_parse.h.i deleted file mode 100644 index 36b506ea..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_arg_parse.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_blob.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_blob.h.i deleted file mode 100644 index 33a64ce6..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_blob.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_emitter.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_emitter.h.i deleted file mode 100644 index ff25041e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_emitter.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_emitter_output.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_emitter_output.h.i deleted file mode 100644 index 47823098..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_emitter_output.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_exceptions.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_exceptions.h.i deleted file mode 100644 index be10ff44..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_exceptions.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_extensions.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_extensions.h.i deleted file mode 100644 index cbad4713..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_extensions.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_guess_format.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_guess_format.h.i deleted file mode 100644 index c84269aa..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_guess_format.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_parser.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_parser.h.i deleted file mode 100644 index 3b383209..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_parser.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_parser_input.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_parser_input.h.i deleted file mode 100644 index eb7d1bc4..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_parser_input.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_path.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_path.h.i deleted file mode 100644 index 872e2341..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_path.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_payload.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_payload.h.i deleted file mode 100644 index f69a4fe2..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_payload.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_schema.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_schema.h.i deleted file mode 100644 index 70c99b2d..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_schema.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_schema_loader.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_schema_loader.h.i deleted file mode 100644 index acb7b99a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_schema_loader.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_shared_ptr.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_shared_ptr.h.i deleted file mode 100644 index a46b91c0..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_shared_ptr.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_variant.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_variant.h.i deleted file mode 100644 index f70b1363..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_variant.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_variant_defines.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_variant_defines.h.i deleted file mode 100644 index 5c1bf16d..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_variant_defines.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_variant_internal.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_variant_internal.h.i deleted file mode 100644 index d3d765ad..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/include/_variant/_variant_internal.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/lib/json/_j_s_o_n___p_a_r_s_e_r___r_e_a_d_m_e.htm.i b/src/hos_libvariant/src/libvariant/.hg/store/data/lib/json/_j_s_o_n___p_a_r_s_e_r___r_e_a_d_m_e.htm.i deleted file mode 100644 index ed0de587..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/lib/json/_j_s_o_n___p_a_r_s_e_r___r_e_a_d_m_e.htm.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/lib/json/_j_s_o_n__parser.c.i b/src/hos_libvariant/src/libvariant/.hg/store/data/lib/json/_j_s_o_n__parser.c.i deleted file mode 100644 index bdd500f3..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/lib/json/_j_s_o_n__parser.c.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/lib/json/_j_s_o_n__parser.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/lib/json/_j_s_o_n__parser.h.i deleted file mode 100644 index 40cafbe9..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/lib/json/_j_s_o_n__parser.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/libvariant.pc.in.i b/src/hos_libvariant/src/libvariant/.hg/store/data/libvariant.pc.in.i deleted file mode 100644 index 5e28a035..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/libvariant.pc.in.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_arg_parse.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_arg_parse.cc.i deleted file mode 100644 index efda5e61..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_arg_parse.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_base64.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_base64.cc.i deleted file mode 100644 index 5a7909ce..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_base64.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_base64.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_base64.h.i deleted file mode 100644 index 21e08302..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_base64.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_blob.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_blob.cc.i deleted file mode 100644 index 4a32c6af..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_blob.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_blob_magic.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_blob_magic.h.i deleted file mode 100644 index bcdb5528..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_blob_magic.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_emitter.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_emitter.cc.i deleted file mode 100644 index c97ca434..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_emitter.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_emitter.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_emitter.h.i deleted file mode 100644 index 2bab3ea4..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_emitter.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_parser.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_parser.cc.i deleted file mode 100644 index 3195171a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_parser.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_parser.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_parser.h.i deleted file mode 100644 index c13707fd..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_bundle_hdr_parser.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_c_make_lists.txt.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_c_make_lists.txt.i deleted file mode 100644 index ad87db59..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_c_make_lists.txt.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_emitter.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_emitter.cc.i deleted file mode 100644 index fbdadc2f..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_emitter.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_emitter_output.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_emitter_output.cc.i deleted file mode 100644 index 52e26ffe..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_emitter_output.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_event_buffer.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_event_buffer.cc.i deleted file mode 100644 index dad0a449..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_event_buffer.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_event_buffer.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_event_buffer.h.i deleted file mode 100644 index 15aef3d0..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_event_buffer.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_exceptions.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_exceptions.cc.i deleted file mode 100644 index 77cd47db..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_exceptions.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_extensions.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_extensions.cc.i deleted file mode 100644 index d7aa1adb..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_extensions.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_guess_format.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_guess_format.cc.i deleted file mode 100644 index d8ca6ff0..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_guess_format.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_guess_scalar.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_guess_scalar.cc.i deleted file mode 100644 index 2266b087..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_guess_scalar.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_guess_scalar.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_guess_scalar.h.i deleted file mode 100644 index 5731227a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_guess_scalar.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_emitter.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_emitter.cc.i deleted file mode 100644 index f70cc7b5..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_emitter.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_emitter.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_emitter.h.i deleted file mode 100644 index 36716c0c..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_emitter.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_parser.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_parser.cc.i deleted file mode 100644 index 2c19a050..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_parser.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_parser.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_parser.h.i deleted file mode 100644 index dd42cab1..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_j_s_o_n_parser.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_emitter.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_emitter.cc.i deleted file mode 100644 index bebe6b12..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_emitter.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_emitter.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_emitter.h.i deleted file mode 100644 index c82822b8..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_emitter.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_parser.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_parser.cc.i deleted file mode 100644 index 74f4012e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_parser.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_parser.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_parser.h.i deleted file mode 100644 index 23673f23..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_msg_pack_parser.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parse_bool.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parse_bool.cc.i deleted file mode 100644 index 6091c17a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parse_bool.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parse_bool.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parse_bool.h.i deleted file mode 100644 index a89095b9..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parse_bool.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parser.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parser.cc.i deleted file mode 100644 index c1ccc7de..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parser.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parser_input.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parser_input.cc.i deleted file mode 100644 index 610bbea5..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_parser_input.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_path.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_path.cc.i deleted file mode 100644 index 9b9842b2..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_path.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_payload.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_payload.cc.i deleted file mode 100644 index 8a3ea0b4..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_payload.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_schema.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_schema.cc.i deleted file mode 100644 index 298ace90..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_schema.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_schema_loader.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_schema_loader.cc.i deleted file mode 100644 index 2831876d..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_schema_loader.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_stack_trace.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_stack_trace.cc.i deleted file mode 100644 index 52269ba3..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_stack_trace.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_stack_trace.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_stack_trace.h.i deleted file mode 100644 index ed577f5f..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_stack_trace.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_variant.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_variant.cc.i deleted file mode 100644 index cb936290..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_variant.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_variant_emitting.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_variant_emitting.cc.i deleted file mode 100644 index 613a0cad..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_variant_emitting.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_variant_parsing.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_variant_parsing.cc.i deleted file mode 100644 index d206bb00..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_variant_parsing.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_defs.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_defs.h.i deleted file mode 100644 index f0ae3ff2..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_defs.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_emitter.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_emitter.cc.i deleted file mode 100644 index 05009e29..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_emitter.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_emitter.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_emitter.h.i deleted file mode 100644 index 476fe549..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_emitter.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_parser.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_parser.cc.i deleted file mode 100644 index 77164258..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_parser.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_parser.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_parser.h.i deleted file mode 100644 index 2cfbbc23..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_x_m_l_p_l_i_s_t_parser.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_emitter.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_emitter.cc.i deleted file mode 100644 index 82e851de..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_emitter.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_emitter.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_emitter.h.i deleted file mode 100644 index ee852568..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_emitter.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_parser.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_parser.cc.i deleted file mode 100644 index 02bbd694..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_parser.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_parser.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_parser.h.i deleted file mode 100644 index 675f5a0c..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/_y_a_m_l_parser.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/argparse-schema.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/argparse-schema.cc.i deleted file mode 100644 index 6de4546a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/argparse-schema.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/argparse-schema.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/argparse-schema.yaml.i deleted file mode 100644 index cc4d998e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/argparse-schema.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/gen-argparse-schema.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/gen-argparse-schema.i deleted file mode 100644 index 502ae7db..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/gen-argparse-schema.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/gen-json-schema.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/gen-json-schema.i deleted file mode 100644 index d6e9af99..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/gen-json-schema.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/json-schema-v4.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/json-schema-v4.cc.i deleted file mode 100644 index fbf6067d..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/json-schema-v4.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/json-schema-v4.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/json-schema-v4.json.i deleted file mode 100644 index 4dcc940f..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/json-schema-v4.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/src/varsh.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/src/varsh.cc.i deleted file mode 100644 index 330f15ba..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/src/varsh.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/_c_make_lists.txt.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/_c_make_lists.txt.i deleted file mode 100644 index c7353529..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/_c_make_lists.txt.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/_test_assert.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/_test_assert.h.i deleted file mode 100644 index ea547a4b..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/_test_assert.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/_test_common.h.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/_test_common.h.i deleted file mode 100644 index f2413f01..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/_test_common.h.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/prof__msgpack.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/prof__msgpack.cc.i deleted file mode 100644 index a45126b7..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/prof__msgpack.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__json.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__json.cc.i deleted file mode 100644 index ee52a789..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__json.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__msgpack.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__msgpack.cc.i deleted file mode 100644 index eab9f453..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__msgpack.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__xml.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__xml.cc.i deleted file mode 100644 index 2ed22e72..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__xml.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__yaml.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__yaml.cc.i deleted file mode 100644 index 2f6f1a3e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/rand__test__yaml.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__argparse.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__argparse.cc.i deleted file mode 100644 index 4fb00c7d..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__argparse.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__argparse.sh.in.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__argparse.sh.in.i deleted file mode 100644 index 3d9cd038..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__argparse.sh.in.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__argparse__merge.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__argparse__merge.cc.i deleted file mode 100644 index 3bc6c17a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__argparse__merge.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__base64.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__base64.cc.i deleted file mode 100644 index dfbdbba7..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__base64.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__bundleemitter.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__bundleemitter.cc.i deleted file mode 100644 index 97f9cff8..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__bundleemitter.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__bundlehdr.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__bundlehdr.cc.i deleted file mode 100644 index c86b4a29..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__bundlehdr.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__bundleparser.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__bundleparser.cc.i deleted file mode 100644 index 8349db77..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__bundleparser.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__empty.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__empty.cc.i deleted file mode 100644 index ec2a01f3..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__empty.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__extensions.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__extensions.cc.i deleted file mode 100644 index 0555675d..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__extensions.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__guess.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__guess.cc.i deleted file mode 100644 index 106efd78..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__guess.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__json__parser.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__json__parser.cc.i deleted file mode 100644 index 6ba31260..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__json__parser.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__loadall.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__loadall.cc.i deleted file mode 100644 index 9e7d1c20..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__loadall.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__memoryoutput.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__memoryoutput.cc.i deleted file mode 100644 index a56c4c15..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__memoryoutput.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__numerics.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__numerics.cc.i deleted file mode 100644 index 669871fb..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__numerics.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__path.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__path.cc.i deleted file mode 100644 index 96204ae9..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__path.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__payload.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__payload.cc.i deleted file mode 100644 index d415f60e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__payload.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__roundtrip.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__roundtrip.cc.i deleted file mode 100644 index 5bc35576..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__roundtrip.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema.cc.i deleted file mode 100644 index 3eb5a219..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/invalid-schema.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/invalid-schema.test.i deleted file mode 100644 index 6b7af253..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/invalid-schema.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/invalid__path.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/invalid__path.test.i deleted file mode 100644 index e684fab6..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/invalid__path.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/_makefile.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/_makefile.i deleted file mode 100644 index 96b901f2..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/_makefile.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/_r_e_a_d_m_e.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/_r_e_a_d_m_e.i deleted file mode 100644 index 9689dee8..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/_r_e_a_d_m_e.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_items.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_items.json.i deleted file mode 100644 index 0229b7f1..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_items.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_items.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_items.test.i deleted file mode 100644 index a8a9843a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_items.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_properties.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_properties.json.i deleted file mode 100644 index ccc9bc18..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_properties.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_properties.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_properties.test.i deleted file mode 100644 index 26f5462f..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/additional_properties.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/all_of.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/all_of.json.i deleted file mode 100644 index 2fdf6475..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/all_of.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/all_of.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/all_of.test.i deleted file mode 100644 index 4e785bea..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/all_of.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/any_of.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/any_of.json.i deleted file mode 100644 index 5cf5d300..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/any_of.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/any_of.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/any_of.test.i deleted file mode 100644 index 9d4e3f01..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/any_of.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/convert.py.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/convert.py.i deleted file mode 100644 index 9fb215fc..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/convert.py.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/definitions.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/definitions.json.i deleted file mode 100644 index 9e2878b7..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/definitions.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/definitions.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/definitions.test.i deleted file mode 100644 index 0dad6d7e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/definitions.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/dependencies.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/dependencies.json.i deleted file mode 100644 index fba01f77..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/dependencies.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/dependencies.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/dependencies.test.i deleted file mode 100644 index d2ee0acb..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/dependencies.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/enum.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/enum.json.i deleted file mode 100644 index c2e4fbfb..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/enum.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/enum.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/enum.test.i deleted file mode 100644 index 8c3549ec..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/enum.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/items.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/items.json.i deleted file mode 100644 index 91d68804..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/items.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/items.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/items.test.i deleted file mode 100644 index cddc9162..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/items.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_items.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_items.json.i deleted file mode 100644 index efab9c32..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_items.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_items.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_items.test.i deleted file mode 100644 index 715246b4..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_items.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_length.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_length.json.i deleted file mode 100644 index 1a107b33..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_length.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_length.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_length.test.i deleted file mode 100644 index a96a89f6..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_length.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_properties.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_properties.json.i deleted file mode 100644 index 47cdd5fd..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_properties.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_properties.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_properties.test.i deleted file mode 100644 index e607dce0..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/max_properties.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/maximum.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/maximum.json.i deleted file mode 100644 index 72fd4090..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/maximum.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/maximum.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/maximum.test.i deleted file mode 100644 index cead4186..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/maximum.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_items.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_items.json.i deleted file mode 100644 index f4d296c9..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_items.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_items.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_items.test.i deleted file mode 100644 index cbe79e90..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_items.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_length.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_length.json.i deleted file mode 100644 index 00aac669..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_length.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_length.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_length.test.i deleted file mode 100644 index 2b842dcb..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_length.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_properties.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_properties.json.i deleted file mode 100644 index c8f232ee..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_properties.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_properties.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_properties.test.i deleted file mode 100644 index 61a99f37..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/min_properties.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/minimum.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/minimum.json.i deleted file mode 100644 index 7117c87c..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/minimum.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/minimum.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/minimum.test.i deleted file mode 100644 index bcc070e4..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/minimum.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/multiple_of.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/multiple_of.json.i deleted file mode 100644 index 559df288..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/multiple_of.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/multiple_of.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/multiple_of.test.i deleted file mode 100644 index 3998829c..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/multiple_of.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/not.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/not.json.i deleted file mode 100644 index 5708a0f3..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/not.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/not.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/not.test.i deleted file mode 100644 index b094ea0f..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/not.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/one_of.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/one_of.json.i deleted file mode 100644 index ca57a008..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/one_of.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/one_of.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/one_of.test.i deleted file mode 100644 index acf4342a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/one_of.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern.json.i deleted file mode 100644 index 5fcaaf67..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern.test.i deleted file mode 100644 index cb59e1ff..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern_properties.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern_properties.json.i deleted file mode 100644 index f5b69539..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern_properties.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern_properties.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern_properties.test.i deleted file mode 100644 index 66ce8603..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/pattern_properties.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/properties.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/properties.json.i deleted file mode 100644 index a24abbc5..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/properties.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/properties.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/properties.test.i deleted file mode 100644 index e9827360..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/properties.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/ref.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/ref.json.i deleted file mode 100644 index c33d427e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/ref.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/ref.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/ref.test.i deleted file mode 100644 index d30197a9..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/ref.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/required.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/required.json.i deleted file mode 100644 index 81f282b1..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/required.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/required.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/required.test.i deleted file mode 100644 index e22a6fbe..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/required.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/type.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/type.json.i deleted file mode 100644 index c416bb7a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/type.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/type.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/type.test.i deleted file mode 100644 index b1c3c58b..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/type.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/unique_items.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/unique_items.json.i deleted file mode 100644 index b7ded369..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/unique_items.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/unique_items.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/unique_items.test.i deleted file mode 100644 index 7136b2d0..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/jsonschema-tests/unique_items.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/negative-unique-items.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/negative-unique-items.test.i deleted file mode 100644 index fbeae62b..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/negative-unique-items.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/recursion.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/recursion.test.i deleted file mode 100644 index 35e53ab7..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/recursion.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/sample-test.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/sample-test.test.i deleted file mode 100644 index d83f3ea4..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/sample-test.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/simple-test-fail.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/simple-test-fail.json.i deleted file mode 100644 index 019d9d84..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/simple-test-fail.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/simple-test-schema.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/simple-test-schema.json.i deleted file mode 100644 index 3693a3e8..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/simple-test-schema.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/simple-test.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/simple-test.json.i deleted file mode 100644 index cfe71ca0..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/simple-test.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/test__resolveuri.json.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/test__resolveuri.json.i deleted file mode 100644 index d698ae49..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/test__resolveuri.json.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/01-type.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/01-type.test.i deleted file mode 100644 index 095d55e7..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/01-type.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/02-enum.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/02-enum.test.i deleted file mode 100644 index abea3409..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/02-enum.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/02-enum.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/02-enum.yaml.i deleted file mode 100644 index 02319124..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/02-enum.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/_makefile.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/_makefile.i deleted file mode 100644 index 19ea61e8..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/01-any-type/_makefile.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/01-min-max.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/01-min-max.test.i deleted file mode 100644 index 20e0e72e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/01-min-max.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/01-min-max.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/01-min-max.yaml.i deleted file mode 100644 index 88f0bb0c..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/01-min-max.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/02-multiple_of.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/02-multiple_of.test.i deleted file mode 100644 index 09e7c85c..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/02-multiple_of.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/02-multiple_of.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/02-multiple_of.yaml.i deleted file mode 100644 index 06f7efa7..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/02-multiple_of.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/_makefile.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/_makefile.i deleted file mode 100644 index d2464947..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/02-numeric/_makefile.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/01-min-max-length.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/01-min-max-length.test.i deleted file mode 100644 index 954e3dfb..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/01-min-max-length.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/01-min-max-length.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/01-min-max-length.yaml.i deleted file mode 100644 index 2f8e9c7d..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/01-min-max-length.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/02-pattern.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/02-pattern.test.i deleted file mode 100644 index db871bc7..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/02-pattern.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/02-pattern.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/02-pattern.yaml.i deleted file mode 100644 index a6e68e76..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/02-pattern.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/_makefile.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/_makefile.i deleted file mode 100644 index d2464947..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/03-strings/_makefile.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/01-min-max-length.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/01-min-max-length.test.i deleted file mode 100644 index 35361657..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/01-min-max-length.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/01-min-max-length.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/01-min-max-length.yaml.i deleted file mode 100644 index 8ebbdbb4..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/01-min-max-length.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/02-uniqueitems.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/02-uniqueitems.test.i deleted file mode 100644 index 14924e37..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/02-uniqueitems.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/02-uniqueitems.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/02-uniqueitems.yaml.i deleted file mode 100644 index c56359ce..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/02-uniqueitems.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/03-items-plain.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/03-items-plain.test.i deleted file mode 100644 index 9e412ddb..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/03-items-plain.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/03-items-plain.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/03-items-plain.yaml.i deleted file mode 100644 index 8e39bda3..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/03-items-plain.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/04-items-tuple-typing.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/04-items-tuple-typing.test.i deleted file mode 100644 index fa160201..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/04-items-tuple-typing.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/04-items-tuple-typing.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/04-items-tuple-typing.yaml.i deleted file mode 100644 index 4b17d54a..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/04-items-tuple-typing.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/05-additionalitems.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/05-additionalitems.test.i deleted file mode 100644 index 66f7616e..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/05-additionalitems.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/05-additionalitems.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/05-additionalitems.yaml.i deleted file mode 100644 index 8ffffad2..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/05-additionalitems.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/_makefile.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/_makefile.i deleted file mode 100644 index d2464947..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/04-arrays/_makefile.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/01-min-max-properties.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/01-min-max-properties.test.i deleted file mode 100644 index 612019ee..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/01-min-max-properties.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/01-min-max-properties.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/01-min-max-properties.yaml.i deleted file mode 100644 index d9a6818d..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/01-min-max-properties.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/02-required.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/02-required.test.i deleted file mode 100644 index 058fbf31..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/02-required.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/02-required.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/02-required.yaml.i deleted file mode 100644 index b34b4c19..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/02-required.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/03-properties.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/03-properties.test.i deleted file mode 100644 index d633e974..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/03-properties.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/03-properties.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/03-properties.yaml.i deleted file mode 100644 index 0cc235fc..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/03-properties.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/04-patternproperties.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/04-patternproperties.test.i deleted file mode 100644 index f714f568..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/04-patternproperties.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/04-patternproperties.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/04-patternproperties.yaml.i deleted file mode 100644 index de013658..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/04-patternproperties.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/05-additionalproperties.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/05-additionalproperties.test.i deleted file mode 100644 index 1d20f881..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/05-additionalproperties.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/05-additionalproperties.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/05-additionalproperties.yaml.i deleted file mode 100644 index be521427..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/05-additionalproperties.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/06-dependencies.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/06-dependencies.test.i deleted file mode 100644 index c5b68366..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/06-dependencies.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/06-dependencies.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/06-dependencies.yaml.i deleted file mode 100644 index 5c50fe91..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/06-dependencies.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/_makefile.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/_makefile.i deleted file mode 100644 index d2464947..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/05-objects/_makefile.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/01-all_of.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/01-all_of.test.i deleted file mode 100644 index 1b5f032b..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/01-all_of.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/01-all_of.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/01-all_of.yaml.i deleted file mode 100644 index 0ae2d139..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/01-all_of.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/02-any_of.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/02-any_of.test.i deleted file mode 100644 index 4915b795..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/02-any_of.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/02-any_of.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/02-any_of.yaml.i deleted file mode 100644 index 63318bbd..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/02-any_of.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/03-one_of.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/03-one_of.test.i deleted file mode 100644 index 4a0066d3..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/03-one_of.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/03-one_of.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/03-one_of.yaml.i deleted file mode 100644 index 2e3a53ef..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/03-one_of.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/04-not.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/04-not.test.i deleted file mode 100644 index 254114d3..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/04-not.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/04-not.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/04-not.yaml.i deleted file mode 100644 index e27772a7..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/04-not.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/_makefile.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/_makefile.i deleted file mode 100644 index d2464947..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/06-combinations/_makefile.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/04-ref.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/04-ref.test.i deleted file mode 100644 index da9c02de..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/04-ref.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/04-ref.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/04-ref.yaml.i deleted file mode 100644 index c524a7b1..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/04-ref.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/05-inline-addressing.test.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/05-inline-addressing.test.i deleted file mode 100644 index 36a54184..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/05-inline-addressing.test.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/05-inline-addressing.yaml.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/05-inline-addressing.yaml.i deleted file mode 100644 index 20a27603..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/05-inline-addressing.yaml.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/_makefile.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/_makefile.i deleted file mode 100644 index d2464947..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/07-ref/_makefile.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/_makefile.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/_makefile.i deleted file mode 100644 index c004fa13..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/_makefile.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/_r_e_a_d_m_e.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/_r_e_a_d_m_e.i deleted file mode 100644 index 51a4e972..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/_r_e_a_d_m_e.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/submakefile.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/submakefile.i deleted file mode 100644 index 1ba00509..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__schema__data/tv4-tests/submakefile.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__variant.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__variant.cc.i deleted file mode 100644 index 672d8e38..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__variant.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__xml__parser.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__xml__parser.cc.i deleted file mode 100644 index d2c89a53..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__xml__parser.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__yaml__parser.cc.i b/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__yaml__parser.cc.i deleted file mode 100644 index 73f7ba45..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/test/test__yaml__parser.cc.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/~2ehgignore.i b/src/hos_libvariant/src/libvariant/.hg/store/data/~2ehgignore.i deleted file mode 100644 index 3cd28624..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/~2ehgignore.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/data/~2ehgtags.i b/src/hos_libvariant/src/libvariant/.hg/store/data/~2ehgtags.i deleted file mode 100644 index 3ec11211..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/data/~2ehgtags.i and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/fncache b/src/hos_libvariant/src/libvariant/.hg/store/fncache deleted file mode 100644 index 7970ba59..00000000 --- a/src/hos_libvariant/src/libvariant/.hg/store/fncache +++ /dev/null @@ -1,248 +0,0 @@ -data/test/test_variant.cc.i -data/test/test_schema_data/jsonschema-tests/additionalProperties.test.i -data/test/test_schema_data/jsonschema-tests/not.test.i -data/test/test_schema_data/tv4-tests/01-any-type/02-enum.yaml.i -data/test/test_schema_data/tv4-tests/05-objects/01-min-max-properties.yaml.i -data/test/test_schema_data/jsonschema-tests/type.test.i -data/test/test_schema_data/tv4-tests/06-combinations/03-oneOf.yaml.i -data/test/test_extensions.cc.i -data/test/test_schema_data/jsonschema-tests/allOf.json.i -data/src/Emitter.cc.i -data/test/test_schema_data/tv4-tests/06-combinations/03-oneOf.test.i -data/test/test_schema_data/jsonschema-tests/properties.test.i -data/test/test_schema_data/jsonschema-tests/oneOf.json.i -data/src/StackTrace.h.i -data/test/test_schema_data/tv4-tests/06-combinations/01-allOf.test.i -data/src/YAMLEmitter.cc.i -data/include/Variant/SchemaLoader.h.i -data/test/test_schema_data/tv4-tests/06-combinations/01-allOf.yaml.i -data/test/test_schema_data/tv4-tests/06-combinations/Makefile.i -data/cmake/Modules/MakeTBZ2.cmake.i -data/test/test_schema_data/jsonschema-tests/required.test.i -data/test/test_schema_data/tv4-tests/05-objects/03-properties.test.i -data/src/XMLPLISTEmitter.cc.i -data/test/test_bundleemitter.cc.i -data/test/test_schema_data/jsonschema-tests/properties.json.i -data/include/Variant/VariantDefines.h.i -data/include/Variant/Blob.h.i -data/test/test_schema_data/tv4-tests/02-numeric/02-multipleOf.yaml.i -data/examples/map_example.cc.i -data/test/test_schema_data/jsonschema-tests/maximum.json.i -data/test/test_schema_data/tv4-tests/04-arrays/04-items-tuple-typing.test.i -data/src/JSONEmitter.cc.i -data/test/test_schema_data/tv4-tests/04-arrays/05-additionalitems.yaml.i -data/include/Variant/Variant.h.i -data/test/test_schema_data/tv4-tests/07-ref/05-inline-addressing.test.i -data/test/test_schema_data/jsonschema-tests/maxItems.json.i -data/test/test_schema_data/simple-test-fail.json.i -data/test/test_argparse.cc.i -data/test/test_schema_data/jsonschema-tests/Makefile.i -data/src/EventBuffer.cc.i -data/test/test_schema_data/tv4-tests/01-any-type/02-enum.test.i -data/test/test_argparse_merge.cc.i -data/test/test_schema_data/jsonschema-tests/maxItems.test.i -data/test/test_schema_data/jsonschema-tests/anyOf.json.i -data/examples/arg_parse.cc.i -data/src/JSONEmitter.h.i -data/test/test_schema_data/jsonschema-tests/type.json.i -data/include/Variant/Payload.h.i -data/src/VariantParsing.cc.i -data/examples/pretty_print.cc.i -data/test/test_schema_data/jsonschema-tests/maximum.test.i -data/src/Parser.cc.i -data/src/JSONParser.h.i -data/test/test_schema_data/jsonschema-tests/ref.test.i -data/test/test_schema_data/tv4-tests/05-objects/Makefile.i -data/src/XMLPLISTEmitter.h.i -data/libvariant.pc.in.i -data/test/test_schema_data/jsonschema-tests/additionalProperties.json.i -data/test/test_empty.cc.i -data/test/test_schema_data/jsonschema-tests/pattern.json.i -data/.hgtags.i -data/LibVariantConfigVersion.cmake.in.i -data/test/test_schema_data/jsonschema-tests/enum.test.i -data/test/TestCommon.h.i -data/test/test_schema_data/simple-test.json.i -data/include/Variant/EmitterOutput.h.i -data/test/test_bundleparser.cc.i -data/src/ArgParse.cc.i -data/include/Variant/Extensions.h.i -data/test/test_schema_data/tv4-tests/04-arrays/Makefile.i -data/src/MsgPackEmitter.cc.i -data/examples/convert.cc.i -data/test/test_schema_data/tv4-tests/03-strings/Makefile.i -data/test/test_schema_data/jsonschema-tests/minProperties.test.i -data/include/Variant/Schema.h.i -data/include/Variant/SharedPtr.h.i -data/src/BundleHdrParser.cc.i -data/src/Payload.cc.i -data/test/test_schema_data/jsonschema-tests/multipleOf.json.i -data/src/ParseBool.h.i -data/examples/README.i -data/lib/json/JSON_parser.c.i -data/test/test_schema_data/jsonschema-tests/minItems.json.i -data/test/test_schema_data/tv4-tests/03-strings/02-pattern.test.i -data/test/test_bundlehdr.cc.i -data/Doxyfile.in.i -data/test/test_schema_data/jsonschema-tests/oneOf.test.i -data/src/MsgPackEmitter.h.i -data/src/json-schema-v4.cc.i -data/test/test_schema_data/tv4-tests/04-arrays/05-additionalitems.test.i -data/src/GuessScalar.cc.i -data/test/test_schema_data/tv4-tests/05-objects/02-required.test.i -data/test/test_schema_data/tv4-tests/04-arrays/04-items-tuple-typing.yaml.i -data/CMakeLists.txt.i -data/test/test_schema_data/jsonschema-tests/pattern.test.i -data/test/test_schema_data/tv4-tests/Makefile.i -data/test/test_schema_data/jsonschema-tests/required.json.i -data/test/test_argparse.sh.in.i -data/test/test_schema_data/jsonschema-tests/maxLength.test.i -data/include/Variant/Parser.h.i -data/test/test_schema_data/tv4-tests/04-arrays/01-min-max-length.yaml.i -data/test/test_schema_data/tv4-tests/01-any-type/01-type.test.i -data/test/test_schema_data/jsonschema-tests/dependencies.json.i -data/test/test_schema_data/tv4-tests/05-objects/01-min-max-properties.test.i -data/examples/example1.cc.i -data/test/rand_test_json.cc.i -data/test/test_schema_data/tv4-tests/05-objects/04-patternproperties.yaml.i -data/test/test_schema_data/tv4-tests/05-objects/02-required.yaml.i -data/src/BundleHdrEmitter.cc.i -data/src/XMLPLISTParser.cc.i -data/test/test_numerics.cc.i -data/src/YAMLParser.cc.i -data/test/test_schema_data/tv4-tests/04-arrays/03-items-plain.test.i -data/test/prof_msgpack.cc.i -data/test/test_schema_data/tv4-tests/02-numeric/Makefile.i -data/src/XMLPLISTParser.h.i -data/src/gen-argparse-schema.i -data/test/test_schema_data/jsonschema-tests/convert.py.i -data/test/test_base64.cc.i -data/src/BlobMagic.h.i -data/src/JSONParser.cc.i -data/src/BundleHdrEmitter.h.i -data/src/BundleHdrParser.h.i -data/test/test_schema_data/tv4-tests/03-strings/01-min-max-length.test.i -data/test/test_schema_data/jsonschema-tests/maxProperties.test.i -data/test/test_schema_data/jsonschema-tests/items.test.i -data/test/test_schema_data/tv4-tests/03-strings/01-min-max-length.yaml.i -data/test/CMakeLists.txt.i -data/examples/CMakeLists.txt.i -data/test/test_schema_data/test_resolveuri.json.i -data/test/test_path.cc.i -data/test/test_schema_data/tv4-tests/04-arrays/02-uniqueitems.test.i -data/test/test_schema_data/tv4-tests/01-any-type/Makefile.i -data/test/test_schema_data/jsonschema-tests/maxLength.json.i -data/test/test_schema_data/jsonschema-tests/allOf.test.i -data/src/argparse-schema.yaml.i -data/test/rand_test_yaml.cc.i -data/include/Variant/ArgParse.h.i -data/test/test_schema_data/tv4-tests/05-objects/05-additionalproperties.test.i -data/cmake/Modules/FindLibYAML.cmake.i -data/test/test_schema_data/jsonschema-tests/README.i -data/test/test_guess.cc.i -data/test/test_schema_data/negative-unique-items.test.i -data/test/test_schema_data/tv4-tests/05-objects/03-properties.yaml.i -data/src/Schema.cc.i -data/src/YAMLEmitter.h.i -data/Config.h.in.i -data/test/test_schema_data/jsonschema-tests/multipleOf.test.i -data/src/StackTrace.cc.i -data/test/test_schema_data/jsonschema-tests/additionalItems.test.i -data/test/test_schema_data/tv4-tests/07-ref/Makefile.i -data/src/Blob.cc.i -data/test/test_schema_data/jsonschema-tests/additionalItems.json.i -data/test/test_schema.cc.i -data/src/VariantEmitting.cc.i -data/test/test_schema_data/tv4-tests/02-numeric/02-multipleOf.test.i -data/src/gen-json-schema.i -data/test/test_roundtrip.cc.i -data/test/test_schema_data/tv4-tests/README.i -data/test/test_schema_data/tv4-tests/07-ref/04-ref.yaml.i -data/test/test_schema_data/jsonschema-tests/minimum.json.i -data/include/Variant/Exceptions.h.i -data/test/test_schema_data/jsonschema-tests/dependencies.test.i -data/test/test_schema_data/tv4-tests/07-ref/04-ref.test.i -data/LibVariantConfig.cmake.in.i -data/.hgignore.i -data/test/test_xml_parser.cc.i -data/test/test_schema_data/simple-test-schema.json.i -data/test/TestAssert.h.i -data/test/test_schema_data/jsonschema-tests/maxProperties.json.i -data/src/Path.cc.i -data/test/test_schema_data/jsonschema-tests/definitions.test.i -data/test/test_schema_data/tv4-tests/05-objects/04-patternproperties.test.i -data/test/test_schema_data/tv4-tests/04-arrays/01-min-max-length.test.i -data/include/Variant/GuessFormat.h.i -data/src/SchemaLoader.cc.i -data/src/EventBuffer.h.i -data/test/test_schema_data/recursion.test.i -data/lib/json/JSON_PARSER_README.htm.i -data/test/test_schema_data/jsonschema-tests/minLength.test.i -data/test/test_schema_data/sample-test.test.i -data/README.md.i -data/test/test_yaml_parser.cc.i -data/include/Variant/VariantInternal.h.i -data/LibVariantBuildTreeSettings.cmake.in.i -data/test/rand_test_msgpack.cc.i -data/test/test_schema_data/jsonschema-tests/uniqueItems.json.i -data/src/CMakeLists.txt.i -data/test/test_schema_data/jsonschema-tests/minProperties.json.i -data/src/varsh.cc.i -data/test/test_schema_data/tv4-tests/02-numeric/01-min-max.test.i -data/test/test_schema_data/jsonschema-tests/not.json.i -data/include/Variant/Emitter.h.i -data/src/ParseBool.cc.i -data/test/test_schema_data/jsonschema-tests/patternProperties.json.i -data/README.i -data/test/test_schema_data/jsonschema-tests/minItems.test.i -data/test/test_schema_data/tv4-tests/06-combinations/02-anyOf.yaml.i -data/test/test_schema_data/jsonschema-tests/definitions.json.i -data/test/test_schema_data/tv4-tests/05-objects/06-dependencies.test.i -data/src/Base64.cc.i -data/test/rand_test_xml.cc.i -data/src/EmitterOutput.cc.i -data/src/GuessFormat.cc.i -data/test/test_schema_data/tv4-tests/05-objects/06-dependencies.yaml.i -data/test/test_schema_data/jsonschema-tests/anyOf.test.i -data/test/test_schema_data/tv4-tests/02-numeric/01-min-max.yaml.i -data/src/Extensions.cc.i -data/test/test_schema_data/jsonschema-tests/enum.json.i -data/test/test_schema_data/jsonschema-tests/uniqueItems.test.i -data/test/test_payload.cc.i -data/LICENSE.i -data/test/test_schema_data/jsonschema-tests/minLength.json.i -data/src/YAMLParser.h.i -data/test/test_schema_data/invalid-schema.test.i -data/test/test_memoryoutput.cc.i -data/test/test_schema_data/jsonschema-tests/items.json.i -data/test/test_schema_data/tv4-tests/03-strings/02-pattern.yaml.i -data/test/test_json_parser.cc.i -data/test/test_schema_data/tv4-tests/04-arrays/03-items-plain.yaml.i -data/test/test_schema_data/tv4-tests/06-combinations/02-anyOf.test.i -data/src/Exceptions.cc.i -data/src/MsgPackParser.h.i -data/src/Base64.h.i -data/src/json-schema-v4.json.i -data/src/MsgPackParser.cc.i -data/cmake/Modules/FindMsgPack.cmake.i -data/examples/example2.cc.i -data/src/Variant.cc.i -data/include/Variant/Path.h.i -data/src/GuessScalar.h.i -data/examples/list_example.cc.i -data/src/argparse-schema.cc.i -data/test/test_schema_data/jsonschema-tests/patternProperties.test.i -data/test/test_loadall.cc.i -data/test/test_schema_data/jsonschema-tests/minimum.test.i -data/test/test_schema_data/jsonschema-tests/ref.json.i -data/test/test_schema_data/tv4-tests/submakefile.i -data/include/Variant/ParserInput.h.i -data/test/test_schema_data/tv4-tests/05-objects/05-additionalproperties.yaml.i -data/src/ParserInput.cc.i -data/test/test_schema_data/tv4-tests/06-combinations/04-not.yaml.i -data/test/test_schema_data/tv4-tests/06-combinations/04-not.test.i -data/test/test_schema_data/tv4-tests/04-arrays/02-uniqueitems.yaml.i -data/src/XMLPLISTDefs.h.i -data/lib/json/JSON_parser.h.i -data/test/test_schema_data/tv4-tests/07-ref/05-inline-addressing.yaml.i -data/test/test_schema_data/invalid_path.test.i diff --git a/src/hos_libvariant/src/libvariant/.hg/store/phaseroots b/src/hos_libvariant/src/libvariant/.hg/store/phaseroots deleted file mode 100644 index e69de29b..00000000 diff --git a/src/hos_libvariant/src/libvariant/.hg/store/undo b/src/hos_libvariant/src/libvariant/.hg/store/undo deleted file mode 100644 index 94c1f7b9..00000000 Binary files a/src/hos_libvariant/src/libvariant/.hg/store/undo and /dev/null differ diff --git a/src/hos_libvariant/src/libvariant/.hg/store/undo.phaseroots b/src/hos_libvariant/src/libvariant/.hg/store/undo.phaseroots deleted file mode 100644 index e69de29b..00000000 diff --git a/src/hos_libvariant/src/libvariant/.hg/undo.bookmarks b/src/hos_libvariant/src/libvariant/.hg/undo.bookmarks deleted file mode 100644 index e69de29b..00000000 diff --git a/src/hos_libvariant/src/libvariant/.hg/undo.branch b/src/hos_libvariant/src/libvariant/.hg/undo.branch deleted file mode 100644 index 331d858c..00000000 --- a/src/hos_libvariant/src/libvariant/.hg/undo.branch +++ /dev/null @@ -1 +0,0 @@ -default \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/.hg/undo.desc b/src/hos_libvariant/src/libvariant/.hg/undo.desc deleted file mode 100644 index f04ce07e..00000000 --- a/src/hos_libvariant/src/libvariant/.hg/undo.desc +++ /dev/null @@ -1,3 +0,0 @@ -0 -pull -https://bitbucket.org/gallen/libvariant diff --git a/src/hos_libvariant/src/libvariant/.hg/undo.dirstate b/src/hos_libvariant/src/libvariant/.hg/undo.dirstate deleted file mode 100644 index e69de29b..00000000 diff --git a/src/hos_libvariant/src/libvariant/.hgignore b/src/hos_libvariant/src/libvariant/.hgignore deleted file mode 100644 index 1e6ada79..00000000 --- a/src/hos_libvariant/src/libvariant/.hgignore +++ /dev/null @@ -1,10 +0,0 @@ - -syntax: regexp -\.swp -\.swo -\.o -\.a -\.so -\.la -\._ -build diff --git a/src/hos_libvariant/src/libvariant/.hgtags b/src/hos_libvariant/src/libvariant/.hgtags deleted file mode 100644 index bedfe9e7..00000000 --- a/src/hos_libvariant/src/libvariant/.hgtags +++ /dev/null @@ -1,4 +0,0 @@ -fb0efab8850da0ff03051b4abae8e1bff1d4ca23 1.0.0 -edb423a0428e6a3744dbf0c4a9ae46e7165561a3 1.0.1 -0000000000000000000000000000000000000000 1.0.1 -40b8e618db81a21c1e363f7c1ee77b2e2c9cc717 1.0.1 diff --git a/src/hos_libvariant/src/libvariant/CMakeLists.txt b/src/hos_libvariant/src/libvariant/CMakeLists.txt deleted file mode 100644 index a9ba68d9..00000000 --- a/src/hos_libvariant/src/libvariant/CMakeLists.txt +++ /dev/null @@ -1,244 +0,0 @@ -project(LibVariant) - -cmake_minimum_required(VERSION 2.6) - -enable_testing() - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/") - -include(CheckCXXSourceCompiles) -include(CheckIncludeFileCXX) - -if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - set(EXAMPLES_AND_TESTS on) - set(LIBVARIANT_DOC_TARGET doc) - option(BUILD_SHARED_LIBS "Build shared libraries." OFF) -else() - set(EXAMPLES_AND_TESTS off) - set(LIBVARIANT_DOC_TARGET libvariant-doc) -endif() - -option(LIBVARIANT_BUILD_WALL "build Variant with the -Wall flag" ON) -option(LIBVARIANT_BUILD_DEBUG "build Variant with the additional debug flags" OFF) -option(LIBVARIANT_BUILD_TESTS "build the Variant tests" ${EXAMPLES_AND_TESTS}) -option(LIBVARIANT_BUILD_EXAMPLES "build the Variant examples" ${EXAMPLES_AND_TESTS}) -option(LIBVARIANT_BUILD_PROFILE "build Variant with profiling flags" OFF) -option(LIBVARIANT_ENABLE_YAML "Enable YAML encoding" ON) -option(LIBVARIANT_ENABLE_XML "Enable XML encoding" ON) -option(LIBVARIANT_ENABLE_MSGPACK "Enable msgpack encoding" OFF) -option(LIBVARIANT_ENABLE_CURL "Enable cURL related functionality in the SchemaLoader" ON) - -set(LIBVARIANT_MAJOR_VERSION 1) -set(LIBVARIANT_MINOR_VERSION 0) -set(LIBVARIANT_PATCH_VERSION 1) -set(LIBVARIANT_VERSION - ${LIBVARIANT_MAJOR_VERSION}.${LIBVARIANT_MINOR_VERSION}.${LIBVARIANT_PATCH_VERSION}) - -# Offer the user the choice of overriding the installation directories -set(INSTALL_LIB_DIR lib CACHE STRING "Installation directory for libraries") -set(INSTALL_BIN_DIR bin CACHE STRING "Installation directory for executables") -set(INSTALL_INCLUDE_DIR include CACHE STRING "Installation directory for header files") - -set(DEF_INSTALL_CMAKE_DIR "${INSTALL_LIB_DIR}/cmake/LibVariant") -set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE STRING - "Installation directory for CMake files") - -# Make relative paths absolute (needed later on) -foreach(p LIB BIN INCLUDE CMAKE) - set(var INSTALL_${p}_DIR) - if(NOT IS_ABSOLUTE "${${var}}") - set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") - endif() -endforeach() - -if(LIBVARIANT_BUILD_WALL) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") -endif() - -if (LIBVARIANT_BUILD_DEBUG) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Winline -Wfatal-errors") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Winline -Wfatal-errors") -endif() - -if (LIBVARIANT_BUILD_PROFILE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fprofile-arcs -ftest-coverage") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fprofile-arcs -ftest-coverage") -endif() - -set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLE_STACKTRACE") -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLE_STACKTRACE") - -# setup include directories -include_directories("include") -include_directories("${CMAKE_CURRENT_BINARY_DIR}/include") - -# libraries to depends upon -if(LIBVARIANT_ENABLE_XML) - find_package(LibXml2) - if(LIBXML2_FOUND) - include_directories(${LIBXML2_INCLUDE_DIR}) - add_definitions(${LIBXML2_DEFINITIONS}) - add_definitions("-DENABLE_XML") - list(APPEND EXTRA_LIBS ${LIBXML2_LIBRARIES}) - else() - message(WARNING " Could not find libxml2, disabling.") - set(LIBVARIANT_ENABLE_XML OFF) - endif() -endif() - -if(LIBVARIANT_ENABLE_YAML) - find_package(LibYAML) - if(LIBYAML_FOUND) - include_directories(${LIBYAML_INCLUDE_DIR}) - add_definitions("-DENABLE_YAML") - list(APPEND EXTRA_LIBS ${LIBYAML_LIBRARIES}) - else() - message(WARNING " Could not find libyaml, disabling.") - set(LIBVARIANT_ENABLE_YAML OFF) - endif() -endif() - -if(LIBVARIANT_ENABLE_MSGPACK) - find_package(MsgPack) - if(MSGPACK_FOUND) - include_directories(${MSGPACK_INCLUDE_DIR}) - add_definitions("-DENABLE_MSGPACK") - list(APPEND EXTRA_LIBS ${MSGPACK_LIBRARIES}) - else() - message(WARNING " Could not find msgpack, disabling") - set(LIBVARIANT_ENABLE_MSGPACK OFF) - endif() -endif() - -if (LIBVARIANT_ENABLE_CURL) - find_package(CURL) - if (CURL_FOUND) - include_directories(${CURL_INCLUDE_DIR}) - add_definitions("-DENABLE_CURL") - list(APPEND EXTRA_LIBS ${CURL_LIBRARIES}) - else() - message(INFO " CURL not found, disabling CURL functionality.") - set(LIBVARIANT_ENABLE_CURL OFF) - endif() -endif() - -# We want to following checks to try compiling with the same flags that we -# have already setup -set(CMAKE_REQUIRED_FLAGS ${CMAKE_CXX_FLAGS}) - -check_cxx_source_compiles( " -\#include \n -int main() { - std::shared_ptr i; - return 0; -} -" - HAVE_CXX11_SHAREDPTR ) - -if (NOT HAVE_CXX11_SHAREDPTR) - check_include_file_cxx("tr1/memory" HAVE_TR1_SHAREDPTR) - - if (NOT HAVE_TR1_SHAREDPTR) - message(STATUS "Fallback to using boost shared_ptr") - find_package(Boost REQUIRED) - include_directories(${Boost_INCLUDE_DIRS}) - set(USE_BOOST_SHAREDPTR 1) - endif() -endif() - -check_cxx_source_compiles(" -int main() { - long long i = 0; - unsigned long long u = 0; - return i + u; -} -" - HAVE_LONG_LONG) - -if (HAVE_LONG_LONG) - add_definitions("-DHAVE_LONG_LONG=1") -endif() - -# add sub directories -add_subdirectory(src) -if (LIBVARIANT_BUILD_TESTS) - add_subdirectory(test) -endif() -if (LIBVARIANT_BUILD_EXAMPLES) - add_subdirectory(examples) -endif() - - -# Build documentation -find_package(Doxygen) -if (DOXYGEN_FOUND) - configure_file(Doxyfile.in ${PROJECT_BINARY_DIR}/Doxyfile @ONLY IMMEDIATE) - add_custom_target(${LIBVARIANT_DOC_TARGET} - COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile - SOURCES ${PROJECT_BINARY_DIR}/Doxyfile) -endif() - - -# Add targets to the build-tree export set -set(LIBVARIANT_EXPORTED_LIBS Variant) - -export(TARGETS ${LIBVARIANT_EXPORTED_LIBS} - FILE "${PROJECT_BINARY_DIR}/LibVariantLibraryDepends.cmake") - -# Export the package for use from the build-tree -# (this registers the build-tree with a global CMake-registry) -#export(PACKAGE LibVariant) # NOT IMPLEMENTED IN cmake 2.6 on RHEL6 - - -# Create a LibVariantBuildTreeSettings.cmake file for the use from the build tree -configure_file(LibVariantBuildTreeSettings.cmake.in - "${PROJECT_BINARY_DIR}/LibVariantBuildTreeSettings.cmake" @ONLY) - -# Create the LibVariantConfig.cmake and LibVariantConfigVersion files -file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" - "${INSTALL_INCLUDE_DIR}") -configure_file(LibVariantConfig.cmake.in - "${PROJECT_BINARY_DIR}/LibVariantConfig.cmake" @ONLY) -configure_file(LibVariantConfigVersion.cmake.in - "${PROJECT_BINARY_DIR}/LibVariantConfigVersion.cmake" @ONLY) - -install(FILES - "${PROJECT_BINARY_DIR}/LibVariantConfig.cmake" - "${PROJECT_BINARY_DIR}/LibVariantConfigVersion.cmake" - DESTINATION "${INSTALL_CMAKE_DIR}") - -# Install the export set for use with the install-tree -install(EXPORT LibVariantLibraryDepends - DESTINATION "${INSTALL_CMAKE_DIR}" - COMPONENT dev) - -# Create the package config file -configure_file(libvariant.pc.in - "${PROJECT_BINARY_DIR}/libvariant.pc" @ONLY) - -install(FILES - "${PROJECT_BINARY_DIR}/libvariant.pc" - DESTINATION "${INSTALL_LIB_DIR}/pkgconfig") - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/include/Variant/Config.h) - -FILE(GLOB install_headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - include/Variant/*.h) -install(FILES ${install_headers} DESTINATION ${INSTALL_INCLUDE_DIR}/Variant/) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/Variant/Config.h DESTINATION - ${INSTALL_INCLUDE_DIR}/Variant/) - -# Am I the root CMakeLists.txt? -if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - include(MakeTBZ2) - add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) -else() - # set parent variables as if it used find_package(testlib2) - set(LIBVARIANT_LIBRARIES Variant PARENT_SCOPE) - get_directory_property(LIBVARIANT_INCLUDE_DIRS INCLUDE_DIRECTORIES) - set(LIBVARIANT_INCLUDE_DIRS ${LIBVARIANT_INCLUDE_DIRS} PARENT_SCOPE) - set(LIBVARIANT_FOUND TRUE PARENT_SCOPE) -endif() diff --git a/src/hos_libvariant/src/libvariant/Config.h.in b/src/hos_libvariant/src/libvariant/Config.h.in deleted file mode 100644 index 37ff2e74..00000000 --- a/src/hos_libvariant/src/libvariant/Config.h.in +++ /dev/null @@ -1,13 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_CONFIG_H -#define VARIANT_CONFIG_H -#pragma once - -#cmakedefine HAVE_CXX11_SHAREDPTR 1 -#cmakedefine HAVE_TR1_SHAREDPTR 1 -#cmakedefine USE_BOOST_SHAREDPTR 1 - -#endif diff --git a/src/hos_libvariant/src/libvariant/Doxyfile.in b/src/hos_libvariant/src/libvariant/Doxyfile.in deleted file mode 100644 index 82dfd8ac..00000000 --- a/src/hos_libvariant/src/libvariant/Doxyfile.in +++ /dev/null @@ -1,1569 +0,0 @@ -# Doxyfile 1.6.1 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = libvariant - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = @VARIANT_VERSION@ - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = @PROJECT_BINARY_DIR@/doc - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = YES - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@/src \ - @PROJECT_SOURCE_DIR@/include - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = @PROJECT_SOURCE_DIR@/include - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 4 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. Note that for custom extensions you also need to set -# FILE_PATTERNS otherwise the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = YES - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = NO - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = YES - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = NO - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = NO - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = @PROJECT_SOURCE_DIR@/src -INPUT += @PROJECT_SOURCE_DIR@/include -INPUT += @PROJECT_SOURCE_DIR@/README.md - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.f90 \ - *.f \ - *.vhd \ - *.vhdl - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# If the HTML_TIMESTAMP tag is set to YES then the generated HTML -# documentation will contain the timesstamp. - -HTML_TIMESTAMP = NO - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's -# filter section matches. -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# When the SEARCHENGINE tag is enable doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP) -# there is already a search function so this one should typically -# be disabled. - -SEARCHENGINE = YES - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings -# such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES - -MARKDOWN_SUPPORT = YES - -USE_MDFILE_AS_MAINPAGE = README.md diff --git a/src/hos_libvariant/src/libvariant/LICENSE b/src/hos_libvariant/src/libvariant/LICENSE deleted file mode 100644 index 2fda3ee9..00000000 --- a/src/hos_libvariant/src/libvariant/LICENSE +++ /dev/null @@ -1,16 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= diff --git a/src/hos_libvariant/src/libvariant/LibVariantBuildTreeSettings.cmake.in b/src/hos_libvariant/src/libvariant/LibVariantBuildTreeSettings.cmake.in deleted file mode 100644 index 06629e75..00000000 --- a/src/hos_libvariant/src/libvariant/LibVariantBuildTreeSettings.cmake.in +++ /dev/null @@ -1,3 +0,0 @@ - -set(LIBVARIANT_INCLUDE_DIRS - "@PROJECT_SOURCE_DIR@/include") diff --git a/src/hos_libvariant/src/libvariant/LibVariantConfig.cmake.in b/src/hos_libvariant/src/libvariant/LibVariantConfig.cmake.in deleted file mode 100644 index e2383699..00000000 --- a/src/hos_libvariant/src/libvariant/LibVariantConfig.cmake.in +++ /dev/null @@ -1,25 +0,0 @@ - -# - Config file for the Variant package -# It defines the following variables -# LIBVARIANT_INCLUDE_DIRS - include directories for Variant -# LIBVARIANT_LIBRARIES - libraries to link against -# LIBVARIANT_FOUND - library has been found - -# Compute paths -get_filename_component(LIBVARIANT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -if(EXISTS "${LIBVARIANT_CMAKE_DIR}/CMakeCache.txt") - # In build tree - include("${LIBVARIANT_CMAKE_DIR}/LibVariantBuildTreeSettings.cmake") -else() - set(LIBVARIANT_INCLUDE_DIRS "${LIBVARIANT_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@") -endif() - -# Our library dependencies (contains defninitinos for IMPORTED targets) -include("${LIBVARIANT_CMAKE_DIR}/LibVariantLibraryDepends.cmake") - -# These are IMPORTANT targets created by VariantLibraryDepends.cmake -set(LIBVARIANT_LIBRARIES Variant) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibVariant DEFAULT_MSG - LIBVARIANT_LIBRARIES LIBVARIANT_INCLUDE_DIRS) diff --git a/src/hos_libvariant/src/libvariant/LibVariantConfigVersion.cmake.in b/src/hos_libvariant/src/libvariant/LibVariantConfigVersion.cmake.in deleted file mode 100644 index ca388800..00000000 --- a/src/hos_libvariant/src/libvariant/LibVariantConfigVersion.cmake.in +++ /dev/null @@ -1,12 +0,0 @@ - -set(PACKAGE_VERSION "@LIBVARIANT_VERSION@") - -# Check whether the requested PACKAGE_FIND_VERSION is compatible -if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_COMPATIBLE FALSE) -else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_EXACT TRUE) - endif() -endif() diff --git a/src/hos_libvariant/src/libvariant/README.md b/src/hos_libvariant/src/libvariant/README.md deleted file mode 100644 index 05c8da1d..00000000 --- a/src/hos_libvariant/src/libvariant/README.md +++ /dev/null @@ -1,126 +0,0 @@ - -Introduction ------------- - -This library, libvariant, provides a class called Variant. -This class is a discriminating union that can contain one of the following values: - - - a null, or no type - - a boolean value - - an unsigned integer - - a signed integer - - a floating point value - - a string value - - a reference to a map of string to Variant - - a reference to a list of Variant - - a reference to a iovec list (Blob) - -### Features - - - Scripting language like variable (Variant) in C++ (with all the upsides and downsides that implies). - - [JSON](http://www.json.org/) serialization. - - [YAML](http://yaml.org/) serialization. Deserialization ignores most tags. - - plist serialization. - - Schema validation based on [json-schema](http://json-schema.org/). - - Schema lookup can be set to use libcurl to fetch remote URLs. - - A simple argument parsing (ArgParse) class that produces a Variant from a programs arguments. - - Experimental [msgpack](http://msgpack.org/) serialization using [msgpack-c](https://github.com/msgpack/msgpack-c) (disabled by default). - - JSONPointer (RFC6901) and JSONPatch (RFC6902) implementations. - -### Changes for the 1.0.1 release - - - Cleaned up static data initialization, will no long call abort. - - Fixed a bug related to proxy resolution when performing additional path resolution. - - Added an ignore_payload and payload_length parameter to the payload serializer helpers. - - Implemented proper JSONPointer lookup routines and changed the schema lookup to use them. - - Modified ArgParse so that positional argument can be specified in loaded configuration files. - - Added a make dist build target. - - Other minor fixes. - -### Implementation details - -Under the hood, Variant uses an explicit vtable to implement the different -behaviors with the same interface. The vtable has more types than the standard -types listed above. The additional types are a reference and proxy type. -There is also a class that is exposed to the user as VariantRef. Several of -the functions that return a Variant return a VariantRef. A VariantRef is a -Variant so const Variant & can bind to a VariantRef. But, in general Variant& -cannot bind to VariantRef as all functions that return VariantRef, return it by -value. This means that if you want a function that takes a non-const Variant as -a parameter to be used as an output parameter, the function must take a -VariantRef by value. VariantRef can be constructed from a Variant as well, so -such a function can take either a VariantRef or Variant. - -libvariant is [publicly hosted here](https://bitbucket.org/gallen/libvariant). - -Building --------- - -This project uses CMake to generate a build system. Consult the CMake -documentation for your preferred build system generation. - -### Building on unix - -The default build system generated by CMake on unix is to use make. -To build with make simply perform the following commands where you would like the build output: - - cmake /path/to/libvariant/sources/ - make - -And to install: - make install - -The cmake configuration files use the standard cmake variables. - -### Dependencies - -libvariant is optionally dependent on the following libraries - - - [libyaml](http://pyyaml.org/wiki/LibYAML) to provide yaml serialization - - [libxml2](http://xmlsoft.org/) to provide plist serialization - - [libcurl](http://curl.haxx.se/) to provide schema web lookup - - [msgpack-c](https://github.com/msgpack/msgpack-c) for the experimental msgpack serialization - -CMake variables are provided to override the default dependency behavior. - -Schemas -------- - -This library also contains a schema validator. The language of the schema when -serialized as JSON is json-schema. See json-schema.org for details about -json-schema. Note the validator in this library uses the version 4 dialect. -The schema for the version 4 dialect can be acquired from -http://json-schema.org/draft-04/schema - -Other than a validator, there is a function to add the schema defaults to a Variant. -This function goes through the schema and attempts to add the defaults -specified in it to the Variant provided if a value is not already present. -There are several constructs that it ignores such as not. - -### Data generation from schemas - -Generating a valid set of data from schema is an interesting idea, and can be -useful for testing purposes. But this problem is rather difficult in general. -For example, the anyOf, oneOf, allOf, and not constructs in a schema mean that -it is possible that the data generator must solve a satisfiability problem. -It is well known that non-trivial satisfiability problems are NP complete. -Despite this there does exists several random data generators (but they can -fail to produce output or can produce output that does not validate). The -following are links to two of the generators I was able to find. - - - [http://schematic-ipsum.herokuapp.com/] - a web app - - [https://github.com/andreineculau/json-schema-random] - requires nodejs - -API Documentation ------------------ - -The main API is documented in the source code using the Doxygen format. -The generated html documentation is served on the web at -http://gallen.bitbucket.org/libvariant-docs. - -If you have doxygen installed, you can generate html documentation of the -libvariant public interface from the source code with: - - cd /path/to/build_dir - cmake /path/to/libvariant - make doc diff --git a/src/hos_libvariant/src/libvariant/cmake/Modules/FindLibYAML.cmake b/src/hos_libvariant/src/libvariant/cmake/Modules/FindLibYAML.cmake deleted file mode 100644 index 26ce0ef2..00000000 --- a/src/hos_libvariant/src/libvariant/cmake/Modules/FindLibYAML.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# CMake module to search for the libyaml library -# (library for parsing YAML files) -# If it's found it sets LIBYAML_FOUND to TRUE -# and following variables are set: -# LIBYAML_INCLUDE_DIR -# LIBYAML_LIBRARY - -find_package(PkgConfig) -pkg_check_modules(PC_LIBYAML yaml-0.1) - -find_path(LIBYAML_INCLUDE_DIR NAMES yaml.h HINTS ${PC_LIBYAML_INCLUDEDIR} - ${PC_LIBYAML_INCLUDE_DIRS}) -find_library(LIBYAML_LIBRARIES NAMES yaml libyaml - HINTS ${PC_LIBYAML_LIBDIR} ${PC_LIBYAML_LIBRARY_DIR}) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibYAML DEFAULT_MSG LIBYAML_LIBRARIES LIBYAML_INCLUDE_DIR) -MARK_AS_ADVANCED(LIBYAML_INCLUDE_DIR LIBYAML_LIBRARIES) diff --git a/src/hos_libvariant/src/libvariant/cmake/Modules/FindMsgPack.cmake b/src/hos_libvariant/src/libvariant/cmake/Modules/FindMsgPack.cmake deleted file mode 100644 index 37871bdd..00000000 --- a/src/hos_libvariant/src/libvariant/cmake/Modules/FindMsgPack.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# - Find msgpack -# Find the native Message Pack headers and libraries. -# -# MSGPACK_INCLUDE_DIRS - where to find msgpack.hpp, etc. -# MSGPACK_LIBRARIES - List of libraries when using MsgPack. -# MSGPACK_FOUND - True if MsgPack found. - - -# Look for the header file. -FIND_PATH(MSGPACK_INCLUDE_DIR NAMES msgpack.hpp) - -# Look for the library. -FIND_LIBRARY(MSGPACK_LIBRARY NAMES msgpack libmsgpack) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(MsgPack DEFAULT_MSG MSGPACK_LIBRARY MSGPACK_INCLUDE_DIR) -MARK_AS_ADVANCED(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY) diff --git a/src/hos_libvariant/src/libvariant/cmake/Modules/MakeTBZ2.cmake b/src/hos_libvariant/src/libvariant/cmake/Modules/MakeTBZ2.cmake deleted file mode 100644 index ec160f9e..00000000 --- a/src/hos_libvariant/src/libvariant/cmake/Modules/MakeTBZ2.cmake +++ /dev/null @@ -1,13 +0,0 @@ -foreach(what MAJOR MINOR PATCH) - set(ivar ${PROJECT_NAME}_${what}_VERSION) - string(TOUPPER ${ivar} ivar) - set(CPACK_PACKAGE_VERSION_${what} ${${ivar}}) -endforeach() - -set(CPACK_SOURCE_GENERATOR "TBZ2") -set(CPACK_SOURCE_PACKAGE_FILE_NAME - "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") -string(TOLOWER ${CPACK_SOURCE_PACKAGE_FILE_NAME} CPACK_SOURCE_PACKAGE_FILE_NAME) -set(CPACK_SOURCE_IGNORE_FILES - "/build*/;/.hg*;~$;CMakeCache.txt;${CPACK_SOURCE_IGNORE_FILES}") -include(CPack) diff --git a/src/hos_libvariant/src/libvariant/examples/CMakeLists.txt b/src/hos_libvariant/src/libvariant/examples/CMakeLists.txt deleted file mode 100644 index 706bc685..00000000 --- a/src/hos_libvariant/src/libvariant/examples/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ - -add_executable(convert convert.cc) -target_link_libraries(convert Variant ${EXTRA_LIBS}) - -add_executable(example1 example1.cc) -target_link_libraries(example1 Variant ${EXTRA_LIBS}) - -add_executable(example2 example2.cc) -target_link_libraries(example2 Variant ${EXTRA_LIBS}) - -add_executable(map_example map_example.cc) -target_link_libraries(map_example Variant ${EXTRA_LIBS}) - -add_executable(list_example list_example.cc) -target_link_libraries(list_example Variant ${EXTRA_LIBS}) - -add_executable(pretty_print pretty_print.cc) -target_link_libraries(pretty_print Variant ${EXTRA_LIBS}) - -add_executable(arg_parse arg_parse.cc) -target_link_libraries(arg_parse Variant ${EXTRA_LIBS}) diff --git a/src/hos_libvariant/src/libvariant/examples/README b/src/hos_libvariant/src/libvariant/examples/README deleted file mode 100644 index 35bf4a31..00000000 --- a/src/hos_libvariant/src/libvariant/examples/README +++ /dev/null @@ -1,23 +0,0 @@ - -convert.cc: - -This example is for a program to convert between different serialization -formats. It can load JSON, YAML or plist and then save it as any of those -formats. - -example1.cc: - -A quick example of how to load YAML and JSON with the convenience interface. - -example2.cc: - -Shows some basic ways of querying for information from a Variant. - -map_example.cc: - -Shows some basic operations that you can perform on the map types. - -pretty_print.cc: - -Shows some basic examples of how to pretty print a Variant into JSON and YAML -in several different formats. diff --git a/src/hos_libvariant/src/libvariant/examples/arg_parse.cc b/src/hos_libvariant/src/libvariant/examples/arg_parse.cc deleted file mode 100644 index a69ac7e1..00000000 --- a/src/hos_libvariant/src/libvariant/examples/arg_parse.cc +++ /dev/null @@ -1,101 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include "../../libvariant/include/Variant/ArgParse.h" -#include "../../libvariant/include/Variant/Schema.h" -#include "../../libvariant/include/Variant/Variant.h" - -using namespace libvariant; -using namespace std; - -void MoreOptions(ArgParse &opts) { - opts.AddOption("/abc/a", 0, "abc-a", "libabc a").Default("a"); - opts.AddOption("/abc/b", 0, "abc-b", "libabc b").Default("b"); - opts.AddOption("/abc/c", 0, "abc-c", "libabc c"); - opts.AddGroup("abc", "libabc", "Options for libabc").Add("/abc/a").Add("/abc/b") - .Add("/abc/c"); - opts.AddGroup("abc-exclusive").Add("/abc/b").Add("/abc/c").MutuallyExclusive(); -} - -int main(int argc, char **argv) { - - SerializeType stype = SERIALIZE_JSON; - Variant params = Variant().Set("pretty", true); - - ArgParse opts(argv[0]); - - opts.SetDescription("An example application that uses ArgParse."); - opts.SetEpilog("An epilog of the help text!"); - opts.AddConfigDefaults(); - - opts.AddOption("foo-key", 'f', "foo", "What to foo with.").Action(ARGACTION_APPEND) - .Type(ARGTYPE_FLOAT).Default(0.1234).Minimum(0); - // Defines an option --foo or -f that takes a number argument, which is 0.1234 - // if not specified and has a minimum value of 0 - - opts.AddOption("bar-key", 'b', "bar", "The bar.") - .Default("frobnar!").MaxLength(100).Pattern("[A-Za-z]*!") - .Env("BAR"); - // Defines an option --bar or -b that takes a string argument that - // may be any alphastring ending in an ! up to 100 characters in length. - - opts.AddOption("blurt-key", 0, "blurt", "BLURT!") - .AddChoice("furble").AddChoice("murble").AddChoice("durble") - .Default("durble"); - // Defines an option --blurt that can take the string values - // 'furble', 'murble', or 'durble' and will error on any other. - - opts.AddFlag("recursive", 'r', "recurse", "Do operation recursively"); - // Add an option -r that sets true if present and false if not - // Same as opts.AddOption("recursive, 'r', "recurse", "Do operation recursively") - // .Action(ARGACTION_STORE_TRUE).Type(ARGTYPE_BOOL).Default(false); - - opts.AddOption("verbose", 'v', "verbose", "Increase verbosity one level.") - .Action(ARGACTION_COUNT); - - opts.AddOption("quiet", 'q', "quiet", "Decrease verbosity one level.") - .Action(ARGACTION_COUNT); - - MoreOptions(opts); - - opts.AddArgument("host", "Hostname").Type(ARGTYPE_STRING).Action(ARGACTION_STORE); - opts.AddArgument("port", "Port number or name").Type(ARGTYPE_STRING).Action(ARGACTION_STORE); - opts.AddArgument("XXX", "Message IDs").Type(ARGTYPE_INT).Action(ARGACTION_APPEND) - .Minimum(0).MinArgs(1).MaxArgs(0); - // Define that the program takes at least 3 positional arguments, - // the first being a string which will be stored in host, a port name - // which will be a string stored in port and a list of positive integers - // which will be stored as a list in key XXX. - - // An example for a single positional optional argument (can have no - // required arguments after it): - // opts.AddArgument("msgid", "Message ID").Type(ARGTYPE_INT).Default(10) - // .Minimum(0).MinArgs(0); - - cout << "The description:\n"; - Serialize(cout.rdbuf(), opts.GetDescription(), stype, params); - cout << endl; - cout << "The generated schema for the parsed arguments:\n"; - Variant schema = opts.GenerateSchema(); - Serialize(cout.rdbuf(), schema, stype, params); - cout << endl; - - opts.Validate(); - cout << "Now parsing the arguments..." << endl; - Variant args = opts.Parse(argc, argv); - - int verbosity = 1 + args.Get("verbose", 0).As() - args.Get("quiet", 0).As(); - - cout << "Using verbosity " << verbosity << endl; - - cout << "The parsed arguments then look like:\n"; - Serialize(cout.rdbuf(), args, stype, params); - cout << endl; - SchemaResult validate_result = SchemaValidate(schema, args); - cout << "Does it validate? " << (validate_result.Error() ? "no" : "yes") << endl; - if (validate_result.Error()) { cout << validate_result << endl; } - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/examples/convert.cc b/src/hos_libvariant/src/libvariant/examples/convert.cc deleted file mode 100644 index 6278163e..00000000 --- a/src/hos_libvariant/src/libvariant/examples/convert.cc +++ /dev/null @@ -1,99 +0,0 @@ -/** \file - * \author John Bridgman - * \brief A simple convert utility that can read in - * the json, yaml or xml formats and then write out - * any of those formats. - */ -#include -#include -#include -#include "../../libvariant/include/Variant/Variant.h" - -using namespace libvariant; - -int main(int argc, char **argv) { - enum Op { - NOOP, - JSON, YAML, XML - }; - SerializeType input = SERIALIZE_YAML; - SerializeType output = SERIALIZE_YAML; - Variant params = Variant::MapType; - params["pretty"] = true; - while (true) { - int c = getopt(argc, argv, "jyxJYXhp:"); - if (c == -1) { break; } - switch (c) { - case 'j': - input = SERIALIZE_JSON; - break; - case 'y': - input = SERIALIZE_YAML; - break; - case 'x': - input = SERIALIZE_XMLPLIST; - break; - case 'J': - output = SERIALIZE_JSON; - break; - case 'Y': - output = SERIALIZE_YAML; - break; - case 'X': - output = SERIALIZE_XMLPLIST; - break; - case 'p': - params["pretty"] = Variant(optarg).AsBool(); - break; - case 'h': - default: - printf("Usage: %s [options] infile outfile\n", *argv); - printf("Options:\n" - "\t-j|-y|-x Specify the input format, JSON, YAML or XML plist\n" - "\t-J|-Y|-X Specify the output format, JSON, YAML or XML plist\n" - "\t-p true|false Set pretty printing (default true)\n" - "Leaving out the input or putput file or specifying it as -\n" - "will use stdin or stdout instead.\n"); - return 0; - } - } - - FILE *in = stdin; - const char *in_file = 0; - if (optind < argc) { - in_file = argv[optind]; - if (strlen(in_file) == 1 && in_file[0] == '-') { - in_file = 0; - } - } - if (in_file) { - in = fopen(in_file, "r"); - if (!in) { - fprintf(stderr, "Unable to open %s\n", in_file); - return 1; - } - } - FILE *out = stdout; - const char *out_file = 0; - if (optind + 1 < argc) { - out_file = argv[optind + 1]; - if (strlen(out_file) == 1 && out_file[0] == '-') { - out_file = 0; - } - } - if (out_file) { - out = fopen(in_file, "w"); - if (!out) { - fprintf(stderr, "Unable to open %s\n", out_file); - return 1; - } - } - - Variant v; - v = DeserializeFile(in, input); - - Serialize(out, v, output, params); - - return 0; -} - diff --git a/src/hos_libvariant/src/libvariant/examples/example1.cc b/src/hos_libvariant/src/libvariant/examples/example1.cc deleted file mode 100644 index 4e384b5a..00000000 --- a/src/hos_libvariant/src/libvariant/examples/example1.cc +++ /dev/null @@ -1,37 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include "../../libvariant/include/Variant/Variant.h" - -// Import Variant from libvariant -using libvariant::Variant; - -// Example strings to use -const char *example_json_string = -"{\"key1\": \"value1\",\"key2\":1.23,\"list\":[1,2,3,4]}"; - -const char *example_yaml_string = -"key1: value1\n" -"key2: 1.23\n" -"list: [ 1, 2, 3, 4]\n" -; - -int main(int argc, char **argv) { - // Load the example_json_string onto ex1 - Variant ex1 = libvariant::DeserializeJSON(example_json_string); - // Load the example yaml string - Variant ex2 = libvariant::DeserializeYAML(example_yaml_string); - // They are the same - if (ex1 != ex2) { - printf("Differ!\n"); - return 1; - } - - // Pretty print to stdout - libvariant::SerializeJSON(stdout, ex2, true); - - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/examples/example2.cc b/src/hos_libvariant/src/libvariant/examples/example2.cc deleted file mode 100644 index 2d6d60ca..00000000 --- a/src/hos_libvariant/src/libvariant/examples/example2.cc +++ /dev/null @@ -1,50 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include "../../libvariant/include/Variant/Variant.h" - -using libvariant::Variant; - -int main(int argc, char **argv) { - if (argc != 2) { - printf("Usage: %s input_file\n", *argv); - return 1; - } - const char *file_name = argv[1]; - Variant v = libvariant::DeserializeYAMLFile(file_name); - - // Now lets examine the variant - if (v.IsMap()) { - printf("The variant is a map of length %u with keys:\n", v.Size()); - bool contains_complex_type = false; - // Maps are internally just std::map - for (Variant::MapIterator i(v.MapBegin()), e(v.MapEnd()); i!=e; ++i) { - printf("\"%s\" ", i->first.c_str()); - switch (i->second.GetType()) { - case Variant::MapType: - case Variant::ListType: - contains_complex_type = true; - break; - default: - break; - } - } - printf("\n"); - if (contains_complex_type) { - printf("The map contains non scalar types.\n"); - } - } else if (v.IsList()) { - printf("The variant is a list of length %u\n", v.Size()); - // Lists are also internally std::vector - // Can use v.ListBegin and v.ListEnd for iterators - // and Variant::ListIterator for the iterator type - } else { - printf("The read in variant is neither a list nor a map.\nIts string value is: %s\n", v.AsString().c_str()); - } - - - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/examples/list_example.cc b/src/hos_libvariant/src/libvariant/examples/list_example.cc deleted file mode 100644 index 0b3f3a90..00000000 --- a/src/hos_libvariant/src/libvariant/examples/list_example.cc +++ /dev/null @@ -1,29 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include - -#include "../../libvariant/include/Variant/Variant.h" -using libvariant::Variant; - -int main(int argc, char **argv) { - Variant list; - // Can assign the type to a variant to "force" it to be - // that type. The type will loose any value it had (i.e., - // a list will be empty, maps will be empty, numbers will have - // an indeterminate value, etc.) - list = Variant::ListType; - list[0] = true; - list[2] = "abc"; - // Note that now the list is [true, null, "abc"] - // Lists are extended automatically to the length that they are referred to. - list.Append(123); - // Appending to the list - - for (unsigned i = 0; i < list.Size(); ++i) { - std::cout << list[i].AsString() << std::endl; - } - return 0; -} - diff --git a/src/hos_libvariant/src/libvariant/examples/map_example.cc b/src/hos_libvariant/src/libvariant/examples/map_example.cc deleted file mode 100644 index 0c6fb374..00000000 --- a/src/hos_libvariant/src/libvariant/examples/map_example.cc +++ /dev/null @@ -1,48 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include -#include - -#include "../../libvariant/include/Variant/Variant.h" -using libvariant::Variant; - -int main(int argc, char **argv) { - Variant map; - // The type of a Variant with the default constructor is the NullType - assert(map.IsNull()); - // Treating a NullType as some type converts it to that type - map["key"] = "value"; - map["doo"] = 1.2345; - map["bar"] = 123; - map["foo"] = true; - Variant map2; - map2["ubar"] = 12u; - - map.Merge(map2); - // Set all the key value pairs in map2 into map. - - - if (map.Contains("doo")) { - // the key "doo" is in the map - } - - Variant doodaa = map.Get("doodaa", true); - // Get checks if doodaa is in the map and if not it returns the second - // parameter. - assert(doodaa.IsTrue()); - - Variant val = map["blah"]; - // "blah" was not in the map so val is of NullType - // But "blah" has been added to the map as NullType because Variant can't - // tell if your assigning or referencing with the [] operator - assert(val.IsNull()); - // But then we can erase it - map.Erase("blah"); - - for (Variant::MapIterator i(map.MapBegin()), e(map.MapEnd()); i!=e; ++i) { - std::cout << i->first << ": " << i->second.AsString() << std::endl; - } - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/examples/pretty_print.cc b/src/hos_libvariant/src/libvariant/examples/pretty_print.cc deleted file mode 100644 index 083f045b..00000000 --- a/src/hos_libvariant/src/libvariant/examples/pretty_print.cc +++ /dev/null @@ -1,40 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include -#include -#include "../../libvariant/include/Variant/Variant.h" - -using namespace libvariant; - -const char example_string[] = "--- { id: [ 1,2 ,3, 4], names: [ foo, bar, gar, mar ], twiddle: true, swizzle: 1.24456e-4," -" subs: [1, 2, [ 1, 2, [ {a: b}, 2 ]]] }"; - -const char styles[] = "any\0block\0flow\0"; - -int main(int argc, char **argv) { - Variant val = Deserialize(example_string, SERIALIZE_YAML); - std::cout << "--- Pretty printing JSON to stdout using generic serialize function\n"; - Variant param; - param["pretty"] = true; - param["indent"] = 2; - Serialize(std::cout.rdbuf(), val, SERIALIZE_JSON, param); - std::cout << std::endl; - param.Clear(); - //param["width"] = 10; - for (const char *mstyle = &styles[0];*mstyle; mstyle += strlen(mstyle) + 1) { - for (const char *lstyle = &styles[0];*lstyle; lstyle += strlen(lstyle) + 1) { - param["map_style"] = mstyle; - param["list_style"] = lstyle; - std::cout << "--- Pretty print YAML to stdout using generic serilize function\n" - << "With params: "; - Serialize(std::cout.rdbuf(), param, SERIALIZE_JSON); - std::cout << std::endl; - Serialize(std::cout.rdbuf(), val, SERIALIZE_YAML, param); - std::cout << std::endl; - } - } - - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/include/Variant/ArgParse.h b/src/hos_libvariant/src/libvariant/include/Variant/ArgParse.h deleted file mode 100644 index 307d3ab7..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/ArgParse.h +++ /dev/null @@ -1,302 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_ARGPARSER_H -#define VARIANT_ARGPARSER_H - -#pragma once -#include "../../../libvariant/include/Variant/Variant.h" -#include -#include -namespace libvariant { - - - enum ArgParseAction { - ARGACTION_UNKNOWN, // Unknown action (invalid) - ARGACTION_STORE, // Interpret the option argument and store it at the path - ARGACTION_STORE_CONST, // Store const into the path - ARGACTION_STORE_TRUE, // Store true into the path - ARGACTION_STORE_FALSE, // Store false into the path - ARGACTION_APPEND, // Append the option argument to the list at path - ARGACTION_COUNT, // Make the value at path be the count of this options occurrences - ARGACTION_HELP, // Print out the help text and exit - ARGACTION_ADVHELP, // Print the advanced help and exit - ARGACTION_CONFIG, // Consider the option argument a filename to be loaded and parsed as a config - ARGACTION_CONFIG_JSON, // force parser to use jscn - ARGACTION_CONFIG_YAML, // force parser to use yaml - ARGACTION_CONFIG_PLIST, // force parser to use xmlplist - ARGACTION_PRINT_CONFIG // At the end of parsing print out the resulting config and exit. - }; - - // A constrained list of only the valid types for ArgParse - enum ArgParseType { - ARGTYPE_GUESS = Variant::NullType, // No type specification, guess, uses deserialize machinery - ARGTYPE_INT = Variant::IntegerType, // Error if it cannot be turned into an integer - ARGTYPE_UINT = Variant::UnsignedType, // Error if it cannot be turned into a unsigned - ARGTYPE_FLOAT = Variant::FloatType, // Error if it cannot be turned into a float - ARGTYPE_STRING = Variant::StringType, // store as string - ARGTYPE_BOOL = Variant::BoolType // Error if it cannot be turned into a boolean type - // it treats 0 or the strings 'false' and 'no' or any substring ignoring case as false - // and everything else as true - }; - - //! Valid values are: - // This is used for converting the enum to a Variant and back for - // ArgParse::GetDescription and ArgParse::Merge - // store -- store the value into the key (default) - // store_const -- store const (see Const) into the key - // store_true -- store true into the key (i.e. no option argument) - // store_false -- store false into the key - // append -- make the value a list of instances of the option - // count -- count the number of instances of this argument - // help -- display the help text and exit - // config -- load a file and merge it into the result (uses GuessFormat) - // config_json -- same as config, force to use json parser - // config_yaml -- same as config, force to use yaml parser - // config_plist -- same as config, force to use xml-plist parser - // config_print -- when finished parsing, print out the config and exit - ArgParseAction ArgParseActionFromStr(const std::string &action); - std::string ArgParseActionToStr(ArgParseAction action); - - class ArgParse; - struct ArgParseImpl; - struct ArgParseOptImpl; - struct ArgParseGroupImpl; - - //! ArgParseOption is a part of class ArgParse. - // ArgParseOption is the interface that ArgParse provides to the user to be able - // to conveniently set the options for an option. - class ArgParseOption { - public: - - //! Set the title of this option. The title is used - // as an argument placeholder string. - ArgParseOption &Title(const std::string &title); - - //! What action to perform when this option is encountered. - // See ArgParseAction above for a list of actions. - ArgParseOption &Action(ArgParseAction action); - DEPRECATED ArgParseOption &Action(const std::string &action); - - //! Set the type parsing and validation. - // If set and the argument is not of this type, then it is invalid. - // Default: ARGTYPE_GUESS - // If type is ARGTYPE_GUESS then ArgParse attempts to parse the - // argument with the same machinery that is used by the deserializers - // to figure out the type of a scalar. - // ARGTYPE_UINT is the same as ARGTYPE_INT but with - // Minimum set to 0. - // See ArgParseType for the list of valid types. - ArgParseOption &Type(ArgParseType type); - // Same as above but throws on invalid type - DEPRECATED ArgParseOption &Type(Variant::Type_t type); - // String version of the above - // Valid types are "string", "number", "integer", "boolean", or "null". - // Default type is "null". - DEPRECATED ArgParseOption &Type(const std::string &type); - - //! Set the const value for "store_const" - ArgParseOption &Const(Variant val); - - //! Set the default value used when the option is not set. - ArgParseOption &Default(Variant val); - - //! Set the environment variable name to check for a value for this option. - // When the environment variable is present this acts like Default was set - // to the environment variable's value. I.e., this overrides default, - // command line arguments override this. - ArgParseOption &Env(const char *env); - - //! If the resulting value is a number, require to be at least this minimum. - ArgParseOption &Minimum(Variant val); - - //! If the resulting value is a number, require to be at most this maximum. - ArgParseOption &Maximum(Variant val); - - //! Add choices. - // If a choice is added, the value of the option must be one of the choices. - ArgParseOption &AddChoice(Variant val); - - //! Set choices (old ones forgotten) from a vector. - ArgParseOption &SetChoices(const std::vector &val); - - //! Return the vector of choices set. - const std::vector &GetChoices(); - - //! Is this option required? - ArgParseOption &Required(bool req=true); - - //! Set the help text for this option. - ArgParseOption &Help(const std::string &helptxt); - - //! If this option is a string, it must match the regex in pattern. - ArgParseOption &Pattern(const std::string &pattern); - - //! If this option is a string, it must be no longer than maxLength. - ArgParseOption &MaxLength(unsigned l); - - //! If this option is a string, it must be no shorter than minLength. - ArgParseOption &MinLength(unsigned l); - - //! If this option can be specified multiple times, it must be - // specified minArgs times at least. - // A value of 0 means zero arguments is valid. - ArgParseOption &MinArgs(unsigned l); - - //! If this option can be specified multiple times, it cannot be - // specified more than maxArgs. - // A value of 0 means any number - ArgParseOption &MaxArgs(unsigned l); - - //! Specify that this argument must be present l times. - // Sets both minArgs and maxArgs to l - ArgParseOption &NumArgs(unsigned l); - - //! Adds this option to group gname. If gname does not exist, - //it will be created with an empty title and description. - ArgParseOption &Group(const std::string &gname); - - //! Sets this argument to be an advanced option - // This hides the option when not printing advanced options - ArgParseOption &Advanced(bool adv = true); - - private: - ArgParseOption(ArgParseOptImpl *i) : impl(i) {} - ArgParseOptImpl *impl; - friend class ArgParse; - }; - - //! Groups are a way to organize the option and to provide mutual exclusion - //of option. An argument may be part of more than one group, but may only - //be part of one group that has a non-empty title and description. An - //attempt is made to order the help text so that options within the same - //group appear together and if a group has a title and/or description the - //options are placed within a subsection headed with the title and - //description. - class OptionGroup { - public: - //! Set the title for this group - OptionGroup &Title(const std::string &t); - //! Set the description for this group - OptionGroup &Description(const std::string &d); - //! Set that the options in this group are mutually exclusive - OptionGroup &MutuallyExclusive(bool exclusive=true); - //! Set that at least one option in this group is required. - //Has no meaning when the group is not mutually exclusive. - OptionGroup &Required(bool req=true); - - OptionGroup &Add(const std::string &keypath); - OptionGroup &Add(const Path &keypath); - - //! Sets this option group to be advanced - // Hide the group when not printing advanced options. - // This only hides the group when it has a title or description - OptionGroup &Advanced(bool adv=true); - private: - OptionGroup(ArgParseGroupImpl *i) : impl(i) {} - ArgParseGroupImpl *impl; - friend class ArgParse; - }; - - class ArgParse { - public: - //! addhelp true causes AddHelp to be called. - ArgParse(bool addhelp=true); - ArgParse(const std::string &pname, bool addhelp=true); - - //! Add the option and configure it as an option that takes an argument. - //The default action will be "store" and type will be unspecified - // - // keypath must be a valid path as defined in Path.h - // - // For no short option, shortOpt may be 0, and for no long option, longOpt may be - // the empty string. If both shortOpt is 0 and longOpt is empty then this option - // is hidden unless Env is also set for the option. - ArgParseOption AddOption(const std::string &keypath, int shortOpt, const std::string &longOpt="", - const std::string &helptxt=""); - - //! Convenience methods for getting an existing option. - // ArgParse args(argv[0]); - // args.AddOption("key1", 'k', "key1", "how many things").Type("integer"); - // args.AddOption("key2", 'K', "key2", "what to name it").Type("string"); - // (... some intermediate code ...) - // args.At("key1").Default(42); - // args["key2"].Default("foo"); - ArgParseOption At(const std::string &keypath); - ArgParseOption operator[](const std::string &keypath) { return At(keypath); } - - //! Add the option and configure it as an option that is default false and - //if present sets to true - //i.e., same as: - // AddOption(keypath, shortOpt, longOpt, helptxt).Type("boolean") - // .Action("store_true").Default(false); - ArgParseOption AddFlag(const std::string &keypath, int shortOpt, const std::string &longOpt="", - const std::string &helptxt=""); - - //! Adds the group name. - OptionGroup AddGroup(const std::string &name, const std::string &title="", const std::string &description=""); - //! Returns the group name. - OptionGroup GetGroup(const std::string &name); - - //! Add a positional argument. - // By default the new positional argument will have NumArgs as 1. - // Arguments are processed in the order they are added. - // If maxArgs is 0, then no positional arguments after this one will - // be processed. - // Default action is store. - ArgParseOption AddArgument(const std::string &keypath, const std::string &helptxt=""); - - //! Convenience methods for getting an existing argument. - // ArgParse args(argv[0]); - // args.AddArgument("arg0", "pick one").AddChoice("AAA").AddChoice("BBB"); - // args.AddArgument("arg1", "scale factor").Type("float"); - // (... some intermediate code ...) - // args.At(0).AddChoice("CCC"); - // args[1].Default(0.456); - ArgParseOption At(size_t argumentIndex); - ArgParseOption operator[](size_t argumentIndex) { return At(argumentIndex); } - - //! When this is on, trying to add a second option with the same short option - //will cause the second option to act as though it had no short option specified. - void ConflictResolution(bool resolve=true); - - //! Add a --config and --print-config option - // --config is set with action ARGACTION_CONFIG and - // --print-config is set with action ARGACTION_PRINT_CONFIG - void AddConfigDefaults(); - - //! Add -h,--help option with action ARGACTION_HELP - void AddHelp(); - - //! Set the description text that follows the usage message. - void SetDescription(const std::string &txt); - //! Set the epilog text at the end of help. - void SetEpilog(const std::string &txt); - //! Override the default program name. - void SetProgramName(const std::string &pname, bool do_basename=true); - std::string GetProgramName() const; - - void Merge(Variant newopts); - void Merge(const ArgParse &other); - - //! Validate the argparse description against the internal schema - void Validate() const; - - //! Parse the arguments with the internal description - Variant Parse(int argc, char *const *argv); - - //! Print the help message and exit. - void PrintHelp(bool advanced=false) const; - - //! Return the Variant that describes the arguments - Variant GetDescription() const; - - //! Generate a schema for the Variant returned by Parse from the argument description - Variant GenerateSchema() const; - - private: - shared_ptr impl; - }; -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/Blob.h b/src/hos_libvariant/src/libvariant/include/Variant/Blob.h deleted file mode 100644 index 985fce3c..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/Blob.h +++ /dev/null @@ -1,63 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_BLOB_H -#define VARIANT_BLOB_H - -#pragma once -#include "../../../libvariant/include/Variant/SharedPtr.h" -#include -#include - -namespace libvariant { - class Blob; - typedef shared_ptr BlobPtr; - typedef shared_ptr ConstBlobPtr; - - typedef void (*BlobFreeFunc)(void *ptr, void *ctx); - - class Blob { - public: - - /// Reference the buffer and call ffunc when Blob no longer references it - static BlobPtr Create(void *ptr, unsigned len, BlobFreeFunc ffunc, void *context); - /// Will call ffunc on each buffer in iov - static BlobPtr Create(struct iovec *iov, unsigned iov_len, BlobFreeFunc ffunc, void *context); - /// Copy the data into a newly allocatd buffer - static BlobPtr CreateCopy(const void *ptr, unsigned len); - static BlobPtr CreateCopy(const struct iovec *iov, unsigned iov_len); - /// Reference the buffer and when done call free to free the buffer - static BlobPtr CreateFree(void *ptr, unsigned len); - static BlobPtr CreateFree(struct iovec *iov, unsigned iov_len); - /// Reference the buffer, assume static or other allocation lifetime where - // calling a free function is not required - static BlobPtr CreateReferenced(void *ptr, unsigned len); - static BlobPtr CreateReferenced(struct iovec *iov, unsigned iov_len); - ~Blob(); - - BlobPtr Copy() const; - - void *GetPtr(unsigned i) { return iov[i].iov_base; } - const void *GetPtr(unsigned i) const { return iov[i].iov_base; } - unsigned GetLength(unsigned i) const { return iov[i].iov_len; } - struct iovec *GetIOVec() { return &iov[0]; } - const struct iovec *GetIOVec() const { return &iov[0]; } - unsigned GetNumBuffers() const { return iov.size(); } - unsigned GetTotalLength() const; - - int Compare(ConstBlobPtr other) const; - - private: - Blob(); - Blob(const Blob&); - Blob(struct iovec *v, unsigned l, BlobFreeFunc f, void *c); - Blob operator=(const Blob&); - - std::vector iov; - BlobFreeFunc free_func; - void *ctx; - }; - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/Emitter.h b/src/hos_libvariant/src/libvariant/include/Variant/Emitter.h deleted file mode 100644 index 619a279b..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/Emitter.h +++ /dev/null @@ -1,226 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_EMITTER_H -#define VARIANT_EMITTER_H - -#pragma once -#include -#include -#include -#include -#include "../../../libvariant/include/Variant/Variant.h" -#include "../../../libvariant/include/Variant/Blob.h" -#include "../../../libvariant/include/Variant/EmitterOutput.h" -#include -#include - -namespace libvariant { - - /** - * Class to override to implement an Emitter - */ - class EmitterImpl { - public: - virtual ~EmitterImpl(); - - virtual void BeginDocument() = 0; - virtual void EndDocument() = 0; - virtual void BeginMap(int length) = 0; - virtual void EndMap() = 0; - virtual void BeginList(int length) = 0; - virtual void EndList() = 0; - - virtual void EmitNull() = 0; - virtual void EmitTrue() = 0; - virtual void EmitFalse() = 0; - virtual void Emit(const char *v) = 0; - virtual void Emit(intmax_t v) = 0; - virtual void Emit(uintmax_t v) = 0; - virtual void Emit(double v) = 0; - virtual void Emit(ConstBlobPtr b) = 0; - - virtual void Flush() = 0; - virtual void Close() = 0; - - virtual Variant GetParam(const std::string &key) = 0; - virtual Variant GetParams() = 0; - virtual void SetParam(const std::string &key, Variant value) = 0; - virtual void SetParams(Variant params); - }; - - /** - * Actual emitter class. - */ - class Emitter { - public: - Emitter(); - Emitter(shared_ptr i); - ~Emitter(); - - Emitter &BeginDocument(); - Emitter &EndDocument(); - - //Some emitter implementations require the length of the map at the - //beginning. Such implementations should buffer events if length == -1 - //Implementations are free to ignore the length. - Emitter &BeginMap() { return BeginMap(-1); } - Emitter &BeginMap(int length); - Emitter &EndMap(); - //Some emitter implementations require the length of the list at the - //beginning. Such implementations should buffer events if length == -1 - Emitter &BeginList() { return BeginList(-1); } - Emitter &BeginList(int length); - Emitter &EndList(); - - Emitter &EmitNull(); - Emitter &EmitTrue(); - Emitter &EmitFalse(); - Emitter &Emit(bool v) { return (v ? EmitTrue() : EmitFalse()); } - Emitter &Emit(const std::string &v); - Emitter &Emit(const char *v); - Emitter &Emit(intmax_t v); - Emitter &Emit(uintmax_t v); - Emitter &Emit(double v); - Emitter &Emit(ConstBlobPtr b); - - void Flush(); - void Close(); - - /// Get the value of parameters of the parser (e.g. pretty printing, - // styles, etc.) - // See individual emitter below for supported values. - Variant GetParam(const std::string &key); - /// Get a dict of all parameters - Variant GetParams(); - /// Set the value of parameters. - // See individual emitter below for supported values. - void SetParam(const std::string &key, Variant value); - /// Set all parameters from a dict - void SetParams(Variant params); - /// Internal/advanced function to get the underlying implementation - shared_ptr GetImpl() { return impl; } - private: - shared_ptr impl; - }; - - template - inline Emitter &operator<<(Emitter &e, const std::vector &v) { - e.BeginList(v.size()); - for (typename std::vector::const_iterator i(v.begin()), end(v.end()); i!=end; i++) { - e << *i; - } - e.EndList(); - return e; - } - - template - inline Emitter &operator<<(Emitter &e, const std::map &v) { - e.BeginMap(v.size()); - for (typename std::map::const_iterator i(v.begin()), end(v.end()); i!=end; ++i) { - e.Emit(i->first); - e << i->second; - } - e.EndMap(); - return e; - } - inline Emitter &operator<<(Emitter &e, bool v) { e.Emit(v); return e; } - inline Emitter &operator<<(Emitter &e, char v) { e.Emit(intmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, short v) { e.Emit(intmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, int v) { e.Emit(intmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, long v) { e.Emit(intmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, long long v) { e.Emit(intmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, unsigned char v) { e.Emit(uintmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, unsigned short v) { e.Emit(uintmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, unsigned int v) { e.Emit(uintmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, unsigned long v) { e.Emit(uintmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, unsigned long long v) { e.Emit(uintmax_t(v)); return e; } - inline Emitter &operator<<(Emitter &e, const char *v) { e.Emit(v); return e; } - inline Emitter &operator<<(Emitter &e, const std::string &v) { e.Emit(v); return e; } - inline Emitter &operator<<(Emitter &e, float v) { e.Emit(double(v)); return e; } - inline Emitter &operator<<(Emitter &e, double v) { e.Emit(v); return e; } - inline Emitter &operator<<(Emitter &e, ConstBlobPtr v) { e.Emit(v); return e; } - - shared_ptr CreateEmitterOutput(void *ptr, unsigned len, unsigned *out_len=0); - shared_ptr CreateEmitterOutput(const char *filename); - shared_ptr CreateEmitterOutput(FILE *f); - shared_ptr CreateEmitterOutput(std::streambuf *sb); - - /** - * Create an Emiter that Emits the format specified by type. - * Supported parameters are dependent on type (see below). - */ - Emitter CreateEmitter(shared_ptr o, SerializeType type, Variant params = Variant::NullType); - - /** - * Create an Emitter that Emits the JSON format. - * - * Supported parameters are: - * "pretty": boolean - * "indent": integer (number of spaces to indent when pretty is on, - * default 4) - * "precision": integer (number of digits for floats) - * "strict": be more strict about emitting correct json - */ - Emitter JSONEmitter(shared_ptr o, Variant params = Variant::NullType); - - /** - * Supported parameters are (first is default): - * - * "scalar_style": "any"|"plain"|"single quoted"|"double - * quoted"|"literal"|"folded" - * - * "map_style": "any"|"block"|"flow" - * - * "list_style": "any"|"block"|"flow" - * - * "implicit_document_begin": false|true - * - * "implicit_document_end": false|true - * - * "indent": integer (number of spaces to indent) - * - * "width": integer (set prefered line width) - * - * "precision": integer (number of digits for floats) - */ - Emitter YAMLEmitter(shared_ptr o, Variant params = Variant::NullType); - - /** - * Supported params are: - * - * "pretty": true|false - * "indent": integer (amount to indent for pretty) - * "precision": integer (number of digits for floats) - */ - Emitter XMLPLISTEmitter(shared_ptr o, Variant params = Variant::NullType); - /** - * Supported params are: - * - * "precision": integer (number of digits for floats) - */ - Emitter BundleHdrEmitter(shared_ptr o, Variant params = Variant::NullType); - - /** - * No parameters supported. - */ - Emitter MsgPackEmitter(shared_ptr o, Variant params = Variant::NullType); -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/EmitterOutput.h b/src/hos_libvariant/src/libvariant/include/Variant/EmitterOutput.h deleted file mode 100644 index ffc5b1e8..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/EmitterOutput.h +++ /dev/null @@ -1,87 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - * - * The end user should not need to look at this file unless they are - * creating custom outputs for the emitters. - */ -#ifndef VARIANT_EMITTEROUTPUT_H -#define VARIANT_EMITTEROUTPUT_H -#pragma once -#include -#include - -namespace libvariant { - - class EmitterOutput { - public: - virtual ~EmitterOutput(); - /// Return the number of bytes written, or throw an exception - virtual unsigned Write(const void *ptr, unsigned len) = 0; - virtual void Flush() {} - virtual unsigned NumBytesWritten() const = 0; - }; - - class EmitterFileOutput : public EmitterOutput { - public: - EmitterFileOutput(FILE *f, bool c); - ~EmitterFileOutput(); - virtual unsigned Write(const void *ptr, unsigned len); - virtual void Flush(); - virtual unsigned NumBytesWritten() const { return num_bytes; } - protected: - FILE *file; - unsigned num_bytes; - bool cls; - }; - - class EmitterFilenameOutput : public EmitterFileOutput { - public: - EmitterFilenameOutput(const char *filename, const char *mode="w"); - }; - - class EmitterStreambufOutput : public EmitterOutput { - public: - EmitterStreambufOutput(std::streambuf *sb, bool d); - ~EmitterStreambufOutput(); - virtual unsigned Write(const void *ptr, unsigned len); - virtual void Flush(); - virtual unsigned NumBytesWritten() const { return num_bytes; } - protected: - std::streambuf *streambuf; - unsigned num_bytes; - bool del; - }; - - class EmitterMemoryOutput : public EmitterOutput { - public: - EmitterMemoryOutput(void *ptr, unsigned len, unsigned *out_len = 0); - - virtual unsigned Write(const void *ptr, unsigned len); - - virtual unsigned NumBytesWritten() const { return *out_length; } - protected: - void *data_ptr; - unsigned length; - unsigned out_length_dummy; - unsigned *out_length; - }; - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/Exceptions.h b/src/hos_libvariant/src/libvariant/include/Variant/Exceptions.h deleted file mode 100644 index baf54abe..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/Exceptions.h +++ /dev/null @@ -1,88 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_EXCEPTIONS_H -#define VARIANT_EXCEPTIONS_H -#include -#include -#include - -#include "../../../libvariant/include/Variant/VariantDefines.h" -namespace libvariant { - - /// \brief Exception thrown when a key does not exist. - class KeyError : public std::runtime_error { - public: - KeyError(const std::string &key) throw(); - }; - - /// \brief Exception thrown when internal state is corrupt. - class UnknownTypeError : public std::runtime_error { - public: - UnknownTypeError(VariantDefines::Type_t type) throw(); - }; - - /// \brief Exception thrown when a function expects a specific type but the action type conflicts. - class UnexpectedTypeError : public std::runtime_error { - public: - UnexpectedTypeError(VariantDefines::Type_t expected, VariantDefines::Type_t value) throw(); - UnexpectedTypeError(const std::vector &expected, VariantDefines::Type_t value) throw(); - }; - - /// \brief Exception thrown when a function cannot convert the Variant to an acceptable type for the routine. - class UnableToConvertError : public std::runtime_error { - public: - UnableToConvertError(VariantDefines::Type_t sourcetype, const std::string &targettype) throw(); - }; - - /// \brief Exception thrown when trying to index a type other than map or list. - class TypeNotIndexableError : public std::runtime_error { - public: - TypeNotIndexableError(VariantDefines::Type_t type) throw(); - }; - - /// \brief Exception thrown when attempting a numeric operation on a non numeric type. - class NotNumericTypeError : public std::runtime_error { - public: - NotNumericTypeError(VariantDefines::Type_t type) throw(); - }; - - /// \brief Exception thrown from path functions - class BadPathError : public std::runtime_error { - public: - BadPathError(VariantDefines::Type_t type) throw(); - BadPathError(const std::string &msg) throw(); - }; - - class InvalidReferenceError : public std::runtime_error { - public: - InvalidReferenceError(const std::string &msg) throw(); - }; - - class InvalidOperationError : public std::runtime_error { - public: - InvalidOperationError(VariantDefines::Type_t type, const std::string &opname) throw(); - }; - - std::ostream &operator <<(std::ostream &os, VariantDefines::Type_t type); - - void AddStackTrace(std::ostream &os, int level); -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/Extensions.h b/src/hos_libvariant/src/libvariant/include/Variant/Extensions.h deleted file mode 100644 index c2ca2584..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/Extensions.h +++ /dev/null @@ -1,92 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author Josh Staley - * \brief Useful extension functions for Variant - */ - -#ifndef VARIANT_EXTENSIONS_H -#define VARIANT_EXTENSIONS_H - -#include "../../../libvariant/include/Variant/Variant.h" - -namespace libvariant { - - /// \brief Returns a default parameters for use with FlattenPath and ExpandPath functions. - Variant ExtensionParams(); - - /// \brief Sets any missing Extension parameters to 'params' for use with FlattenPath and ExpandPath functions. - void ExtensionParams( VariantRef params ); - - /// \brief Returns a version of 'var' with flat paths based on 'params' - Variant FlattenPath( const Variant &var, Variant params = ExtensionParams() ); - - /// \brief Returns a version of 'var' with expanded paths based on 'params' - Variant ExpandPath( const Variant &var, Variant params = ExtensionParams() ); - - /// \brief Flattens 'var' paths to 'flat' based on 'params' - void FlattenPathTo( VariantRef flat, const Variant &var, Variant params = ExtensionParams(), std::string prefix = "" ); - - /// \brief Expands 'var' paths to 'expand' based on 'params' - void ExpandPathTo( VariantRef expand, const Variant &var, Variant params = ExtensionParams() ); - - /// \brief Returns a string string map representation of 'var' based on 'params' - std::map - FlattenPathToStrStrMap( const Variant &var, Variant params = ExtensionParams() ); - - /// \brief Returns a variant representing elements in 'compare' that differ from 'base' recursively - Variant RDiff( const Variant &base, const Variant &compare ); - - /// \brief Sets elements into 'diff' from 'compare' that differ from 'base' recursively - void RDiff( VariantRef diff, const Variant &base, const Variant &compare ); - - /// \brief Updates 'base' with entries in 'update' recursively - void RUpdate( VariantRef base, const Variant &update ); - - /// Perform an operations on v according to RFC6901 and RFC6902. - // Note that JSON Pointer is ambiguous without the presence of a document. - // These function throw if the lookup fails because of incorrect types or - // on ambiguity. - // On return (or throw) the operation will have either succedded or no - // change will have been made. - - /// Add data to v at the spot specified by pointer - void JSONPointerAdd(const std::string &pointer, VariantRef v, Variant data); - /// Remove the element in v at the spot specified by pointer - void JSONPointerRemove(const std::string &pointer, VariantRef v); - /// Replace the value at pointer with data, error if the location does not already exist - void JSONPointerReplace(const std::string &pointer, VariantRef v, Variant data); - /// Move the value from src to dst (equivalent to get(src), remove(src), add(dst) - void JSONPointerMove(const std::string &src, const std::string &dst, VariantRef v); - /// Copy the value from src to dst (equivalent to add(dst, get(src).Copy())) - void JSONPointerCopy(const std::string &src, const std::string &dst, VariantRef v); - /// Perform a lookup into v according to RFC6901, return a reference to the value at the location - VariantRef JSONPointerLookup(const std::string &pointer, VariantRef v); - - std::string FormJSONPointer(const Path &path); - - /// Perform a patch operation on v with the patch as described by diff according to RFC6902 - // Returns true if the patch is applied and all tests pass, - // false if any tests failed and no patch is applied - std::pair JSONPatch(VariantRef v, const Variant &diff); - - /// Create a diff suitable to give to JSONPatch to transform src into dst. - Variant JSONDiff(const Variant &src, const Variant &dst); - -} // namespace libvariant - -#endif /*#ifndef VARIANT_EXTENSIONS_H*/ diff --git a/src/hos_libvariant/src/libvariant/include/Variant/GuessFormat.h b/src/hos_libvariant/src/libvariant/include/Variant/GuessFormat.h deleted file mode 100644 index 0346e80a..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/GuessFormat.h +++ /dev/null @@ -1,23 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_GUESSFORMAT_H -#define VARIANT_GUESSFORMAT_H - -#pragma once -#include "../../../libvariant/include/Variant/Variant.h" -#include "../../../libvariant/include/Variant/Parser.h" -namespace libvariant { - - /// - // Try to guess the format of the input without removing any - // input from the input object. - // - // Currently only looks at the first non-whitespace character - // and if it is '<' then says XMLPLIST, otherwise says YAML - // if enabled otherwise JSON. - // - SerializeType GuessFormat(ParserInput* in); -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/Parser.h b/src/hos_libvariant/src/libvariant/include/Variant/Parser.h deleted file mode 100644 index 8309eabd..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/Parser.h +++ /dev/null @@ -1,158 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_PARSER_H -#define VARIANT_PARSER_H - -#pragma once -#include -#include -#include "../../../libvariant/include/Variant/Blob.h" -#include "../../../libvariant/include/Variant/ParserInput.h" -#include "../../../libvariant/include/Variant/Variant.h" -#include - -namespace libvariant { - - class ParserImpl; - - class ParserActions { - public: - virtual ~ParserActions(); - virtual void BeginDocument(ParserImpl *p) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void EndDocument(ParserImpl *p) - { throw std::runtime_error("Parser: Unexpected event"); } - // If length < 0, unknown length - virtual void BeginMap(ParserImpl *p, int length, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void EndMap(ParserImpl *p) - { throw std::runtime_error("Parser: Unexpected event"); } - // If length < 0, unknown length - virtual void BeginList(ParserImpl *p, int length, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void EndList(ParserImpl *p) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Alias(ParserImpl *p, const char *anchor) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, double v, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, const char *str, unsigned length, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, bool v, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Null(ParserImpl *p, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, intmax_t v, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, uintmax_t v, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - virtual void Scalar(ParserImpl *p, BlobPtr b, const char *anchor, const char *tag) - { throw std::runtime_error("Parser: Unexpected event"); } - }; - - /// The class that parser implementations override - class ParserImpl { - public: - virtual ~ParserImpl(); - /** - * Attempt to parse some actions. - * At least one ParserActions should be on the action stack. - * - * Run is not guaranteed to be recursively callable from inside a - * ParserActions callback. Do not do that. - * - * return 0 on success - * return 1 when done - * return -1 if needing more data is detected (not all parsers support this; can be treated as an error) - * throw on error - */ - virtual int Run() = 0; - - /** - * Push a new ParserActions handler onto the action handler stack. - */ - virtual void PushAction(shared_ptr action) { action_stack.push_back(action); } - - /** - * Pop the top ParserActions handler off the action handler stack and - * return it. - */ - virtual shared_ptr PopAction() { - if (action_stack.empty()) - { throw std::runtime_error("Parser: Attempting to parse an actions without any action handlers"); } - shared_ptr ret = action_stack.back(); - action_stack.pop_back(); - return ret; - } - - /** - * Access the top ParserActions - */ - ParserActions *TopAction() { - if (action_stack.empty()) - { throw std::runtime_error("Parser: Attempting to parse an actions without any action handlers"); } - return action_stack.back().get(); - } - - /** These three functiosn can be used to query the state - * later. - * Done means that a call to Process will immediately return 1 - * Error if Process threw an exception last - * Ok if everything looks good (Process never been called, or last return 0 or possibly -1) - */ - virtual bool Done() const = 0; - virtual bool Error() const = 0; - virtual bool Ok() const = 0; - /// Return a string describing the last error suitable for presentation to a user - virtual std::string ErrorStr() const = 0; - /// Reset the parser - virtual void Reset() = 0; - protected: - std::deque< shared_ptr< ParserActions > > action_stack; - }; - - class Parser { - public: - Parser(); - Parser(shared_ptr pi); - ~Parser(); - /// 0 on success, 1 when done, -1 other problem, throw on error - int Run() { return impl->Run(); } - /// Push an action handler onto the action stack. - void PushAction(shared_ptr action) { impl->PushAction(action); } - /// Pop the top action handler off the stack. - shared_ptr PopAction() { return impl->PopAction(); } - - /// Query state - bool Done() const { return impl->Done(); } - bool Error() const { return impl->Error(); } - bool Ok() const { return impl->Ok(); } - /// Return a string describing the last error suitable for presentation to a user - std::string ErrorStr() const { return impl->ErrorStr(); } - /// Reset the parser if applicable (some types will throw) - void Reset() { impl->Reset(); } - - /// Internal/advanced function to get the underlying implementation - shared_ptr GetImpl() { return impl; } - private: - shared_ptr impl; - }; - - shared_ptr CreateParserInput(const std::string &str); - shared_ptr CreateParserInput(const char *str); - shared_ptr CreateParserInput(const void *ptr, unsigned len); - shared_ptr CreateParserInputFile(const char *filename); - shared_ptr CreateParserInputFile(FILE *f); - shared_ptr CreateParserInputFile(std::streambuf *sb); - - Parser CreateParser(shared_ptr i, SerializeType type); - Parser CreateParserGuess(shared_ptr i); - Parser JSONParser(shared_ptr i); - Parser YAMLParser(shared_ptr i); - Parser XMLPLISTParser(shared_ptr i); - Parser BundleHdrParser(shared_ptr i); - Parser MsgPackParser(shared_ptr i); -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/ParserInput.h b/src/hos_libvariant/src/libvariant/include/Variant/ParserInput.h deleted file mode 100644 index 5fa66311..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/ParserInput.h +++ /dev/null @@ -1,104 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_PARSERINPUT_H -#define VARIANT_PARSERINPUT_H -#pragma once -#include -#include -#include -#include - -namespace libvariant { - - class ParserInput { - public: - virtual ~ParserInput(); - // Get a pointer and length to the unprocessed data that is available - // (return null on end of data) len being an in/out parameter, - // the initial value of len is how much the parser wants. An input value of zero - // in means give whatever is currently available. - virtual const void *GetPtr(unsigned &len) = 0; - - // Tell the input that the parser is done with len bytes from the last - // GetPtr - virtual void Release(unsigned len) = 0; - }; - - class ParserStreamInput : public ParserInput { - public: - ParserStreamInput(unsigned buffer_len); - virtual const void *GetPtr(unsigned &len); - virtual void Release(unsigned len); - /// return number of bytes read into ptr, 0 on EOF - // and throw on error - virtual unsigned Read(void *ptr, unsigned len) = 0; - protected: - std::vector buffer; - unsigned num; - unsigned offset; - bool eof; - }; - - class ParserMemoryInput : public ParserInput { - public: - ParserMemoryInput(const void *ptr, unsigned len); - virtual const void *GetPtr(unsigned &len); - virtual void Release(unsigned len); - protected: - const void *data_ptr; - unsigned data_len; - unsigned offset; - }; - - class ParserStringInput : public ParserInput { - public: - ParserStringInput(const std::string &str); - virtual const void *GetPtr(unsigned &len); - virtual void Release(unsigned len); - protected: - const std::string val; - unsigned offset; - }; - - class ParserFileInput : public ParserStreamInput { - public: - ParserFileInput(FILE *f); - virtual unsigned Read(void *ptr, unsigned len); - protected: - FILE *file; - }; - - class ParserFilenameInput : public ParserFileInput { - public: - ParserFilenameInput(const char *filename, const char *mode = "r"); - ~ParserFilenameInput(); - }; - - class ParserStreambufInput : public ParserStreamInput { - public: - ParserStreambufInput(std::streambuf *sb); - unsigned Read(void *ptr, unsigned len); - protected: - std::streambuf *streambuf; - }; - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/Path.h b/src/hos_libvariant/src/libvariant/include/Variant/Path.h deleted file mode 100644 index 15c059fe..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/Path.h +++ /dev/null @@ -1,100 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_PATH_H -#define VARIANT_PATH_H - -#pragma once -#include -#include -#include "../../../libvariant/include/Variant/Exceptions.h" -namespace libvariant { - - // A simple xpath like path functionality for Variant - // - // Map keys are specified using a "/" then the key. - // List indeces are specified using [index] - // A "/" at the end of the path is ignored. - // Characters "\/[]" must all be escaped with "\" - // - // For example: - // { - // "key1": [ 1, 2, 3, { "blork": true } ], - // "key2": { - // "subkey": [ "a", { "furple": 1 }, 2 ], - // "sub/key2": true - // } - // } - // - // Then all paths enumerated are: - // Path Value - // "/" Identity - // "/key1" [ 1, 2, 3, { "blork": true } ], - // "/key1[0]" 1 - // "/key1[1]" 2 - // "/key1[2]" 3 - // "/key1[3]" { "blork": true } - // "/key1[3]/blork" true - // "/key2" { "subkey": [ "a", { "furple": 1 }, 2 ], "sub/key2": true } - // "/key2/subkey" [ "a", { "furple": 1 }, 2 ] - // "/key2/subkey[0]" "a" - // "/key2/subkey[1]" { "furple": 1 } - // "/key2/subkey[1]/furple" 1 - // "/key2/subkey[2]" 2 - // "/key2/sub\/key2" true - // - // For all these functions PathList must act like a vector - // It may be of some other type (like deque) - - class PathElement { - public: - enum Type_t { INDEX, KEY }; - PathElement(const std::string &k) : type(KEY), key(k) {} - PathElement(const char *k) : type(KEY), key(k) {} - PathElement(unsigned i) : type(INDEX), index(i) {} - - bool IsNumber() const { return type == INDEX; } - unsigned AsUnsigned() const { - if (type != INDEX) throw BadPathError("Variant path element is not a number"); - return index; - } - bool IsString() const { return type == KEY; } - const std::string &AsString() const { - if (type != KEY) throw BadPathError("Variant path element is not a key"); - return key; - } - private: - Type_t type; - unsigned index; - std::string key; - }; - - typedef std::deque Path; - - //! - // Parse the path string into path tokens. - void ParsePath(Path &parsed_path, const std::string &path); - Path ParsePath(const std::string &path); - - //! Take the set of path tokens and turn it into a path string - std::string PathString(const Path &path); - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/Payload.h b/src/hos_libvariant/src/libvariant/include/Variant/Payload.h deleted file mode 100644 index 104dffc8..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/Payload.h +++ /dev/null @@ -1,130 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_PAYLOAD_H -#define VARIANT_PAYLOAD_H - -#pragma once -#include "../../../libvariant/include/Variant/Variant.h" -#include "../../../libvariant/include/Variant/Emitter.h" -#include "../../../libvariant/include/Variant/Parser.h" -namespace libvariant { - - // Serialize and Deserialize a header, null byte, and a binary payload - // - // All restrictions of the given serialization format are required. - // - // Parameters for payload data location: - // "length_path": path to where the payload length should be - // placed for serialization and where the payload length should be read - // from for deserialization - // Defaults to: -#define VARIANT_PAYLOAD_LENGTH_PATH "payload/length" -#define VARIANT_BUNDLE_PAYLOAD_LENGTH_PATH "payload.length" - // "data_path": path to where the payload is located for - // serialization and path to store payload for deserialization - // Defaults to: -#define VARIANT_PAYLOAD_DATA_PATH "payload/data" -#define VARIANT_BUNDLE_PAYLOAD_DATA_PATH "payload.data" - // The defaults are the values for compatibility with the bundle format. - // - // Serialize only parameters: - // "ignore_payload": true|false (default false) - // Don't output the payload, only the header, alignment and null byte. - // If the payload exists in the Variant, use the length for the payload length - // value, if not look in parameters for the payload length value, if not there - // look in the Variant for the payload length. - // "payload_length": num - // Payload length override, put this number in as the payload length - // regardless of what size the blob is. - // Note that unless ingnore_payload is true, the emitter will try to output the whole - // payload (and no more) regardless of what this number is. - - void SerializeWithPayload(shared_ptr out, Variant v, SerializeType type, - Variant params = Variant::NullType); - Variant DeserializeWithPayload(shared_ptr in, SerializeType type, - Variant params = Variant::NullType, bool be_safe=true); - - std::string SerializeWithPayload(Variant v, SerializeType type, Variant params = Variant::NullType); - void SerializeWithPayload(const std::string &filename, Variant v, SerializeType type, - Variant params = Variant::NullType); - void SerializeWithPayload(FILE *f, Variant v, SerializeType type, - Variant params = Variant::NullType); - void SerializeWithPayload(std::streambuf *sb, Variant v, SerializeType type, - Variant params = Variant::NullType); - unsigned SerializeWithPayload(void *ptr, unsigned len, Variant v, SerializeType type, - Variant params = Variant::NullType); - - Variant DeserializeWithPayload(const std::string &str, SerializeType type, - Variant params = Variant::NullType); - /// If the be_safe parameter is false, then it is considered OK - // to __/NOT/__ copy the payload and just reference it in the BlobPtr. - // This is only safe when you know your buffer is going to stick around - // until after your done with the resulting Variant. - // (This is to support zero copy) - // No null terminated string version provided as these formats contain nulls. - Variant DeserializeWithPayload(const void *ptr, unsigned len, SerializeType type, - Variant params = Variant::NullType, bool be_safe=true); - Variant DeserializeWithPayloadFile(const char *filename, SerializeType type, - Variant params = Variant::NullType); - Variant DeserializeWithPayloadFile(FILE *f, SerializeType type, - Variant params = Variant::NullType); - Variant DeserializeWithPayloadFile(std::streambuf *sb, SerializeType type, - Variant params = Variant::NullType); - - - /// Bundle is a simple format used internally at ARL for passing around - // a textual key value map plus a binary payload. The payload is often a very large - // array of numbers that would produce unacceptable overhead to serialize into text. - // These serialize routines assume that the passed in Variant is of MapType - // and if a key named "payload.data" exists it is to be written as the payload - // of the Bundle. - // - // If a key "payload.data" does not exist, these are almost the same as using the BundleHdrEmitter - // except it adds a null byte at the end. - inline std::string SerializeBundle(Variant v) - { return SerializeWithPayload(v, SERIALIZE_BUNDLEHDR); } - inline void SerializeBundle(const std::string &filename, Variant v) - { SerializeWithPayload(filename, v, SERIALIZE_BUNDLEHDR); } - inline void SerializeBundle(FILE *f, Variant v) - { SerializeWithPayload(f, v, SERIALIZE_BUNDLEHDR); } - inline void SerializeBundle(std::streambuf *sb, Variant v) - { SerializeWithPayload(sb, v, SERIALIZE_BUNDLEHDR); } - inline unsigned SerializeBundle(void *ptr, unsigned len, Variant v) - { return SerializeWithPayload(ptr, len, v, SERIALIZE_BUNDLEHDR); } - - inline Variant DeserializeBundle(const std::string &str) - { return DeserializeWithPayload(str, SERIALIZE_BUNDLEHDR); } - /// If the be_safe parameter is false, then it is considered OK - // to __/NOT/__ copy the payload and just reference it in the BlobPtr. - // This is only safe when you know your buffer is going to stick around - // until after your done with the resulting Variant. - // (This is to support zero copy) - // No null terminated string version provided as bundles contain nulls. - inline Variant DeserializeBundle(const void *ptr, unsigned len, bool be_safe=true) - { return DeserializeWithPayload(ptr, len, SERIALIZE_BUNDLEHDR, Variant::NullType, be_safe); } - inline Variant DeserializeBundleFile(const char *filename) - { return DeserializeWithPayloadFile(filename, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleFile(FILE *f) { return DeserializeWithPayloadFile(f, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleFile(std::streambuf *sb) - { return DeserializeWithPayloadFile(sb, SERIALIZE_BUNDLEHDR); } - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/Schema.h b/src/hos_libvariant/src/libvariant/include/Variant/Schema.h deleted file mode 100644 index 2626087d..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/Schema.h +++ /dev/null @@ -1,175 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief A schema validator. - * - * This code is based on the public domain JSONv4 validator tv4. - * tv4 is available at http://geraintluff.github.com/tv4/ - */ -#ifndef VARIANT_SCHEMA_H -#define VARIANT_SCHEMA_H - -#pragma once -#include "../../../libvariant/include/Variant/Variant.h" -#include -#include -#include -#include -namespace libvariant { - - class SchemaResult; - - class ValidationError { - public: - ValidationError(const std::string &m, const Path &dpath, - const Path &spath); - - void AddSubError(const SchemaResult &err); - - const std::string &GetMessage() const { return message; } - const Path &GetDataPath() const { return data_path; } - std::string GetDataPathStr() const; - const Path &GetSchemaPath() const { return schema_path; } - std::string GetSchemaPathStr() const; - const std::vector &GetSubErrors() const { return sub_errors; } - - std::string PrettyPrintMessage() const; - void PrettyPrintMessage(std::ostream &os, unsigned indent=0) const; - private: - std::string message; - Path data_path; - Path schema_path; - std::vector sub_errors; - }; - - class SchemaError { - public: - SchemaError(const std::string &m, const Path &spath); - - const std::string &GetMessage() const { return message; } - const Path &GetSchemaPath() const { return schema_path; } - std::string GetSchemaPathStr() const; - - std::string PrettyPrintMessage() const; - void PrettyPrintMessage(std::ostream &os, unsigned indent=0) const; - private: - std::string message; - Path schema_path; - }; - - class SchemaResult { - public: - SchemaResult(); - - void AddError(const ValidationError &err); - void AddSchemaError(const SchemaError &err); - - bool Error() const { return !errors.empty() || !schema_errors.empty(); } - bool ValidationErrors() const { return !errors.empty(); } - bool SchemaErrors() const { return !schema_errors.empty(); } - - const std::vector &GetErrors() const { return errors; } - const std::vector &GetSchemaErrors() const { return schema_errors; } - - std::string PrettyPrintMessage() const; - void PrettyPrintMessage(std::ostream &os, unsigned indent=0) const; - private: - std::vector errors; - std::vector schema_errors; - }; - - inline std::ostream &operator<<(std::ostream &os, const SchemaResult &sr) { - sr.PrettyPrintMessage(os); - return os; - } - - class SchemaLoader { - public: - class LoaderError { - public: - LoaderError(); - ~LoaderError(); - void AddError(const std::string &uri, const std::string &msg); - std::string GetErrorMessage() const { return erross.str(); } - private: - std::ostringstream erross; - }; - - typedef bool (*MissingHandlerType)(SchemaLoader*,const std::string&,LoaderError &,void*); - SchemaLoader(); - SchemaLoader(SchemaLoader *b); - virtual ~SchemaLoader(); - // Get the schema at the uri specified. - // Internal lookup first, then call HandleMissing if the uri is not internally available. - // If the schema then is still not available return Variant::NullType. - virtual Variant GetSchema(const std::string &uri); - // Add a schema to the loader at the uri specified. - // returns the schema(s) added with the corresponding uri(s) - virtual std::map AddSchema(const std::string &uri, Variant schema); - // Forget a schema with the specified uri. - virtual void ForgetSchema(const std::string &uri); - // Called when a schema is not in the loader. - // Default implementation is to call the missing handler - // or add a not found error to the LoaderError and return false - // Return true on success, otherwise false, any errors are filled into the LoaderError - virtual bool HandleMissing(const std::string &uri, LoaderError &error); - void SetMissingHandler(MissingHandlerType, void *ctx); - - static void NormSchema(Variant &schema, const std::string &uri); - //! - // A realpath function for schema URIs. - // href is the "current working directory" and base is - // possibly a relative path. - static std::string ResolveURI(const std::string &base, const std::string &href); - - struct URIInfo { - std::string href; // EX: the whole uri if matched - std::string protocol; // EX: http:// - std::string authority; // user:host@hostname:port - std::string pathname; // The path segment - std::string search; // ?q=234 - std::string hash; // #tag - }; - - //! Break a uri into its components and store them into the URIInfo struct - //! returns true if the parsing was successful - static bool ParseURI(URIInfo &info, const std::string &uri); - protected: - - static void SearchForTrustedSchemas(std::map &m, Variant schema, const std::string &uri); - MissingHandlerType missingHandler; - void *missingctx; - std::map schemas; - SchemaLoader *base; - }; - - //! Validate data against a schema. - //! - //! The schema parameter is either a schema, a string uri to a schema, or null. - //! If it is a schema then data is validated against it. - //! If it is a string then it calls loader->GetSchema() and validates data against the result. - //! If schema is null, then look for a key "$schema" in data, set schema to it and proceed as above. - SchemaResult SchemaValidate(Variant schema, Variant data, SchemaLoader *loader=0); - - //! Add the defaults specified in schema to data if they do not exist. - //! Ignores default in some combinations and types that could match multiple entries (not, - //! additionalProperties, patternProperties, etc.) - //! schema is processed the same as for SchemaValidate - void AddSchemaDefaults(Variant schema, VariantRef data, SchemaLoader *loader=0); -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/SchemaLoader.h b/src/hos_libvariant/src/libvariant/include/Variant/SchemaLoader.h deleted file mode 100644 index e4944279..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/SchemaLoader.h +++ /dev/null @@ -1,54 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief An advanced schema loader. - */ -#ifndef VARIANT_SCHEMALOADER_H -#define VARIANT_SCHEMALOADER_H - -#pragma once - -#include "../../../libvariant/include/Variant/Schema.h" - -namespace libvariant { - - //! The advanced schema loader will try to load missing schemas from - //! the file system and optionally curl if built. - //! If the url begins with file:// it will always use LoadFromFile - //! otherwise if the protocol is empty it will try loading from a file - //! then try loading from curl. Otherwise if the protocol is not file:// - //! it will try to load from curl. - class AdvSchemaLoader : public SchemaLoader { - public: - - //! The advanced schema loader will search for a schema in the paths - //! added to it on the file system. If the schema uri looks like a - //! relative path, then it will be searched for in the paths set with - //! this function. If no paths are added, then only absolute paths will - //! be looked up in the file system. - // - void AddPath(const std::string &path); - - virtual bool HandleMissing(const std::string &uri, LoaderError &error); - protected: - bool LoadFromFile(URIInfo &info, LoaderError &error); - bool LoadFromCurl(URIInfo &info, LoaderError &error); - std::vector< std::string > paths; - }; -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/SharedPtr.h b/src/hos_libvariant/src/libvariant/include/Variant/SharedPtr.h deleted file mode 100644 index 9fe22a68..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/SharedPtr.h +++ /dev/null @@ -1,40 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_SHAREDPTR_H -#define VARIANT_SHAREDPTR_H -#pragma once -#include - -#if defined(__GXX_EXPERIMENTAL_CXX0X) || __cplusplus >= 201103L || defined(HAVE_CXX11_SHAREDPTR) -// The C++11 implementation is available -#include -namespace libvariant { - using std::shared_ptr; - using std::dynamic_pointer_cast; -} - -#elif defined(HAVE_TR1_SHAREDPTR) -// Use the tr1 implementation -#include -namespace libvariant { - using std::tr1::shared_ptr; - using std::tr1::dynamic_pointer_cast; -} - -#elif defined(USE_BOOST_SHAREDPTR) -// Use the boost implementation -#include -namespace libvariant { - using boost::shared_ptr; - using boost::dynamic_pointer_cast; -} - -#else - -#error libvariant requires a shared_ptr implementation - -#endif - -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/Variant.h b/src/hos_libvariant/src/libvariant/include/Variant/Variant.h deleted file mode 100644 index 136506eb..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/Variant.h +++ /dev/null @@ -1,816 +0,0 @@ -// vim: foldmethod=marker -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= - -/** \file - * - * \brief Main implementation file for Variant and related functions - */ - - -#ifndef VARIANT_VARIANT_H -#define VARIANT_VARIANT_H - -#pragma once -#include "../../../libvariant/include/Variant/Blob.h" -#include "../../../libvariant/include/Variant/SharedPtr.h" -#include "../../../libvariant/include/Variant/Exceptions.h" -#include "../../../libvariant/include/Variant/VariantInternal.h" -#include -#include -#include -#include -#include -#include -#include - -namespace libvariant { - - /** \brief The Variant class. - * This is a variant type inspired by types from several different - * scripting languages. - * - * \author John Bridgman - * - * This class gives the power and convenience of a scripting language variable - * to C++ with all the same /downsides/ that such a variable has as well. The - * main idea is that things should be simple, lists are behind the scenes an - * std::vector and maps are an std::map. - * - * A Variant may be null, a number, a string, a boolean, a reference to a list, - * or a reference to a map. This means that const Variant of a map is not a - * const map but a const reference. Lists and maps are reference counted. If - * one wants to copy use the Copy member function. - * - * If you need a reference to a Variant to assign to it or change its type, - * use VariantRef. - * A const Variant & should be used for an immutable reference. - * E.g., void foo(VariantRef inout_param, const Variant &in_param); - * That is to say, if you think you want Variant &, you don't, you want - * VariantRef. - * The library is written so that: - * Variant v; - * void bar(Variant &); - * bar(v["foo"]); - * is a compile error. - * But - * Variant v; - * void moo(const Variant &); - * moo(v["moo"]); - * is correct. - * - * - * Note that this implementation will let you create a back reference (i.e., a - * map with itself as a member) but unless the user explicitly breaks it, it - * will result in a memory leak. Checking for this case was deemed too - * expensive. - * - * A Variant will only change its own type if the type is null. That is to say - * that a null Variant that gets treated as a map will become a map. But, a - * Variant of any other type will never automatically convert. - * - */ - class Variant : protected Internal::Data, public VariantDefines { - public: - - typedef VariantRefImpl VariantRef; - - typedef std::vector List; - typedef std::map Map; - - typedef Map::iterator MapIterator; - typedef Map::const_iterator ConstMapIterator; - typedef List::iterator ListIterator; - typedef List::const_iterator ConstListIterator; - - Variant() {} - Variant(VariantDefines::Type_t type) { Assign(type); } - Variant(bool v) { Assign(v); } - - Variant(int v) { Assign(v); } - Variant(unsigned v) { Assign(v); } - Variant(long v) { Assign(v); } - Variant(unsigned long v) { Assign(v); } - Variant(long long v) { Assign(v); } - Variant(unsigned long long v) { Assign(v); } - Variant(double v) { Assign(v); } - Variant(long double v) { Assign(v); } - - Variant(BlobPtr b) { Assign(b); } - - Variant(const std::string &v) { Assign(v); } - Variant(const char *v) { Assign(v); } - Variant(const Variant &v) { Assign(v); } - Variant(const VariantRefImpl &v) { Assign(v); } - - /// Construct a list from a std::vector. - template - Variant(const std::vector &v) { Assign(v); } - - /// Construct a map from a std::map. - template - Variant(const std::map &v) { Assign(v); } - - ~Variant(); - - Variant &operator=(const Variant &o) { Assign(o); return *this; } - - Variant &operator=(VariantDefines::Type_t v) { Assign(v); return *this; } - Variant &operator=(bool v) { Assign(v); return *this; } - Variant &operator=(int v) { Assign(v); return *this; } - Variant &operator=(unsigned v) { Assign(v); return *this; } - Variant &operator=(long v) { Assign(v); return *this; } - Variant &operator=(unsigned long v) { Assign(v); return *this; } - Variant &operator=(long long v) { Assign(v); return *this; } - Variant &operator=(unsigned long long v) { Assign(v); return *this; } - Variant &operator=(double v) { Assign(v); return *this; } - Variant &operator=(long double v) { Assign(v); return *this; } - Variant &operator=(BlobPtr v) { Assign(v); return *this; } - Variant &operator=(const std::string & v) { Assign(v); return *this; } - Variant &operator=(const char * v) { Assign(v); return *this; } - - template - Variant &operator=(const std::vector &v) { Assign(v); return *this; } - template - Variant &operator=(const std::map &v) { Assign(v); return *this; } - - // Type query functions - - Type_t GetType() const; ///< Return the type of this Variant - - bool IsNull() const { return NullType == GetType(); } - bool IsBool() const { return BoolType == GetType(); } - bool IsTrue() const { return (BoolType == GetType()) && AsBool(); } - bool IsFalse() const { return (BoolType == GetType()) && !AsBool(); } - bool IsNumber() const - { return IntegerType == GetType() || UnsignedType == GetType() || FloatType == GetType(); } - bool IsInt() const { return IntegerType == GetType(); } - bool IsUnsigned() const { return UnsignedType == GetType(); } - bool IsFloat() const { return FloatType == GetType(); } - bool IsString() const { return StringType == GetType(); } - bool IsList() const { return ListType == GetType(); } - bool IsMap() const { return MapType == GetType(); } - bool IsBlob() const { return BlobType == GetType(); } - - - // Accessor functions - - bool AsBool() const; ///< Return the value as a bool - long double AsLongDouble() const; ///< Return the value as a long double - double AsDouble() const { return (double)AsLongDouble(); } - uintmax_t AsUnsigned() const; ///< Return the value as an unsigned - intmax_t AsInt() const; ///< Return the value as an integer - template - T AsNumber() const { return static_cast(AsLongDouble()); } - std::string AsString() const; ///< Return the value as a string - BlobPtr AsBlob(); - ConstBlobPtr AsBlob() const; - - template - T As() const; - - /// \brief If the type is string, list, map or blob returns its size, - /// otherwise throws an exception - unsigned Size() const; - - /// \brief If the type is string, list or map return if size == 0 otherwise - /// throw an exception - bool Empty() const; - - /// \brief If the type is string, list or map, empty the container otherwise - /// set type to NullType - void Clear(); - - // List specific accessors - List &AsList(); - const List &AsList() const; - ListIterator ListBegin() ///< Equivalent to AsList().begin() - { return AsList().begin(); } - ConstListIterator ListBegin() const ///< Equivalent to AsList().begin() - { return AsList().begin(); } - ListIterator ListEnd() ///< Equivalent to AsList().end() - { return AsList().end(); } - ConstListIterator ListEnd() const ///< Equivalent to AsList().end() - { return AsList().end(); } - VariantRef At(unsigned i); //< Return a proxy/reference to the element at index i - VariantRef At(unsigned i, Variant def); //< sets to def if doesn't exist - const Variant &At(unsigned i) const; - Variant Get(unsigned i) const; //< Return the element at index i or throw - Variant Get(unsigned i, Variant def) const; //< Return the element at index i or return def - Variant &Set(unsigned i, Variant v); //< Set the element at index i to v - /// \brief Only valid when of type ListType Returns *this, so you can - /// do Variant().Append(v1).Append(v2)... - Variant &Append(Variant value); - - /// \brief If list return true if list is at least i in size, if map then convert i - /// to a string, otherwise throw - bool Contains(unsigned i) const; - /// \brief Return the index hat v is at. - /// If v is not contained in the list it return this->Size() - unsigned Index(Variant v) const; - - /// \brief If list set index i to null, if index at end, reduce size by 1 - /// throw if not a list - void Erase(unsigned i); - - // Map specific accessors - Map &AsMap(); - const Map &AsMap() const; - MapIterator MapBegin() ///< Equivalent to AsMap().begin() - { return AsMap().begin(); } - ConstMapIterator MapBegin() const ///< Equivalent to AsMap().begin() - { return AsMap().begin(); } - MapIterator MapEnd() ///< Equivalent to AsMap().end() - { return AsMap().end(); } - ConstMapIterator MapEnd() const ///< Equivalent to AsMap().end() - { return AsMap().end(); } - VariantRef At(const std::string &s); // Return a proxy/reference to the element at key s - VariantRef At(const std::string &s, Variant def); //< Sets to def if doesn't exist and return a reference to it - const Variant &At(const std::string &s) const; - - /// \brief If s in *this: return this->At(s); else throw; - Variant Get(const std::string &s) const; - /// \brief If s in *this: return this->At(s); else return def - /// Only works if type is map - Variant Get(const std::string &s, Variant def) const; - - /// \brief Set the key s to v - // returns *this - Variant &Set(const std::string &s, Variant v); - - /// \brief If map return true if s is a key in the map, if list then convert - /// s to an unsigned and the above Contains, otherwise throw - bool Contains(const std::string &s) const; - /// \brief Erase a key in a map, throws if type is not MapType - void Erase(const std::string &key); - - VariantRef operator[](int i) { return At(i); } - const Variant &operator[](int i) const { return At(i); } - - VariantRef operator[](unsigned i) { return At(i); } - const Variant &operator[](unsigned i) const { return At(i); } - - VariantRef operator[](const std::string &s) { return At(s); } - const Variant &operator[](const std::string &s) const { return At(s); } - - // Path related accessors - // These are the same as the non-path functions but take a path instead. - VariantRef AtPath(const Path &path); - VariantRef AtPath(const std::string &path) { return AtPath(ParsePath(path)); } - VariantRef AtPath(const Path &path, Variant def); - VariantRef AtPath(const std::string &path, Variant def) { return AtPath(ParsePath(path), def); } - const Variant &AtPath(const Path &path) const; - const Variant &AtPath(const std::string &path) const { return AtPath(ParsePath(path)); } - - /// \brief Like Variant::Get but it takes a path instead. - Variant GetPath(const Path &path) const; - Variant GetPath(const std::string &path) const { return GetPath(ParsePath(path)); } - /// \brief Like Variant::Get but it takes a path instead. The path is - /// very like xpath, /key[index]/key/key. See Variant/Path.h - Variant GetPath(const Path &path, Variant def) const; - Variant GetPath(const std::string &path, Variant def) const { return GetPath(ParsePath(path), def); } - - /// \brief Set the value at the path, creating elements if they do not - /// exist. throws if an intermediate path element exists but is not a - /// map or list. returns *this - Variant &SetPath(const Path &path, Variant val); - Variant &SetPath(const std::string &path, Variant val) { return SetPath(ParsePath(path), val); } - - /// \brief Erase a value at a path, if remove_empty is false only erase the very end - /// otherwise erase empty lists and maps in the path. returns *this - Variant &ErasePath(const Path &path, bool remove_empty=false); - Variant &ErasePath(const std::string &path, bool remove_empty=false) - { return ErasePath(ParsePath(path), remove_empty); } - - /// \brief Tester functions for paths, returns true if path is valid and exists. - bool HasPath(const Path &path) const; - bool HasPath(const std::string &path) const { return HasPath(ParsePath(path)); } - - /// \brief Just like Variant::Get except a reference to the value to - /// set is passed in and Variant does the casting. - template - void GetInto(T &lvalue, const std::string &s) const; - - /// \brief An into version of GetPath - template - void GetPathInto(T &lvalue, const Path &path) const; - template - void GetPathInto(T &lvalue, const std::string &path) const - { GetPathInto(lvalue, ParsePath(path)); } - - /// \brief Just like Variant::Get except a reference to the value to - /// set is passed in and Variant does the casting. - template - void GetInto(T &lvalue, const std::string &s, const T &def) const; - - /// \brief An into version of GetPath - template - void GetPathInto(T &lvalue, const Path &path, const T &def) const; - template - void GetPathInto(T &lvalue, const std::string &path, const T &def) const - { GetPathInto(lvalue, ParsePath(path), def); } - - /// \brief This type and other type must be MapType. - /// for (k, v) in other: this[k] = v - void Merge(Variant other); - - /// \brief Comparison operator - /// Returns -1 if we are less than other - /// 0 if we are equal - /// 1 if we are greater than - /// This function always returns 1 if Comparable returns false - /// This compare is not completely consistent - /// i.e. it can be such that two Variants are - /// both < and > (ex map and list types) - int Compare(const Variant &other) const; - - /// \brief Return true if this and other are comparable. Two types are - /// considered comparable if they have the same type or if they are both - /// number types. - bool Comparable(const Variant &other) const; - - void Incr(); - void Decr(); - void Add(const Variant &o); - void Sub(const Variant &o); - void Mul(const Variant &o); - void Div(const Variant &o); - void Rem(const Variant &o); - - Variant Neg() const; - - Variant &operator++() { Incr(); return *this; } - Variant &operator--() { Decr(); return *this; } - Variant operator++(int) { Variant tmp = *this; ++(*this); return tmp; } - Variant operator--(int) { Variant tmp = *this; --(*this); return tmp; } - Variant operator-() const { return Neg(); } - Variant operator+() const { return *this; } - - Variant &operator+=(const Variant &o) { Add(o); return *this; } - Variant &operator-=(const Variant &o) { Sub(o); return *this; } - Variant &operator*=(const Variant &o) { Mul(o); return *this; } - Variant &operator/=(const Variant &o) { Div(o); return *this; } - Variant &operator%=(const Variant &o) { Rem(o); return *this; } - - VariantRef Ref(); //< Return a new VariantRef to this Variant - Variant Copy() const; //< Return a copy of this Variant - Variant &Resolve(); //< Return *this or return the Variant this is a reference to - const Variant &Resolve() const; - /// Return *this or Variant referenced to if exists, otherwise create it with def. - Variant &Resolve(const Variant &def); - /// Return weather or not Resolve() const would throw. - bool Exists() const; - - /// Make this equal other. - void Assign(const Variant &other); - - void Assign(VariantDefines::Type_t type); - void Assign(bool v); - void Assign(int v); - void Assign(unsigned v); - void Assign(long v); - void Assign(unsigned long v); - void Assign(long long v); - void Assign(unsigned long long v); - void Assign(double v); - void Assign(long double v); - void Assign(BlobPtr b); - void Assign(const std::string &v); - void Assign(const char *v); - - template - void Assign(const std::vector &v) { - Assign(VariantDefines::ListType); - AsList().assign(v.begin(), v.end()); - } - - template - void Assign(const std::map &v) { - Assign(VariantDefines::MapType); - AsMap().insert(v.begin(), v.end()); - } - - protected: - Variant(const RefTag &, const Variant &o); - Variant(const RefTag &, Variant &o, Path::const_iterator b, Path::const_iterator e); - /// Reassing this reference, only available through the VariantRef interface. - /// The regular Assign makes what this is refering to equal the new value, this - /// function makes this reference refer to the new value. - void ReassignRef(const Variant &o); - friend class Internal::VTable; - }; - - typedef VariantRefImpl VariantRef; - - inline bool operator==(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) == 0; } - inline bool operator!=(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) != 0; } - inline bool operator<(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) < 0; } - inline bool operator>(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) > 0; } - inline bool operator<=(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) <= 0; } - inline bool operator>=(const Variant &lhs, const Variant &rhs) { return lhs.Compare(rhs) >= 0; } - - inline Variant operator+(const Variant &lhs, const Variant &rhs) { - Variant ret = lhs; - return ret += rhs; - } - inline Variant operator-(const Variant &lhs, const Variant &rhs) { - Variant ret = lhs; - return ret -= rhs; - } - inline Variant operator*(const Variant &lhs, const Variant &rhs) { - Variant ret = lhs; - return ret *= rhs; - } - inline Variant operator/(const Variant &lhs, const Variant &rhs) { - Variant ret = lhs; - return ret /= rhs; - } - inline Variant operator%(const Variant &lhs, const Variant &rhs) { - Variant ret = lhs; - return ret %= rhs; - } - - /// \defgroup variant_cast Template casting operators. - /// These are for use inside templates to extract the value of a Variant into - /// a templated type. - /// @{ - - template - struct VariantCaster { - static T Cast(const Variant &v); - }; - - // Default - template inline T VariantCaster::Cast(const Variant &v) { return T(v); } - - template - inline T variant_cast(const Variant &v) { return VariantCaster::Cast(v); } - - // Provide specializations for all the basic types - template<> inline bool VariantCaster::Cast(const Variant &v) { return v.AsBool(); } - template<> inline char VariantCaster::Cast(const Variant &v) { return (char)v.AsInt(); } - template<> inline unsigned char VariantCaster::Cast(const Variant &v) { return (unsigned char)v.AsUnsigned(); } - template<> inline signed char VariantCaster::Cast(const Variant &v) { return (signed char)v.AsUnsigned(); } - template<> inline short VariantCaster::Cast(const Variant &v) { return (short)v.AsInt(); } - template<> inline unsigned short VariantCaster::Cast(const Variant &v) { return (unsigned short)v.AsUnsigned(); } - template<> inline int VariantCaster::Cast(const Variant &v) { return (int)v.AsInt(); } - template<> inline unsigned VariantCaster::Cast(const Variant &v) { return (unsigned)v.AsUnsigned(); } - template<> inline long VariantCaster::Cast(const Variant &v) { return (long)v.AsInt(); } - template<> inline unsigned long VariantCaster::Cast(const Variant &v) { return (unsigned long)v.AsUnsigned(); } - template<> inline long long VariantCaster::Cast(const Variant &v) { return (long long)v.AsInt(); } - template<> inline unsigned long long VariantCaster::Cast(const Variant &v) { return (unsigned long long)v.AsUnsigned(); } - template<> inline float VariantCaster::Cast(const Variant &v) { return (float)v.AsDouble(); } - template<> inline double VariantCaster::Cast(const Variant &v) { return v.AsDouble(); } - template<> inline long double VariantCaster::Cast(const Variant &v) { return v.AsLongDouble(); } - template<> inline std::string VariantCaster::Cast(const Variant &v) { return v.AsString(); } - - // Allow things like variant_cast< std::vector >(v) to work - template - struct VariantCaster< std::vector > { - static std::vector Cast(const Variant &v); - }; - - template - inline std::vector VariantCaster< std::vector >::Cast(const Variant &v) { - std::vector ret; - for (Variant::ConstListIterator i(v.ListBegin()), e(v.ListEnd()); i != e; ++i) { - ret.push_back( variant_cast( *i ) ); - } - return ret; - } - - template<> inline Variant::List VariantCaster::Cast(const Variant &v) { return v.AsList(); } - - // allow things like variant_cast< std::map >(v) - // to work - template - struct VariantCaster< std::map > { - static std::map Cast(const Variant &v); - }; - - template - inline std::map VariantCaster< std::map >::Cast(const Variant &v) { - std::map ret; - for (Variant::ConstMapIterator i(v.MapBegin()), e(v.MapEnd()); i != e; ++i) { - ret.insert( std::make_pair( i->first, variant_cast( i->second ) ) ); - } - return ret; - } - - template<> inline Variant::Map VariantCaster::Cast(const Variant &v) { return v.AsMap(); } - - template - struct VariantCaster< std::complex > { - static std::complex Cast(const Variant &v); - }; - - template - std::complex VariantCaster< std::complex >::Cast(const Variant &v) { - if (v.IsNull()) { - return std::complex(); - } else if (v.IsNumber()) { - return std::complex(v.As(), T()); - } else if (v.IsMap()) { - T r = variant_cast(v.Get("real", T())); - T c = variant_cast(v.Get("imag", T())); - return std::complex(r, c); - } else if (v.IsList()) { - if (v.Size() > 1) { - return std::complex(v[0].As(), v[1].As()); - } else if (v.Size() > 0) { - return std::complex(v[0].As(), T()); - } else { - return std::complex(); - } - } - throw UnableToConvertError(v.GetType(), "std::complex"); - } - - /// @} - - template - T Variant::As() const { return variant_cast(*this); } - - template - void Variant::GetInto(T &lvalue, const std::string &s) const { - lvalue = variant_cast(Get(s)); - } - - template - void Variant::GetPathInto(T &lvalue, const Path &p) const { - lvalue = variant_cast(GetPath(p)); - } - - template - void Variant::GetInto(T &lvalue, const std::string &s, const T &def) const { - if (Contains(s)) { lvalue = variant_cast(Get(s)); } - else { lvalue = def; } - } - - template - void Variant::GetPathInto(T &lvalue, const Path &p, const T &def) const { - lvalue = variant_cast(GetPath(p, def)); - } - - class Parser; - /// \brief Takes a parser and produces a Variant from it. - Variant ParseVariant(Parser &p); - - class Emitter; - /// Takes a Variant and Emitter and emits the Variant. - Emitter &operator<<(Emitter &e, const Variant &v); - - /// \brief The different types of serialization supported. - enum SerializeType { - // Attempt to guess the format - // Cannot be specified as an output format. - SERIALIZE_GUESS = 0x0, - - // Built in text formats - SERIALIZE_JSON = 0x00000001, - SERIALIZE_YAML, - SERIALIZE_XMLPLIST, - SERIALIZE_BUNDLEHDR, - - // Built in binary formats - SERIALIZE_MSGPACK = 0x000000FF, - - }; - - - /// \brief An iterator that iterates over all documents that the parser will generate - class LoadAllIterator { - public: - typedef Variant value_type; - typedef ptrdiff_t difference_type; - typedef Variant* pointer; - typedef Variant& reference; - typedef std::forward_iterator_tag iterator_category; - - LoadAllIterator(); - explicit LoadAllIterator(Parser &parser); - Variant &operator*() { return Get(); } - Variant *operator->() { return &Get(); } - Variant &Get(); - void Next(); - LoadAllIterator &operator++() { - Next(); - return *this; - } - LoadAllIterator operator++(int) { - LoadAllIterator copy = *this; - Next(); - return copy; - } - bool operator==(const LoadAllIterator &that) const; - bool operator!=(const LoadAllIterator &that) const { return !(*this == that); } - private: - class Impl; - shared_ptr impl; - struct Value; - shared_ptr value; - }; - - // Some convenience functions - // A version is provided that will go to/from a string, - // a memory buffer, a file name, an open FILE*, and - // a streambuf* (usually acquired through iostream.rdbuf()). - - /// \brief Serialize a Variant to a string using format type. - std::string Serialize(Variant v, SerializeType type, Variant params = Variant::NullType); - /// \brief Serialize a Variant to a file using format type. - void Serialize(const std::string &filename, Variant v, SerializeType type, - Variant params = Variant::NullType); - /// \brief Serialize a Variant to a FILE pointer using format type. - void Serialize(FILE *f, Variant v, SerializeType type, - Variant params = Variant::NullType); - /// \brief Serialize a Variant to a streambuf* (iostrem.rdbuf()) using format type. - void Serialize(std::streambuf *sb, Variant v, SerializeType type, - Variant params = Variant::NullType); - /// \brief Serialize a Variant to a memory buffer of length len, using format type - //and return how many bytes produced. - unsigned Serialize(void *ptr, unsigned len, Variant v, SerializeType type, - Variant params = Variant::NullType); - - // The basic deserializing functions - - /// \brief Attempt to deserialize a string in format type to a Variant - Variant Deserialize(const std::string &str, SerializeType type); - /// \brief Attempt to deserialize a null terminated string in format type to a Variant - Variant Deserialize(const char *str, SerializeType type); - /// \brief Attempt to deserialize a pointer and length in format type to a Variant - Variant Deserialize(const void *ptr, unsigned len, SerializeType type); - /// \brief Attempt to deserialize the file to a Variant in format type - Variant DeserializeFile(const char *filename, SerializeType type); - /// \brief Deserialize from a FILE pointer to a Variant in format type - Variant DeserializeFile(FILE *f, SerializeType type); - /// \brief Deserialize from a streambuf to a Variant in format type - Variant DeserializeFile(std::streambuf *sb, SerializeType type); - - /// \defgroup deserialize_guess Guess format - /// These functions attempt to guess the type of the input. The guessing - /// function only looks at the first non-whitespace character to make the - /// decision. As such on sufficiently badly behaved input can select the - /// wrong format. - /// @{ - Variant DeserializeGuess(const std::string &str); - Variant DeserializeGuess(const char *str); - Variant DeserializeGuess(const void *ptr, unsigned len); - Variant DeserializeGuessFile(const char *filename); - Variant DeserializeGuessFile(FILE *f); - Variant DeserializeGuessFile(std::streambuf *sb); - /// @} - - /// \defgroup deserialize_all Deserialize all elements - /// These functions return an iterator. These are for format types that - /// support multiple documents in one stream. Otherwise same as Deserialize - /// functions above. - /// @{ - LoadAllIterator DeserializeAll(const std::string &str, SerializeType type); - LoadAllIterator DeserializeAll(const char *str, SerializeType type); - LoadAllIterator DeserializeAll(const void *ptr, unsigned len, SerializeType type); - LoadAllIterator DeserializeAllFile(const char *filename, SerializeType type); - /// File must remain open for as long as the iterator is referenced - LoadAllIterator DeserializeAllFile(FILE *f, SerializeType type); - /// Streambuf must exist for as long as the iterator is referenced - LoadAllIterator DeserializeAllFile(std::streambuf *sb, SerializeType type); - /// @} - - - // Serialize and Deserializing JSON - // - inline std::string SerializeJSON(Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - return Serialize(v, SERIALIZE_JSON, param); - } - inline void SerializeJSON(const std::string &filename, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(filename, v, SERIALIZE_JSON, param); - } - inline void SerializeJSON(FILE *f, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(f, v, SERIALIZE_JSON, param); - } - inline void SerializeJSON(std::streambuf *sb, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(sb, v, SERIALIZE_JSON, param); - } - inline unsigned SerializeJSON(void *ptr, unsigned len, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - return Serialize(ptr, len, v, SERIALIZE_JSON, param); - } - inline Variant DeserializeJSON(const std::string &str) { return Deserialize(str, SERIALIZE_JSON); } - inline Variant DeserializeJSON(const char *str) { return Deserialize(str, SERIALIZE_JSON); } - inline Variant DeserializeJSON(const void *ptr, unsigned len) { return Deserialize(ptr, len, SERIALIZE_JSON); } - inline Variant DeserializeJSONFile(const char *filename) { return DeserializeFile(filename, SERIALIZE_JSON); } - inline Variant DeserializeJSONFile(FILE *f) { return DeserializeFile(f, SERIALIZE_JSON); } - inline Variant DeserializeJSONFile(std::streambuf *sb) { return DeserializeFile(sb, SERIALIZE_JSON); } - - //Serialize and Deserialize YAML - // - inline std::string SerializeYAML(Variant v) { return Serialize(v, SERIALIZE_YAML); } - inline void SerializeYAML(const std::string &filename, Variant v) { Serialize(filename, v, SERIALIZE_YAML); } - inline void SerializeYAML(FILE *f, Variant v) { Serialize(f, v, SERIALIZE_YAML); } - inline void SerializeYAML(std::streambuf *sb, Variant v) { Serialize(sb, v, SERIALIZE_YAML); } - inline unsigned SerializeYAML(void *ptr, unsigned len, Variant v) { return Serialize(ptr, len, v, SERIALIZE_YAML); } - - inline Variant DeserializeYAML(const std::string &str) { return Deserialize(str, SERIALIZE_YAML); } - inline Variant DeserializeYAML(const char *str) { return Deserialize(str, SERIALIZE_YAML); } - inline Variant DeserializeYAML(const void *ptr, unsigned len) { return Deserialize(ptr, len, SERIALIZE_YAML); } - inline Variant DeserializeYAMLFile(const char *filename) { return DeserializeFile(filename, SERIALIZE_YAML); } - inline Variant DeserializeYAMLFile(FILE *f) { return DeserializeFile(f, SERIALIZE_YAML); } - inline Variant DeserializeYAMLFile(std::streambuf *sb) { return DeserializeFile(sb, SERIALIZE_YAML); } - - inline LoadAllIterator DeserializeYAMLAll(const std::string &str) { return DeserializeAll(str, SERIALIZE_YAML); } - inline LoadAllIterator DeserializeYAMLAll(const char *str) { return DeserializeAll(str, SERIALIZE_YAML); } - inline LoadAllIterator DeserializeYAMLAll(const void *ptr, unsigned len) { return DeserializeAll(ptr, len, SERIALIZE_YAML); } - inline LoadAllIterator DeserializeYAMLAllFile(const char *filename) { return DeserializeAllFile(filename, SERIALIZE_YAML); } - inline LoadAllIterator DeserializeYAMLAllFile(FILE *f) { return DeserializeAllFile(f, SERIALIZE_YAML); } - inline LoadAllIterator DeserializeYAMLAllFile(std::streambuf *sb) { return DeserializeAllFile(sb, SERIALIZE_YAML); } - - //Serialize and Deserialize XML plist - // - inline std::string SerializeXMLPLIST(Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - return Serialize(v, SERIALIZE_XMLPLIST, param); - } - inline void SerializeXMLPLIST(const std::string &filename, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(filename, v, SERIALIZE_XMLPLIST, param); - } - inline void SerializeXMLPLIST(FILE *f, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(f, v, SERIALIZE_XMLPLIST, param); - } - inline void SerializeXMLPLIST(std::streambuf *sb, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - Serialize(sb, v, SERIALIZE_XMLPLIST, param); - } - inline unsigned SerializeXMLPLIST(void *ptr, unsigned len, Variant v, bool pretty=false) { - Variant param = Variant::MapType; param["pretty"] = pretty; - return Serialize(ptr, len, v, SERIALIZE_XMLPLIST, param); - } - - inline Variant DeserializeXMLPLIST(const std::string &str) { return Deserialize(str, SERIALIZE_XMLPLIST); } - inline Variant DeserializeXMLPLIST(const char *str) { return Deserialize(str, SERIALIZE_XMLPLIST); } - inline Variant DeserializeXMLPLIST(const void *ptr, unsigned len) { return Deserialize(ptr, len, SERIALIZE_XMLPLIST); } - inline Variant DeserializeXMLPLISTFile(const char *filename) { return DeserializeFile(filename, SERIALIZE_XMLPLIST); } - inline Variant DeserializeXMLPLISTFile(FILE *f) { return DeserializeFile(f, SERIALIZE_XMLPLIST); } - inline Variant DeserializeXMLPLISTFile(std::streambuf *sb) { return DeserializeFile(sb, SERIALIZE_XMLPLIST); } - - //Serialize and Deserialize BundleHdr - // - // BundleHdr requires the root element to be of MapType and - // no submaps exist. - // - // Note that these do not add a null byte to the end. - // Use SerializeBundle for that. - - inline std::string SerializeBundleHdr(Variant v) { - Variant param = Variant::MapType; - return Serialize(v, SERIALIZE_BUNDLEHDR, param); - } - inline void SerializeBundleHdr(const std::string &filename, Variant v) { - Variant param = Variant::MapType; - Serialize(filename, v, SERIALIZE_BUNDLEHDR, param); - } - inline void SerializeBundleHdr(FILE *f, Variant v) { - Variant param = Variant::MapType; - Serialize(f, v, SERIALIZE_BUNDLEHDR, param); - } - inline void SerializeBundleHdr(std::streambuf *sb, Variant v) { - Variant param = Variant::MapType; - Serialize(sb, v, SERIALIZE_BUNDLEHDR, param); - } - inline unsigned SerializeBundleHdr(void *ptr, unsigned len, Variant v) { - Variant param = Variant::MapType; - return Serialize(ptr, len, v, SERIALIZE_BUNDLEHDR, param); - } - - inline Variant DeserializeBundleHdr(const std::string &str) { return Deserialize(str, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleHdr(const char *str) { return Deserialize(str, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleHdr(const void *ptr, unsigned len) { return Deserialize(ptr, len, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleHdrFile(const char *filename) { return DeserializeFile(filename, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleHdrFile(FILE *f) { return DeserializeFile(f, SERIALIZE_BUNDLEHDR); } - inline Variant DeserializeBundleHdrFile(std::streambuf *sb) { return DeserializeFile(sb, SERIALIZE_BUNDLEHDR); } - -} - -/// Debug function not inside the namespace to print out a variant (calls SerializeJSON) -void VariantPrint(const libvariant::Variant v); - -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/VariantDefines.h b/src/hos_libvariant/src/libvariant/include/Variant/VariantDefines.h deleted file mode 100644 index 6a6df997..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/VariantDefines.h +++ /dev/null @@ -1,50 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_DEFINES_H -#define VARIANT_DEFINES_H - -#ifdef __GNUC__ -#define DEPRECATED __attribute__((deprecated)) -#elif defined(_MSC_VER) -#define DEPRECATED __declspec(deprecated) -#else -#pragma message("WARNING: You need to implement DEPRECATED for this compiler") -#define DEPRECATED -#endif - -namespace libvariant { - class VariantDefines { - public: - enum Type_t { - NullType = 0, // Explicitly defined as 0 - BoolType, - IntegerType, - UnsignedType, - FloatType, - StringType, - ListType, - MapType, - BlobType - }; - - }; -} -#endif diff --git a/src/hos_libvariant/src/libvariant/include/Variant/VariantInternal.h b/src/hos_libvariant/src/libvariant/include/Variant/VariantInternal.h deleted file mode 100644 index 9e786302..00000000 --- a/src/hos_libvariant/src/libvariant/include/Variant/VariantInternal.h +++ /dev/null @@ -1,96 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_BASE_H -#define VARIANT_BASE_H -#include -#include -#include -#include - -#include "../../../libvariant/include/Variant/Blob.h" -#include "../../../libvariant/include/Variant/Path.h" -#include "../../../libvariant/include/Variant/SharedPtr.h" -#include "../../../libvariant/include/Variant/VariantDefines.h" -namespace libvariant { - - struct RefTag {}; - - class Variant; - template class VariantRefImpl; - - - /** - * Action implementation for the VariantRef class. - */ - template - class VariantRefImpl : public Base { - public: - VariantRefImpl(const Variant &o) : Base(RefTag(), o) {} - VariantRefImpl(Variant &o, const Path &path) - : Base(RefTag(), o, path.begin(), path.end()) {} - VariantRefImpl(Variant &o, Path::const_iterator b, Path::const_iterator e) - : Base(RefTag(), o, b, e) {} - VariantRefImpl(const VariantRefImpl &o) - : Base(RefTag(), o) {} - - using Base::operator=; - using Base::As; - using Base::AsNumber; - using Base::GetInto; - using Base::GetPathInto; - using Base::Assign; - - using Base::ReassignRef; - }; - - namespace Internal { - - class VTable; - struct Storage; - struct MapStorage; - struct ListStorage; - struct ProxyStorage; - struct RefData; - - struct Data { - Data(); - const VTable *vtable; - union { - bool b; - long double f; - intmax_t i; - uintmax_t u; - std::string *s; - MapStorage *m; - ListStorage *l; - BlobPtr *blob; - Data *ref; - ProxyStorage *proxy; - }; - shared_ptr ref_data; - shared_ptr storage; - }; - } - - - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/lib/json/JSON_PARSER_README.htm b/src/hos_libvariant/src/libvariant/lib/json/JSON_PARSER_README.htm deleted file mode 100644 index b4bfe0d9..00000000 --- a/src/hos_libvariant/src/libvariant/lib/json/JSON_PARSER_README.htm +++ /dev/null @@ -1,16 +0,0 @@ -A JSON parser based on http://www.json.org's JSON_checker code. - -Copyright (c) 2007-2009 Jean Gressmann (jean@0x42.de). - -For license information, see JSON_parser.c. - -JSON parser features: -- arbitrary levels of JSON object/array nesting, -- C-style comments, -- UTF-16 & escape sequence (\uXXXX) decoding to UTF-8. -- Manual processing of floating point values. - -The parser processes UTF-8 encoded JSON only. -JSON object keys and JSON strings are returned as UTF-8 encoded C strings. - - diff --git a/src/hos_libvariant/src/libvariant/lib/json/JSON_parser.c b/src/hos_libvariant/src/libvariant/lib/json/JSON_parser.c deleted file mode 100644 index b97423d0..00000000 --- a/src/hos_libvariant/src/libvariant/lib/json/JSON_parser.c +++ /dev/null @@ -1,1013 +0,0 @@ -/* -Copyright (c) 2005 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -/* - Callbacks, comments, Unicode handling by Jean Gressmann (jean@0x42.de), 2007-2009. - - Changelog: - 2009-10-19 - Replaced long double in JSON_value_struct with double after reports - of strtold being broken on some platforms (charles@transmissionbt.com). - - 2009-05-17 - Incorporated benrudiak@googlemail.com fix for UTF16 decoding. - - 2009-05-14 - Fixed float parsing bug related to a locale being set that didn't - use '.' as decimal point character (charles@transmissionbt.com). - - 2008-10-14 - Renamed states.IN to states.IT to avoid name clash which IN macro - defined in windef.h (alexey.pelykh@gmail.com) - - 2008-07-19 - Removed some duplicate code & debugging variable (charles@transmissionbt.com) - - 2008-05-28 - Made JSON_value structure ansi C compliant. This bug was report by - trisk@acm.jhu.edu - - 2008-05-20 - Fixed bug reported by charles@transmissionbt.com where the switching - from static to dynamic parse buffer did not copy the static parse - buffer's content. -*/ - - - -#include "../../../libvariant/lib/json/JSON_parser.h" - -#include -#include -#include -#include -#include -#include -#include -#include - - -#ifdef _MSC_VER -# if _MSC_VER >= 1400 /* Visual Studio 2005 and up */ -# pragma warning(disable:4996) // unsecure sscanf -# endif -#endif - - -#define true 1 -#define false 0 -#define __ -1 /* the universal error code */ - -/* values chosen so that the object size is approx equal to one page (4K) */ -#ifndef JSON_PARSER_STACK_SIZE -# define JSON_PARSER_STACK_SIZE 128 -#endif - -#ifndef JSON_PARSER_PARSE_BUFFER_SIZE -# define JSON_PARSER_PARSE_BUFFER_SIZE 3500 -#endif - -typedef unsigned short UTF16; - -struct JSON_parser_struct { - JSON_parser_callback callback; - void* ctx; - signed char state, before_comment_state, type, escaped, comment, allow_comments, handle_floats_manually; - UTF16 utf16_high_surrogate; - long depth; - long top; - signed char* stack; - long stack_capacity; - char decimal_point; - char* parse_buffer; - size_t parse_buffer_capacity; - size_t parse_buffer_count; - size_t comment_begin_offset; - signed char static_stack[JSON_PARSER_STACK_SIZE]; - char static_parse_buffer[JSON_PARSER_PARSE_BUFFER_SIZE]; -}; - -#define COUNTOF(x) (sizeof(x)/sizeof(x[0])) - -/* - Characters are mapped into these character classes. This allows for - a significant reduction in the size of the state transition table. -*/ - - - -enum classes { - C_SPACE, /* space */ - C_WHITE, /* other whitespace */ - C_LCURB, /* { */ - C_RCURB, /* } */ - C_LSQRB, /* [ */ - C_RSQRB, /* ] */ - C_COLON, /* : */ - C_COMMA, /* , */ - C_QUOTE, /* " */ - C_BACKS, /* \ */ - C_SLASH, /* / */ - C_PLUS, /* + */ - C_MINUS, /* - */ - C_POINT, /* . */ - C_ZERO , /* 0 */ - C_DIGIT, /* 123456789 */ - C_LOW_A, /* a */ - C_LOW_B, /* b */ - C_LOW_C, /* c */ - C_LOW_D, /* d */ - C_LOW_E, /* e */ - C_LOW_F, /* f */ - C_LOW_L, /* l */ - C_LOW_N, /* n */ - C_LOW_R, /* r */ - C_LOW_S, /* s */ - C_LOW_T, /* t */ - C_LOW_U, /* u */ - C_ABCDF, /* ABCDF */ - C_E, /* E */ - C_ETC, /* everything else */ - C_STAR, /* * */ - NR_CLASSES -}; - -static int ascii_class[128] = { -/* - This array maps the 128 ASCII characters into character classes. - The remaining Unicode characters should be mapped to C_ETC. - Non-whitespace control characters are errors. -*/ - __, __, __, __, __, __, __, __, - __, C_WHITE, C_WHITE, __, __, C_WHITE, __, __, - __, __, __, __, __, __, __, __, - __, __, __, __, __, __, __, __, - - C_SPACE, C_ETC, C_QUOTE, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, - C_ETC, C_ETC, C_STAR, C_PLUS, C_COMMA, C_MINUS, C_POINT, C_SLASH, - C_ZERO, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, - C_DIGIT, C_DIGIT, C_COLON, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, - - C_ETC, C_ABCDF, C_ABCDF, C_ABCDF, C_ABCDF, C_E, C_ABCDF, C_ETC, - C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, - C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, - C_ETC, C_ETC, C_ETC, C_LSQRB, C_BACKS, C_RSQRB, C_ETC, C_ETC, - - C_ETC, C_LOW_A, C_LOW_B, C_LOW_C, C_LOW_D, C_LOW_E, C_LOW_F, C_ETC, - C_ETC, C_ETC, C_ETC, C_ETC, C_LOW_L, C_ETC, C_LOW_N, C_ETC, - C_ETC, C_ETC, C_LOW_R, C_LOW_S, C_LOW_T, C_LOW_U, C_ETC, C_ETC, - C_ETC, C_ETC, C_ETC, C_LCURB, C_ETC, C_RCURB, C_ETC, C_ETC -}; - - -/* - The state codes. -*/ -enum states { - GO, /* start */ - OK, /* ok */ - OB, /* object */ - KE, /* key */ - CO, /* colon */ - VA, /* value */ - AR, /* array */ - ST, /* string */ - ES, /* escape */ - U1, /* u1 */ - U2, /* u2 */ - U3, /* u3 */ - U4, /* u4 */ - MI, /* minus */ - ZE, /* zero */ - IT, /* integer */ - FR, /* fraction */ - E1, /* e */ - E2, /* ex */ - E3, /* exp */ - T1, /* tr */ - T2, /* tru */ - T3, /* true */ - F1, /* fa */ - F2, /* fal */ - F3, /* fals */ - F4, /* false */ - N1, /* nu */ - N2, /* nul */ - N3, /* null */ - C1, /* / */ - C2, /* / * */ - C3, /* * */ - FX, /* *.* *eE* */ - D1, /* second UTF-16 character decoding started by \ */ - D2, /* second UTF-16 character proceeded by u */ - NR_STATES -}; - -enum actions -{ - CB = -10, /* comment begin */ - CE = -11, /* comment end */ - FA = -12, /* false */ - TR = -13, /* false */ - NU = -14, /* null */ - DE = -15, /* double detected by exponent e E */ - DF = -16, /* double detected by fraction . */ - SB = -17, /* string begin */ - MX = -18, /* integer detected by minus */ - ZX = -19, /* integer detected by zero */ - IX = -20, /* integer detected by 1-9 */ - EX = -21, /* next char is escaped */ - UC = -22 /* Unicode character read */ -}; - - -static int state_transition_table[NR_STATES][NR_CLASSES] = { -/* - The state transition table takes the current state and the current symbol, - and returns either a new state or an action. An action is represented as a - negative number. A JSON text is accepted if at the end of the text the - state is OK and if the mode is MODE_DONE. - - white 1-9 ABCDF etc - space | { } [ ] : , " \ / + - . 0 | a b c d e f l n r s t u | E | * */ -/*start GO*/ {GO,GO,-6,__,-5,__,__,__,__,__,CB,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*ok OK*/ {OK,OK,__,-8,__,-7,__,-3,__,__,CB,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*object OB*/ {OB,OB,__,-9,__,__,__,__,SB,__,CB,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*key KE*/ {KE,KE,__,__,__,__,__,__,SB,__,CB,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*colon CO*/ {CO,CO,__,__,__,__,-2,__,__,__,CB,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*value VA*/ {VA,VA,-6,__,-5,__,__,__,SB,__,CB,__,MX,__,ZX,IX,__,__,__,__,__,FA,__,NU,__,__,TR,__,__,__,__,__}, -/*array AR*/ {AR,AR,-6,__,-5,-7,__,__,SB,__,CB,__,MX,__,ZX,IX,__,__,__,__,__,FA,__,NU,__,__,TR,__,__,__,__,__}, -/*string ST*/ {ST,__,ST,ST,ST,ST,ST,ST,-4,EX,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST,ST}, -/*escape ES*/ {__,__,__,__,__,__,__,__,ST,ST,ST,__,__,__,__,__,__,ST,__,__,__,ST,__,ST,ST,__,ST,U1,__,__,__,__}, -/*u1 U1*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,U2,U2,U2,U2,U2,U2,U2,U2,__,__,__,__,__,__,U2,U2,__,__}, -/*u2 U2*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,U3,U3,U3,U3,U3,U3,U3,U3,__,__,__,__,__,__,U3,U3,__,__}, -/*u3 U3*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,U4,U4,U4,U4,U4,U4,U4,U4,__,__,__,__,__,__,U4,U4,__,__}, -/*u4 U4*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,UC,UC,UC,UC,UC,UC,UC,UC,__,__,__,__,__,__,UC,UC,__,__}, -/*minus MI*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,ZE,IT,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*zero ZE*/ {OK,OK,__,-8,__,-7,__,-3,__,__,CB,__,__,DF,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*int IT*/ {OK,OK,__,-8,__,-7,__,-3,__,__,CB,__,__,DF,IT,IT,__,__,__,__,DE,__,__,__,__,__,__,__,__,DE,__,__}, -/*frac FR*/ {OK,OK,__,-8,__,-7,__,-3,__,__,CB,__,__,__,FR,FR,__,__,__,__,E1,__,__,__,__,__,__,__,__,E1,__,__}, -/*e E1*/ {__,__,__,__,__,__,__,__,__,__,__,E2,E2,__,E3,E3,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*ex E2*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,E3,E3,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*exp E3*/ {OK,OK,__,-8,__,-7,__,-3,__,__,__,__,__,__,E3,E3,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*tr T1*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,T2,__,__,__,__,__,__,__}, -/*tru T2*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,T3,__,__,__,__}, -/*true T3*/ {__,__,__,__,__,__,__,__,__,__,CB,__,__,__,__,__,__,__,__,__,OK,__,__,__,__,__,__,__,__,__,__,__}, -/*fa F1*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,F2,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*fal F2*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,F3,__,__,__,__,__,__,__,__,__}, -/*fals F3*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,F4,__,__,__,__,__,__}, -/*false F4*/ {__,__,__,__,__,__,__,__,__,__,CB,__,__,__,__,__,__,__,__,__,OK,__,__,__,__,__,__,__,__,__,__,__}, -/*nu N1*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,N2,__,__,__,__}, -/*nul N2*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,N3,__,__,__,__,__,__,__,__,__}, -/*null N3*/ {__,__,__,__,__,__,__,__,__,__,CB,__,__,__,__,__,__,__,__,__,__,__,OK,__,__,__,__,__,__,__,__,__}, -/*/ C1*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,C2}, -/*/* C2*/ {C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C3}, -/** C3*/ {C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,CE,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C3}, -/*_. FX*/ {OK,OK,__,-8,__,-7,__,-3,__,__,__,__,__,__,FR,FR,__,__,__,__,E1,__,__,__,__,__,__,__,__,E1,__,__}, -/*\ D1*/ {__,__,__,__,__,__,__,__,__,D2,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__}, -/*\ D2*/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,U1,__,__,__,__}, -}; - - -/* - These modes can be pushed on the stack. -*/ -enum modes { - MODE_ARRAY = 1, - MODE_DONE = 2, - MODE_KEY = 3, - MODE_OBJECT = 4 -}; - -static int -push(JSON_parser jc, int mode) -{ -/* - Push a mode onto the stack. Return false if there is overflow. -*/ - jc->top += 1; - if (jc->depth < 0) { - if (jc->top >= jc->stack_capacity) { - size_t bytes_to_allocate; - jc->stack_capacity *= 2; - bytes_to_allocate = jc->stack_capacity * sizeof(jc->static_stack[0]); - if (jc->stack == &jc->static_stack[0]) { - jc->stack = (signed char*)malloc(bytes_to_allocate); - memcpy(jc->stack, jc->static_stack, sizeof(jc->static_stack)); - } else { - jc->stack = (signed char*)realloc(jc->stack, bytes_to_allocate); - } - } - } else { - if (jc->top >= jc->depth) { - return false; - } - } - - jc->stack[jc->top] = mode; - return true; -} - - -static int -pop(JSON_parser jc, int mode) -{ -/* - Pop the stack, assuring that the current mode matches the expectation. - Return false if there is underflow or if the modes mismatch. -*/ - if (jc->top < 0 || jc->stack[jc->top] != mode) { - return false; - } - jc->top -= 1; - return true; -} - - -#define parse_buffer_clear(jc) \ - do {\ - jc->parse_buffer_count = 0;\ - jc->parse_buffer[0] = 0;\ - } while (0) - -#define parse_buffer_pop_back_char(jc)\ - do {\ - assert(jc->parse_buffer_count >= 1);\ - --jc->parse_buffer_count;\ - jc->parse_buffer[jc->parse_buffer_count] = 0;\ - } while (0) - -void delete_JSON_parser(JSON_parser jc) -{ - if (jc) { - if (jc->stack != &jc->static_stack[0]) { - free((void*)jc->stack); - } - if (jc->parse_buffer != &jc->static_parse_buffer[0]) { - free((void*)jc->parse_buffer); - } - free((void*)jc); - } -} - - -JSON_parser -new_JSON_parser(JSON_config* config) -{ -/* - new_JSON_parser starts the checking process by constructing a JSON_parser - object. It takes a depth parameter that restricts the level of maximum - nesting. - - To continue the process, call JSON_parser_char for each character in the - JSON text, and then call JSON_parser_done to obtain the final result. - These functions are fully reentrant. -*/ - - int depth = 0; - JSON_config default_config; - - JSON_parser jc = malloc(sizeof(struct JSON_parser_struct)); - - memset(jc, 0, sizeof(*jc)); - - - /* initialize configuration */ - init_JSON_config(&default_config); - - /* set to default configuration if none was provided */ - if (config == NULL) { - config = &default_config; - } - - depth = config->depth; - - /* We need to be able to push at least one object */ - if (depth == 0) { - depth = 1; - } - - jc->state = GO; - jc->top = -1; - - /* Do we want non-bound stack? */ - if (depth > 0) { - jc->stack_capacity = depth; - jc->depth = depth; - if (depth <= (int)COUNTOF(jc->static_stack)) { - jc->stack = &jc->static_stack[0]; - } else { - jc->stack = (signed char*)malloc(jc->stack_capacity * sizeof(jc->static_stack[0])); - } - } else { - jc->stack_capacity = COUNTOF(jc->static_stack); - jc->depth = -1; - jc->stack = &jc->static_stack[0]; - } - - /* set parser to start */ - push(jc, MODE_DONE); - - /* set up the parse buffer */ - jc->parse_buffer = &jc->static_parse_buffer[0]; - jc->parse_buffer_capacity = COUNTOF(jc->static_parse_buffer); - parse_buffer_clear(jc); - - /* set up callback, comment & float handling */ - jc->callback = config->callback; - jc->ctx = config->callback_ctx; - jc->allow_comments = config->allow_comments != 0; - jc->handle_floats_manually = config->handle_floats_manually != 0; - - /* set up decimal point */ - jc->decimal_point = *localeconv()->decimal_point; - - return jc; -} - -static void grow_parse_buffer(JSON_parser jc) -{ - size_t bytes_to_allocate; - jc->parse_buffer_capacity *= 2; - bytes_to_allocate = jc->parse_buffer_capacity * sizeof(jc->parse_buffer[0]); - if (jc->parse_buffer == &jc->static_parse_buffer[0]) { - jc->parse_buffer = (char*)malloc(bytes_to_allocate); - memcpy(jc->parse_buffer, jc->static_parse_buffer, jc->parse_buffer_count); - } else { - jc->parse_buffer = (char*)realloc(jc->parse_buffer, bytes_to_allocate); - } -} - -#define parse_buffer_push_back_char(jc, c)\ - do {\ - if (jc->parse_buffer_count + 1 >= jc->parse_buffer_capacity) grow_parse_buffer(jc);\ - jc->parse_buffer[jc->parse_buffer_count++] = c;\ - jc->parse_buffer[jc->parse_buffer_count] = 0;\ - } while (0) - -#define assert_is_non_container_type(jc) \ - assert( \ - jc->type == JSON_T_NULL || \ - jc->type == JSON_T_FALSE || \ - jc->type == JSON_T_TRUE || \ - jc->type == JSON_T_FLOAT || \ - jc->type == JSON_T_INTEGER || \ - jc->type == JSON_T_UNSIGNED || \ - jc->type == JSON_T_STRING) - - -static int parse_parse_buffer(JSON_parser jc) -{ - if (jc->callback) { - JSON_value value, *arg = NULL; - - if (jc->type != JSON_T_NONE) { - assert_is_non_container_type(jc); - - switch(jc->type) { - case JSON_T_FLOAT: - arg = &value; - if (jc->handle_floats_manually) { - value.vu.str.value = jc->parse_buffer; - value.vu.str.length = jc->parse_buffer_count; - } else { - /* not checking with end pointer b/c there may be trailing ws */ - value.vu.float_value = strtod(jc->parse_buffer, NULL); - } - break; - case JSON_T_INTEGER: - arg = &value; - sscanf(jc->parse_buffer, JSON_PARSER_INTEGER_SSCANF_TOKEN, &value.vu.integer_value); - break; - case JSON_T_UNSIGNED: - arg = &value; - sscanf(jc->parse_buffer, JSON_PARSER_UNSIGNED_SSCANF_TOKEN, &value.vu.unsigned_value); - break; - case JSON_T_STRING: - arg = &value; - value.vu.str.value = jc->parse_buffer; - value.vu.str.length = jc->parse_buffer_count; - break; - } - - if (!(*jc->callback)(jc->ctx, jc->type, arg)) { - return false; - } - } - } - - parse_buffer_clear(jc); - - return true; -} - -#define IS_HIGH_SURROGATE(uc) (((uc) & 0xFC00) == 0xD800) -#define IS_LOW_SURROGATE(uc) (((uc) & 0xFC00) == 0xDC00) -#define DECODE_SURROGATE_PAIR(hi,lo) ((((hi) & 0x3FF) << 10) + ((lo) & 0x3FF) + 0x10000) -static unsigned char utf8_lead_bits[4] = { 0x00, 0xC0, 0xE0, 0xF0 }; - -static int decode_unicode_char(JSON_parser jc) -{ - int i; - unsigned uc = 0; - char* p; - int trail_bytes; - - assert(jc->parse_buffer_count >= 6); - - p = &jc->parse_buffer[jc->parse_buffer_count - 4]; - - for (i = 12; i >= 0; i -= 4, ++p) { - unsigned x = *p; - - if (x >= 'a') { - x -= ('a' - 10); - } else if (x >= 'A') { - x -= ('A' - 10); - } else { - x &= ~0x30u; - } - - assert(x < 16); - - uc |= x << i; - } - - /* clear UTF-16 char from buffer */ - jc->parse_buffer_count -= 6; - jc->parse_buffer[jc->parse_buffer_count] = 0; - - /* attempt decoding ... */ - if (jc->utf16_high_surrogate) { - if (IS_LOW_SURROGATE(uc)) { - uc = DECODE_SURROGATE_PAIR(jc->utf16_high_surrogate, uc); - trail_bytes = 3; - jc->utf16_high_surrogate = 0; - } else { - /* high surrogate without a following low surrogate */ - return false; - } - } else { - if (uc < 0x80) { - trail_bytes = 0; - } else if (uc < 0x800) { - trail_bytes = 1; - } else if (IS_HIGH_SURROGATE(uc)) { - /* save the high surrogate and wait for the low surrogate */ - jc->utf16_high_surrogate = uc; - return true; - } else if (IS_LOW_SURROGATE(uc)) { - /* low surrogate without a preceding high surrogate */ - return false; - } else { - trail_bytes = 2; - } - } - - jc->parse_buffer[jc->parse_buffer_count++] = (char) ((uc >> (trail_bytes * 6)) | utf8_lead_bits[trail_bytes]); - - for (i = trail_bytes * 6 - 6; i >= 0; i -= 6) { - jc->parse_buffer[jc->parse_buffer_count++] = (char) (((uc >> i) & 0x3F) | 0x80); - } - - jc->parse_buffer[jc->parse_buffer_count] = 0; - - return true; -} - -static int add_escaped_char_to_parse_buffer(JSON_parser jc, int next_char) -{ - jc->escaped = 0; - /* remove the backslash */ - parse_buffer_pop_back_char(jc); - switch(next_char) { - case 'b': - parse_buffer_push_back_char(jc, '\b'); - break; - case 'f': - parse_buffer_push_back_char(jc, '\f'); - break; - case 'n': - parse_buffer_push_back_char(jc, '\n'); - break; - case 'r': - parse_buffer_push_back_char(jc, '\r'); - break; - case 't': - parse_buffer_push_back_char(jc, '\t'); - break; - case '"': - parse_buffer_push_back_char(jc, '"'); - break; - case '\\': - parse_buffer_push_back_char(jc, '\\'); - break; - case '/': - parse_buffer_push_back_char(jc, '/'); - break; - case 'u': - parse_buffer_push_back_char(jc, '\\'); - parse_buffer_push_back_char(jc, 'u'); - break; - default: - return false; - } - - return true; -} - -#define add_char_to_parse_buffer(jc, next_char, next_class) \ - do { \ - if (jc->escaped) { \ - if (!add_escaped_char_to_parse_buffer(jc, next_char)) \ - return false; \ - } else if (!jc->comment) { \ - if ((jc->type != JSON_T_NONE) | !((next_class == C_SPACE) | (next_class == C_WHITE)) /* non-white-space */) { \ - parse_buffer_push_back_char(jc, (char)next_char); \ - } \ - } \ - } while (0) - - -#define assert_type_isnt_string_null_or_bool(jc) \ - assert(jc->type != JSON_T_FALSE); \ - assert(jc->type != JSON_T_TRUE); \ - assert(jc->type != JSON_T_NULL); \ - assert(jc->type != JSON_T_STRING) - - -int -JSON_parser_char(JSON_parser jc, int next_char) -{ -/* - After calling new_JSON_parser, call this function for each character (or - partial character) in your JSON text. It can accept UTF-8, UTF-16, or - UTF-32. It returns true if things are looking ok so far. If it rejects the - text, it returns false. -*/ - int next_class, next_state; - -/* - Determine the character's class. -*/ - if (next_char < 0) { - return false; - } - if (next_char >= 128) { - next_class = C_ETC; - } else { - next_class = ascii_class[next_char]; - if (next_class <= __) { - return false; - } - } - - add_char_to_parse_buffer(jc, next_char, next_class); - -/* - Get the next state from the state transition table. -*/ - next_state = state_transition_table[jc->state][next_class]; - if (next_state >= 0) { -/* - Change the state. -*/ - jc->state = next_state; - } else { -/* - Or perform one of the actions. -*/ - switch (next_state) { -/* Unicode character */ - case UC: - if(!decode_unicode_char(jc)) { - return false; - } - /* check if we need to read a second UTF-16 char */ - if (jc->utf16_high_surrogate) { - jc->state = D1; - } else { - jc->state = ST; - } - break; -/* escaped char */ - case EX: - jc->escaped = 1; - jc->state = ES; - break; -/* integer detected by minus */ - case MX: - jc->type = JSON_T_INTEGER; - jc->state = MI; - break; -/* integer detected by zero */ - case ZX: - jc->type = JSON_T_UNSIGNED; - jc->state = ZE; - break; -/* integer detected by 1-9 */ - case IX: - jc->type = JSON_T_UNSIGNED; - jc->state = IT; - break; - -/* floating point number detected by exponent*/ - case DE: - assert_type_isnt_string_null_or_bool(jc); - jc->type = JSON_T_FLOAT; - jc->state = E1; - break; - -/* floating point number detected by fraction */ - case DF: - assert_type_isnt_string_null_or_bool(jc); - if (!jc->handle_floats_manually) { -/* - Some versions of strtod (which underlies sscanf) don't support converting - C-locale formated floating point values. -*/ - assert(jc->parse_buffer[jc->parse_buffer_count-1] == '.'); - jc->parse_buffer[jc->parse_buffer_count-1] = jc->decimal_point; - } - jc->type = JSON_T_FLOAT; - jc->state = FX; - break; -/* string begin " */ - case SB: - parse_buffer_clear(jc); - assert(jc->type == JSON_T_NONE); - jc->type = JSON_T_STRING; - jc->state = ST; - break; - -/* n */ - case NU: - assert(jc->type == JSON_T_NONE); - jc->type = JSON_T_NULL; - jc->state = N1; - break; -/* f */ - case FA: - assert(jc->type == JSON_T_NONE); - jc->type = JSON_T_FALSE; - jc->state = F1; - break; -/* t */ - case TR: - assert(jc->type == JSON_T_NONE); - jc->type = JSON_T_TRUE; - jc->state = T1; - break; - -/* closing comment */ - case CE: - jc->comment = 0; - assert(jc->parse_buffer_count == 0); - assert(jc->type == JSON_T_NONE); - jc->state = jc->before_comment_state; - break; - -/* opening comment */ - case CB: - if (!jc->allow_comments) { - return false; - } - parse_buffer_pop_back_char(jc); - if (!parse_parse_buffer(jc)) { - return false; - } - assert(jc->parse_buffer_count == 0); - assert(jc->type != JSON_T_STRING); - switch (jc->stack[jc->top]) { - case MODE_ARRAY: - case MODE_OBJECT: - switch(jc->state) { - case VA: - case AR: - jc->before_comment_state = jc->state; - break; - default: - jc->before_comment_state = OK; - break; - } - break; - default: - jc->before_comment_state = jc->state; - break; - } - jc->type = JSON_T_NONE; - jc->state = C1; - jc->comment = 1; - break; -/* empty } */ - case -9: - parse_buffer_clear(jc); - if (jc->callback && !(*jc->callback)(jc->ctx, JSON_T_OBJECT_END, NULL)) { - return false; - } - if (!pop(jc, MODE_KEY)) { - return false; - } - jc->state = OK; - break; - -/* } */ case -8: - parse_buffer_pop_back_char(jc); - if (!parse_parse_buffer(jc)) { - return false; - } - if (jc->callback && !(*jc->callback)(jc->ctx, JSON_T_OBJECT_END, NULL)) { - return false; - } - if (!pop(jc, MODE_OBJECT)) { - return false; - } - jc->type = JSON_T_NONE; - jc->state = OK; - break; - -/* ] */ case -7: - parse_buffer_pop_back_char(jc); - if (!parse_parse_buffer(jc)) { - return false; - } - if (jc->callback && !(*jc->callback)(jc->ctx, JSON_T_ARRAY_END, NULL)) { - return false; - } - if (!pop(jc, MODE_ARRAY)) { - return false; - } - - jc->type = JSON_T_NONE; - jc->state = OK; - break; - -/* { */ case -6: - parse_buffer_pop_back_char(jc); - if (jc->callback && !(*jc->callback)(jc->ctx, JSON_T_OBJECT_BEGIN, NULL)) { - return false; - } - if (!push(jc, MODE_KEY)) { - return false; - } - assert(jc->type == JSON_T_NONE); - jc->state = OB; - break; - -/* [ */ case -5: - parse_buffer_pop_back_char(jc); - if (jc->callback && !(*jc->callback)(jc->ctx, JSON_T_ARRAY_BEGIN, NULL)) { - return false; - } - if (!push(jc, MODE_ARRAY)) { - return false; - } - assert(jc->type == JSON_T_NONE); - jc->state = AR; - break; - -/* string end " */ case -4: - parse_buffer_pop_back_char(jc); - switch (jc->stack[jc->top]) { - case MODE_KEY: - assert(jc->type == JSON_T_STRING); - jc->type = JSON_T_NONE; - jc->state = CO; - - if (jc->callback) { - JSON_value value; - value.vu.str.value = jc->parse_buffer; - value.vu.str.length = jc->parse_buffer_count; - if (!(*jc->callback)(jc->ctx, JSON_T_KEY, &value)) { - return false; - } - } - parse_buffer_clear(jc); - break; - case MODE_ARRAY: - case MODE_OBJECT: - assert(jc->type == JSON_T_STRING); - if (!parse_parse_buffer(jc)) { - return false; - } - jc->type = JSON_T_NONE; - jc->state = OK; - break; - default: - return false; - } - break; - -/* , */ case -3: - parse_buffer_pop_back_char(jc); - if (!parse_parse_buffer(jc)) { - return false; - } - switch (jc->stack[jc->top]) { - case MODE_OBJECT: -/* - A comma causes a flip from object mode to key mode. -*/ - if (!pop(jc, MODE_OBJECT) || !push(jc, MODE_KEY)) { - return false; - } - assert(jc->type != JSON_T_STRING); - jc->type = JSON_T_NONE; - jc->state = KE; - break; - case MODE_ARRAY: - assert(jc->type != JSON_T_STRING); - jc->type = JSON_T_NONE; - jc->state = VA; - break; - default: - return false; - } - break; - -/* : */ case -2: -/* - A colon causes a flip from key mode to object mode. -*/ - parse_buffer_pop_back_char(jc); - if (!pop(jc, MODE_KEY) || !push(jc, MODE_OBJECT)) { - return false; - } - assert(jc->type == JSON_T_NONE); - jc->state = VA; - break; -/* - Bad action. -*/ - default: - return false; - } - } - return true; -} - - -int -JSON_parser_done(JSON_parser jc) -{ - const int result = jc->state == OK && pop(jc, MODE_DONE); - - return result; -} - - -int JSON_parser_is_legal_white_space_string(const char* s) -{ - int c, char_class; - - if (s == NULL) { - return false; - } - - for (; *s; ++s) { - c = *s; - - if (c < 0 || c >= 128) { - return false; - } - - char_class = ascii_class[c]; - - if (char_class != C_SPACE && char_class != C_WHITE) { - return false; - } - } - - return true; -} - - -void init_JSON_config(JSON_config* config) -{ - if (config) { - memset(config, 0, sizeof(*config)); - - config->depth = JSON_PARSER_STACK_SIZE - 1; - } -} diff --git a/src/hos_libvariant/src/libvariant/lib/json/JSON_parser.h b/src/hos_libvariant/src/libvariant/lib/json/JSON_parser.h deleted file mode 100644 index 93207a3f..00000000 --- a/src/hos_libvariant/src/libvariant/lib/json/JSON_parser.h +++ /dev/null @@ -1,162 +0,0 @@ -#ifndef JSON_PARSER_H -#define JSON_PARSER_H -#pragma once - -/* JSON_parser.h */ - - -#include - -/* Windows DLL stuff */ -#ifdef _WIN32 -# ifdef JSON_PARSER_DLL_EXPORTS -# define JSON_PARSER_DLL_API __declspec(dllexport) -# else -# define JSON_PARSER_DLL_API __declspec(dllimport) -# endif -#else -# define JSON_PARSER_DLL_API -#endif - -/* Determine the integer type use to parse non-floating point numbers */ -#if __STDC_VERSION__ >= 199901L || HAVE_LONG_LONG == 1 -typedef long long JSON_int_t; -typedef unsigned long long JSON_uint_t; -#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%lld" -#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%lld" -#define JSON_PARSER_UNSIGNED_SSCANF_TOKEN "%llu" -#define JSON_PARSER_UNSIGNED_SPRINTF_TOKEN "%llu" -#else -typedef long JSON_int_t; -typedef unsigned long JSON_uint_t; -#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%ld" -#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%ld" -#define JSON_PARSER_UNSIGNED_SSCANF_TOKEN "%lu" -#define JSON_PARSER_UNSIGNED_SPRINTF_TOKEN "%lu" -#endif - - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum -{ - JSON_T_NONE = 0, - JSON_T_ARRAY_BEGIN, - JSON_T_ARRAY_END, - JSON_T_OBJECT_BEGIN, - JSON_T_OBJECT_END, - JSON_T_INTEGER, - JSON_T_UNSIGNED, - JSON_T_FLOAT, - JSON_T_NULL, - JSON_T_TRUE, - JSON_T_FALSE, - JSON_T_STRING, - JSON_T_KEY, - JSON_T_MAX -} JSON_type; - -typedef struct JSON_value_struct { - union { - JSON_int_t integer_value; - - JSON_uint_t unsigned_value; - - double float_value; - - struct { - const char* value; - size_t length; - } str; - } vu; -} JSON_value; - -typedef struct JSON_parser_struct* JSON_parser; - -/*! \brief JSON parser callback - - \param ctx The pointer passed to new_JSON_parser. - \param type An element of JSON_type but not JSON_T_NONE. - \param value A representation of the parsed value. This parameter is NULL for - JSON_T_ARRAY_BEGIN, JSON_T_ARRAY_END, JSON_T_OBJECT_BEGIN, JSON_T_OBJECT_END, - JSON_T_NULL, JSON_T_TRUE, and SON_T_FALSE. String values are always returned - as zero-terminated C strings. - - \return Non-zero if parsing should continue, else zero. -*/ -typedef int (*JSON_parser_callback)(void* ctx, int type, const struct JSON_value_struct* value); - - -/*! \brief The structure used to configure a JSON parser object - - \param depth If negative, the parser can parse arbitrary levels of JSON, otherwise - the depth is the limit - \param Pointer to a callback. This parameter may be NULL. In this case the input is merely checked for validity. - \param Callback context. This parameter may be NULL. - \param depth. Specifies the levels of nested JSON to allow. Negative numbers yield unlimited nesting. - \param allowComments. To allow C style comments in JSON, set to non-zero. - \param handleFloatsManually. To decode floating point numbers manually set this parameter to non-zero. - - \return The parser object. -*/ -typedef struct { - JSON_parser_callback callback; - void* callback_ctx; - int depth; - int allow_comments; - int handle_floats_manually; -} JSON_config; - - -/*! \brief Initializes the JSON parser configuration structure to default values. - - The default configuration is - - 127 levels of nested JSON (depends on JSON_PARSER_STACK_SIZE, see json_parser.c) - - no parsing, just checking for JSON syntax - - no comments - - \param config. Used to configure the parser. -*/ -JSON_PARSER_DLL_API void init_JSON_config(JSON_config* config); - -/*! \brief Create a JSON parser object - - \param config. Used to configure the parser. Set to NULL to use the default configuration. - See init_JSON_config - - \return The parser object. -*/ -JSON_PARSER_DLL_API extern JSON_parser new_JSON_parser(JSON_config* config); - -/*! \brief Destroy a previously created JSON parser object. */ -JSON_PARSER_DLL_API extern void delete_JSON_parser(JSON_parser jc); - -/*! \brief Parse a character. - - \return Non-zero, if all characters passed to this function are part of are valid JSON. -*/ -JSON_PARSER_DLL_API extern int JSON_parser_char(JSON_parser jc, int next_char); - -/*! \brief Finalize parsing. - - Call this method once after all input characters have been consumed. - - \return Non-zero, if all parsed characters are valid JSON, zero otherwise. -*/ -JSON_PARSER_DLL_API extern int JSON_parser_done(JSON_parser jc); - -/*! \brief Determine if a given string is valid JSON white space - - \return Non-zero if the string is valid, zero otherwise. -*/ -JSON_PARSER_DLL_API extern int JSON_parser_is_legal_white_space_string(const char* s); - - -#ifdef __cplusplus -} -#endif - - -#endif /* JSON_PARSER_H */ diff --git a/src/hos_libvariant/src/libvariant/libvariant.pc.in b/src/hos_libvariant/src/libvariant/libvariant.pc.in deleted file mode 100644 index 07372752..00000000 --- a/src/hos_libvariant/src/libvariant/libvariant.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@INSTALL_BIN_DIR@ -libdir=@INSTALL_LIB_DIR@ -includedir=@INSTALL_INCLUDE_DIR@ - -Name: libvariant -Description: Scripting language like variable (Variant) in C++ with serializing, deserializing, schema and other features. -Version: @VARIANT_VERSION@ -Libs: -L${libdir} -lVariant -Cflags: -I${includedir} diff --git a/src/hos_libvariant/src/libvariant/src/ArgParse.cc b/src/hos_libvariant/src/libvariant/src/ArgParse.cc deleted file mode 100644 index 3bfd4c59..00000000 --- a/src/hos_libvariant/src/libvariant/src/ArgParse.cc +++ /dev/null @@ -1,1855 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/include/Variant/ArgParse.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../../libvariant/include/Variant/Extensions.h" -#include "../../libvariant/include/Variant/Path.h" -#include "../../libvariant/include/Variant/Schema.h" -#include "../../libvariant/src/GuessScalar.h" -#include "../../libvariant/src/ParseBool.h" - -#if 0 -#define DBPRINT(x) std::cout << x -#else -#define DBPRINT(X) -#endif - -namespace libvariant { - - // ----------------- - // Static data - // ----------------- - - extern const char ARG_PARSE_SCHEMA_STR[]; - static const struct ArgParseStatic { - ArgParseStatic() { - schema = DeserializeJSON(ARG_PARSE_SCHEMA_STR); - } - Variant schema; - } arg_parse_static; - - - // ---------------- - // Static and global functions - // ---------------- - - ArgParseAction ArgParseActionFromStr(const std::string &action) { - if (action == "store") { - return ARGACTION_STORE; - } else if (action == "store_const") { - return ARGACTION_STORE_CONST; - } else if (action == "store_true") { - return ARGACTION_STORE_TRUE; - } else if (action == "store_false") { - return ARGACTION_STORE_FALSE; - } else if (action == "append") { - return ARGACTION_APPEND; - } else if (action == "count") { - return ARGACTION_COUNT; - } else if (action == "help") { - return ARGACTION_HELP; - } else if (action == "adv_help") { - return ARGACTION_ADVHELP; - } else if (action == "config") { - return ARGACTION_CONFIG; - } else if (action == "config_json") { - return ARGACTION_CONFIG_JSON; - } else if (action == "config_yaml") { - return ARGACTION_CONFIG_YAML; - } else if (action == "config_plist") { - return ARGACTION_CONFIG_PLIST; - } else if (action == "config_print") { - return ARGACTION_PRINT_CONFIG; - } else { - return ARGACTION_UNKNOWN; - } - } - - std::string ArgParseActionToStr(ArgParseAction action) { - switch (action) { - case ARGACTION_STORE: - return "store"; - case ARGACTION_STORE_CONST: - return "store_const"; - case ARGACTION_STORE_TRUE: - return "store_true"; - case ARGACTION_STORE_FALSE: - return "store_false"; - case ARGACTION_APPEND: - return "append"; - case ARGACTION_COUNT: - return "count"; - case ARGACTION_HELP: - return "help"; - case ARGACTION_ADVHELP: - return "adv_help"; - case ARGACTION_CONFIG: - return "config"; - case ARGACTION_CONFIG_JSON: - return "config_json"; - case ARGACTION_CONFIG_YAML: - return "config_yaml"; - case ARGACTION_CONFIG_PLIST: - return "config_plist"; - case ARGACTION_PRINT_CONFIG: - return "config_print"; - case ARGACTION_UNKNOWN: - default: - throw std::runtime_error("ArgParseActionToStr action enum an unknown value."); - } - } - - static bool ArgParseActionHasArg(ArgParseAction action) { - switch (action) { - case ARGACTION_STORE: - case ARGACTION_APPEND: - case ARGACTION_CONFIG: - case ARGACTION_CONFIG_JSON: - case ARGACTION_CONFIG_YAML: - case ARGACTION_CONFIG_PLIST: - return true; - case ARGACTION_STORE_CONST: - case ARGACTION_STORE_TRUE: - case ARGACTION_STORE_FALSE: - case ARGACTION_COUNT: - case ARGACTION_HELP: - case ARGACTION_ADVHELP: - return false; - default: - return false; - } - } - - static bool ArgParseActionHasResult(ArgParseAction action) { - switch (action) { - case ARGACTION_STORE: - case ARGACTION_APPEND: - case ARGACTION_STORE_CONST: - case ARGACTION_STORE_TRUE: - case ARGACTION_STORE_FALSE: - case ARGACTION_COUNT: - return true; - case ARGACTION_CONFIG: - case ARGACTION_CONFIG_JSON: - case ARGACTION_CONFIG_YAML: - case ARGACTION_CONFIG_PLIST: - case ARGACTION_HELP: - case ARGACTION_ADVHELP: - return false; - default: - return false; - } - } - - ArgParseType ParseType(const Variant &type) { - if (type.IsString()) { - if (type == "string") { return ARGTYPE_STRING; } - if (type == "number") { return ARGTYPE_FLOAT; } - if (type == "integer") { return ARGTYPE_INT; } - if (type == "boolean") { return ARGTYPE_BOOL; } - if (type == "null") { return ARGTYPE_GUESS; } - - std::ostringstream oss; - oss << "libvariant::ArgParse unrecognized type \"" << type.AsString() << "\""; - throw std::runtime_error(oss.str()); - } - return ARGTYPE_GUESS; - } - - std::string TypeString(Variant::Type_t type) { - switch (type) { - case Variant::NullType: - return "null"; - case Variant::BoolType: - return "boolean"; - case Variant::IntegerType: - case Variant::UnsignedType: - return "integer"; - case Variant::FloatType: - return "number"; - case Variant::StringType: - return "string"; - case Variant::ListType: - case Variant::MapType: - case Variant::BlobType: - default: - return "null"; - } - } - - //----------------- - // - - struct ArgParseOptImpl { - ArgParseOptImpl(ArgParseImpl *i, int id, const Path &p, int sOpt, const std::string &lOpt, - const std::string &htxt, ArgParseAction a); - void Set(const std::string &key, Variant v) { opt.Set(key, v); } - bool HasArg() const { return ArgParseActionHasArg(action); } - bool HasResult() { return ArgParseActionHasResult(action); } - void HandleOption(const char *arg) { Handle(ParseArg(arg)); } - void Handle(Variant arg); - void CheckRequirements(Variant val); - Variant ParseArg(const char *arg); - void Init(Variant o); - - void FinalizeResult(); - void FormResult(VariantRef res); - - std::ostream &MakeArgString(std::ostream &os) const; - void HelpLine(std::ostream &os, bool is_arg, bool adv, unsigned indent) const; - Variant GetDescription() const; - void GenerateSchema(VariantRef schema) const; - void GenerateSchema(VariantRef schema, Path::const_iterator i, Path::const_iterator e) const; - void GenerateObjectSchema(VariantRef schema, Path::const_iterator i, Path::const_iterator e) const; - void GenerateArraySchema(VariantRef schema, Path::const_iterator i, Path::const_iterator e) const; - Variant GenerateSchema() const; - - Variant::Type_t type; - Path path; - int id; - std::set groups; - int shortOpt; - std::string longOpt; - ArgParseAction action; - bool required; - bool advanced; - ArgParseImpl *impl; - Variant opt; - Variant result; - }; - - struct ArgString { - ArgString(const ArgParseOptImpl &o) : opt(o) {} - const ArgParseOptImpl &opt; - }; - static std::ostream &operator<<(std::ostream &os, const ArgString &as) { - return as.opt.MakeArgString(os); - } - - struct OptName { - OptName(ArgParseOptImpl *o, bool a=true) : opt(o), arg(a) {} - ArgParseOptImpl *opt; - bool arg; - }; - - static std::ostream &operator<<(std::ostream &os, const OptName &o) { - if (o.opt->longOpt != "") { - os << "option --" << o.opt->longOpt; - if (o.arg) os << " argument"; - } else if (o.opt->shortOpt != 0) { - os << "option -" << (char)o.opt->shortOpt; - if (o.arg) os << " argument"; - } else { - os << "argument " << o.opt->opt.Get("title").AsString(); - } - return os; - } - - struct ArgParseGroupImpl { - - ArgParseGroupImpl(ArgParseImpl *i, const std::string &name_) - : name(name_), - required(false), - mutually_exclusive(false), - advanced(false), - impl(i) - {} - - void Add(const Path &path); - void Add(ArgParseOptImpl *i); - void Init(Variant o); - void FinalizeResult(); - Variant GetDescription() const; - void GenerateSchema(VariantRef schema) const; - void GroupSchema(VariantRef schema, const ArgParseOptImpl *opt, - Path::const_iterator i, Path::const_iterator e) const; - - std::string name; - std::string title; - std::string description; - std::set members; - bool required; - bool mutually_exclusive; - bool advanced; - ArgParseImpl *impl; - }; - - struct ArgParseImpl { - - ArgParseImpl(const std::string &pname, bool addhelp) - : option_count(256), resolve_conflicts(false), have_advanced(false), - add_help(addhelp), print_help(false), - print_adv_help(false), print_config(false) - { - SetProgramName(pname); - } - - ArgParseOptImpl *AddOption(const std::string &keypath, int shortOpt, const std::string &longOpt, - const std::string &helptxt, ArgParseAction action) - { - Path path; - ParsePath(path, keypath); - int id = CheckExisting(path, shortOpt, longOpt); - if (longOpt.empty() && shortOpt == 0) { - throw std::runtime_error("ArgParse: Error attempting to add an option without" - " a short or long option."); - } - options.push_back(id); - optmap_iter i = option_map.insert(std::make_pair(id, - ArgParseOptImpl(this, id, path, shortOpt, longOpt, helptxt, action))).first; - if (!longOpt.empty()) { - longOpts.insert(std::make_pair(longOpt, id)); - } - if (shortOpt > 0) { - shortOpts.insert(std::make_pair((char)shortOpt, id)); - } - paths.insert(std::make_pair(PathString(path), id)); - return &i->second; - } - - ArgParseOptImpl *At(const std::string &keypath) { - Path path; - ParsePath(path, keypath); - return At(path); - } - - ArgParseOptImpl *At(const Path &path) { - std::map::iterator path_iter; - path_iter = paths.find(PathString(path)); - if (path_iter == paths.end()) { - throw std::runtime_error("ArgParse error, attempting to reference an non-existing option"); - } - return GetOpt(path_iter->second); - } - - ArgParseOptImpl *GetOpt(int id) { - return &option_map.find(id)->second; - } - - const ArgParseOptImpl *GetOpt(int id) const { - return &option_map.find(id)->second; - } - - ArgParseOptImpl *AddArgument(const std::string &keypath, const std::string &helptxt, - ArgParseAction action=ARGACTION_STORE) { - Path path; - ParsePath(path, keypath); - int sopt = 0; - int id = CheckExisting(path, sopt, ""); - arguments.push_back(id); - optmap_iter i = option_map.insert(std::make_pair(id, - ArgParseOptImpl(this, id, path, 0, "", helptxt, action) - )).first; - paths.insert(std::make_pair(PathString(path), id)); - i->second.Init(Variant().Set("maxArgs", 1).Set("minArgs", 1)); - return &i->second; - } - - ArgParseOptImpl *At(unsigned arg_index) { - return GetOpt(arguments.at(arg_index)); - } - - ArgParseGroupImpl *GetGroup(const std::string &name) { - return &groups.insert(std::make_pair(name, ArgParseGroupImpl(this, name))).first->second; - } - - void ConflictResolution(bool resolve) { - resolve_conflicts = resolve; - } - - void AddHelp() { - add_help = true; - } - - void AddConfigDefaults() { - AddOption("default-config-load", 0, "config", "Load options from file.", ARGACTION_CONFIG); - AddOption("default-config-print", 0, "print-config", "Print the configuration and exit.", - ARGACTION_PRINT_CONFIG); - } - - int CheckExisting(const Path &path, int &shortOpt, const std::string &longOpt) { - if (paths.find(PathString(path)) != paths.end()) { - std::ostringstream oss; - oss << "ArgParse option key \"" << PathString(path) << "\" already exists in options."; - throw std::runtime_error(oss.str()); - } - if (shortOpt > 0 && shortOpts.find(shortOpt) != shortOpts.end()) { - if (resolve_conflicts) { - shortOpt = 0; - } else { - std::ostringstream oss; - oss << "ArgParse duplicate short option \"" << std::string(1, (char)shortOpt) - << "\""; - throw std::runtime_error(oss.str()); - } - } - if (!longOpt.empty() && longOpts.find(longOpt) != longOpts.end()) { - std::ostringstream oss; - oss << "ArgParse duplicate long option \"" << longOpt << "\""; - throw std::runtime_error(oss.str()); - } - if (shortOpt > 0) { return shortOpt; } - else { return ++option_count; } - } - - void SetProgramName(const std::string &pname, bool do_basename=true); - - void Parse(int argc, char *const *argv); - Variant FormResult(); - - void PrintHelp(bool advanced) const; - void PrintConfig(); - - void MergeDescription(Variant desc); - void MergeOptions(Variant opts); - void MergeOptions(Variant opt, Path &path); - - void GenerateSchema(VariantRef schema) const; - Variant GetDescription() const; - - std::string title; - std::string description; - std::string epilog; - int option_count; - std::map option_map; - typedef std::map::iterator optmap_iter; - std::vector options; - typedef std::vector::iterator opt_iter; - typedef std::vector::const_iterator const_opt_iter; - std::map longOpts; - std::map shortOpts; - std::map paths; - std::vector arguments; - typedef std::vector::iterator arg_iter; - typedef std::vector::const_iterator const_arg_iter; - - std::map groups; - typedef std::map::iterator group_iter; - typedef std::map::const_iterator const_group_iter; - - bool resolve_conflicts; - bool have_advanced; - bool add_help; - bool print_help; - bool print_adv_help; - bool print_config; - }; - - - // ------------- - // ArgParseOption implemenatation - // ------------- - - ArgParseOption &ArgParseOption::Title(const std::string &title) { - impl->Set("title", title); - return *this; - } - - ArgParseOption &ArgParseOption::Action(const std::string &action) { - return Action(ArgParseActionFromStr(action)); - } - - ArgParseOption &ArgParseOption::Action(ArgParseAction action) { - if (action == ARGACTION_UNKNOWN) { - throw std::runtime_error("ArgParse: Unknown action"); - } - impl->action = action; - return *this; - } - - ArgParseOption &ArgParseOption::Type(ArgParseType type) { - switch (type) { - case ARGTYPE_GUESS: - case ARGTYPE_INT: - case ARGTYPE_UINT: - case ARGTYPE_STRING: - case ARGTYPE_BOOL: - case ARGTYPE_FLOAT: - impl->type = (Variant::Type_t)type; - return *this; - default: - throw std::runtime_error("ArgParse: Unknown argument type specified."); - } - } - - ArgParseOption &ArgParseOption::Type(const std::string &type) { - return Type(ParseType(type)); - } - - ArgParseOption &ArgParseOption::Type(Variant::Type_t type) { - if (type == Variant::MapType || type == Variant::ListType) { - std::ostringstream oss; - oss << "ArgParse: Type " << type << " cannot be specified as an option type."; - throw std::runtime_error(oss.str()); - } - impl->type = type; - return *this; - } - - ArgParseOption &ArgParseOption::Const(Variant val) { - impl->Set("const", val); - return *this; - } - - ArgParseOption &ArgParseOption::Default(Variant val) { - impl->Set("default", val); - return *this; - } - - ArgParseOption &ArgParseOption::Env(const char *env) { - impl->Set("env", env); - return *this; - } - - ArgParseOption &ArgParseOption::Minimum(Variant val) { - if (!val.IsNumber()) { - throw std::runtime_error("Minimum requires a number."); - } - if (impl->type == Variant::NullType) { impl->type = Variant::FloatType; } - impl->Set("minimum", val); - return *this; - } - - ArgParseOption &ArgParseOption::Maximum(Variant val) { - if (!val.IsNumber()) { - throw std::runtime_error("Maximum requires a number."); - } - if (impl->type == Variant::NullType) { impl->type = Variant::FloatType; } - impl->Set("maximum", val); - return *this; - } - - ArgParseOption &ArgParseOption::AddChoice(Variant val) { - if (!impl->opt.Contains("enum")) { impl->Set("enum", Variant::ListType); } - Variant e = impl->opt["enum"]; - if (std::find(e.ListBegin(), e.ListEnd(), val) == e.ListEnd()) { - e.Append(val); - } - return *this; - } - - ArgParseOption &ArgParseOption::SetChoices(const std::vector &val) { - impl->Set("enum", val); - return *this; - } - - const std::vector &ArgParseOption::GetChoices() { - return impl->opt["enum"].AsList(); - } - - ArgParseOption &ArgParseOption::Required(bool req) { - impl->required = true; - return *this; - } - - ArgParseOption &ArgParseOption::Help(const std::string &helptxt) { - impl->Set("description", helptxt); - return *this; - } - - ArgParseOption &ArgParseOption::Pattern(const std::string &pattern) { - if (impl->type == Variant::NullType) { impl->type = Variant::StringType; } - impl->Set("pattern", pattern); - return *this; - } - - ArgParseOption &ArgParseOption::MaxLength(unsigned l) { - if (impl->type == Variant::NullType) { impl->type = Variant::StringType; } - impl->Set("maxLength", l); - return *this; - } - - ArgParseOption &ArgParseOption::MinLength(unsigned l) { - if (impl->type == Variant::NullType) { impl->type = Variant::StringType; } - impl->Set("minLength", l); - return *this; - } - - ArgParseOption &ArgParseOption::MinArgs(unsigned l) { - impl->Set("minArgs", l); - if (l > 0 && !impl->required) { - impl->required = true; - } - return *this; - } - - ArgParseOption &ArgParseOption::MaxArgs(unsigned l) { - impl->Set("maxArgs", l); - return *this; - } - - ArgParseOption &ArgParseOption::NumArgs(unsigned l) { - MinArgs(l); - MaxArgs(l); - return *this; - } - - ArgParseOption &ArgParseOption::Group(const std::string &gname) { - impl->impl->GetGroup(gname)->Add(impl); - return *this; - } - - ArgParseOption &ArgParseOption::Advanced(bool adv) { - impl->advanced = adv; - impl->impl->have_advanced = true; - return *this; - } - - OptionGroup &OptionGroup::Title(const std::string &t) { - impl->title = t; - return *this; - } - - OptionGroup &OptionGroup::Description(const std::string &d) { - impl->description = d; - return *this; - } - - OptionGroup &OptionGroup::MutuallyExclusive(bool exclusive) { - impl->mutually_exclusive = exclusive; - return *this; - } - - OptionGroup &OptionGroup::Required(bool req) { - impl->required = req; - return *this; - } - - OptionGroup &OptionGroup::Add(const std::string &keypath) { - Path path; - ParsePath(path, keypath); - impl->Add(path); - return *this; - } - - OptionGroup &OptionGroup::Add(const Path &keypath) { - impl->Add(keypath); - return *this; - } - - OptionGroup &OptionGroup::Advanced(bool adv) { - impl->advanced = adv; - impl->impl->have_advanced = true; - return *this; - } - - // ----------------------- - // ArgParse implementation - // ----------------------- - - ArgParse::ArgParse(bool addhelp) - : impl(shared_ptr(new ArgParseImpl("", addhelp))) - {} - - ArgParse::ArgParse(const std::string &pname, bool addhelp) - : impl(shared_ptr(new ArgParseImpl(pname, addhelp))) - {} - - ArgParseOption ArgParse::AddOption(const std::string &keypath, int shortOpt, const std::string &longOpt, - const std::string &helptxt) - { - return ArgParseOption(impl->AddOption(keypath, shortOpt, longOpt, helptxt, ARGACTION_STORE)); - } - - ArgParseOption ArgParse::At(const std::string &keypath) { - return ArgParseOption(impl->At(keypath)); - } - - ArgParseOption ArgParse::AddFlag(const std::string &keypath, int shortOpt, const std::string &longOpt, - const std::string &helptxt) - { - return ArgParseOption(impl->AddOption(keypath, shortOpt, longOpt, helptxt, ARGACTION_STORE_TRUE)) - .Type(ARGTYPE_BOOL).Default(false); - } - - OptionGroup ArgParse::AddGroup(const std::string &name, const std::string &title, - const std::string &description) { - return OptionGroup(impl->GetGroup(name)).Title(title).Description(description); - } - - OptionGroup ArgParse::GetGroup(const std::string &name) { - return OptionGroup(impl->GetGroup(name)); - } - - ArgParseOption ArgParse::AddArgument(const std::string &keypath, const std::string &helptxt) - { - return ArgParseOption(impl->AddArgument(keypath, helptxt)); - } - - ArgParseOption ArgParse::At(size_t argumentIndex) { - return ArgParseOption(impl->At(argumentIndex)); - } - - void ArgParse::ConflictResolution(bool resolve) { - impl->ConflictResolution(resolve); - } - - void ArgParse::AddConfigDefaults() { - impl->AddConfigDefaults(); - } - - void ArgParse::AddHelp() { - impl->AddHelp(); - } - - void ArgParse::SetDescription(const std::string &txt) { - impl->description = txt; - } - - void ArgParse::SetEpilog(const std::string &txt) { - impl->epilog = txt; - } - - void ArgParse::SetProgramName(const std::string &pname, bool do_basename) { - impl->SetProgramName(pname, do_basename); - } - - std::string ArgParse::GetProgramName() const { - return impl->title; - } - - void ArgParse::Merge(Variant newopts) { - impl->MergeDescription(newopts); - } - - void ArgParse::Merge(const ArgParse &other) { - Merge(other.GetDescription()); - } - - void ArgParse::Validate() const { - SchemaResult result = SchemaValidate(arg_parse_static.schema, GetDescription()); - if (result.Error()) { - throw std::runtime_error(result.PrettyPrintMessage()); - } - } - - Variant ArgParse::Parse(int argc, char *const *argv) { - impl->Parse(argc, argv); - return impl->FormResult(); - } - - void ArgParse::PrintHelp(bool advanced) const { - impl->PrintHelp(advanced); - } - - Variant ArgParse::GetDescription() const { - return impl->GetDescription(); - } - - Variant ArgParse::GenerateSchema() const { - Variant schema = Variant::MapType; - impl->GenerateSchema(schema); - return schema; - } - - //------------------- - // ArgParseGroupImpl - //------------------- - - void ArgParseGroupImpl::Add(const Path &path) { - ArgParseOptImpl *o = impl->At(path); - Add(o); - } - - void ArgParseGroupImpl::Add(ArgParseOptImpl *o) { - members.insert(o); - o->groups.insert(name); - } - - void ArgParseGroupImpl::Init(Variant o) { - o.GetInto(title, "title", title); - o.GetInto(description, "description", description); - o.GetInto(required, "required", required); - o.GetInto(mutually_exclusive, "mutually exclusive", mutually_exclusive); - o.GetInto(advanced, "advanced", false); - if (advanced) { impl->have_advanced = true; } - if (o.Contains("members") && o["members"].IsList()) { - for (Variant::ListIterator i(o["members"].ListBegin()), e(o["members"].ListEnd()); - i != e; ++i) - { - Add(impl->At(i->AsString())); - } - } - } - - void ArgParseGroupImpl::FinalizeResult() { - if (mutually_exclusive) { - ArgParseOptImpl *last = 0; - for (std::set::iterator i(members.begin()), e(members.end()); - i != e; ++i) - { - ArgParseOptImpl *o = *i; - if (!o->result.IsNull()) { - if (!last) { - last = o; - } else { - std::ostringstream oss; - oss << "Error parsing arguments\n" - << OptName(last, false) << " and " << OptName(o, false) - << " are mutually exclusive."; - throw std::runtime_error(oss.str()); - } - } - } - if (required && !last) { - std::ostringstream oss; - oss << "Error parsing arguments\n" - << "One of the following options must be specified:\n"; - for (std::set::iterator i(members.begin()), e(members.end()); - i != e; ++i) - { - oss << "\t" << OptName(*i, false) << "\n"; - } - throw std::runtime_error(oss.str()); - } - } - } - - Variant ArgParseGroupImpl::GetDescription() const { - Variant desc = Variant::MapType; - if (!title.empty()) { desc.Set("title", title); } - if (!description.empty()) { desc.Set("description", description); } - desc.Set("required", required); - desc.Set("mutually exclusive", mutually_exclusive); - Variant mem = Variant::ListType; - for (std::set::iterator i(members.begin()), e(members.end()); - i != e; ++i) - { - mem.Append(PathString((*i)->path)); - } - desc.Set("advanced", advanced); - desc.Set("members", mem); - return desc; - } - - void ArgParseGroupImpl::GenerateSchema(VariantRef schema) const { - // The basic pattern for mutual exclusion with required is: - // "oneOf": [ - // { "required": [ "key" ] }, - // { "required": [ "key2" ] }, - // ] - // just mutual exclusion: - // "oneOf": [ - // { "required": [ "key" ] }, - // { "required": [ "key2" ] }, - // { "not": { "required": [ "key", "key2" ] } - // ] - // What makes things funny is paths. - if (mutually_exclusive) { - Variant oneof = Variant::ListType; - for (std::set::const_iterator i(members.begin()), e(members.end()); - i != e; ++i) - { - Variant instance; - GroupSchema(instance, *i, (*i)->path.begin(), (*i)->path.end()); - oneof.Append(instance); - } - if (!required) { - Variant anyof = Variant().Set("anyOf", oneof.Copy()); - oneof.Append(Variant().Set("not", anyof)); - } - if (!schema.Contains("allOf")) { schema["allOf"] = Variant::ListType; } - schema["allOf"].Append(Variant().Set("oneOf", oneof)); - } - } - - void ArgParseGroupImpl::GroupSchema(VariantRef schema, const ArgParseOptImpl *opt, - Path::const_iterator i, Path::const_iterator e) const - { - if (i != e) { - if (i->IsString()) { - schema["required"].Append(i->AsString()); - GroupSchema(schema["properties"][i->AsString()], opt, i+1, e); - } else if (i->IsNumber()) { - if (!schema.Contains("items")) { schema["items"] = Variant::ListType; } - if (schema["items"].Size() < i->AsUnsigned()) { - schema["items"].AsList().resize(i->AsUnsigned(), Variant::MapType); - } - GroupSchema(schema["items"][unsigned(i->AsUnsigned())], opt, i+1, e); - } - } else { - schema = Variant::MapType; - } - } - - //------------- - // ArgParseImpl - //------------- - -#if __APPLE__ -#include -#endif - void ArgParseImpl::SetProgramName(const std::string &pname, bool do_basename) { - if (pname.length() > 0) { - if (do_basename) { - char buf[pname.size()+1]; - strcpy(buf,pname.c_str()); - title = basename(buf); - } - else { - title = pname; - } - } - else { - // try to figure out the program name on our own - - char *progname = 0; - char buf[PATH_MAX*2]; - memset(buf, 0, PATH_MAX*2); - - #if __linux__ - if (!progname || !strlen(progname)) { - size_t bufsize = sizeof(buf); - if (0 == readlink("/proc/self/exe", buf, bufsize)) { - progname = buf; - } - } - #endif /* __linux__ */ - - #if __APPLE__ - if (!progname || !strlen(progname)) { - uint32_t bufsize = sizeof(buf); - if (0 == _NSGetExecutablePath(buf, &bufsize)) { - progname = buf; - } - } - #endif /* __APPLE__ */ - - if (!progname || !strlen(progname)) { - // Note: this is not accurate if the shell that set "_" - // called a program that called another program - progname = getenv("_"); - } - - if (!progname || !strlen(progname)) { - title = "ArgParse"; - } else { - title = std::string(basename(progname)); - } - } - } - - void ArgParseImpl::Parse(int argc, char *const *argv) { - - if (add_help) { - bool old_conflict = resolve_conflicts; - resolve_conflicts = true; - try { - AddOption("default-help-option", 'h', "help", "Print this message and exit.", ARGACTION_HELP); - if (have_advanced) { - AddOption("default-adv-help-option", 0, "adv-help", "Print help message" - " including options marked as advanced.", ARGACTION_ADVHELP); - } - } catch (const std::runtime_error &) {} - resolve_conflicts = old_conflict; - } - - try { - std::string shortOpts; - std::vector longOpts; - for (optmap_iter i(option_map.begin()), e(option_map.end()); i != e; ++i) { - ArgParseOptImpl &o = i->second; - int id = i->first; - if (o.shortOpt > 0) { - shortOpts.append(1, (char)o.shortOpt); - if (o.HasArg()) { shortOpts.append(1, ':'); } - } - if (!o.longOpt.empty()) { - struct option tmp_option = - { o.longOpt.c_str(), (o.HasArg() ? 1 : 0), 0, id }; - longOpts.push_back(tmp_option); - } - if (o.action == ARGACTION_COUNT) { o.result = 0u; } - // Handle environment variables - if (o.opt.Contains("env")) { - const char *env = getenv(o.opt["env"].AsString().c_str()); - if (env) { o.HandleOption(env); } - } - } - { - // End the option list - struct option tmp_option = {0, 0, 0, 0}; - longOpts.push_back(tmp_option); - } - - optind = 1; // Make sure getopt is in initial state - while (true) { - int c = getopt_long(argc, argv, shortOpts.c_str(), &longOpts[0], 0); - if (c == -1) { break; } - if (c == '?') { PrintHelp(false); } - optmap_iter o = option_map.find(c); - if (o == option_map.end()) { PrintHelp(false); } - ArgParseOptImpl &opt = o->second; - opt.HandleOption(optarg); - } - - // Handle arguments - unsigned minimum_arguments = 0; - for (arg_iter i(arguments.begin()), e(arguments.end()); i != e; ++i) { - ArgParseOptImpl *o = GetOpt(*i); - unsigned minarg; o->opt.GetInto(minarg, "minArgs", 0u); - if (minarg > 0) { minimum_arguments += minarg; } - else { break; } - } - unsigned numarg = argc - optind; - unsigned index = optind; - unsigned maximum_arguments = 0; - for (arg_iter i(arguments.begin()), e(arguments.end()); i != e; ++i) { - unsigned minarg, maxarg; - ArgParseOptImpl *o = GetOpt(*i); - o->opt.GetInto(minarg, "minArgs", 0u); - o->opt.GetInto(maxarg, "maxArgs", 0u); - if (maxarg != 0) { maximum_arguments += maxarg; } - else { maximum_arguments = 0; } - if (i + 1 == e && maxarg != 0 && argc - index > maxarg) { - std::ostringstream oss; - oss << "Error parsing arguments\nToo many arguments specified, " - << numarg << " given, maximum: " << maximum_arguments; - throw std::runtime_error(oss.str()); - } else { - unsigned num = 0; - while (index < (unsigned)argc && (maxarg == 0 || num < maxarg)) { - o->HandleOption(argv[index]); - ++index; - ++num; - } - } - } - if (index < (unsigned)argc) { - throw std::runtime_error("Error parsing arguments\nExtra arguments given."); - } - - for (optmap_iter i(option_map.begin()), e(option_map.end()); i != e; ++i) { - i->second.FinalizeResult(); - } - for (group_iter i(groups.begin()), e(groups.end()); i != e; ++i) { - i->second.FinalizeResult(); - } - if (print_adv_help) { PrintHelp(true); } - if (print_help) { PrintHelp(false); } - if (print_config) { PrintConfig(); } - } catch (const std::exception &e) { - if (print_adv_help) { PrintHelp(true); } - if (print_help) { PrintHelp(false); } - if (print_config) { PrintConfig(); } - std::cerr << e.what() << std::endl; - exit(1); - } - } - - Variant ArgParseImpl::FormResult() { - Variant ret = Variant::MapType; - for (optmap_iter i(option_map.begin()), e(option_map.end()); i != e; ++i) { - i->second.FormResult(ret); - } - return ret; - } - - - struct PrintHelpGroup { - std::string title; - std::string description; - bool advanced; - std::vector members; - }; - - void ArgParseImpl::PrintHelp(bool advanced) const { - std::cerr << title << ": [options]"; - for (const_arg_iter i(arguments.begin()), e(arguments.end()); i != e; ++i) { - const ArgParseOptImpl &arg = *GetOpt(*i); - unsigned minArgs, maxArgs; - arg.opt.GetInto(minArgs, "minArgs", 0u); - arg.opt.GetInto(maxArgs, "maxArgs", 0u); - if (minArgs == 0 && maxArgs == 0) { - std::cerr << " [" << ArgString(arg) << " [" << ArgString(arg) << " ...]]"; - } else { - for (unsigned i = 0; i < minArgs; ++i) { - std::cerr << " " << ArgString(arg); - } - if (maxArgs > minArgs) { - for (unsigned i = minArgs; i < maxArgs; ++i) { - std::cerr << " [" << ArgString(arg); - } - for (unsigned i = minArgs; i < maxArgs; ++i) { - std::cerr << "]"; - } - } else if (maxArgs < minArgs) { - std::cerr << " [" << ArgString(arg) << " ...]"; - } - } - } - std::cerr << "\n\n"; - if (!description.empty()) { - std::cerr << description << "\n\n"; - } - if (!arguments.empty()) { - std::cerr << "Arguments:\n"; - } - for (const_arg_iter i(arguments.begin()), e(arguments.end()); i != e; ++i) { - const ArgParseOptImpl &arg = *GetOpt(*i); - arg.HelpLine(std::cerr, false, true, 1); - } - if (!options.empty()) { - std::cerr << "Options:\n"; - } - std::vector ungrouped; - std::map groupings; - - for (const_opt_iter i(options.begin()), e(options.end()); i != e; ++i) { - bool in_group = false; - const ArgParseOptImpl &opt = *GetOpt(*i); - std::set::const_iterator g(opt.groups.begin()), gend(opt.groups.end()); - for (; g != gend; ++g) { - const_group_iter group_i = groups.find(*g); - if (group_i == groups.end()) { - std::cerr << "Group " << *g << " referenced but does not exist\n"; - continue; - } - const ArgParseGroupImpl *gimpl = &group_i->second; - if (!gimpl->title.empty() || !gimpl->description.empty()) { - in_group = true; - std::map::iterator giter; - giter = groupings.find(*g); - if (giter == groupings.end()) { - PrintHelpGroup group; - group.title = gimpl->title; - group.description = gimpl->description; - group.advanced = gimpl->advanced; - group.members.push_back(&opt); - groupings[*g] = group; - } else { - giter->second.members.push_back(&opt); - } - break; - } - } - if (!in_group) { - ungrouped.push_back(&opt); - } - } - for (std::vector::iterator i(ungrouped.begin()), e(ungrouped.end()); - i != e; ++i) - { - (*i)->HelpLine(std::cerr, true, advanced, 1); - } - for (std::map::iterator i(groupings.begin()), e(groupings.end()); - i != e; ++i) - { - if ( !(!i->second.advanced || advanced) ) { continue; } - std::cerr << "\n"; - if (! i->second.title.empty()) { - std::cerr << i->second.title << "\n"; - } - if (! i->second.description.empty()) { - std::cerr << i->second.description << "\n"; - } - for (std::vector::iterator j(i->second.members.begin()), - je(i->second.members.end()); - j != je; ++j) - { - (*j)->HelpLine(std::cerr, true, advanced, 1); - } - } - if (!epilog.empty()) { - std::cerr << "\n" << epilog << "\n" << std::endl; - } - exit(0); - } - - void ArgParseImpl::PrintConfig() { - Variant config = FormResult(); - Serialize(std::cout.rdbuf(), config, SERIALIZE_JSON, Variant().Set("pretty", true)); - std::cout << std::endl; - exit(0); - } - - void ArgParseImpl::MergeDescription(Variant desc) { - if (!desc.IsMap()) { return; } - if (desc.Contains("options") && desc["options"].IsMap()) { - Variant opts = desc["options"]; - for (Variant::MapIterator i(opts.MapBegin()), e(opts.MapEnd()); - i != e; ++i) - { - Variant o = i->second; - std::string keypath = i->first; - int shortOpt = 0; - if (o.Contains("shortOption")) { - shortOpt = o.Get("shortOption").AsString()[0]; - } - std::string longOpt = o.Get("longOption", "").AsString(); - std::string helptxt = o.Get("description", "").AsString(); - ArgParseAction action = ArgParseActionFromStr(o.Get("action", "store").AsString()); - AddOption(keypath, shortOpt, longOpt, helptxt, action)->Init(o); - } - } - if (desc.Contains("groups") && desc["groups"].IsMap()) { - Variant grps = desc["groups"]; - for (Variant::MapIterator i(grps.MapBegin()), e(grps.MapEnd()); - i != e; ++i) - { - Variant g = i->second; - std::string name = i->first; - GetGroup(name)->Init(g); - } - } - if (desc.Contains("arguments") && desc["arguments"].IsList()) { - Variant args = desc["arguments"]; - for (Variant::ListIterator i(args.ListBegin()), e(args.ListEnd()); - i != e; ++i) - { - Variant o = *i; - if (!o.Contains("keypath")) { continue; } - std::string keypath = o.Get("keypath").AsString(); - std::string helptxt = o.Get("description", "").AsString(); - ArgParseAction action = ArgParseActionFromStr(o.Get("action", "store").AsString()); - AddArgument(keypath, helptxt, action)->Init(o); - } - } - } - - void ArgParseImpl::MergeOptions(Variant opts) { - Path path; - MergeOptions(opts, path); - } - - void ArgParseImpl::MergeOptions(Variant opt, Path &path) { - switch (opt.GetType()) { - case Variant::NullType: - break; - case Variant::BoolType: - case Variant::IntegerType: - case Variant::UnsignedType: - case Variant::FloatType: - case Variant::StringType: - try { - At(path)->Handle(opt); - } catch (const std::runtime_error &) {} - break; - case Variant::ListType: - try { - At(path)->Handle(opt); - } catch (const std::runtime_error &) { - unsigned index = 0; - for (Variant::ListIterator i(opt.ListBegin()), e(opt.ListEnd()); - i != e; ++i, ++index) { - path.push_back(index); - MergeOptions(*i, path); - path.pop_back(); - } - } - break; - case Variant::MapType: - for (Variant::MapIterator i(opt.MapBegin()), e(opt.MapEnd()); i != e; ++i) { - path.push_back(i->first); - MergeOptions(i->second, path); - path.pop_back(); - } - break; - case Variant::BlobType: - break; - } - } - - void ArgParseImpl::GenerateSchema(VariantRef schema) const { - for (const_opt_iter i(options.begin()), e(options.end()); i != e; ++i) { - GetOpt(*i)->GenerateSchema(schema); - } - for (const_arg_iter i(arguments.begin()), e(arguments.end()); i != e; ++i) { - GetOpt(*i)->GenerateSchema(schema); - } - for (const_group_iter i(groups.begin()), e(groups.end()); i != e; ++i) { - i->second.GenerateSchema(schema); - } - } - - Variant ArgParseImpl::GetDescription() const { - Variant desc = Variant::MapType; - desc.Set("title", title); - desc.Set("description", description); - desc.Set("epilog", epilog); - for (const_opt_iter i(options.begin()), e(options.end()); i != e; ++i) { - const ArgParseOptImpl *opt = GetOpt(*i); - desc["options"].Set(PathString(opt->path), opt->GetDescription()); - } - for (const_arg_iter i(arguments.begin()), e(arguments.end()); i != e; ++i) { - const ArgParseOptImpl *opt = GetOpt(*i); - desc["arguments"].Append(opt->GetDescription()); - } - for (const_group_iter i(groups.begin()), e(groups.end()); i != e; ++i) { - desc["groups"].Set(i->first, i->second.GetDescription()); - } - return desc; - } - - // --------------- - // ArgParseOptImpl - // --------------- - - ArgParseOptImpl::ArgParseOptImpl(ArgParseImpl *i, int id_, const Path &p, - int sOpt, const std::string &lOpt, const std::string &htxt, ArgParseAction a) - : type(Variant::NullType), - path(p), - id(id_), - shortOpt(sOpt), - longOpt(lOpt), - action(a), - required(false), - advanced(false), - impl(i), - opt(Variant::MapType), - result(Variant::NullType) - { - if (path.back().IsString()) { - opt["title"] = path.back().AsString(); - } else { - opt["title"] = PathString(path); - } - opt["description"] = htxt; - } - - void ArgParseOptImpl::Handle(Variant arg) { - switch (action) { - case ARGACTION_STORE: - CheckRequirements(arg); - result = arg; - break; - case ARGACTION_STORE_CONST: - result = opt["const"]; - break; - case ARGACTION_STORE_TRUE: - if (arg.IsBool()) { - result = arg; - } else { - result = true; - } - break; - case ARGACTION_STORE_FALSE: - if (arg.IsBool()) { - result = arg; - } else { - result = false; - } - break; - case ARGACTION_APPEND: - if (arg.IsList()) { - for (Variant::ListIterator i(arg.ListBegin()), e(arg.ListEnd()); i != e; ++i) { - CheckRequirements(*i); - result.Append(*i); - } - } else { - CheckRequirements(arg); - result.Append(arg); - } - break; - case ARGACTION_COUNT: - if (arg.IsNumber()) { - result += arg.AsInt(); - } else { - result += 1; - } - break; - case ARGACTION_HELP: - impl->print_help = true; - break; - case ARGACTION_ADVHELP: - impl->print_adv_help = true; - break; - case ARGACTION_CONFIG: - impl->MergeOptions(DeserializeGuessFile(arg.AsString().c_str())); - break; - case ARGACTION_CONFIG_JSON: - impl->MergeOptions(DeserializeFile(arg.AsString().c_str(), SERIALIZE_JSON)); - break; - case ARGACTION_CONFIG_YAML: - impl->MergeOptions(DeserializeFile(arg.AsString().c_str(), SERIALIZE_YAML)); - break; - case ARGACTION_CONFIG_PLIST: - impl->MergeOptions(DeserializeFile(arg.AsString().c_str(), SERIALIZE_XMLPLIST)); - break; - case ARGACTION_PRINT_CONFIG: - impl->print_config = true; - break; - default: - break; - } - } - - void ArgParseOptImpl::CheckRequirements(Variant val) { - - switch (val.GetType()) { - case Variant::StringType: - if (opt.Contains("minLength") && val.Size() < opt["minLength"]) { - std::ostringstream oss; - oss << "Error parsing arguments\n" << OptName(this) << " is too short: " << val.Size() - << " chars, minimum " << opt["minLength"].AsUnsigned(); - throw std::runtime_error(oss.str()); - } - if (opt.Contains("maxLength") && val.Size() > opt["maxLength"]) { - std::ostringstream oss; - oss << "Error parsing arguments\n" << OptName(this) << " is too long: " << val.Size() - << " chars, maximum " << opt["maxLength"].AsUnsigned(); - throw std::runtime_error(oss.str()); - } - if (opt.Contains("pattern")) { - std::string pat = opt["pattern"].AsString(); - regex_t reg; - memset(®, 0, sizeof(regex_t)); - int err; - if ((err = regcomp(®, pat.c_str(), REG_EXTENDED | REG_NOSUB))) { - std::vector buffer(8192); - regerror(err, ®, &buffer[0], buffer.size()); - std::ostringstream oss; - oss << "Error parsing arguments\n"; - oss << "Failed to compile pattern regex \"" << pat << "\" with error: " - << &buffer[0]; - throw std::runtime_error(oss.str()); - } - if (regexec(®, val.AsString().c_str(), 0, 0, 0) != 0) { - regfree(®); - std::ostringstream oss; - oss << "Error parsing arguments\n"; - oss << OptName(this) << " failed to match pattern \"" - << pat << "\""; - throw std::runtime_error(oss.str()); - } - regfree(®); - } - break; - case Variant::IntegerType: case Variant::UnsignedType: case Variant::FloatType: - if (opt.Contains("minimum") && val < opt["minimum"]) { - std::ostringstream oss; - oss << "Error parsing arguments\n" << OptName(this) << " is too small: "; - SerializeJSON(oss.rdbuf(), val); - oss << ", minimum "; - SerializeJSON(oss.rdbuf(), opt["minimum"]); - throw std::runtime_error(oss.str()); - } - if (opt.Contains("maximum") && val > opt["maximum"]) { - std::ostringstream oss; - oss << "Error parsing arguments\n" << OptName(this) << " is too large: "; - SerializeJSON(oss.rdbuf(), val); - oss << ", maximum "; - SerializeJSON(oss.rdbuf(), opt["maximum"]); - throw std::runtime_error(oss.str()); - } - break; - default: - break; - } - - if (opt.Contains("enum")) { - Variant choices = opt["enum"]; - bool pass = false; - for (Variant::ListIterator i(choices.ListBegin()), e(choices.ListEnd()); i != e; ++i) - { - if (val == *i) { pass = true; break; } - } - if (!pass) { - std::ostringstream oss; - oss << "Error parsing arguments\n"; - SerializeJSON(oss.rdbuf(), val); - oss << "\nis not one of the allowed choices for " << OptName(this) << std::endl; - for (Variant::ListIterator i(choices.ListBegin()), e(choices.ListEnd()); i != e; ++i) - { - oss << " - "; - SerializeJSON(oss.rdbuf(), *i); - oss << std::endl; - } - throw std::runtime_error(oss.str()); - } - } - } - - - static void ParseArgIntError(const char *arg) { - std::ostringstream oss; - oss << "Error parsing arguments\nUnable to convert \"" << arg << "\" to an integer"; - throw std::runtime_error(oss.str()); - } - - Variant ArgParseOptImpl::ParseArg(const char *arg) { - - class PAction : public ParserActions { - public: - virtual void Scalar(ParserImpl *p, double v, const char *anchor, const char *tag) - { val = v; } - virtual void Scalar(ParserImpl *p, const char *str, unsigned length, const char *anchor, const char *tag) - { val = std::string(str, length); } - virtual void Scalar(ParserImpl *p, bool v, const char *anchor, const char *tag) - { val = v; } - virtual void Null(ParserImpl *p, const char *anchor, const char *tag) - { val = Variant::NullType; } - virtual void Scalar(ParserImpl *p, intmax_t v, const char *anchor, const char *tag) - { val = v; } - virtual void Scalar(ParserImpl *p, uintmax_t v, const char *anchor, const char *tag) - { val = v; } - Variant val; - }; - - if (!HasArg()) { - if (arg) { - std::ostringstream oss; - oss << "Error parsing arguments\n" - << OptName(this) << " does not take an argument, but argument \"" - << arg << "\" given."; - throw std::runtime_error(oss.str()); - } - return Variant::NullType; - } - - // Was type specified? - unsigned len = strlen(arg); - switch (type) { - case Variant::BoolType: - return Variant(ParseBool(arg)); - case Variant::IntegerType: - { - long long val; - char *end = 0; - val = strtoll(arg, &end, 10); - if (val == 0 && end == arg) { ParseArgIntError(arg); } - if (arg + len != end) { ParseArgIntError(arg); } - if (!(val == LLONG_MAX && errno == ERANGE)) { - return Variant(val); - } - } // Fall through - case Variant::UnsignedType: - { - char *end = 0; - unsigned long long val; - val = strtoull(arg, &end, 10); - if (val == 0 && end == arg) { ParseArgIntError(arg); } - if (arg + len != end) { ParseArgIntError(arg); } - return Variant(val); - } - case Variant::FloatType: - { - char *end = 0; - double val = strtod(arg, &end); - if ((val == 0 && end == arg) || (arg + len != end)) { - std::ostringstream oss; - oss << "Error parsing arguments\nUnable to convert \"" << arg << "\" to a number"; - throw std::runtime_error(oss.str()); - } - return Variant(val); - } - case Variant::StringType: - return Variant(arg); - - case Variant::NullType: case Variant::ListType: case Variant::MapType: case Variant::BlobType: default: - { - PAction a; - GuessScalar(arg, strlen(arg), 0, 0, 0, &a); - return a.val; - } - } - } - - std::ostream &ArgParseOptImpl::MakeArgString(std::ostream &os) const { - switch (action) { - case ARGACTION_STORE: - case ARGACTION_APPEND: - if (opt.Contains("enum") && opt["enum"].IsList()) { - for (Variant::ConstListIterator i(opt["enum"].ListBegin()), - e(opt["enum"].ListEnd()); i != e; ++i) - { - os << i->AsString(); - if (i + 1 != e) { - os << " | "; - } - } - } else { - switch (type) { - case Variant::BoolType: os << "yes|no"; break; - case Variant::IntegerType: case Variant::UnsignedType: - case Variant::NullType: case Variant::FloatType: default: - os << opt.Get("title", "XXX").AsString(); - } - } - break; - case ARGACTION_CONFIG: - case ARGACTION_CONFIG_JSON: - case ARGACTION_CONFIG_YAML: - case ARGACTION_CONFIG_PLIST: - os << "FILE"; - break; - case ARGACTION_PRINT_CONFIG: - default: - break; - } - return os; - } - - void ArgParseOptImpl::Init(Variant o) { - if (o.Contains("type")) { - type = (Variant::Type_t)ParseType(o["type"]); - } - o.GetInto(required, "required", required); - o.GetInto(advanced, "advanced", false); - if (advanced) { impl->have_advanced = true; } - opt.Merge(o); - } - - void ArgParseOptImpl::FinalizeResult() { - if (opt.Contains("default") && result.IsNull()) { - bool add_default = true; - for (std::set::iterator i(groups.begin()), e(groups.end()); - i != e; ++i) - { - ArgParseGroupImpl *g = impl->GetGroup(*i); - if (g->mutually_exclusive) { - for (std::set::iterator o(g->members.begin()), - oend(g->members.end()); o != oend; ++o) - { - ArgParseOptImpl *opt = *o; - if (!opt->result.IsNull()) { - add_default = false; - } - } - } - } - if (add_default) { - switch (action) { - case ARGACTION_STORE: - case ARGACTION_STORE_CONST: - case ARGACTION_STORE_TRUE: - case ARGACTION_STORE_FALSE: - result = opt["default"]; - break; - case ARGACTION_APPEND: - result.Append(opt["default"]); - case ARGACTION_COUNT: - case ARGACTION_HELP: - case ARGACTION_ADVHELP: - case ARGACTION_CONFIG: - case ARGACTION_CONFIG_JSON: - case ARGACTION_CONFIG_YAML: - case ARGACTION_CONFIG_PLIST: - case ARGACTION_PRINT_CONFIG: - default: - break; - } - } - } - if (!result.IsNull()) { - if (action == ARGACTION_APPEND) { - if (opt.Contains("maxArgs") && opt["maxArgs"] != 0) { - if (opt["maxArgs"] < result.Size()) { - std::ostringstream oss; - oss << "Error parsing arguments\n"; - oss << "More than maximum arguments specified for " << OptName(this) << ", "; - oss << result.Size() << " options, maximum: " << opt["maxArgs"].AsUnsigned(); - throw std::runtime_error(oss.str()); - } - } - if (opt.Contains("minArgs")) { - if (opt["minArgs"] > result.Size()) { - std::ostringstream oss; - oss << "Error parsing arguments\n"; - oss << "Less than minimum arguments specified for " << OptName(this) << ", "; - oss << result.Size() << " options, minimum: " << opt["minArgs"].AsUnsigned(); - throw std::runtime_error(oss.str()); - } - } - } - } else if (required) { - std::ostringstream oss; - oss << "Error parsing arguments\n"; - oss << "Required " << OptName(this) << " missing."; - throw std::runtime_error(oss.str()); - } - } - - void ArgParseOptImpl::FormResult(VariantRef res) { - if (!HasResult()) { return; } - if (result.IsNull()) { return; } - res.SetPath(path, result); - } - - void ArgParseOptImpl::HelpLine(std::ostream &os, bool is_arg, bool adv, unsigned indent) const { - if ( !(!advanced || adv) ) { return; } - os << "\t"; - if (shortOpt > 0) { - os << "-" << (char)shortOpt; - } - if (shortOpt > 0 && !longOpt.empty()) { - os << ", "; - } - if (!longOpt.empty()) { - os << "--" << longOpt; - } - if (HasArg()) { - os << " " << ArgString(*this); - } - if (opt.Contains("env")) { - if (shortOpt > 0 || !longOpt.empty()) { - os << "\n\t"; - } - os << "env: $" << opt["env"].AsString(); - if (HasArg()) { - os << "=" << ArgString(*this); - } - } - os << "\n\t\t" << opt["description"].AsString(); - - if (opt.Contains("default")) { - Variant def = opt["default"]; - if (!def.IsMap() && !def.IsList()) { - os << " (default: "; - SerializeJSON(os.rdbuf(), def); - os << ")"; - } - } - os << "\n"; - } - - Variant ArgParseOptImpl::GetDescription() const { - Variant desc; - desc.Merge(opt); - if (type == Variant::NullType) { - desc.Set("type", type); - } else { - desc.Set("type", TypeString(type)); - } - if (shortOpt > 0) { - desc.Set("shortOption", std::string(1, (char)shortOpt)); - } else { - desc.Erase("shortOption"); - } - if (!longOpt.empty()) { - desc.Set("longOption", longOpt); - } else { - desc.Erase("longOption"); - } - desc.Set("action", ArgParseActionToStr(action)); - desc.Set("required", required); - desc.Set("keypath", PathString(path)); - desc.Set("advanced", advanced); - return desc; - } - - void ArgParseOptImpl::GenerateSchema(VariantRef schema) const { - GenerateSchema(schema, path.begin(), path.end()); - } - - void ArgParseOptImpl::GenerateSchema(VariantRef schema, Path::const_iterator i, - Path::const_iterator e) const { - if (i == e) { - schema = GenerateSchema(); - } else { - if (schema.Get("type", "") == "object") { - GenerateObjectSchema(schema, i, e); - } else if (schema.Get("type", "") == "array") { - GenerateArraySchema(schema, i, e); - } else if (i->IsString()) { - GenerateObjectSchema(schema, i, e); - } else if (i->IsNumber()) { - GenerateArraySchema(schema, i, e); - } - } - } - - void ArgParseOptImpl::GenerateObjectSchema(VariantRef schema, Path::const_iterator i, - Path::const_iterator e) const - { - if (schema.IsNull()) { schema = Variant::MapType; } - std::string key = i->AsString(); - if (!schema.Contains("type")) { schema["type"] = "object"; } - if (!schema.Contains("properties")) { schema["properties"] = Variant::MapType; } - if (required) { - if (!schema.Contains("required")) { schema["required"] = Variant::ListType; } - if (std::find(schema["required"].ListBegin(), schema["required"].ListEnd(), Variant(key)) - == schema["required"].ListEnd()) - { - schema["required"].Append(key); - } - } - GenerateSchema(schema["properties"].At(key, Variant::MapType), i+1, e); - } - - void ArgParseOptImpl::GenerateArraySchema(VariantRef schema, Path::const_iterator i, - Path::const_iterator e) const - { - unsigned index = i->AsUnsigned(); - if (!schema.Contains("type")) { schema["type"] = "array"; } - if (!schema.Contains("items")) { schema["items"] = Variant::ListType; } - GenerateSchema(schema["items"].At(index, Variant::MapType), i+1, e); - } - - Variant ArgParseOptImpl::GenerateSchema() const { - Variant s = Variant::MapType; - if (opt.Contains("title")) { s["title"] = opt["title"]; } - if (opt.Contains("description")) { s["description"] = opt["description"]; } - switch (action) { - case ARGACTION_STORE: - if (type != Variant::NullType) { s["type"] = TypeString(type); } - if (opt.Contains("minimum")) { s["minimum"] = opt["minimum"]; } - if (opt.Contains("maximum")) { s["maximum"] = opt["maximum"]; } - if (opt.Contains("minLength")) { s["minLength"] = opt["minLength"]; } - if (opt.Contains("maxLength")) { s["maxLength"] = opt["maxLength"]; } - if (opt.Contains("pattern")) { s["pattern"] = opt["pattern"]; } - if (opt.Contains("enum")) { s["enum"] = opt["enum"].Copy(); } - if (opt.Contains("default")) { s["default"] = opt["default"]; } - break; - case ARGACTION_STORE_CONST: - s["enum"].Append(opt.Get("const")); - break; - case ARGACTION_STORE_TRUE: - case ARGACTION_STORE_FALSE: - s["type"] = "boolean"; - if (opt.Contains("default")) { s["default"] = opt["default"]; } - break; - case ARGACTION_APPEND: - { - Variant itemschema = Variant::MapType; - if (type != Variant::NullType) { itemschema["type"] = TypeString(type); } - if (opt.Contains("minimum")) { itemschema["minimum"] = opt["minimum"]; } - if (opt.Contains("maximum")) { itemschema["maximum"] = opt["maximum"]; } - if (opt.Contains("minLength")) { itemschema["minLength"] = opt["minLength"]; } - if (opt.Contains("maxLength")) { itemschema["maxLength"] = opt["maxLength"]; } - if (opt.Contains("pattern")) { itemschema["pattern"] = opt["pattern"]; } - if (opt.Contains("enum")) { itemschema["enum"] = opt["enum"].Copy(); } - if (opt.Contains("default")) { - s["default"] = Variant::ListType; - s["default"].Append(opt["default"]); - } - s["items"] = itemschema; - } - if (opt.Contains("minArgs") && opt["minArgs"] > 0) { s["minItems"] = opt["minArgs"]; } - if (opt.Contains("maxArgs") && opt["maxArgs"] > 0) { s["maxItems"] = opt["maxArgs"]; } - break; - case ARGACTION_COUNT: - s["type"] = "integer"; - s["minimum"] = 0; - break; - case ARGACTION_HELP: - case ARGACTION_ADVHELP: - case ARGACTION_CONFIG: - case ARGACTION_CONFIG_JSON: - case ARGACTION_CONFIG_YAML: - case ARGACTION_CONFIG_PLIST: - case ARGACTION_UNKNOWN: - default: - break; - } - return s; - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/Base64.cc b/src/hos_libvariant/src/libvariant/src/Base64.cc deleted file mode 100644 index edf834fb..00000000 --- a/src/hos_libvariant/src/libvariant/src/Base64.cc +++ /dev/null @@ -1,160 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/src/Base64.h" - -namespace libvariant { - - unsigned Base64Encode(char *outptr, const void *inptr, unsigned len, unsigned cpl) { - struct iovec iov = { (void*)inptr, len }; - return Base64Encode(outptr, &iov, 1, cpl); - } - - class iov_iterator { - public: - iov_iterator() : iov(0), len(0), slab(0), offset(0) {} - iov_iterator(const iov_iterator &o) : iov(o.iov), len(o.len), slab(o.slab), offset(o.offset) {} - iov_iterator(const struct iovec *v, unsigned l) : iov(v), len(l), slab(0), offset(0) {} - iov_iterator &operator++() { - ++offset; - if (offset >= iov[slab].iov_len) { - ++slab; - offset = 0; - } - return *this; - } - iov_iterator operator++(int) { - iov_iterator o = *this; - ++(*this); - return o; - } - - char operator *() { - return *((char*)(iov[slab].iov_base) + offset); - } - - bool operator==(const iov_iterator &o) { - return (slab == o.slab && offset == o.offset); - } - - bool is_end() { return slab >= len; } - iov_iterator end() { - iov_iterator o = *this; - while (!o.is_end()) { ++o; } - return o; - } - - private: - const struct iovec *iov; - unsigned len; - unsigned slab; - unsigned offset; - }; - - unsigned Base64Encode(char *outptr, const struct iovec *iov, unsigned iov_len, unsigned cpl) { - static const char encoding[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - iov_iterator i = iov_iterator(iov, iov_len); - iov_iterator e = i.end(); - unsigned step_count = 0; - char *o = outptr; -#define PUSH_VALUE()\ - do {\ - if (result > 63) { *o++ = '='; }\ - else { *o++ = encoding[(int)result]; }\ - } while (0) - - char result; - char fragment; - while (true) { - // Step A - if (i == e) { break; } - fragment = *i++; - result = (fragment & 0x0FC) >> 2; - PUSH_VALUE(); - result = (fragment & 0x003) << 4; - // Step B - if (i == e) { - PUSH_VALUE(); - *o++ = '='; - *o++ = '='; - break; - } - fragment = *i++; - result |= (fragment & 0x0f0) >> 4; - PUSH_VALUE(); - result = (fragment & 0x00f) << 2; - // Step C - if (i == e) { - PUSH_VALUE(); - *o++ = '='; - break; - } - fragment = *i++; - result |= (fragment & 0x0c0) >> 6; - PUSH_VALUE(); - result = (fragment & 0x03f) >> 0; - PUSH_VALUE(); - ++step_count; - if (cpl > 0 && step_count == cpl/4) { - *o++ = '\n'; - step_count = 0; - } - } -#undef PUSH_VALUE - if (cpl > 0) { *o++ = '\n'; } - *o = '\0'; - return o - outptr; - } - - unsigned Base64EncodeSize(unsigned len, unsigned cpl) { - // Every 3 bytes turns into 4 bytes - unsigned res = (len*4)/3+4; - // There are 2 extra bytes every CPL output bytes plus 2 extras at the end - if (cpl > 0) { res += 2*(res/cpl + 1); } - else { res+= 1; } - return res; - } - - unsigned Base64Decode(void *outptr, const char *inptr, unsigned len) { - static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; - static const signed char decoding_size = sizeof(decoding); - const signed char *i = (const signed char*)inptr; - const signed char *e = i + len; - signed char *o = (signed char*)outptr; - signed char fragment; - signed char result; -#define DECODE_VALUE()\ - do {\ - if (i == e) { return o - (signed char*)outptr; }\ - signed char val = *i++ - 43;\ - if (val < 0 || val > decoding_size) { fragment = -1; }\ - else { fragment = decoding[(int)val]; }\ - } while (fragment < 0) - - while (true) { - // Step A - DECODE_VALUE(); - result = (fragment & 0x03f) << 2; - // Step B - DECODE_VALUE(); - result |= (fragment & 0x030) >> 4; - *o++ = result; - result = (fragment & 0x00f) << 4; - // Step C - DECODE_VALUE(); - result |= (fragment & 0x03c) >> 2; - *o++ = result; - result = (fragment & 0x003) << 6; - // Step D - DECODE_VALUE(); - result |= (fragment & 0x03f); - *o++ = result; - } -#undef DECODE_VALUE - } - - unsigned Base64DecodeSize(unsigned len) { - return (len*3)/4 + 1; - } -} diff --git a/src/hos_libvariant/src/libvariant/src/Base64.h b/src/hos_libvariant/src/libvariant/src/Base64.h deleted file mode 100644 index b340483a..00000000 --- a/src/hos_libvariant/src/libvariant/src/Base64.h +++ /dev/null @@ -1,24 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_BASE64_H -#define VARIANT_BASE64_H -#pragma once -#include -namespace libvariant { - /// Encode the binary blob of len pointed to by inptr - //into a base64 string encoding in the buffer pointed to by - //outptr. The buffer for outptr should be at least Base64EncodeSize(len) - //in length, returns the actual length of the output - unsigned Base64Encode(char *outptr, const void *inptr, unsigned len, unsigned cpl = 72); - unsigned Base64Encode(char *outptr, const struct iovec *iov, unsigned iov_len, unsigned cpl = 72); - unsigned Base64EncodeSize(unsigned len, unsigned cpl=72); - /// Decode a base64 encoded string of length len to a binary blob - //The blob will be no larger than Base64DecodeSize(len) - //returns the actual size of the blob - unsigned Base64Decode(void *outptr, const char *inptr, unsigned len); - unsigned Base64DecodeSize(unsigned len); -} -#endif - diff --git a/src/hos_libvariant/src/libvariant/src/Blob.cc b/src/hos_libvariant/src/libvariant/src/Blob.cc deleted file mode 100644 index 6052d133..00000000 --- a/src/hos_libvariant/src/libvariant/src/Blob.cc +++ /dev/null @@ -1,123 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/include/Variant/Blob.h" - -#include -#include -#include -#include - -namespace libvariant { - - static void MallocFree(void *ptr, void *) { - free(ptr); - } - - shared_ptr Blob::Create(void *ptr, unsigned len, BlobFreeFunc ffunc, void *context) - { - struct iovec iov = { ptr, len }; - return shared_ptr(new Blob(&iov, 1, ffunc, context)); - } - - BlobPtr Blob::Create(struct iovec *iov, unsigned iov_len, BlobFreeFunc ffunc, void *context) { - return BlobPtr(new Blob(iov, iov_len, ffunc, context)); - } - - shared_ptr Blob::CreateCopy(const void *ptr, unsigned len) { - struct iovec iov = { (void*)ptr, len }; - return CreateCopy(&iov, 1); - } - - BlobPtr Blob::CreateCopy(const struct iovec *iov, unsigned iov_len) { - unsigned len = 0; - for (unsigned i = 0; i < iov_len; ++i) { len += iov[i].iov_len; } - void *data = 0; -#ifdef __APPLE__ - // TODO: Remove when apple fixes this error. - if (posix_memalign(&data, 64, std::max(len, 1u)) != 0) { - throw std::bad_alloc(); - } -#else - if (posix_memalign(&data, 64, len) != 0) { - throw std::bad_alloc(); - } -#endif - for (unsigned i = 0, copied = 0; i < iov_len; ++i) { - memcpy((char*)data + copied, iov[i].iov_base, iov[i].iov_len); - copied += iov[i].iov_len; - } - struct iovec v = { data, len }; - return shared_ptr(new Blob(&v, 1, MallocFree, 0)); - } - - shared_ptr Blob::CreateFree(void *ptr, unsigned len) { - struct iovec iov = { ptr, len }; - return CreateFree(&iov, 1); - } - - BlobPtr Blob::CreateFree(struct iovec *iov, unsigned iov_len) { - return shared_ptr(new Blob(iov, iov_len, MallocFree, 0)); - } - - shared_ptr Blob::CreateReferenced(void *ptr, unsigned len) { - struct iovec iov = { ptr, len }; - return CreateReferenced(&iov, 1); - } - - BlobPtr Blob::CreateReferenced(struct iovec *iov, unsigned iov_len) { - return shared_ptr(new Blob(iov, iov_len, 0, 0)); - } - - Blob::Blob(struct iovec *v, unsigned l, BlobFreeFunc f, void *c) - : iov(v, v+l), free_func(f), ctx(c) - { - } - - Blob::~Blob() { - if (free_func) { - for (unsigned i = 0; i < iov.size(); ++i) { - free_func(iov[i].iov_base, ctx); - } - } - iov.clear(); - free_func = 0; - ctx = 0; - } - - shared_ptr Blob::Copy() const { - return CreateCopy(&iov[0], iov.size()); - } - - unsigned Blob::GetTotalLength() const { - unsigned size = 0; - for (unsigned i = 0; i < iov.size(); ++i) { - size += iov[i].iov_len; - } - return size; - } - - int Blob::Compare(ConstBlobPtr other) const { - unsigned our_offset = 0; - unsigned oth_offset = 0; - unsigned i = 0, j = 0; - while (i < GetNumBuffers() && j < other->GetNumBuffers()) { - unsigned len = std::min(GetLength(i) - our_offset, other->GetLength(j) - oth_offset); - int res = memcmp((char*)(GetPtr(i)) + our_offset, (char*)(other->GetPtr(j)) + oth_offset, len); - if (res != 0) { return res; } - our_offset += len; - if (our_offset >= GetLength(i)) { - our_offset = 0; - ++i; - } - oth_offset += len; - if (oth_offset >= other->GetLength(j)) { - oth_offset = 0; - ++j; - } - } - return 0; - } -} - diff --git a/src/hos_libvariant/src/libvariant/src/BlobMagic.h b/src/hos_libvariant/src/libvariant/src/BlobMagic.h deleted file mode 100644 index 31ff9935..00000000 --- a/src/hos_libvariant/src/libvariant/src/BlobMagic.h +++ /dev/null @@ -1,20 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_BLOBMAGIC_H -#define VARIANT_BLOBMAGIC_H -#pragma once - -// We implement blobs by prepending the encoding with a special value -// of \0BLOB to identify it for those serialization formats that do not -// provide a method to distinguish strings and binary data. - -// Raw encoding -#define MAGIC_BLOB_TAG "\0BLOB" -// Length of raw encoding -#define MAGIC_BLOB_LENGTH 5 -// The string encoding for json -#define MAGIC_BLOB_JSONSTR "\\u0000BLOB" - -#endif diff --git a/src/hos_libvariant/src/libvariant/src/BundleHdrEmitter.cc b/src/hos_libvariant/src/libvariant/src/BundleHdrEmitter.cc deleted file mode 100644 index 44f477e1..00000000 --- a/src/hos_libvariant/src/libvariant/src/BundleHdrEmitter.cc +++ /dev/null @@ -1,126 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/src/BundleHdrEmitter.h" - -#include -#include -#include -#include - -#define BUNDLE_VERSION_KEY "bundle.version" -#define BUNDLE_VERSION "0.0" - -namespace libvariant { - - BundleHdrEmitterImpl::BundleHdrEmitterImpl(shared_ptr o, Variant params) - : output(o), - state(BHE_START), - numeric_precision(std::numeric_limits::digits10+2) - { - } - - - BundleHdrEmitterImpl::~BundleHdrEmitterImpl() { - Close(); - } - - - void BundleHdrEmitterImpl::BeginDocument() { - if (state != BHE_START) { - throw std::runtime_error("BundleHdrEmitter in invalid state for BeginDocument"); - } - Write(BUNDLE_VERSION_KEY ": " BUNDLE_VERSION "\n"); - state = BHE_BEGIN; - } - - void BundleHdrEmitterImpl::EndDocument() { - if (state == BHE_STOP) { - throw std::runtime_error("BundleHdrEmitter in invalid state for EndDocument"); - } - state = BHE_STOP; - Flush(); - } - - void BundleHdrEmitterImpl::BeginMap(int) { - if (state == BHE_START) { - BeginDocument(); - } - if (state != BHE_BEGIN) { - throw std::runtime_error("BundleHdrEmitter in invalid state for BeginDocument"); - } - state = BHE_KEY; - } - - void BundleHdrEmitterImpl::EndMap() { - if (state != BHE_KEY) { - throw std::runtime_error("BundleHdrEmitter in invalid state for EndMap"); - } - state = BHE_END; - } - - void BundleHdrEmitterImpl::BeginList(int) { - if (state != BHE_VALUE) { - throw std::runtime_error("BundleHdrEmitter in invalid state for BeginList"); - } - state = BHE_LIST_START; - } - - void BundleHdrEmitterImpl::EndList() { - if (state != BHE_LIST && state != BHE_LIST_START) { - throw std::runtime_error("BundleHdrEmitter in invalid state for EndList"); - } - Write("|\n"); - state = BHE_KEY; - } - - - void BundleHdrEmitterImpl::EmitNull() { - Value("", 0); - } - - void BundleHdrEmitterImpl::EmitTrue() { - Value("1", 1); - } - - void BundleHdrEmitterImpl::EmitFalse() { - Value("0", 1); - } - - void BundleHdrEmitterImpl::Emit(const char *v) { - Value(v, strlen(v)); - } - - void BundleHdrEmitterImpl::Emit(intmax_t v) { - std::ostringstream oss; - oss << v; - Value(oss.str().c_str(), oss.str().length()); - } - - void BundleHdrEmitterImpl::Emit(uintmax_t v) { - std::ostringstream oss; - oss << v; - Value(oss.str().c_str(), oss.str().length()); - } - - void BundleHdrEmitterImpl::Emit(double v) { - std::ostringstream oss; - oss << std::setprecision(numeric_precision) << std::showpoint << v; - Value(oss.str().c_str(), oss.str().length()); - } - - void BundleHdrEmitterImpl::Emit(ConstBlobPtr b) { - throw std::runtime_error("BundleHdr is not able to serialize the blob type"); - } - - void BundleHdrEmitterImpl::Flush() { output->Flush(); } - - void BundleHdrEmitterImpl::Close() { - if (state != BHE_STOP) { - EndDocument(); - } - Flush(); - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/BundleHdrEmitter.h b/src/hos_libvariant/src/libvariant/src/BundleHdrEmitter.h deleted file mode 100644 index 10d45195..00000000 --- a/src/hos_libvariant/src/libvariant/src/BundleHdrEmitter.h +++ /dev/null @@ -1,110 +0,0 @@ -/** \file - * \author John Bridgman - * \brief A simple emitter that will emit a Bundle header - */ -#ifndef VARIANT_BUNDLEHDREMITTER_H -#define VARIANT_BUNDLEHDREMITTER_H - -#pragma once -#include "../../libvariant/include/Variant/Emitter.h" -#include "../../libvariant/include/Variant/EmitterOutput.h" -#include - -namespace libvariant { - - /** - * This emitter is designed so that its output gives predictable - * results for the original bundle parser. This means that the parser - * in this library will not produce identical results. I.e., - * boolian values will be converted to 0, 1. - * - * Parameters: - * "precision": number of digits for a float - */ - class BundleHdrEmitterImpl : public EmitterImpl { - enum BHEState_t { - BHE_START, - BHE_BEGIN, - BHE_KEY, - BHE_VALUE, - BHE_LIST_START, - BHE_LIST, - BHE_END, - BHE_STOP - }; - public: - BundleHdrEmitterImpl(shared_ptr o, Variant params); - - virtual ~BundleHdrEmitterImpl(); - - virtual void BeginDocument(); - virtual void EndDocument(); - virtual void BeginMap(int length); - virtual void EndMap(); - virtual void BeginList(int length); - virtual void EndList(); - - virtual void EmitNull(); - virtual void EmitTrue(); - virtual void EmitFalse(); - virtual void Emit(const char *v); - virtual void Emit(intmax_t v); - virtual void Emit(uintmax_t v); - virtual void Emit(double v); - virtual void Emit(ConstBlobPtr b); - - virtual void Flush(); - virtual void Close(); - - virtual Variant GetParam(const std::string &key) { - if (key == "precision") { return numeric_precision; } - return Variant::NullType; - } - virtual Variant GetParams() { return Variant().Set("precision", numeric_precision); } - virtual void SetParam(const std::string &key, Variant value) { - if (key == "precision") { numeric_precision = value.AsUnsigned(); } - } - private: - - void Value(const char *v, unsigned len) { - switch (state) { - case BHE_KEY: - Write(v, len); - Write(": "); - state = BHE_VALUE; - break; - case BHE_VALUE: - Write(v, len); - Write("\n"); - state = BHE_KEY; - break; - case BHE_LIST_START: - Write(v, len); - state = BHE_LIST; - break; - case BHE_LIST: - Write("|"); - Write(v, len); - break; - default: - throw std::runtime_error("BundleHdrEmitter in invalid state to emit a scalar value."); - } - } - - void Write(const char *str) { - Write(str, strlen(str)); - } - - void Write(const char *str, unsigned len) { - unsigned num_written = 0; - while (num_written < len) { - num_written += output->Write(str + num_written, len - num_written); - } - } - - shared_ptr output; - BHEState_t state; - unsigned numeric_precision; - }; -} -#endif diff --git a/src/hos_libvariant/src/libvariant/src/BundleHdrParser.cc b/src/hos_libvariant/src/libvariant/src/BundleHdrParser.cc deleted file mode 100644 index cff8144a..00000000 --- a/src/hos_libvariant/src/libvariant/src/BundleHdrParser.cc +++ /dev/null @@ -1,219 +0,0 @@ -/** \file - * \author John Bridgman - * \brief A parser for the Bundle header. - */ -#include "../../libvariant/src/BundleHdrParser.h" - -#include -#include -#include -#include - -#include "../../libvariant/include/Variant/ParserInput.h" -#include "../../libvariant/src/GuessScalar.h" - -#define BUNDLE_VERSION_KEY "bundle.version" - -namespace libvariant { - - void BundleHdrParserImpl::ReadLine() { - line_len = 0; - unsigned len = 0; - while (true) { - line = (const char *)input->GetPtr(len); - if (!line || line_len == len) { - line = 0; - return; - } - for (;line_len < len; ++line_len) { - if (line[line_len] == '\n') { - return; - } - } - len += 4096; - } - } - - void BundleHdrParserImpl::RetireLine() { - input->Release(line_len + 1); - line = 0; - line_len = 0; - } - - bool BundleHdrParserImpl::ScanLine() { - // Fill key and value - //if (sscanf(line, " %[^: \t#] : %[^#]", &key[0], &value[0]) >= 1) { - if (line_len == 0) { return false; } - bool loop = true; - const char *c = line; - const char *e = line + line_len; - key.clear(); - value.clear(); - while (isspace(*c) && c != e) { ++c; } - loop = true; - while (loop && c != e) { - switch (*c) { - case ':': - case ' ': - case '\t': - loop = false; - break; - case '#': - return false; - default: - key.push_back(*c); - ++c; - break; - } - } - key.push_back('\0'); - while (isspace(*c) && c != e) { ++c; } - if (*c != ':') { - return false; - } - ++c; - while (isspace(*c) && c != e) { ++c; } - while (c != e && *c != '#') { - value.push_back(*c); - ++c; - } - value.push_back('\0'); - return true; - } - - int BundleHdrParserImpl::Run() { - while (!action_stack.empty()) { - switch (state) { - case START: - { - unsigned len = 0; - const char *ptr = (const char*)input->GetPtr(len); - if (len == 0 || !ptr) { - state = STOP; - return 1; - } - state = BEGIN_MAP; - TopAction()->BeginDocument(this); - } - break; - case BEGIN_MAP: - state = KEY; - TopAction()->BeginMap(this, -1, 0, 0); - break; - case KEY: - while (true) { - ReadLine(); - if (!line) { - state = END_MAP; - break; - } - ++line_num; - bool success = ScanLine(); - RetireLine(); - if (success) { - // If it is the version key, ignore this line - if (strcmp(&key[0], BUNDLE_VERSION_KEY) == 0) { - continue; - } - // Remove whitespace from end of value - char *e = strchr(&value[0], '\0'); - while (--e >= &value[0] && isspace(*e)) { *e = '\0'; } - state = VALUE; - TopAction()->Scalar(this, &key[0], strlen(&key[0]), 0, 0); - key.clear(); - break; - } - } - break; - case VALUE: - { - char *list_context = 0; - int i = 0; - bool bar_at_end = (value.size() > 1 && value[value.size()-2] == '|'); - while (true) { - char *v = strtok_r((i == 0 ? &value[0] : 0), "|", &list_context); - if (!v) { - if (i <= 1 && !bar_at_end) { - state = KEY; - list.clear(); - GuessScalar(&value[0], strlen(&value[0]), 0, 0, this, TopAction()); - break; - } else { - state = LIST; - value.clear(); - TopAction()->BeginList(this, -1, 0, 0); - break; - } - } - list.push_back(v); - ++i; - } - } - break; - case LIST: - if (!list.empty()) { - char *v = list.front(); - list.pop_front(); - GuessScalar(v, strlen(v), 0, 0, this, TopAction()); - } else { - state = KEY; - TopAction()->EndList(this); - } - break; - case END_MAP: - state = END; - TopAction()->EndMap(this); - break; - case END: - state = STOP; - TopAction()->EndDocument(this); - break; - case STOP: - return 1; - default: - errorstr = "BundleHdrParser: Inconsistent state"; - throw std::runtime_error(errorstr); - } - } - return 0; - } - - void BundleHdrParserImpl::Reset() { - state = START; - line = 0; - line_len = 0; - key.clear(); - value.clear(); - list.clear(); - line_num = 0; - } - - BundleHdrParserImpl::BundleHdrParserImpl(shared_ptr i) - : input(i), - state(START), - line(0), - line_len(0), - line_num(0) - {} - - BundleHdrParserImpl::~BundleHdrParserImpl() {} - - unsigned BundleHdrParserImpl::GetLine() const { return line_num; } - - bool BundleHdrParserImpl::Done() const { - return state == STOP; - } - - bool BundleHdrParserImpl::Error() const { - return state > STOP; - } - - bool BundleHdrParserImpl::Ok() const { - return state != STOP; - } - - std::string BundleHdrParserImpl::ErrorStr() const { - return errorstr; - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/BundleHdrParser.h b/src/hos_libvariant/src/libvariant/src/BundleHdrParser.h deleted file mode 100644 index afae6eef..00000000 --- a/src/hos_libvariant/src/libvariant/src/BundleHdrParser.h +++ /dev/null @@ -1,66 +0,0 @@ -/** \file - * \author John Bridgman - * \brief A parser for the Bundle header. - */ -#ifndef VARIANT_BUNDLEHDRPARSER_H -#define VARIANT_BUNDLEHDRPARSER_H - -#pragma once -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/include/Variant/SharedPtr.h" -#include -namespace libvariant { - - /** - * A simple parser for the Bundle header. - * - * Maintanance programmer note: BundleParserImpl - * relies on a lot of the implementation details of this class. - */ - class BundleHdrParserImpl : public ParserImpl { - protected: - enum State_t { - START, - BEGIN_MAP, - KEY, - VALUE, - LIST, - END_MAP, - END, - STOP - }; - - public: - BundleHdrParserImpl(shared_ptr i); - virtual ~BundleHdrParserImpl(); - - virtual int Run(); - - unsigned GetLine() const; - /** - * Resets the parser to the state it was in when just constructed. - */ - virtual void Reset(); - - virtual bool Done() const; - virtual bool Error() const; - virtual bool Ok() const; - virtual std::string ErrorStr() const; - protected: - void ReadLine(); - void RetireLine(); - bool ScanLine(); - - shared_ptr input; - State_t state; - const char *line; - unsigned line_len; - std::vector key; - std::vector value; - std::deque list; - unsigned line_num; - std::string errorstr; - }; - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/src/CMakeLists.txt b/src/hos_libvariant/src/libvariant/src/CMakeLists.txt deleted file mode 100644 index f1ffaff9..00000000 --- a/src/hos_libvariant/src/libvariant/src/CMakeLists.txt +++ /dev/null @@ -1,60 +0,0 @@ - -set(sources - Variant.cc - VariantEmitting.cc - VariantParsing.cc - Exceptions.cc - Extensions.cc - Blob.cc - Base64.cc - ParseBool.cc - Path.cc - Emitter.cc - EmitterOutput.cc - JSONEmitter.cc - Parser.cc - ParserInput.cc - JSONParser.cc - ../lib/json/JSON_parser.c - GuessScalar.cc - BundleHdrParser.cc - BundleHdrEmitter.cc - GuessFormat.cc - Payload.cc - ArgParse.cc - argparse-schema.cc - Schema.cc - SchemaLoader.cc - json-schema-v4.cc - StackTrace.cc - EventBuffer.cc - ) - -if(LIBVARIANT_ENABLE_XML) - list(APPEND sources XMLPLISTEmitter.cc XMLPLISTParser.cc) -endif() - -if(LIBVARIANT_ENABLE_YAML) - list(APPEND sources YAMLEmitter.cc YAMLParser.cc) -endif() - -if(LIBVARIANT_ENABLE_MSGPACK) - list(APPEND sources MsgPackEmitter.cc MsgPackParser.cc) -endif() - -include_directories("../lib/json/") - -add_library(Variant ${sources}) -set_target_properties(Variant PROPERTIES VERSION ${LIBVARIANT_VERSION}) -target_link_libraries(Variant ${EXTRA_LIBS}) - -add_executable(varsh varsh.cc) -target_link_libraries(varsh Variant) - -install(TARGETS Variant varsh - EXPORT LibVariantLibraryDepends - RUNTIME DESTINATION ${INSTALL_BIN_DIR} - LIBRARY DESTINATION ${INSTALL_LIB_DIR} - ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) - - diff --git a/src/hos_libvariant/src/libvariant/src/Emitter.cc b/src/hos_libvariant/src/libvariant/src/Emitter.cc deleted file mode 100644 index 8026faed..00000000 --- a/src/hos_libvariant/src/libvariant/src/Emitter.cc +++ /dev/null @@ -1,219 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/include/Variant/Emitter.h" - -#include "../../libvariant/src/JSONEmitter.h" -#ifdef ENABLE_YAML -#include "../../libvariant/src/YAMLEmitter.h" -#endif -#ifdef ENABLE_XML -#include "../../libvariant/src/XMLPLISTEmitter.h" -#endif -#ifdef ENABLE_MSGPACK -#include "../../libvariant/src/MsgPackEmitter.h" -#endif -#include "../../libvariant/src/BundleHdrEmitter.h" -#include "../../libvariant/include/Variant/EmitterOutput.h" - -namespace libvariant { - EmitterImpl::~EmitterImpl() {} - - void EmitterImpl::SetParams(Variant params) { - if (params.IsMap()) { - for (Variant::MapIterator i(params.MapBegin()), e(params.MapEnd()); i != e; ++i) { - SetParam(i->first, i->second); - } - } - } - - Emitter::Emitter() {} - - Emitter::Emitter(shared_ptr i) - : impl(i) - {} - - Emitter::~Emitter() {} - - Emitter &Emitter::BeginDocument() { - impl->BeginDocument(); - return *this; - } - - Emitter &Emitter::EndDocument() { - impl->EndDocument(); - return *this; - } - - Emitter &Emitter::BeginMap(int length) { - impl->BeginMap(length); - return *this; - } - - Emitter &Emitter::EndMap() { - impl->EndMap(); - return *this; - } - - Emitter &Emitter::BeginList(int length) { - impl->BeginList(length); - return *this; - } - - Emitter &Emitter::EndList() { - impl->EndList(); - return *this; - } - - Emitter &Emitter::EmitNull() { - impl->EmitNull(); - return *this; - } - - Emitter &Emitter::EmitTrue() { - impl->EmitTrue(); - return *this; - } - - Emitter &Emitter::EmitFalse() { - impl->EmitFalse(); - return *this; - } - - Emitter &Emitter::Emit(const std::string &v) { - impl->Emit(v.c_str()); - return *this; - } - - Emitter &Emitter::Emit(const char *v) { - impl->Emit(v); - return *this; - } - - Emitter &Emitter::Emit(intmax_t v) { - impl->Emit(v); - return *this; - } - - Emitter &Emitter::Emit(uintmax_t v) { - impl->Emit(v); - return *this; - } - - Emitter &Emitter::Emit(double v) { - impl->Emit(v); - return *this; - } - - Emitter &Emitter::Emit(ConstBlobPtr b) { - impl->Emit(b); - return *this; - } - - void Emitter::Flush() { - impl->Flush(); - } - - void Emitter::Close() { - impl->Close(); - } - - Variant Emitter::GetParam(const std::string &key) { - return impl->GetParam(key); - } - - Variant Emitter::GetParams() { - return impl->GetParams(); - } - - void Emitter::SetParam(const std::string &key, Variant value) { - impl->SetParam(key, value); - } - - void Emitter::SetParams(Variant params) { - impl->SetParams(params); - } - - shared_ptr CreateEmitterOutput(void *ptr, unsigned len, unsigned *out_len) { - return shared_ptr(new EmitterMemoryOutput(ptr, len, out_len)); - } - - shared_ptr CreateEmitterOutput(const char *filename) { - return shared_ptr(new EmitterFilenameOutput(filename)); - } - - shared_ptr CreateEmitterOutput(FILE *f) { - return shared_ptr(new EmitterFileOutput(f, false)); - } - - shared_ptr CreateEmitterOutput(std::streambuf *sb) { - return shared_ptr(new EmitterStreambufOutput(sb, false)); - } - - - Emitter CreateEmitter(shared_ptr o, SerializeType type, Variant params) { - switch (type) { - case SERIALIZE_JSON: - return JSONEmitter(o, params); - case SERIALIZE_XMLPLIST: - return XMLPLISTEmitter(o, params); - case SERIALIZE_BUNDLEHDR: - return BundleHdrEmitter(o, params); - case SERIALIZE_YAML: - return YAMLEmitter(o, params); - case SERIALIZE_MSGPACK: - return MsgPackEmitter(o, params); - default: - throw std::runtime_error("libvariant: Unsupported emitter serialization type."); - } - } - - Emitter JSONEmitter(shared_ptr o, Variant params) { - return Emitter(shared_ptr(new JSONEmitterImpl(o, params))); - } - - Emitter YAMLEmitter(shared_ptr o, Variant params) { -#ifdef ENABLE_YAML - return Emitter(shared_ptr(new YAMLEmitterImpl(o, params))); -#else - throw std::runtime_error("libvariant not compiled with YAML support."); -#endif - } - - Emitter XMLPLISTEmitter(shared_ptr o, Variant params) { -#ifdef ENABLE_XML - return Emitter(shared_ptr(new XMLPLISTEmitterImpl(o, params))); -#else - throw std::runtime_error("libvariant not compiled with plist xml support."); -#endif - } - - Emitter BundleHdrEmitter(shared_ptr o, Variant params) { - return Emitter(shared_ptr(new BundleHdrEmitterImpl(o, params))); - } - - Emitter MsgPackEmitter(shared_ptr o, Variant params) { -#ifdef ENABLE_MSGPACK - return Emitter(shared_ptr(new MsgPackEmitterImpl(o, params))); -#else - throw std::runtime_error("libvariant not compiled with msgpack support."); -#endif - } -} diff --git a/src/hos_libvariant/src/libvariant/src/EmitterOutput.cc b/src/hos_libvariant/src/libvariant/src/EmitterOutput.cc deleted file mode 100644 index 422d3f2b..00000000 --- a/src/hos_libvariant/src/libvariant/src/EmitterOutput.cc +++ /dev/null @@ -1,100 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/include/Variant/EmitterOutput.h" - -#include -#include -#include -#include - -namespace libvariant { - - EmitterOutput::~EmitterOutput() {} - - EmitterFileOutput::EmitterFileOutput(FILE *f, bool c) : file(f), num_bytes(0), cls(c) {} - - EmitterFileOutput::~EmitterFileOutput() { - if (cls && file) { - fclose(file); - } - file = 0; - } - - unsigned EmitterFileOutput::Write(const void *ptr, unsigned len) { - unsigned num = fwrite(ptr, 1, len, file); - num_bytes += num; - return num; - } - - void EmitterFileOutput::Flush() { - fflush(file); - } - - EmitterFilenameOutput::EmitterFilenameOutput(const char *filename, const char *mode) - : EmitterFileOutput(fopen(filename, mode), true) - { - if (!file) { - std::ostringstream oss; - oss << "Unable to open \"" << filename << "\" with mode \"" - << mode << "\""; - throw std::runtime_error(oss.str()); - } - } - - EmitterStreambufOutput::EmitterStreambufOutput(std::streambuf *sb, bool d) - : streambuf(sb), num_bytes(0), del(d) {} - - EmitterStreambufOutput::~EmitterStreambufOutput() { - if (del && streambuf) { - delete streambuf; - } - streambuf = 0; - } - - unsigned EmitterStreambufOutput::Write(const void *ptr, unsigned len) { - unsigned num = streambuf->sputn((const char*)ptr, len); - num_bytes += num; - return num; - } - - void EmitterStreambufOutput::Flush() { - streambuf->pubsync(); - } - - EmitterMemoryOutput::EmitterMemoryOutput(void *ptr, unsigned len, unsigned *out_len) - : data_ptr(ptr), length(len), out_length(out_len) - { - if (0 == out_length) { - out_length = &out_length_dummy; - } - } - - unsigned EmitterMemoryOutput::Write(const void *ptr, unsigned len) { - if (*out_length + len > length) { - throw std::length_error("Emitter memory output buffer to small."); - } - memcpy(((char*)data_ptr + *out_length), ptr, len); - *out_length += len; - return len; - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/EventBuffer.cc b/src/hos_libvariant/src/libvariant/src/EventBuffer.cc deleted file mode 100644 index fc1d0371..00000000 --- a/src/hos_libvariant/src/libvariant/src/EventBuffer.cc +++ /dev/null @@ -1,283 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/src/EventBuffer.h" - -#include -#include -#include -#include - -namespace libvariant { - - EmitterParserActions::~EmitterParserActions() {} - - void EventBuffer::Event::Fire(ParserImpl *that, ParserActions *a) const { - switch (type) { - case BEGIN_DOCUMENT: - a->BeginDocument(that); - break; - case END_DOCUMENT: - a->EndDocument(that); - break; - case BEGIN_MAP: - a->BeginMap(that, val.len, 0, 0); - break; - case END_MAP: - a->EndMap(that); - break; - case BEGIN_LIST: - a->BeginList(that, val.len, 0, 0); - break; - case END_LIST: - a->EndList(that); - break; - case SCALAR_NULL: - a->Null(that, 0, 0); - break; - case SCALAR_BOOL: - a->Scalar(that, val.b, 0, 0); - break; - case SCALAR_STRING: - a->Scalar(that, s.c_str(), s.length(), 0, 0); - break; - case SCALAR_INT: - a->Scalar(that, val.i, 0, 0); - break; - case SCALAR_UINT: - a->Scalar(that, val.u, 0, 0); - break; - case SCALAR_FLOAT: - a->Scalar(that, val.d, 0, 0); - break; - case SCALAR_BLOB: - a->Scalar(that, blob->Copy(), 0, 0); - break; - default: - throw std::runtime_error("EventBuffer::Event::Fire Encountered an incorrect event."); - } - } - - bool EventBuffer::Event::operator==(const Event &o) const { - switch (type) { - case SCALAR_BOOL: - return val.b == o.val.b; - case SCALAR_FLOAT: - return val.d == o.val.d || (val.d != val.d && o.val.d != o.val.d); - case SCALAR_STRING: - return s == o.s; - case SCALAR_INT: - return val.i == o.val.i; - case SCALAR_UINT: - return val.u == o.val.u; - default: - if (type != o.type) { return false; } - break; - } - return true; - } - - void EventBuffer::Event::Print(std::ostream &os) const { - switch (type) { - case BEGIN_DOCUMENT: - os << "Event(BEGIN_DOCUMENT)"; - break; - case END_DOCUMENT: - os << "Event(END_DOCUMENT)"; - break; - case BEGIN_MAP: - os << "Event(BEGIN_MAP, " << val.len << ")"; - break; - case END_MAP: - os << "Event(END_MAP)"; - break; - case BEGIN_LIST: - os << "Event(BEGIN_LIST, " << val.len << ")"; - break; - case END_LIST: - os << "Event(END_LIST)"; - break; - case SCALAR_BOOL: - os << "Event(SCALAR_BOOL, " << std::boolalpha << val.b << ")"; - break; - case SCALAR_FLOAT: - os << "Event(SCALAR_FLOAT, " << val.d << ")"; - break; - case SCALAR_STRING: - os << "Event(SCALAR_STRING, " << s << ")"; - break; - case SCALAR_NULL: - os << "Event(SCALAR_NULL)"; - break; - case SCALAR_INT: - os << "Event(SCALAR_INT, " << val.i << ")"; - break; - case SCALAR_UINT: - os << "Event(SCALAR_UINT, " << val.u << ")"; - break; - case SCALAR_BLOB: - os << "Event(SCALAR_BLOB)"; - break; - default: - os << "Unknown event (" << (int)type << ")"; - break; - } - } - - EventBuffer::EventBuffer(const EventBuffer &eb) - : level(eb.level), events(eb.events) - { - - } - - EventBuffer::~EventBuffer() {} - - - void EventBuffer::FillRandom(EventType_t disallowed_events, int max_level, bool allow_nan) { - bool begin_document = false; - if (!(BEGIN_DOCUMENT & disallowed_events)) { - BeginDocument(); - begin_document = true; - } - disallowed_events = disallowed_events | BEGIN_DOCUMENT; - EventType_t next_event = RandomEventType(disallowed_events | SCALAR_EVENTS | END_EVENTS, max_level); - switch (next_event) { - case BEGIN_MAP: - MapRandomEvent(disallowed_events, max_level, allow_nan); - break; - case BEGIN_LIST: - ListRandomEvent(disallowed_events, max_level, allow_nan); - break; - default: - // should not be reachable - throw std::runtime_error("EventBuffer::FillRandom reached code that should be not reachable"); - } - - if (begin_document) { - EndDocument(); - } - } - - EventBuffer::EventType_t EventBuffer::RandomEventType(EventBuffer::EventType_t disallowed, int max_level) - { - if (level >= max_level) { - disallowed = disallowed | BEGIN_EVENTS; - } - while (true) { - int bit = rand() % 32; - int val = 1<::infinity(); - if ((type&0x4) == 0) { - val = -val; - } - } else if ((type&0x4) == 0) { - val = std::numeric_limits::quiet_NaN(); - } else { - val = std::numeric_limits::signaling_NaN(); - } - Emit(val); - } - break; - case SCALAR_BLOB: - Emit((ConstBlobPtr)GenerateRandomBlob()); - break; - default: - // should not be reachable - throw std::runtime_error("EventBuffer::BasicRandomEvent reached code that should be not reachable"); - } - } - - void EventBuffer::MapRandomEvent(EventType_t disallowed, int max_level, bool allow_nan) { - int map_len = rand()%10; - BeginMap(map_len); - for (int i = 0; i < map_len; ++i) { - std::string key = GenerateRandomString(); - Emit(key.c_str()); - BasicRandomEvent(disallowed, max_level, allow_nan); - } - EndMap(); - } - - void EventBuffer::ListRandomEvent(EventType_t disallowed, int max_level, bool allow_nan) { - int list_len = rand()%10; - BeginList(list_len); - for (int i = 0; i < list_len; ++i) { - BasicRandomEvent(disallowed, max_level, allow_nan); - } - EndList(); - } -} diff --git a/src/hos_libvariant/src/libvariant/src/EventBuffer.h b/src/hos_libvariant/src/libvariant/src/EventBuffer.h deleted file mode 100644 index 45981b97..00000000 --- a/src/hos_libvariant/src/libvariant/src/EventBuffer.h +++ /dev/null @@ -1,269 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_EVENTBUFFER_H -#define VARIANT_EVENTBUFFER_H - -#pragma once -#include "../../libvariant/include/Variant/Emitter.h" -#include "../../libvariant/include/Variant/Parser.h" -#include -#include -namespace libvariant { - - class EmitterParserActions : public ParserActions { - public: - EmitterParserActions(EmitterImpl *i) : impl(i) {} - EmitterParserActions(Emitter i) : impl_ptr(i.GetImpl()) { impl = impl_ptr.get(); } - virtual ~EmitterParserActions(); - - virtual void BeginDocument(ParserImpl *p) - { impl->BeginDocument(); } - virtual void EndDocument(ParserImpl *p) - { impl->EndDocument(); } - virtual void BeginMap(ParserImpl *p, int length, const char *anchor, const char *tag) - { impl->BeginMap(length); } - virtual void EndMap(ParserImpl *p) - { impl->EndMap(); } - virtual void BeginList(ParserImpl *p, int length, const char *anchor, const char *tag) - { impl->BeginList(length); } - virtual void EndList(ParserImpl *p) - { impl->EndList(); } - //virtual void Alias(ParserImpl *p, const char *anchor) - virtual void Scalar(ParserImpl *p, double v, const char *anchor, const char *tag) - { impl->Emit(v); } - virtual void Scalar(ParserImpl *p, const char *str, unsigned length, const char *anchor, const char *tag) - { - std::string v(str, length); - impl->Emit(v.c_str()); - } - virtual void Scalar(ParserImpl *p, bool v, const char *anchor, const char *tag) { - if (v) { impl->EmitTrue(); } - else { impl->EmitFalse(); } - } - virtual void Null(ParserImpl *p, const char *anchor, const char *tag) - { impl->EmitNull(); } - virtual void Scalar(ParserImpl *p, intmax_t v, const char *anchor, const char *tag) - { impl->Emit(v); } - virtual void Scalar(ParserImpl *p, uintmax_t v, const char *anchor, const char *tag) - { impl->Emit(v); } - virtual void Scalar(ParserImpl *p, BlobPtr b, const char *anchor, const char *tag) - { impl->Emit((ConstBlobPtr)b); } - private: - EmitterImpl *impl; - shared_ptr impl_ptr; - }; - - class EventBuffer : public EmitterImpl, public ParserImpl { - public: - enum EventType_t { - NO_EVENT = 0, - BEGIN_DOCUMENT = 1, - END_DOCUMENT = 1<<1, - BEGIN_MAP = 1<<2, - END_MAP = 1<<3, - BEGIN_LIST = 1<<4, - END_LIST = 1<<5, - SCALAR_NULL = 1<<6, - SCALAR_BOOL = 1<<7, - SCALAR_STRING = 1<<8, - SCALAR_INT = 1<<9, - SCALAR_UINT = 1<<10, - SCALAR_FLOAT = 1<<11, - SCALAR_BLOB = 1<<12, - NON_SCALARS = BEGIN_DOCUMENT | END_DOCUMENT | BEGIN_MAP | END_MAP | BEGIN_LIST | END_LIST, - BEGIN_EVENTS = BEGIN_DOCUMENT | BEGIN_MAP | BEGIN_LIST, - END_EVENTS = END_DOCUMENT | END_MAP | END_LIST, - SCALAR_EVENTS = SCALAR_NULL | SCALAR_BOOL | SCALAR_STRING | SCALAR_INT | SCALAR_UINT | - SCALAR_FLOAT | SCALAR_BLOB, - ALL_EVENTS = 0x0FFF - }; - - struct Event { - Event(EventType_t t, Event *p) : type(t), parent(p), key(true) { val.len = 0; } - - Event(Event *p, const char *str) : type(SCALAR_STRING), parent(p), s(str) {} - Event(Event *p, intmax_t v) : type(SCALAR_INT), parent(p) { val.i = v; } - Event(Event *p, uintmax_t v) : type(SCALAR_UINT), parent(p) { val.u = v; } - Event(Event *p, double v) : type(SCALAR_FLOAT), parent(p) { val.d = v; } - Event(Event *p, bool v) : type(SCALAR_BOOL), parent(p) { val.b = v; } - Event(Event *p, ConstBlobPtr b) : type(SCALAR_BLOB), parent(p), blob(b) {} - - private: - void Update() { - if (type == BEGIN_MAP) { - if (key) { - key = false; - } else { - key = true; - val.len++; - } - } else if (type == BEGIN_LIST) { - val.len++; - } - } - - Event *Parent() { - if (type == BEGIN_MAP) { return this; } - if (type == BEGIN_LIST) { return this; } - return parent; - } - public: - void Fire(ParserImpl *that, ParserActions *a) const; - bool operator==(const Event &o) const; - void Print(std::ostream &os) const; - private: - friend class EventBuffer; - EventType_t type; - Event *parent; - union { - bool b; - double d; - intmax_t i; - uintmax_t u; - uintmax_t len; - } val; - bool key; - std::string s; - libvariant::ConstBlobPtr blob; - }; - - private: - Event *Parent() { - if (events.empty()) { return 0; } - else { return events.back().Parent(); } - } - - Event *ParentUpdate() { - Event *p = Parent(); - if (p) { p->Update(); } - return p; - } - - Event *GrandParent() { - Event *p = Parent(); - if (p) { return p->parent; } - else { return 0; } - } - public: - - EventBuffer() : level(0) {} - EventBuffer(const EventBuffer &eb); - virtual ~EventBuffer(); - - virtual void BeginDocument() { - events.push_back(Event(BEGIN_DOCUMENT, Parent())); - level++; - } - - virtual void EndDocument() { - events.push_back(Event(END_DOCUMENT, GrandParent())); - level--; - } - - virtual void BeginMap(int) { - events.push_back(Event(BEGIN_MAP, ParentUpdate())); - level++; - } - - virtual void EndMap() { - events.push_back(Event(END_MAP, GrandParent())); - level--; - } - - virtual void BeginList(int) { - events.push_back(Event(BEGIN_LIST, ParentUpdate())); - level++; - } - - virtual void EndList() { - events.push_back(Event(END_LIST, GrandParent())); - level--; - } - - virtual void EmitNull() { events.push_back(Event(SCALAR_NULL, ParentUpdate())); } - virtual void EmitTrue() { events.push_back(Event(ParentUpdate(), true)); } - virtual void EmitFalse() { events.push_back(Event(ParentUpdate(), false)); } - virtual void Emit(const char *v) { events.push_back(Event(ParentUpdate(), v)); } - virtual void Emit(intmax_t v) { events.push_back(Event(ParentUpdate(), v)); } - virtual void Emit(uintmax_t v) { events.push_back(Event(ParentUpdate(), v)); } - virtual void Emit(double v) { events.push_back(Event(ParentUpdate(), v)); } - virtual void Emit(ConstBlobPtr b) { events.push_back(Event(ParentUpdate(), b)); } - - virtual void Flush() {} - virtual void Close() {} - - virtual Variant GetParam(const std::string &key) { return Variant::NullType; } - virtual Variant GetParams() { return Variant::NullType; } - virtual void SetParam(const std::string &key, Variant value) {} - - void Playback(Emitter e) { - Playback(e.GetImpl().get()); - } - - void Playback(EmitterImpl *e) { - shared_ptr action(new EmitterParserActions(e)); - PushAction(action); - while (!Done()) { Run(); } - PopAction(); - } - - void Fill(Parser p) { - shared_ptr action(new EmitterParserActions(this)); - p.PushAction(action); - unsigned start_events = events.size(); - while (!p.Done() && (level > 0 || start_events == events.size()) && p.Run() == 0); - p.PopAction(); - } - - void FillRandom(EventType_t disallowed_events, int max_level, bool allow_nan); - - virtual int Run() { - while (!events.empty() && !action_stack.empty()) { - ParserActions *a = TopAction(); - events.front().Fire(this, a); - events.pop_front(); - } - return 0; - } - - virtual bool Done() const { return events.empty(); } - virtual bool Error() const { return false; } - virtual bool Ok() const { return !events.empty(); } - virtual std::string ErrorStr() const { return ""; } - virtual void Reset() { events.clear(); } - - bool Equal(const EventBuffer &o) const { - return events == o.events; - } - - unsigned NumEvents() const { return events.size(); } - const Event &GetEvent(int i) const { return events[i]; } - int GetLevel() const { return level; } - - private: - EventType_t RandomEventType(EventType_t disallowed, int max_level); - void BasicRandomEvent(EventType_t disallowed, int max_level, bool allow_nan); - void MapRandomEvent(EventType_t disallowed, int max_level, bool allow_nan); - void ListRandomEvent(EventType_t disallowed, int max_level, bool allow_nan); - - int level; - std::deque events; - }; - - inline EventBuffer::EventType_t operator|(EventBuffer::EventType_t lhs, EventBuffer::EventType_t rhs) { - return (EventBuffer::EventType_t)((int)lhs | (int)rhs); - } - - inline EventBuffer::EventType_t operator&(EventBuffer::EventType_t lhs, EventBuffer::EventType_t rhs) { - return (EventBuffer::EventType_t)((int)lhs & (int)rhs); - } - - inline std::ostream &operator<<(std::ostream &os, const EventBuffer::Event &e) { - e.Print(os); - return os; - } - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/src/Exceptions.cc b/src/hos_libvariant/src/libvariant/src/Exceptions.cc deleted file mode 100644 index 9b04b072..00000000 --- a/src/hos_libvariant/src/libvariant/src/Exceptions.cc +++ /dev/null @@ -1,201 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/include/Variant/Exceptions.h" - -#include - -#include "../../libvariant/src/StackTrace.h" - -namespace libvariant { - - std::ostream &operator <<(std::ostream &os, VariantDefines::Type_t type) { - switch (type) { - case VariantDefines::NullType: - os << "NullType"; - break; - case VariantDefines::BoolType: - os << "BoolType"; - break; - case VariantDefines::IntegerType: - os << "IntegerType"; - break; - case VariantDefines::UnsignedType: - os << "UnsignedType"; - break; - case VariantDefines::FloatType: - os << "FloatType"; - break; - case VariantDefines::StringType: - os << "StringType"; - break; - case VariantDefines::ListType: - os << "ListType"; - break; - case VariantDefines::MapType: - os << "MapType"; - break; - case VariantDefines::BlobType: - os << "BlobType"; - break; - default: - os << "Unknown(" << (int)type << ")"; - break; - } - return os; - } - - void AddStackTrace(std::ostream &os, int level) { -#ifdef ENABLE_STACKTRACE - os << "\nBacktrace:\n" << GetStack(level + 2) << "\n"; -#endif - } - - static inline std::string UnknownTypeErrorMessage(VariantDefines::Type_t type) { - std::ostringstream oss; - oss << "Unknown variant type \"" << type << "\""; - AddStackTrace(oss, 2); - return oss.str(); - } - - UnknownTypeError::UnknownTypeError(VariantDefines::Type_t type) throw() - : std::runtime_error(UnknownTypeErrorMessage(type)) - {} - - static inline std::string UnexpectedTypeErrorMessage(VariantDefines::Type_t expected, VariantDefines::Type_t value) { - std::ostringstream oss; - oss << "Unexpected variant type " << value << " expected " << expected; - AddStackTrace(oss, 2); - return oss.str(); - } - - static inline std::string UnexpectedTypeErrorMessage(const std::vector &expected, - VariantDefines::Type_t value) { - std::ostringstream oss; - oss << "Unexpected variant type " << value << " expected one of "; - for (unsigned i = 0; i < expected.size(); ++i) { - if (i != 0) { oss << ", "; } - oss << expected[i]; - } - AddStackTrace(oss, 2); - return oss.str(); - } - - UnexpectedTypeError::UnexpectedTypeError(VariantDefines::Type_t expected, VariantDefines::Type_t value) throw() - : std::runtime_error(UnexpectedTypeErrorMessage(expected, value)) - {} - - UnexpectedTypeError::UnexpectedTypeError(const std::vector &expected, - VariantDefines::Type_t value) throw() - : std::runtime_error(UnexpectedTypeErrorMessage(expected, value)) - {} - - static inline std::string UnableToConvertErrorMessage(VariantDefines::Type_t sourcetype, - const std::string &targettype) { - std::ostringstream oss; - oss << "Unable to convert variant " << sourcetype << " to " << targettype; - AddStackTrace(oss, 2); - return oss.str(); - } - - UnableToConvertError::UnableToConvertError(VariantDefines::Type_t sourcetype, - const std::string &targettype) throw() - : std::runtime_error(UnableToConvertErrorMessage(sourcetype, targettype)) - {} - - static inline std::string TypeNotIndexableErrorMessage(VariantDefines::Type_t type) { - std::ostringstream oss; - oss << "Variant type " << type << " is not an indexable type."; - AddStackTrace(oss, 2); - return oss.str(); - } - - TypeNotIndexableError::TypeNotIndexableError(VariantDefines::Type_t type) throw() - : std::runtime_error(TypeNotIndexableErrorMessage(type)) - {} - - static inline std::string NotNumericTypeErrorMessage(VariantDefines::Type_t type) { - std::ostringstream oss; - oss << "Variant type " << type << " not a numeric type."; - AddStackTrace(oss, 2); - return oss.str(); - } - - NotNumericTypeError::NotNumericTypeError(VariantDefines::Type_t type) throw() - : std::runtime_error(NotNumericTypeErrorMessage(type)) - {} - - static inline std::string KeyErrorMessage(const std::string &key) { - std::ostringstream oss; - oss << "Key \"" << key << "\" not contained in map."; - AddStackTrace(oss, 2); - return oss.str(); - } - - KeyError::KeyError(const std::string &key) throw() - : std::runtime_error(KeyErrorMessage(key)) - {} - - static inline std::string BadPathErrorMessage(VariantDefines::Type_t type) { - std::ostringstream oss; - oss << "Variant paths do not allow " << type << " as a path element."; - AddStackTrace(oss, 2); - return oss.str(); - } - - static inline std::string BadPathErrorMessage(const std::string &msg) { - std::ostringstream oss; - oss << msg; - AddStackTrace(oss, 2); - return oss.str(); - } - - BadPathError::BadPathError(VariantDefines::Type_t type) throw() - : std::runtime_error(BadPathErrorMessage(type)) - {} - - BadPathError::BadPathError(const std::string &msg) throw() - : std::runtime_error(BadPathErrorMessage(msg)) - {} - - static inline std::string InvalidReferenceErrorMessage(const std::string &msg) { - std::ostringstream oss; - oss << msg; - AddStackTrace(oss, 2); - return oss.str(); - } - - InvalidReferenceError::InvalidReferenceError(const std::string &msg) throw() - : std::runtime_error(InvalidReferenceErrorMessage(msg)) - {} - - static inline std::string InvalidOperationErrorMessage(VariantDefines::Type_t type, const std::string &opname) - { - std::ostringstream oss; - oss << "Variant cannot perform operation " << opname << " on type " << type; - AddStackTrace(oss, 2); - return oss.str(); - } - - InvalidOperationError::InvalidOperationError(VariantDefines::Type_t type, const std::string &opname) throw() - : std::runtime_error(InvalidOperationErrorMessage(type, opname)) - {} -} - diff --git a/src/hos_libvariant/src/libvariant/src/Extensions.cc b/src/hos_libvariant/src/libvariant/src/Extensions.cc deleted file mode 100644 index e4cffce2..00000000 --- a/src/hos_libvariant/src/libvariant/src/Extensions.cc +++ /dev/null @@ -1,797 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author Josh Staley - * \brief Useful extension functions for Variants - */ - -#include "../../libvariant/include/Variant/Extensions.h" - -#include -#include -#include -#include -#include -#include "../../libvariant/include/Variant/Path.h" -#include "../../libvariant/include/Variant/Variant.h" - -using namespace std; - -#if 0 -#include -#define DBPRINT(x) cout << x -#else -#define DBPRINT(x) -#endif - -namespace libvariant { - - bool SimpleList( const Variant & var ) { - if ( !var.IsList() ) - return false; - for ( unsigned i = 0; i < var.Size(); ++i ) - if ( var[i].IsMap() | var[i].IsList() ) - return false; - return true; - } - - Variant ExtensionParams() { - Variant v; - ExtensionParams(v); - return v; - } - - void ExtensionParams( VariantRef params ) { - if ( params.IsNull() ) { - params = Variant::MapType; - } - - if ( !params.IsMap() ) { - throw runtime_error("# ExtensionParams() - params must be a map"); - } - - if ( !(params.Contains("noSimpleLists") && params["noSimpleLists"].IsBool()) ) { - params["noSimpleLists"] = true; - } - - if ( !params.Contains("pathPrefix") ) { - params["pathPrefix"] = ""; - } - if ( !(params["pathPrefix"].IsString() && params["pathPrefix"].Size() <= 1) ) { - throw runtime_error("# ExtensionParams() - Invalid pathPrefix"); - } - - if ( !params.Contains("pathDelimiter") ) { - params["pathDelimiter"] = "/"; - } - // Must have a delimiter - if ( !(params["pathDelimiter"].IsString() && params["pathDelimiter"].Size() == 1) ) { - throw runtime_error("# ExtensionParams() - Invalid pathDelimiter"); - } - - if ( !params.Contains("indexPrefix") ) { - params["indexPrefix"] = "["; - } - // Must have a prefix - if ( !(params["indexPrefix"].IsString() && params["indexPrefix"].Size() == 1) ) { - throw runtime_error("# ExtensionParams() - Invalid indexPrefix"); - } - - if ( !params.Contains("indexSuffix") ) { - params["indexSuffix"] = "]"; - } - if ( !(params["indexSuffix"].IsString() && params["indexSuffix"].Size() <= 1) ) { - throw runtime_error("# ExtensionParams() - Invalid indexSuffix"); - } - - if ( !params.Contains("listDelimiter") ) { - params["listDelimiter"] = ","; - } - // Must have a delimiter - if ( !(params["listDelimiter"].IsString() && params["listDelimiter"].Size() == 1)) { - throw runtime_error("# ExtensionParams() - Invalid listDelimiter"); - } - } - - Variant FlattenPath( const Variant &var, Variant params ) { - Variant flat; - FlattenPathTo( flat, var, params ); - return flat; - } - - Variant ExpandPath( const Variant &var, Variant params ) { - Variant expand; - ExpandPathTo( expand, var, params ); - return expand; - } - - void FlattenPathTo( VariantRef flat, const Variant &var, Variant params, string prefix ) { - switch ( var.GetType() ) { - case Variant::ListType: - if ( (!params["noSimpleLists"].AsBool()) && SimpleList(var) ) { - if( prefix.size() ) { - flat[prefix] = var.Copy(); - } else { - flat = var.Copy(); - } - } else { - for( unsigned i=0; i < var.Size(); ++i ) { - stringstream tmp; - if ( prefix.size() ) { - tmp << prefix; - } - tmp << params["indexPrefix"].AsString(); - tmp << i; - tmp << params["indexSuffix"].AsString(); - FlattenPathTo( flat, var[i], params, tmp.str() ); - } - } - break; - case Variant::MapType: - for( Variant::ConstMapIterator i(var.MapBegin()), e(var.MapEnd()); i != e; ++i ) { - stringstream tmp; - if ( prefix.size() ) { - tmp << prefix + params["pathDelimiter"].AsString(); - } else { - tmp << params["pathPrefix"].AsString(); - } - tmp << i->first; - FlattenPathTo( flat, i->second, params, tmp.str()); - } - break; - default: - if( prefix.size() ) { - flat[ prefix ] = var.Copy(); - } else { - flat = var.Copy(); - } - } - } - - /// The current version of this funtion is fairly simple and cannot fully - /// reverse the operation FlattenPathTo does on a variant with the same params - /// argument. This primarily has to do with lists. - void ExpandPathTo( VariantRef expand, const Variant &var, Variant params ) { - if ( !var.IsMap() ) { - expand = var; - return; - } - - for ( Variant::ConstMapIterator i(var.MapBegin()), e(var.MapEnd()); i != e; ++i ) { - string path = i->first; - string delimiter = params["pathDelimiter"].AsString(); - if ( delimiter.length() != 1 ) { - throw runtime_error("# ExpandPathTo() - Delimiter is not a single char"); - } - for ( unsigned ii = 0; ii < path.length(); ++ii ) { - if (path[ii] == delimiter[0]) { - path[ii] = '/'; - } - } - expand.SetPath( path, i->second ); - } - } - - map< string, string > FlattenPathToStrStrMap ( const Variant &var, Variant params ) { - map< string, string > flatMap; - Variant flat = FlattenPath( var, params ); - - for ( Variant::MapIterator i(flat.MapBegin()), e(flat.MapEnd()); i != e; ++i ) { - stringstream tmp; - - switch (i->second.GetType()) { - case Variant::ListType: - for ( unsigned j = 0; j < i->second.Size(); ++j ) { - if (j != 0){ - tmp << params["listDelimiter"].AsString(); - } - tmp << i->second[j].AsString(); - } - flatMap[i->first] = tmp.str(); - break; - case Variant::BlobType: - throw runtime_error("# FlattenToStrStrMap() - BlobType not supported"); - default: - flatMap[i->first] = i->second.AsString(); - } - } - - return flatMap; - } - - Variant RDiff ( const Variant &base, const Variant &compare ) { - Variant diff(Variant::MapType); - RDiff( diff, base, compare ); - return diff; - } - - void RDiff ( VariantRef diff, const Variant &base, const Variant &compare ) { - switch ( compare.GetType() ) { - case Variant::MapType: - DBPRINT("Start of map" << endl); - - // Replace and break - if ( !base.IsMap() ) { - diff = compare.Copy(); - break; - } - - for ( Variant::ConstMapIterator i(compare.MapBegin()), e(compare.MapEnd()); i != e; ++i ) { - DBPRINT(i->first << endl); - - // Replace and continue - if ( !base.Contains(i->first) ) { - diff[i->first] = i->second.Copy(); - continue; - } - - // Recurse into map - if ( base[i->first] != i->second ) { - diff[i->first] = Variant::MapType; - DBPRINT("recurse for " << i->first << endl); - RDiff( diff[i->first], base[i->first], compare[i->first] ); - } - - // If map diff became null or an empty map, remove - TODO: should this be an option? - if ( diff.Contains(i->first) ) { - if ( (diff[ i->first ].GetType() == Variant::NullType) || - (diff[ i->first ].GetType() == Variant::MapType && diff[ i->first ].Size() == 0) ) { - diff.Erase(i->first); - } - } - } - break; - default: - if( base != compare ) { - diff = compare.Copy(); - } - } - } - - void RUpdate( VariantRef base, const Variant &update ) { - switch ( update.GetType() ) { - case Variant::NullType: - return; - case Variant::MapType: - if ( !base.Exists() || base.IsMap() ) { - for ( Variant::ConstMapIterator i(update.MapBegin()), e(update.MapEnd()); i != e; ++i ) { - RUpdate(base.At( i->first, Variant::MapType ), update[ i->first ]); - } - break; - } - // else we go to default - default: - base = update.Copy(); - } - } - - std::string JSONPointerUnescape(const std::string &fragment) { - std::string ret; - const char *c = fragment.c_str(); - const char *e = c + fragment.size(); - while (c != e) { - switch (*c) { - case '~': - ++c; - if (c != e) { - if (*c == '0') { - ret.append("~"); - } else if (*c == '1') { - ret.append("/"); - } else { - ret.append("~"); - ret.append(c, 1); - } - ++c; - } - break; - default: - ret.append(c, 1); - ++c; - break; - } - } - return ret; - } - - enum Operations_e { - OP_ADD, - OP_REMOVE, - OP_TEST, - OP_GET - }; - - struct Operation_t { - Operation_t() {} - Operation_t(Operations_e o, const std::string &p) - : op(o), success(false), guess(false), replaced(false), pointer(p) {} - - Operations_e op; - Path path; // path that modification /starts at/ - Variant value; - Variant old_value; - bool success; - bool guess; - bool replaced; - std::string pointer; - }; - - static bool IsIndex(const std::string &str, uintmax_t &index) { - const char *b = str.c_str(); - char *e = 0; - unsigned long long v = strtoull(b, &e, 10); - if (e == b) { return false; } - while (e != 0 && *e != '\0' && isspace(*e)) { ++e; } - if (e == 0 || *e != '\0') { return false; } - index = v; - return true; - } - - VariantRef JSONPointerOp(const std::string &pointer, VariantRef v, Operation_t &op) { - if (pointer.empty()) { - switch (op.op) { - case OP_ADD: - if (v.Exists()) { - op.replaced = true; - op.old_value = v; - } - v = op.value; - op.success = true; - return v; - case OP_REMOVE: - op.value = v; - v = Variant::NullType; - op.success = true; - return v; - case OP_TEST: - op.success = (v == op.value); - return v; - case OP_GET: - op.value = v; - op.success = true; - return v; - } - } - if (pointer[0] != '/') { - throw std::runtime_error("JSON Pointer is required to start with '/'"); - } - std::string::size_type nindex = pointer.find('/', 1); - std::string component = JSONPointerUnescape(pointer.substr(1, nindex - 1)); - bool is_last = (nindex >= pointer.size()); - if (!v.Exists()) { - if (op.guess) { - // Best guess - uintmax_t index = 0; - if (IsIndex(component, index)) { - return JSONPointerOp(pointer.substr(nindex), v.At(index), op); - } else { - return JSONPointerOp(pointer.substr(nindex), v.At(component), op); - } - } else { - throw std::runtime_error("Unable to resolve the JSON Pointer."); - } - } else if (v.IsMap()) { - op.path.push_back(component); - if (is_last) { - switch (op.op) { - case OP_ADD: - if (v.Contains(component)) { - op.replaced = true; - op.old_value = v.Get(component); - } - v.Set(component, op.value); - op.success = true; - return v.At(component); - case OP_REMOVE: - op.value = v.At(component); - v.Erase(component); - op.success = true; - return v.At(component); - case OP_TEST: - { - VariantRef ret = v.At(component); - op.success = (ret == op.value); - return ret; - } - case OP_GET: - { - VariantRef ret = v.At(component); - op.value = ret; - op.success = true; - return ret; - } - } - } else { - return JSONPointerOp(pointer.substr(nindex), v.At(component), op); - } - } else if (v.IsList()) { - if (is_last && component == "-") { - op.path.push_back(v.Size()); - if (op.op == OP_ADD) { - v.Append(op.value); - op.success = true; - return v.At(v.Size()); - } - throw std::runtime_error("Attempting to reference past the end of an array"); - } - uintmax_t index = 0; - if (!IsIndex(component, index)) { - throw std::runtime_error("Attempting to index an array with a string"); - } - op.path.push_back(index); - if (is_last) { - switch (op.op) { - case OP_ADD: - if (v.Contains(index)) { - op.old_value = v.Get(index); - op.replaced = true; - } - v.AsList().insert(v.ListBegin()+index, op.value); - op.success = true; - return v.At(index); - case OP_REMOVE: - op.value = v.At(component); - v.Erase(index); - op.success = true; - return v.At(index); - case OP_TEST: - { - VariantRef ret = v.At(index); - op.success = (ret == op.value); - return ret; - } - case OP_GET: - { - VariantRef ret = v.At(index); - op.value = ret; - op.success = true; - return ret; - } - } - } else { - return JSONPointerOp(pointer.substr(nindex), v.At(index), op); - } - } - std::ostringstream oss; - oss << "The JSON Pointer does not match the document, " - << v.GetType() << " is not a indexable type"; - throw std::runtime_error(oss.str()); - } - - void JSONPointerAdd(const std::string &pointer, VariantRef v, Variant data) { - Operation_t op(OP_ADD, pointer); - op.value = data; - try { - JSONPointerOp(op.pointer, v, op); - } catch (const std::exception &e) { - std::ostringstream oss; - oss << "Error adding a value with the JSON Pointer \"" - << op.pointer << "\" at path \"" - << PathString(op.path) << "\": " << e.what(); - throw std::runtime_error(oss.str()); - } - } - - void JSONPointerRemove(const std::string &pointer, VariantRef v) { - Operation_t op(OP_REMOVE, pointer); - try { - JSONPointerOp(op.pointer, v, op); - } catch (const std::exception &e) { - std::ostringstream oss; - oss << "Error removing a value with the JSON Pointer \"" - << op.pointer << "\" at path \"" - << PathString(op.path) << "\": " << e.what(); - throw std::runtime_error(oss.str()); - } - } - - void JSONPointerReplace(const std::string &pointer, VariantRef v, Variant data) { - Operation_t op(OP_GET, pointer); - try { - if (JSONPointerOp(op.pointer, v, op).Exists()) { - v.SetPath(op.path, data); - } else { - throw std::runtime_error("The target does not exist"); - } - } catch (const std::exception &e) { - std::ostringstream oss; - oss << "Error replacing a value with the JSON Pointer \"" - << op.pointer << "\" at path \"" - << PathString(op.path) << "\": " << e.what(); - throw std::runtime_error(oss.str()); - } - } - - void JSONPointerMove(const std::string &src, const std::string &dst, VariantRef v) { - Operation_t op(OP_REMOVE, src); - try { - JSONPointerOp(op.pointer, v, op); - Variant data = op.value; - Path path = op.path; - try { - op = Operation_t(OP_ADD, dst); - op.value = data; - JSONPointerOp(op.pointer, v, op); - } catch (const std::exception &e) { - v.SetPath(path, data); - throw e; - } - } catch (const std::exception &e) { - std::ostringstream oss; - oss << "Error moving a value with the JSON Pointer \"" - << op.pointer << "\" at path \"" - << PathString(op.path) << "\": " << e.what(); - throw std::runtime_error(oss.str()); - } - } - - void JSONPointerCopy(const std::string &src, const std::string &dst, VariantRef v) { - Operation_t op(OP_GET, src); - try { - VariantRef s = JSONPointerOp(op.pointer, v, op); - if (s.Exists()) { - op = Operation_t(OP_ADD, dst); - op.value = s.Copy(); - JSONPointerOp(op.pointer, v, op); - } else { - throw std::runtime_error("The src does not exist"); - } - } catch (const std::exception &e) { - std::ostringstream oss; - oss << "Error copying a value with the JSON Pointer \"" - << op.pointer << "\" at path \"" - << PathString(op.path) << "\": " << e.what(); - throw std::runtime_error(oss.str()); - } - } - - VariantRef JSONPointerLookup(const std::string &pointer, VariantRef v) { - Operation_t op(OP_GET, pointer); - try { - return JSONPointerOp(op.pointer, v, op); - } catch (const std::exception &e) { - std::ostringstream oss; - oss << "Error looking up a value with the JSON Pointer \"" - << op.pointer << "\" at path \"" - << PathString(op.path) << "\": " << e.what(); - throw std::runtime_error(oss.str()); - } - } - - std::string FormJSONPointer(const Path &path) { - std::ostringstream ret; - for (Path::const_iterator i(path.begin()), e(path.end()); i != e; ++i) { - if (i->IsNumber()) { - ret << "/" << i->AsUnsigned(); - } else { - ret << "/" << i->AsString(); - } - } - return ret.str(); - } - - struct Patch_t { - Patch_t(Operations_e o, Path p, Variant v) : op(o), path(p), value(v) {} - Patch_t(Operations_e o, Path p) : op(o), path(p) {} - Operations_e op; - Path path; - Variant value; - }; - - void JSONPatchUndo(VariantRef v, std::deque *undo) { - while (!undo->empty()) { - const Patch_t &p = undo->back(); - switch (p.op) { - case OP_ADD: - { - Path path = p.path; - if (path.size() > 0) { - PathElement elem = path.back(); - path.pop_back(); - VariantRef r = v.AtPath(path); - if (r.IsList()) { - r.AsList().insert(r.ListBegin()+elem.AsUnsigned(), p.value); - } else { - r.Set(elem.AsString(), p.value); - } - } else { - v = p.value; - } - } - break; - case OP_REMOVE: - v.ErasePath(p.path); - break; - case OP_TEST: - case OP_GET: - throw std::runtime_error("Unable to perform operation here"); - } - undo->pop_back(); - } - } - - - bool JSONPatchOp(VariantRef v, const Variant &diff, std::deque *undo) { - std::string oper = diff.Get("op").AsString(); - Operation_t op; - try { - if (oper == "add") { - op = Operation_t(OP_ADD, diff.Get("path").AsString()); - op.value = diff.Get("value"); - JSONPointerOp(op.pointer, v, op); - if (op.replaced) { - undo->push_back(Patch_t(OP_ADD, op.path, op.old_value)); - } else { - undo->push_back(Patch_t(OP_REMOVE, op.path)); - } - return op.success; - } else if (oper == "remove") { - op = Operation_t(OP_REMOVE, diff.Get("path").AsString()); - JSONPointerOp(op.pointer, v, op); - undo->push_back(Patch_t(OP_ADD, op.path, op.value)); - return op.success; - } else if (oper == "replace") { - op = Operation_t(OP_GET, diff.Get("path").AsString()); - VariantRef r = JSONPointerOp(op.pointer, v, op); - if (r.Exists()) { - r = diff.Get("value"); - } else { - return false; - } - undo->push_back(Patch_t(OP_ADD, op.path, op.value)); - return op.success; - } else if (oper == "move") { - op = Operation_t(OP_REMOVE, diff.Get("from").AsString()); - JSONPointerOp(op.pointer, v, op); - Variant data = op.value; - undo->push_back(Patch_t(OP_ADD, op.path, data)); - op = Operation_t(OP_ADD, diff.Get("path").AsString()); - op.value = data; - JSONPointerOp(op.pointer, v, op); - if (op.replaced) { - undo->push_back(Patch_t(OP_ADD, op.path, op.old_value)); - } else { - undo->push_back(Patch_t(OP_REMOVE, op.path)); - } - return op.success; - } else if (oper == "copy") { - op = Operation_t(OP_GET, diff.Get("from").AsString()); - JSONPointerOp(op.pointer, v, op); - Variant data = op.value; - op = Operation_t(OP_ADD, diff.Get("path").AsString()); - op.value = data; - JSONPointerOp(op.pointer, v, op); - if (op.replaced) { - undo->push_back(Patch_t(OP_ADD, op.path, op.old_value)); - } else { - undo->push_back(Patch_t(OP_REMOVE, op.path)); - } - return op.success; - } else if (oper == "test") { - op = Operation_t(OP_TEST, diff.Get("path").AsString()); - op.value = diff.Get("value"); - JSONPointerOp(op.pointer, v, op); - return op.success; - } - } catch (const std::exception &e) { - std::ostringstream oss; - oss << "Error executing patch op \"" << oper << "\" for pointer: " << op.pointer - << " stopped at: " << PathString(op.path) << "\n\twhat:\n" << e.what(); - throw std::runtime_error(oss.str()); - } - throw std::runtime_error("Unknown JSON Patch operation: " + oper); - } - - std::pair JSONPatch(VariantRef v, const Variant &diff) { - std::deque undo; - try { - bool success = true; - if (diff.IsList()) { - Variant::ConstListIterator i(diff.ListBegin()), e(diff.ListEnd()); - for (;i != e && success; ++i) { - success = JSONPatchOp(v, *i, &undo); - } - } else { - success = JSONPatchOp(v, diff, &undo); - } - std::string msg; - if (!success) { - JSONPatchUndo(v, &undo); - msg = "Failure"; - } - return std::make_pair(success, msg); - } catch (const std::exception &e) { - JSONPatchUndo(v, &undo); - return std::make_pair(false, std::string(e.what())); - } - } - - void JSONDiffRef(VariantRef src, VariantRef dst, VariantRef diff, Path &path) { - if (!dst.Exists()) { - diff.Append( - Variant() - .Set("op", "remove") - .Set("path", FormJSONPointer(path)) - ); - return; - } - if (!src.Exists()) { - diff.Append( - Variant() - .Set("op", "add") - .Set("path", FormJSONPointer(path)) - .Set("value", dst) - ); - return; - } - if (src.GetType() != dst.GetType()) { - diff.Append( - Variant() - .Set("op", "replace") - .Set("path", FormJSONPointer(path)) - .Set("value", dst) - ); - return; - } - if (src != dst) { - switch (src.GetType()) { - case Variant::ListType: - { - uintmax_t len = std::max(src.Size(), dst.Size()); - for (uintmax_t i = 0; i < len; ++i) { - path.push_back(PathElement(i)); - JSONDiffRef(src.At(i), dst.At(i), diff, path); - path.pop_back(); - } - } - break; - case Variant::MapType: - { - std::set keys; - Variant::ConstMapIterator i, e; - for (i = dst.MapBegin(), e = dst.MapEnd(); i != e; ++i) { - keys.insert(i->first); - } - for (i = src.MapBegin(), e = src.MapEnd(); i != e; ++i) { - keys.insert(i->first); - } - for (std::set::iterator i(keys.begin()), e(keys.end()); i != e; ++i) { - path.push_back(PathElement(*i)); - JSONDiffRef(src.At(*i), dst.At(*i), diff, path); - path.pop_back(); - } - } - break; - default: - diff.Append( - Variant() - .Set("op", "replace") - .Set("path", FormJSONPointer(path)) - .Set("value", dst) - ); - break; - } - } - } - - Variant JSONDiff(const Variant &src, const Variant &dst) { - Path path; - Variant diff = Variant::ListType; - JSONDiffRef(src, dst, diff, path); - return diff; - } -} diff --git a/src/hos_libvariant/src/libvariant/src/GuessFormat.cc b/src/hos_libvariant/src/libvariant/src/GuessFormat.cc deleted file mode 100644 index 12306bbb..00000000 --- a/src/hos_libvariant/src/libvariant/src/GuessFormat.cc +++ /dev/null @@ -1,54 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/include/Variant/GuessFormat.h" - -#include - -namespace libvariant { - SerializeType GuessFormat(ParserInput* in) { - unsigned len = 0; - const char *ptr = (const char*)in->GetPtr(len); - if (!ptr) { -#ifdef ENABLE_YAML - return SERIALIZE_YAML; -#endif - throw std::runtime_error( - "libvariant::GuessFormat: Unable to guess input format, unexpected end of input." - ); - } - unsigned i = 0; - while (true) { - if (i >= len) { - unsigned l = i+1; - ptr = (const char*)in->GetPtr(l); - if (!ptr) { - throw std::runtime_error( - "libvariant::GuessFormat: Unable to guess input format, unexpected end of input." - ); - } - len = l; - } - if (!isspace(ptr[i])) { - if (ptr[i] == '<') { -#ifdef ENABLE_XML - return SERIALIZE_XMLPLIST; -#else - throw std::runtime_error("libvariant::GuessFormat: Input looks like XML but XML support is not available."); -#endif - } else { - // Even if the start looks like JSON it could still be YAML. - // YAML can also deserialize everything the JSON parser can, - // so choose YAML over JSON. -#ifdef ENABLE_YAML - return SERIALIZE_YAML; -#else - return SERIALIZE_JSON; -#endif - } - } - ++i; - } - } -} diff --git a/src/hos_libvariant/src/libvariant/src/GuessScalar.cc b/src/hos_libvariant/src/libvariant/src/GuessScalar.cc deleted file mode 100644 index 8c01516a..00000000 --- a/src/hos_libvariant/src/libvariant/src/GuessScalar.cc +++ /dev/null @@ -1,120 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/src/GuessScalar.h" - -#include -#include -#include -#include -#include -#include - -namespace libvariant { - - namespace { - // Apparently the first match result is the match of the entire pattern - static const char *match_string = "^[[:space:]\n]*(" - "(null|Null|NULL|~)" // Null 2 - "|(true|True|TRUE)" // True 3 - "|(false|False|FALSE)" // False 4 - "|([-+]?[0-9]+)" // int10 5 - "|0o([0-7]+)" // int8 6 - "|0x([0-9a-fA-F]+)" // int16 7 - "|([-+]?((\\.[0-9]+)|([0-9]+(\\.[0-9]*)?))([eE][-+]?[0-9]+)?)" // float 8 (9,10,11,12,13) - "|([-+]?\\.inf|\\.Inf|\\.INF)" // inf 14 - "|(\\.nan|\\.Nan|\\.NAN)" // nan 15 - ")[[:space:]\n]*$"; - enum { - MATCH_NULL = 2, - MATCH_TRUE = 3, - MATCH_FALSE = 4, - MATCH_INT10 = 5, - MATCH_INT8 = 6, - MATCH_INT16 = 7, - MATCH_FLOAT = 8, - MATCH_INF = 14, - MATCH_NAN = 15, - MATCH_MAX = 16 - }; - - class GuessRegex { - public: - GuessRegex(); - ~GuessRegex(); - regex_t guessregex; - - }; - - GuessRegex::GuessRegex() { - int err = 0; - memset(&guessregex, 0, sizeof(regex_t)); - err = regcomp(&guessregex, match_string, REG_EXTENDED); - if (err) { - std::vector buffer(8192); - regerror(err, &guessregex, &buffer[0], buffer.size()); - std::ostringstream oss; - oss << "libvariant library initialization failure: Failed to initialize type guessing regex with error: " - << &buffer[0]; - fputs(oss.str().c_str(), stderr); - throw std::runtime_error(oss.str()); - } - } - - - GuessRegex::~GuessRegex() { - regfree(&guessregex); - } - } - - void GuessScalar(const char *value, unsigned length, const char *anchor, const char *tag, - ParserImpl *p, ParserActions *action) { - static GuessRegex guessregex; - regmatch_t match[MATCH_MAX]; - if (regexec(&guessregex.guessregex, value, MATCH_MAX, &match[0], 0) == 0) { - if (match[MATCH_NULL].rm_so != -1) { - action->Null(p, anchor, tag); - } else if (match[MATCH_TRUE].rm_so != -1) { - action->Scalar(p, true, anchor, tag); - } else if (match[MATCH_FALSE].rm_so != -1) { - action->Scalar(p, false, anchor, tag); - } else if (match[MATCH_INT10].rm_so != -1) { - long long val; - val = strtoll(&value[match[MATCH_INT10].rm_so], 0, 10); - if (val == LLONG_MAX && errno == ERANGE) { - unsigned long long v; - v = strtoull(&value[match[MATCH_INT10].rm_so], 0, 10); - action->Scalar(p, uintmax_t(v), anchor, tag); - } else { - action->Scalar(p, intmax_t(val), anchor, tag); - } - } else if (match[MATCH_INT8].rm_so != -1) { - unsigned long long val; - val = strtoull(&value[match[MATCH_INT8].rm_so], 0, 8); - action->Scalar(p, uintmax_t(val), anchor, tag); - } else if (match[MATCH_INT16].rm_so != -1) { - unsigned long long val; - val = strtoull(&value[match[MATCH_INT16].rm_so], 0, 16); - action->Scalar(p, uintmax_t(val), anchor, tag); - } else if (match[MATCH_FLOAT].rm_so != -1) { - double val = strtod(&value[match[MATCH_FLOAT].rm_so], 0); - action->Scalar(p, val, anchor, tag); - } else if (match[MATCH_INF].rm_so != -1) { - double val = std::numeric_limits::infinity(); - if (value[match[MATCH_INF].rm_so] == '-') { - val = -val; - } - action->Scalar(p, val, anchor, tag); - } else if (match[MATCH_NAN].rm_so != -1) { - double val = std::numeric_limits::quiet_NaN(); - action->Scalar(p, val, anchor, tag); - } else { - action->Scalar(p, value, length, anchor, tag); - } - } else { - action->Scalar(p, value, length, anchor, tag); - } - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/GuessScalar.h b/src/hos_libvariant/src/libvariant/src/GuessScalar.h deleted file mode 100644 index 2c1f3412..00000000 --- a/src/hos_libvariant/src/libvariant/src/GuessScalar.h +++ /dev/null @@ -1,14 +0,0 @@ -/** \file - * \author John Bridgman - * \brief A simple routine that "guesses" what type a scalar is. - */ -#ifndef VARIANT_GUESSSCALAR_H -#define VARIANT_GUESSSCALAR_H - -#pragma once -#include "../../libvariant/include/Variant/Parser.h" -namespace libvariant { - void GuessScalar(const char *value, unsigned length, const char *anchor, const char *tag, - ParserImpl *p, ParserActions *action); -} -#endif diff --git a/src/hos_libvariant/src/libvariant/src/JSONEmitter.cc b/src/hos_libvariant/src/libvariant/src/JSONEmitter.cc deleted file mode 100644 index 78ce6e23..00000000 --- a/src/hos_libvariant/src/libvariant/src/JSONEmitter.cc +++ /dev/null @@ -1,299 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= - -#include "../../libvariant/src/JSONEmitter.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../../libvariant/include/Variant/EmitterOutput.h" -#include "../../libvariant/src/Base64.h" -#include "../../libvariant/src/BlobMagic.h" - -using namespace std; - -// We do some small buffering optimizations so that we aren't calling -// Write over and over again with very small amounts. - -#define MAX_BUFFER_LEN 512u -#define BUFFER_THRESHOLD 128u - -namespace libvariant { - - JSONEmitterImpl::JSONEmitterImpl(shared_ptr o, Variant params) - : output(o), pretty(false), strict(false), num_indent(4), - numeric_precision(std::numeric_limits::digits10+2), - buffer(MAX_BUFFER_LEN, 0), buffer_len(0) - { - if (params.IsMap()) { - params.GetInto(pretty, "pretty", pretty); - params.GetInto(strict, "strict", strict); - params.GetInto(num_indent, "indent", num_indent); - params.GetInto(numeric_precision, "precision", numeric_precision); - } - } - - JSONEmitterImpl::~JSONEmitterImpl() { - Close(); - } - - void JSONEmitterImpl::BeginDocument() { - } - - void JSONEmitterImpl::EndDocument() { - } - - void JSONEmitterImpl::BeginMap(int length) { - CheckSeparator(); - EmitRaw("{"); - state.push_back(MAP_FIRST); - } - - void JSONEmitterImpl::EndMap() { - state.pop_back(); - EmitIndent(); - EmitRaw("}"); - Flush(); - } - - void JSONEmitterImpl::BeginList(int length) { - CheckSeparator(); - EmitRaw("["); - state.push_back(LIST_FIRST); - } - - void JSONEmitterImpl::EndList() { - state.pop_back(); - EmitIndent(); - EmitRaw("]"); - Flush(); - } - - void JSONEmitterImpl::EmitNull() { - CheckSeparator(); - EmitRaw("null"); - } - - void JSONEmitterImpl::EmitTrue() { - CheckSeparator(); - EmitRaw("true"); - } - - void JSONEmitterImpl::EmitFalse() { - CheckSeparator(); - EmitRaw("false"); - } - - void JSONEmitterImpl::Emit(const char *v) { - CheckSeparator(); - EmitString(v, strlen(v)); - } - - void JSONEmitterImpl::Emit(intmax_t v) { - CheckSeparator(); - std::ostringstream oss; - oss << v; - EmitRaw(oss.str().c_str(), oss.str().length()); - } - - void JSONEmitterImpl::Emit(uintmax_t v) { - CheckSeparator(); - std::ostringstream oss; - oss << v; - EmitRaw(oss.str().c_str(), oss.str().length()); - } - - void JSONEmitterImpl::Emit(double v) { - CheckSeparator(); - std::ostringstream oss; - if (strict && (std::isnan(v) || std::isinf(v))) { - throw std::runtime_error("JSONEmitter: The JSON specification does not permit" - " numeric types that cannot be represented as a series of digits."); - } else if (std::isnan(v) || std::isinf(v)) { - oss << "null"; - } else { - oss << std::setprecision(numeric_precision) << std::showpoint << v; - } - EmitRaw(oss.str().c_str(), oss.str().length()); - } - - void JSONEmitterImpl::Emit(ConstBlobPtr b) { - if (strict) { - throw std::runtime_error("JSONEmitter: Cannot serialize a BlobType" - " in strict JSON mode."); - } - CheckSeparator(); - EmitRaw("\""); - EmitRaw(MAGIC_BLOB_JSONSTR); - std::vector buf(Base64EncodeSize(b->GetTotalLength(), 0)); - unsigned len = Base64Encode(&buf[0], b->GetIOVec(), b->GetNumBuffers(), 0); - EmitRaw(&buf[0], len); - EmitRaw("\""); - } - - void JSONEmitterImpl::Flush() { - if (buffer_len > 0) { - unsigned num_written = 0; - while (num_written < buffer_len) { - num_written += output->Write(&buffer[num_written], buffer_len - num_written); - } - buffer_len = 0; - } - output->Flush(); - } - - void JSONEmitterImpl::Close() { - Flush(); - } - - Variant JSONEmitterImpl::GetParam(const std::string &key) { - if (key == "pretty") { return pretty; } - if (key == "indent") { return num_indent; } - if (key == "precision") { return numeric_precision; } - return Variant::NullType; - } - - Variant JSONEmitterImpl::GetParams() { - Variant ret; - ret["pretty"] = pretty; - ret["indent"] = num_indent; - ret["precision"] = numeric_precision; - return ret; - } - - void JSONEmitterImpl::SetParam(const std::string &key, Variant value) { - if (key == "pretty") { - pretty = value.AsBool(); - } - if (key == "indent") { - num_indent = value.AsUnsigned(); - } - if (key == "precision") { - numeric_precision = value.AsUnsigned(); - } - } - - void JSONEmitterImpl::CheckSeparator() { - if (state.empty()) return; - switch (state.back()) { - case MAP_FIRST: - state.back() = IN_MAP_VALUE; - EmitIndent(); - break; - case IN_MAP_KEY: - state.back() = IN_MAP_VALUE; - EmitRaw(","); - EmitIndent(); - break; - case IN_MAP_VALUE: - state.back() = IN_MAP_KEY; - EmitRaw(": "); - break; - case LIST_FIRST: - state.back() = IN_LIST; - EmitIndent(); - break; - case IN_LIST: - EmitRaw(","); - EmitIndent(); - break; - default: - break; - } - } - - void JSONEmitterImpl::EmitIndent() { - if (!pretty) return; - EmitRaw("\n"); - unsigned indent = state.size() * num_indent; - if (indent > BUFFER_THRESHOLD) { - Flush(); - memset(&buffer[buffer_len], ' ', BUFFER_THRESHOLD); - unsigned num_written = 0; - while (num_written < indent) { - num_written += output->Write(&buffer[buffer_len], min(indent - num_written, BUFFER_THRESHOLD)); - } - } else { - if (indent + buffer_len > MAX_BUFFER_LEN) { - Flush(); - } - memset(&buffer[buffer_len], ' ', indent); - buffer_len += indent; - } - } - - void JSONEmitterImpl::EmitString(const char *text, unsigned len) { - EmitRaw("\""); - const char *end = text + len; - while (text != end) { - if (*text == '\\') { - EmitRaw("\\\\"); - } else if (*text == '\"') { - EmitRaw("\\\""); - //} else if (*text == '/') { - //EmitRaw("\\/"); - } else if (*text == '\b') { - EmitRaw("\\b"); - } else if (*text == '\f') { - EmitRaw("\\f"); - } else if (*text == '\n') { - EmitRaw("\\n"); - } else if (*text == '\r') { - EmitRaw("\\r"); - } else if (*text == '\t') { - EmitRaw("\\t"); - } else if (*text < 0) { - EmitRaw(text, 1); - } else if (*text < 0x20) { - char buffer[7]; - int val = (unsigned char)*text; - snprintf(buffer, sizeof(buffer), "\\u%4.4x", val); - EmitRaw(&buffer[0]); - } else { - EmitRaw(text, 1); - } - ++text; - } - EmitRaw("\""); - } - - void JSONEmitterImpl::EmitRaw(const char *text) { - EmitRaw(text, strlen(text)); - } - void JSONEmitterImpl::EmitRaw(const char *text, unsigned len) { - if (len > BUFFER_THRESHOLD) { - Flush(); - unsigned num_written = 0; - while (num_written < len) { - num_written += output->Write(&text[num_written], len - num_written); - } - } else { - if (len + buffer_len > MAX_BUFFER_LEN) { - Flush(); - } - memcpy(&buffer[buffer_len], text, len); - buffer_len += len; - } - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/JSONEmitter.h b/src/hos_libvariant/src/libvariant/src/JSONEmitter.h deleted file mode 100644 index d9685b85..00000000 --- a/src/hos_libvariant/src/libvariant/src/JSONEmitter.h +++ /dev/null @@ -1,105 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * A simple JSON emitter class to emit valid JSON. - */ -#ifndef VARIANT_JSONEMITTER_H -#define VARIANT_JSONEMITTER_H - -#pragma once -#include -#include -#include -#include -#include "../../libvariant/include/Variant/Emitter.h" - -namespace libvariant { - - /** - * A simple JSON emitter class to make it simple to emit - * valid JSON in a program. - * Does minimal error checking. - * All strings are assumed to be UTF-8 encoded. - * - * This class buffers with a small buffer otherwise it would internally - * perform many calls to write with 1 or 2 bytes. - * Flush automatically happens on EndMap and EndList. - * - * Supported parameters are: - * "pretty": boolean - * "indent": integer (number of spaces to indent when pretty is on, - * default 4) - * "precision": integer (number of digits for a float) - * "strict": be more strict about emitting correct json - */ - class JSONEmitterImpl : public EmitterImpl { - enum State_t { - NONE, - MAP_FIRST, - IN_MAP_KEY, - IN_MAP_VALUE, - LIST_FIRST, - IN_LIST - }; - public: - JSONEmitterImpl(shared_ptr o, Variant params); - - ~JSONEmitterImpl(); - - virtual void BeginDocument(); - virtual void EndDocument(); - virtual void BeginMap(int length); - virtual void EndMap(); - virtual void BeginList(int length); - virtual void EndList(); - - virtual void EmitNull(); - virtual void EmitTrue(); - virtual void EmitFalse(); - virtual void Emit(const char *v); - virtual void Emit(intmax_t v); - virtual void Emit(uintmax_t v); - virtual void Emit(double v); - virtual void Emit(ConstBlobPtr b); - - virtual void Flush(); - virtual void Close(); - - virtual Variant GetParam(const std::string &key); - virtual Variant GetParams(); - virtual void SetParam(const std::string &key, Variant value); - private: - - void CheckSeparator(); - void EmitIndent(); - void EmitString(const char *text, unsigned len); - void EmitRaw(const char *text); - void EmitRaw(const char *text, unsigned len); - - shared_ptr output; - bool pretty; - bool strict; - unsigned num_indent; - unsigned numeric_precision; - std::deque state; - std::vector buffer; - unsigned buffer_len; - }; - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/src/JSONParser.cc b/src/hos_libvariant/src/libvariant/src/JSONParser.cc deleted file mode 100644 index 54d3fdd2..00000000 --- a/src/hos_libvariant/src/libvariant/src/JSONParser.cc +++ /dev/null @@ -1,214 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - */ -#include "../../libvariant/src/JSONParser.h" - -#include "../../libvariant/src/BlobMagic.h" - -namespace libvariant { - - int JSONParserImpl::StaticCallback(void *ctx, int type, const struct JSON_value_struct* value) { - JSONParserImpl *impl = (JSONParserImpl*)ctx; - if (impl->status == S_BEGIN) { - impl->status = S_OK; - } - // If an exception is thrown from here, the parser will be in an - // inconsistent state. So, set our state to error. - try { - switch(type) { - case JSON_T_ARRAY_BEGIN: - ++impl->depth; - impl->TopAction()->BeginList(impl, -1, 0, 0); - break; - case JSON_T_ARRAY_END: - --impl->depth; - impl->TopAction()->EndList(impl); - break; - case JSON_T_OBJECT_BEGIN: - ++impl->depth; - impl->TopAction()->BeginMap(impl, -1, 0, 0); - break; - case JSON_T_OBJECT_END: - --impl->depth; - impl->TopAction()->EndMap(impl); - break; - case JSON_T_INTEGER: - impl->TopAction()->Scalar(impl, intmax_t(value->vu.integer_value), 0, 0); - break; - case JSON_T_UNSIGNED: - impl->TopAction()->Scalar(impl, uintmax_t(value->vu.unsigned_value), 0, 0); - break; - case JSON_T_FLOAT: - impl->TopAction()->Scalar(impl, value->vu.float_value, 0, 0); - break; - case JSON_T_NULL: - impl->TopAction()->Null(impl, 0, 0); - break; - case JSON_T_TRUE: - impl->TopAction()->Scalar(impl, true, 0, 0); - break; - case JSON_T_FALSE: - impl->TopAction()->Scalar(impl, false, 0, 0); - break; - case JSON_T_KEY: - impl->TopAction()->Scalar(impl, value->vu.str.value, value->vu.str.length, 0, 0); - break; - case JSON_T_STRING: - if (value->vu.str.length >= MAGIC_BLOB_LENGTH && - memcmp(value->vu.str.value, MAGIC_BLOB_TAG, MAGIC_BLOB_LENGTH) == 0) { - void *ptr = 0; - if (posix_memalign(&ptr, 64, Base64DecodeSize(value->vu.str.length)) != 0) { - throw std::bad_alloc(); - } - unsigned len = Base64Decode(ptr, value->vu.str.value+MAGIC_BLOB_LENGTH, - value->vu.str.length-MAGIC_BLOB_LENGTH); - BlobPtr blob = Blob::CreateFree(ptr, len); - impl->TopAction()->Scalar(impl, blob, 0, 0); - } else { - impl->TopAction()->Scalar(impl, value->vu.str.value, value->vu.str.length, 0, 0); - } - break; - default: - break; - } - } catch (...) { - impl->status = S_ERROR; - throw; - } - return true; - } - - JSONParserImpl::JSONParserImpl(shared_ptr i) - : parser(0), - status(S_START), - line(1), - column(0), - charcount(0), - depth(0), - input(i) - { - AllocParser(); - } - - JSONParserImpl::~JSONParserImpl() { - delete_JSON_parser(parser); - parser = 0; - } - - void JSONParserImpl::Reset() { - if (parser) { delete_JSON_parser(parser); } - parser = 0; - status = S_START; - line = 1; - column = 0; - charcount = 0; - depth = 0; - AllocParser(); - } - - void JSONParserImpl::AllocParser() { - JSON_config config; - init_JSON_config(&config); - config.callback = StaticCallback; - config.callback_ctx = this; - config.depth = -1; - config.allow_comments = 1; - parser = new_JSON_parser(&config); - } - - void JSONParserImpl::Parse() { - while ( (status == S_OK || status == S_BEGIN) && !action_stack.empty() ) { - unsigned len = 0; - const unsigned char *ptr = (const unsigned char*)input->GetPtr(len); - const unsigned char *c = ptr; - const unsigned char *end = ptr + len; - if (len == 0 || !ptr) { - if (JSON_parser_done(parser)) { status = S_END; } - else { status = S_ERROR; } - return; - } - while ( c != end && ( status == S_OK || status == S_BEGIN) && !action_stack.empty() ) { - ++charcount; - if (*c == '\n') { - column = 0; - ++line; - } else { ++column; } - if (JSON_parser_char(parser, *c)) { - if (depth == 0) { - if (status == S_OK) { - if (JSON_parser_done(parser)) { status = S_END; } - else { status = S_ERROR; } - } - } - } else if (status == S_OK) { status = S_ERROR; } - ++c; - } - input->Release(c - ptr); - } - } - - int JSONParserImpl::Run() { - while (!action_stack.empty()) { - switch (status) { - case S_START: - TopAction()->BeginDocument(this); - status = S_BEGIN; - return 0; - case S_BEGIN: - Parse(); - break; - case S_OK: - Parse(); - break; - case S_ERROR: - { - std::ostringstream oss; - oss << "JSONParser: An error occurred on line " << line << " column " << column; - errorstr = oss.str(); - throw std::runtime_error(errorstr); - } - case S_END: - status = S_DONE; - TopAction()->EndDocument(this); - return 1; - case S_DONE: - return 1; - default: - { - std::ostringstream oss; - oss << "JSONParser in inconsistent state (line: " << line << " column: " << column << ")"; - errorstr = oss.str(); - throw std::runtime_error("JSONParser in inconsistent state."); - } - } - } - return 0; - } - - JSONParserImpl::Status_t JSONParserImpl::GetStatus() const { return status; } - bool JSONParserImpl::Done() const { return status == S_DONE; } - bool JSONParserImpl::Error() const { return status == S_ERROR; } - bool JSONParserImpl::Ok() const { return status == S_OK; } - - std::string JSONParserImpl::ErrorStr() const { return errorstr; } - - unsigned JSONParserImpl::GetLine() const { return line; } - unsigned JSONParserImpl::GetColumn() const { return column; } - unsigned JSONParserImpl::GetByteCount() const { return charcount; } -} diff --git a/src/hos_libvariant/src/libvariant/src/JSONParser.h b/src/hos_libvariant/src/libvariant/src/JSONParser.h deleted file mode 100644 index 07ce2582..00000000 --- a/src/hos_libvariant/src/libvariant/src/JSONParser.h +++ /dev/null @@ -1,91 +0,0 @@ -//============================================================================= -// Computational Process Networks class library -// Copyright (C) 1997-2006 Gregory E. Allen and The University of Texas -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - */ -#ifndef JSON_PARSER_HPP -#define JSON_PARSER_HPP - -#pragma once -#include "../../libvariant/src/Base64.h" -#include -#include "../../libvariant/lib/json/JSON_parser.h" -#include -#include -#include -#include -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/include/Variant/ParserInput.h" -#include "../../libvariant/include/Variant/SharedPtr.h" - - -namespace libvariant { - /** - * A class that encapsulates the JSON_parser with the Parser interface - */ - class JSONParserImpl : public ParserImpl { - public: - enum Status_t { - S_START, - S_BEGIN, - S_OK, - S_ERROR, - S_END, - S_DONE - }; - JSONParserImpl(shared_ptr i); - virtual ~JSONParserImpl(); - - virtual int Run(); - - /** - * \return the status of the parser. - */ - Status_t GetStatus() const; - virtual bool Done() const; - virtual bool Error() const; - virtual bool Ok() const; - virtual std::string ErrorStr() const; - unsigned GetLine() const; - unsigned GetColumn() const; - unsigned GetByteCount() const; - /** - * Resets the parser to the state it was in when just constructed. - */ - virtual void Reset(); - private: - - void AllocParser(); - - void Parse(); - - static int StaticCallback(void *ctx, int type, const struct JSON_value_struct* value); - - JSON_parser_struct *parser; - Status_t status; - unsigned line; - unsigned column; - unsigned charcount; - unsigned depth; - shared_ptr input; - std::string errorstr; - }; -} -#endif diff --git a/src/hos_libvariant/src/libvariant/src/MsgPackEmitter.cc b/src/hos_libvariant/src/libvariant/src/MsgPackEmitter.cc deleted file mode 100644 index ddf64f50..00000000 --- a/src/hos_libvariant/src/libvariant/src/MsgPackEmitter.cc +++ /dev/null @@ -1,135 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/src/MsgPackEmitter.h" - -#include "../../libvariant/src/BlobMagic.h" - -static void msgpack_pack_string(msgpack_packer *packer, const char *str, unsigned len) { - msgpack_pack_raw(packer, len); - msgpack_pack_raw_body(packer, str, len); -} - -namespace libvariant { - - int MsgPackPackerWrite(void* data, const char* buf, unsigned int len) { - return static_cast(data)->Write(buf, len); - } - - MsgPackEmitterImpl::MsgPackEmitterImpl(shared_ptr out, Variant params) - : output(out) - { - msgpack_packer_init(&packer, output.get(), MsgPackPackerWrite); - } - - MsgPackEmitterImpl::~MsgPackEmitterImpl() { - Close(); - } - - - void MsgPackEmitterImpl::BeginDocument() { - } - - void MsgPackEmitterImpl::EndDocument() { - Flush(); - } - - void MsgPackEmitterImpl::BeginMap(int length) { - if (buffer) { buffer->BeginMap(length); } - else if (length < 0) { - buffer.reset(new EventBuffer); - buffer->BeginMap(length); - } else { - msgpack_pack_map(&packer, length); - } - } - - void MsgPackEmitterImpl::EndMap() { - if (buffer) { - buffer->EndMap(); - if (buffer->GetLevel() <= 0) { - shared_ptr buf = buffer; - buffer.reset(); - buf->Playback(this); - } - } - } - - void MsgPackEmitterImpl::BeginList(int length) { - if (buffer) { buffer->BeginList(length); } - else if (length < 0) { - buffer.reset(new EventBuffer); - buffer->BeginList(length); - } else { - msgpack_pack_array(&packer, length); - } - } - - void MsgPackEmitterImpl::EndList() { - if (buffer) { - buffer->EndList(); - if (buffer->GetLevel() <= 0) { - shared_ptr buf = buffer; - buffer.reset(); - buf->Playback(this); - } - } - } - - void MsgPackEmitterImpl::EmitNull() { - if (buffer) { buffer->EmitNull(); } - else { msgpack_pack_nil(&packer); } - } - - void MsgPackEmitterImpl::EmitTrue() { - if (buffer) { buffer->EmitTrue(); } - else { msgpack_pack_true(&packer); } - } - - void MsgPackEmitterImpl::EmitFalse() { - if (buffer) { buffer->EmitFalse(); } - else { msgpack_pack_false(&packer); } - } - - void MsgPackEmitterImpl::Emit(const char *v) { - if (buffer) { buffer->Emit(v); } - else { msgpack_pack_string(&packer, v, strlen(v)); } - } - - void MsgPackEmitterImpl::Emit(intmax_t v) { - if (buffer) { buffer->Emit(v); } - else { msgpack_pack_int64(&packer, v); } - } - - void MsgPackEmitterImpl::Emit(uintmax_t v) { - if (buffer) { buffer->Emit(v); } - else { msgpack_pack_uint64(&packer, v); } - } - - void MsgPackEmitterImpl::Emit(double v) { - if (buffer) { buffer->Emit(v); } - else { msgpack_pack_double(&packer, v); } - } - - void MsgPackEmitterImpl::Emit(ConstBlobPtr b) { - if (buffer) { buffer->Emit(b); } - else { - msgpack_pack_raw(&packer, b->GetTotalLength() + MAGIC_BLOB_LENGTH); - msgpack_pack_raw_body(&packer, MAGIC_BLOB_TAG, MAGIC_BLOB_LENGTH); - for (int i = 0, num = b->GetNumBuffers(); i < num; ++i) { - msgpack_pack_raw_body(&packer, b->GetPtr(i), b->GetLength(i)); - } - } - } - - void MsgPackEmitterImpl::Flush() { - output->Flush(); - } - - void MsgPackEmitterImpl::Close() { - output->Flush(); - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/MsgPackEmitter.h b/src/hos_libvariant/src/libvariant/src/MsgPackEmitter.h deleted file mode 100644 index d215f2a5..00000000 --- a/src/hos_libvariant/src/libvariant/src/MsgPackEmitter.h +++ /dev/null @@ -1,51 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_MSGPACK_H -#define VARIANT_MSGPACK_H - -#pragma once -#include "../../libvariant/include/Variant/Variant.h" -#include "../../libvariant/include/Variant/EmitterOutput.h" -#include "../../libvariant/include/Variant/ParserInput.h" -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/include/Variant/Emitter.h" -#include "../../libvariant/src/EventBuffer.h" -#include -namespace libvariant { - - class MsgPackEmitterImpl : public EmitterImpl { - public: - MsgPackEmitterImpl(shared_ptr out, Variant params); - ~MsgPackEmitterImpl(); - virtual void BeginDocument(); - virtual void EndDocument(); - virtual void BeginMap(int length); - virtual void EndMap(); - virtual void BeginList(int length); - virtual void EndList(); - - virtual void EmitNull(); - virtual void EmitTrue(); - virtual void EmitFalse(); - virtual void Emit(const char *v); - virtual void Emit(intmax_t v); - virtual void Emit(uintmax_t v); - virtual void Emit(double v); - virtual void Emit(ConstBlobPtr b); - - virtual void Flush(); - virtual void Close(); - - virtual Variant GetParam(const std::string &key) { return Variant::NullType; } - virtual Variant GetParams() { return Variant::NullType; } - virtual void SetParam(const std::string &key, Variant value) {} - private: - shared_ptr output; - shared_ptr buffer; - msgpack_packer packer; - }; - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/src/MsgPackParser.cc b/src/hos_libvariant/src/libvariant/src/MsgPackParser.cc deleted file mode 100644 index ee34f11b..00000000 --- a/src/hos_libvariant/src/libvariant/src/MsgPackParser.cc +++ /dev/null @@ -1,250 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/src/MsgPackParser.h" - -#include -#include -#include "../../libvariant/src/BlobMagic.h" - -// vmpu = variant msg pack unpack - -struct vmpu_user { - libvariant::MsgPackParserImpl *impl; -}; - -struct vmpu_object { - vmpu_object() : count(0) {} - uint64_t count; -}; - -#define msgpack_unpack_struct(name) \ -struct vmpu ## name - -#define msgpack_unpack_func(ret, name) \ -ret vmpu ## name - -#define msgpack_unpack_callback(name) \ -vmpu_callback ## name - -#define msgpack_unpack_object vmpu_object - -#define msgpack_unpack_user vmpu_user - - -typedef struct vmpu_context vmpu_context; - -static void vmpu_init(vmpu_context* ctx); - -//static vmpu_object vmpu_data(vmpu_context* ctx); - -static int vmpu_execute(vmpu_context* ctx, - const char* data, size_t len, size_t* off); - - -static inline vmpu_object vmpu_callback_root(vmpu_user* u) -{ return vmpu_object(); } - -static inline int vmpu_callback_uint8(vmpu_user* u, uint8_t d, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, uint64_t(d), 0, 0); - return 0; -} - -static inline int vmpu_callback_uint16(vmpu_user* u, uint16_t d, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, uint64_t(d), 0, 0); - return 0; -} - -static inline int vmpu_callback_uint32(vmpu_user* u, uint32_t d, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, uint64_t(d), 0, 0); - return 0; -} - -static inline int vmpu_callback_uint64(vmpu_user* u, uint64_t d, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, uint64_t(d), 0, 0); - return 0; -} - -static inline int vmpu_callback_int8(vmpu_user* u, int8_t d, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, int64_t(d), 0, 0); - return 0; -} - -static inline int vmpu_callback_int16(vmpu_user* u, int16_t d, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, int64_t(d), 0, 0); - return 0; -} - -static inline int vmpu_callback_int32(vmpu_user* u, int32_t d, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, int64_t(d), 0, 0); - return 0; -} - -static inline int vmpu_callback_int64(vmpu_user* u, int64_t d, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, int64_t(d), 0, 0); - return 0; -} - -static inline int vmpu_callback_float(vmpu_user* u, float d, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, double(d), 0, 0); - return 0; -} - -static inline int vmpu_callback_double(vmpu_user* u, double d, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, double(d), 0, 0); - return 0; -} - -static inline int vmpu_callback_nil(vmpu_user* u, vmpu_object* o) -{ - u->impl->TopAction()->Null(u->impl, 0, 0); - return 0; -} - -static inline int vmpu_callback_true(vmpu_user* u, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, true, 0, 0); - return 0; -} - -static inline int vmpu_callback_false(vmpu_user* u, vmpu_object* o) -{ - u->impl->TopAction()->Scalar(u->impl, false, 0, 0); - return 0; -} - -static inline int vmpu_callback_array(vmpu_user* u, unsigned int n, vmpu_object* o) -{ - u->impl->TopAction()->BeginList(u->impl, n, 0, 0); - o->count = n; - if (n == 0) { - u->impl->TopAction()->EndList(u->impl); - } - return 0; -} - -static inline int vmpu_callback_array_item(vmpu_user* u, vmpu_object* c, vmpu_object o) -{ - c->count--; - if (c->count == 0) { - u->impl->TopAction()->EndList(u->impl); - } - return 0; -} - -static inline int vmpu_callback_map(vmpu_user* u, unsigned int n, vmpu_object* o) -{ - u->impl->TopAction()->BeginMap(u->impl, n, 0, 0); - o->count = n; - if (n == 0) { - u->impl->TopAction()->EndMap(u->impl); - } - return 0; -} - -static inline int vmpu_callback_map_item(vmpu_user* u, vmpu_object* c, - vmpu_object k, vmpu_object v) -{ - c->count--; - if (c->count == 0) { - u->impl->TopAction()->EndMap(u->impl); - } - return 0; -} - -static inline int vmpu_callback_raw(vmpu_user* u, const char* b, const char* p, - unsigned int l, vmpu_object* o) -{ - if (l >= MAGIC_BLOB_LENGTH && memcmp(MAGIC_BLOB_TAG, p, MAGIC_BLOB_LENGTH) == 0) { - u->impl->TopAction()->Scalar(u->impl, - libvariant::Blob::CreateCopy(p + MAGIC_BLOB_LENGTH, l - MAGIC_BLOB_LENGTH), 0, 0); - } else { - u->impl->TopAction()->Scalar(u->impl, p, l, 0, 0); - } - return 0; -} - -#include - -namespace libvariant { - - MsgPackParserImpl::MsgPackParserImpl(shared_ptr in) - : state(START), input(in), - ctx(new vmpu_context), - bytecount(0) - { - vmpu_init(ctx.get()); - ctx->user.impl = this; - } - - MsgPackParserImpl::~MsgPackParserImpl() - {} - - int MsgPackParserImpl::Run() { - while (!action_stack.empty()) { - unsigned len = 0; - const char *ptr = 0; - size_t off = 0; - int ret = 0; - switch (state) { - case START: - TopAction()->BeginDocument(this); - state = OK; - break; - case OK: - while (state == OK) { - if (off > 0) { len = 0; } - else { len += 1; } - ptr = (const char *)input->GetPtr(len); - if (!ptr || len == 0) { - throw std::runtime_error("unexpected end of data"); - } - off = 0; - ret = vmpu_execute(ctx.get(), ptr, len, &off); - if (ret < 0) { - std::ostringstream oss; - oss << "MsgPack: A parse error occured at byte offset " - << off + bytecount; - errorstr = oss.str(); - state = ERROR; - throw std::runtime_error(errorstr); - } else { - bytecount += off; - input->Release(off); - if (ret > 0) { - state = END; - } - } - } - break; - case END: - TopAction()->EndDocument(this); - state = DONE; - break; - case DONE: - return 1; - case ERROR: - throw std::runtime_error(errorstr); - } - } - return 0; - } - - void MsgPackParserImpl::Reset() { - state = START; - vmpu_init(ctx.get()); - ctx->user.impl = this; - } -} diff --git a/src/hos_libvariant/src/libvariant/src/MsgPackParser.h b/src/hos_libvariant/src/libvariant/src/MsgPackParser.h deleted file mode 100644 index 8b423015..00000000 --- a/src/hos_libvariant/src/libvariant/src/MsgPackParser.h +++ /dev/null @@ -1,49 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#ifndef VARIANT_MSGPACKPARSER_H -#define VARIANT_MSGPACKPARSER_H - -#pragma once -#include "../../libvariant/include/Variant/ParserInput.h" -#include "../../libvariant/include/Variant/Parser.h" -#include - -struct vmpu_context; - -namespace libvariant { - - class MsgPackParserImpl : public ParserImpl { - public: - enum State_t { - START, - OK, - END, - DONE, - ERROR - }; - - MsgPackParserImpl(shared_ptr in); - virtual ~MsgPackParserImpl(); - - virtual int Run(); - - virtual bool Done() const { return state == DONE; } - virtual bool Error() const { return state == ERROR; } - virtual bool Ok() const { return state == OK; } - /// Return a string describing the last error suitable for presentation to a user - virtual std::string ErrorStr() const { return errorstr; } - /// Reset the parser - virtual void Reset(); - private: - State_t state; - shared_ptr input; - shared_ptr ctx; - std::string errorstr; - unsigned bytecount; - }; -} - -#endif diff --git a/src/hos_libvariant/src/libvariant/src/ParseBool.cc b/src/hos_libvariant/src/libvariant/src/ParseBool.cc deleted file mode 100644 index 3915f260..00000000 --- a/src/hos_libvariant/src/libvariant/src/ParseBool.cc +++ /dev/null @@ -1,55 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - */ -#include "../../libvariant/src/ParseBool.h" - -#include - - -bool ParseBool(const std::string &str) { - static const char NO_STR[] = "no"; - static const char FALSE_STR[] = "false"; - bool result = true; - std::string::const_iterator cur = str.begin(); - const std::string::const_iterator end = str.end(); - while (cur != end && isspace(*cur)) { ++cur; } - if (cur == end) return result; - const char *cmpstr = 0; - if (tolower(*cur) == NO_STR[0]) { - cmpstr = &NO_STR[1]; - } else if (tolower(*cur) == FALSE_STR[0]) { - cmpstr = &FALSE_STR[1]; - } else if (*cur == '0') { - ++cur; - while (cur != end && *cur == '0') { ++cur; } - while (cur != end && isspace(*cur)) { ++cur; } - if (cur == end) { result = false; } - return result; - } - if (cmpstr != 0) { - ++cur; - int i = 0; - while (cur != end && cmpstr[i] != '\0' && tolower(*cur) == cmpstr[i]) { - ++cur; ++i; - } - while (cur != end && isspace(*cur)) { ++cur; } - if (cur == end) { result = false; } - } - return result; -} diff --git a/src/hos_libvariant/src/libvariant/src/ParseBool.h b/src/hos_libvariant/src/libvariant/src/ParseBool.h deleted file mode 100644 index f6773f8e..00000000 --- a/src/hos_libvariant/src/libvariant/src/ParseBool.h +++ /dev/null @@ -1,37 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - */ -#ifndef PARSEBOOL_H -#define PARSEBOOL_H -#pragma once -#include -/** - * \brief Parses string for a boolean value. - * - * Considers no, false, 0 and any abreviation - * like " f" to be false - * and everything else to be true (including - * the empty string). - * Ignores whitespace. - * Note "false blah" is true! - * \return true or false - * \param str the string to parse - */ -bool ParseBool(const std::string &str); -#endif diff --git a/src/hos_libvariant/src/libvariant/src/Parser.cc b/src/hos_libvariant/src/libvariant/src/Parser.cc deleted file mode 100644 index 8a208f2a..00000000 --- a/src/hos_libvariant/src/libvariant/src/Parser.cc +++ /dev/null @@ -1,127 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/include/Variant/Parser.h" - -#include - -#include "../../libvariant/include/Variant/ParserInput.h" -#include "../../libvariant/src/JSONParser.h" -#ifdef ENABLE_YAML -#include "../../libvariant/src/YAMLParser.h" -#endif -#ifdef ENABLE_XML -#include "../../libvariant/src/XMLPLISTParser.h" -#endif -#ifdef ENABLE_MSGPACK -#include "../../libvariant/src/MsgPackParser.h" -#endif -#include "../../libvariant/src/BundleHdrParser.h" -#include "../../libvariant/include/Variant/GuessFormat.h" -namespace libvariant { - - ParserActions::~ParserActions() {} - - ParserImpl::~ParserImpl() {} - - void ParserImpl::Reset() { - throw std::runtime_error("Parser does not support reset."); - } - - Parser::Parser() {} - Parser::Parser(shared_ptr pi) : impl(pi) {} - Parser::~Parser() {} - - shared_ptr CreateParserInput(const std::string &str) { - return CreateParserInput(str.c_str(), str.length()); - } - - shared_ptr CreateParserInput(const char *str) { - return shared_ptr(new ParserMemoryInput(str, strlen(str))); - } - shared_ptr CreateParserInput(const void *ptr, unsigned len) { - return shared_ptr(new ParserMemoryInput(ptr, len)); - } - shared_ptr CreateParserInputFile(const char *filename) { - return shared_ptr(new ParserFilenameInput(filename)); - } - - shared_ptr CreateParserInputFile(FILE *f) { - return shared_ptr(new ParserFileInput(f)); - } - - shared_ptr CreateParserInputFile(std::streambuf *sb) { - return shared_ptr(new ParserStreambufInput(sb)); - } - - Parser CreateParser(shared_ptr i, SerializeType type) { - switch (type) { - case SERIALIZE_XMLPLIST: - return XMLPLISTParser(i); - case SERIALIZE_JSON: - return JSONParser(i); - case SERIALIZE_BUNDLEHDR: - return BundleHdrParser(i); - case SERIALIZE_GUESS: - return CreateParserGuess(i); - case SERIALIZE_MSGPACK: - return MsgPackParser(i); - case SERIALIZE_YAML: - default: - return YAMLParser(i); - } - } - - Parser CreateParserGuess(shared_ptr i) { - SerializeType type = GuessFormat(i.get()); - return CreateParser(i, type); - } - - Parser JSONParser(shared_ptr i) { - return Parser(shared_ptr(new JSONParserImpl(i))); - } - Parser YAMLParser(shared_ptr i) { -#ifdef ENABLE_YAML - return Parser(shared_ptr(new YAMLParserImpl(i))); -#else - throw std::runtime_error("libvariant not compiled with YAML support."); -#endif - } - Parser XMLPLISTParser(shared_ptr i) { -#ifdef ENABLE_XML - return Parser(shared_ptr(new XMLPLISTParserImpl(i))); -#else - throw std::runtime_error("libvariant not compiled with plist xml support."); -#endif - } - - Parser BundleHdrParser(shared_ptr i) { - return Parser(shared_ptr(new BundleHdrParserImpl(i))); - } - - Parser MsgPackParser(shared_ptr i) { -#ifdef ENABLE_MSGPACK - return Parser(shared_ptr(new MsgPackParserImpl(i))); -#else - throw std::runtime_error("libvariant not compiled with msgpack support."); -#endif - } -} diff --git a/src/hos_libvariant/src/libvariant/src/ParserInput.cc b/src/hos_libvariant/src/libvariant/src/ParserInput.cc deleted file mode 100644 index 7fc1f0b6..00000000 --- a/src/hos_libvariant/src/libvariant/src/ParserInput.cc +++ /dev/null @@ -1,164 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/include/Variant/ParserInput.h" - -#include -#include -#include -#include -#include - -namespace libvariant { - - //---------------------------------------------------------------------- - // ParserInput - - ParserInput::~ParserInput() {} - - //---------------------------------------------------------------------- - // ParserStreamInput - - ParserStreamInput::ParserStreamInput(unsigned buffer_len) - : buffer(buffer_len), - num(0), - offset(0), - eof(false) - { - - } - - const void *ParserStreamInput::GetPtr(unsigned &len) { - if (eof) { - len = num; - if (num == 0) { return 0; } - return &buffer[offset]; - } - if (len <= num && num > 0) { - len = num; - return &buffer[offset]; - } - if (len + offset > buffer.size()) { - if (len > buffer.size()) { - std::vector newbuffer(len); - memmove(&newbuffer[0], &buffer[offset], num); - std::swap(newbuffer, buffer); - } else { - memmove(&buffer[0], &buffer[offset], num); - } - offset = 0; - } - while (!eof && (num < len || num == 0)) { - unsigned to_read = buffer.size() - num - offset; - unsigned num_read = Read(&buffer[num + offset], to_read); - if (num_read < to_read) { eof = true; } - num += num_read; - } - len = num; - if (num == 0 && eof) { return 0; } - return &buffer[offset]; - } - - void ParserStreamInput::Release(unsigned len) { - if (len > num) { - throw std::runtime_error("ParserStreamInput: trying to release more than was aquired."); - } else if (len == num) { - num = 0; - offset = 0; - } else { - offset += len; - num -= len; - } - } - - //---------------------------------------------------------------------- - // ParserMemoryInput - - ParserMemoryInput::ParserMemoryInput(const void *ptr, unsigned len) - : data_ptr(ptr), data_len(len), offset(0) {} - - const void *ParserMemoryInput::GetPtr(unsigned &len) { - if (offset > data_len) { - throw std::length_error("Parser input buffer underflow."); - } - len = data_len - offset; - if (len > 0) { - return (const void*)((char*)data_ptr + offset); - } else { - return 0; - } - } - - void ParserMemoryInput::Release(unsigned len) { - offset += len; - } - - //---------------------------------------------------------------------- - // ParserFileInput - - ParserFileInput::ParserFileInput(FILE *f) - : ParserStreamInput(8192), file(f) - { - } - - unsigned ParserFileInput::Read(void *ptr, unsigned len) { - unsigned num_read = fread(ptr, 1, len, file); - int error = errno; - if (num_read) return num_read; - if (ferror(file)) { - std::ostringstream oss; - oss << "Error reading from file: "; - oss << strerror(error); - throw std::runtime_error(oss.str()); - } - return 0; - } - - //---------------------------------------------------------------------- - // ParserFilenameInput - - ParserFilenameInput::ParserFilenameInput(const char *filename, const char *mode) - : ParserFileInput(fopen(filename, mode)) - { - if (!file) { - std::ostringstream oss; - oss << "Unable to open " << filename; - throw std::runtime_error(oss.str()); - } - } - - ParserFilenameInput::~ParserFilenameInput() { - fclose(file); - } - - //---------------------------------------------------------------------- - // ParserStreambufInput - - ParserStreambufInput::ParserStreambufInput(std::streambuf *sb) - : ParserStreamInput(8192), streambuf(sb) - { - } - - unsigned ParserStreambufInput::Read(void *ptr, unsigned len) { - return streambuf->sgetn((char*)ptr, len); - } -} - diff --git a/src/hos_libvariant/src/libvariant/src/Path.cc b/src/hos_libvariant/src/libvariant/src/Path.cc deleted file mode 100644 index 76e0efb4..00000000 --- a/src/hos_libvariant/src/libvariant/src/Path.cc +++ /dev/null @@ -1,117 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/include/Variant/Path.h" - -#include - -namespace libvariant { - - void ParsePath(Path &parsed_path, const std::string &path) { - const char *c = path.c_str(); - const char *e = c + path.length(); - std::string frag; - bool escape = false; - bool index = false; - bool key = false; - while (c != e) { - if (escape) { - frag.append(c, 1); - escape = false; - } else if (index) { - if (*c == ']') { - std::istringstream iss(frag); - unsigned long long i = 0; - if (!(iss >> i)) { - throw std::runtime_error("Error parsing Variant path: \"" + frag + "\" is not a number."); - } - parsed_path.push_back(i); - frag.clear(); - index = false; - } else { - frag.append(c, 1); - } - } else if (key) { - switch (*c) { - case '/': - parsed_path.push_back(frag); - frag.clear(); - break; - case '[': - parsed_path.push_back(frag); - frag.clear(); - key = false; - index = true; - break; - case '\\': - escape = true; - break; - default: - frag.append(c, 1); - break; - } - } else { - switch (*c) { - case '/': - frag.clear(); - key = true; - break; - case '[': - frag.clear(); - index = true; - break; - default: - frag.clear(); - key = true; - frag.append(c, 1); - break; - } - } - ++c; - } - if (!frag.empty()) { parsed_path.push_back(frag); } - } - - Path ParsePath(const std::string &path) { - Path parsed_path; - ParsePath(parsed_path, path); - return parsed_path; - } - - std::string PathString(const Path &path) { - if (path.empty()) { return "/"; } - std::ostringstream oss; - for (Path::const_iterator i(path.begin()), e(path.end()); i != e; ++i) { - if (i->IsString()) { - std::string fragment = i->AsString(); - oss << "/"; - for (unsigned i = 0; i < fragment.size(); ++i) { - switch (fragment[i]) { - case '/': - oss << "\\/"; - break; - case '[': - oss << "\\["; - break; - case ']': - oss << "\\]"; - break; - case '\\': - oss << "\\\\"; - break; - default: - oss << fragment[i]; - break; - } - } - } else if (i->IsNumber()) { - oss << "[" << i->AsUnsigned() << "]"; - } else { - throw BadPathError("Unknown path element type"); - } - } - return oss.str(); - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/Payload.cc b/src/hos_libvariant/src/libvariant/src/Payload.cc deleted file mode 100644 index acd400cb..00000000 --- a/src/hos_libvariant/src/libvariant/src/Payload.cc +++ /dev/null @@ -1,347 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/include/Variant/Payload.h" - -#include -#include -#include -#include "../../libvariant/include/Variant/Path.h" - -#define PADDING_MOD 32 - -namespace libvariant { - - struct PayloadEmitState { - Emitter e; - Path::iterator len_end; - Path::iterator data_end; - uintmax_t payload_len; - }; - - void PayloadEmit( - const Variant &v, - Path::iterator len_i, - bool on_len_path, - Path::iterator data_i, - bool on_data_path, - PayloadEmitState &state) - { - if (on_len_path && len_i == state.len_end) { - state.e.Emit(state.payload_len); - return; - } - if (on_data_path && data_i == state.data_end) { - state.e.EmitNull(); - return; - } - - bool output_len = false; - unsigned index = 0; - unsigned length = 0; - - switch (v.GetType()) { - case Variant::NullType: - state.e.EmitNull(); - break; - case Variant::BoolType: - if (v.AsBool()) { - state.e.EmitTrue(); - } else { - state.e.EmitFalse(); - } - break; - case Variant::IntegerType: - state.e.Emit(v.AsInt()); - break; - case Variant::UnsignedType: - state.e.Emit(v.AsUnsigned()); - break; - case Variant::FloatType: - state.e.Emit(v.AsDouble()); - break; - case Variant::StringType: - state.e.Emit(v.AsString()); - break; - case Variant::ListType: - length = v.Size(); - if (on_len_path && length <= len_i->AsUnsigned()) { length = len_i->AsUnsigned() + 1; } - state.e.BeginList(length); - for (Variant::ConstListIterator i(v.ListBegin()), e(v.ListEnd()); i != e; ++i, ++index) { - bool on_len = on_len_path && index == len_i->AsUnsigned(); - bool on_data = on_data_path && index == data_i->AsUnsigned(); - PayloadEmit(*i, - (on_len ? len_i + 1 : len_i), on_len, - (on_data ? data_i + 1 : data_i), on_data, - state); - } - if (on_len_path && len_i->AsUnsigned() < index) { - while (len_i->AsUnsigned() < index) { - state.e.EmitNull(); - ++index; - } - if (len_i+1 != state.len_end) { - Variant tmp; - Path newpath(len_i+1, state.len_end); - tmp.SetPath(newpath, state.payload_len); - state.e << tmp; - } else { - state.e.Emit(state.payload_len); - } - } - state.e.EndList(); - break; - case Variant::MapType: - length = v.Size(); - if (on_len_path && !v.Contains(len_i->AsString())) { length++; } - if (on_data_path && v.Contains(data_i->AsString())) { length--; } - state.e.BeginMap(length); - for (Variant::ConstMapIterator i(v.MapBegin()), e(v.MapEnd()); i != e; ++i) { - bool on_len = on_len_path && i->first == len_i->AsString(); - if (on_len) { output_len = true; } - bool on_data = on_data_path && i->first == data_i->AsString(); - if ( !(on_data && data_i + 1 == state.data_end) ) { - state.e.Emit(i->first); - PayloadEmit(i->second, - (on_len ? len_i + 1 : len_i), on_len, - (on_data ? data_i + 1 : data_i), on_data, - state); - } - } - if (on_len_path && !output_len) { - state.e.Emit(len_i->AsString()); - if (len_i+1 != state.len_end) { - Variant tmp; - Path newpath(len_i+1, state.len_end); - tmp.SetPath(newpath, state.payload_len); - state.e << tmp; - } else { - state.e.Emit(state.payload_len); - } - } - state.e.EndMap(); - break; - case Variant::BlobType: - state.e << v.AsBlob(); - break; - default: - throw UnknownTypeError(v.GetType()); - } - } - - void SerializeWithPayload(shared_ptr out, Variant v, SerializeType type, Variant params) - { - if (!v.IsMap()) { - throw std::runtime_error("libvariant: Serializing with payload requires root element to be a map."); - } - - Path dpath; - Path lpath; - if (type == SERIALIZE_BUNDLEHDR) { - ParsePath(dpath, params.Get("data_path", VARIANT_BUNDLE_PAYLOAD_DATA_PATH).AsString()); - ParsePath(lpath, params.Get("length_path", VARIANT_BUNDLE_PAYLOAD_LENGTH_PATH).AsString()); - } else { - ParsePath(dpath, params.Get("data_path", VARIANT_PAYLOAD_DATA_PATH).AsString()); - ParsePath(lpath, params.Get("length_path", VARIANT_PAYLOAD_LENGTH_PATH).AsString()); - } - bool ignore_payload = params.Get("ignore_payload", false).AsBool(); - uintmax_t payload_length = 0; - - bool payload_exists = v.HasPath(dpath); - BlobPtr blob; - if (payload_exists) { - blob = v.GetPath(dpath).AsBlob(); - payload_length = blob->GetTotalLength(); - } else if (ignore_payload) { - payload_length = v.GetPath(lpath, 0).AsUnsigned(); - } - payload_length = params.Get("payload_length", payload_length).AsUnsigned(); - - - Emitter emitter = CreateEmitter(out, type, params); - PayloadEmitState state; - state.e = emitter; - state.len_end = lpath.end(); - state.data_end = dpath.end(); - state.payload_len = payload_length; - - emitter.BeginDocument(); - PayloadEmit(v, lpath.begin(), true, dpath.begin(), true, state); - emitter.EndDocument(); - emitter.Flush(); - - // plus 1 because we want a payload to be aligned when adding 1 null byte - unsigned num = PADDING_MOD - (out->NumBytesWritten() + 1) % PADDING_MOD; - std::vector buf(num, '\n'); - buf.push_back('\0'); - unsigned written = 0; - while (written < num) { - written += out->Write(&buf[written], buf.size() - written); - } - - if (payload_exists && !ignore_payload) { - unsigned num_slabs = blob->GetNumBuffers(); - for (unsigned slab = 0; slab < num_slabs; ++slab) { - unsigned to_write = blob->GetLength(slab); - char *ptr = (char*)blob->GetPtr(slab); - while (to_write > 0) { - unsigned num = out->Write(ptr, to_write); - ptr += num; - to_write -= num; - } - } - out->Flush(); - } - } - - class ProxyInput : public ParserInput { - public: - ProxyInput(shared_ptr i); - virtual ~ProxyInput(); - virtual const void *GetPtr(unsigned &len); - virtual void Release(unsigned len); - private: - shared_ptr base_input; - unsigned scanned_to; - }; - - ProxyInput::ProxyInput(shared_ptr i) - : base_input(i), scanned_to(0) - {} - - ProxyInput::~ProxyInput() {} - - const void *ProxyInput::GetPtr(unsigned &len) { - const void *retptr = base_input->GetPtr(len); - if (retptr) { - const char *ptr = (const char*)retptr; - if (ptr[scanned_to] != '\0') { - scanned_to += strnlen(&ptr[scanned_to], len-scanned_to); - - } - len = std::min(len, scanned_to); - } - return retptr; - } - - void ProxyInput::Release(unsigned len) { - scanned_to -= len; - base_input->Release(len); - } - - Variant DeserializeWithPayload(shared_ptr in, SerializeType type, Variant params, bool be_safe) - { - Path dpath; - Path lpath; - if (type == SERIALIZE_BUNDLEHDR) { - ParsePath(dpath, params.Get("data_path", VARIANT_BUNDLE_PAYLOAD_DATA_PATH).AsString()); - ParsePath(lpath, params.Get("length_path", VARIANT_BUNDLE_PAYLOAD_LENGTH_PATH).AsString()); - } else { - ParsePath(dpath, params.Get("data_path", VARIANT_PAYLOAD_DATA_PATH).AsString()); - ParsePath(lpath, params.Get("length_path", VARIANT_PAYLOAD_LENGTH_PATH).AsString()); - } - - shared_ptr input(new ProxyInput(in)); - Parser parser = CreateParser(input, type); - Variant ret = ParseVariant(parser); - - // Read any remaining bytes up to and including a terminating null if present. - bool loop = true; - while (loop) { - unsigned len = 1; - const char *ptr = (const char *)in->GetPtr(len); - if (len > 0) { - unsigned i; - for (i = 0; i < len && loop; ++i) { - if (ptr[i] == '\0') { - loop = false; - } - } - in->Release(i); - } else { loop = false; } - } - - uintmax_t payload_length = ret.GetPath(lpath, 0u).AsUnsigned(); - - if (payload_length > 0) { - // Note: make a copy when be_safe is true, otherwise just - // reference the buffer that the input returns. This is only - // a valid thing to do when the input is a memory buffer input - unsigned len = payload_length; - const void *ptr = in->GetPtr(len); - if (len < payload_length) { - throw std::runtime_error("libvariant: Error parsing payload, " - "unexpected EOF encountered when reading payload"); - } - BlobPtr payload; - if (be_safe) { - payload = Blob::CreateCopy(ptr, payload_length); - } else { - payload = Blob::CreateReferenced((void*)ptr, payload_length); - } - in->Release(payload_length); - ret.SetPath(dpath, payload); - } - return ret; - } - - std::string SerializeWithPayload(Variant v, SerializeType type, Variant params) { - std::ostringstream oss; - SerializeWithPayload(oss.rdbuf(), v, type, params); - return oss.str(); - } - - void SerializeWithPayload(const std::string &filename, Variant v, SerializeType type, - Variant params) { - shared_ptr o = CreateEmitterOutput(filename.c_str()); - SerializeWithPayload(o, v, type, params); - } - - void SerializeWithPayload(FILE *f, Variant v, SerializeType type, - Variant params) { - shared_ptr o = CreateEmitterOutput(f); - SerializeWithPayload(o, v, type, params); - } - - void SerializeWithPayload(std::streambuf *sb, Variant v, SerializeType type, - Variant params) { - shared_ptr o = CreateEmitterOutput(sb); - SerializeWithPayload(o, v, type, params); - } - - unsigned SerializeWithPayload(void *ptr, unsigned len, Variant v, SerializeType type, - Variant params) { - unsigned out_len = 0; - shared_ptr o = CreateEmitterOutput(ptr, len, &out_len); - SerializeWithPayload(o, v, type, params); - return out_len; - } - - Variant DeserializeWithPayload(const std::string &str, SerializeType type, Variant params) { - return DeserializeWithPayload(str.c_str(), str.length(), type, params); - } - - Variant DeserializeWithPayload(const void *ptr, unsigned len, SerializeType type, - Variant params, bool be_safe) - { - shared_ptr i = CreateParserInput(ptr, len); - return DeserializeWithPayload(i, type, params, be_safe); - } - - Variant DeserializeWithPayloadFile(const char *filename, SerializeType type, Variant params) { - shared_ptr i = CreateParserInputFile(filename); - return DeserializeWithPayload(i, type, params); - } - - Variant DeserializeWithPayloadFile(FILE *f, SerializeType type, Variant params) { - shared_ptr i = CreateParserInputFile(f); - return DeserializeWithPayload(i, type, params); - } - - Variant DeserializeWithPayloadFile(std::streambuf *sb, SerializeType type, Variant params) { - shared_ptr i = CreateParserInputFile(sb); - return DeserializeWithPayload(i, type, params); - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/Schema.cc b/src/hos_libvariant/src/libvariant/src/Schema.cc deleted file mode 100644 index 0b5967c2..00000000 --- a/src/hos_libvariant/src/libvariant/src/Schema.cc +++ /dev/null @@ -1,996 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - * - * This code is based on the public domain JSONv4 validator tv4. - * tv4 is available at http://geraintluff.github.com/tv4/ - */ - -#include "../../libvariant/include/Variant/Schema.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "../../libvariant/include/Variant/Path.h" - -#define FLOAT_TOLERANCE 100*std::numeric_limits::epsilon() -#define RECURSION_LIMIT 100 - -namespace libvariant { - - struct StopValidation : public std::exception { - virtual const char *what() const throw() { return "stop validation"; } - }; - - struct SchemaContext { - SchemaContext(const SchemaContext &o) - : data_path(o.data_path), - schema_path(o.schema_path), - depth(o.depth), - loader(o.loader) - {} - - SchemaContext(SchemaLoader *l) - : depth(0), - loader(l) - {} - - void AddError(const std::string &m) { AddError(ValidationError(m, data_path, schema_path)); } - void AddError(const std::string &m, const SchemaContext &o) { - ValidationError err(m, data_path, schema_path); - err.AddSubError(o.result); - AddError(err); - } - - void AddError(const ValidationError &err) { - result.AddError(err); - throw StopValidation(); - } - - void AddSchemaError(const std::string &m) { AddSchemaError(SchemaError(m, schema_path)); } - void AddSchemaError(const SchemaError &err) { result.AddSchemaError(err); } - - void IncrDepth() { - depth += 1; - if (depth > RECURSION_LIMIT) { - std::ostringstream oss; - oss << "SchemaValidate reached recursion limit."; - AddSchemaError(oss.str()); - throw StopValidation(); - } - } - - void DecrDepth() { - depth -= 1; - } - - Path data_path; - Path schema_path; - unsigned depth; - SchemaResult result; - SchemaLoader *loader; - }; - - struct AutoDataPath { - AutoDataPath(SchemaContext &c, const PathElement &p) : ctx(c) { ctx.data_path.push_back(p); } - ~AutoDataPath() { ctx.data_path.pop_back(); } - SchemaContext &ctx; - }; - - struct AutoSchemaPath { - AutoSchemaPath(SchemaContext &c, const PathElement &p) : ctx(c) { ctx.schema_path.push_back(p); } - ~AutoSchemaPath() { ctx.schema_path.pop_back(); } - SchemaContext &ctx; - }; - - struct AutoDepth { - AutoDepth(SchemaContext &c) : ctx(c) { ctx.IncrDepth(); } - ~AutoDepth() { ctx.DecrDepth(); } - SchemaContext &ctx; - }; - - void SchemaValidate(SchemaContext &ctx, Variant schema, Variant data); - - void ValidateNot(SchemaContext &ctx, Variant schema, Variant data) { - if (!schema.Contains("not")) { return; } - AutoSchemaPath spath(ctx, "not"); - SchemaContext notctx(ctx); - try { - SchemaValidate(notctx, schema["not"], data); - } catch (const StopValidation &) { - return; - } - if (notctx.result.Error()) { return; } - ctx.AddError("Data matches schema from \"not\""); - } - - void ValidateOneOf(SchemaContext &ctx, Variant schema, Variant data) { - if (!schema.Contains("oneOf")) { return; } - AutoSchemaPath spath(ctx, "oneOf"); - if (!schema["oneOf"].IsList()) { - ctx.AddSchemaError("\"oneOf\" must be a list of schemas"); - return; - } - ValidationError error("Data does not match any schemas from \"oneOf\"", - ctx.data_path, ctx.schema_path); - unsigned num_validates = 0; - unsigned index = 0; - unsigned validIndex = 0; - for (Variant::ListIterator i(schema["oneOf"].ListBegin()), e(schema["oneOf"].ListEnd()); - i != e; ++i, ++index) - { - SchemaContext subctx(ctx); - try { - AutoSchemaPath spath(subctx, index); - SchemaValidate(subctx, *i, data); - if (!subctx.result.Error()) { num_validates++; } - } catch (const StopValidation &) {} - if (subctx.result.Error()) { error.AddSubError(subctx.result); } - if (num_validates == 1) { - validIndex = index; - } else if (num_validates > 1) { - std::ostringstream oss; - oss << "Data is valid against more than one schema from \"oneOf\": indeces " - << validIndex << " and " << index; - ctx.AddError(oss.str()); - } - } - if (num_validates == 0) { - ctx.AddError(error); - } - } - - void ValidateAnyOf(SchemaContext &ctx, Variant schema, Variant data) { - if (!schema.Contains("anyOf")) { return; } - AutoSchemaPath spath(ctx, "anyOf"); - if (!schema["anyOf"].IsList()) { - ctx.AddSchemaError("\"anyOf\" must be a list of schemas"); - return; - } - ValidationError error("Data does not match any schema from \"anyOf\"", - ctx.data_path, ctx.schema_path); - unsigned index = 0; - for (Variant::ListIterator i(schema["anyOf"].ListBegin()), e(schema["anyOf"].ListEnd()); - i != e; ++i, ++index) - { - SchemaContext subctx(ctx); - try { - AutoSchemaPath spath(subctx, index); - SchemaValidate(subctx, *i, data); - if (!subctx.result.Error()) { return; } - } catch (const StopValidation &) {} - error.AddSubError(subctx.result); - } - ctx.AddError(error); - } - - void ValidateAllOf(SchemaContext &ctx, Variant schema, Variant data) { - if (!schema.Contains("allOf")) { return; } - AutoSchemaPath spath(ctx, "allOf"); - if (!schema["allOf"].IsList()) { - ctx.AddSchemaError("\"allOf\" must be a list of schemas"); - return; - } - unsigned index = 0; - for (Variant::ListIterator i(schema["allOf"].ListBegin()), e(schema["allOf"].ListEnd()); - i != e; ++i, ++index) - { - AutoSchemaPath spath(ctx, index); - SchemaValidate(ctx, *i, data); - } - } - - void ValidateCombinations(SchemaContext &ctx, Variant schema, Variant data) { - ValidateAllOf(ctx, schema, data); - ValidateAnyOf(ctx, schema, data); - ValidateOneOf(ctx, schema, data); - ValidateNot(ctx, schema, data); - } - - void ValidateObjectDependenciesHelper(SchemaContext &ctx, const std::string &dep, Variant data) { - if (!data.Contains(dep)) { - std::ostringstream oss; - oss << "Dependency failed - key must exist: " << dep; - ctx.AddError(oss.str()); - } - } - - void ValidateObjectDependencies(SchemaContext &ctx, Variant schema, Variant data) { - if (schema.Contains("dependencies")) { - Variant deps = schema["dependencies"]; - AutoSchemaPath spath(ctx, "dependencies"); - if (!deps.IsMap()) { - ctx.AddSchemaError("Schema key \"dependencies\" must be an object."); - return; - } - for (Variant::MapIterator i(deps.MapBegin()), e(deps.MapEnd()); i != e; ++i) { - if (data.Contains(i->first)) { - AutoSchemaPath spath(ctx, i->first); - if (i->second.IsString()) { - ValidateObjectDependenciesHelper(ctx, i->second.AsString(), data); - } else if (i->second.IsList()) { - for (unsigned j = 0; j < i->second.Size(); ++j) { - AutoSchemaPath spath(ctx, j); - ValidateObjectDependenciesHelper(ctx, i->second[j].AsString(), data); - } - } else if (i->second.IsMap()) { - SchemaValidate(ctx, i->second, data); - } else { - ctx.AddSchemaError("Values for dependencies must be either a key, a list of" - " keys, or a schema."); - } - } - } - } - } - - // Helper class for ValidateObjectProperties - class PatternProperty { - public: - PatternProperty(const std::string &patternkey, Variant schm) - : key(patternkey), schema(schm) - { - memset(&pattern, 0, sizeof(regex_t)); - int err; - if ((err = regcomp(&pattern, key.c_str(), REG_EXTENDED | REG_NOSUB))) { - std::vector buffer(8192); - regerror(err, &pattern, &buffer[0], buffer.size()); - std::ostringstream oss; - oss << "Failed to compile patternProperty regex \"" << key << "\" with error: " - << &buffer[0]; - throw std::runtime_error(oss.str()); - } - } - ~PatternProperty() { - regfree(&pattern); - } - bool Test(const std::string &k) { - return regexec(&pattern, k.c_str(), 0, 0, 0) == 0; - } - Variant GetSchema() { return schema; } - std::string GetKey() { return key; } - private: - // Can't tell if it is safe to copy regex_t structures... - PatternProperty(const PatternProperty &); - std::string key; - regex_t pattern; - Variant schema; - }; - - void ValidateObjectProperties(SchemaContext &ctx, Variant schema, Variant data) { - // Precompile because we always match against all of them for every key - std::vector< shared_ptr > patternProperties; - if (schema.Contains("patternProperties")) { - AutoSchemaPath spath(ctx, "patternProperties"); - if (schema["patternProperties"].IsMap()) { - for (Variant::MapIterator i(schema["patternProperties"].MapBegin()), - e(schema["patternProperties"].MapEnd()); i != e; ++i) - { - try { - patternProperties.push_back( - shared_ptr( - new PatternProperty(i->first, i->second) - ) - ); - } catch (const std::runtime_error &e) { - AutoSchemaPath spath(ctx, i->first); - ctx.AddSchemaError(e.what()); - } - } - } else { - ctx.AddSchemaError("\"patternProperties\" must be an object"); - } - } - Variant properties = schema.Get("properties", Variant::MapType); - if (!properties.IsMap()) { - ctx.AddSchemaError("\"properties\" must be an object"); - properties = Variant::MapType; - } - for (Variant::MapIterator i(data.MapBegin()), e(data.MapEnd()); - i != e; ++i) - { - bool matchFound = false; - AutoDataPath dpath(ctx, i->first); - // Validate against property declarations - if (properties.Contains(i->first)) { - AutoSchemaPath spath(ctx, "properties"); - AutoSchemaPath spath2(ctx, i->first); - matchFound = true; - SchemaValidate(ctx, properties[i->first], i->second); - } - // Validate against all matching patternProperties declarations - for (unsigned j = 0; j < patternProperties.size(); ++j) { - if (patternProperties[j]->Test(i->first)) { - AutoSchemaPath spath(ctx, "patternProperties"); - AutoSchemaPath spath2(ctx, patternProperties[j]->GetKey()); - matchFound = true; - SchemaValidate(ctx, patternProperties[j]->GetSchema(), i->second); - } - } - // If no match was found for either of the previous cases validate - // against additionalProperties - if (!matchFound && schema.Contains("additionalProperties")) { - Variant additionalProps = schema["additionalProperties"]; - AutoSchemaPath spath(ctx, "additionalProperties"); - if (additionalProps.IsBool()) { - if (!additionalProps.AsBool()) { - ctx.AddError("Additional properties not allowed."); - } - } else { - SchemaValidate(ctx, additionalProps, i->second); - } - } - } - } - - void ValidateObjectRequiredProperties(SchemaContext &ctx, Variant schema, Variant data) { - if (schema.Contains("required")) { - unsigned index = 0; - Variant required = schema["required"]; - AutoSchemaPath spath(ctx, "required"); - if (!required.IsList()) { - ctx.AddSchemaError("\"required\" must be a list of required keys"); - return; - } - for (Variant::ListIterator i(required.ListBegin()), e(required.ListEnd()); - i != e; ++i, ++index) - { - AutoSchemaPath spath(ctx, index); - if (i->IsString()) { - std::string key = i->AsString(); - if (!data.Contains(key)) { - std::ostringstream oss; - oss << "Missing required property: " << key; - ctx.AddError(oss.str()); - } - } else { - ctx.AddSchemaError("Elements of the \"required\" list must be strings"); - } - } - } - // TODO: Add v3 compatibility by checking required keys in properties? - } - - void ValidateObjectMinMaxProperties(SchemaContext &ctx, Variant schema, Variant data) { - if (schema.Contains("minProperties")) { - AutoSchemaPath spath(ctx, "minProperties"); - if (schema["minProperties"].IsNumber()) { - uintmax_t minprops = schema["minProperties"].AsUnsigned(); - if (data.Size() < minprops) { - std::ostringstream oss; - oss << "Too few properties defined (" << data.Size() << "), minimum " << minprops; - ctx.AddError(oss.str()); - } - } else { - ctx.AddSchemaError("\"minProperties\" must be a number"); - } - } - if (schema.Contains("maxProperties")) { - AutoSchemaPath spath(ctx, "maxProperties"); - if (schema["maxProperties"].IsNumber()) { - uintmax_t maxprops = schema["maxProperties"].AsUnsigned(); - if (data.Size() > maxprops) { - std::ostringstream oss; - oss << "Too many properties defined (" << data.Size() << "), maximum " << maxprops; - ctx.AddError(oss.str()); - } - } else { - ctx.AddSchemaError("\"minProperties\" must be a number"); - } - } - } - - void ValidateObject(SchemaContext &ctx, Variant schema, Variant data) { - if (!data.IsMap() || data.IsNull()) { return; } - ValidateObjectMinMaxProperties(ctx, schema, data); - ValidateObjectRequiredProperties(ctx, schema, data); - ValidateObjectProperties(ctx, schema, data); - ValidateObjectDependencies(ctx, schema, data); - } - - void ValidateArrayItems(SchemaContext &ctx, Variant schema, Variant data) { - if (!schema.Contains("items")) { return; } - if (!data.IsList()) { return; } - if (schema["items"].IsList()) { - Variant items = schema["items"]; - unsigned datalength = data.Size(); - unsigned itemlength = items.Size(); - for (unsigned i(0); i < datalength; ++i) { - AutoDataPath dpath(ctx, i); - if (i < itemlength) { - AutoSchemaPath spath(ctx, "items"); - AutoSchemaPath spath2(ctx, i); - SchemaValidate(ctx, items[i], data[i]); - } else if (schema.Contains("additionalItems")) { - AutoSchemaPath spath(ctx, "additionalItems"); - if (schema["additionalItems"].IsBool()) { - if (!schema["additionalItems"].AsBool()) { - ctx.AddError("Additional items not allowed"); - } - } else { - SchemaValidate(ctx, schema["additionalItems"], data[i]); - } - } - } - } else { - unsigned datalength = data.Size(); - AutoSchemaPath spath(ctx, "items"); - for (unsigned i(0); i < datalength; ++i) { - AutoDataPath dpath(ctx, i); - SchemaValidate(ctx, schema["items"], data[i]); - } - } - } - - void ValidateArrayUniqueItems(SchemaContext &ctx, Variant schema, Variant data) { - if (!schema.Contains("uniqueItems")) { return; } - AutoSchemaPath spath(ctx, "uniqueItems"); - if (!schema["uniqueItems"].IsBool()) { - ctx.AddSchemaError("\"uniqueItems\" must be a boolean"); - return; - } - if (!schema["uniqueItems"].AsBool()) { return; } - unsigned length = data.Size(); - for (unsigned i(0); i < length; ++i) { - for (unsigned j(i+1); j < length; ++j) { - if (data[i].Comparable(data[j]) && data[i] == data[j]) { - std::ostringstream oss; - oss << "Array items are not unique (indices " << i << " and " << j << ")"; - ctx.AddError(oss.str()); - } - } - } - } - - void ValidateArrayLength(SchemaContext &ctx, Variant schema, Variant data) { - if (schema.Contains("minItems")) { - AutoSchemaPath spath(ctx, "minItems"); - if (schema["minItems"].IsNumber()) { - uintmax_t minItems = schema["minItems"].AsUnsigned(); - if (data.Size() < minItems) { - std::ostringstream oss; - oss << "Array is to short (" << data.Size() << "), minimum " << minItems; - ctx.AddError(oss.str()); - } - } else { - ctx.AddSchemaError("\"minItems\" must be a number"); - } - } - if (schema.Contains("maxItems")) { - AutoSchemaPath spath(ctx, "maxItems"); - if (schema["maxItems"].IsNumber()) { - uintmax_t maxItems = schema["maxItems"].AsUnsigned(); - if (data.Size() > maxItems) { - std::ostringstream oss; - oss << "Array is to long (" << data.Size() << "), maximum " << maxItems; - ctx.AddError(oss.str()); - } - } else { - ctx.AddSchemaError("\"maxItems\" must be a number"); - } - } - } - - void ValidateArray(SchemaContext &ctx, Variant schema, Variant data) { - if (!data.IsList()) { return; } - ValidateArrayLength(ctx, schema, data); - ValidateArrayUniqueItems(ctx, schema, data); - ValidateArrayItems(ctx, schema, data); - } - - void ValidateStringFormat(SchemaContext &ctx, Variant schema, Variant data) { - if (!schema.Contains("format")) { return; } - AutoSchemaPath spath(ctx, "format"); - if (!schema["format"].IsString()) { return; } - std::string format = schema["format"].AsString(); - regex_t pattern; - memset(&pattern, 0, sizeof(regex_t)); - std::string patternstr; - int err; - if (format == "regex") { - // From V3 spec - err = regcomp(&pattern, data.AsString().c_str(), REG_EXTENDED | REG_NOSUB); - if (err) { - std::ostringstream oss; - oss << "String \"" << data.AsString() << "\" not a valid regular expression."; - ctx.AddError(oss.str()); - } - regfree(&pattern); - } else { - if (format == "date-time") { - // From V4 spec - // RFC 3339, section 5.6 - patternstr = "^[0-9][0-9][0-9][0-9](-[0-1][0-9](-[0-3][0-9]" - "(T[0-9][0-9](:[0-9][0-9](:[0-9][0-9])?)?)?)?)?Z?$"; - } else if (format == "date") { - // From V3 spec: should be format of YYYY-MM-DD - patternstr = "^[0-9][0-9][0-9][0-9]-[0-1][0-9]-[0-3][0-9]$"; - } else if (format == "time") { - // From V3 spec: should be format of hh:mm:ss - patternstr = "^[0-2][0-9]:[0-5][0-9]:[0-5][0-9]$"; - } else if (format == "email") { - // RFC 5322, section 3.4.1 - // TODO - } else if (format == "hostname") { - // RFC 1034, section 3.1 - // TODO - } else if (format == "ipv4") { - // RFC 2676, section 3.2 - // TODO - } else if (format == "ipv6") { - // RFC 2373, section 2.2 - // TODO - } else if (format == "uri") { - // RFC 3986 - // TODO - } - - if (!patternstr.empty()) { - if ((err = regcomp(&pattern, patternstr.c_str(), REG_EXTENDED | REG_NOSUB))) { - std::vector buffer(8192); - regerror(err, &pattern, &buffer[0], buffer.size()); - std::ostringstream oss; - oss << "Failed to compile format regex \"" << patternstr << "\" with error: " - << &buffer[0]; - ctx.AddSchemaError(oss.str()); - return; - } - try { - if (regexec(&pattern, data.AsString().c_str(), 0, 0, 0)) { - ctx.AddError("String does not match format " + format); - } - } catch (...) { - regfree(&pattern); - throw; - } - regfree(&pattern); - } - } - } - - void ValidateStringPattern(SchemaContext &ctx, Variant schema, Variant data) { - if (!schema.Contains("pattern")) { return; } - AutoSchemaPath spath(ctx, "pattern"); - if (!schema["pattern"].IsString()) { - ctx.AddSchemaError("\"pattern\" must be a string"); - return; - } - regex_t pattern; - memset(&pattern, 0, sizeof(regex_t)); - std::string patternstr = schema["pattern"].AsString(); - int err; - if ((err = regcomp(&pattern, patternstr.c_str(), REG_EXTENDED | REG_NOSUB))) { - std::vector buffer(8192); - regerror(err, &pattern, &buffer[0], buffer.size()); - std::ostringstream oss; - oss << "Failed to compile pattern regex \"" << patternstr << "\" with error: " - << &buffer[0]; - ctx.AddSchemaError(oss.str()); - return; - } - try { - if (regexec(&pattern, data.AsString().c_str(), 0, 0, 0)) { - std::ostringstream oss; - oss << "String does not match pattern \"" - << patternstr << "\""; - ctx.AddError(oss.str()); - } - } catch (...) { - regfree(&pattern); - throw; - } - regfree(&pattern); - } - - void ValidateStringLength(SchemaContext &ctx, Variant schema, Variant data) { - if (schema.Contains("minLength")) { - AutoSchemaPath spath(ctx, "minLength"); - if (schema["minLength"].IsNumber()) { - // TODO: Get encoded length rather than byte length? - if (data.Size() < schema["minLength"].AsUnsigned()) { - std::ostringstream oss; - oss << "String is too short (" << data.Size() << " chars), minimum " - << schema["minLength"].AsUnsigned(); - ctx.AddError(oss.str()); - } - } else { - ctx.AddSchemaError("\"minLength\" must be a number"); - } - } - if (schema.Contains("maxLength")) { - AutoSchemaPath spath(ctx, "maxLength"); - if (schema["maxLength"].IsNumber()) { - // TODO: Get encoded length rather than byte length? - if (data.Size() > schema["maxLength"].AsUnsigned()) { - std::ostringstream oss; - oss << "String is too long (" << data.Size() << " chars), maximum " - << schema["maxLength"].AsUnsigned(); - ctx.AddError(oss.str()); - } - } else { - ctx.AddSchemaError("\"maxLength\" must be a number"); - } - } - } - - void ValidateString(SchemaContext &ctx, Variant schema, Variant data) { - if (!data.IsString()) { return; } - ValidateStringLength(ctx, schema, data); - ValidateStringPattern(ctx, schema, data); - ValidateStringFormat(ctx, schema, data); - } - - void ValidateMinMax(SchemaContext &ctx, Variant schema, Variant data) { - if (schema.Contains("minimum")) { - if (schema["minimum"].IsNumber()) { - if (data < schema["minimum"]) { - AutoSchemaPath spath(ctx, "minimum"); - std::ostringstream oss; - oss << "Value " << data.AsString() - << " is less than minimum " << schema["minimum"].AsString(); - ctx.AddError(oss.str()); - } - if (schema.Contains("exclusiveMinimum") && schema["exclusiveMinimum"].AsBool() - && data == schema["minimum"]) { - AutoSchemaPath spath(ctx, "exclusiveMinimum"); - std::ostringstream oss; - oss << "Value " << data.AsString() << " is equal to exclusive minimum " - << schema["minimum"].AsString(); - ctx.AddError(oss.str()); - } - } else { - AutoSchemaPath spath(ctx, "minimum"); - ctx.AddSchemaError("\"minimum\" must be a number"); - } - } - if (schema.Contains("maximum")) { - if (schema["maximum"].IsNumber()) { - if (data > schema["maximum"]) { - AutoSchemaPath spath(ctx, "maximum"); - std::ostringstream oss; - oss << "Value " << data.AsString() - << " is greater than maximum " << schema["maximum"].AsString(); - ctx.AddError(oss.str()); - } - if (schema.Contains("exclusiveMaximum") && schema["exclusiveMaximum"].AsBool() - && data == schema["maximum"]) { - AutoSchemaPath spath(ctx, "exclusiveMaximum"); - std::ostringstream oss; - oss << "Value " << data.AsString() - << " is equal to exclusive maximum " << schema["maximum"].AsString(); - ctx.AddError(oss.str()); - } - } else { - AutoSchemaPath spath(ctx, "maximum"); - ctx.AddSchemaError("\"maximum\" must be a number"); - } - } - } - - void ValidateMultipleOf(SchemaContext &ctx, Variant schema, Variant data) { - std::string multkey; - if (schema.Contains("multipleOf")) { - multkey = "multipleOf"; - } else if (schema.Contains("divisibleBy")) { - multkey = "divisibleBy"; - } else { - return; - } - AutoSchemaPath spath(ctx, multkey); - Variant multipleof = schema[multkey]; - if (!multipleof.IsNumber() || multipleof < 0) { - std::ostringstream oss; - oss << "\"" << multkey << "\" must be a positive number"; - ctx.AddSchemaError(oss.str()); - return; - } - Variant mod = data % multipleof; - if (data.IsFloat() || multipleof.IsFloat()) { - // We have an issue here of the fact that many numeric values in base 10 are - // not exactly represented in binary floating point. - // So, we need to check if it is within epsilon of 0 - long double m = mod.AsLongDouble(); - long double divisor = multipleof.AsLongDouble(); - long double tolerance = FLOAT_TOLERANCE; - - if (m > tolerance && std::abs(m - divisor) > tolerance) { - std::ostringstream oss; - oss << "Value " << data.AsString() << " is not a multiple of " << multipleof.AsString(); - //oss << "\nmodulus: " << m << "\n|modulus-divisor|: " << std::abs(m - divisor) - // << "\ntolerance " << tolerance; - ctx.AddError(oss.str()); - } - } else if (mod != 0) { - std::ostringstream oss; - oss << "Value " << data.AsString() << " is not a multiple of " << multipleof.AsString(); - ctx.AddError(oss.str()); - } - } - - void ValidateNumeric(SchemaContext &ctx, Variant schema, Variant data) { - if (!data.IsNumber()) { return; } - ValidateMultipleOf(ctx, schema, data); - ValidateMinMax(ctx, schema, data); - } - - void ValidateEnum(SchemaContext &ctx, Variant schema, Variant data) { - if (!schema.Contains("enum")) { return; } - Variant enm = schema["enum"]; - AutoSchemaPath spath(ctx, "enum"); - if (!enm.IsList()) { - ctx.AddSchemaError("\"enum\" must be an array"); - return; - } - for (Variant::ListIterator i(enm.ListBegin()), e(enm.ListEnd()); i!=e; ++i) { - if (i->Comparable(data) && *i == data) { return; } - } - std::ostringstream oss; - oss << "No enum match for: "; - SerializeJSON(oss.rdbuf(), data); - ctx.AddError(oss.str()); - } - - void ValidateType(SchemaContext &ctx, Variant schema, Variant data) { - if (!schema.Contains("type")) { return; } - AutoSchemaPath spath(ctx, "type"); - std::vector allowed_types; - if (schema["type"].IsList()) { - allowed_types = schema["type"].AsList(); - } else { - // TODO: v3 compatibility - // if (schema["type"] == "any") { return; } - allowed_types.push_back(schema["type"]); - } - std::ostringstream oss; - unsigned index = 0; - for (Variant::ListIterator i(allowed_types.begin()), e(allowed_types.end()); - i != e; ++i, ++index) { - if (*i == "array") { - if (data.IsList()) { return; } - } else if (*i == "boolean") { - if (data.IsBool()) { return; } - } else if (*i == "integer") { - if (data.IsInt() || data.IsUnsigned()) { return; } - if (data.IsFloat() && data % 1 == 0) { return; } - } else if (*i == "null") { - if (data.IsNull()) { return; } - } else if (*i == "number") { - if (data.IsNumber()) { return; } - } else if (*i == "object") { - if (data.IsMap()) { return; } - } else if (*i == "string") { - if (data.IsString()) { return; } - } else { - AutoSchemaPath spath(ctx, index); - std::ostringstream oss; - oss << "Invalid schema type: \"" << i->AsString() << "\""; - ctx.AddSchemaError(oss.str()); - } - } - oss << "invalid data type: \"" << data.GetType() << "\" expected"; - if (allowed_types.size() == 1) { - oss << ": \"" << allowed_types.front().AsString() << "\""; - } else { - oss << " one of: ["; - for (Variant::ListIterator i(allowed_types.begin()), e(allowed_types.end()); - i != e; ++i) { - oss << "\"" << i->AsString() << "\""; - if (i+1 != e) { oss << ", "; } - } - oss << "]"; - } - ctx.AddError(oss.str()); - } - - void ValidateBasic(SchemaContext &ctx, Variant schema, Variant data) { - ValidateType(ctx, schema, data); - ValidateEnum(ctx, schema, data); - } - - void SchemaValidate(SchemaContext &ctx, Variant schema, Variant data) { - AutoDepth depth(ctx); - // Empty schema always validates - if (!schema.IsMap()) { return; } - if (schema.Contains("$ref") && schema["$ref"].IsString()) { - SchemaValidate(ctx, ctx.loader->GetSchema(schema["$ref"].AsString()), data); - } - ValidateBasic(ctx, schema, data); - ValidateNumeric(ctx, schema, data); - ValidateString(ctx, schema, data); - ValidateArray(ctx, schema, data); - ValidateObject(ctx, schema, data); - ValidateCombinations(ctx, schema, data); - } - - SchemaResult SchemaValidate(Variant schema, Variant data, SchemaLoader *loader) - { - SchemaLoader lloader(loader); - if (schema.IsNull() && data.IsMap() && data.Contains("$schema")) { - schema["$ref"] = data["$schema"]; - } - if (schema.IsString()) { - schema = lloader.GetSchema(schema.AsString()); - } - lloader.AddSchema("", schema); - SchemaContext ctx(&lloader); - try { - SchemaValidate(ctx, schema, data); - } catch (const StopValidation &) {} - return ctx.result; - } - - void AddSchemaDefaultsImpl(Variant schema, VariantRef data, SchemaLoader *loader); - - void AddSchemaListDefaultsImpl(VariantRef slist, VariantRef data, SchemaLoader *loader) { - if (slist.Exists() && slist.IsList()) { - for (Variant::ListIterator i(slist.ListBegin()), e(slist.ListEnd()); i != e; ++i) { - AddSchemaDefaultsImpl(*i, data, loader); - } - } - } - - void AddSchemaDefaultsImpl(Variant schema, VariantRef data, SchemaLoader *loader) { - if (!schema.IsMap()) { return; } - if (schema.Contains("$ref") && schema["$ref"].IsString()) { - AddSchemaDefaultsImpl(loader->GetSchema(schema["$ref"].AsString()), data, loader); - } - if (schema.Contains("default") && (!data.Exists() || data.IsNull())) { - data = schema["default"].Copy(); - return; - } - if (schema.Contains("properties") && (!data.Exists() || data.IsMap())) { - for (Variant::MapIterator i(schema["properties"].MapBegin()), e(schema["properties"].MapEnd()); - i != e; ++i) - { - AddSchemaDefaultsImpl(i->second, data.At(i->first), loader); - } - } - if (schema.Contains("items") && (!data.Exists() || data.IsList())) { - if (schema["items"].IsList()) { - for (unsigned i = 0; i < schema["items"].Size(); ++i) - { - AddSchemaDefaultsImpl(schema["items"][i], data[i], loader); - } - } else { - AddSchemaDefaultsImpl(schema["items"], data[0], loader); - } - } - AddSchemaListDefaultsImpl(schema["allOf"], data, loader); - AddSchemaListDefaultsImpl(schema["oneOf"], data, loader); - AddSchemaListDefaultsImpl(schema["anyOf"], data, loader); - } - - void AddSchemaDefaults(Variant schema, VariantRef data, SchemaLoader *loader) { - SchemaLoader lloader(loader); - if (schema.IsNull() && data.IsMap() && data.Contains("$schema")) { - schema["$ref"] = data["$schema"]; - } - if (schema.IsString()) { - schema = lloader.GetSchema(schema.AsString()); - } - lloader.AddSchema("", schema); - AddSchemaDefaultsImpl(schema, data, &lloader); - } - - void InsertIndent(std::ostream &os, unsigned indent) { - for (unsigned i = 0; i < indent; ++i) { os << "\t"; } - } - - ValidationError::ValidationError(const std::string &m, const Path &dpath, - const Path &spath) - : message(m), - data_path(dpath), - schema_path(spath) - {} - - void ValidationError::AddSubError(const SchemaResult &err) { - sub_errors.push_back(err); - } - - std::string ValidationError::GetDataPathStr() const { - return PathString(data_path); - } - - std::string ValidationError::GetSchemaPathStr() const { - return PathString(schema_path); - } - - std::string ValidationError::PrettyPrintMessage() const { - std::ostringstream oss; - PrettyPrintMessage(oss); - return oss.str(); - } - - void ValidationError::PrettyPrintMessage(std::ostream &os, unsigned indent) const { - InsertIndent(os, indent); - os << "validation error: " << message << "\n"; - InsertIndent(os, indent); - os << "data path: " << GetDataPathStr() << "\n"; - InsertIndent(os, indent); - os << "schema path: " << GetSchemaPathStr() << "\n"; - if (!sub_errors.empty()) { - InsertIndent(os, indent); - os << "sub errors:\n"; - for (unsigned i = 0; i < sub_errors.size(); ++i) { - sub_errors[i].PrettyPrintMessage(os, indent+1); - } - } - } - - SchemaError::SchemaError(const std::string &m, const Path &spath) - : message(m), - schema_path(spath) - { - } - - std::string SchemaError::GetSchemaPathStr() const { - return PathString(schema_path); - } - - std::string SchemaError::PrettyPrintMessage() const { - std::ostringstream oss; - PrettyPrintMessage(oss); - return oss.str(); - } - - void SchemaError::PrettyPrintMessage(std::ostream &os, unsigned indent) const { - InsertIndent(os, indent); - os << "schema error: " << message << "\n"; - InsertIndent(os, indent); - os << "schema path: " << GetSchemaPathStr() << "\n"; - } - - SchemaResult::SchemaResult() - { - } - - void SchemaResult::AddError(const ValidationError &err) { - errors.push_back(err); - } - - void SchemaResult::AddSchemaError(const SchemaError &err) { - schema_errors.push_back(err); - } - - std::string SchemaResult::PrettyPrintMessage() const { - std::ostringstream oss; - PrettyPrintMessage(oss); - return oss.str(); - } - - void SchemaResult::PrettyPrintMessage(std::ostream &os, unsigned indent) const { - if (!errors.empty()) { - for (unsigned i = 0; i < errors.size(); ++i) { - errors[i].PrettyPrintMessage(os, indent); - } - } - if (!schema_errors.empty()) { - for (unsigned i = 0; i < schema_errors.size(); ++i) { - schema_errors[i].PrettyPrintMessage(os, indent); - } - } - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/SchemaLoader.cc b/src/hos_libvariant/src/libvariant/src/SchemaLoader.cc deleted file mode 100644 index 20f1ea9e..00000000 --- a/src/hos_libvariant/src/libvariant/src/SchemaLoader.cc +++ /dev/null @@ -1,572 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/include/Variant/SchemaLoader.h" - -#include -#include -#include -#include -#include -#include - -#include "../../libvariant/include/Variant/Extensions.h" -#ifdef ENABLE_CURL -#include -#endif - -#if 0 -#include -#define DBPRINT(a) std::cerr << a -#else -#define DBPRINT(a) -#endif - -namespace libvariant { - - extern const char JSON_SCHEMA_V4_SCHEMA[]; - class SchemaStaticData { - public: - SchemaStaticData() { - JSON_SCHEMA_SCHEMA = DeserializeJSON(JSON_SCHEMA_V4_SCHEMA); - SCHEMA_URI = SchemaLoader::ResolveURI(JSON_SCHEMA_SCHEMA["id"].AsString(), ""); - SchemaLoader::NormSchema(JSON_SCHEMA_SCHEMA, SCHEMA_URI); - } - Variant JSON_SCHEMA_SCHEMA; - std::string SCHEMA_URI; - }; - shared_ptr schema_static_data; - - SchemaStaticData *GetSchemaStaticData() { - // This is actually a race condition when multithreading is used, but - // every thread will write the same data, so this is "OK" as long as - // the CPU cache coherency is reasonable. - if (!schema_static_data.get()) { - shared_ptr new_schema_static_data; - new_schema_static_data.reset(new SchemaStaticData); - schema_static_data = new_schema_static_data; - } - return schema_static_data.get(); - } - - SchemaLoader::SchemaLoader() - : missingHandler(0), - missingctx(0), - base(0) - { - SchemaStaticData *d = GetSchemaStaticData(); - schemas[d->SCHEMA_URI] = d->JSON_SCHEMA_SCHEMA; - } - - SchemaLoader::SchemaLoader(SchemaLoader *b) - : missingHandler(0), - missingctx(0), - base(b) - { - DBPRINT("schema loader\n"); - SchemaStaticData *d = GetSchemaStaticData(); - schemas[d->SCHEMA_URI] = d->JSON_SCHEMA_SCHEMA; - } - - SchemaLoader::~SchemaLoader() {} - - std::string UnescapeURI(const std::string &uri) { - std::string ret; - const char *c = uri.c_str(); - const char *e = c + uri.size(); - while (c != e) { - switch (*c) { - case '%': - if (c + 1 == e || c + 2 == e) { - ret.append(c); - c = e; - } else { - char hex[3] = { *(c+1), *(c+2), 0 }; - char *endp = 0; - long hexv = strtol(hex, &endp, 16); - if (*endp != 0) { - ret.append(c, 3); - } else { - ret.append(1, (char)hexv); - } - c += 3; - } - break; - default: - ret.append(c, 1); - ++c; - break; - } - } - return ret; - } - - Variant SchemaLoader::GetSchema(const std::string &uri) { - Variant::MapIterator iter = schemas.find(uri); - if (iter != schemas.end()) { - return iter->second; - } - std::string baseuri = ResolveURI(uri, ""); - std::string fragment; - std::string::size_type hashIndex = uri.find("#"); - if (hashIndex != std::string::npos) { - fragment = uri.substr(hashIndex + 1); - baseuri = uri.substr(0, hashIndex); - } - iter = schemas.find(baseuri); - if (iter == schemas.end()) { - if (base) { - return base->GetSchema(uri); - } - LoaderError err; - if (!HandleMissing(baseuri, err)) { - throw std::runtime_error(err.GetErrorMessage()); - } - iter = schemas.find(baseuri); - } - if (iter == schemas.end()) { - return Variant::NullType; - } - - Variant schema = iter->second; - return JSONPointerLookup(UnescapeURI(fragment), schema); - } - - std::map SchemaLoader::AddSchema(const std::string &uri, Variant schema) { - std::string luri = ResolveURI(uri, ""); - std::map m; - m[luri] = schema; - NormSchema(schema, luri); - SearchForTrustedSchemas(m, schema, luri); - schemas.insert(m.begin(), m.end()); - return m; - } - - void SchemaLoader::ForgetSchema(const std::string &uri) { - schemas.erase(uri); - } - - bool SchemaLoader::HandleMissing(const std::string &uri, LoaderError &error) { - if (missingHandler) { - return missingHandler(this, uri, error, missingctx); - } else if (base) { - return base->HandleMissing(uri, error); - } else { - error.AddError(uri, "SchemaLoader missing schema"); - return false; - } - } - - void SchemaLoader::SetMissingHandler(MissingHandlerType f, void *ctx) { - missingHandler = f; - missingctx = ctx; - } - - // The following two functions are adapted from two functions in tv4 with the following comment: - // parseURI() and resolveUrl() are from https://gist.github.com/1088850 - // - released as public domain by author ("Yaffle") - see comments on gist - - bool SchemaLoader::ParseURI(URIInfo &info, const std::string &uri) { - enum { - HREF=0, PROTOCOL, AUTHORITY, USERHOST, HOST, - HOSTNAME, PORT, PATHNAME, SEARCH, HASH, MATCHLEN - }; - static const struct RegexHelper { - RegexHelper() { - memset(®ex, 0, sizeof(regex_t)); - int ret = regcomp(®ex, -"^[[:space:]]*([^:\\/?#]+:)?" // PROTOCOL -"(//([^:@]*(:[^:@]*)?@)?([^:/?#]*)(:[0-9]*)?)?" // (//((user(:host)@)(hostname)(:port))) -"([^?#]*)" // PATHNAME -"(\\?[^#]*)?" // SEARCH -"(#[^[:space:]]*)?[[:space:]]*$" // HASH - , REG_EXTENDED); - if (ret) { - std::vector buffer(8192); - regerror(ret, ®ex, &buffer[0], buffer.size()); - std::ostringstream oss; - oss << "libvariant library initialization failure: Failed to initialize schema uri handling regex with error: " - << &buffer[0]; - fputs(oss.str().c_str(), stderr); - throw std::runtime_error(oss.str()); - } - } - ~RegexHelper() { regfree(®ex); } - regex_t regex; - } regex; - regmatch_t match[MATCHLEN]; - DBPRINT(std::endl << "Matching against \"" << uri << "\"\n"); - int err = regexec(®ex.regex, uri.c_str(), MATCHLEN, &match[0], 0); - if (err != 0) { - DBPRINT("Match failed\n"); - return false; - } - for (int i = 0; i < MATCHLEN; ++i) { - int so, eo, len; - if (match[i].rm_so >= 0) { - so = match[i].rm_so; - eo = match[i].rm_eo; - len = eo - so; - DBPRINT("Match "); - switch (i) { - case HREF: - info.href = uri.substr(so, len); - DBPRINT("href\t"); - break; - case PROTOCOL: - info.protocol = uri.substr(so, len); - DBPRINT("protocol\t"); - break; - case AUTHORITY: - info.authority = uri.substr(so, len); - DBPRINT("authority\t"); - break; - case PATHNAME: - info.pathname = uri.substr(so, len); - DBPRINT("pathname\t"); - break; - case SEARCH: - info.search = uri.substr(so, len); - DBPRINT("search\t"); - break; - case HASH: - info.hash = uri.substr(so, len); - DBPRINT("hash\t"); - break; - default: - break; - } - DBPRINT(i << " matched \"" << uri.substr(so, len) << "\"" << std::endl); - } else { - DBPRINT(i << " did not match" << std::endl); - } - } - return true; - } - - std::string RemoveDotSegments(const std::string &input) { - //^(\.\.?(\/|$))+/, '' -- ignore leading ../ removed - //\/(\.(\/|$))+/g, '/' -- remove /./ - //\/\.\.$/, '/../' -- normalize last /.. to /../ - //\/?[^\/]*/g, function (p) { - std::vector output; - std::string::size_type i = 0; - std::string::size_type next = input.find("/"); - bool firstslash = false; - DBPRINT("Processing \"" << input << "\"\n"); - unsigned lastdot = 0; - if (next == 0) { - // First was a slash, make sure to add it back - firstslash = true; - DBPRINT("firstslash\n"); - } else if (next >= input.size()) { - // No slashes - DBPRINT("no slashes\n"); - if (input == ".") { return ""; } - else { return input; } - //} else if (next + 1 == input.size()) { - // only slash at end - //if (input == "../" || input == "./") { return ""; } - //else { return input; } - } else { - std::string sub = input.substr(i, next - i); - if (sub != ".") { - output.push_back(sub); - if (sub == "..") { lastdot = output.size(); } - DBPRINT("leading: \"" << output.back() << "\"\n"); - } - } - while (next < input.size()) { - i = next; - next = input.find("/", i + 1); - // Get the string between the slashes - std::string sub = input.substr(i + 1, next - 1 - i); - if (sub == ".") { - lastdot = output.size(); - } else if (sub == "..") { - DBPRINT("pop\n"); - if (!output.empty()) { output.pop_back(); } - else { output.push_back(sub); } - lastdot = output.size(); - } else { - output.push_back(sub); - DBPRINT("push back: \"" << output.back() << "\"\n"); - } - } - std::ostringstream oss; - for (std::vector::iterator iv(output.begin()), ie(output.end()); iv != ie; ++iv) { - if (firstslash) { - oss << "/"; - } else { - firstslash = true; - } - oss << *iv; - } - if (output.empty() && firstslash) { oss << "/"; } - if (lastdot > 0 && lastdot == output.size()) { oss << "/"; } - DBPRINT("ret: \"" << oss.str() << "\""); - return oss.str(); - } - - std::string SchemaLoader::ResolveURI(const std::string &base, const std::string &href) { - URIInfo b, h; - bool base_parsed = ParseURI(b, base); - bool href_parsed = ParseURI(h, href); - std::string ret = ""; - if (!base_parsed || !href_parsed) { - return ret; - } - - ret += (h.protocol != "" ? h.protocol : b.protocol); - ret += (h.protocol != "" || h.authority != "" ? h.authority : b.authority); - if (h.protocol != "" || h.authority != "" || h.pathname[0] == '/') { - ret += RemoveDotSegments(h.pathname); - } else { - if (h.pathname == "") { - ret += RemoveDotSegments(b.pathname); - } else { - ret += RemoveDotSegments( - (b.authority != "" && b.pathname == "" ? "/" : "") - + b.pathname.substr(0, b.pathname.rfind("/") + 1) - + h.pathname - ); - } - } - if (h.protocol != "" || h.authority != "" || h.pathname != "" || h.search != "") { - ret += h.search; - } else { - ret += b.search; - } - ret += h.hash; - return ret; - } - - void SchemaLoader::NormSchema(Variant &schema, const std::string &uri) { - std::string baseuri = uri; - if (schema.IsMap()) { - if (schema.Contains("id") && schema["id"].IsString()) { - baseuri = ResolveURI(baseuri, schema["id"].AsString()); - schema["id"] = baseuri; - } - if (schema.Contains("$ref") && schema["$ref"].IsString()) { - schema["$ref"] = ResolveURI(baseuri, schema["$ref"].AsString()); - } else { - for (Variant::MapIterator i(schema.MapBegin()), e(schema.MapEnd()); i != e; ++i) { - if (i->first != "enum") { - NormSchema(i->second, baseuri); - } - } - } - } else if (schema.IsList()) { - for (Variant::ListIterator i(schema.ListBegin()), e(schema.ListEnd()); i != e; ++i) { - NormSchema(*i, baseuri); - } - } - } - - void SchemaLoader::SearchForTrustedSchemas(std::map &m, - Variant schema, const std::string &uri) - { - if (schema.IsMap()) { - if (schema.Contains("id") && schema["id"].IsString()) { - std::string id = schema["id"].AsString(); - if (id.substr(0, uri.length()) == uri) { - std::string remainder = id.substr(uri.length()); - if ((uri.length() > 0 && uri[uri.length()-1] == '/') - || remainder[0] == '#' - || remainder[0] == '?') - { - if (m.find(id) == m.end()) { - m[id] = schema; - } - } - } - } - - for (Variant::MapIterator i(schema.MapBegin()), e(schema.MapEnd()); i != e; ++i) { - if (i->first != "enum" && i->second.IsMap()) { - SearchForTrustedSchemas(m, i->second, uri); - } - } - } - } - - SchemaLoader::LoaderError::LoaderError() { - erross << "SchemaLoader error:\n"; - } - - SchemaLoader::LoaderError::~LoaderError() {} - - void SchemaLoader::LoaderError::AddError(const std::string &uri, const std::string &msg) { - erross << "\t" << uri << ": " << msg << "\n"; - } - - void AdvSchemaLoader::AddPath(const std::string &path) { - paths.push_back(path); - } - - bool AdvSchemaLoader::HandleMissing(const std::string &uri, LoaderError &error) { - URIInfo info; - if (uri.empty()) { - return SchemaLoader::HandleMissing(uri, error); - } else if (ParseURI(info, uri)) { - if (info.href[0] == '/' || info.href[0] == '.') { - // Assume file system path. - if (!LoadFromFile(info, error)) { - return SchemaLoader::HandleMissing(uri, error); - } - return true; - } else if (info.protocol.empty()) { - if (!LoadFromFile(info, error) && !LoadFromCurl(info, error)) { - return SchemaLoader::HandleMissing(uri, error); - } - return true; - } else if (info.protocol == "file:") { - if (!LoadFromFile(info, error)) { - return SchemaLoader::HandleMissing(uri, error); - } - return true; - } else { - if (!LoadFromCurl(info, error)) { - return SchemaLoader::HandleMissing(uri, error); - } - return true; - } - } - return SchemaLoader::HandleMissing(uri, error); - } - - bool AdvSchemaLoader::LoadFromFile(URIInfo &info, LoaderError &error) { - // Normalize the path.. - std::string path; - if (!info.authority.empty()) { - if ( - !info.protocol.empty() - && info.authority.size() >= 2 - && info.authority[0] == '/' - && info.authority[1] == '/' - ) - { - path = info.authority.substr(2); - } else { - path = info.authority; - } - } - path += info.pathname; - if (path[0] == '/') { - // Absolute path - try { - AddSchema(info.href, DeserializeGuessFile(path.c_str())); - return true; - } catch (const std::exception &e) { - error.AddError(path.c_str(), e.what()); - return false; - } - } - // Not absolute - for (std::vector::iterator i(paths.begin()), e(paths.end()); i != e; ++i) { - std::string uri = *i + "/" + path; - try { - AddSchema(info.href, DeserializeGuessFile(uri.c_str())); - return true; - } catch (const std::exception &e) { - error.AddError(uri, e.what()); - } - } - return false; - } - -#ifdef ENABLE_CURL - - size_t CurlContextWrite(char *ptr, size_t size, size_t nmemb, void *userdata); - - class CurlContext { - public: - - CurlContext(SchemaLoader::URIInfo &info) - : self(curl_easy_init()) - { - if (!self) { - std::ostringstream oss; - oss << "Unable to initialize curl to fetch uri: " << info.href; - throw std::runtime_error(oss.str()); - } - CURLcode err = curl_easy_setopt(self, CURLOPT_NOSIGNAL, 1); - if (err != CURLE_OK) { Error(err); } - err = curl_easy_setopt(self, CURLOPT_WRITEFUNCTION, &CurlContextWrite); - if (err != CURLE_OK) { Error(err); } - err = curl_easy_setopt(self, CURLOPT_WRITEDATA, (void*)this); - if (err != CURLE_OK) { Error(err); } - uri = info.protocol + info.authority + info.pathname + info.search; - err = curl_easy_setopt(self, CURLOPT_URL, uri.c_str()); - if (err != CURLE_OK) { Error(err); } - } - - ~CurlContext() { - curl_easy_cleanup(self); - } - - size_t Write(char *ptr, size_t len) { - data_buff.insert(data_buff.end(), ptr, ptr + len); - return len; - } - - void Perform() { - CURLcode err = curl_easy_perform(self); - if (err != CURLE_OK) { Error(err); } - } - - void Error(CURLcode err) { - std::ostringstream oss; - oss << "Error attempting to fetch uri: " << uri << "\n"; - oss << curl_easy_strerror(err); - throw std::runtime_error(oss.str()); - } - - CURL *self; - std::string uri; - std::vector data_buff; - std::vector err_buff; - }; - - size_t CurlContextWrite(char *ptr, size_t size, size_t nmemb, void *userdata) { - return ((CurlContext*)userdata)->Write(ptr, size*nmemb); - } - - bool AdvSchemaLoader::LoadFromCurl(URIInfo &info, LoaderError &error) { - try { - CurlContext ctx(info); - ctx.Perform(); - AddSchema(ctx.uri, DeserializeGuess(&ctx.data_buff[0], ctx.data_buff.size())); - return true; - } catch (const std::exception &e) { - error.AddError(info.href, e.what()); - return false; - } - } - -#else - bool AdvSchemaLoader::LoadFromCurl(URIInfo &info, LoaderError &error) { - error.AddError(info.href, "Curl support not compiled in to load urls."); - return false; - } -#endif -} diff --git a/src/hos_libvariant/src/libvariant/src/StackTrace.cc b/src/hos_libvariant/src/libvariant/src/StackTrace.cc deleted file mode 100644 index ec8bc2c4..00000000 --- a/src/hos_libvariant/src/libvariant/src/StackTrace.cc +++ /dev/null @@ -1,52 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \brief functino for printing out a stack trace - * lookup the backtrace etc. in the man pages. - * \author John Bridgman - */ -#include "../../libvariant/src/StackTrace.h" - -#include -#include -#include -#include -#include - -void PrintStack() { - void* stack[STACKTRACE_MAXTRACE]; - size_t size = backtrace(stack, STACKTRACE_MAXTRACE); - backtrace_symbols_fd(stack, size, 2); -} - -std::string GetStack(unsigned ignore) { - void* stack[STACKTRACE_MAXTRACE]; - size_t size = backtrace(stack, STACKTRACE_MAXTRACE); - char **bt = backtrace_symbols(stack, size); - if (!bt) { - perror("backtrace_symbols"); - return ""; - } - std::ostringstream oss; - for (unsigned i = ignore; i < size; ++i) { - oss << bt[i] << '\n'; - } - free(bt); - return oss.str(); -} - - diff --git a/src/hos_libvariant/src/libvariant/src/StackTrace.h b/src/hos_libvariant/src/libvariant/src/StackTrace.h deleted file mode 100644 index 50047a0b..00000000 --- a/src/hos_libvariant/src/libvariant/src/StackTrace.h +++ /dev/null @@ -1,48 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \brief function for printing out a stack trace - * Note that we need to pass -rdynamic to the linker to - * be able to see the function names with these functions. - * \author John Bridgman - */ - -#ifndef STACKTRACE_H -#define STACKTRACE_H -#pragma once -#include -#ifndef STACKTRACE_MAXTRACE -#define STACKTRACE_MAXTRACE 100 -#endif -/** - * Prints the stack trace to stderr - * Should work even if we are out of memory - */ -void PrintStack(); - -/** - * Returns a std::string to the stack trace. - * May fail if out of memory. - * \param ignore the number of top stacks to ignore. This is - * useful because this function is often used in error messages - * and it is useless garbage to report the stack from the error - * handler. - */ -std::string GetStack(unsigned ignore = 0); - -#endif - diff --git a/src/hos_libvariant/src/libvariant/src/Variant.cc b/src/hos_libvariant/src/libvariant/src/Variant.cc deleted file mode 100644 index e767e3b6..00000000 --- a/src/hos_libvariant/src/libvariant/src/Variant.cc +++ /dev/null @@ -1,2258 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= - -/** \file - * \author John Bridgman - * Variant implementation - */ -#include "../../libvariant/include/Variant/Variant.h" - -#include -#include -#include -#include -#include -#include -#include "../../libvariant/src/ParseBool.h" - -template -class my_modulus { -public: - T operator()(const T &lhs, const T &rhs) { return lhs % rhs; } -}; - -template<> -class my_modulus { -public: - long double operator()(const long double &lhs, const long double &rhs) { return fmod(lhs, rhs); } -}; - -namespace libvariant { - - static inline Variant::Type_t NumericUpcast(Variant::Type_t t1, Variant::Type_t t2) { - switch (t1) { - case Variant::IntegerType: - switch (t2) { - case Variant::IntegerType: - return Variant::IntegerType; - case Variant::UnsignedType: - return Variant::UnsignedType; - case Variant::FloatType: - return Variant::FloatType; - case Variant::NullType: - case Variant::BoolType: - case Variant::StringType: - case Variant::ListType: - case Variant::MapType: - throw UnableToConvertError(t2, "a numeric type."); - default: - throw UnknownTypeError(t2); - } - case Variant::UnsignedType: - switch (t2) { - case Variant::IntegerType: - return Variant::UnsignedType; - case Variant::UnsignedType: - return Variant::UnsignedType; - case Variant::FloatType: - return Variant::FloatType; - case Variant::NullType: - case Variant::BoolType: - case Variant::StringType: - case Variant::ListType: - case Variant::MapType: - throw UnableToConvertError(t2, "a numeric type."); - default: - throw UnknownTypeError(t2); - } - case Variant::FloatType: - switch (t2) { - case Variant::IntegerType: - return Variant::FloatType; - case Variant::UnsignedType: - return Variant::FloatType; - case Variant::FloatType: - return Variant::FloatType; - case Variant::NullType: - case Variant::BoolType: - case Variant::StringType: - case Variant::ListType: - case Variant::MapType: - throw UnableToConvertError(t2, "a numeric type."); - default: - throw UnknownTypeError(t2); - } - case Variant::NullType: - case Variant::BoolType: - case Variant::StringType: - case Variant::ListType: - case Variant::MapType: - throw UnableToConvertError(t1, "a numeric type."); - default: - throw UnknownTypeError(t1); - } - } - - - namespace Internal { - - struct RefData { - RefData() : valid(true) {} - bool valid; - }; - - struct Storage { - Storage() {} - - virtual ~Storage() {} - - }; - - struct MapStorage : public Storage { - MapStorage(const Variant::Map &m) : map(m) {} - Variant::Map map; - }; - - struct ListStorage : public Storage { - ListStorage(const Variant::List &l) : list(l) {} - Variant::List list; - }; - - struct StringStorage : public Storage { - StringStorage(const std::string &s) : str(s) {} - std::string str; - }; - - struct BlobStorage : public Storage { - BlobStorage(BlobPtr b) : blob(b) {} - BlobPtr blob; - }; - - struct RefStorage : public Storage { - shared_ptr storage; - }; - - struct ProxyStorage : public Storage { - ProxyStorage(Data *ref_, Path::const_iterator b, Path::const_iterator e) - : ref(ref_), storage(ref_->storage), path(b, e) - {} - Data *ref; - shared_ptr storage; - Path path; - }; - - - // Three ways to look up a value in a map or list: - // Get a reference/proxy -> GetRef - // Get pointer/throw -> Get checked=true - // Get pointer/null -> Get checked=false - - class VTable { - public: - static inline Data *GetData(Variant *v) { return v; } - static inline const Data *GetData(const Variant *v) { return v; } - static inline Variant *GetVar(Data *d) { return static_cast(d); } - static inline const Variant *GetVar(const Data *d) { return static_cast(d); } - - virtual ~VTable() {} - virtual void Copy(const Data *that, Data *other) const = 0; - virtual void Assign(const Data *that, Data *other) const; - virtual void MakeRef(const Data *that, Data *ref) const; - virtual void MakeProxy(Data *that, Data *ref, Path::const_iterator b, Path::const_iterator e) const; - virtual Variant::Type_t GetType(const Data *that) const = 0; - virtual bool AsBool(const Data *that) const; - virtual long double AsLongDouble(const Data *that) const; - virtual uintmax_t AsUnsigned(const Data *that) const; - virtual intmax_t AsInt(const Data *that) const; - virtual std::string AsString(const Data *that) const; - virtual BlobPtr AsBlob(Data *that) const; - virtual ConstBlobPtr AsBlobConst(const Data *that) const; - virtual unsigned Size(const Data *that) const; - virtual bool Empty(const Data *that) const; - virtual void Clear(Data *that) const; - virtual Variant::List &AsList(Data *that) const; - virtual const Variant::List &AsListConst(const Data *that) const; - virtual bool ContainsIndex(const Data *that, unsigned i) const; - virtual unsigned Index(const Data *that, Variant v) const; - virtual void EraseIndex(Data *that, unsigned i) const; - virtual VariantRef GetRefIndex(Data *that, unsigned i, Variant *def) const; - virtual const Variant *GetConstIndex(const Data *that, unsigned i, bool checked) const; - virtual Variant *GetIndex(Data *that, unsigned i, bool checked) const; - virtual void SetIndex(Data *that, unsigned i, const Data *other) const; - virtual Variant::Map &AsMap(Data *that) const; - virtual const Variant::Map &AsMapConst(const Data *that) const; - virtual bool ContainsKey(const Data *that, const std::string &s) const; - virtual void EraseKey(Data *that, const std::string &key) const; - virtual VariantRef GetRefKey(Data *that, const std::string &s, Variant *def) const; - virtual const Variant *GetConstKey(const Data *that, const std::string &s, bool checked) const; - virtual Variant *GetKey(Data *that, const std::string &s, bool checked) const; - virtual void SetKey(Data *that, const std::string &s, const Data *other) const; - VariantRef GetPathRef(Data *that, Path::const_iterator b, Path::const_iterator e, Variant *def) const; - const Variant *GetPathConst(const Data *that, Path::const_iterator b, Path::const_iterator e, bool checked) const; - void SetPath(Data *that, Path::const_iterator b, Path::const_iterator e, const Variant *other) const; - void ErasePath(Data *that, Path::const_iterator b, Path::const_iterator e, bool recursive) const; - bool Comparable(const Data *that, const Data *other) const; - virtual int Compare(const Data *that, const Data *other) const = 0; - virtual void Incr(Data *that) const; - virtual void Decr(Data *that) const; - virtual Variant Neg(const Data *that) const; - virtual void Add(Data *that, const Data *other) const; - virtual void Sub(Data *that, const Data *other) const; - virtual void Mul(Data *that, const Data *other) const; - virtual void Div(Data *that, const Data *other) const; - virtual void Rem(Data *that, const Data *other) const; - shared_ptr EnsureRef(Data *that) const; - virtual void Destroy(Data *that) const; - virtual void Destruct(Data *that) const; - virtual Variant *Resolve(Data *that) const; - virtual const Variant *ResolveConst(const Data *that) const; - virtual Variant *ResolveDefault(Data *that, const Data *def) const; - virtual bool Exists(const Data *that) const; - }; - - void DefaultInit(Data *that, VariantDefines::Type_t type); - - void NullInit(Data *that); - - void BoolInit(Data *that, bool b); - - void IntegerInit(Data *that, intmax_t i); - - void UnsignedInit(Data *that, uintmax_t u); - - void FloatInit(Data *that, long double f); - - void StringInit(Data *that, const std::string &s); - - void ListInit(Data *that, const Variant::List &l); - - void MapInit(Data *that, const Variant::Map &m); - - void BlobInit(Data *that, BlobPtr blob); - - void RefInit(Data *that, const Data *other); - - void ProxyInit(Data *that, Data *ref, Path::const_iterator b, Path::const_iterator e); - - //-------------------- - // VTable - //-------------------- - - void VTable::Assign(const Data *that, Data *other) const - { that->vtable->Copy(that, VTable::GetData(other->vtable->Resolve(other))); } - - void VTable::MakeRef(const Data *that, Data *ref) const { - RefInit(ref, that); - } - void VTable::MakeProxy(Data *that, Data *ref, Path::const_iterator b, Path::const_iterator e) const - { ProxyInit(ref, that, b, e); } - - bool VTable::AsBool(const Data *that) const - { throw UnableToConvertError(that->vtable->GetType(that), "a bool"); } - - long double VTable::AsLongDouble(const Data *that) const - { throw UnableToConvertError(that->vtable->GetType(that), "a float"); } - - uintmax_t VTable::AsUnsigned(const Data *that) const - { throw UnableToConvertError(that->vtable->GetType(that), "a unsigned"); } - - intmax_t VTable::AsInt(const Data *that) const - { throw UnableToConvertError(that->vtable->GetType(that), "a int"); } - - std::string VTable::AsString(const Data *that) const - { throw UnableToConvertError(that->vtable->GetType(that), "a string"); } - - BlobPtr VTable::AsBlob(Data *that) const - { throw UnexpectedTypeError(VariantDefines::BlobType, that->vtable->GetType(that)); } - - ConstBlobPtr VTable::AsBlobConst(const Data *that) const - { throw UnexpectedTypeError(VariantDefines::BlobType, that->vtable->GetType(that)); } - - unsigned VTable::Size(const Data *that) const - { throw InvalidOperationError(that->vtable->GetType(that), "Size"); } - - bool VTable::Empty(const Data *that) const - { throw InvalidOperationError(that->vtable->GetType(that), "Empty"); } - - void VTable::Clear(Data *that) const { NullInit(that); } - - Variant::List &VTable::AsList(Data *that) const - { throw UnableToConvertError(that->vtable->GetType(that), "a list"); } - - const Variant::List &VTable::AsListConst(const Data *that) const - { throw UnexpectedTypeError(VariantDefines::ListType, that->vtable->GetType(that)); } - - bool VTable::ContainsIndex(const Data *that, unsigned i) const - { return false; } - - unsigned VTable::Index(const Data *that, Variant o) const - { throw UnexpectedTypeError(VariantDefines::ListType, that->vtable->GetType(that)); } - - void VTable::EraseIndex(Data *that, unsigned i) const - { throw UnexpectedTypeError(VariantDefines::ListType, that->vtable->GetType(that)); } - - VariantRef VTable::GetRefIndex(Data *that, unsigned i, Variant *def) const - { throw UnexpectedTypeError(VariantDefines::ListType, that->vtable->GetType(that)); } - - const Variant *VTable::GetConstIndex(const Data *that, unsigned i, bool checked) const { - if (!checked) { return 0; } - throw UnexpectedTypeError(VariantDefines::ListType, that->vtable->GetType(that)); - } - - Variant *VTable::GetIndex(Data *that, unsigned i, bool checked) const { - if (!checked) { return 0; } - throw UnexpectedTypeError(VariantDefines::ListType, that->vtable->GetType(that)); - } - - void VTable::SetIndex(Data *that, unsigned i, const Data *other) const - { throw UnexpectedTypeError(VariantDefines::ListType, that->vtable->GetType(that)); } - - Variant::Map &VTable::AsMap(Data *that) const - { throw UnableToConvertError(that->vtable->GetType(that), "a map"); } - - const Variant::Map &VTable::AsMapConst(const Data *that) const - { throw UnexpectedTypeError(VariantDefines::MapType, that->vtable->GetType(that)); } - - bool VTable::ContainsKey(const Data *that, const std::string &s) const - { return false; } - - void VTable::EraseKey(Data *that, const std::string &key) const - { throw UnexpectedTypeError(VariantDefines::MapType, that->vtable->GetType(that)); } - - VariantRef VTable::GetRefKey(Data *that, const std::string &s, Variant *def) const - { throw UnexpectedTypeError(VariantDefines::MapType, that->vtable->GetType(that)); } - - const Variant *VTable::GetConstKey(const Data *that, const std::string &s, bool checked) const { - if (!checked) { return 0; } - throw UnexpectedTypeError(VariantDefines::MapType, that->vtable->GetType(that)); - } - - Variant *VTable::GetKey(Data *that, const std::string &s, bool checked) const { - if (!checked) { return 0; } - throw UnexpectedTypeError(VariantDefines::MapType, that->vtable->GetType(that)); - } - - void VTable::SetKey(Data *that, const std::string &s, const Data *other) const - { throw UnexpectedTypeError(VariantDefines::MapType, that->vtable->GetType(that)); } - - const Variant *GetPathElem(const Data *that, const PathElement &elem, bool checked) { - if (elem.IsString()) { - return that->vtable->GetConstKey(that, elem.AsString(), checked); - } else /* if (elem.IsNumber()) */ { - return that->vtable->GetConstIndex(that, elem.AsUnsigned(), checked); - } - } - - Variant *GetPathElem(Data *that, const PathElement &elem, bool checked) { - if (elem.IsString()) { - return that->vtable->GetKey(that, elem.AsString(), checked); - } else /* if (elem.IsNumber()) */ { - return that->vtable->GetIndex(that, elem.AsUnsigned(), checked); - } - } - - VariantRef GetRefPathElem(Data *that, const PathElement &elem, Variant *def) { - if (elem.IsString()) { - return that->vtable->GetRefKey(that, elem.AsString(), def); - } else /* if (elem.IsNumber()) */ { - return that->vtable->GetRefIndex(that, elem.AsUnsigned(), def); - } - } - - void SetPathElem(Data *that, const PathElement &elem, const Variant *other) { - if (elem.IsString()) { - that->vtable->SetKey(that, elem.AsString(), VTable::GetData(other)); - } else /* if (elem.IsNumber()) */ { - that->vtable->SetIndex(that, elem.AsUnsigned(), VTable::GetData(other)); - } - } - - VariantRef VTable::GetPathRef(Data *that, Path::const_iterator b, - Path::const_iterator e, Variant *def) const - { - if (b == e) { return VariantRef(*GetVar(that)); } - Variant *ref = 0; - ref = GetPathElem(that, *b, false); - if (!ref) { - if (!def) { - return VariantRef(*GetVar(that), b, e); - } - if (b + 1 == e) { - return GetRefPathElem(that, *b, def); - } else { - Variant null_value; - SetPathElem(that, *b, &null_value); - return that->vtable->GetPathRef(that, b, e, def); - } - } - if (b + 1 == e) { - return VariantRef(*ref); - } else { - Data *ref_data = VTable::GetData(ref); - return ref_data->vtable->GetPathRef(ref_data, b + 1, e, def); - } - } - - const Variant *VTable::GetPathConst(const Data *that, Path::const_iterator b, Path::const_iterator e, bool checked) const - { - if (b == e) { return that->vtable->ResolveConst(that); } - const Variant *ref = 0; - ref = GetPathElem(that, *b, checked); - if (!ref) { - if (checked) { - if (b->IsString()) { - throw KeyError(b->AsString()); - } else { - throw std::out_of_range("Variant::List index out of range."); - } - } - return 0; - } - if (b + 1 == e) { - return ref; - } else { - const Data *ref_data = VTable::GetData(ref); - return ref_data->vtable->GetPathConst(ref_data, b + 1, e, checked); - } - } - - void VTable::SetPath(Data *that, Path::const_iterator b, Path::const_iterator e, const Variant *other) const - { - if (b == e) { - const Data *other_data = VTable::GetData(other); - other_data->vtable->Assign(other_data, that); - return; - } - Variant *ref = 0; - ref = GetPathElem(that, *b, false); - if (!ref) { - if (b + 1 == e) { - SetPathElem(that, *b, other); - return; - } else { - Variant null_value; - SetPathElem(that, *b, &null_value); - that->vtable->SetPath(that, b, e, other); - return; - } - } - Data *ref_data = VTable::GetData(ref); - ref_data->vtable->SetPath(ref_data, b + 1, e, other); - } - - void ErasePathElem(Data *that, const PathElement &elem) { - if (elem.IsString()) { - return that->vtable->EraseKey(that, elem.AsString()); - } else /* if (elem.IsNumber()) */ { - return that->vtable->EraseIndex(that, elem.AsUnsigned()); - } - } - - void VTable::ErasePath(Data *that, Path::const_iterator b, Path::const_iterator e, bool remove_empty) const - { - if (b == e) { return; } - if (b + 1 == e) { - ErasePathElem(that, *b); - return; - } - Variant *ref = 0; - ref = GetPathElem(that, *b, false); - if (!ref) { return; } - Data *ref_data = VTable::GetData(ref); - ref_data->vtable->ErasePath(ref_data, b + 1, e, remove_empty); - if (remove_empty && ref_data->vtable->Empty(ref_data)) { - ErasePathElem(that, *b); - } - } - - bool VTable::Comparable(const Data *that, const Data *other) const { - VariantDefines::Type_t ltype = that->vtable->GetType(that), otype = other->vtable->GetType(other); - return ( ltype == otype ) - || ( - ( ltype == VariantDefines::IntegerType - || ltype == VariantDefines::UnsignedType - || ltype == VariantDefines::FloatType ) - && ( otype == VariantDefines::IntegerType - || otype == VariantDefines::UnsignedType - || otype == VariantDefines::FloatType ) - ); - } - - void VTable::Incr(Data *that) const - { throw NotNumericTypeError(that->vtable->GetType(that)); } - - void VTable::Decr(Data *that) const - { throw NotNumericTypeError(that->vtable->GetType(that)); } - - Variant VTable::Neg(const Data *that) const - { throw NotNumericTypeError(that->vtable->GetType(that)); } - - void VTable::Add(Data *that, const Data *other) const - { throw NotNumericTypeError(that->vtable->GetType(that)); } - - void VTable::Sub(Data *that, const Data *other) const - { throw NotNumericTypeError(that->vtable->GetType(that)); } - - void VTable::Mul(Data *that, const Data *other) const - { throw NotNumericTypeError(that->vtable->GetType(that)); } - - void VTable::Div(Data *that, const Data *other) const - { throw NotNumericTypeError(that->vtable->GetType(that)); } - - void VTable::Rem(Data *that, const Data *other) const - { throw NotNumericTypeError(that->vtable->GetType(that)); } - - shared_ptr VTable::EnsureRef(Data *that) const { - if (!that->ref_data) { - that->ref_data.reset(new RefData()); - } - return that->ref_data; - } - - void VTable::Destroy(Data *that) const { - assert(that->vtable); - that->storage.reset(); - that->vtable = 0; - } - - void VTable::Destruct(Data *that) const { - that->vtable->Destroy(that); - if (that->ref_data) { - that->ref_data->valid = false; - that->ref_data.reset(); - } - } - - Variant *VTable::Resolve(Data *that) const - { return VTable::GetVar(that); } - - const Variant *VTable::ResolveConst(const Data *that) const - { return VTable::GetVar(that); } - - Variant *VTable::ResolveDefault(Data *that, const Data *) const - { return VTable::GetVar(that); } - - bool VTable::Exists(const Data *that) const { return true; } - - //-------------------- - // NullVTable - //-------------------- - - class Null : public VTable { - public: - Null() {} - virtual void Copy(const Data *that, Data *other) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual bool AsBool(const Data *that) const; - virtual long double AsLongDouble(const Data *that) const; - virtual uintmax_t AsUnsigned(const Data *that) const; - virtual intmax_t AsInt(const Data *that) const; - virtual std::string AsString(const Data *that) const; - virtual unsigned Size(const Data *that) const; - virtual bool Empty(const Data *that) const; - virtual void Clear(Data *that) const; - virtual Variant::List &AsList(Data *that) const; - virtual void EraseIndex(Data *that, unsigned i) const; - virtual VariantRef GetRefIndex(Data *that, unsigned i, Variant *def) const; - virtual const Variant *GetConstIndex(const Data *that, unsigned i, bool checked) const; - virtual Variant *GetIndex(Data *that, unsigned i, bool checked) const; - virtual void SetIndex(Data *that, unsigned i, const Data *other) const; - virtual Variant::Map &AsMap(Data *that) const; - virtual void EraseKey(Data *that, const std::string &key) const; - virtual VariantRef GetRefKey(Data *that, const std::string &s, Variant *def) const; - virtual const Variant *GetConstKey(const Data *that, const std::string &s, bool checked) const; - virtual Variant *GetKey(Data *that, const std::string &s, bool checked) const; - virtual void SetKey(Data *that, const std::string &s, const Data *other) const; - virtual int Compare(const Data *that, const Data *other) const; - virtual Variant *ResolveDefault(Data *that, const Data *def) const; - }; - - const VTable *NullVTable() { - static const Null null_vtable; - return &null_vtable; - } - - void Null::Copy(const Data *that, Data *other) const { NullInit(other); } - - VariantDefines::Type_t Null::GetType(const Data *that) const - { return VariantDefines::NullType; } - - bool Null::AsBool(const Data *that) const { return false; } - - long double Null::AsLongDouble(const Data *that) const { return 0.0; } - - uintmax_t Null::AsUnsigned(const Data *that) const { return 0; } - - intmax_t Null::AsInt(const Data *that) const { return 0; } - - std::string Null::AsString(const Data *that) const { return ""; } - - unsigned Null::Size(const Data *that) const { return 0; } - - bool Null::Empty(const Data *that) const { return true; } - - void Null::Clear(Data *that) const {} - - Variant::List &Null::AsList(Data *that) const { - ListInit(that, Variant::List()); - return that->vtable->AsList(that); - } - void Null::EraseIndex(Data *that, unsigned i) const {} - - VariantRef Null::GetRefIndex(Data *that, unsigned i, Variant *def) const { - if (def) { - ListInit(that, Variant::List()); - return that->vtable->GetRefIndex(that, i, def); - } - return VariantRef(*that->vtable->Resolve(that), Path(1, i)); - } - - const Variant *Null::GetConstIndex(const Data *that, unsigned i, bool checked) const { - if (!checked) { return 0; } - throw std::out_of_range("Variant::List index out of range."); - } - - Variant *Null::GetIndex(Data *that, unsigned i, bool checked) const { - if (!checked) { return 0; } - throw std::out_of_range("Variant::List index out of range."); - } - - void Null::SetIndex(Data *that, unsigned i, const Data *other) const { - ListInit(that, Variant::List()); - that->vtable->SetIndex(that, i, other); - } - - Variant::Map &Null::AsMap(Data *that) const { - MapInit(that, Variant::Map()); - return that->vtable->AsMap(that); - } - - - void Null::EraseKey(Data *that, const std::string &) const {} - - VariantRef Null::GetRefKey(Data *that, const std::string &s, Variant *def) const { - if (def) { - MapInit(that, Variant::Map()); - return that->vtable->GetRefKey(that, s, def); - } - return VariantRef(*that->vtable->Resolve(that), Path(1, s)); - } - - const Variant *Null::GetConstKey(const Data *that, const std::string &s, bool checked) const { - if (!checked) { return 0; } - throw KeyError(s); - } - - Variant *Null::GetKey(Data *that, const std::string &s, bool checked) const { - if (!checked) { return 0; } - throw KeyError(s); - } - - void Null::SetKey(Data *that, const std::string &s, const Data *other) const { - MapInit(that, Variant::Map()); - that->vtable->SetKey(that, s, other); - } - - int Null::Compare(const Data *that, const Data *other) const { - return (Comparable(that, other) ? 0 : 1); - } - - Variant *Null::ResolveDefault(Data *that, const Data *def) const { - def->vtable->Assign(def, that); - return that->vtable->Resolve(that); - } - - void NullInit(Data *that) { - if (that->vtable) that->vtable->Destroy(that); - that->vtable = NullVTable(); - } - - //-------------------- - // BoolVTable - //-------------------- - - class Bool : public VTable { - public: - Bool() {} - virtual void Copy(const Data *that, Data *other) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual bool AsBool(const Data *that) const; - virtual long double AsLongDouble(const Data *that) const; - virtual uintmax_t AsUnsigned(const Data *that) const; - virtual intmax_t AsInt(const Data *that) const; - virtual std::string AsString(const Data *that) const; - virtual int Compare(const Data *that, const Data *other) const; - }; - - void Bool::Copy(const Data *that, Data *other) const - { BoolInit(other, that->b); } - - VariantDefines::Type_t Bool::GetType(const Data *that) const - { return VariantDefines::BoolType; } - - bool Bool::AsBool(const Data *that) const - { return that->b; } - - long double Bool::AsLongDouble(const Data *that) const - { return that->b; } - - uintmax_t Bool::AsUnsigned(const Data *that) const - { return that->b; } - - intmax_t Bool::AsInt(const Data *that) const - { return that->b; } - - std::string Bool::AsString(const Data *that) const { - if (that->b) { return "true"; } - else { return "false"; } - } - - int Bool::Compare(const Data *that, const Data *other) const { - if (Comparable(that, other)) { - other = VTable::GetData(other->vtable->ResolveConst(other)); - return (that->b == other->b ? 0 : 1); - } - return 1; - } - - void BoolInit(Data *that, bool b) { - static const Bool bool_vtable; - if (that->vtable) that->vtable->Destroy(that); - that->vtable = &bool_vtable; - that->b = b; - } - - //-------------------- - // NumericVTable - //-------------------- - - class Numeric : public VTable { - public: - virtual int Compare(const Data *that, const Data *other) const; - virtual void Add(Data *that, const Data *other) const; - virtual void Sub(Data *that, const Data *other) const; - virtual void Mul(Data *that, const Data *other) const; - virtual void Div(Data *that, const Data *other) const; - virtual void Rem(Data *that, const Data *other) const; - }; - - int Numeric::Compare(const Data *that, const Data *other) const { - if (Comparable(that, other)) { - long double us = that->vtable->AsLongDouble(that); - long double o = other->vtable->AsLongDouble(other); - if (us < o) { return -1; } - else if (us > o) { return 1; } - else { return 0; } - } - return 1; - } - - template< template class Op > - void NumericOperation(Data *that, const Data *other) { - VariantDefines::Type_t ntype = NumericUpcast(that->vtable->GetType(that), - other->vtable->GetType(other)); - switch (ntype) { - case VariantDefines::IntegerType: - { - Op op; - IntegerInit(that, - op(that->vtable->AsInt(that), other->vtable->AsInt(other))); - } - break; - case VariantDefines::UnsignedType: - { - Op op; - UnsignedInit(that, - op(that->vtable->AsUnsigned(that), other->vtable->AsUnsigned(other))); - } - break; - case VariantDefines::FloatType: - { - Op op; - FloatInit(that, - op(that->vtable->AsLongDouble(that), other->vtable->AsLongDouble(other))); - } - break; - default: - throw NotNumericTypeError(ntype); - } - } - - void Numeric::Add(Data *that, const Data *other) const - { NumericOperation(that, other); } - - void Numeric::Sub(Data *that, const Data *other) const - { NumericOperation(that, other); } - - void Numeric::Mul(Data *that, const Data *other) const - { NumericOperation(that, other); } - - void Numeric::Div(Data *that, const Data *other) const - { NumericOperation(that, other); } - - void Numeric::Rem(Data *that, const Data *other) const - { NumericOperation(that, other); } - - //-------------------- - // IntegerVTable - //-------------------- - - class Integer : public Numeric { - public: - Integer() {} - virtual void Copy(const Data *that, Data *other) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual bool AsBool(const Data *that) const; - virtual long double AsLongDouble(const Data *that) const; - virtual uintmax_t AsUnsigned(const Data *that) const; - virtual intmax_t AsInt(const Data *that) const; - virtual std::string AsString(const Data *that) const; - virtual void Incr(Data *that) const; - virtual void Decr(Data *that) const; - virtual Variant Neg(const Data *that) const; - }; - - void Integer::Copy(const Data *that, Data *other) const - { IntegerInit(other, that->i); } - - VariantDefines::Type_t Integer::GetType(const Data *that) const - { return VariantDefines::IntegerType; } - - bool Integer::AsBool(const Data *that) const - { return that->i != 0; } - - long double Integer::AsLongDouble(const Data *that) const - { return (long double)that->i; } - - uintmax_t Integer::AsUnsigned(const Data *that) const - { return (uintmax_t)that->i; } - - intmax_t Integer::AsInt(const Data *that) const - { return that->i; } - - std::string Integer::AsString(const Data *that) const { - std::ostringstream oss; - oss << that->i; - return oss.str(); - } - - void Integer::Incr(Data *that) const - { ++that->i; } - - void Integer::Decr(Data *that) const - { --that->i; } - - Variant Integer::Neg(const Data *that) const - { return Variant(-that->i); } - - void IntegerInit(Data *that, intmax_t i) { - static const Integer integer_vtable; - if (that->vtable) that->vtable->Destroy(that); - that->vtable = &integer_vtable; - that->i = i; - } - - //-------------------- - // UnsignedVTable - //-------------------- - - class Unsigned : public Numeric { - public: - Unsigned() {} - virtual void Copy(const Data *that, Data *other) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual bool AsBool(const Data *that) const; - virtual long double AsLongDouble(const Data *that) const; - virtual uintmax_t AsUnsigned(const Data *that) const; - virtual intmax_t AsInt(const Data *that) const; - virtual std::string AsString(const Data *that) const; - virtual void Incr(Data *that) const; - virtual void Decr(Data *that) const; - virtual Variant Neg(const Data *that) const; - }; - - void Unsigned::Copy(const Data *that, Data *other) const - { UnsignedInit(other, that->u); } - - VariantDefines::Type_t Unsigned::GetType(const Data *that) const - { return VariantDefines::UnsignedType; } - - bool Unsigned::AsBool(const Data *that) const - { return that->u != 0; } - - long double Unsigned::AsLongDouble(const Data *that) const - { return (long double)that->u; } - - uintmax_t Unsigned::AsUnsigned(const Data *that) const - { return that->u; } - - intmax_t Unsigned::AsInt(const Data *that) const - { return (intmax_t)that->u; } - - std::string Unsigned::AsString(const Data *that) const { - std::ostringstream oss; - oss << that->u; - return oss.str(); - } - - void Unsigned::Incr(Data *that) const - { ++that->u; } - - void Unsigned::Decr(Data *that) const - { --that->u; } - - Variant Unsigned::Neg(const Data *that) const { - return Variant(-that->u); - } - - void UnsignedInit(Data *that, uintmax_t u) { - static const Unsigned unsigned_vtable; - if (that->vtable) that->vtable->Destroy(that); - that->vtable = &unsigned_vtable; - that->u = u; - } - - //-------------------- - // FloatVTable - //-------------------- - - class Float : public Numeric { - public: - Float() {} - virtual void Copy(const Data *that, Data *other) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual bool AsBool(const Data *that) const; - virtual long double AsLongDouble(const Data *that) const; - virtual uintmax_t AsUnsigned(const Data *that) const; - virtual intmax_t AsInt(const Data *that) const; - virtual std::string AsString(const Data *that) const; - virtual void Incr(Data *that) const; - virtual void Decr(Data *that) const; - virtual Variant Neg(const Data *that) const; - }; - - void Float::Copy(const Data *that, Data *other) const { - FloatInit(other, that->f); - } - - VariantDefines::Type_t Float::GetType(const Data *that) const - { return VariantDefines::FloatType; } - - bool Float::AsBool(const Data *that) const - { return that->f != 0; } - - long double Float::AsLongDouble(const Data *that) const - { return that->f; } - - uintmax_t Float::AsUnsigned(const Data *that) const - { return (uintmax_t)that->f; } - - intmax_t Float::AsInt(const Data *that) const - { return (intmax_t)that->f; } - - std::string Float::AsString(const Data *that) const { - std::ostringstream oss; - oss << that->f; - return oss.str(); - } - - void Float::Incr(Data *that) const - { ++that->f; } - - void Float::Decr(Data *that) const - { --that->f; } - - Variant Float::Neg(const Data *that) const { - return Variant(-that->f); - } - - void FloatInit(Data *that, long double f) { - static const Float float_vtable; - if (that->vtable) that->vtable->Destroy(that); - that->vtable = &float_vtable; - that->f = f; - } - - //-------------------- - // StringVTable - //-------------------- - - class String : public VTable { - public: - String() {} - virtual void Copy(const Data *that, Data *other) const; - virtual void Assign(const Data *that, Data *other) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual bool AsBool(const Data *that) const; - virtual long double AsLongDouble(const Data *that) const; - virtual uintmax_t AsUnsigned(const Data *that) const; - virtual intmax_t AsInt(const Data *that) const; - virtual std::string AsString(const Data *that) const; - virtual unsigned Size(const Data *that) const; - virtual bool Empty(const Data *that) const; - virtual void Clear(Data *that) const; - virtual int Compare(const Data *that, const Data *other) const; - virtual void Destroy(Data *that) const; - }; - - const VTable *StringVTable() { - static const String string_vtable; - return &string_vtable; - } - - void String::Copy(const Data *that, Data *other) const - { StringInit(other, *that->s); } - - void String::Assign(const Data *that, Data *other) const { - assert(that->vtable); - shared_ptr storage = that->storage; - std::string *s = that->s; - if (other->vtable) { other = VTable::GetData(other->vtable->Resolve(other)); } - if (other->vtable) { other->vtable->Destroy(other); } - other->vtable = StringVTable(); - other->s = s; - other->storage = storage; - } - - VariantDefines::Type_t String::GetType(const Data *that) const - { return VariantDefines::StringType; } - - bool String::AsBool(const Data *that) const - { return ParseBool(*that->s); } - - long double String::AsLongDouble(const Data *that) const { - std::istringstream iss(*that->s); - long double val = 0; - iss >> val; - if (iss.fail()) { throw UnableToConvertError(that->vtable->GetType(that), "a float"); } - return val; - } - - uintmax_t String::AsUnsigned(const Data *that) const { - std::istringstream iss(*that->s); - uintmax_t val = 0; - iss >> val; - if (iss.fail()) { throw UnableToConvertError(that->vtable->GetType(that), "an unsigned"); } - return val; - } - - intmax_t String::AsInt(const Data *that) const { - std::istringstream iss(*that->s); - intmax_t val = 0; - iss >> val; - if (iss.fail()) { throw UnableToConvertError(that->vtable->GetType(that), "an int"); } - return val; - } - - std::string String::AsString(const Data *that) const - { return *that->s; } - - unsigned String::Size(const Data *that) const { return that->s->size(); } - - bool String::Empty(const Data *that) const { return that->s->empty(); } - - void String::Clear(Data *that) const { return that->s->clear(); } - - int String::Compare(const Data *that, const Data *other) const { - if (Comparable(that, other)) { - other = VTable::GetData(other->vtable->ResolveConst(other)); - return that->s->compare(*other->s); - } - return 1; - } - - void String::Destroy(Data *that) const { - VTable::Destroy(that); - that->s = 0; - } - - void StringInit(Data *that, const std::string &s) { - if (that->vtable) that->vtable->Destroy(that); - that->vtable = StringVTable(); - shared_ptr storage(new StringStorage(s)); - that->s = &storage->str; - that->storage = storage; - } - - //-------------------- - // ListVTable - //-------------------- - - class List : public VTable { - public: - List() {} - virtual void Copy(const Data *that, Data *other) const; - virtual void Assign(const Data *that, Data *other) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual unsigned Size(const Data *that) const; - virtual bool Empty(const Data *that) const; - virtual void Clear(Data *that) const; - virtual Variant::List &AsList(Data *that) const; - virtual const Variant::List &AsListConst(const Data *that) const; - virtual bool ContainsIndex(const Data *that, unsigned i) const; - virtual unsigned Index(const Data *that, Variant v) const; - virtual void EraseIndex(Data *that, unsigned i) const; - virtual VariantRef GetRefIndex(Data *that, unsigned i, Variant *def) const; - virtual const Variant *GetConstIndex(const Data *that, unsigned i, bool checked) const; - virtual Variant *GetIndex(Data *that, unsigned i, bool checked) const; - virtual void SetIndex(Data *that, unsigned i, const Data *other) const; - virtual int Compare(const Data *that, const Data *other) const; - virtual void Destroy(Data *that) const; - }; - - const VTable *ListVTable() { - static const List list_vtable; - return &list_vtable; - } - - void List::Copy(const Data *that, Data *other) const { - ListInit(other, Variant::List()); - for (Variant::ConstListIterator i(that->l->list.begin()), e(that->l->list.end()); - i != e; ++i) { - other->l->list.push_back(i->Copy()); - } - } - - void List::Assign(const Data *that, Data *other) const { - assert(that->vtable); - shared_ptr storage = that->storage; - ListStorage *l = that->l; - if (other->vtable) { other = VTable::GetData(other->vtable->Resolve(other)); } - if (other->vtable) { other->vtable->Destroy(other); } - other->vtable = ListVTable(); - other->l = l; - other->storage = storage; - } - - VariantDefines::Type_t List::GetType(const Data *that) const { return VariantDefines::ListType; } - - unsigned List::Size(const Data *that) const { return that->l->list.size(); } - - bool List::Empty(const Data *that) const { return that->l->list.empty(); } - - void List::Clear(Data *that) const { return that->l->list.clear(); } - - Variant::List &List::AsList(Data *that) const { return that->l->list; } - - const Variant::List &List::AsListConst(const Data *that) const { return that->l->list; } - - bool List::ContainsIndex(const Data *that, unsigned i) const { return i < that->l->list.size(); } - - unsigned List::Index(const Data *that, Variant v) const { - Variant::ListIterator begin = that->l->list.begin(), - end = that->l->list.end(); - return std::distance(begin, std::find(begin, end, v)); - } - - void List::EraseIndex(Data *that, unsigned i) const - { - unsigned size = that->l->list.size(); - if (i + 1 < size) { - that->l->list.at(i).Assign(Variant::NullType); - } else if (i < size) { - that->l->list.pop_back(); - } - } - - VariantRef List::GetRefIndex(Data *that, unsigned i, Variant *def) const { - if (i < that->l->list.size()) { - return VariantRef(that->l->list.at(i)); - } else if (def) { - that->l->list.resize(i + 1); - that->l->list.at(i) = *def; - return VariantRef(that->l->list.at(i)); - } else { - return VariantRef(*that->vtable->Resolve(that), Path(1, i)); - } - } - - const Variant *List::GetConstIndex(const Data *that, unsigned i, bool checked) const { - if (i < that->l->list.size()) { - return &that->l->list.at(i); - } else if (!checked) { - return 0; - } else { - throw std::out_of_range("Variant::List index out of range."); - } - } - - Variant *List::GetIndex(Data *that, unsigned i, bool checked) const { - if (i < that->l->list.size()) { - return &that->l->list.at(i); - } else if (!checked) { - return 0; - } else { - throw std::out_of_range("Variant::List index out of range."); - } - } - - void List::SetIndex(Data *that, unsigned i, const Data *other) const { - if ( ! (i < that->l->list.size()) ) { - that->l->list.resize(i + 1); - } - other->vtable->Assign(other, VTable::GetData(&that->l->list.at(i))); - } - - int List::Compare(const Data *that, const Data *other) const { - if (Comparable(that, other)) { - other = VTable::GetData(other->vtable->ResolveConst(other)); - return (that->l->list != other->l->list ? 1 : 0); - } - return 1; - } - - void List::Destroy(Data *that) const { - VTable::Destroy(that); - that->l = 0; - } - - void ListInit(Data *that, const Variant::List &l) { - if (that->vtable) that->vtable->Destroy(that); - that->vtable = ListVTable(); - shared_ptr storage(new ListStorage(l)); - that->l = storage.get(); - that->storage = storage; - } - - //-------------------- - // MapVTable - //-------------------- - - class Map : public VTable { - public: - Map() {} - virtual void Copy(const Data *that, Data *other) const; - virtual void Assign(const Data *that, Data *other) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual unsigned Size(const Data *that) const; - virtual bool Empty(const Data *that) const; - virtual void Clear(Data *that) const; - virtual Variant::Map &AsMap(Data *that) const; - virtual const Variant::Map &AsMapConst(const Data *that) const; - virtual bool ContainsKey(const Data *that, const std::string &s) const; - virtual void EraseKey(Data *that, const std::string &key) const; - virtual VariantRef GetRefKey(Data *that, const std::string &s, Variant *def) const; - virtual const Variant *GetConstKey(const Data *that, const std::string &s, bool checked) const; - virtual Variant *GetKey(Data *that, const std::string &s, bool checked) const; - virtual void SetKey(Data *that, const std::string &s, const Data *other) const; - virtual int Compare(const Data *that, const Data *other) const; - virtual void Destroy(Data *that) const; - }; - - const VTable *MapVTable() { - static const Map map_vtable; - return &map_vtable; - } - - void Map::Copy(const Data *that, Data *other) const { - MapInit(other, Variant::Map()); - for (Variant::ConstMapIterator i(that->m->map.begin()), e(that->m->map.end()); - i != e; ++i) { - other->m->map.insert(std::make_pair(i->first, i->second.Copy())); - } - } - - void Map::Assign(const Data *that, Data *other) const { - assert(that->vtable); - shared_ptr storage = that->storage; - MapStorage *m = that->m; - if (other->vtable) { other = VTable::GetData(other->vtable->Resolve(other)); } - if (other->vtable) { other->vtable->Destroy(other); } - other->vtable = MapVTable(); - other->m = m; - other->storage = storage; - } - - VariantDefines::Type_t Map::GetType(const Data *that) const { return VariantDefines::MapType; } - - unsigned Map::Size(const Data *that) const { return that->m->map.size(); } - - bool Map::Empty(const Data *that) const { return that->m->map.empty(); } - - void Map::Clear(Data *that) const { return that->m->map.clear(); } - - Variant::Map &Map::AsMap(Data *that) const { return that->m->map; } - - const Variant::Map &Map::AsMapConst(const Data *that) const { return that->m->map; } - - bool Map::ContainsKey(const Data *that, const std::string &s) const - { return that->m->map.find(s) != that->m->map.end(); } - - void Map::EraseKey(Data *that, const std::string &key) const { that->m->map.erase(key); } - - VariantRef Map::GetRefKey(Data *that, const std::string &s, Variant *def) const { - Variant::MapIterator entry = that->m->map.find(s); - if (entry != that->m->map.end()) { - return VariantRef(entry->second); - } else if (def) { - return VariantRef(that->m->map.insert(std::make_pair(s, *def)).first->second); - } else { - return VariantRef(*that->vtable->Resolve(that), Path(1, s)); - } - } - - const Variant *Map::GetConstKey(const Data *that, const std::string &s, bool checked) const { - Variant::MapIterator entry = that->m->map.find(s); - if (entry != that->m->map.end()) { - return &entry->second; - } else if (!checked) { - return 0; - } else { - throw KeyError(s); - } - } - - Variant *Map::GetKey(Data *that, const std::string &s, bool checked) const { - Variant::MapIterator entry = that->m->map.find(s); - if (entry != that->m->map.end()) { - return &entry->second; - } else if (!checked) { - return 0; - } else { - throw KeyError(s); - } - } - - void Map::SetKey(Data *that, const std::string &s, const Data *other) const { - Variant::MapIterator entry = that->m->map.insert(std::make_pair(s, Variant())).first; - other->vtable->Assign(other, VTable::GetData(&entry->second)); - } - - - int Map::Compare(const Data *that, const Data *other) const { - if (Comparable(that, other)) { - other = VTable::GetData(other->vtable->ResolveConst(other)); - return (that->m->map != other->m->map ? 1 : 0); - } - return 1; - } - - void Map::Destroy(Data *that) const { - VTable::Destroy(that); - that->m = 0; - } - - void MapInit(Data *that, const Variant::Map &m) { - if (that->vtable) that->vtable->Destroy(that); - that->vtable = MapVTable(); - shared_ptr storage(new MapStorage(m)); - that->m = storage.get(); - that->storage = storage; - } - - //-------------------- - // BlobVTable - //-------------------- - - class Blob : public VTable { - public: - Blob() {} - virtual void Copy(const Data *that, Data *other) const; - virtual void Assign(const Data *that, Data *other) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual BlobPtr AsBlob(Data *that) const; - virtual ConstBlobPtr AsBlobConst(const Data *that) const; - virtual unsigned Size(const Data *that) const; - virtual int Compare(const Data *that, const Data *other) const; - }; - - const VTable *BlobVTable() { - static const Blob blob_vtable; - return &blob_vtable; - } - - void Blob::Copy(const Data *that, Data *other) const - { BlobInit(other, ( (*that->blob) ? (*that->blob)->Copy() : BlobPtr() )); } - - void Blob::Assign(const Data *that, Data *other) const { - assert(that->vtable); - shared_ptr storage = that->storage; - BlobPtr *b = that->blob; - if (other->vtable) { other = VTable::GetData(other->vtable->Resolve(other)); } - if (other->vtable) { other->vtable->Destroy(other); } - other->vtable = BlobVTable(); - other->blob = b; - other->storage = storage; - } - - VariantDefines::Type_t Blob::GetType(const Data *that) const - { return VariantDefines::BlobType; } - - BlobPtr Blob::AsBlob(Data *that) const - { return *(that->blob); } - - ConstBlobPtr Blob::AsBlobConst(const Data *that) const - { return *(that->blob); } - - unsigned Blob::Size(const Data *that) const - { return (*that->blob)->GetTotalLength(); } - - int Blob::Compare(const Data *that, const Data *other) const { - if (Comparable(that, other)) { - ConstBlobPtr us = (*that->blob); - ConstBlobPtr o = other->vtable->AsBlobConst(other); - if (us == o) { return 0; } - if (us && o) { return us->Compare(o); } - } - return 1; - } - - void BlobInit(Data *that, BlobPtr blob) { - if (that->vtable) that->vtable->Destroy(that); - that->vtable = BlobVTable(); - shared_ptr storage(new BlobStorage(blob)); - that->blob = &storage->blob; - that->storage = storage; - } - - //-------------------- - // RefVTable - //-------------------- - - class Ref : public VTable { - public: - Ref() {} - virtual void Copy(const Data *that, Data *other) const; - virtual void Assign(const Data *that, Data *other) const; - virtual void MakeRef(const Data *that, Data *ref) const; - virtual void MakeProxy(Data *that, Data *ref, Path::const_iterator b, Path::const_iterator e) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual bool AsBool(const Data *that) const; - virtual long double AsLongDouble(const Data *that) const; - virtual uintmax_t AsUnsigned(const Data *that) const; - virtual intmax_t AsInt(const Data *that) const; - virtual std::string AsString(const Data *that) const; - virtual BlobPtr AsBlob(Data *that) const; - virtual ConstBlobPtr AsBlobConst(const Data *that) const; - virtual unsigned Size(const Data *that) const; - virtual bool Empty(const Data *that) const; - virtual void Clear(Data *that) const; - virtual Variant::List &AsList(Data *that) const; - virtual const Variant::List &AsListConst(const Data *that) const; - virtual bool ContainsIndex(const Data *that, unsigned i) const; - virtual unsigned Index(const Data *that, Variant v) const; - virtual void EraseIndex(Data *that, unsigned i) const; - virtual VariantRef GetRefIndex(Data *that, unsigned i, Variant *def) const; - virtual const Variant *GetConstIndex(const Data *that, unsigned i, bool checked) const; - virtual Variant *GetIndex(Data *that, unsigned i, bool checked) const; - virtual void SetIndex(Data *that, unsigned i, const Data *other) const; - virtual Variant::Map &AsMap(Data *that) const; - virtual const Variant::Map &AsMapConst(const Data *that) const; - virtual bool ContainsKey(const Data *that, const std::string &s) const; - virtual void EraseKey(Data *that, const std::string &key) const; - virtual VariantRef GetRefKey(Data *that, const std::string &s, Variant *def) const; - virtual const Variant *GetConstKey(const Data *that, const std::string &s, bool checked) const; - virtual Variant *GetKey(Data *that, const std::string &s, bool checked) const; - virtual void SetKey(Data *that, const std::string &s, const Data *other) const; - virtual int Compare(const Data *that, const Data *other) const; - virtual void Incr(Data *that) const; - virtual void Decr(Data *that) const; - virtual Variant Neg(const Data *that) const; - virtual void Add(Data *that, const Data *other) const; - virtual void Sub(Data *that, const Data *other) const; - virtual void Mul(Data *that, const Data *other) const; - virtual void Div(Data *that, const Data *other) const; - virtual void Rem(Data *that, const Data *other) const; - virtual void Destroy(Data *that) const; - virtual void Destruct(Data *that) const; - virtual Variant *Resolve(Data *that) const; - virtual const Variant *ResolveConst(const Data *that) const; - virtual Variant *ResolveDefault(Data *that, const Data *def) const; - virtual bool Exists(const Data *that) const; - }; - - static inline void CheckRef(const Data *that) { - if (!that->ref_data || !that->ref_data->valid) { - throw InvalidReferenceError("Error attempting to access an invalid VariantRef"); - } - } - - void Ref::Copy(const Data *that, Data *other) const - { CheckRef(that); that->ref->vtable->Copy(that->ref, other); } - - void Ref::Assign(const Data *that, Data *other) const - { CheckRef(that); that->ref->vtable->Assign(that->ref, other); } - - void Ref::MakeRef(const Data *that, Data *ref) const - { CheckRef(that); that->ref->vtable->MakeRef(that->ref, ref); } - - void Ref::MakeProxy(Data *that, Data *ref, Path::const_iterator b, Path::const_iterator e) const - { CheckRef(that); that->ref->vtable->MakeProxy(that->ref, ref, b, e); } - - VariantDefines::Type_t Ref::GetType(const Data *that) const - { CheckRef(that); return that->ref->vtable->GetType(that->ref); } - - bool Ref::AsBool(const Data *that) const - { CheckRef(that); return that->ref->vtable->AsBool(that->ref); } - - long double Ref::AsLongDouble(const Data *that) const - { CheckRef(that); return that->ref->vtable->AsLongDouble(that->ref); } - - uintmax_t Ref::AsUnsigned(const Data *that) const - { CheckRef(that); return that->ref->vtable->AsUnsigned(that->ref); } - - intmax_t Ref::AsInt(const Data *that) const - { CheckRef(that); return that->ref->vtable->AsInt(that->ref); } - - std::string Ref::AsString(const Data *that) const - { CheckRef(that); return that->ref->vtable->AsString(that->ref); } - - BlobPtr Ref::AsBlob(Data *that) const - { CheckRef(that); return that->ref->vtable->AsBlob(that->ref); } - - ConstBlobPtr Ref::AsBlobConst(const Data *that) const - { CheckRef(that); return that->ref->vtable->AsBlobConst(that->ref); } - - unsigned Ref::Size(const Data *that) const - { CheckRef(that); return that->ref->vtable->Size(that->ref); } - - bool Ref::Empty(const Data *that) const - { CheckRef(that); return that->ref->vtable->Empty(that->ref); } - - void Ref::Clear(Data *that) const - { CheckRef(that); return that->ref->vtable->Clear(that->ref); } - - Variant::List &Ref::AsList(Data *that) const - { CheckRef(that); return that->ref->vtable->AsList(that->ref); } - - const Variant::List &Ref::AsListConst(const Data *that) const - { CheckRef(that); return that->ref->vtable->AsListConst(that->ref); } - - bool Ref::ContainsIndex(const Data *that, unsigned i) const - { CheckRef(that); return that->ref->vtable->ContainsIndex(that->ref, i); } - - unsigned Ref::Index(const Data *that, Variant v) const - { CheckRef(that); return that->ref->vtable->Index(that->ref, v); } - - void Ref::EraseIndex(Data *that, unsigned i) const - { CheckRef(that); return that->ref->vtable->EraseIndex(that->ref, i); } - - VariantRef Ref::GetRefIndex(Data *that, unsigned i, Variant *def) const - { CheckRef(that); return that->ref->vtable->GetRefIndex(that->ref, i , def); } - - const Variant *Ref::GetConstIndex(const Data *that, unsigned i, bool checked) const - { CheckRef(that); return that->ref->vtable->GetConstIndex(that->ref, i, checked); } - - Variant *Ref::GetIndex(Data *that, unsigned i, bool checked) const - { CheckRef(that); return that->ref->vtable->GetIndex(that->ref, i, checked); } - - void Ref::SetIndex(Data *that, unsigned i, const Data *other) const - { CheckRef(that); that->ref->vtable->SetIndex(that->ref, i, other); } - - Variant::Map &Ref::AsMap(Data *that) const - { CheckRef(that); return that->ref->vtable->AsMap(that->ref); } - - const Variant::Map &Ref::AsMapConst(const Data *that) const - { CheckRef(that); return that->ref->vtable->AsMapConst(that->ref); } - - bool Ref::ContainsKey(const Data *that, const std::string &s) const - { CheckRef(that); return that->ref->vtable->ContainsKey(that->ref, s); } - - void Ref::EraseKey(Data *that, const std::string &key) const - { CheckRef(that); return that->ref->vtable->EraseKey(that->ref, key); } - - VariantRef Ref::GetRefKey(Data *that, const std::string &s, Variant *def) const - { CheckRef(that); return that->ref->vtable->GetRefKey(that->ref, s, def); } - - const Variant *Ref::GetConstKey(const Data *that, const std::string &s, bool checked) const - { CheckRef(that); return that->ref->vtable->GetConstKey(that->ref, s, checked); } - - Variant *Ref::GetKey(Data *that, const std::string &s, bool checked) const - { CheckRef(that); return that->ref->vtable->GetKey(that->ref, s, checked); } - - void Ref::SetKey(Data *that, const std::string &s, const Data *other) const - { CheckRef(that); that->ref->vtable->SetKey(that->ref, s, other); } - - int Ref::Compare(const Data *that, const Data *other) const - { CheckRef(that); return that->ref->vtable->Compare(that->ref, other); } - - void Ref::Incr(Data *that) const - { CheckRef(that); that->ref->vtable->Incr(that->ref); } - - void Ref::Decr(Data *that) const - { CheckRef(that); that->ref->vtable->Decr(that->ref); } - - Variant Ref::Neg(const Data *that) const - { CheckRef(that); return that->ref->vtable->Neg(that->ref); } - - void Ref::Add(Data *that, const Data *other) const - { CheckRef(that); that->ref->vtable->Add(that->ref, other); } - - void Ref::Sub(Data *that, const Data *other) const - { CheckRef(that); that->ref->vtable->Sub(that->ref, other); } - - void Ref::Mul(Data *that, const Data *other) const - { CheckRef(that); that->ref->vtable->Mul(that->ref, other); } - - void Ref::Div(Data *that, const Data *other) const - { CheckRef(that); that->ref->vtable->Div(that->ref, other); } - - void Ref::Rem(Data *that, const Data *other) const - { CheckRef(that); that->ref->vtable->Rem(that->ref, other); } - - void Ref::Destroy(Data *that) const { - VTable::Destroy(that); - that->ref = 0; - } - - void Ref::Destruct(Data *that) const { - Destroy(that); - that->ref_data.reset(); - } - - Variant *Ref::Resolve(Data *that) const - { CheckRef(that); return that->ref->vtable->Resolve(that->ref); } - - const Variant *Ref::ResolveConst(const Data *that) const - { CheckRef(that); return that->ref->vtable->ResolveConst(that->ref); } - - Variant *Ref::ResolveDefault(Data *that, const Data *def) const - { CheckRef(that); return that->ref->vtable->ResolveDefault(that->ref, def); } - - bool Ref::Exists(const Data *that) const { - return (that->ref != 0) && (that->ref_data->valid == true); - } - - void RefInit(Data *that, const Data *other) { - static const Ref ref_vtable; - if (that->vtable) that->vtable->Destroy(that); - that->vtable = &ref_vtable; - // XXX: const cast.. double ICKY! - that->ref = const_cast(other); - that->ref_data = that->ref->vtable->EnsureRef(that->ref); - } - - //-------------------- - // ProxyVTable - //-------------------- - - class Proxy : public VTable { - public: - Proxy() {} - virtual void Copy(const Data *that, Data *other) const; - virtual void Assign(const Data *that, Data *other) const; - virtual void MakeRef(const Data *that, Data *ref) const; - virtual void MakeProxy(Data *that, Data *ref, Path::const_iterator b, Path::const_iterator e) const; - virtual Variant::Type_t GetType(const Data *that) const; - virtual bool AsBool(const Data *that) const; - virtual long double AsLongDouble(const Data *that) const; - virtual uintmax_t AsUnsigned(const Data *that) const; - virtual intmax_t AsInt(const Data *that) const; - virtual std::string AsString(const Data *that) const; - virtual BlobPtr AsBlob(Data *that) const; - virtual ConstBlobPtr AsBlobConst(const Data *that) const; - virtual unsigned Size(const Data *that) const; - virtual bool Empty(const Data *that) const; - virtual void Clear(Data *that) const; - virtual Variant::List &AsList(Data *that) const; - virtual const Variant::List &AsListConst(const Data *that) const; - virtual bool ContainsIndex(const Data *that, unsigned i) const; - virtual unsigned Index(const Data *that, Variant v) const; - virtual void EraseIndex(Data *that, unsigned i) const; - virtual VariantRef GetRefIndex(Data *that, unsigned i, Variant *def) const; - virtual const Variant *GetConstIndex(const Data *that, unsigned i, bool checked) const; - virtual Variant *GetIndex(Data *that, unsigned i, bool checked) const; - virtual void SetIndex(Data *that, unsigned i, const Data *other) const; - virtual Variant::Map &AsMap(Data *that) const; - virtual const Variant::Map &AsMapConst(const Data *that) const; - virtual bool ContainsKey(const Data *that, const std::string &s) const; - virtual void EraseKey(Data *that, const std::string &key) const; - virtual VariantRef GetRefKey(Data *that, const std::string &s, Variant *def) const; - virtual const Variant *GetConstKey(const Data *that, const std::string &s, bool checked) const; - virtual Variant *GetKey(Data *that, const std::string &s, bool checked) const; - virtual void SetKey(Data *that, const std::string &s, const Data *other) const; - virtual int Compare(const Data *that, const Data *other) const; - virtual void Incr(Data *that) const; - virtual void Decr(Data *that) const; - virtual Variant Neg(const Data *that) const; - virtual void Add(Data *that, const Data *other) const; - virtual void Sub(Data *that, const Data *other) const; - virtual void Mul(Data *that, const Data *other) const; - virtual void Div(Data *that, const Data *other) const; - virtual void Rem(Data *that, const Data *other) const; - virtual void Destroy(Data *that) const; - virtual void Destruct(Data *that) const; - virtual Variant *Resolve(Data *that) const; - virtual const Variant *ResolveConst(const Data *that) const; - virtual Variant *ResolveDefault(Data *that, const Data *def) const; - virtual bool Exists(const Data *that) const; - }; - - bool ProxyResolveCheck(const Data *that) { - CheckRef(that); - Data *ref = that->proxy->ref; - const Variant *result = ref->vtable->GetPathConst(ref, that->proxy->path.begin(), - that->proxy->path.end(), false); - if (result) { - const Data *res = VTable::GetData(result); - // XXX: Const cast, ICKY! I don't know how to do this without making all of Data mutable... - res->vtable->MakeRef(res, const_cast(that)); - return true; - } - return false; - } - - void ProxyResolveThrow(const Data *that) { - CheckRef(that); - Data *ref = that->proxy->ref; - const Variant *result = ref->vtable->GetPathConst(ref, that->proxy->path.begin(), - that->proxy->path.end(), true); - const Data *res = VTable::GetData(result); - // XXX: Const cast, ICKY! I don't know how to do this without making all of Data mutable... - res->vtable->MakeRef(res, const_cast(that)); - } - - void ProxyResolveCreate(Data *that) { - CheckRef(that); - Variant tmp_null; - Data *ref = that->proxy->ref; - VariantRef result = ref->vtable->GetPathRef(ref, that->proxy->path.begin(), - that->proxy->path.end(), &tmp_null); - Data *res = VTable::GetData(&result); - res->vtable->MakeRef(res, that); - } - - - void Proxy::Copy(const Data *that, Data *other) const - { ProxyResolveThrow(that); that->vtable->Copy(that, other); } - - void Proxy::Assign(const Data *that, Data *other) const - { ProxyResolveThrow(that); that->vtable->Assign(that, other); } - - void Proxy::MakeRef(const Data *that, Data *ref) const { - CheckRef(that); - ProxyInit(ref, that->proxy->ref, that->proxy->path.begin(), that->proxy->path.end()); - } - - void Proxy::MakeProxy(Data *that, Data *ref, Path::const_iterator b, Path::const_iterator e) const - { - CheckRef(that); - Path newpath = that->proxy->path; - newpath.insert(newpath.end(), b, e); - ProxyInit(ref, that->proxy->ref, newpath.begin(), newpath.end()); - } - - VariantDefines::Type_t Proxy::GetType(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->GetType(that); } - - bool Proxy::AsBool(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->AsBool(that); } - - long double Proxy::AsLongDouble(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->AsLongDouble(that); } - - uintmax_t Proxy::AsUnsigned(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->AsUnsigned(that); } - - intmax_t Proxy::AsInt(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->AsInt(that); } - - std::string Proxy::AsString(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->AsString(that); } - - BlobPtr Proxy::AsBlob(Data *that) const - { ProxyResolveThrow(that); return that->vtable->AsBlob(that); } - - ConstBlobPtr Proxy::AsBlobConst(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->AsBlobConst(that); } - - unsigned Proxy::Size(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->Size(that); } - - bool Proxy::Empty(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->Empty(that); } - - void Proxy::Clear(Data *that) const - { ProxyResolveThrow(that); return that->vtable->Clear(that); } - - Variant::List &Proxy::AsList(Data *that) const - { ProxyResolveCreate(that); return that->vtable->AsList(that); } - - const Variant::List &Proxy::AsListConst(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->AsListConst(that); } - - bool Proxy::ContainsIndex(const Data *that, unsigned i) const - { ProxyResolveThrow(that); return that->vtable->ContainsIndex(that, i); } - - unsigned Proxy::Index(const Data *that, Variant v) const - { ProxyResolveThrow(that); return that->vtable->Index(that, v); } - - void Proxy::EraseIndex(Data *that, unsigned i) const - { ProxyResolveThrow(that); return that->vtable->EraseIndex(that, i); } - - VariantRef Proxy::GetRefIndex(Data *that, unsigned i, Variant *def) const - { - if (def) { - ProxyResolveCreate(that); - return that->vtable->GetRefIndex(that, i, def); - } - if (ProxyResolveCheck(that)) { - return that->vtable->GetRefIndex(that, i, def); - } else { - Path path = that->proxy->path; - path.push_back(i); - return VariantRef(*VTable::GetVar(that->proxy->ref), path); - } - } - - const Variant *Proxy::GetConstIndex(const Data *that, unsigned i, bool checked) const - { ProxyResolveThrow(that); return that->vtable->GetConstIndex(that, i, checked); } - - Variant *Proxy::GetIndex(Data *that, unsigned i, bool checked) const - { - if (ProxyResolveCheck(that)) { - return that->vtable->GetIndex(that, i, checked); - } else if (checked) { - throw std::out_of_range("Variant::List index out of range."); - } else { - return 0; - } - } - - void Proxy::SetIndex(Data *that, unsigned i, const Data *other) const - { ProxyResolveCreate(that); return that->vtable->SetIndex(that, i, other); } - - Variant::Map &Proxy::AsMap(Data *that) const - { ProxyResolveCreate(that); return that->vtable->AsMap(that); } - - const Variant::Map &Proxy::AsMapConst(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->AsMapConst(that); } - - bool Proxy::ContainsKey(const Data *that, const std::string &s) const - { ProxyResolveThrow(that); return that->vtable->ContainsKey(that, s); } - - void Proxy::EraseKey(Data *that, const std::string &key) const - { ProxyResolveThrow(that); return that->vtable->EraseKey(that, key); } - - VariantRef Proxy::GetRefKey(Data *that, const std::string &s, Variant *def) const - { - if (def) { - ProxyResolveCreate(that); - return that->vtable->GetRefKey(that, s, def); - } - if (ProxyResolveCheck(that)) { - return that->vtable->GetRefKey(that, s, def); - } else { - Path path = that->proxy->path; - path.push_back(s); - return VariantRef(*VTable::GetVar(that->proxy->ref), path); - } - } - - const Variant *Proxy::GetConstKey(const Data *that, const std::string &s, bool checked) const - { ProxyResolveThrow(that); return that->vtable->GetConstKey(that, s, checked); } - - Variant *Proxy::GetKey(Data *that, const std::string &s, bool checked) const - { - if (ProxyResolveCheck(that)) { - return that->vtable->GetKey(that, s, checked); - } else if (checked) { - throw KeyError(s); - } else { - return 0; - } - } - - void Proxy::SetKey(Data *that, const std::string &s, const Data *other) const - { ProxyResolveCreate(that); return that->vtable->SetKey(that, s, other); } - - int Proxy::Compare(const Data *that, const Data *other) const - { ProxyResolveThrow(that); return that->vtable->Compare(that, other); } - - void Proxy::Incr(Data *that) const - { ProxyResolveThrow(that); return that->vtable->Incr(that); } - - void Proxy::Decr(Data *that) const - { ProxyResolveThrow(that); return that->vtable->Decr(that); } - - Variant Proxy::Neg(const Data *that) const - { ProxyResolveThrow(that); return that->vtable->Neg(that); } - - void Proxy::Add(Data *that, const Data *other) const - { ProxyResolveThrow(that); return that->vtable->Add(that, other); } - - void Proxy::Sub(Data *that, const Data *other) const - { ProxyResolveThrow(that); return that->vtable->Sub(that, other); } - - void Proxy::Mul(Data *that, const Data *other) const - { ProxyResolveThrow(that); return that->vtable->Mul(that, other); } - - void Proxy::Div(Data *that, const Data *other) const - { ProxyResolveThrow(that); return that->vtable->Div(that, other); } - - void Proxy::Rem(Data *that, const Data *other) const - { ProxyResolveThrow(that); return that->vtable->Rem(that, other); } - - void Proxy::Destroy(Data *that) const { - VTable::Destroy(that); - that->proxy = 0; - } - - void Proxy::Destruct(Data *that) const { - Destroy(that); - that->ref_data.reset(); - } - - Variant *Proxy::Resolve(Data *that) const { - ProxyResolveCreate(that); - return that->vtable->Resolve(that); - } - - const Variant *Proxy::ResolveConst(const Data *that) const { - ProxyResolveThrow(that); - return that->vtable->ResolveConst(that); - } - - Variant *Proxy::ResolveDefault(Data *that, const Data *def) const { - ProxyResolveCreate(that); - return that->vtable->ResolveDefault(that, def); - } - - bool Proxy::Exists(const Data *that) const { - if (!that->ref_data || !that->ref_data->valid) { - return false; - } - Data *ref = that->proxy->ref; - const Variant *result = ref->vtable->GetPathConst(ref, that->proxy->path.begin(), - that->proxy->path.end(), false); - return result != 0; - } - - void ProxyInit(Data *that, Data *ref, Path::const_iterator b, Path::const_iterator e) { - static const Proxy proxy_vtable; - if (that->vtable) that->vtable->Destroy(that); - that->vtable = &proxy_vtable; - that->ref_data = ref->vtable->EnsureRef(ref); - shared_ptr storage(new ProxyStorage(ref, b, e)); - that->proxy = storage.get(); - that->storage = storage; - } - - - //------------------- - - void DefaultInit(Data *that, VariantDefines::Type_t type) { - switch (type) { - case VariantDefines::NullType: - NullInit(that); - break; - case VariantDefines::BoolType: - BoolInit(that, false); - break; - case VariantDefines::IntegerType: - IntegerInit(that, 0); - break; - case VariantDefines::UnsignedType: - UnsignedInit(that, 0u); - break; - case VariantDefines::FloatType: - FloatInit(that, 0.0); - break; - case VariantDefines::StringType: - StringInit(that, ""); - break; - case VariantDefines::ListType: - ListInit(that, Variant::List()); - break; - case VariantDefines::MapType: - MapInit(that, Variant::Map()); - break; - case VariantDefines::BlobType: - BlobInit(that, BlobPtr()); - break; - } - } - - Data::Data() : vtable(NullVTable()) {} - } - - //-------------------- - // Variant - //-------------------- - - Variant::Variant(const RefTag &, const Variant &o) - { - o.vtable->MakeRef(&o, this); - } - - Variant::Variant(const RefTag &, Variant &o, Path::const_iterator b, Path::const_iterator e) - { - o.vtable->MakeProxy(&o, this, b, e); - } - - Variant::~Variant() { - vtable->Destruct(this); - } - - VariantDefines::Type_t Variant::GetType() const - { return vtable->GetType(this); } - - bool Variant::AsBool() const - { return vtable->AsBool(this); } - - long double Variant::AsLongDouble() const - { return vtable->AsLongDouble(this); } - - uintmax_t Variant::AsUnsigned() const - { return vtable->AsUnsigned(this); } - - intmax_t Variant::AsInt() const - { return vtable->AsInt(this); } - - std::string Variant::AsString() const - { return vtable->AsString(this); } - - BlobPtr Variant::AsBlob() - { return vtable->AsBlob(this); } - - ConstBlobPtr Variant::AsBlob() const - { return vtable->AsBlobConst(this); } - - unsigned Variant::Size() const - { return vtable->Size(this); } - - bool Variant::Empty() const - { return vtable->Empty(this); } - - void Variant::Clear() - { vtable->Clear(this); } - - Variant::List &Variant::AsList() - { return vtable->AsList(this); } - - const Variant::List &Variant::AsList() const - { return vtable->AsListConst(this); } - - VariantRef Variant::At(unsigned i) - { return vtable->GetRefIndex(this, i, 0); } - - VariantRef Variant::At(unsigned i, Variant def) - { return vtable->GetRefIndex(this, i, &def); } - - const Variant &Variant::At(unsigned i) const - { return *vtable->GetConstIndex(this, i, true); } - - Variant Variant::Get(unsigned i) const - { return *vtable->GetConstIndex(this, i, true); } - - Variant Variant::Get(unsigned i, Variant def) const { - const Variant *ret = vtable->GetConstIndex(this, i, false); - if (ret) { return *ret; } - else { return def; } - } - - Variant &Variant::Set(unsigned i, Variant v) { - vtable->SetIndex(this, i, &v); - return *this; - } - - Variant &Variant::Append(Variant value) { - vtable->AsList(this).push_back(value); - return *this; - } - - bool Variant::Contains(unsigned i) const - { return vtable->ContainsIndex(this, i); } - - unsigned Variant::Index(Variant v) const - { return vtable->Index(this, v); } - - void Variant::Erase(unsigned i) - { vtable->EraseIndex(this, i); } - - Variant::Map &Variant::AsMap() - { return vtable->AsMap(this); } - - const Variant::Map &Variant::AsMap() const - { return vtable->AsMapConst(this); } - - VariantRef Variant::At(const std::string &s) - { return vtable->GetRefKey(this, s, 0); } - - VariantRef Variant::At(const std::string &s, Variant def) - { return vtable->GetRefKey(this, s, &def); } - - const Variant &Variant::At(const std::string &s) const - { return *vtable->GetConstKey(this, s, true); } - - Variant Variant::Get(const std::string &s) const - { return *vtable->GetConstKey(this, s, true); } - - Variant Variant::Get(const std::string &s, Variant def) const { - const Variant *ret = vtable->GetConstKey(this, s, false); - if (ret) { return *ret; } - else { return def; } - } - - Variant &Variant::Set(const std::string &s, Variant v) { - vtable->SetKey(this, s, &v); - return *this; - } - - bool Variant::Contains(const std::string &s) const - { return vtable->ContainsKey(this, s); } - - void Variant::Erase(const std::string &key) - { vtable->EraseKey(this, key); } - - VariantRef Variant::AtPath(const Path &path) - { return vtable->GetPathRef(this, path.begin(), path.end(), 0); } - - VariantRef Variant::AtPath(const Path &path, Variant def) - { return vtable->GetPathRef(this, path.begin(), path.end(), &def); } - - const Variant &Variant::AtPath(const Path &path) const - { return *vtable->GetPathConst(this, path.begin(), path.end(), true); } - - Variant Variant::GetPath(const Path &path) const - { return *vtable->GetPathConst(this, path.begin(), path.end(), true); } - - Variant Variant::GetPath(const Path &path, Variant def) const { - const Variant *ret = vtable->GetPathConst(this, path.begin(), path.end(), false); - if (ret) { return *ret; } - else { return def; } - } - - Variant &Variant::SetPath(const Path &path, Variant val) { - vtable->SetPath(this, path.begin(), path.end(), &val); - return *this; - } - - Variant &Variant::ErasePath(const Path &path, bool remove_empty) { - vtable->ErasePath(this, path.begin(), path.end(), remove_empty); - return *this; - } - - bool Variant::HasPath(const Path &path) const { - return vtable->GetPathConst(this, path.begin(), path.end(), false) != 0; - } - - void Variant::Merge(Variant other) { - for (ConstMapIterator i(other.MapBegin()), e(other.MapEnd()); i != e; ++i) { - this->Set(i->first, i->second); - } - } - - int Variant::Compare(const Variant &other) const - { return vtable->Compare(this, &other); } - - bool Variant::Comparable(const Variant &other) const - { return vtable->Comparable(this, &other); } - - void Variant::Incr() { - vtable->Incr(this); - } - - void Variant::Decr() { - vtable->Decr(this); - } - - void Variant::Add(const Variant &o){ - vtable->Add(this, &o); - } - - void Variant::Sub(const Variant &o){ - vtable->Sub(this, &o); - } - - void Variant::Mul(const Variant &o){ - vtable->Mul(this, &o); - } - - void Variant::Div(const Variant &o){ - vtable->Div(this, &o); - } - - void Variant::Rem(const Variant &o){ - vtable->Rem(this, &o); - } - - Variant Variant::Neg() const - { return vtable->Neg(this); } - - VariantRef Variant::Ref() { - return VariantRef(*this); - } - - Variant Variant::Copy() const { - Variant result; - vtable->Copy(this, &result); - return result; - } - - Variant &Variant::Resolve() { - return *vtable->Resolve(this); - } - - const Variant &Variant::Resolve() const { - return *vtable->ResolveConst(this); - } - - Variant &Variant::Resolve(const Variant &def) { - return *vtable->ResolveDefault(this, &def); - } - - bool Variant::Exists() const { - return vtable->Exists(this); - } - - void Variant::Assign(const Variant &other) - { other.vtable->Assign(&other, this); } - - void Variant::Assign(VariantDefines::Type_t type) - { DefaultInit(vtable->Resolve(this), type); } - - void Variant::Assign(bool v) - { Internal::BoolInit(vtable->Resolve(this), v); } - - void Variant::Assign(int v) - { Internal::IntegerInit(vtable->Resolve(this), v); } - - void Variant::Assign(unsigned v) - { Internal::UnsignedInit(vtable->Resolve(this), v); } - - void Variant::Assign(long v) - { Internal::IntegerInit(vtable->Resolve(this), v); } - - void Variant::Assign(unsigned long v) - { Internal::UnsignedInit(vtable->Resolve(this), v); } - - void Variant::Assign(long long v) - { Internal::IntegerInit(vtable->Resolve(this), v); } - - void Variant::Assign(unsigned long long v) - { Internal::UnsignedInit(vtable->Resolve(this), v); } - - void Variant::Assign(double v) - { Internal::FloatInit(vtable->Resolve(this), v); } - - void Variant::Assign(long double v) - { Internal::FloatInit(vtable->Resolve(this), v); } - - void Variant::Assign(BlobPtr b) - { Internal::BlobInit(vtable->Resolve(this), b); } - - void Variant::Assign(const std::string &v) - { Internal::StringInit(vtable->Resolve(this), v); } - - void Variant::Assign(const char *v) - { Internal::StringInit(vtable->Resolve(this), v); } - - void Variant::ReassignRef(const Variant &o) { - o.vtable->MakeRef(&o, this); - } -} diff --git a/src/hos_libvariant/src/libvariant/src/VariantEmitting.cc b/src/hos_libvariant/src/libvariant/src/VariantEmitting.cc deleted file mode 100644 index 324c1bb1..00000000 --- a/src/hos_libvariant/src/libvariant/src/VariantEmitting.cc +++ /dev/null @@ -1,110 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#include -#include -#include -#include "../../libvariant/include/Variant/Emitter.h" -#include "../../libvariant/include/Variant/Variant.h" - -namespace libvariant { - - Emitter &operator<<(Emitter &e, const Variant &v) { - switch (v.GetType()) { - case Variant::NullType: - e.EmitNull(); - break; - case Variant::BoolType: - if (v.AsBool()) { - e.EmitTrue(); - } else { - e.EmitFalse(); - } - break; - case Variant::IntegerType: - e.Emit(v.AsInt()); - break; - case Variant::UnsignedType: - e.Emit(v.AsUnsigned()); - break; - case Variant::FloatType: - e.Emit(v.AsDouble()); - break; - case Variant::StringType: - e.Emit(v.AsString()); - break; - case Variant::ListType: - e << v.AsList(); - break; - case Variant::MapType: - e << v.AsMap(); - break; - case Variant::BlobType: - e << v.AsBlob(); - break; - default: - throw UnknownTypeError(v.GetType()); - } - return e; - } - - std::string Serialize(Variant v, SerializeType type, Variant params) { - std::ostringstream oss; - Serialize(oss.rdbuf(), v, type, params); - return oss.str(); - - } - - void Serialize(const std::string &filename, Variant v, SerializeType type, - Variant params) { - Emitter emitter = CreateEmitter(CreateEmitterOutput(filename.c_str()), type, params); - emitter << v; - emitter.Close(); - } - - void Serialize(FILE *f, Variant v, SerializeType type, - Variant params) { - Emitter emitter = CreateEmitter(CreateEmitterOutput(f), type, params); - emitter << v; - emitter.Close(); - } - - void Serialize(std::streambuf *sb, Variant v, SerializeType type, - Variant params) { - Emitter emitter = CreateEmitter(CreateEmitterOutput(sb), type, params); - emitter << v; - emitter.Close(); - - } - - unsigned Serialize(void *ptr, unsigned len, Variant v, SerializeType type, - Variant params) { - unsigned out_len = 0; - Emitter emitter = CreateEmitter(CreateEmitterOutput(ptr, len, &out_len), type, params); - emitter << v; - emitter.Close(); - return out_len; - } -} - -void VariantPrint(const libvariant::Variant v) { - libvariant::SerializeJSON(stderr, v, true); - fprintf(stderr, "\n"); -} diff --git a/src/hos_libvariant/src/libvariant/src/VariantParsing.cc b/src/hos_libvariant/src/libvariant/src/VariantParsing.cc deleted file mode 100644 index 7fb57eaf..00000000 --- a/src/hos_libvariant/src/libvariant/src/VariantParsing.cc +++ /dev/null @@ -1,345 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#include -#include -#include -#include -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/include/Variant/Variant.h" - -#if 0 -#include -#include -#define ANCHOR (anchor ? anchor : "") -#define TAG (tag ? tag : "") -#define DBTRACE(args) do {\ - for (int i = Level(); i > 0; --i) { std::cerr << ". "; }\ - std::cerr << args << std::endl;\ -} while (false) -#else -#define DBTRACE(args) -#endif - -namespace libvariant { - - typedef std::map AnchorMap; - - class ParserState { - public: - - ParserState() - {} - - void Anchor(const char *anchor, Variant v) { - if (anchor) { anchors.insert(std::make_pair(std::string(anchor), v)); } - } - - Variant Anchor(const char *anchor) { - return anchors.at(anchor); - } - - AnchorMap anchors; - Variant result; - }; - - class VariantBaseParserActions : public ParserActions { - public: - VariantBaseParserActions(ParserState *s, VariantBaseParserActions *b) - : done(false), seen_begin_document(false), state(s), base(b) - {} - - virtual void BeginDocument(ParserImpl *p) { - DBTRACE("BeginDocument"); - seen_begin_document = true; - } - virtual void EndDocument(ParserImpl *p) { - DBTRACE("EndDocument"); - Finish(p); - } - - virtual void BeginMap(ParserImpl *p, int length, const char *anchor, const char *tag); - virtual void BeginList(ParserImpl *p, int length, const char *anchor, const char *tag); - - virtual void Alias(ParserImpl *p, const char *anchor) { - DBTRACE("Alias (" << ANCHOR << ")"); - SetValue(p, state->Anchor(anchor), 0); - } - virtual void Scalar(ParserImpl *p, double v, const char *anchor, const char *tag) { - DBTRACE("Scalar(" << v << ", " << ANCHOR << ", " << TAG << ")"); - SetValue(p, v, anchor); - } - virtual void Scalar(ParserImpl *p, const char *str, unsigned length, const char *anchor, const char *tag) { - DBTRACE("Scalar(" << std::string(str, length) << ", " << ANCHOR << ", " << TAG << ")"); - SetValue(p, std::string(str, length), anchor); - } - virtual void Scalar(ParserImpl *p, bool v, const char *anchor, const char *tag) { - DBTRACE("Scalar(" << v << ", " << ANCHOR << ", " << TAG << ")"); - SetValue(p, v, anchor); - } - virtual void Null(ParserImpl *p, const char *anchor, const char *tag) { - DBTRACE("Scalar( null, " << ANCHOR << ", " << TAG << ")"); - SetValue(p, Variant::NullType, anchor); - } - virtual void Scalar(ParserImpl *p, intmax_t v, const char *anchor, const char *tag) { - DBTRACE("Scalar(" << v << ", " << ANCHOR << ", " << TAG << ")"); - SetValue(p, v, anchor); - } - virtual void Scalar(ParserImpl *p, uintmax_t v, const char *anchor, const char *tag) { - DBTRACE("Scalar(" << v << ", " << ANCHOR << ", " << TAG << ")"); - SetValue(p, v, anchor); - } - virtual void Scalar(ParserImpl *p, BlobPtr b, const char *anchor, const char *tag) { - DBTRACE("Scalar(blob, " << ANCHOR << ", " << TAG << ")"); - SetValue(p, b, anchor); - } - - virtual void SetValue(ParserImpl *p, Variant v, const char *anchor) { - state->Anchor(anchor, v); - result = v; - if (anchor) { this->anchor = anchor; } - if (!seen_begin_document) { - Finish(p); - } - } - - void Finish(ParserImpl *p) { - if (base) { - base->SetValue(p, result, (anchor.empty() ? 0 : anchor.c_str())); - } else { - state->result = result; - } - done = true; - p->PopAction(); - } - - int Level() { - if (base) { return base->Level() + 1; } - else { return 1; } - } - - Variant result; - bool done; - bool seen_begin_document; - ParserState *state; - VariantBaseParserActions *base; - std::string anchor; - }; - - class VariantMapParserActions : public VariantBaseParserActions { - public: - VariantMapParserActions(ParserState *s, VariantBaseParserActions *b) - : VariantBaseParserActions(s, b), expect_key(true) - { - result = Variant::MapType; - } - - virtual void EndMap(ParserImpl *p) { - DBTRACE("EndMap"); - Finish(p); - } - - virtual void SetValue(ParserImpl *p, Variant v, const char *anchor) { - if (expect_key) { - key = v.AsString(); - expect_key = false; - } else { - state->Anchor(anchor, v); - result[key] = v; - expect_key = true; - } - } - - bool expect_key; - std::string key; - }; - - void VariantBaseParserActions::BeginMap(ParserImpl *p, int length, const char *anchor, const char *tag) { - DBTRACE("BeginMap(" << ANCHOR << ", " << TAG << ")"); - shared_ptr actions(new VariantMapParserActions(state, this)); - if (anchor) { actions->anchor = anchor; } - p->PushAction(actions); - } - - class VariantListParserActions : public VariantBaseParserActions { - public: - VariantListParserActions(ParserState *s, VariantBaseParserActions *b) - : VariantBaseParserActions(s, b) - { - result = Variant::ListType; - } - - virtual void EndList(ParserImpl *p) { - DBTRACE("EndList"); - Finish(p); - } - - virtual void SetValue(ParserImpl *p, Variant v, const char *anchor) { - state->Anchor(anchor, v); - result.Append(v); - } - - }; - - void VariantBaseParserActions::BeginList(ParserImpl *p, int length, const char *anchor, const char *tag) { - DBTRACE("BeginList(" << ANCHOR << ", " << TAG << ")"); - shared_ptr actions(new VariantListParserActions(state, this)); - if (anchor) { actions->anchor = anchor; } - p->PushAction(actions); - } - - Variant ParseVariant(Parser &p) { - ParserState state; - shared_ptr actions(new VariantBaseParserActions(&state, 0)); - p.PushAction(actions); - while (p.Run() == 0 && !actions->done); - return state.result; - } - - Variant Deserialize(const std::string &str, SerializeType type) { - return Deserialize(str.c_str(), str.length(), type); - } - - Variant Deserialize(const char *str, SerializeType type) { - return Deserialize(str, strlen(str), type); - } - - Variant Deserialize(const void *ptr, unsigned len, SerializeType type) { - Parser parser = CreateParser(CreateParserInput(ptr, len), type); - return ParseVariant(parser); - } - - Variant DeserializeFile(const char *filename, SerializeType type) { - Parser parser = CreateParser(CreateParserInputFile(filename), type); - return ParseVariant(parser); - } - - Variant DeserializeFile(FILE *f, SerializeType type) { - Parser parser = CreateParser(CreateParserInputFile(f), type); - return ParseVariant(parser); - } - - Variant DeserializeFile(std::streambuf *sb, SerializeType type) { - Parser parser = CreateParser(CreateParserInputFile(sb), type); - return ParseVariant(parser); - } - - Variant DeserializeGuess(const std::string &str) { - return DeserializeGuess(str.c_str(), str.length()); - } - Variant DeserializeGuess(const char *str) { - return DeserializeGuess(str, strlen(str)); - } - Variant DeserializeGuess(const void *ptr, unsigned len) { - Parser parser = CreateParserGuess(CreateParserInput(ptr, len) ); - return ParseVariant(parser); - } - Variant DeserializeGuessFile(const char *filename) { - Parser parser = CreateParserGuess(CreateParserInputFile(filename)); - return ParseVariant(parser); - } - Variant DeserializeGuessFile(FILE *f) { - Parser parser = CreateParserGuess(CreateParserInputFile(f)); - return ParseVariant(parser); - } - Variant DeserializeGuessFile(std::streambuf *sb) { - Parser parser = CreateParserGuess(CreateParserInputFile(sb)); - return ParseVariant(parser); - } - - LoadAllIterator DeserializeAll(const std::string &str, SerializeType type) { - return DeserializeAll(str.c_str(), str.length(), type); - } - - LoadAllIterator DeserializeAll(const char *str, SerializeType type) { - return DeserializeAll(str, strlen(str), type); - } - - LoadAllIterator DeserializeAll(const void *ptr, unsigned len, SerializeType type) { - Parser parser = CreateParser(CreateParserInput(ptr, len), type); - return LoadAllIterator(parser); - } - - LoadAllIterator DeserializeAllFile(const char *filename, SerializeType type) { - Parser parser = CreateParser(CreateParserInputFile(filename), type); - return LoadAllIterator(parser); - } - - LoadAllIterator DeserializeAllFile(FILE *f, SerializeType type) { - Parser parser = CreateParser(CreateParserInputFile(f), type); - return LoadAllIterator(parser); - } - - LoadAllIterator DeserializeAllFile(std::streambuf *sb, SerializeType type) { - Parser parser = CreateParser(CreateParserInputFile(sb), type); - return LoadAllIterator(parser); - } - - - class LoadAllIterator::Impl { - public: - Impl(Parser p) : parser(p) {} - Parser parser; - }; - - struct LoadAllIterator::Value { - Value(Variant v_) :v(v_) {} - Variant v; - shared_ptr next; - }; - - LoadAllIterator::LoadAllIterator() - {} - - LoadAllIterator::LoadAllIterator(Parser &parser) - : impl(new Impl(parser)) - { - Next(); - } - - Variant &LoadAllIterator::Get() { - if (!value) { throw std::out_of_range("LoadAllIterator: Trying to reach past the end."); } - return value->v; - } - - void LoadAllIterator::Next() { - if (!value) { - if (!impl->parser.Done()) { - value = shared_ptr(new Value(ParseVariant(impl->parser))); - } - } else if (value->next) { - value = value->next; - } else { - if (!impl->parser.Done()) { - value->next = shared_ptr(new Value(ParseVariant(impl->parser))); - if (impl->parser.Done() && value->next->v.IsNull()) { - value->next.reset(); - } - } - value = value->next; - } - } - bool LoadAllIterator::operator==(const LoadAllIterator &that) const { - if (value && that.value) { - return value == that.value; - } - return (!value && !that.value); - } -} diff --git a/src/hos_libvariant/src/libvariant/src/XMLPLISTDefs.h b/src/hos_libvariant/src/libvariant/src/XMLPLISTDefs.h deleted file mode 100644 index ef7ebe45..00000000 --- a/src/hos_libvariant/src/libvariant/src/XMLPLISTDefs.h +++ /dev/null @@ -1,37 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_XMLPLISTDEFS_H -#define VARIANT_XMLPLISTDEFS_H -#pragma once - -#define MAP_NAME "dict" -#define STRING_NAME "string" -#define TRUE_NAME "true" -#define FALSE_NAME "false" -#define INTEGER_NAME "integer" -#define FLOAT_NAME "real" -#define ROOT_NAME "plist" -#define LIST_NAME "array" -#define NULL_NAME "null" -#define KEY_NAME "key" -#define BLOB_NAME "data" - -#endif diff --git a/src/hos_libvariant/src/libvariant/src/XMLPLISTEmitter.cc b/src/hos_libvariant/src/libvariant/src/XMLPLISTEmitter.cc deleted file mode 100644 index db138a3b..00000000 --- a/src/hos_libvariant/src/libvariant/src/XMLPLISTEmitter.cc +++ /dev/null @@ -1,219 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/src/XMLPLISTEmitter.h" - -#include -#include -#include - -#include "../../libvariant/include/Variant/EmitterOutput.h" -#include "../../libvariant/src/Base64.h" -#include "../../libvariant/src/XMLPLISTDefs.h" - -namespace libvariant { - - int XMLPLISTEmitterImpl::DoWrite(void *ctx, const char *buffer, int len) { - XMLPLISTEmitterImpl *impl = (XMLPLISTEmitterImpl*)ctx; - return impl->output->Write(buffer, len); - } - - int XMLPLISTEmitterImpl::DoClose(void *ctx) { - XMLPLISTEmitterImpl *impl = (XMLPLISTEmitterImpl*)ctx; - impl->output->Flush(); - return 0; - } - - XMLPLISTEmitterImpl::XMLPLISTEmitterImpl(shared_ptr out, Variant params) - : output(out), pretty(false), indent(4), - precision(std::numeric_limits::digits10+2), closed(false) - { - if (params.IsMap()) { - params.GetInto(pretty, "pretty", pretty); - params.GetInto(indent, "indent", indent); - params.GetInto(precision, "precision", precision); - } - xmlOutputBufferPtr xmloutput = xmlOutputBufferCreateIO(&XMLPLISTEmitterImpl::DoWrite, - &XMLPLISTEmitterImpl::DoClose, - (void*)this, 0); - if (xmloutput == 0) { - HandleError("xmlOutputBufferCreateIO"); - } - writer = xmlNewTextWriter(xmloutput); - if (writer == 0) { - xmlOutputBufferClose(xmloutput); - HandleError("xmlNewTextWriter"); - } - UpdateParams(); - if (xmlTextWriterStartDocument(writer, 0, 0, "yes") < 0) { - xmlFreeTextWriter(writer); - writer = 0; - HandleError("xmlTextWriterStartDocument"); - } - state.push_back(NONE); - } - - XMLPLISTEmitterImpl::~XMLPLISTEmitterImpl() { - if (!closed) { - xmlTextWriterEndDocument(writer); - xmlTextWriterFlush(writer); - closed = true; - } - xmlFreeTextWriter(writer); - writer = 0; - } - - void XMLPLISTEmitterImpl::BeginDocument() { - StartElement(ROOT_NAME); - } - - void XMLPLISTEmitterImpl::EndDocument() { - CloseElement(); - } - - void XMLPLISTEmitterImpl::BeginMap(int) { - StartElement(MAP_NAME); - state.push_back(EXPECT_MAP_KEY); - } - - void XMLPLISTEmitterImpl::EndMap() { - CloseElement(); - state.pop_back(); - } - - void XMLPLISTEmitterImpl::BeginList(int) { - StartElement(LIST_NAME); - state.push_back(IN_LIST); - } - - void XMLPLISTEmitterImpl::EndList() { - CloseElement(); - state.pop_back(); - } - - void XMLPLISTEmitterImpl::EmitNull() { - StartElement(NULL_NAME); - CloseElement(); - } - - void XMLPLISTEmitterImpl::EmitTrue() { - StartElement(TRUE_NAME); - CloseElement(); - } - - void XMLPLISTEmitterImpl::EmitFalse() { - StartElement(FALSE_NAME); - CloseElement(); - } - - void XMLPLISTEmitterImpl::Emit(const char *v) { - if (state.back() == EXPECT_MAP_KEY) { - StartElement(KEY_NAME, false); - WriteText(v); - CloseElement(); - } else { - StartElement(STRING_NAME); - WriteText(v); - CloseElement(); - } - } - - void XMLPLISTEmitterImpl::Emit(intmax_t v) { - StartElement(INTEGER_NAME); - std::ostringstream oss; - oss << v; - WriteText(oss.str().c_str()); - CloseElement(); - } - - void XMLPLISTEmitterImpl::Emit(uintmax_t v) { - StartElement(INTEGER_NAME); - std::ostringstream oss; - oss << v; - WriteText(oss.str().c_str()); - CloseElement(); - } - - void XMLPLISTEmitterImpl::Emit(double v) { - StartElement(FLOAT_NAME); - std::ostringstream oss; - oss << std::setprecision(precision) << std::showpoint << v; - WriteText(oss.str().c_str()); - CloseElement(); - } - - void XMLPLISTEmitterImpl::Emit(ConstBlobPtr b) { - StartElement(BLOB_NAME); - std::vector buf(Base64EncodeSize(b->GetTotalLength())); - Base64Encode(&buf[0], b->GetIOVec(), b->GetNumBuffers()); - WriteText(&buf[0]); - CloseElement(); - } - - void XMLPLISTEmitterImpl::Flush() { - CheckClosed(); - if (xmlTextWriterFlush(writer) < 0) { - HandleError("xmlTextWriterFlush"); - } - output->Flush(); - } - - void XMLPLISTEmitterImpl::Close() { - if (!closed) { - if (xmlTextWriterEndDocument(writer) < 0) { - HandleError("xmlTextWriterEndDocument"); - } - Flush(); - closed = true; - } - } - - Variant XMLPLISTEmitterImpl::GetParam(const std::string &key) { - if (key == "pretty") { return pretty; } - if (key == "indent") { return indent; } - if (key == "precision") { return precision; } - return Variant::NullType; - } - - Variant XMLPLISTEmitterImpl::GetParams() { - Variant ret; - ret["pretty"] = pretty; - ret["indent"] = indent; - ret["precision"] = precision; - return ret; - } - - void XMLPLISTEmitterImpl::SetParam(const std::string &key, Variant value) { - if (key == "pretty") { pretty = value.AsBool(); } - else if (key == "indent") { indent = value.AsUnsigned(); } - else if (key == "precision") { precision = value.AsUnsigned(); } - UpdateParams(); - } - - void XMLPLISTEmitterImpl::UpdateParams() { - if (pretty) { - xmlTextWriterSetIndent(writer, indent); - } else { - xmlTextWriterSetIndent(writer, 0); - } - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/XMLPLISTEmitter.h b/src/hos_libvariant/src/libvariant/src/XMLPLISTEmitter.h deleted file mode 100644 index daac7a09..00000000 --- a/src/hos_libvariant/src/libvariant/src/XMLPLISTEmitter.h +++ /dev/null @@ -1,133 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief An emitter for the XMLPLIST subset that Variant supports. - * Depends on libxml2. - */ -#ifndef VARIANT_XMLPLISTEMITTER_H -#define VARIANT_XMLPLISTEMITTER_H - -#pragma once -#include "../../libvariant/include/Variant/Emitter.h" -#include -#include -#include - -namespace libvariant { - - /** - * Supported params are: - * - * "pretty": true|false - * "indent": integer (amount to indent for pretty) - * "precision": number of digits for a float - */ - class XMLPLISTEmitterImpl : public EmitterImpl { - enum State { - NONE, - EXPECT_MAP_KEY, - EXPECT_MAP_VALUE, - IN_LIST - }; - public: - - XMLPLISTEmitterImpl(shared_ptr out, Variant params); - ~XMLPLISTEmitterImpl(); - - virtual void BeginDocument(); - virtual void EndDocument(); - virtual void BeginMap(int length); - virtual void EndMap(); - virtual void BeginList(int length); - virtual void EndList(); - - virtual void EmitNull(); - virtual void EmitTrue(); - virtual void EmitFalse(); - virtual void Emit(const char *v); - virtual void Emit(intmax_t v); - virtual void Emit(uintmax_t v); - virtual void Emit(double v); - virtual void Emit(ConstBlobPtr b); - - virtual void Flush(); - virtual void Close(); - - virtual Variant GetParam(const std::string &key); - virtual Variant GetParams(); - virtual void SetParam(const std::string &key, Variant value); - private: - static int DoWrite(void *ctx, const char *buffer, int len); - static int DoClose(void *ctx); - - void HandleError(const char *fnname) { - xmlErrorPtr error = xmlGetLastError(); - if (error) { - throw std::runtime_error(error->message); - } else { - throw std::runtime_error(fnname); - } - } - - void CheckClosed() { - if (closed) { throw std::runtime_error("Cannot operate on a closed XMLPLISTEmitter."); } - } - - void CheckMapKey(bool complex_type) { - if (state.back() == EXPECT_MAP_VALUE) { - state.back() = EXPECT_MAP_KEY; - } else if (state.back() == EXPECT_MAP_KEY) { - if (complex_type) { - throw std::runtime_error("XMLPLISTEmitter does not support non trivial types as keys"); - } - state.back() = EXPECT_MAP_VALUE; - } - } - - void StartElement(const char *name, bool complex_type=true) { - CheckClosed(); - if (xmlTextWriterStartElement(writer, (const xmlChar*)name) < 0) { - HandleError("xmlTextWriterStartElement"); - } - CheckMapKey(complex_type); - } - - void CloseElement() { - CheckClosed(); - if (xmlTextWriterEndElement(writer) < 0) { - HandleError("xmlTextWriterEndElement"); - } - } - - void WriteText(const char *ptr) { - if (xmlTextWriterWriteString(writer, (const xmlChar*)ptr) < 0) { - HandleError("xmlTextWriterWriteString"); - } - } - - void UpdateParams(); - xmlTextWriterPtr writer; - shared_ptr output; - bool pretty; - unsigned indent; - unsigned precision; - bool closed; - std::deque state; - }; -} -#endif diff --git a/src/hos_libvariant/src/libvariant/src/XMLPLISTParser.cc b/src/hos_libvariant/src/libvariant/src/XMLPLISTParser.cc deleted file mode 100644 index 107c28a8..00000000 --- a/src/hos_libvariant/src/libvariant/src/XMLPLISTParser.cc +++ /dev/null @@ -1,425 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/src/XMLPLISTParser.h" - -#include -#include -#include -#include -#include - -#include "../../libvariant/src/Base64.h" -#include "../../libvariant/src/XMLPLISTDefs.h" - -namespace libvariant { - - XMLPLISTParserImpl::State_t XMLPLISTParserImpl::StringToNode(const char *name) { - if (!name) { - return StringNode; - } else if (strcasecmp(name, STRING_NAME) == 0) { - return StringNode; - } else if (strcasecmp(name, TRUE_NAME) == 0) { - return TrueNode; - } else if (strcasecmp(name, ROOT_NAME) == 0) { - return RootNode; - } else if (strcasecmp(name, LIST_NAME) == 0) { - return ListNode; - } else if (strcasecmp(name, FALSE_NAME) == 0) { - return FalseNode; - } else if (strcasecmp(name, INTEGER_NAME) == 0) { - return IntegerNode; - } else if (strcasecmp(name, FLOAT_NAME) == 0) { - return FloatNode; - } else if (strcasecmp(name, NULL_NAME) == 0) { - return NullNode; - } else if (strcasecmp(name, MAP_NAME) == 0) { - return MapNode; - } else if (strcasecmp(name, KEY_NAME) == 0) { - return KeyNode; - } else if (strcasecmp(name, BLOB_NAME) == 0) { - return BlobNode; - } else { - return StringNode; - } - } - - int XMLPLISTParserImpl::Run() { - while (!action_stack.empty()) { - if (closed) { return 1; } - bool loop = true; - switch (statestack.back()) { - case StartState: - statestack.back() = EndState; - break; - case EndState: - return 1; - case EmptyMapNode: - statestack.pop_back(); - TopAction()->EndMap(this); - return 0; - case EmptyListNode: - statestack.pop_back(); - TopAction()->EndList(this); - return 0; - case RootNode: - case MapNode: - case ListNode: - break; - default: - err = true; - errorstr = "libvariant XML PLIST parser in an inconsistent state"; - throw std::runtime_error(errorstr); - } - while (loop) { - int ret = xmlTextReaderRead(reader); - if (ret == 1) { - int node_type = xmlTextReaderNodeType(reader); - const char *name = (const char*)xmlTextReaderConstName(reader); - switch (node_type) { - case XML_READER_TYPE_ELEMENT: - loop = BeginElement(TopAction(), StringToNode(name)); - break; - case XML_READER_TYPE_END_ELEMENT: - loop = EndElement(TopAction(), StringToNode(name)); - break; - case XML_READER_TYPE_TEXT: - loop = ProcessText(TopAction()); - break; - case XML_READER_TYPE_END_ENTITY: - case XML_READER_TYPE_ATTRIBUTE: - case XML_READER_TYPE_CDATA: - case XML_READER_TYPE_ENTITY_REFERENCE: - case XML_READER_TYPE_ENTITY: - case XML_READER_TYPE_PROCESSING_INSTRUCTION: - case XML_READER_TYPE_COMMENT: - case XML_READER_TYPE_DOCUMENT: - case XML_READER_TYPE_DOCUMENT_TYPE: - case XML_READER_TYPE_DOCUMENT_FRAGMENT: - case XML_READER_TYPE_NOTATION: - case XML_READER_TYPE_WHITESPACE: - case XML_READER_TYPE_SIGNIFICANT_WHITESPACE: - case XML_READER_TYPE_XML_DECLARATION: - case XML_READER_TYPE_NONE: - default: - break; - } - } else if (ret == 0) { - if (statestack.back() != EndState) { - err = true; - errorstr = "libvariant XML PLIST parser in inconsistent state"; - throw std::runtime_error(errorstr); - } - return 1; - } else { - HandleError("xmlTextReaderRead"); - } - } - } - return 0; - } - - bool XMLPLISTParserImpl::BeginElement(ParserActions *action, State_t nodetype) { - bool empty_node = xmlTextReaderIsEmptyElement(reader) != 0; - switch (nodetype) { - case NullNode: - if (!empty_node) { statestack.push_back(nodetype); } - action->Null(this, 0, 0); - return !empty_node; - case RootNode: - statestack.push_back(nodetype); - action->BeginDocument(this); - return !empty_node; - case TrueNode: - if (!empty_node) { statestack.push_back(nodetype); } - action->Scalar(this, true, 0, 0); - return !empty_node; - case FalseNode: - if (!empty_node) { statestack.push_back(nodetype); } - action->Scalar(this, false, 0, 0); - return !empty_node; - case IntegerNode: - if (!empty_node) { - statestack.push_back(nodetype); - empty = true; - } else { - err = true; - errorstr = "libvariant XML PLIST does not allow empty interger elements"; - throw std::runtime_error(errorstr); - } - return true; - case FloatNode: - if (!empty_node) { - statestack.push_back(nodetype); - empty = true; - } else { - err = true; - errorstr = "libvariant XML PLIST does not allow empty real elements"; - throw std::runtime_error(errorstr); - } - return true; - case StringNode: - if (!empty_node) { - statestack.push_back(nodetype); - empty = true; - } else { - err = true; - errorstr = "libvariant XML PLIST does not allow empty string elements"; - throw std::runtime_error(errorstr); - } - return true; - case BlobNode: - if (!empty_node) { - statestack.push_back(nodetype); - empty = true; - } else { - err = true; - errorstr = "libvariant XML PLIST does not allow empty data elements"; - throw std::runtime_error(errorstr); - } - return true; - case MapNode: - if (empty_node) { statestack.push_back(EmptyMapNode); } - else { statestack.push_back(nodetype); } - action->BeginMap(this, -1, 0, 0); - return false; - case KeyNode: - { - if (empty_node) { - err = true; - errorstr = "libvariant XML PLIST does not allow empty key elements"; - throw std::runtime_error(errorstr); - } - statestack.push_back(nodetype); - empty = true; - } - return true; - case ListNode: - if (empty_node) { statestack.push_back(EmptyListNode); } - else { statestack.push_back(nodetype); } - action->BeginList(this, -1, 0, 0); - return false; - default: - err = true; - errorstr = "Invalid libvariant XML PLIST parser state"; - throw std::runtime_error(errorstr); - } - } - - bool XMLPLISTParserImpl::ProcessText(ParserActions *action) { - switch (statestack.back()) { - case NullNode: - case RootNode: - case TrueNode: - case FalseNode: - case MapNode: - case ListNode: - return true; - case IntegerNode: - { - empty = false; - const char *value = (const char*)xmlTextReaderConstValue(reader); - intmax_t val; - val = strtoll(value, 0, 0); - if (val == LLONG_MAX && errno == ERANGE) { - uintmax_t v; - v = strtoull(value, 0, 0); - action->Scalar(this, v, 0, 0); - } else { - action->Scalar(this, val, 0, 0); - } - } - return true; - case FloatNode: - { - empty = false; - const char *value = (const char*)xmlTextReaderConstValue(reader); - double val = strtod(value, 0); - action->Scalar(this, val, 0, 0); - } - return true; - case StringNode: - { - empty = false; - const char *value = (const char*)xmlTextReaderConstValue(reader); - action->Scalar(this, value, strlen(value), 0, 0); - } - return true; - case BlobNode: - { - empty = false; - const char *value = (const char*)xmlTextReaderConstValue(reader); - unsigned length = strlen(value); - void *data = 0; - if (posix_memalign(&data, 64, Base64DecodeSize(length)) != 0) { - err = true; - errorstr = "memory allocation failure"; - throw std::bad_alloc(); - } - unsigned len = Base64Decode(data, value, length); - action->Scalar(this, Blob::CreateFree(data, len), 0, 0); - } - return true; - case KeyNode: - { - empty = false; - const char *value = (const char*)xmlTextReaderConstValue(reader); - action->Scalar(this, value, strlen(value), 0, 0); - } - return true; - default: - err = true; - errorstr = "Invalid libvariant XML PLIST parser state"; - throw std::runtime_error(errorstr); - } - - } - - bool XMLPLISTParserImpl::EndElement(ParserActions *action, State_t nodetype) { - if (statestack.back() != nodetype) { - err = true; - errorstr = "libvariant XML PLIST parser in inconsistent state"; - throw std::runtime_error(errorstr); - } - statestack.pop_back(); - switch (nodetype) { - case NullNode: - case TrueNode: - case FalseNode: - return false; - case IntegerNode: - case FloatNode: - if (empty) { - err = true; - errorstr = "libvariant XML PLIST parser cannot have empty numeric nodes"; - throw std::runtime_error(errorstr); - } - return false; - case BlobNode: - if (empty) { - err = true; - errorstr = "libvariant XML PLIST parser cannot have empty data nodes"; - throw std::runtime_error(errorstr); - } - return false; - case StringNode: - case KeyNode: - if (empty) { action->Scalar(this, "", 0, 0, 0); } - return false; - case RootNode: - action->EndDocument(this); - return false; - case MapNode: - action->EndMap(this); - return false; - case ListNode: - action->EndList(this); - return false; - default: - err = true; - errorstr = "Invalid libvariant XML PLIST parser state"; - throw std::runtime_error(errorstr); - } - } - - void XMLPLISTParserImpl::Close() { - if (!closed) { - closed = true; - xmlTextReaderClose(reader); - } - } - - void XMLPLISTParserImpl::HandleError(const char *fnname) { - xmlErrorPtr error = xmlGetLastError(); - err = true; - if (error) { - errorstr = error->message; - throw std::runtime_error(error->message); - } else { - errorstr = fnname; - throw std::runtime_error(fnname); - } - } - - int XMLPLISTParserImpl::do_read(void *ctx, char *buffer, int len) { - XMLPLISTParserImpl *impl = (XMLPLISTParserImpl*)ctx; - unsigned l = len; - const void *ptr = impl->input->GetPtr(l); - if (!ptr) { return 0; } - l = std::min(len, l); - memcpy(buffer, ptr, l); - impl->input->Release(l); - return l; - } - - int XMLPLISTParserImpl::do_close(void *ctx) { - XMLPLISTParserImpl *impl = (XMLPLISTParserImpl*)ctx; - impl->Close(); - return 0; - } - - XMLPLISTParserImpl::XMLPLISTParserImpl(shared_ptr in) - : input(in), closed(false), err(false) - { - reader = xmlReaderForIO(do_read, do_close, this, 0, 0, - XML_PARSE_NOENT|XML_PARSE_NOCDATA); - if (!reader) { - HandleError("xmlReaderForIO"); - } - statestack.push_back(StartState); - } - - XMLPLISTParserImpl::~XMLPLISTParserImpl() { - Close(); - xmlFreeTextReader(reader); - reader = 0; - } - - bool XMLPLISTParserImpl::Done() const { - return closed; - } - - bool XMLPLISTParserImpl::Error() const { - return err; - } - - bool XMLPLISTParserImpl::Ok() const { - return !closed && !err; - } - - std::string XMLPLISTParserImpl::ErrorStr() const { - return errorstr; - } - - void XMLPLISTParserImpl::Reset() { - Close(); - xmlFreeTextReader(reader); - reader = 0; - reader = xmlReaderForIO(do_read, do_close, this, 0, 0, - XML_PARSE_NOENT|XML_PARSE_NOCDATA); - if (!reader) { - HandleError("xmlReaderForIO"); - } - statestack.push_back(StartState); - closed = false; - err = false; - - } -} diff --git a/src/hos_libvariant/src/libvariant/src/XMLPLISTParser.h b/src/hos_libvariant/src/libvariant/src/XMLPLISTParser.h deleted file mode 100644 index 65598fb1..00000000 --- a/src/hos_libvariant/src/libvariant/src/XMLPLISTParser.h +++ /dev/null @@ -1,81 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#ifndef VARIANT_XMLPLISTPARSER_H -#define VARIANT_XMLPLISTPARSER_H - -#pragma once -#include -#include -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/include/Variant/ParserInput.h" -#include "../../libvariant/include/Variant/SharedPtr.h" - - -namespace libvariant { - - class XMLPLISTParserImpl : public ParserImpl { - enum State_t { - StartState, - NullNode, - RootNode, - TrueNode, - FalseNode, - IntegerNode, - FloatNode, - StringNode, - BlobNode, - MapNode, - EmptyMapNode, - KeyNode, - ListNode, - EmptyListNode, - EndState - }; - public: - XMLPLISTParserImpl(shared_ptr in); - virtual ~XMLPLISTParserImpl(); - virtual int Run(); - virtual bool Done() const; - virtual bool Error() const; - virtual bool Ok() const; - virtual std::string ErrorStr() const; - virtual void Reset(); - private: - bool BeginElement(ParserActions *action, State_t nodetype); - bool ProcessText(ParserActions *action); - bool EndElement(ParserActions *action, State_t nodetype); - void Close(); - void HandleError(const char *fnname); - - static int do_read(void *ctx, char *buffer, int len); - static int do_close(void *ctx); - static State_t StringToNode(const char *name); - - std::deque statestack; - xmlTextReaderPtr reader; - shared_ptr input; - bool closed; - bool empty; - bool err; - std::string errorstr; - }; -} -#endif diff --git a/src/hos_libvariant/src/libvariant/src/YAMLEmitter.cc b/src/hos_libvariant/src/libvariant/src/YAMLEmitter.cc deleted file mode 100644 index 292ba1da..00000000 --- a/src/hos_libvariant/src/libvariant/src/YAMLEmitter.cc +++ /dev/null @@ -1,412 +0,0 @@ -//============================================================================= -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief A wrapper class around a libyaml emitter - */ -#include "../../libvariant/src/YAMLEmitter.h" - -#include -#include -#include -#include - -#include "../../libvariant/include/Variant/EmitterOutput.h" -#include "../../libvariant/src/Base64.h" - -namespace libvariant { - - static int WriteHandler(void *data, unsigned char *buffer, size_t size) { - EmitterOutput *out = (EmitterOutput*)data; - return out->Write((const void*)buffer, size); - } - - static const char *param_keys[] = { "scalar_style", "map_style", "list_style", - "implicit_document_begin", "implicit_document_end", "indent", "width", - "precision", 0 }; - static const char *scalar_style_str[] = { "any", "plain", "single quoted", - "double quoted", "literal", "folded", 0 }; - static const char *style_str[] = { "any", "block", "flow", 0 }; - - YAMLEmitterImpl::Config::Config(Variant params) - : default_scalar_style(ANY_SCALAR_STYLE), - default_map_style(ANY_STYLE), - default_list_style(ANY_STYLE), - implicit_begin_document(false), - implicit_end_document(false), - indent(-1), - width(-1), - precision(std::numeric_limits::digits10+2) - { - SetParams(params); - } - - void YAMLEmitterImpl::Config::SetParams(Variant params) { - if (params.IsMap()) { - for (int i = 0; param_keys[i]; ++i) { - const char *key = param_keys[i]; - if (params.Contains(key)) { - SetParam((ConfigKeys)i, params[key]); - } - } - } - } - - void YAMLEmitterImpl::Config::SetParam(const std::string &key, Variant value) { - for (int i = 0; param_keys[i]; ++i) { - if (param_keys[i] == key) { - SetParam((ConfigKeys)i, value); - break; - } - } - } - - void YAMLEmitterImpl::Config::SetParam(ConfigKeys index, Variant value) { - switch (index) { - case SCALAR_STYLE: - { - std::string v = value.AsString(); - for (int i = 0; scalar_style_str[i]; ++i) { - const char *style = scalar_style_str[i]; - if (v == style) { - default_scalar_style = (ScalarStyle)i; - break; - } - } - } - break; - case MAP_STYLE: - { - std::string v = value.AsString(); - for (int i = 0; style_str[i]; ++i) { - const char *style = style_str[i]; - if (v == style) { - default_map_style = (Style)i; - break; - } - } - } - break; - case LIST_STYLE: - { - std::string v = value.AsString(); - for (int i = 0; style_str[i]; ++i) { - const char *style = style_str[i]; - if (v == style) { - default_list_style = (Style)i; - break; - } - } - } - break; - case IMPLICIT_DOCUMENT_BEGIN: - implicit_begin_document = value.AsBool(); - break; - case IMPLICIT_DOCUMENT_END: - implicit_end_document = value.AsBool(); - break; - case INDENT: - indent = value.AsInt(); - break; - case WIDTH: - width = value.AsInt(); - break; - case PRECISION: - precision = value.AsUnsigned(); - break; - default: - break; - } - } - - Variant YAMLEmitterImpl::Config::GetParams() { - Variant ret = Variant::MapType; - for (int i = 0; param_keys[i]; ++i) { - const char *key = param_keys[i]; - ret[key] = GetParam((ConfigKeys)i); - } - return ret; - } - - Variant YAMLEmitterImpl::Config::GetParam(const std::string &key) { - for (int i = 0; param_keys[i]; ++i) { - if (param_keys[i] == key) { - return GetParam((ConfigKeys)i); - } - } - return Variant::NullType; - } - - Variant YAMLEmitterImpl::Config::GetParam(ConfigKeys index) { - switch (index) { - case SCALAR_STYLE: - return scalar_style_str[index]; - case MAP_STYLE: - return style_str[index]; - case LIST_STYLE: - return style_str[index]; - case IMPLICIT_DOCUMENT_BEGIN: - return implicit_begin_document; - case IMPLICIT_DOCUMENT_END: - return implicit_end_document; - case INDENT: - return indent; - case WIDTH: - return width; - case PRECISION: - return precision; - default: - return Variant::NullType; - } - } - - - YAMLEmitterImpl::YAMLEmitterImpl(shared_ptr o, Variant params) - :out(o), closed(false), in_document(false), conf(params) - { - if (yaml_emitter_initialize(&emitter) == 0) { - throw std::runtime_error("Unable to initialize YAMLEmitter."); - } - yaml_emitter_set_output(&emitter, WriteHandler, out.get()); - if (conf.indent > 0) { - yaml_emitter_set_indent(&emitter, conf.indent); - } - if (conf.width > 0) { - yaml_emitter_set_width(&emitter, conf.width); - } - try { EmitStreamStart(); } - catch (...) { - yaml_emitter_delete(&emitter); - throw; - } - } - - YAMLEmitterImpl::~YAMLEmitterImpl() { - try { Close(); } - catch (const std::runtime_error &) {} - } - - void YAMLEmitterImpl::BeginDocument() { - BeginDocument(conf.implicit_begin_document); - } - - void YAMLEmitterImpl::BeginDocument(bool implicit) { - CheckClosed(); - CheckOutDocument(); - yaml_event_t event; - if (yaml_document_start_event_initialize(&event, 0, 0, 0, implicit ? 1 : 0) == 0) { - throw std::runtime_error("Error initializing document start event."); - } - Emit(event); - in_document = true; - } - - void YAMLEmitterImpl::EndDocument() { - EndDocument(conf.implicit_end_document); - } - - void YAMLEmitterImpl::EndDocument(bool implicit) { - CheckClosed(); - CheckInDocument(); - yaml_event_t event; - if (yaml_document_end_event_initialize(&event, implicit ? 1 : 0) == 0) { - throw std::runtime_error("Error initializing document end event."); - } - Emit(event); - in_document = false; - } - - void YAMLEmitterImpl::BeginMap(int length) { - BeginMap(length, conf.default_map_style); - } - - void YAMLEmitterImpl::BeginMap(int, Style style) { - CheckClosed(); - CheckInDocument(); - yaml_event_t event; - if (yaml_mapping_start_event_initialize(&event, 0, 0, 1, - (yaml_mapping_style_t)style) == 0) { - throw std::runtime_error("Unable to initialize mapping start event"); - } - Emit(event); - } - - void YAMLEmitterImpl::EndMap() { - CheckClosed(); - CheckInDocument(); - yaml_event_t event; - if (yaml_mapping_end_event_initialize(&event) == 0) { - throw std::runtime_error("Unable to initialize mapping end event."); - } - Emit(event); - } - - void YAMLEmitterImpl::BeginList(int length) { - BeginList(length, conf.default_list_style); - } - - void YAMLEmitterImpl::BeginList(int, Style style) { - CheckClosed(); - CheckInDocument(); - yaml_event_t event; - if (yaml_sequence_start_event_initialize(&event, 0, 0, 1, - (yaml_sequence_style_t)style) == 0) { - throw std::runtime_error("Unable to initialize sequence start event"); - } - Emit(event); - } - - void YAMLEmitterImpl::EndList() { - CheckClosed(); - CheckInDocument(); - yaml_event_t event; - if (yaml_sequence_end_event_initialize(&event) == 0) { - throw std::runtime_error("Unable to initialize sequence end event."); - } - Emit(event); - } - - void YAMLEmitterImpl::EmitNull() { - Emit("null", PLAIN_SCALAR_STYLE); - } - - void YAMLEmitterImpl::EmitTrue() { - Emit("true", PLAIN_SCALAR_STYLE); - } - - void YAMLEmitterImpl::EmitFalse() { - Emit("false", PLAIN_SCALAR_STYLE); - } - - void YAMLEmitterImpl::Emit(const std::string &v, ScalarStyle style) { - CheckClosed(); - CheckInDocument(); - yaml_event_t event; - if (yaml_scalar_event_initialize(&event, 0, 0, (yaml_char_t*)v.c_str(), v.length(), 1, 1, - (yaml_scalar_style_t)style) == 0) { - throw std::runtime_error("Unable to initialize scalar event."); - } - Emit(event); - } - - void YAMLEmitterImpl::Emit(const char *v) { - Emit(v, ANY_SCALAR_STYLE); - } - - void YAMLEmitterImpl::Emit(const char *v, ScalarStyle style) { - CheckClosed(); - CheckInDocument(); - yaml_event_t event; - if (yaml_scalar_event_initialize(&event, 0, 0, (yaml_char_t*)v, strlen(v), 1, 1, - (yaml_scalar_style_t)style) == 0) { - throw std::runtime_error("Unable to initialize scalar event."); - } - Emit(event); - } - - void YAMLEmitterImpl::Emit(intmax_t v) { - std::ostringstream oss; - oss << v; - Emit(oss.str(), PLAIN_SCALAR_STYLE); - } - - void YAMLEmitterImpl::Emit(uintmax_t v) { - std::ostringstream oss; - oss << v; - Emit(oss.str(), PLAIN_SCALAR_STYLE); - } - - void YAMLEmitterImpl::Emit(double v) { - std::ostringstream oss; - if (v != v) { - oss << ".nan"; - } else if (std::abs(v) == std::numeric_limits::infinity()) { - oss << (v < 0 ? "-" : "") << ".inf"; - } else { - oss << std::setprecision(conf.precision) << std::showpoint << v; - } - Emit(oss.str(), PLAIN_SCALAR_STYLE); - } - - void YAMLEmitterImpl::Emit(ConstBlobPtr b) { - CheckClosed(); - CheckInDocument(); - yaml_event_t event; - std::vector buf(Base64EncodeSize(b->GetTotalLength())); - unsigned len = Base64Encode(&buf[0], b->GetIOVec(), b->GetNumBuffers(), 0); - if (yaml_scalar_event_initialize(&event, 0, (yaml_char_t*)"tag:yaml.org,2002:binary", (yaml_char_t*)&buf[0], len, 0, 0, - (yaml_scalar_style_t)ANY_SCALAR_STYLE) == 0) { - throw std::runtime_error("Unable to initialize scalar event."); - } - Emit(event); - } - - void YAMLEmitterImpl::Flush() { - CheckClosed(); - if (yaml_emitter_flush(&emitter) == 0) { - throw std::runtime_error(emitter.problem); - } - } - - void YAMLEmitterImpl::Close() { - if (!closed) { - CheckOutDocument(); - yaml_event_t event; - if (yaml_stream_end_event_initialize(&event) == 0) { - throw std::runtime_error("Unable to initialize stream end event."); - } - Emit(event); - Flush(); - yaml_emitter_delete(&emitter); - out.reset(); - closed = true; - } - } - - Variant YAMLEmitterImpl::GetParam(const std::string &key) { - return conf.GetParam(key); - } - - Variant YAMLEmitterImpl::GetParams() { - return conf.GetParams(); - } - - void YAMLEmitterImpl::SetParam(const std::string &key, Variant value) { - conf.SetParam(key, value); - } - - void YAMLEmitterImpl::SetParams(Variant params) { - conf.SetParams(params); - } - - void YAMLEmitterImpl::EmitStreamStart() { - yaml_event_t event; - if (yaml_stream_start_event_initialize(&event, YAML_UTF8_ENCODING) == 0) { - throw std::runtime_error("Unable to initialize stream start event"); - } - Emit(event); - } - - void YAMLEmitterImpl::Emit(yaml_event_t &event) { - if (yaml_emitter_emit(&emitter, &event) == 0) { - yaml_event_delete(&event); - throw std::runtime_error(emitter.problem); - } - } - -} diff --git a/src/hos_libvariant/src/libvariant/src/YAMLEmitter.h b/src/hos_libvariant/src/libvariant/src/YAMLEmitter.h deleted file mode 100644 index 12b8375d..00000000 --- a/src/hos_libvariant/src/libvariant/src/YAMLEmitter.h +++ /dev/null @@ -1,170 +0,0 @@ -//============================================================================= -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief A wrapper class around a libyaml emitter - */ - -#ifndef YAMLEMITTER_INC -#define YAMLEMITTER_INC - -#pragma once -#include -#include -#include -#include -#include -#include "../../libvariant/include/Variant/Emitter.h" -#include -#include - -namespace libvariant { - - /** - * Supported parameters are (first is default): - * "scalar_style": "any"|"plain"|"single quoted"|"double - * quoted"|"literal"|"folded" - * "map_style": "any"|"block"|"flow" - * "list_style": "any"|"block"|"flow" - * "implicit_document_begin": false|true - * "implicit_document_end": false|true - * These two parameters are only settable on creation. - * Resetting afterwards has no effect. - * "indent": integer (number of spaces to indent) - * "width": integer (set prefered line width) - * "precision": number of digits for a float - */ - class YAMLEmitterImpl : public EmitterImpl { - public: - enum ConfigKeys { - SCALAR_STYLE, - MAP_STYLE, - LIST_STYLE, - IMPLICIT_DOCUMENT_BEGIN, - IMPLICIT_DOCUMENT_END, - INDENT, - WIDTH, - PRECISION - }; - - enum ScalarStyle { - ANY_SCALAR_STYLE, - PLAIN_SCALAR_STYLE, - SINGLE_QUOTED_SCALAR_STYLE, - DOUBLE_QUOTED_SCALAR_STYLE, - LITERAL_SCALAR_STYLE, - FOLDED_SCALAR_STYLE - }; - - enum Style { - ANY_STYLE, - BLOCK_STYLE, - FLOW_STYLE - }; - - struct Config { - Config(Variant params); - void SetParams(Variant params); - void SetParam(const std::string &key, Variant value); - void SetParam(ConfigKeys index, Variant value); - Variant GetParams(); - Variant GetParam(const std::string &key); - Variant GetParam(ConfigKeys index); - - ScalarStyle default_scalar_style; - Style default_map_style; - Style default_list_style; - bool implicit_begin_document; - bool implicit_end_document; - int indent; - int width; - unsigned precision; - }; - - /** - * Create a YAMLEmitter that uses output to write. - * The output object will be deleted when YAMLEmitter - * is destroyed. - */ - YAMLEmitterImpl(shared_ptr output, Variant params); - virtual ~YAMLEmitterImpl(); - - virtual void BeginDocument(); - void BeginDocument(bool implicit); - virtual void EndDocument(); - void EndDocument(bool implicit); - virtual void BeginMap(int length); - void BeginMap(int length, Style style); - virtual void EndMap(); - virtual void BeginList(int length); - void BeginList(int length, Style style); - virtual void EndList(); - - virtual void EmitNull(); - virtual void EmitTrue(); - virtual void EmitFalse(); - void Emit(const std::string &v, ScalarStyle style); - virtual void Emit(const char *v); - void Emit(const char *v, ScalarStyle style); - virtual void Emit(intmax_t v); - virtual void Emit(uintmax_t v); - virtual void Emit(double v); - virtual void Emit(ConstBlobPtr b); - - virtual void Flush(); - /** Flush, release all resources and clean up. - * Doing anything other than deleting this object - * will result in a std::runtime_error */ - virtual void Close(); - - virtual Variant GetParam(const std::string &key); - virtual Variant GetParams(); - virtual void SetParam(const std::string &key, Variant value); - virtual void SetParams(Variant params); - - private: - void EmitStreamStart(); - void Emit(yaml_event_t &event); - - void CheckClosed() { - if (closed) { - throw std::runtime_error("YAMLEmitter is closed"); - } - } - - void CheckInDocument() { - if (!in_document) { - BeginDocument(); - } - } - - void CheckOutDocument() { - if (in_document) { - EndDocument(); - } - } - - shared_ptr out; - yaml_emitter_t emitter; - bool closed; - bool in_document; - Config conf; - }; - -} -#endif diff --git a/src/hos_libvariant/src/libvariant/src/YAMLParser.cc b/src/hos_libvariant/src/libvariant/src/YAMLParser.cc deleted file mode 100644 index 484ad62d..00000000 --- a/src/hos_libvariant/src/libvariant/src/YAMLParser.cc +++ /dev/null @@ -1,195 +0,0 @@ -//============================================================================= -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/src/YAMLParser.h" - -#include -#include -#include -#include -#include "../../libvariant/src/Base64.h" -#include "../../libvariant/src/GuessScalar.h" - -namespace libvariant { - - int YAMLParserImpl::ParserReadHandler(void *data, unsigned char *buffer, size_t size, size_t *sizein) { - YAMLParserImpl *impl = (YAMLParserImpl*)data; - unsigned len = size; - const void *ptr = impl->input->GetPtr(len); - if (!ptr) { - *sizein = 0; - return 1; - } - *sizein = std::min(size, len); - memcpy(buffer, ptr, *sizein); - impl->input->Release(*sizein); - return 1; - } - - YAMLParserImpl::YAMLParserImpl(shared_ptr in) - : input(in), eof(false), err(false) - { - yaml_parser_initialize(&parser); - yaml_parser_set_input(&parser, &ParserReadHandler, this); - } - - YAMLParserImpl::~YAMLParserImpl() { - yaml_parser_delete(&parser); - } - - void ParseScalar(yaml_event_t &event, ParserImpl *p, ParserActions *action) { - const char *value = (const char *)event.data.scalar.value; - const char *anchor = (const char *)event.data.scalar.anchor; - const char *tag = (const char *)event.data.scalar.tag; - unsigned length = event.data.scalar.length; - yaml_scalar_style_t style = event.data.scalar.style; - if (tag && strcmp(tag, "tag:yaml.org,2002:binary") == 0) { - void *data = 0; - if (posix_memalign(&data, 64, Base64DecodeSize(length)) != 0) { - throw std::bad_alloc(); - } - unsigned len = Base64Decode(data, value, length); - action->Scalar(p, Blob::CreateFree(data, len), anchor, tag); - return; - } - switch (style) { - case YAML_ANY_SCALAR_STYLE: - case YAML_PLAIN_SCALAR_STYLE: - break; - case YAML_SINGLE_QUOTED_SCALAR_STYLE: - case YAML_DOUBLE_QUOTED_SCALAR_STYLE: - case YAML_LITERAL_SCALAR_STYLE: - case YAML_FOLDED_SCALAR_STYLE: - action->Scalar(p, value, length, anchor, tag); - return; - } - if (tag) { - action->Scalar(p, value, length, anchor, tag); - } else { - GuessScalar(value, length, anchor, tag, p, action); - } - } - - int YAMLParserImpl::Run() { - bool loop = true; - while (loop && !eof && !action_stack.empty()) { - yaml_event_t event; - if (yaml_parser_parse(&parser, &event) == 0) { - err = true; - std::ostringstream oss; - oss << "Error parsing YAML: " << parser.problem << " " - << (parser.context ? parser.context : "") - << " at line " << parser.problem_mark.line << " column " - << parser.problem_mark.column << "\n"; - errorstr = oss.str(); - throw std::runtime_error(errorstr); - } - - try { - switch (event.type) { - /** An empty event. */ - case YAML_NO_EVENT: - break; - - /** A STREAM-START event. */ - case YAML_STREAM_START_EVENT: - break; - /** A STREAM-END event. */ - case YAML_STREAM_END_EVENT: - eof = true; - loop = false; - break; - - /** A DOCUMENT-START event. */ - case YAML_DOCUMENT_START_EVENT: - TopAction()->BeginDocument(this); - break; - /** A DOCUMENT-END event. */ - case YAML_DOCUMENT_END_EVENT: - TopAction()->EndDocument(this); - loop = false; - break; - - /** An ALIAS event. */ - case YAML_ALIAS_EVENT: - TopAction()->Alias(this, (const char*)event.data.alias.anchor); - break; - /** A SCALAR event. */ - case YAML_SCALAR_EVENT: - ParseScalar(event, this, TopAction()); - break; - - /** A SEQUENCE-START event. */ - case YAML_SEQUENCE_START_EVENT: - TopAction()->BeginList(this, -1, (const char*)event.data.sequence_start.anchor, - (const char*)event.data.sequence_start.tag); - break; - /** A SEQUENCE-END event. */ - case YAML_SEQUENCE_END_EVENT: - TopAction()->EndList(this); - break; - - /** A MAPPING-START event. */ - case YAML_MAPPING_START_EVENT: - TopAction()->BeginMap(this, -1, (const char*)event.data.mapping_start.anchor, - (const char*)event.data.mapping_start.tag); - break; - /** A MAPPING-END event. */ - case YAML_MAPPING_END_EVENT: - TopAction()->EndMap(this); - break; - - } - } catch (...) { - err = true; - errorstr = "Exception from action..."; - yaml_event_delete(&event); - throw; - } - yaml_event_delete(&event); - } - return eof ? 1 : 0; - } - - bool YAMLParserImpl::Done() const { - return eof; - } - - bool YAMLParserImpl::Error() const { - return err; - } - - bool YAMLParserImpl::Ok() const { - return !err && !eof; - } - - std::string YAMLParserImpl::ErrorStr() const { - return errorstr; - } - - void YAMLParserImpl::Reset() { - eof = false; - err = false; - yaml_parser_delete(&parser); - yaml_parser_initialize(&parser); - yaml_parser_set_input(&parser, &ParserReadHandler, this); - } -} diff --git a/src/hos_libvariant/src/libvariant/src/YAMLParser.h b/src/hos_libvariant/src/libvariant/src/YAMLParser.h deleted file mode 100644 index ed3f328d..00000000 --- a/src/hos_libvariant/src/libvariant/src/YAMLParser.h +++ /dev/null @@ -1,62 +0,0 @@ -//============================================================================= -// -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief - */ - - -#ifndef YAMLPARSER_INC -#define YAMLPARSER_INC - -#pragma once -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/include/Variant/ParserInput.h" -#include "../../libvariant/include/Variant/SharedPtr.h" -#include - -namespace libvariant { - - - /** - * \brief - */ - class YAMLParserImpl : public ParserImpl { - public: - YAMLParserImpl(shared_ptr in); - virtual ~YAMLParserImpl(); - - virtual int Run(); - - virtual bool Done() const; - virtual bool Error() const; - virtual bool Ok() const; - virtual std::string ErrorStr() const; - virtual void Reset(); - private: - static int ParserReadHandler(void *data, unsigned char *buffer, size_t size, size_t *sizein); - yaml_parser_t parser; - shared_ptr input; - bool eof; - bool err; - std::string errorstr; - }; - -} - -#endif diff --git a/src/hos_libvariant/src/libvariant/src/argparse-schema.cc b/src/hos_libvariant/src/libvariant/src/argparse-schema.cc deleted file mode 100644 index 93d131f0..00000000 --- a/src/hos_libvariant/src/libvariant/src/argparse-schema.cc +++ /dev/null @@ -1,184 +0,0 @@ -// This file was generated using gen-argparse-schema and argparse-schema.yaml -// To change edit those files and regenarate. -namespace libvariant { -extern const char ARG_PARSE_SCHEMA_STR[]; -const char ARG_PARSE_SCHEMA_STR[] = { - 0x7b, 0x22, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x65, 0x6e, 0x75, 0x6d, 0x22, 0x3a, - 0x20, 0x5b, 0x22, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x2c, 0x20, 0x22, - 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x22, - 0x2c, 0x20, 0x22, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x74, 0x72, 0x75, - 0x65, 0x22, 0x2c, 0x20, 0x22, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x66, - 0x61, 0x6c, 0x73, 0x65, 0x22, 0x2c, 0x20, 0x22, 0x61, 0x70, 0x70, 0x65, - 0x6e, 0x64, 0x22, 0x2c, 0x20, 0x22, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, - 0x2c, 0x20, 0x22, 0x68, 0x65, 0x6c, 0x70, 0x22, 0x2c, 0x20, 0x22, 0x61, - 0x64, 0x76, 0x5f, 0x68, 0x65, 0x6c, 0x70, 0x22, 0x2c, 0x20, 0x22, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x2c, 0x20, 0x22, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x22, 0x2c, 0x20, 0x22, - 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x79, 0x61, 0x6d, 0x6c, 0x22, - 0x2c, 0x20, 0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x6c, - 0x69, 0x73, 0x74, 0x22, 0x2c, 0x20, 0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, - 0x67, 0x5f, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x22, 0x5d, 0x7d, 0x2c, 0x20, - 0x22, 0x74, 0x79, 0x70, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x65, - 0x6e, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x5b, 0x22, 0x73, 0x74, 0x72, 0x69, - 0x6e, 0x67, 0x22, 0x2c, 0x20, 0x22, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, - 0x6e, 0x22, 0x2c, 0x20, 0x22, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, - 0x22, 0x2c, 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x2c, - 0x20, 0x22, 0x6e, 0x75, 0x6c, 0x6c, 0x22, 0x2c, 0x20, 0x6e, 0x75, 0x6c, - 0x6c, 0x5d, 0x7d, 0x2c, 0x20, 0x22, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x42, 0x61, 0x73, 0x65, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x72, 0x65, 0x71, - 0x75, 0x69, 0x72, 0x65, 0x64, 0x22, 0x3a, 0x20, 0x5b, 0x22, 0x74, 0x69, - 0x74, 0x6c, 0x65, 0x22, 0x2c, 0x20, 0x22, 0x64, 0x65, 0x73, 0x63, 0x72, - 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2c, 0x20, 0x22, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x5d, 0x2c, 0x20, 0x22, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, - 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, - 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x6d, - 0x69, 0x6e, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x22, 0x3a, 0x20, 0x7b, - 0x22, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x30, - 0x2c, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x69, - 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x6d, - 0x61, 0x78, 0x41, 0x72, 0x67, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x6d, - 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x30, 0x2c, 0x20, - 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x69, 0x6e, 0x74, - 0x65, 0x67, 0x65, 0x72, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x65, 0x6e, 0x75, - 0x6d, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x6d, 0x69, 0x6e, 0x49, 0x74, 0x65, - 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x31, 0x2c, 0x20, 0x22, 0x75, 0x6e, 0x69, - 0x71, 0x75, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x74, - 0x72, 0x75, 0x65, 0x2c, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, - 0x20, 0x22, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2c, 0x20, 0x22, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, - 0x65, 0x22, 0x3a, 0x20, 0x5b, 0x22, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, - 0x6e, 0x22, 0x2c, 0x20, 0x22, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, - 0x22, 0x2c, 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x2c, - 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x5d, 0x7d, 0x7d, - 0x2c, 0x20, 0x22, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, - 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x6e, - 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x6d, 0x61, - 0x78, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x22, 0x3a, 0x20, 0x7b, 0x22, - 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x30, 0x2c, - 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x69, 0x6e, - 0x74, 0x65, 0x67, 0x65, 0x72, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x6d, 0x69, - 0x6e, 0x41, 0x72, 0x67, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x6d, 0x69, - 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x30, 0x2c, 0x20, 0x22, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x69, 0x6e, 0x74, 0x65, - 0x67, 0x65, 0x72, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x61, 0x64, 0x76, 0x61, - 0x6e, 0x63, 0x65, 0x64, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, - 0x2c, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x62, - 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x63, - 0x6f, 0x6e, 0x73, 0x74, 0x22, 0x3a, 0x20, 0x7b, 0x7d, 0x2c, 0x20, 0x22, - 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, - 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3a, 0x20, 0x7b, 0x7d, 0x2c, 0x20, 0x22, 0x70, 0x61, 0x74, 0x74, - 0x65, 0x72, 0x6e, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x2c, - 0x20, 0x22, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x3a, 0x20, 0x22, - 0x72, 0x65, 0x67, 0x65, 0x78, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x72, 0x65, - 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, 0x20, 0x66, 0x61, 0x6c, - 0x73, 0x65, 0x2c, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, - 0x22, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x22, 0x7d, 0x2c, 0x20, - 0x22, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x7b, - 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x6e, 0x75, 0x6d, - 0x62, 0x65, 0x72, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, - 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, - 0x7b, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, - 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x22, 0x7d, 0x7d, 0x7d, 0x7d, 0x2c, 0x20, - 0x22, 0x24, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x22, 0x3a, 0x20, 0x22, - 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x2d, - 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x64, - 0x72, 0x61, 0x66, 0x74, 0x2d, 0x30, 0x34, 0x2f, 0x73, 0x63, 0x68, 0x65, - 0x6d, 0x61, 0x23, 0x22, 0x2c, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, - 0x3a, 0x20, 0x22, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x2c, 0x20, - 0x22, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, - 0x3a, 0x20, 0x7b, 0x22, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x7d, - 0x2c, 0x20, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x22, 0x3a, 0x20, - 0x7b, 0x22, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, - 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, - 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x2c, 0x20, 0x22, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, - 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, - 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x6d, - 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, - 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, - 0x7d, 0x2c, 0x20, 0x22, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x22, 0x3a, - 0x20, 0x74, 0x72, 0x75, 0x65, 0x2c, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3a, 0x20, 0x22, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x7d, 0x2c, - 0x20, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x3a, 0x20, 0x7b, 0x22, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, - 0x6e, 0x67, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x72, 0x65, 0x71, 0x75, 0x69, - 0x72, 0x65, 0x64, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3a, 0x20, 0x22, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x22, - 0x7d, 0x2c, 0x20, 0x22, 0x61, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x64, - 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3a, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x2c, 0x20, 0x22, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x62, 0x6f, 0x6f, 0x6c, 0x65, - 0x61, 0x6e, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x6d, 0x75, 0x74, 0x75, 0x61, - 0x6c, 0x6c, 0x79, 0x20, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, - 0x65, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, - 0x20, 0x22, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x22, 0x7d, 0x7d, - 0x7d, 0x2c, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, - 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, - 0x7d, 0x2c, 0x20, 0x22, 0x65, 0x70, 0x69, 0x6c, 0x6f, 0x67, 0x22, 0x3a, - 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, - 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x61, 0x64, - 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x22, 0x2c, 0x20, 0x22, 0x61, 0x6e, 0x79, 0x4f, 0x66, 0x22, 0x3a, - 0x20, 0x5b, 0x7b, 0x22, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, - 0x22, 0x3a, 0x20, 0x5b, 0x22, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x4f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x5d, 0x7d, 0x2c, 0x20, 0x7b, 0x22, 0x72, - 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x22, 0x3a, 0x20, 0x5b, 0x22, - 0x6c, 0x6f, 0x6e, 0x67, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x5d, - 0x7d, 0x5d, 0x2c, 0x20, 0x22, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x6c, 0x6f, 0x6e, 0x67, - 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, - 0x67, 0x22, 0x7d, 0x2c, 0x20, 0x22, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x4f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x6d, 0x69, - 0x6e, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x22, 0x3a, 0x20, 0x31, 0x2c, - 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, - 0x72, 0x69, 0x6e, 0x67, 0x22, 0x2c, 0x20, 0x22, 0x6d, 0x61, 0x78, 0x4c, - 0x65, 0x6e, 0x67, 0x74, 0x68, 0x22, 0x3a, 0x20, 0x31, 0x7d, 0x2c, 0x20, - 0x22, 0x65, 0x6e, 0x76, 0x22, 0x3a, 0x20, 0x7b, 0x22, 0x74, 0x79, 0x70, - 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, - 0x7d, 0x7d, 0x2c, 0x20, 0x22, 0x61, 0x6c, 0x6c, 0x4f, 0x66, 0x22, 0x3a, - 0x20, 0x5b, 0x7b, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, - 0x23, 0x2f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x73, 0x65, - 0x22, 0x7d, 0x5d, 0x7d, 0x2c, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, - 0x3a, 0x20, 0x22, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x7d, 0x2c, - 0x20, 0x22, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, - 0x3a, 0x20, 0x7b, 0x22, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, - 0x7b, 0x22, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x22, 0x3a, - 0x20, 0x5b, 0x22, 0x6b, 0x65, 0x79, 0x70, 0x61, 0x74, 0x68, 0x22, 0x5d, - 0x2c, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x2c, 0x20, 0x22, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x22, - 0x6b, 0x65, 0x79, 0x70, 0x61, 0x74, 0x68, 0x22, 0x3a, 0x20, 0x7b, 0x22, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, - 0x6e, 0x67, 0x22, 0x7d, 0x7d, 0x2c, 0x20, 0x22, 0x61, 0x6c, 0x6c, 0x4f, - 0x66, 0x22, 0x3a, 0x20, 0x5b, 0x7b, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, - 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, - 0x61, 0x73, 0x65, 0x22, 0x7d, 0x5d, 0x7d, 0x2c, 0x20, 0x22, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, - 0x7d, 0x7d, 0x7d -, 0 }; } diff --git a/src/hos_libvariant/src/libvariant/src/argparse-schema.yaml b/src/hos_libvariant/src/libvariant/src/argparse-schema.yaml deleted file mode 100644 index 43417a4d..00000000 --- a/src/hos_libvariant/src/libvariant/src/argparse-schema.yaml +++ /dev/null @@ -1,91 +0,0 @@ - -"$schema": "http://json-schema.org/draft-04/schema#" -definitions: - actions: - enum: - - store - - store_const - - store_true - - store_false - - append - - count - - help - - adv_help - - config - - config_json - - config_yaml - - config_plist - - config_print - types: - enum: - - string - - boolean - - integer - - number - - 'null' - - null - - optionBase: - properties: - title: { type: string } - description: { type: string } - action: { "$ref": '#/definitions/actions' } - type: { "$ref": '#/definitions/types' } - default: {} - const: {} - required: { type: boolean, default: false } - advanced: { type: boolean, default: false } - enum: - type: array - minItems: 1 - uniqueItems: true - items: { type: [ boolean, integer, number, string ] } -# Specific to type "number" and "integer" - minimum: { type: number } - maximum: { type: number } -# Specific to type "string" - minLength: { type: integer, minimum: 0 } - maxLength: { type: integer, minimum: 0 } - pattern: { type: string, format: regex } -# Specific to action "append" - minArgs: { type: integer, minimum: 0 } - maxArgs: { type: integer, minimum: 0 } - required: [ title, description, action ] - -type: object -properties: - title: { type: string } - description: { type: string } - epilog: { type: string } - options: - type: object - additionalProperties: - type: object - properties: - longOption: { type: string } - shortOption: { type: string, maxLength: 1, minLength: 1 } - env: { type: string } - allOf: [ { "$ref": '#/definitions/optionBase' } ] - anyOf: - - { required: [ shortOption ] } - - { required: [ longOption ] } - groups: - type: object - additionalProperties: - type: object - properties: - title: { type: string } - description: { type: string } - mutually exclusive: { type: boolean } - required: { type: boolean } - advanced: { type: boolean, default: false } - members: { type: array, unique: true, items: { type: string } } - arguments: - type: array - items: - type: object - properties: - keypath: { type: string } - allOf: [ { "$ref": '#/definitions/optionBase' } ] - required: [ keypath ] - diff --git a/src/hos_libvariant/src/libvariant/src/gen-argparse-schema b/src/hos_libvariant/src/libvariant/src/gen-argparse-schema deleted file mode 100755 index 04b0b09f..00000000 --- a/src/hos_libvariant/src/libvariant/src/gen-argparse-schema +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -(echo "// This file was generated using gen-argparse-schema and argparse-schema.yaml"; -echo "// To change edit those files and regenarate."; -echo "namespace libvariant {"; -echo "extern const char ARG_PARSE_SCHEMA_STR[];"; -echo "const char ARG_PARSE_SCHEMA_STR[] = {"; -python -c 'import json,yaml,sys; json.dump(yaml.load(sys.stdin), sys.stdout);' < argparse-schema.yaml | xxd -i; -echo ", 0 }; }") > argparse-schema.cc diff --git a/src/hos_libvariant/src/libvariant/src/gen-json-schema b/src/hos_libvariant/src/libvariant/src/gen-json-schema deleted file mode 100755 index 0d5e17d8..00000000 --- a/src/hos_libvariant/src/libvariant/src/gen-json-schema +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -(echo "// This file was generated using gen-json-schema and json-schema-v4.json"; -echo "// To change edit those files and regenarate."; -echo "namespace libvariant {"; -echo "extern const char JSON_SCHEMA_V4_SCHEMA[];"; -echo "const char JSON_SCHEMA_V4_SCHEMA[] = {"; -xxd -i < json-schema-v4.json; -echo ", 0 }; }") > json-schema-v4.cc diff --git a/src/hos_libvariant/src/libvariant/src/json-schema-v4.cc b/src/hos_libvariant/src/libvariant/src/json-schema-v4.cc deleted file mode 100644 index 87deb5fb..00000000 --- a/src/hos_libvariant/src/libvariant/src/json-schema-v4.cc +++ /dev/null @@ -1,371 +0,0 @@ -// This file was generated using gen-json-schema and json-schema-v4.json -// To change edit those files and regenarate. -namespace libvariant { -extern const char JSON_SCHEMA_V4_SCHEMA[]; -const char JSON_SCHEMA_V4_SCHEMA[] = { - 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x22, 0x69, 0x64, 0x22, 0x3a, 0x20, - 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, - 0x2d, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x6f, 0x72, 0x67, 0x2f, - 0x64, 0x72, 0x61, 0x66, 0x74, 0x2d, 0x30, 0x34, 0x2f, 0x73, 0x63, 0x68, - 0x65, 0x6d, 0x61, 0x23, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x22, - 0x24, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x22, 0x3a, 0x20, 0x22, 0x68, - 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x2d, 0x73, - 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x64, 0x72, - 0x61, 0x66, 0x74, 0x2d, 0x30, 0x34, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, - 0x61, 0x23, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, - 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3a, 0x20, - 0x22, 0x43, 0x6f, 0x72, 0x65, 0x20, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, - 0x20, 0x6d, 0x65, 0x74, 0x61, 0x2d, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, 0x66, 0x69, - 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x73, 0x63, 0x68, - 0x65, 0x6d, 0x61, 0x41, 0x72, 0x72, 0x61, 0x79, 0x22, 0x3a, 0x20, 0x7b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x61, 0x72, - 0x72, 0x61, 0x79, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6d, 0x69, 0x6e, 0x49, 0x74, - 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x31, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x69, 0x74, - 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, - 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x22, 0x20, 0x7d, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x76, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x22, 0x3a, 0x20, - 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x69, - 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6d, 0x69, - 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x30, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x76, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x44, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x30, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x61, - 0x6c, 0x6c, 0x4f, 0x66, 0x22, 0x3a, 0x20, 0x5b, 0x20, 0x7b, 0x20, 0x22, - 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x65, - 0x72, 0x22, 0x20, 0x7d, 0x2c, 0x20, 0x7b, 0x20, 0x22, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, 0x20, 0x30, 0x20, 0x7d, 0x20, 0x5d, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x73, 0x69, 0x6d, - 0x70, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x22, 0x65, 0x6e, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x5b, 0x20, 0x22, - 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2c, 0x20, 0x22, 0x62, 0x6f, 0x6f, - 0x6c, 0x65, 0x61, 0x6e, 0x22, 0x2c, 0x20, 0x22, 0x69, 0x6e, 0x74, 0x65, - 0x67, 0x65, 0x72, 0x22, 0x2c, 0x20, 0x22, 0x6e, 0x75, 0x6c, 0x6c, 0x22, - 0x2c, 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x2c, 0x20, - 0x22, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x2c, 0x20, 0x22, 0x73, - 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x20, 0x5d, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x41, - 0x72, 0x72, 0x61, 0x79, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x22, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x7b, - 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, - 0x72, 0x69, 0x6e, 0x67, 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6d, 0x69, - 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x31, 0x2c, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x22, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, - 0x22, 0x3a, 0x20, 0x74, 0x72, 0x75, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, - 0x20, 0x22, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, - 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x69, 0x64, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, - 0x6e, 0x67, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, - 0x22, 0x3a, 0x20, 0x22, 0x75, 0x72, 0x69, 0x22, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x22, 0x24, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, - 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, - 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, - 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x3a, 0x20, 0x22, 0x75, 0x72, - 0x69, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, - 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, - 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3a, 0x20, - 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, - 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, - 0x20, 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x22, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x4f, 0x66, - 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, - 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, - 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x30, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x22, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x4d, - 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x74, 0x72, 0x75, - 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6d, 0x61, - 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, - 0x72, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x65, - 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x69, - 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, - 0x65, 0x22, 0x3a, 0x20, 0x22, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3a, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, - 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, - 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x22, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, - 0x76, 0x65, 0x4d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, - 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x62, - 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, 0x20, 0x66, 0x61, 0x6c, 0x73, - 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6d, 0x61, - 0x78, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x22, 0x3a, 0x20, 0x7b, 0x20, - 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, - 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, - 0x65, 0x72, 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x6d, 0x69, 0x6e, 0x4c, 0x65, 0x6e, 0x67, 0x74, - 0x68, 0x22, 0x3a, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, - 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, - 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x44, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x30, 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, - 0x6e, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, - 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x2c, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x22, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x3a, 0x20, 0x22, 0x72, - 0x65, 0x67, 0x65, 0x78, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x22, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, - 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x61, - 0x6e, 0x79, 0x4f, 0x66, 0x22, 0x3a, 0x20, 0x5b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x7b, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, - 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x22, 0x20, 0x7d, 0x2c, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, - 0x3a, 0x20, 0x22, 0x23, 0x22, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5d, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, 0x20, 0x7b, 0x7d, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x69, 0x74, 0x65, - 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x61, 0x6e, 0x79, 0x4f, - 0x66, 0x22, 0x3a, 0x20, 0x5b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x20, - 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x22, 0x20, - 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, - 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, 0x65, 0x66, 0x69, - 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x63, 0x68, 0x65, - 0x6d, 0x61, 0x41, 0x72, 0x72, 0x61, 0x79, 0x22, 0x20, 0x7d, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5d, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, - 0x20, 0x7b, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, - 0x6d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x7b, - 0x20, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, - 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x65, - 0x67, 0x65, 0x72, 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x22, 0x6d, 0x69, 0x6e, 0x49, 0x74, 0x65, 0x6d, - 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, - 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, - 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x44, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x30, 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, - 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x62, 0x6f, 0x6f, 0x6c, 0x65, - 0x61, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3a, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6d, 0x61, 0x78, 0x50, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x20, - 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, - 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, - 0x65, 0x72, 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x6d, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x20, 0x22, 0x24, - 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, 0x65, 0x66, - 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, - 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x30, 0x22, 0x20, 0x7d, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x72, 0x65, - 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x22, 0x3a, 0x20, 0x7b, 0x20, 0x22, - 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, - 0x72, 0x69, 0x6e, 0x67, 0x41, 0x72, 0x72, 0x61, 0x79, 0x22, 0x20, 0x7d, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x61, - 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x22, 0x61, 0x6e, 0x79, 0x4f, 0x66, 0x22, 0x3a, 0x20, 0x5b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x7b, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, - 0x20, 0x22, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x22, 0x20, 0x7d, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, - 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x22, 0x20, 0x7d, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5d, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, 0x20, - 0x7b, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x64, - 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3a, - 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x61, 0x64, - 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x20, 0x22, - 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x22, 0x20, 0x7d, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, - 0x20, 0x7b, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, - 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x61, 0x64, - 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x20, 0x22, - 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x22, 0x20, 0x7d, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, - 0x20, 0x7b, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, - 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x22, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, - 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, - 0x3a, 0x20, 0x22, 0x23, 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3a, 0x20, 0x7b, 0x7d, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, 0x70, 0x65, 0x6e, - 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x61, 0x64, 0x64, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x69, 0x65, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x22, 0x61, 0x6e, 0x79, 0x4f, 0x66, 0x22, 0x3a, 0x20, 0x5b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, - 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x22, 0x20, 0x7d, 0x2c, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x20, 0x22, 0x24, - 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, 0x65, 0x66, - 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x41, 0x72, 0x72, 0x61, 0x79, 0x22, 0x20, 0x7d, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x65, 0x6e, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x7b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x61, 0x72, - 0x72, 0x61, 0x79, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6d, 0x69, 0x6e, 0x49, 0x74, - 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x31, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x75, 0x6e, - 0x69, 0x71, 0x75, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, - 0x74, 0x72, 0x75, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x61, - 0x6e, 0x79, 0x4f, 0x66, 0x22, 0x3a, 0x20, 0x5b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, - 0x23, 0x2f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x2f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, - 0x73, 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, - 0x65, 0x22, 0x3a, 0x20, 0x22, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x69, 0x74, - 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, - 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, 0x65, 0x66, 0x69, 0x6e, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x69, 0x6d, 0x70, 0x6c, - 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6d, 0x69, 0x6e, 0x49, - 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x31, 0x2c, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x75, 0x6e, 0x69, 0x71, 0x75, - 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x3a, 0x20, 0x74, 0x72, 0x75, - 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5d, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x61, 0x6c, 0x6c, 0x4f, 0x66, 0x22, - 0x3a, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, - 0x22, 0x23, 0x2f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x41, 0x72, 0x72, - 0x61, 0x79, 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x61, 0x6e, 0x79, 0x4f, 0x66, 0x22, 0x3a, 0x20, - 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, - 0x2f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x41, 0x72, 0x72, 0x61, 0x79, - 0x22, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x22, 0x6f, 0x6e, 0x65, 0x4f, 0x66, 0x22, 0x3a, 0x20, 0x7b, 0x20, - 0x22, 0x24, 0x72, 0x65, 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x2f, 0x64, - 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, - 0x63, 0x68, 0x65, 0x6d, 0x61, 0x41, 0x72, 0x72, 0x61, 0x79, 0x22, 0x20, - 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, - 0x6e, 0x6f, 0x74, 0x22, 0x3a, 0x20, 0x7b, 0x20, 0x22, 0x24, 0x72, 0x65, - 0x66, 0x22, 0x3a, 0x20, 0x22, 0x23, 0x22, 0x20, 0x7d, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x22, 0x3a, - 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, - 0x65, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x4d, 0x61, 0x78, - 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x5b, 0x20, 0x22, 0x6d, 0x61, - 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x22, 0x20, 0x5d, 0x2c, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x65, 0x78, 0x63, 0x6c, 0x75, - 0x73, 0x69, 0x76, 0x65, 0x4d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x22, - 0x3a, 0x20, 0x5b, 0x20, 0x22, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, - 0x22, 0x20, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3a, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a -, 0 }; } diff --git a/src/hos_libvariant/src/libvariant/src/json-schema-v4.json b/src/hos_libvariant/src/libvariant/src/json-schema-v4.json deleted file mode 100644 index 85eb502a..00000000 --- a/src/hos_libvariant/src/libvariant/src/json-schema-v4.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "id": "http://json-schema.org/draft-04/schema#", - "$schema": "http://json-schema.org/draft-04/schema#", - "description": "Core schema meta-schema", - "definitions": { - "schemaArray": { - "type": "array", - "minItems": 1, - "items": { "$ref": "#" } - }, - "positiveInteger": { - "type": "integer", - "minimum": 0 - }, - "positiveIntegerDefault0": { - "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ] - }, - "simpleTypes": { - "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ] - }, - "stringArray": { - "type": "array", - "items": { "type": "string" }, - "minItems": 1, - "uniqueItems": true - } - }, - "type": "object", - "properties": { - "id": { - "type": "string", - "format": "uri" - }, - "$schema": { - "type": "string", - "format": "uri" - }, - "title": { - "type": "string" - }, - "description": { - "type": "string" - }, - "default": {}, - "multipleOf": { - "type": "number", - "minimum": 0, - "exclusiveMinimum": true - }, - "maximum": { - "type": "number" - }, - "exclusiveMaximum": { - "type": "boolean", - "default": false - }, - "minimum": { - "type": "number" - }, - "exclusiveMinimum": { - "type": "boolean", - "default": false - }, - "maxLength": { "$ref": "#/definitions/positiveInteger" }, - "minLength": { "$ref": "#/definitions/positiveIntegerDefault0" }, - "pattern": { - "type": "string", - "format": "regex" - }, - "additionalItems": { - "anyOf": [ - { "type": "boolean" }, - { "$ref": "#" } - ], - "default": {} - }, - "items": { - "anyOf": [ - { "$ref": "#" }, - { "$ref": "#/definitions/schemaArray" } - ], - "default": {} - }, - "maxItems": { "$ref": "#/definitions/positiveInteger" }, - "minItems": { "$ref": "#/definitions/positiveIntegerDefault0" }, - "uniqueItems": { - "type": "boolean", - "default": false - }, - "maxProperties": { "$ref": "#/definitions/positiveInteger" }, - "minProperties": { "$ref": "#/definitions/positiveIntegerDefault0" }, - "required": { "$ref": "#/definitions/stringArray" }, - "additionalProperties": { - "anyOf": [ - { "type": "boolean" }, - { "$ref": "#" } - ], - "default": {} - }, - "definitions": { - "type": "object", - "additionalProperties": { "$ref": "#" }, - "default": {} - }, - "properties": { - "type": "object", - "additionalProperties": { "$ref": "#" }, - "default": {} - }, - "patternProperties": { - "type": "object", - "additionalProperties": { "$ref": "#" }, - "default": {} - }, - "dependencies": { - "type": "object", - "additionalProperties": { - "anyOf": [ - { "$ref": "#" }, - { "$ref": "#/definitions/stringArray" } - ] - } - }, - "enum": { - "type": "array", - "minItems": 1, - "uniqueItems": true - }, - "type": { - "anyOf": [ - { "$ref": "#/definitions/simpleTypes" }, - { - "type": "array", - "items": { "$ref": "#/definitions/simpleTypes" }, - "minItems": 1, - "uniqueItems": true - } - ] - }, - "allOf": { "$ref": "#/definitions/schemaArray" }, - "anyOf": { "$ref": "#/definitions/schemaArray" }, - "oneOf": { "$ref": "#/definitions/schemaArray" }, - "not": { "$ref": "#" } - }, - "dependencies": { - "exclusiveMaximum": [ "maximum" ], - "exclusiveMinimum": [ "minimum" ] - }, - "default": {} -} diff --git a/src/hos_libvariant/src/libvariant/src/varsh.cc b/src/hos_libvariant/src/libvariant/src/varsh.cc deleted file mode 100644 index 13aa9cc4..00000000 --- a/src/hos_libvariant/src/libvariant/src/varsh.cc +++ /dev/null @@ -1,233 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief Variant tool - */ - -#include -#include -#include -#include -#include "../../libvariant/include/Variant/ArgParse.h" -#include "../../libvariant/include/Variant/Extensions.h" -#include "../../libvariant/include/Variant/Payload.h" -#include "../../libvariant/include/Variant/Schema.h" -#include "../../libvariant/include/Variant/SchemaLoader.h" -#include "../../libvariant/include/Variant/Variant.h" - -using namespace std; -using namespace libvariant; - -struct State { - SerializeType stype; - AdvSchemaLoader loader; - Variant conf; -}; - -void Process(State &state, ostream &out, istream &in) { - Variant data; - SerializeType itype; - if (state.conf.Get("guess-in", false).AsBool()) { itype = SERIALIZE_GUESS; } - if (state.conf.Get("json-in", false).AsBool()) { itype = SERIALIZE_JSON; } - if (state.conf.Get("yaml-in", false).AsBool()) { itype = SERIALIZE_YAML; } - if (state.conf.Get("plist-in", false).AsBool()) { itype = SERIALIZE_XMLPLIST; } - if (state.conf.Get("bundlehdr-in", false).AsBool()) { itype = SERIALIZE_BUNDLEHDR; } - - if (state.conf.Get("payload-in", false).AsBool()) { - data = DeserializeWithPayloadFile(in.rdbuf(), itype); - } else { - data = DeserializeFile(in.rdbuf(), itype); - } - - if (state.conf.GetPath("extension/flatten", false).AsBool()) { - data = FlattenPath( data, state.conf.GetPath("extension/params") ); - } - else if (state.conf.GetPath("extension/expand", false).AsBool()) { - data = ExpandPath( data, state.conf.GetPath("extension/params") ); - } - - Variant conf = state.conf; - if (conf.Contains("schemas")) { - for (Variant::ListIterator i(conf["schemas"].ListBegin()), e(conf["schemas"].ListEnd()); i != e; ++i) { - SchemaResult result = SchemaValidate(*i, data, &state.loader); - if (result.Error()) { - cerr << result << endl; - exit(1); - } - } - } - if (conf.Contains("set")) { - if (!conf.Contains("path")) { - data = conf["set"]; - } else { - data.SetPath(conf["path"].AsString(), conf["set"]); - } - } else { - if (conf.Contains("path")) { - data = data.GetPath(conf["path"].AsString()); - } - } - if (conf.Contains("list") && conf["list"].AsBool()) { - for (Variant::MapIterator i(data.MapBegin()), e(data.MapEnd()); i != e; ++i) { - out << i->first << endl; - } - } else if (conf.Contains("len") && conf["len"].AsBool()) { - out << data.Size() << endl; - } else { - if (state.conf.Get("payload", false).AsBool()) { - SerializeWithPayload(out.rdbuf(), data, state.stype, conf["sparams"]); - } else { - Serialize(out.rdbuf(), data, state.stype, conf["sparams"]); - out << endl; - } - } -} - -int main(int argc, char **argv) { - ArgParse opts(*argv); - opts.AddOption("schema_path", 0, "schema-path", "Add a search path for schemas.") - .Action(ARGACTION_APPEND).Type(ARGTYPE_STRING); - opts.AddOption("schemas", 0, "schema", "Add a schema uri to verify against.") - .Action(ARGACTION_APPEND).Type(ARGTYPE_STRING); - opts.AddOption("path", 0, "path", "Set a path name to operate on rather than the whole document.") - .Type(ARGTYPE_STRING); - - opts.AddOption("set", 0, "set", "Specify the value to set at the acting path."); - opts.AddOption("set-file", 0, "set-file", "Specify a file that should be read to set at the acting path.") - .Type(ARGTYPE_STRING); - opts.AddFlag("list", 0, "list", "Print a list of keys at the acting path."); - opts.AddFlag("len", 0, "length", "Print the length of the object at the acting path."); - opts.AddGroup("set").Add("set").Add("set-file").Add("list").Add("len").MutuallyExclusive(); - - opts.AddOption("output", 'o', "out", "Specify a file to output rather than standard out.") - .Type(ARGTYPE_STRING); - - opts.AddOption("guess-in", 'G', "guess", "Specify input format should be guessed (only guesses between json/yaml/plist)").Type(ARGTYPE_BOOL).Action(ARGACTION_STORE_TRUE) - .Default(true); - opts.AddOption("json-in", 'J', "json-in", "Specify input to be JSON").Type(ARGTYPE_BOOL).Action(ARGACTION_STORE_TRUE); -#ifdef ENABLE_YAML - opts.AddOption("yaml-in", 'Y', "yaml-in", "Specify input to be YAML").Type(ARGTYPE_BOOL).Action(ARGACTION_STORE_TRUE).Group("type-in"); -#endif -#ifdef ENABLE_XML - opts.AddOption("plist-in", 'X', "xml-in", "Specify input to be XML-PLIST").Type(ARGTYPE_BOOL).Action(ARGACTION_STORE_TRUE).Group("type-in"); -#endif - opts.AddOption("bundlehdr-in", 'B', "bundlehdr-in", "Specify input to be bundle header").Type(ARGTYPE_BOOL).Action(ARGACTION_STORE_TRUE) - .Group("type-in"); - opts.AddGroup("type-in").Add("guess-in").Add("json-in").MutuallyExclusive(); - - opts.AddFlag("payload-in", 'P', "payload-in", "Run input through the WithPayload functions instead of regular"); - - opts.AddOption("json", 'j', "json", "Specify output to be JSON").Default(true).Type(ARGTYPE_BOOL).Action(ARGACTION_STORE_TRUE); -#ifdef ENABLE_YAML - opts.AddOption("yaml", 'y', "yaml", "Specify output to be YAML").Type(ARGTYPE_BOOL).Action(ARGACTION_STORE_TRUE).Group("type"); -#endif -#ifdef ENABLE_XML - opts.AddOption("plist", 'x', "xml", "Specify output to be XML-PLIST").Type(ARGTYPE_BOOL).Action(ARGACTION_STORE_TRUE).Group("type"); -#endif - opts.AddOption("bundlehdr", 'b', "bundlehdr", "Specify output to be bundle header").Type(ARGTYPE_BOOL).Action(ARGACTION_STORE_TRUE) - .Group("type"); - opts.AddGroup("type").Add("json").MutuallyExclusive(); - - opts.AddFlag("payload", 'p', "payload", "Run output through the WithPayload functions instead of regular"); - - opts.AddGroup("format", "Format specifiers"); - opts.AddOption("sparams/pretty", 0, "pretty", "Pretty print.").Default(true).Type(ARGTYPE_BOOL).Group("format"); - opts.AddOption("sparams/indent", 0, "indent", "Set indent.").Type(ARGTYPE_INT).Minimum(0).Group("format"); - opts.AddOption("sparams/precision", 0, "precision", "Floating point precision.").Type(ARGTYPE_INT).Minimum(0).Group("format"); - - opts.AddOption("sparams/width", 0, "width", "Set prefered line width (YAML only)").Type(ARGTYPE_INT).Minimum(0).Group("format"); - - opts.AddOption("sparams/scalar_style", 0, "scalar-style", "Set default scalar style (YAML only)").Type(ARGTYPE_STRING).Group("format") - .AddChoice("any").AddChoice("plain").AddChoice("single quoted").AddChoice("double quoted").AddChoice("folded"); - - opts.AddOption("sparams/map_style", 0, "map-style", "Set default map style (YAML only)").Type(ARGTYPE_STRING).Group("format") - .AddChoice("any").AddChoice("block").AddChoice("flow"); - - opts.AddOption("sparams/list_style", 0, "list-style", "Set default list style (YAML only)").Type(ARGTYPE_STRING).Group("format") - .AddChoice("any").AddChoice("block").AddChoice("flow"); - - opts.AddOption("sparams/implicit_document_begin", 0, "implicit-document-begin", "Set to let the emitter omit the document begin tag (YAML only)") - .Group("format") .Type(ARGTYPE_BOOL); - - opts.AddOption("sparams/implicit_document_end", 0, "implicit-document-end", "Set to let the emitter omit the document end tag (YAML only)") - .Group("format") .Type(ARGTYPE_BOOL); - - opts.AddFlag("extension/flatten", 'f', "flatten-path", "Flatten the paths using Flatten/Expand path format specifiers"); - opts.AddFlag("extension/expand", 'e', "expand-path", "Expand the paths using Flatten/Expand path format specifiers"); - - opts.AddGroup("extension-format", "Flatten/Expand path format specifiers"); - - opts.AddOption("extension/params/noSimpleLists", 0, "no-simple-lists") - .Type(ARGTYPE_BOOL).Default(false).Group("extension-format"); - - opts.AddOption("extension/params/pathPrefix", 0, "path-prefix") - .Type(ARGTYPE_STRING).Default("").Group("extension-format").MaxLength(1); - - opts.AddOption("extension/params/pathDelimiter", 0, "path-delimiter") - .Type(ARGTYPE_STRING).Default("/").Group("extension-format").MaxLength(1); - - opts.AddOption("extension/params/indexPrefix", 0, "index-prefix") - .Type(ARGTYPE_STRING).Default("[").Group("extension-format").MaxLength(1); - - opts.AddOption("extension/params/indexSuffix", 0, "index-suffix") - .Type(ARGTYPE_STRING).Default("]").Group("extension-format").MaxLength(1); - - opts.AddOption("extension/params/listDelimiter", 0, "list-delimiter") - .Type(ARGTYPE_STRING).Default(",").Group("extension-format").MaxLength(1); - - opts.AddArgument("input", "The files to read in, if absent read stdin.").Action(ARGACTION_APPEND).MinArgs(0).MaxArgs(0); - - State state; - state.conf = opts.Parse(argc, argv); - - if (state.conf.Get("json", false).AsBool()) { state.stype = SERIALIZE_JSON; } - if (state.conf.Get("yaml", false).AsBool()) { state.stype = SERIALIZE_YAML; } - if (state.conf.Get("plist", false).AsBool()) { state.stype = SERIALIZE_XMLPLIST; } - if (state.conf.Get("bundlehdr", false).AsBool()) { state.stype = SERIALIZE_BUNDLEHDR; } - - state.loader.AddPath("."); - - if (state.conf.Contains("schema_path")) { - for (Variant::ListIterator i(state.conf["schema_path"].ListBegin()), e(state.conf["schema_path"].ListEnd()); i != e; ++i) { - state.loader.AddPath(i->AsString()); - } - } - - if (state.conf.Contains("set-file")) { - state.conf["set"] = DeserializeGuessFile(state.conf["set-file"].AsString().c_str()); - } - - ofstream output_file; - ostream *output = &cout; - if (state.conf.Contains("output")) { - output_file.open(state.conf["output"].AsString().c_str()); - output = &output_file; - } - - if (state.conf.Contains("input")) { - for (Variant::ListIterator i(state.conf["input"].ListBegin()), e(state.conf["input"].ListEnd()); i != e; ++i) { - ifstream input(i->AsString().c_str()); - Process(state, *output, input); - } - } else { - Process(state, *output, cin); - } - return 0; -} - - diff --git a/src/hos_libvariant/src/libvariant/test/CMakeLists.txt b/src/hos_libvariant/src/libvariant/test/CMakeLists.txt deleted file mode 100644 index 484f7875..00000000 --- a/src/hos_libvariant/src/libvariant/test/CMakeLists.txt +++ /dev/null @@ -1,114 +0,0 @@ - -include_directories ("../src") - -add_executable(rand_test_json rand_test_json.cc) -target_link_libraries(rand_test_json Variant) -add_test(rand_test_json ${CMAKE_CURRENT_BINARY_DIR}/rand_test_json) - -if(LIBVARIANT_ENABLE_YAML) - add_executable(rand_test_yaml rand_test_yaml.cc) - target_link_libraries(rand_test_yaml Variant) - add_test(rand_test_yaml ${CMAKE_CURRENT_BINARY_DIR}/rand_test_yaml) - - add_executable(test_yaml_parser test_yaml_parser.cc) - target_link_libraries(test_yaml_parser Variant) - add_test(test_yaml_parser ${CMAKE_CURRENT_BINARY_DIR}/test_yaml_parser) - - add_executable(test_loadall test_loadall.cc) - target_link_libraries(test_loadall Variant) - add_test(test_loadall ${CMAKE_CURRENT_BINARY_DIR}/test_loadall) -endif() - -if(LIBVARIANT_ENABLE_XML) - add_executable(rand_test_xml rand_test_xml.cc) - target_link_libraries(rand_test_xml Variant) - add_test(rand_test_xml ${CMAKE_CURRENT_BINARY_DIR}/rand_test_xml) - - add_executable(test_xml_parser test_xml_parser.cc) - target_link_libraries(test_xml_parser Variant) - add_test(test_xml_parser ${CMAKE_CURRENT_BINARY_DIR}/test_xml_parser) -endif() - -add_executable(test_variant test_variant.cc) -target_link_libraries(test_variant Variant) -add_test(test_variant ${CMAKE_CURRENT_BINARY_DIR}/test_variant) - -add_executable(test_empty test_empty.cc) -target_link_libraries(test_empty Variant) -add_test(test_empty ${CMAKE_CURRENT_BINARY_DIR}/test_empty) - -add_executable(test_base64 test_base64.cc) -target_link_libraries(test_base64 Variant) -add_test(test_base64 ${CMAKE_CURRENT_BINARY_DIR}/test_base64) - -add_executable(test_memoryoutput test_memoryoutput.cc) -target_link_libraries(test_memoryoutput Variant) -add_test(test_memoryoutput ${CMAKE_CURRENT_BINARY_DIR}/test_memoryoutput) - -add_executable(test_bundlehdr test_bundlehdr.cc) -target_link_libraries(test_bundlehdr Variant) -add_test(test_bundlehdr ${CMAKE_CURRENT_BINARY_DIR}/test_bundlehdr) - -add_executable(test_bundleparser test_bundleparser.cc) -target_link_libraries(test_bundleparser Variant) -add_test(test_bundleparser ${CMAKE_CURRENT_BINARY_DIR}/test_bundleparser) - -add_executable(test_bundleemitter test_bundleemitter.cc) -target_link_libraries(test_bundleemitter Variant) -add_test(test_bundleemitter ${CMAKE_CURRENT_BINARY_DIR}/test_bundleemitter) - -add_executable(test_guess test_guess.cc) -target_link_libraries(test_guess Variant) -add_test(test_guess ${CMAKE_CURRENT_BINARY_DIR}/test_guess) - -add_executable(test_numerics test_numerics.cc) -target_link_libraries(test_numerics Variant) -add_test(test_numerics ${CMAKE_CURRENT_BINARY_DIR}/test_numerics) - -add_definitions("-DTEST_SCHEMA_DATA=\"${CMAKE_CURRENT_SOURCE_DIR}/test_schema_data/\"") -add_executable(test_schema test_schema.cc) -target_link_libraries(test_schema Variant) -add_test(test_schema ${CMAKE_CURRENT_BINARY_DIR}/test_schema) - -add_executable(test_path test_path.cc) -target_link_libraries(test_path Variant) -add_test(test_path ${CMAKE_CURRENT_BINARY_DIR}/test_path) - -add_executable(test_extensions test_extensions.cc) -target_link_libraries(test_extensions Variant) -add_test(test_extensions ${CMAKE_CURRENT_BINARY_DIR}/test_extensions) - -add_executable(test_argparse test_argparse.cc) -target_link_libraries(test_argparse Variant) -configure_file(test_argparse.sh.in - "${CMAKE_CURRENT_BINARY_DIR}/test_argparse.sh" @ONLY) -add_test(test_argparse sh ${CMAKE_CURRENT_BINARY_DIR}/test_argparse.sh) - - -add_executable(test_payload test_payload.cc) -target_link_libraries(test_payload Variant) -add_test(test_payload ${CMAKE_CURRENT_BINARY_DIR}/test_payload) - -add_executable(test_roundtrip test_roundtrip.cc) -target_link_libraries(test_roundtrip Variant) -add_test(test_roundtrip ${CMAKE_CURRENT_BINARY_DIR}/test_roundtrip) - -add_executable(test_argparse_merge test_argparse_merge.cc) -target_link_libraries(test_argparse_merge Variant) -add_test(test_argparse_merge ${CMAKE_CURRENT_BINARY_DIR}/test_argparse_merge) - -add_executable(test_json_parser test_json_parser.cc) -target_link_libraries(test_json_parser Variant) -add_test(test_json_parser ${CMAKE_CURRENT_BINARY_DIR}/test_json_parser) - -if(LIBVARIANT_ENABLE_MSGPACK) - - add_executable(prof_msgpack prof_msgpack.cc) - target_link_libraries(prof_msgpack Variant) - add_test(prof_msgpack ${CMAKE_CURRENT_BINARY_DIR}/prof_msgpack) - - add_executable(rand_test_msgpack rand_test_msgpack.cc) - target_link_libraries(rand_test_msgpack Variant) - add_test(rand_test_msgpack ${CMAKE_CURRENT_BINARY_DIR}/rand_test_msgpack) - -endif() diff --git a/src/hos_libvariant/src/libvariant/test/TestAssert.h b/src/hos_libvariant/src/libvariant/test/TestAssert.h deleted file mode 100644 index 7c5db218..00000000 --- a/src/hos_libvariant/src/libvariant/test/TestAssert.h +++ /dev/null @@ -1,20 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#ifndef TEST_ASSERT_H -#define TEST_ASSERT_H -#include -#include - -inline void test_assert_throw(const char *file, unsigned line, const char *expression) { - std::ostringstream oss; - oss << "Assert failed in " << file << " line " << line - << "\nExpression: " << expression; - throw std::runtime_error(oss.str()); -} - -#define ASSERT(x) if (!(x)) { test_assert_throw(__FILE__, __LINE__, #x); } else (void)0 - -#endif diff --git a/src/hos_libvariant/src/libvariant/test/TestCommon.h b/src/hos_libvariant/src/libvariant/test/TestCommon.h deleted file mode 100644 index 30f95701..00000000 --- a/src/hos_libvariant/src/libvariant/test/TestCommon.h +++ /dev/null @@ -1,103 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#ifndef TESTCOMMON_H -#define TESTCOMMON_H - -#pragma once -#include "../../libvariant/src/EventBuffer.h" -#include "../../libvariant/include/Variant/Variant.h" -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/include/Variant/Emitter.h" -#include -#include -#include -#include - -namespace libvariant { - -inline bool ErrorCheckEventBuffer(shared_ptr expected, shared_ptr result) { - if (!result->Equal(*expected)) { - if (result->NumEvents() != expected->NumEvents()) { - std::cout << "Error size of action are different, got " << result->NumEvents() << " expected " << expected->NumEvents() << "\n"; - } - for (unsigned i = 0; i < std::max(expected->NumEvents(), result->NumEvents()); ++i) { - if (i < expected->NumEvents() && i < result->NumEvents()) { - if (!(expected->GetEvent(i) == result->GetEvent(i))) { - std::cout << "Action number " << i << " not expected action\nExpected: " << expected->GetEvent(i) - << "\nGot: " << result->GetEvent(i) << "\n"; - } - } else if (i < expected->NumEvents()) { - std::cout << "Action in original not in result: " << expected->GetEvent(i) << "\n"; - } else if (i < result->NumEvents()) { - std::cout << "Action in result not in original: " << result->GetEvent(i) << "\n"; - } - } - return false; - } - return true; -} - -inline int DoRandomTest(int argc, char **argv, -libvariant::Emitter (*Emitter_t)(libvariant::shared_ptr, libvariant::Variant), -libvariant::Parser (*Parser_t)(libvariant::shared_ptr), bool allow_nan) { - int verbose = 0; - int num_tests = 100; - while (true) { - int c = getopt(argc, argv, "n:v:s:h"); - if (c == -1) break; - switch (c) { - case 'n': - num_tests = atoi(optarg); - break; - case 'v': - verbose = atoi(optarg); - break; - case 's': - srand(strtoll(optarg, 0, 0)); - break; - default: - std::cout << *argv << " -s seed -v verbosity -n num_tests\n"; - return 0; - } - } - for (int test = 0; test < num_tests; ++test) { - if (verbose > 0) { std::cout << "Performing test " << test << "\n"; } - shared_ptr expected(new EventBuffer); - expected->FillRandom(EventBuffer::NO_EVENT, 10, allow_nan); - if (verbose > 0) { std::cout << "Generated " << expected->NumEvents() << " events\n"; } - std::ostringstream oss; - libvariant::Variant params; - libvariant::Emitter emitter = Emitter_t(libvariant::CreateEmitterOutput(oss.rdbuf()), params); - shared_ptr event_copy(new EventBuffer(*expected)); - event_copy->Playback(emitter); - emitter.Close(); - std::string val = oss.str(); - if (verbose > 1) { - std::cout << val; - std::cout.flush(); - } - std::istringstream iss(val); - libvariant::Parser parser = Parser_t(libvariant::CreateParserInputFile(iss.rdbuf())); - shared_ptr result(new EventBuffer); - result->Fill(parser); - - bool err = !ErrorCheckEventBuffer(expected, result); - if (err) return 1; - if (verbose > 0) { printf("End test %d\n\n", test); } - } - - return 0; -} - -inline Variant GenerateRandomVariant(bool allow_nan) { - shared_ptr events(new EventBuffer); - events->FillRandom(EventBuffer::NO_EVENT, 10, allow_nan); - Parser p(events); - return ParseVariant(p); -} - -} - -#endif diff --git a/src/hos_libvariant/src/libvariant/test/prof_msgpack.cc b/src/hos_libvariant/src/libvariant/test/prof_msgpack.cc deleted file mode 100644 index 38b6fe85..00000000 --- a/src/hos_libvariant/src/libvariant/test/prof_msgpack.cc +++ /dev/null @@ -1,129 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include -#include -#include -#include -#include -#include "../../libvariant/include/Variant/Variant.h" -#include "../../libvariant/test/TestCommon.h" - -using namespace libvariant; -using namespace std; - -static double getTime() { - timeval tv; - if (gettimeofday(&tv, 0) != 0) { - throw std::runtime_error(strerror(errno)); - } - return static_cast(tv.tv_sec) + 1e-6 * static_cast(tv.tv_usec); -} - -ostream &operator<<(ostream &os, Variant v) { - SerializeJSON(os.rdbuf(), v, true); - return os; -} - -static const char *suffix[] = { "y", "z", "a", "f", "p", "n", "u", "m", "", -"k", "M", "G", "T", "P", "E", "Z", "Y" }; -static const int suffix_len = sizeof(suffix)/sizeof(char *); - -class engrfmt { -public: - engrfmt(double v) - : value(v){} - - void Print(std::ostream &os) const { - double v = value; - int suffix_off = 8; - while (v >= 1e3 && suffix_off < suffix_len) { - v /= 1e3; - suffix_off++; - } - while (v < 1.0 && suffix_off > 0) { - v /= 1e-3; - suffix_off--; - } - os << v << suffix[suffix_off]; - } -private: - double value; -}; - -ostream &operator<<(ostream &os, const engrfmt &fmt) { - fmt.Print(os); - return os; -} - -std::vector msgpack_serialize_time; -std::vector msgpack_deserialize_time; -std::vector json_serialize_time; -std::vector json_deserialize_time; - -int DoTest(Variant v) { - stringstream ss_msgpack; - //cout << "Testing...\n" << v << endl; - double start = getTime(); - Serialize(ss_msgpack.rdbuf(), v, SERIALIZE_MSGPACK); - msgpack_serialize_time.push_back(getTime() - start); - start = getTime(); - Variant v2 = DeserializeFile(ss_msgpack.rdbuf(), SERIALIZE_MSGPACK); - msgpack_deserialize_time.push_back(getTime() - start); - if (v2 != v) { - cout << "Msgpack: Error not equal:\n"; - cout << "Expected: " << v << endl << "Got: " << v2 << endl; - return 1; - } - stringstream ss_json; - start = getTime(); - Serialize(ss_json.rdbuf(), v, SERIALIZE_JSON); - json_serialize_time.push_back(getTime() - start); - start = getTime(); - v2 = DeserializeFile(ss_json.rdbuf(), SERIALIZE_JSON); - json_deserialize_time.push_back(getTime() - start); - if (v2 != v) { - cout << "JSON: Error not equal:\n"; - cout << "Expected: " << v << endl << "Got: " << v2 << endl; - return 1; - } - return 0; -} - -int main(int argc, char **argv) { - int iterations = 100; - if (argc > 1) { - iterations = 1; - Variant v = DeserializeGuessFile(argv[1]); - if (DoTest(v)) { return 1; } - } else { - for (int i = 0; i < iterations; ++i) { - Variant v = GenerateRandomVariant(false); - if (DoTest(v)) { return 1; } - } - } - double mp_s_avg = 0, mp_d_avg = 0, j_s_avg = 0, j_d_avg = 0; - for (int i = 0; i < iterations; ++i) { - mp_s_avg += msgpack_serialize_time[i]; - mp_d_avg += msgpack_deserialize_time[i]; - j_s_avg += json_serialize_time[i]; - j_d_avg += json_deserialize_time[i]; - } - mp_s_avg /= iterations; - mp_d_avg /= iterations; - j_s_avg /= iterations; - j_d_avg /= iterations; - cout << "msgpack serialize avg time: " << engrfmt(mp_s_avg) << endl; - cout << "msgpack deserialize avg time: " << engrfmt(mp_d_avg) << endl; - cout << "msgpack avg time: " << engrfmt(mp_s_avg + mp_d_avg) << endl; - cout << "json serialize avg time: " << engrfmt(j_s_avg) << endl; - cout << "json deserialize avg time: " << engrfmt(j_d_avg) << endl; - cout << "json avg time: " << engrfmt(j_s_avg + j_d_avg) << endl; - cout << "serialize msgpack/json: " << (mp_s_avg/j_s_avg) << "\tjson/msgpack: " << (j_s_avg/mp_s_avg) << endl; - cout << "deserialize msgpack/json: " << (mp_d_avg/j_d_avg) << "\tjson/msgpack: " << (j_d_avg/mp_d_avg) << endl; - cout << "msgpack/json: " << ((mp_s_avg+mp_d_avg)/(j_s_avg+j_d_avg)) << "\tjson/msgpack: " << (j_s_avg+j_d_avg)/(mp_s_avg+mp_d_avg) << endl; - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/rand_test_json.cc b/src/hos_libvariant/src/libvariant/test/rand_test_json.cc deleted file mode 100644 index dec42446..00000000 --- a/src/hos_libvariant/src/libvariant/test/rand_test_json.cc +++ /dev/null @@ -1,12 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/test/TestCommon.h" - -using namespace libvariant; - -int main(int argc, char **argv) { - return DoRandomTest(argc, argv, JSONEmitter, JSONParser, false); -} diff --git a/src/hos_libvariant/src/libvariant/test/rand_test_msgpack.cc b/src/hos_libvariant/src/libvariant/test/rand_test_msgpack.cc deleted file mode 100644 index ca148938..00000000 --- a/src/hos_libvariant/src/libvariant/test/rand_test_msgpack.cc +++ /dev/null @@ -1,12 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include "../../libvariant/test/TestCommon.h" - -using namespace libvariant; - -int main(int argc, char **argv) { - return DoRandomTest(argc, argv, MsgPackEmitter, MsgPackParser, true); -} diff --git a/src/hos_libvariant/src/libvariant/test/rand_test_xml.cc b/src/hos_libvariant/src/libvariant/test/rand_test_xml.cc deleted file mode 100644 index 3b1ced5b..00000000 --- a/src/hos_libvariant/src/libvariant/test/rand_test_xml.cc +++ /dev/null @@ -1,11 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/test/TestCommon.h" - -using namespace libvariant; - -int main(int argc, char **argv) { - return DoRandomTest(argc, argv, XMLPLISTEmitter, XMLPLISTParser, true); -} diff --git a/src/hos_libvariant/src/libvariant/test/rand_test_yaml.cc b/src/hos_libvariant/src/libvariant/test/rand_test_yaml.cc deleted file mode 100644 index aa0fa836..00000000 --- a/src/hos_libvariant/src/libvariant/test/rand_test_yaml.cc +++ /dev/null @@ -1,11 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include "../../libvariant/test/TestCommon.h" - -using namespace libvariant; - -int main(int argc, char **argv) { - return DoRandomTest(argc, argv, YAMLEmitter, YAMLParser, true); -} diff --git a/src/hos_libvariant/src/libvariant/test/test_argparse.cc b/src/hos_libvariant/src/libvariant/test/test_argparse.cc deleted file mode 100644 index ff2d45c4..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_argparse.cc +++ /dev/null @@ -1,181 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include -#include -#include "../../libvariant/include/Variant/ArgParse.h" -#include "../../libvariant/include/Variant/Schema.h" - -using namespace libvariant; -using namespace std; - -SerializeType stype = SERIALIZE_JSON; -Variant sparams = Variant::MapType; - -Variant OtherConfig() { - ArgParse args; - args.AddOption("adv-option1", 's', "adv1", "adv1").Advanced(true); - args.AddOption("adv-option2", 0, "adv2", "adv2").Group("adv"); - args.AddGroup("adv", "adv group").Advanced(true); - return args.GetDescription(); -} - -int Compare(Variant exp, Variant opts) { - for (Variant::MapIterator ci(exp.MapBegin()), ce(exp.MapEnd()); ci != ce; ++ci) { - if (!opts.Contains(ci->first)) { - cout << "Missing key " << ci->first << endl; - return 1; - } - if (ci->second.IsMap()) { - if (Compare(ci->second, opts[ci->first])) { - cout << "In sub map: \"" << ci->first << "\"\n"; - return 1; - } - } else if (opts[ci->first] != ci->second) { - cout << "Value at key \"" << ci->first << "\" differs\n"; - cout << "Got:\n"; - Serialize(cout.rdbuf(), opts[ci->first], stype, sparams); - cout << "\nExpected:\n"; - Serialize(cout.rdbuf(), ci->second, stype, sparams); - cout << endl; - return 1; - } - } - return 0; -} - -int main(int argc, char **argv) { - sparams["pretty"] = true; - - ArgParse args(*argv); - // store -- store the value into the key (default) - args.AddOption("store", 's', "store", "Test store number").Action(ARGACTION_STORE) - .Type(ARGTYPE_FLOAT).Env("TEST_STORE").Minimum(0).Maximum(1) - .Default(0.54321); - args.AddOption("store_bool", 0, "store_bool", "Test store boolean").Action(ARGACTION_STORE) - .Type(ARGTYPE_BOOL).Env("TEST_STORE_BOOLEAN"); - args.AddOption("store_int", 0, "store_int", "Test store int").Action(ARGACTION_STORE) - .Type(ARGTYPE_INT).Minimum(-10).Maximum(10).Default(0); - args.AddOption("store_string", 0, "store_string", "Test store string").Action(ARGACTION_STORE) - .Type(ARGTYPE_STRING).MinLength(4).MaxLength(10).Pattern("^[0-9a-zA-Z]*$") - .Default("abc123"); - try { - args.AddOption("store", 0, "blahblah", ""); - cerr << "Duplicate path successfully added." << endl; - return 1; - } catch (const std::runtime_error&) {} - try { - args.AddOption("blahblah", 0, "store", ""); - cerr << "Duplicate long option successfully added." << endl; - return 1; - } catch (const std::runtime_error&) {} - try { - args.AddOption("blahblah", 's', "", ""); - cerr << "Duplicate short option successfully added." << endl; - return 1; - } catch (const std::runtime_error&) {} - try { - args.AddOption("store", 0, "", ""); - cerr << "Option with no short or long opt sucessfully added." << endl; - return 1; - } catch (const std::runtime_error&) {} - try { - //args.AddOption("abc", 0, "abc", "").Type("abc"); - args.AddOption("abc", 0, "abc", "").Type((ArgParseType)Variant::MapType); - cerr << "Option with invalid type successfully added." << endl; - return 1; - } catch (const std::runtime_error&) {} - - //cerr << "Turning conflict resolution on" << endl; - args.ConflictResolution(true); - try { - args.AddOption("blahblah", 's', "", ""); - cerr << "Duplicate short option with no long option succesfully added" << endl; - return 1; - } catch (const std::runtime_error&) {} - try { - args.AddOption("blahblah", 's', "blahblah", ""); - } catch (const std::runtime_error&) { - cerr << "Failed to add duplicate short option with long option with conflict resolution on." << endl; - return 1; - } - - args.AddOption("store_undef", 0, "store_undef", "Test store").Action(ARGACTION_STORE); - // store_const -- store const (see Const) into the key - args.AddOption("store_const", 0, "store_const", "Test store const").Action(ARGACTION_STORE_CONST) - .Const(123); - // store_true -- store true into the key (i.e. no option argument) - args.AddOption("store_true", 0, "store_true", "Test store_true").Action(ARGACTION_STORE_TRUE) - .Default(false).Type(ARGTYPE_BOOL); - // store_false -- store false into the key - args.AddOption("store_false", 0, "store_false", "Test store_false").Action(ARGACTION_STORE_FALSE) - .Default(true).Type(ARGTYPE_BOOL); - // append -- make the value a list of instances of the option - args.AddOption("append", 0, "append", "Test append").Action(ARGACTION_APPEND) - .Type(ARGTYPE_FLOAT).Minimum(0).Maximum(1).MinArgs(1).MaxArgs(10); - // count -- count the number of instances of this argument - args.AddOption("count", 0, "count", "Test count").Action(ARGACTION_COUNT); - // config -- load a file and merge it into the result (uses GuessFormat) - args.AddOption("load", 0, "load", "Test config").Action(ARGACTION_CONFIG); - - args.AddOption("choice", 0, "choice", "Test choices").AddChoice("a").AddChoice("b"); - - args.AddOption("abc/a", 0, "abc-a", "abc-a"); - args.AddOption("abc/b", 0, "abc-b", "abc-b"); - args.AddGroup("abc", "abc").Add("abc/a").Add("abc/b").MutuallyExclusive(); - args.AddOption("abc/c", 0, "abc-c", "Test group mutual exclusion with default").Default(123); - args.AddOption("abc/d", 0, "abc-d", "Mutually exclusive wth abc-c"); - args.AddGroup("abc-m").Add("abc/c").Add("abc/d").MutuallyExclusive(); - - args.AddArgument("comp", "Comparison file for options") - .Action(ARGACTION_APPEND).Type(ARGTYPE_STRING).MinArgs(0); - - args.AddOption("shortonly", 'a', "", "short only option").Type(ARGTYPE_GUESS); - - args.AddOption("list[0]", 0, "list0", "List zero option").Title("ListOp1"); - args.AddOption("list[1]", 0, "list1", "List one option"); - args.AddOption("list[2]", 0, "list2", "List two option"); - - args.Merge(OtherConfig()); - args.AddConfigDefaults(); - - args.Validate(); - - Variant opts = args.Parse(argc, argv); - - ArgParse arg2; - arg2.Merge(args); - - Variant opt2 = arg2.Parse(argc, argv); - if (opts != opt2) { - cout << "Second parsing of option failed...\n"; - cout << "First pass gave:\n\n"; - Serialize(cout.rdbuf(), opts, stype, sparams); - cout << "\n\nsecond pass gave:\n\n"; - Serialize(cout.rdbuf(), opt2, stype, sparams); - cout << endl; - return 1; - } - - cout << "parsed arguments:\n\n"; - Serialize(cout.rdbuf(), opts, stype, sparams); - cout << "\n\n"; - cout << "Validating..."; - SchemaResult valres = SchemaValidate(args.GenerateSchema(), opts); - if (valres.Error()) { - cout << endl << valres << endl << endl; - return 1; - } else { cout << " passed\n\n"; } - - Variant::ListIterator i(opts["comp"].ListBegin()), - e(opts["comp"].ListEnd()); - while (i != e) { - Variant comp = DeserializeGuessFile(i->AsString().c_str()); - if (Compare(comp, opts)) { return 1; } - ++i; - } - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_argparse.sh.in b/src/hos_libvariant/src/libvariant/test/test_argparse.sh.in deleted file mode 100644 index a6ac5243..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_argparse.sh.in +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -ex=@CMAKE_CURRENT_BINARY_DIR@/test_argparse - -echo "Test required argument" -if $ex; then exit 1; fi -echo "Test append argument minimum" -if $ex --append -1; then exit 1; fi -echo "Test append argument maximum" -if $ex --append 2; then exit 1; fi -echo "Test store minimum" -if $ex -s'-1' --append 1; then exit 1; fi -echo "Test store maximum" -if $ex -s'2' --append 1; then exit 1; fi - -echo "Testing store boolean" -if ! echo '{ "store_bool": true }' | $ex --append 1 --store_bool=yes /dev/stdin; then exit 1; fi -if ! echo '{ "store_bool": true }' | $ex --append 1 --store_bool=Y /dev/stdin; then exit 1; fi -if ! echo '{ "store_bool": true }' | $ex --append 1 --store_bool=t /dev/stdin; then exit 1; fi -if ! echo '{ "store_bool": true }' | $ex --append 1 --store_bool=1 /dev/stdin; then exit 1; fi -if ! echo '{ "store_bool": false }' | $ex --append 1 --store_bool=N /dev/stdin; then exit 1; fi -if ! echo '{ "store_bool": false }' | $ex --append 1 --store_bool=no /dev/stdin; then exit 1; fi -if ! echo '{ "store_bool": false }' | $ex --append 1 --store_bool=0 /dev/stdin; then exit 1; fi -if ! echo '{ "store_bool": false }' | $ex --append 1 --store_bool=f /dev/stdin; then exit 1; fi -if ! echo '{ "store_bool": true }' | TEST_STORE_BOOLEAN=yes $ex --append 1 /dev/stdin; then exit 1; fi - -echo "Test store integer" - -if $ex --append 1 --store_int -11; then exit 1; fi -if $ex --append 1 --store_int 11; then exit 1; fi -if $ex --append 1 --store_int 'abc'; then exit 1; fi -if $ex --append 1 --store_int 1.4; then exit 1; fi -if ! echo '{ "store_int": 4}' | $ex --append 1 --store_int 4 /dev/stdin; then exit 1; fi - -echo "Test store string" -if $ex --append 1 --store_string "@#$^aaa"; then exit 1; fi -if $ex --append 1 --store_string "a"; then exit 1; fi -if $ex --append 1 --store_string "0123456789aaaaaa"; then exit 1; fi -if ! echo '{ "store_string": "abc123" }' | $ex --append 1 /dev/stdin; then exit 1; fi -if ! echo '{ "store_string": "7j34d" }' | $ex --append 1 --store_string 7j34d /dev/stdin; then exit 1; fi - -if $ex --append 1 --choice "aaaa"; then exit 1; fi -if ! echo '{ "choice": "a" }' | $ex --append 1 --choice "a" /dev/stdin; then exit 1; fi -if ! echo '{ "choice": "b" }' | $ex --append 1 --choice "b" /dev/stdin; then exit 1; fi - -echo "Test group mutual exclusion" -if $ex --append 1 --abc-a=1 --abc-b=2; then exit 1; fi -if ! echo '{ "abc": { "a": 1 } }' | $ex --append 1 --abc-a=1 /dev/stdin; then - exit 1 -fi -if ! echo '{ "abc": { "b": 1 } }' | $ex --append 1 --abc-b=1 /dev/stdin; then - exit 1 -fi - -if $ex --append 1 --abc-c=1 --abc-d=2; then exit 1; fi -if ! echo '{ "abc": { "c": 1 } }' | $ex --append 1 --abc-c=1 /dev/stdin; then - exit 1 -fi -if ! echo '{ "abc": { "d": 1 } }' | $ex --append 1 --abc-d=1 /dev/stdin; then - exit 1 -fi -if ! echo '{ "abc": { "c": 123 } }' | $ex --append 1 /dev/stdin; then exit 1; fi - -echo "Generic tests" -expected=' -{ - "append": [ 0.1 ], - "store": 0.54321, - "store_int": 0, - "store_string": "abc123", - "store_true": false, - "store_false": true -}'; - -if ! echo $expected | $ex --append 0.1 /dev/stdin; then exit 1; fi - -expected=' -{ - "store": 0.5, - "append": [ 1, 0.4 ], - "store_bool": true, - "store_int": 5, - "store_string": "zxcv098784", - "store_undef": true, - "store_true": true, - "store_const": 123, - "store_false": false, - "count": 3, - "comp": [ "/dev/stdin" ] -} -'; -echo $expected | $ex --store 0.5 --append 1 --append 0.4 --store_bool yes --store_int 5 --store_string "zxcv098784" \ - --store_undef true --store_true --store_false --count --store_const --count --count /dev/stdin; -if [[ $? != 0 ]]; then exit 1; fi; - -tmpfile=$(mktemp) -echo $expected >$tmpfile -echo $expected | $ex --config $tmpfile; -if [[ $? != 0 ]]; then exit 1; fi; -rm $tmpfile - -echo "PASS!!"; -exit 0; - diff --git a/src/hos_libvariant/src/libvariant/test/test_argparse_merge.cc b/src/hos_libvariant/src/libvariant/test/test_argparse_merge.cc deleted file mode 100644 index 8db9efb9..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_argparse_merge.cc +++ /dev/null @@ -1,108 +0,0 @@ -//============================================================================= -//! \file main.cc -//! \author Josh Staley -//============================================================================= - -//=== Includes ================================================================ - -#include -#include "../../libvariant/include/Variant/ArgParse.h" -#include "../../libvariant/include/Variant/Schema.h" -#include "../../libvariant/include/Variant/Variant.h" - -using namespace std; -using namespace libvariant; - -//=== Foo ===================================================================== - -class Foo { - -public: - - Foo ( Variant opts = Variant::MapType ): - mOpts ( opts ) - { - SchemaResult result = SchemaValidate( Foo::GetArgParse().GenerateSchema(), mOpts ); - if ( result.Error() ) - cerr << "# Foo: " << result.PrettyPrintMessage() << endl; - } - - static ArgParse GetArgParse () - { - ArgParse argParse; - - // -v --verbose - argParse.AddOption( "foo/verbosity", 'v', "foo-verbose", - "Set foo verbosity level" - ).Action( ARGACTION_COUNT ).Default(0); - - argParse.AddOption( "list[0]/foo", 'f', "foo", "FoOOooOooOoo!" ); - - return argParse; - } - -private: - - Variant mOpts; - -}; - -//=== Bar ===================================================================== - -class Bar { - -public: - - Bar ( Variant opts = Variant::MapType ): - mOpts ( opts ) - { - SchemaResult result = SchemaValidate( Bar::GetArgParse().GenerateSchema(), mOpts ); - if ( result.Error() ) - cerr << "# Bar: " << result.PrettyPrintMessage() << endl; - } - - static ArgParse GetArgParse () - { - ArgParse argParse; - - // -v --verbose - argParse.AddOption( "bar/verbosity", 'v', "bar-verbose", - "Set bar verbosity level" - ).Action( ARGACTION_COUNT ).Default(0); - - argParse.AddOption( "list[1]/bar", 'b', "bar", "BaaaaAAAaaar!" ); - - return argParse; - } - -private: - - Variant mOpts; - -}; - -//=== Main ==================================================================== - -int main ( int argc, char *argv[] ) -{ - ArgParse argParse( "Test" ); - argParse.ConflictResolution(); - argParse.Merge( Foo::GetArgParse() ); - argParse.Merge( Bar::GetArgParse() ); - Variant opts = argParse.Parse( argc, argv ); - - Foo foo( opts ); - Bar bar( opts ); - - cout << "--- Foo ---" << endl; - cout << Serialize( Foo::GetArgParse().GenerateSchema(), SERIALIZE_JSON, Variant().Set( "pretty", true ) ) << endl; - - cout << "--- Bar ---" << endl; - cout << Serialize( Bar::GetArgParse().GenerateSchema(), SERIALIZE_JSON, Variant().Set( "pretty", true ) ) << endl; - - cout << "--- Merged ---" << endl; - cout << Serialize( argParse.GenerateSchema(), SERIALIZE_JSON, Variant().Set( "pretty", true ) ) << endl; - return 0; -} - -//============================================================================= diff --git a/src/hos_libvariant/src/libvariant/test/test_base64.cc b/src/hos_libvariant/src/libvariant/test/test_base64.cc deleted file mode 100644 index 869cf866..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_base64.cc +++ /dev/null @@ -1,1033 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include -#include -#include - -#include "../../libvariant/src/Base64.h" -using namespace libvariant; - -unsigned char test_data[] = { - 0xde, 0xc1, 0x9a, 0x7c, 0xc6, 0xdb, 0xda, 0x3d, 0x77, 0xc5, 0x37, 0xf7, - 0x2c, 0xf1, 0x15, 0x47, 0xe4, 0x63, 0xe5, 0x68, 0x62, 0x8e, 0x6c, 0x09, - 0xbd, 0xd7, 0x74, 0xfc, 0x73, 0x00, 0xe8, 0x82, 0xc2, 0x7c, 0x73, 0x1b, - 0x26, 0xe5, 0x73, 0x6b, 0xf7, 0xcc, 0x15, 0xf6, 0xc2, 0x21, 0x8f, 0x3e, - 0x28, 0xd9, 0xb2, 0x96, 0xaf, 0x96, 0xef, 0xfe, 0xcd, 0x3a, 0x55, 0x68, - 0xc6, 0xaa, 0xe7, 0xfa, 0x36, 0x34, 0x34, 0xa9, 0xa7, 0xd9, 0x1f, 0x10, - 0x85, 0x98, 0xd5, 0x4a, 0x7b, 0x88, 0x04, 0xba, 0x6c, 0x36, 0xdb, 0x69, - 0x31, 0xbd, 0x06, 0x70, 0xfb, 0x06, 0x3a, 0x4b, 0x4f, 0xc2, 0x11, 0xca, - 0x5d, 0x3a, 0x11, 0x0d, 0x39, 0x40, 0x18, 0xa7, 0x5a, 0xd2, 0x7f, 0x85, - 0x4a, 0xcf, 0x3e, 0x9f, 0x02, 0x24, 0x07, 0x9b, 0x67, 0x1e, 0x09, 0x54, - 0xcf, 0xab, 0xb5, 0x18, 0xaa, 0xd3, 0xc7, 0xbd, 0x48, 0xd5, 0x17, 0xe6, - 0x16, 0x93, 0x8d, 0x2e, 0x84, 0xc0, 0x97, 0x71, 0xb4, 0x6a, 0xae, 0x2e, - 0x0b, 0x0c, 0x04, 0xad, 0xae, 0x28, 0x4e, 0x63, 0x22, 0x9b, 0x52, 0xfd, - 0x9e, 0xf3, 0xac, 0x54, 0x8d, 0xaa, 0xe4, 0x15, 0x68, 0x25, 0x6b, 0x3e, - 0x07, 0xd6, 0x0a, 0x15, 0x8f, 0x37, 0xa0, 0xb1, 0xbf, 0xd0, 0x24, 0xff, - 0x58, 0x73, 0xd6, 0xcd, 0xca, 0xc2, 0x32, 0x34, 0xb4, 0x09, 0x8d, 0xf8, - 0xf8, 0xa1, 0xa9, 0xba, 0xcc, 0xde, 0x1b, 0x79, 0x62, 0xd7, 0x47, 0xcf, - 0x32, 0x48, 0xbc, 0xc1, 0x66, 0xf5, 0x87, 0xf8, 0xcd, 0xa0, 0x5a, 0xee, - 0x4f, 0x8b, 0xf1, 0x68, 0xf8, 0xf4, 0x63, 0x19, 0x4c, 0xe0, 0x3c, 0x3b, - 0x1a, 0x69, 0x8f, 0xf6, 0x17, 0xe2, 0x38, 0x6c, 0x53, 0x9b, 0x90, 0x73, - 0x1f, 0xd6, 0x5d, 0x7d, 0xfa, 0xb7, 0x80, 0x83, 0xe8, 0x7a, 0xbd, 0x84, - 0x0a, 0xff, 0xdf, 0x02, 0xee, 0x29, 0x75, 0x6e, 0x25, 0x9d, 0x37, 0x90, - 0x62, 0x53, 0x5a, 0x88, 0xb9, 0x8e, 0x5a, 0xfa, 0x5f, 0x6c, 0x1f, 0xed, - 0x9a, 0x4b, 0x69, 0x0e, 0xd2, 0x61, 0xd3, 0x17, 0x57, 0x0c, 0x52, 0x32, - 0x43, 0x83, 0x6a, 0x3b, 0x41, 0x43, 0xa4, 0xbe, 0xb9, 0xbd, 0xd5, 0xe7, - 0xe5, 0xb2, 0x16, 0x59, 0xba, 0xb0, 0xf5, 0xbc, 0xe2, 0x5b, 0x79, 0x96, - 0xd2, 0xa0, 0xa3, 0x08, 0x76, 0xa8, 0xbb, 0xff, 0xcb, 0xf2, 0x15, 0x66, - 0x6c, 0x49, 0x9b, 0xcb, 0xc5, 0x8d, 0xb2, 0xc6, 0xea, 0xaa, 0x17, 0x09, - 0x1b, 0x1c, 0x87, 0xb9, 0x67, 0xc7, 0x85, 0xc1, 0x38, 0xe6, 0x2c, 0xd3, - 0x09, 0x97, 0xf8, 0xe0, 0xd2, 0xb1, 0x62, 0x72, 0xfc, 0x79, 0x77, 0x35, - 0xbb, 0x6e, 0x54, 0xdc, 0xdf, 0x9b, 0xcf, 0x46, 0xdb, 0xb2, 0xbb, 0xf9, - 0xb9, 0x7c, 0xa8, 0xeb, 0x01, 0x2e, 0x37, 0xb4, 0xfd, 0x3e, 0xa1, 0x82, - 0x6b, 0x31, 0x18, 0x72, 0x3a, 0x55, 0x7e, 0xc9, 0xb9, 0xc8, 0x1b, 0xdc, - 0xd9, 0xa0, 0x16, 0x4c, 0xfd, 0x6d, 0xfe, 0xf0, 0x6a, 0x66, 0x88, 0xb9, - 0x20, 0x6e, 0xb5, 0x4f, 0xbc, 0xdb, 0x94, 0xbb, 0x00, 0x4a, 0xa3, 0x3f, - 0x79, 0xc0, 0xf4, 0x18, 0x93, 0xa1, 0x2d, 0xec, 0xae, 0x5e, 0x42, 0xca, - 0x15, 0x01, 0x40, 0xd7, 0x59, 0x90, 0x0e, 0x92, 0x33, 0x98, 0x8f, 0xe0, - 0x68, 0xe4, 0xea, 0x8e, 0x37, 0x70, 0x3f, 0x4a, 0x83, 0x27, 0x08, 0xf0, - 0xc7, 0x39, 0x0f, 0x1c, 0x21, 0xb7, 0x6b, 0x2f, 0x9e, 0x73, 0x21, 0x23, - 0x16, 0x15, 0xdd, 0xc4, 0xbe, 0xef, 0x35, 0xea, 0xd8, 0x5e, 0xad, 0x83, - 0xa9, 0x13, 0xeb, 0x40, 0x94, 0x77, 0x9f, 0xdb, 0xdc, 0x97, 0x54, 0x01, - 0x15, 0x58, 0x09, 0x8d, 0x21, 0x1c, 0xe0, 0x3a, 0xc4, 0xbd, 0x75, 0x1b, - 0xef, 0x8a, 0xb5, 0x78, 0xaa, 0x23, 0x79, 0x69, 0xcc, 0x15, 0x43, 0xfa, - 0x65, 0xf5, 0x6a, 0xca, 0x23, 0x42, 0x7e, 0x8e, 0x19, 0xfb, 0x05, 0x43, - 0xae, 0x4c, 0x8a, 0xe6, 0xdb, 0x05, 0xc1, 0xbe, 0xd5, 0x31, 0x61, 0xab, - 0xd4, 0x8e, 0x89, 0x21, 0xe2, 0x1b, 0xa8, 0xcd, 0xa0, 0xf5, 0x9e, 0xd1, - 0x00, 0x3c, 0x05, 0xb6, 0x42, 0xba, 0x53, 0x8b, 0x52, 0x6b, 0x75, 0x99, - 0x76, 0x31, 0x09, 0x7f, 0x9d, 0xa5, 0xa3, 0xe4, 0x2f, 0x45, 0x8d, 0x7e, - 0x32, 0xd0, 0x33, 0xd3, 0xa4, 0xd2, 0x01, 0x67, 0x75, 0x08, 0xf7, 0x69, - 0x8e, 0x9d, 0xec, 0x63, 0x71, 0xa8, 0x3c, 0xcc, 0x2c, 0x15, 0x24, 0x3e, - 0x66, 0xcd, 0x24, 0xee, 0x78, 0xbc, 0x60, 0x4c, 0xd4, 0x4b, 0xc1, 0x50, - 0x44, 0xbe, 0xb4, 0x60, 0xb9, 0x22, 0x1b, 0x12, 0x33, 0x34, 0x1b, 0xa9, - 0x04, 0x9f, 0x01, 0x6b, 0xdd, 0x1f, 0x4c, 0x64, 0x98, 0x05, 0xb8, 0x7f, - 0xb3, 0x41, 0xd1, 0xee, 0xd8, 0xef, 0xb6, 0x61, 0x37, 0x22, 0x39, 0xa5, - 0x16, 0x0e, 0x9d, 0x93, 0x74, 0x6f, 0x32, 0xf0, 0xb1, 0x13, 0x00, 0x78, - 0x25, 0x96, 0x90, 0xcf, 0x8f, 0xe1, 0x1a, 0xa0, 0x81, 0xc5, 0x96, 0x1a, - 0x9c, 0x89, 0x94, 0xc7, 0xc3, 0x4c, 0xec, 0xe5, 0xa5, 0xb2, 0x4d, 0x6c, - 0x0f, 0x8d, 0x09, 0x34, 0x8e, 0x54, 0xc3, 0xbb, 0x51, 0xb7, 0x3e, 0x82, - 0xda, 0x5f, 0x21, 0x8f, 0xf3, 0x68, 0x82, 0x33, 0xcb, 0x64, 0x71, 0x9c, - 0xdf, 0xab, 0xfa, 0xb4, 0x57, 0xd9, 0x07, 0x78, 0xa2, 0xe8, 0xa6, 0xba, - 0x8c, 0x48, 0x2f, 0xb3, 0x96, 0x1c, 0x1d, 0xa4, 0x1c, 0xe0, 0x15, 0x6e, - 0xc4, 0x80, 0xd7, 0x4d, 0x78, 0xce, 0x9a, 0x77, 0x2a, 0x90, 0xe4, 0xde, - 0x66, 0x88, 0x54, 0xda, 0x14, 0x3f, 0x02, 0x30, 0x67, 0x23, 0x94, 0x76, - 0xc3, 0x28, 0xe4, 0x1b, 0xbf, 0x37, 0x13, 0x0f, 0xc9, 0xa9, 0xdd, 0x75, - 0x63, 0x41, 0x07, 0x7c, 0xad, 0xda, 0xb2, 0x62, 0x9c, 0xaf, 0x1d, 0x4b, - 0x46, 0x71, 0x16, 0xc8, 0xb4, 0x04, 0x62, 0xa3, 0x1c, 0x06, 0xdd, 0x58, - 0x3a, 0xb8, 0x83, 0x4b, 0x1c, 0xa8, 0x7b, 0xa8, 0x9c, 0x36, 0x1a, 0x01, - 0x23, 0x99, 0x10, 0xf6, 0x1d, 0x1e, 0x2e, 0x80, 0xe4, 0x46, 0x8a, 0x30, - 0x42, 0xc2, 0x48, 0x18, 0x70, 0x2a, 0x60, 0x52, 0xc0, 0x55, 0xc0, 0xef, - 0x2a, 0x2d, 0x44, 0x5e, 0xea, 0x77, 0x74, 0x81, 0xde, 0xed, 0x74, 0x48, - 0xac, 0x27, 0xf9, 0x5d, 0xff, 0xb2, 0xab, 0xd9, 0x6b, 0x03, 0x5a, 0x9f, - 0x6a, 0x7d, 0x7b, 0x05, 0xad, 0x76, 0x51, 0x9c, 0xc1, 0x46, 0x86, 0x9b, - 0x7b, 0x7d, 0x90, 0x57, 0x14, 0x35, 0xf8, 0xa4, 0xb6, 0xb7, 0xcd, 0x19, - 0x0a, 0x86, 0x37, 0x6a, 0xc3, 0xe9, 0xeb, 0x78, 0x77, 0x4d, 0x06, 0x0a, - 0xad, 0x0a, 0xec, 0xdb, 0x6e, 0xe5, 0xdc, 0x58, 0xba, 0x65, 0xbf, 0x01, - 0x76, 0x8a, 0xed, 0x0a, 0x88, 0x24, 0x95, 0x91, 0x14, 0x47, 0x52, 0x77, - 0xb1, 0x02, 0x19, 0x79, 0x78, 0xaf, 0x73, 0x37, 0x8c, 0xed, 0x07, 0x6e, - 0x64, 0xfe, 0xde, 0x29, 0x2d, 0x29, 0x95, 0x4e, 0xc8, 0x12, 0x65, 0x8c, - 0x93, 0x7f, 0xa7, 0xde, 0x88, 0x03, 0xb9, 0x14, 0x5e, 0xc2, 0x8c, 0x97, - 0x88, 0xe4, 0x30, 0x3a, 0xc8, 0x00, 0x52, 0x26, 0x61, 0x98, 0x8a, 0xdc, - 0x59, 0x1b, 0xc9, 0x98, 0x75, 0xf1, 0xbf, 0xc0, 0x79, 0xe0, 0x65, 0x29, - 0xd2, 0xc6, 0x51, 0x33, 0x67, 0xaf, 0x0f, 0xcb, 0x1a, 0x89, 0xce, 0xf9, - 0x27, 0x2d, 0x23, 0xc3, 0x56, 0x07, 0xb6, 0xb9, 0x74, 0x0a, 0x90, 0xcc, - 0x47, 0x53, 0xcf, 0x77, 0xa7, 0x9d, 0x03, 0xc6, 0x73, 0xce, 0x3e, 0xc5, - 0x5b, 0xfc, 0xc8, 0x6a, 0x18, 0x09, 0xac, 0x27, 0x66, 0x18, 0x7a, 0xba, - 0x9e, 0x3d, 0xd1, 0x0a, 0xdd, 0xc2, 0x1e, 0x40, 0x20, 0xf1, 0x05, 0x66, - 0xbb, 0x4c, 0xa0, 0x2b, 0xd0, 0x8b, 0x53, 0xcb, 0x35, 0x45, 0xa3, 0x0e, - 0x75, 0x8b, 0xea, 0x27, 0xcc, 0xb2, 0xa3, 0xd7, 0x7d, 0xaf, 0x60, 0xcb, - 0x62, 0xab, 0x2c, 0x24, 0x93, 0x29, 0xa7, 0x71, 0xed, 0x66, 0x26, 0x98, - 0xaf, 0xc9, 0x6b, 0x7d, 0x57, 0xc4, 0x4f, 0xb7, 0x48, 0x81, 0x0c, 0x1a, - 0xc3, 0x7e, 0xde, 0x33, 0xff, 0x12, 0xec, 0xe9, 0x6c, 0x2f, 0xcd, 0x67, - 0x16, 0x80, 0x67, 0x21, 0x6b, 0x09, 0x8d, 0x1b, 0xa4, 0xd0, 0xec, 0x63, - 0x07, 0xc2, 0x38, 0x50, 0xcd, 0x7a, 0xc3, 0xe5, 0x43, 0x1d, 0xd0, 0x22, - 0x86, 0x4f, 0xa3, 0x84, 0x07, 0xb2, 0xc3, 0x7d, 0x8e, 0xb4, 0xb1, 0x1d, - 0xe0, 0x73, 0x1b, 0xf9, 0x6f, 0xc9, 0x60, 0xa6, 0x78, 0x34, 0x60, 0x66, - 0xd1, 0x47, 0x26, 0x78, 0x11, 0x24, 0x39, 0x27, 0x33, 0xae, 0x38, 0x96, - 0x97, 0x7c, 0x14, 0x7d, 0xc5, 0x74, 0xd4, 0xaf, 0xb3, 0x7d, 0x28, 0x61, - 0xe5, 0x21, 0xc0, 0xba, 0xdc, 0xcf, 0x55, 0xba, 0x2a, 0x6f, 0xcc, 0x29, - 0x96, 0x5e, 0xca, 0x35, 0x7c, 0xbc, 0x93, 0xf0, 0xa8, 0xf8, 0x09, 0xc1, - 0xa5, 0xf1, 0xb2, 0x05, 0x64, 0xa1, 0xf8, 0x43, 0x62, 0xea, 0xce, 0x2a, - 0xc2, 0x95, 0xcc, 0x11, 0x0b, 0xf6, 0xff, 0x66, 0x50, 0xf0, 0xfe, 0xd1, - 0x95, 0xa5, 0xd1, 0x8a, 0x95, 0x00, 0x6b, 0x4a, 0x1c, 0x14, 0xdd, 0x7d, - 0xf6, 0x97, 0x07, 0xbe, 0x3b, 0x7d, 0x58, 0x4e, 0x09, 0xed, 0x9b, 0x13, - 0x6e, 0xca, 0xca, 0xf9, 0x66, 0x0f, 0xc3, 0x2a, 0xed, 0xd1, 0xe7, 0x3e, - 0x52, 0x0c, 0xde, 0x0d, 0xe3, 0x02, 0x4d, 0x29, 0xac, 0xae, 0x9f, 0xb8, - 0xb1, 0x46, 0x3c, 0xa4, 0xad, 0x27, 0x77, 0x39, 0x42, 0xc7, 0x09, 0x0a, - 0x12, 0x91, 0xfd, 0x3e, 0xd4, 0x00, 0x13, 0x9b, 0xd6, 0xe7, 0xc8, 0x88, - 0x35, 0x7b, 0x65, 0x26, 0x94, 0x74, 0x59, 0x1a, 0x9f, 0xc1, 0x3a, 0xa4, - 0x4a, 0x2b, 0xf0, 0xaa, 0x7e, 0xc9, 0x7c, 0x8f, 0xbf, 0x15, 0x32, 0xbd, - 0x8d, 0xb3, 0xa4, 0x8e, 0x1f, 0x15, 0x1d, 0x4b, 0xda, 0xf4, 0x20, 0xa5, - 0xcc, 0x09, 0xc3, 0x18, 0x18, 0x7e, 0xcb, 0xb3, 0x38, 0x56, 0x07, 0x67, - 0x75, 0x5d, 0x53, 0xde, 0x8f, 0xc9, 0x45, 0xac, 0x9e, 0xb2, 0xa9, 0x47, - 0xb0, 0x61, 0x87, 0xa0, 0x39, 0x8f, 0x86, 0xde, 0xa3, 0xc3, 0xc8, 0x76, - 0x9c, 0xc2, 0x75, 0x02, 0x81, 0x7c, 0xcf, 0x20, 0x98, 0xc7, 0x05, 0xfd, - 0xa6, 0x2f, 0x28, 0xdb, 0x96, 0xa4, 0xad, 0x05, 0xd7, 0xb2, 0x55, 0xef, - 0x3b, 0xa3, 0x30, 0x7a, 0x32, 0x34, 0x4e, 0x6c, 0xd3, 0x63, 0x9c, 0x85, - 0x88, 0xa3, 0x9a, 0x14, 0xdb, 0x6d, 0xa5, 0xaa, 0xa2, 0x45, 0x3e, 0xca, - 0x95, 0x96, 0x5d, 0x26, 0xd0, 0x8b, 0x1e, 0xf3, 0x1a, 0x3f, 0xe1, 0xca, - 0x24, 0x09, 0xc1, 0x9a, 0x1a, 0xbb, 0xba, 0x84, 0x70, 0x1b, 0x9b, 0x30, - 0xdc, 0x33, 0x16, 0xb5, 0x17, 0x37, 0x90, 0x78, 0x16, 0x2c, 0x09, 0x24, - 0x4e, 0xdc, 0x83, 0x55, 0x13, 0xe8, 0x19, 0x49, 0xfa, 0xb8, 0x19, 0x8e, - 0x80, 0x18, 0xe7, 0x89, 0xa7, 0xe1, 0x88, 0x31, 0x14, 0xd5, 0xc6, 0xdf, - 0xe7, 0x5e, 0x95, 0x9e, 0x48, 0x24, 0xdd, 0x09, 0x28, 0xd1, 0xbb, 0xe0, - 0x61, 0xbb, 0x2a, 0x76, 0xbf, 0xe5, 0x28, 0x21, 0x0e, 0x6f, 0x6c, 0x96, - 0xbb, 0xf0, 0x25, 0x66, 0xfe, 0xb2, 0x22, 0x07, 0x77, 0xf5, 0x11, 0x3e, - 0xa7, 0x1d, 0x12, 0x55, 0x03, 0x48, 0xc9, 0xae, 0xb4, 0x86, 0x44, 0xf1, - 0x37, 0xe6, 0x92, 0xc8, 0x4d, 0xc6, 0xb4, 0xa9, 0x12, 0xc6, 0xe8, 0x10, - 0x48, 0x91, 0xea, 0xe3, 0x38, 0x40, 0x86, 0x27, 0x43, 0x1d, 0xdf, 0x34, - 0xbb, 0x7a, 0x64, 0xf0, 0x7e, 0x00, 0x79, 0x24, 0x3b, 0x6b, 0x16, 0x2b, - 0x1d, 0x94, 0xb5, 0xc5, 0xe7, 0x16, 0x62, 0xac, 0x10, 0xba, 0xe0, 0x83, - 0x7e, 0xd7, 0x40, 0xd2, 0x6f, 0x3c, 0x49, 0x22, 0x4f, 0x34, 0x82, 0x55, - 0xd6, 0xb1, 0x56, 0x4a, 0x8d, 0x8f, 0x34, 0x82, 0x66, 0x92, 0x58, 0xf1, - 0x01, 0x67, 0x0d, 0xac, 0xdb, 0x5b, 0xcb, 0xbc, 0xe7, 0xd7, 0x68, 0x42, - 0xb7, 0x47, 0x3c, 0x63, 0x8c, 0x33, 0x94, 0x36, 0xfa, 0x5a, 0x0c, 0x1d, - 0x7a, 0x46, 0x26, 0x6c, 0xb4, 0x12, 0x01, 0x89, 0xab, 0x36, 0x78, 0x05, - 0x75, 0xda, 0x63, 0xf4, 0xe6, 0x20, 0x37, 0x6e, 0x51, 0xea, 0x7a, 0xa5, - 0xdd, 0xde, 0xc8, 0x74, 0x66, 0x27, 0x05, 0x56, 0x9b, 0xbf, 0x05, 0x31, - 0x77, 0x0f, 0x93, 0xb7, 0x15, 0xb8, 0x20, 0x13, 0x83, 0x0b, 0xe2, 0xe6, - 0x36, 0x3e, 0x89, 0xf0, 0x3b, 0xe3, 0x5b, 0xbf, 0x8e, 0xb8, 0x33, 0x5e, - 0x43, 0xc9, 0xc1, 0xdd, 0x9a, 0xcd, 0x9b, 0x5a, 0x58, 0x2e, 0x6e, 0x50, - 0xd4, 0x13, 0x64, 0x07, 0x46, 0x7e, 0x83, 0x80, 0x33, 0x43, 0xd3, 0xa7, - 0x1e, 0x07, 0x2c, 0xaf, 0x03, 0xd5, 0x1f, 0x7d, 0x95, 0xf4, 0x70, 0x08, - 0xab, 0xa9, 0x36, 0xff, 0xf2, 0xc5, 0xbc, 0x82, 0x5e, 0x75, 0x8a, 0xd0, - 0x32, 0xfb, 0xf4, 0x34, 0x44, 0x42, 0x42, 0x76, 0xce, 0x27, 0x42, 0x93, - 0x29, 0x54, 0x21, 0x14, 0x2a, 0x2f, 0x93, 0xd8, 0x2a, 0xe8, 0xf8, 0x44, - 0xec, 0x4c, 0x8b, 0xdb, 0xe9, 0xdc, 0x38, 0x35, 0xca, 0xb8, 0x34, 0x9f, - 0xec, 0x32, 0x24, 0xda, 0x45, 0x6f, 0x74, 0x4d, 0x42, 0xa3, 0x9c, 0x18, - 0xee, 0x91, 0x25, 0x11, 0xae, 0xbc, 0x94, 0x48, 0x0e, 0x9a, 0x4f, 0x5b, - 0x60, 0x41, 0x76, 0x1a, 0x06, 0xae, 0x1a, 0x0f, 0x57, 0x23, 0xe8, 0xcd, - 0x00, 0xc6, 0xc2, 0x83, 0xa2, 0x36, 0x90, 0x4d, 0xf1, 0xe3, 0x7e, 0xda, - 0xf6, 0xff, 0x36, 0x37, 0x10, 0x78, 0xe2, 0x5f, 0x59, 0x7c, 0x07, 0xe9, - 0xe6, 0x3c, 0x7a, 0x3c, 0xbf, 0x89, 0x80, 0xce, 0x07, 0xca, 0xbc, 0xee, - 0x54, 0x09, 0x12, 0xa1, 0x0f, 0x34, 0xe3, 0xde, 0x8e, 0x96, 0xdf, 0xe5, - 0x36, 0x68, 0xb4, 0x3a, 0x6d, 0x51, 0x96, 0x9b, 0x10, 0xdb, 0x7e, 0x31, - 0x22, 0xd2, 0x60, 0x3e, 0x2f, 0x63, 0xb8, 0x40, 0x56, 0x4c, 0x3d, 0xae, - 0xba, 0x3b, 0x06, 0x66, 0x31, 0xc8, 0xa7, 0x2b, 0xea, 0xa1, 0xc4, 0x8c, - 0x80, 0x5f, 0xcc, 0x85, 0xc4, 0xd4, 0xc5, 0x77, 0xb3, 0x30, 0x1f, 0xfe, - 0xe6, 0x19, 0x4a, 0x95, 0x41, 0x57, 0x5c, 0xb4, 0x73, 0x5d, 0x78, 0x47, - 0x02, 0x28, 0x91, 0x67, 0x3a, 0xd0, 0x86, 0x23, 0xa9, 0x74, 0x10, 0x15, - 0x79, 0x71, 0x36, 0x6d, 0xf4, 0xb3, 0x89, 0xb3, 0x77, 0xa5, 0xf0, 0x5f, - 0x37, 0x89, 0xc3, 0xec, 0xcf, 0x80, 0x2b, 0x0b, 0x99, 0xd3, 0xe5, 0x19, - 0x23, 0x94, 0x85, 0x1f, 0x07, 0x3d, 0x19, 0x3a, 0x60, 0xaa, 0x71, 0xfb, - 0xf1, 0x17, 0x3d, 0xd9, 0x07, 0x42, 0x92, 0xf5, 0xc5, 0xb2, 0x53, 0x50, - 0x7c, 0x00, 0x45, 0xb5, 0x05, 0xa1, 0xf8, 0x02, 0x91, 0x6e, 0x9e, 0x2f, - 0x5b, 0x42, 0x48, 0x01, 0x12, 0x53, 0x79, 0xbe, 0x2f, 0x18, 0x0e, 0xa0, - 0x8d, 0x22, 0x1b, 0xfd, 0x51, 0x33, 0x56, 0x16, 0x2f, 0x2e, 0x38, 0x75, - 0x5f, 0xcd, 0x58, 0xa1, 0x0c, 0x27, 0x35, 0x0c, 0x27, 0x6d, 0xfa, 0x57, - 0x99, 0x14, 0xee, 0xe1, 0xcb, 0x52, 0xd7, 0xee, 0x0f, 0x24, 0xf0, 0x32, - 0xf3, 0x6f, 0x82, 0x63, 0x99, 0xa3, 0xd7, 0xd7, 0x82, 0xff, 0xc2, 0xd9, - 0x66, 0x69, 0x27, 0x73, 0x24, 0x37, 0xac, 0xff, 0x21, 0x97, 0x4a, 0xf9, - 0xba, 0x75, 0x2d, 0x89, 0x49, 0x35, 0x4a, 0x07, 0x19, 0xd7, 0x83, 0xc1, - 0x89, 0x67, 0x6a, 0x57, 0x7a, 0xf8, 0x28, 0x62, 0xd3, 0xa6, 0x26, 0x8d, - 0x85, 0xe6, 0xb0, 0x91, 0x10, 0xf4, 0xbd, 0x65, 0x5a, 0x9e, 0x62, 0x30, - 0x07, 0x5d, 0x73, 0xbd, 0x29, 0xaf, 0x68, 0xbf, 0x8d, 0x6f, 0xab, 0xab, - 0xf9, 0x3e, 0x8e, 0x6a, 0xe4, 0xfb, 0x0f, 0xb9, 0xc9, 0xe9, 0xe8, 0xbe, - 0xb1, 0x6e, 0x81, 0xc7, 0xb7, 0xaf, 0xc7, 0xf7, 0xc4, 0x07, 0x2c, 0x15, - 0xaf, 0xb4, 0x10, 0xf5, 0x78, 0x0f, 0x52, 0x1d, 0x2c, 0xd4, 0xb7, 0x08, - 0xc9, 0xba, 0x9a, 0xfa, 0x46, 0x86, 0x16, 0x7a, 0x8d, 0x21, 0xb6, 0xb1, - 0xb5, 0xd4, 0x8a, 0xcc, 0x16, 0x2a, 0x17, 0xeb, 0xcd, 0xb3, 0xb0, 0xb0, - 0xe1, 0x75, 0x09, 0x15, 0x65, 0xd8, 0x6c, 0x73, 0xfc, 0xed, 0x2f, 0x24, - 0xbb, 0xfb, 0xbc, 0xaa, 0xf4, 0xf5, 0x2e, 0xf9, 0x0b, 0xbe, 0xb8, 0x49, - 0x7d, 0xf4, 0x85, 0xae, 0x2a, 0xb8, 0x06, 0x33, 0x73, 0x5f, 0x30, 0x62, - 0xdb, 0xc0, 0xb3, 0x21, 0xeb, 0x4b, 0x33, 0x08, 0x52, 0x91, 0xdc, 0x9d, - 0xf1, 0x70, 0x02, 0x47, 0x84, 0x1a, 0xa5, 0xdd, 0x9c, 0x69, 0x8f, 0xf1, - 0x97, 0x92, 0xd8, 0xbe, 0x22, 0xf2, 0x91, 0x0e, 0xca, 0x46, 0xc1, 0x21, - 0x9f, 0x93, 0xb9, 0x89, 0xb7, 0xbb, 0x88, 0x10, 0xa3, 0x78, 0xa7, 0x41, - 0xea, 0x13, 0x7f, 0x6a, 0x62, 0xc4, 0x52, 0x4f, 0xf2, 0x8c, 0x16, 0xf0, - 0x32, 0x08, 0x6c, 0x58, 0xd8, 0xb9, 0x9d, 0x02, 0x68, 0x59, 0x26, 0x2f, - 0xb1, 0x70, 0x6c, 0xc1, 0x8c, 0xbc, 0xa3, 0x7e, 0x0f, 0x7c, 0xb2, 0x4f, - 0xc5, 0x3e, 0xef, 0xec, 0xa1, 0xc6, 0x8a, 0x35, 0x19, 0xcc, 0x24, 0xdc, - 0xbe, 0x24, 0x30, 0x8c, 0xf2, 0x1a, 0x88, 0x8d, 0xe6, 0x7a, 0xd0, 0xc5, - 0x17, 0x3c, 0x1d, 0xe6, 0xb4, 0xdf, 0x62, 0xec, 0xfc, 0x14, 0xb3, 0x2f, - 0x03, 0xd6, 0xc8, 0x73, 0x43, 0x12, 0x15, 0x44, 0x52, 0xeb, 0xc9, 0x2a, - 0x7b, 0x6c, 0x3e, 0x82, 0x52, 0xaf, 0x2f, 0xf8, 0xa8, 0xd5, 0xcc, 0xc7, - 0x8f, 0xfd, 0xbd, 0xb7, 0xbe, 0xd2, 0x94, 0x6a, 0x01, 0x7c, 0xae, 0xf1, - 0x2a, 0xab, 0x0c, 0xc2, 0x7a, 0x62, 0x7a, 0x57, 0x73, 0x2e, 0x6c, 0x1c, - 0x25, 0x17, 0xd8, 0x47, 0x92, 0x9b, 0xec, 0xcd, 0x73, 0x58, 0x0c, 0x9b, - 0x4d, 0x79, 0x97, 0x10, 0xa7, 0x47, 0xe3, 0x33, 0xba, 0xf8, 0x9d, 0xec, - 0x4a, 0xce, 0xf7, 0xab, 0x78, 0x9a, 0x5e, 0x51, 0x63, 0x1a, 0xd5, 0x47, - 0x10, 0x1f, 0x29, 0x6d, 0x54, 0x06, 0xb9, 0xb9, 0xd8, 0xd5, 0x60, 0x88, - 0xc3, 0x84, 0x96, 0x09, 0x18, 0xd6, 0x20, 0xa5, 0xda, 0x2b, 0x9d, 0xca, - 0xeb, 0x69, 0x54, 0x50, 0xae, 0x97, 0x02, 0x4c, 0x14, 0x85, 0x89, 0x46, - 0x4e, 0xfc, 0x0c, 0x71, 0x77, 0x88, 0xb3, 0x0c, 0xfc, 0x50, 0xff, 0xf5, - 0xa9, 0x8f, 0x5f, 0xe9, 0x1d, 0x07, 0xed, 0xf6, 0xdd, 0xe0, 0xeb, 0xc1, - 0x4a, 0x25, 0xc7, 0xca, 0x7b, 0x10, 0x8f, 0x9c, 0x11, 0xf3, 0x23, 0xe6, - 0x20, 0xe2, 0x13, 0x34, 0xe2, 0x88, 0x54, 0x77, 0xbb, 0x9a, 0x37, 0xa5, - 0x47, 0xde, 0x30, 0xa0, 0x1e, 0xd9, 0x88, 0x73, 0x4c, 0x05, 0xce, 0x58, - 0xeb, 0x32, 0x87, 0x67, 0x5a, 0x57, 0xc2, 0x38, 0x0e, 0xc6, 0x00, 0xa4, - 0x37, 0x8d, 0x89, 0x7f, 0xa9, 0xba, 0x09, 0x9f, 0x40, 0x74, 0x61, 0xe5, - 0x61, 0x3a, 0xee, 0xb4, 0x75, 0x16, 0x13, 0x9e, 0x98, 0x1b, 0x9f, 0x92, - 0x14, 0xd0, 0x09, 0x9f, 0x33, 0xc3, 0x29, 0xda, 0xac, 0x5b, 0x3d, 0xac, - 0xf5, 0x73, 0x89, 0xf7, 0xa0, 0x21, 0xab, 0xf1, 0x3b, 0x95, 0xff, 0x24, - 0x76, 0xa6, 0xe6, 0x06, 0xec, 0xfe, 0xce, 0x57, 0xb8, 0x68, 0x5d, 0x73, - 0xa5, 0xa9, 0x00, 0xed, 0x66, 0xd7, 0x05, 0x8b, 0x28, 0xff, 0xf1, 0x91, - 0x67, 0x21, 0xe1, 0xe7, 0xcd, 0x65, 0x20, 0x22, 0x4e, 0x5d, 0x1b, 0x7b, - 0x2d, 0x9d, 0x2d, 0xc9, 0xb5, 0xee, 0xaf, 0x55, 0xa0, 0x18, 0xf5, 0xd7, - 0xd8, 0x1e, 0xf0, 0x3a, 0xe6, 0x27, 0xd4, 0x1a, 0x93, 0x39, 0xbb, 0x19, - 0x2d, 0xae, 0xf0, 0xf0, 0xee, 0x34, 0x12, 0xfc, 0x48, 0xb0, 0x97, 0xce, - 0x7c, 0x52, 0xdd, 0xf7, 0x2a, 0x9b, 0x15, 0xb4, 0xf5, 0xf3, 0x13, 0x16, - 0x2d, 0x0f, 0x30, 0xbf, 0x7b, 0xdf, 0xca, 0x44, 0xd4, 0x46, 0x27, 0x47, - 0xcd, 0x3c, 0xbf, 0xd6, 0x1b, 0xc4, 0x24, 0x4b, 0x1e, 0xf5, 0x50, 0x55, - 0xcd, 0x84, 0x85, 0x71, 0x46, 0xd4, 0xac, 0x6f, 0xbf, 0x2c, 0x80, 0xb8, - 0x8e, 0x54, 0xf1, 0x0d, 0xd8, 0x07, 0x77, 0xbc, 0xad, 0x84, 0x9e, 0xcd, - 0xc0, 0xb8, 0x61, 0x73, 0x08, 0x41, 0xfd, 0x4f, 0xb3, 0xe3, 0xdc, 0x5b, - 0x3e, 0xfe, 0xe5, 0xbd, 0xf4, 0xcb, 0xab, 0x85, 0x1a, 0x1d, 0x4e, 0x3b, - 0xa9, 0x0e, 0xdd, 0xff, 0x8b, 0x07, 0xcf, 0x5b, 0x32, 0x2b, 0xb9, 0x4c, - 0x2c, 0x3e, 0xe9, 0x43, 0x5d, 0x32, 0x69, 0xa2, 0xc9, 0xb0, 0x4f, 0x14, - 0x07, 0x28, 0xa0, 0x2e, 0xa5, 0x6d, 0x13, 0x07, 0x96, 0x90, 0xb1, 0x55, - 0x33, 0x43, 0x23, 0x53, 0x9d, 0x6b, 0x8a, 0xb5, 0xa9, 0x46, 0xe6, 0xeb, - 0x19, 0xd4, 0x85, 0xb1, 0x70, 0xe5, 0xd4, 0xdd, 0x56, 0x4a, 0x07, 0xa8, - 0xd1, 0x9b, 0xae, 0xec, 0x02, 0x5d, 0xb4, 0x10, 0xa1, 0x77, 0x56, 0xe6, - 0x4b, 0xff, 0x55, 0xf4, 0x70, 0xa2, 0x04, 0x5c, 0xb7, 0xa8, 0x10, 0xbe, - 0xdc, 0xac, 0xb8, 0xa0, 0xd3, 0x24, 0x94, 0xb1, 0x68, 0x4e, 0x85, 0xf0, - 0xdf, 0x67, 0x02, 0xd7, 0x4e, 0x3d, 0x70, 0x88, 0x86, 0xe6, 0x1e, 0xe4, - 0xe1, 0x3d, 0x1f, 0x04, 0x7b, 0xae, 0x17, 0x10, 0x73, 0xa8, 0xdd, 0x60, - 0xe0, 0x48, 0x29, 0xbd, 0x38, 0xa8, 0x45, 0x0a, 0x13, 0x6d, 0x88, 0xe7, - 0x96, 0x92, 0x4f, 0x8e, 0x1b, 0xb1, 0x43, 0xc0, 0x76, 0xc5, 0x0c, 0x3c, - 0xe3, 0xd8, 0xf1, 0xe2, 0x80, 0xc3, 0x72, 0xb4, 0x1d, 0x7f, 0x79, 0x0b, - 0x3e, 0xba, 0x3c, 0x8b, 0xf1, 0xd0, 0x06, 0x05, 0x3c, 0x83, 0x33, 0xe6, - 0x88, 0x0a, 0x10, 0x60, 0xe4, 0x40, 0x56, 0x68, 0x46, 0xec, 0x43, 0xbc, - 0x29, 0x9b, 0x7c, 0x2e, 0xbb, 0xd1, 0xc0, 0x82, 0x10, 0x26, 0xfa, 0x59, - 0x76, 0x83, 0xca, 0x93, 0xcf, 0x42, 0x84, 0x7b, 0x0d, 0x1f, 0x32, 0x65, - 0xe6, 0xac, 0x11, 0x37, 0x67, 0xc0, 0xb1, 0xe4, 0x74, 0xca, 0x22, 0x8f, - 0xd1, 0xd2, 0x55, 0x3f, 0x33, 0x10, 0x2d, 0x9e, 0xa3, 0x0a, 0xcd, 0x2e, - 0x5a, 0x19, 0xeb, 0xb9, 0x53, 0xd6, 0x09, 0xe3, 0x4c, 0xca, 0x40, 0x06, - 0xb7, 0xde, 0x26, 0x90, 0xab, 0xe3, 0xc6, 0x49, 0x14, 0x6d, 0xbf, 0x59, - 0x4b, 0xb7, 0x3d, 0x64, 0xe6, 0x6a, 0xc0, 0x1b, 0xe8, 0x5a, 0x09, 0xd3, - 0x07, 0x39, 0xaa, 0x69, 0x35, 0xf2, 0xc0, 0x2d, 0xe1, 0x8b, 0xc0, 0xb4, - 0x2d, 0x46, 0x34, 0x5d, 0xeb, 0x1e, 0x5b, 0x09, 0x69, 0x34, 0x8f, 0xe4, - 0xed, 0x40, 0x4c, 0xf5, 0xc1, 0x28, 0xa4, 0x31, 0x45, 0xf3, 0xe7, 0x11, - 0x8e, 0x02, 0x5c, 0xd7, 0x47, 0x4d, 0x02, 0x84, 0x11, 0xbf, 0xc7, 0xba, - 0xd1, 0x6b, 0x6c, 0x99, 0x71, 0x39, 0x2d, 0x52, 0x7b, 0x7c, 0xd5, 0x9d, - 0x4e, 0x2c, 0xc6, 0x56, 0x72, 0xf3, 0x72, 0x61, 0xbc, 0xc4, 0x44, 0x4d, - 0x3f, 0x4c, 0xd9, 0x31, 0x45, 0xcd, 0x9f, 0xf5, 0xf8, 0xcc, 0x5b, 0xbd, - 0x42, 0xe8, 0xc3, 0x9e, 0x76, 0x2e, 0x7b, 0x99, 0x4f, 0x10, 0xea, 0x22, - 0xad, 0x81, 0x42, 0x49, 0xe3, 0x69, 0xa9, 0x76, 0xd2, 0x42, 0xec, 0xae, - 0x69, 0x81, 0x1c, 0x9b, 0x25, 0xab, 0xca, 0xed, 0x5c, 0x56, 0x84, 0x2b, - 0xee, 0xfc, 0x12, 0xc5, 0x65, 0xbf, 0x7d, 0xb2, 0x2a, 0x65, 0x56, 0xaf, - 0xf7, 0x02, 0x9b, 0x74, 0x7f, 0x13, 0x56, 0xf5, 0x51, 0x84, 0xd9, 0x02, - 0xeb, 0x23, 0xa8, 0xa5, 0x41, 0xca, 0xea, 0xb6, 0xcc, 0x73, 0xb3, 0x67, - 0x0b, 0xb3, 0x6f, 0x1e, 0xce, 0x08, 0xcf, 0x4b, 0xb7, 0xad, 0x6d, 0x4a, - 0x44, 0x04, 0x94, 0x15, 0x59, 0x1d, 0x04, 0xcf, 0x2b, 0x45, 0x93, 0x29, - 0x3e, 0xe6, 0x1f, 0xe3, 0x69, 0x81, 0x81, 0x56, 0x1c, 0x61, 0xe5, 0xcb, - 0xd8, 0x13, 0x97, 0x8e, 0xf2, 0x01, 0x2f, 0xb6, 0x41, 0x1f, 0xfa, 0x28, - 0x7f, 0x92, 0xc8, 0x52, 0x38, 0x7c, 0x2a, 0x1f, 0x89, 0x07, 0xcf, 0xf5, - 0xc8, 0x1d, 0x57, 0x81, 0xa3, 0x1a, 0x48, 0xd8, 0x7e, 0xdb, 0xc3, 0x1f, - 0xbb, 0xcc, 0xf2, 0xc8, 0x17, 0xa9, 0xaf, 0xb7, 0x0b, 0xbd, 0x6e, 0xf0, - 0xcd, 0x96, 0x22, 0x00, 0xda, 0x10, 0x39, 0xd2, 0xc5, 0xc3, 0x92, 0x9c, - 0xc0, 0x61, 0x22, 0x43, 0x9d, 0x17, 0x0f, 0x22, 0x37, 0x22, 0xe1, 0x6b, - 0xd2, 0x05, 0xd7, 0xf2, 0xdb, 0xec, 0x3f, 0x99, 0xe7, 0x86, 0x45, 0x1a, - 0x4e, 0xf7, 0x33, 0xef, 0xf1, 0x11, 0xad, 0xb7, 0x72, 0x95, 0x73, 0x78, - 0x52, 0x2c, 0x83, 0x6f, 0x19, 0x0d, 0x9e, 0xfa, 0x20, 0x6a, 0x82, 0xbe, - 0x9f, 0x7a, 0xe5, 0x47, 0x29, 0xf6, 0xfd, 0xbf, 0xd5, 0x3d, 0x2f, 0x89, - 0xac, 0xd3, 0xae, 0xad, 0x15, 0x21, 0xed, 0x72, 0x38, 0x25, 0x8e, 0x68, - 0xd8, 0xf0, 0x72, 0xd6, 0xde, 0x30, 0x60, 0x42, 0x1d, 0x20, 0x13, 0x29, - 0xf8, 0x6c, 0x50, 0xe2, 0x06, 0xa6, 0xae, 0xdc, 0x1b, 0x34, 0x8c, 0x3e, - 0xe2, 0xd8, 0x8a, 0x09, 0x9a, 0x99, 0x7a, 0xb0, 0xf9, 0x38, 0xb0, 0xf5, - 0x68, 0x97, 0xfd, 0x4d, 0x9c, 0xfd, 0xa1, 0x97, 0x57, 0xfc, 0x79, 0x8d, - 0x47, 0xca, 0x2b, 0xba, 0x68, 0x42, 0xfe, 0x1a, 0x84, 0xd4, 0x93, 0x99, - 0x51, 0x8f, 0xe3, 0xb1, 0x76, 0x86, 0xd0, 0x24, 0x66, 0x18, 0x88, 0xfb, - 0x18, 0x17, 0x46, 0x30, 0xf9, 0x4d, 0xe4, 0x7a, 0x45, 0x52, 0x78, 0xee, - 0xa1, 0x41, 0xa5, 0xd6, 0x5d, 0x54, 0x39, 0xdd, 0xba, 0x31, 0x5c, 0x92, - 0xcc, 0xc5, 0xe8, 0xcb, 0xac, 0x5a, 0xbf, 0x36, 0xde, 0xe6, 0xbe, 0x5c, - 0xef, 0xa3, 0x24, 0x46, 0x23, 0x92, 0xd2, 0x96, 0xe8, 0x8b, 0x89, 0xae, - 0x01, 0xde, 0xfc, 0xe3, 0xde, 0xb2, 0x04, 0xab, 0x27, 0x82, 0xec, 0xd4, - 0xdf, 0x0f, 0xb7, 0xa3, 0x5d, 0xb9, 0x61, 0x37, 0x60, 0x7c, 0xb1, 0x4d, - 0x51, 0xec, 0xc7, 0xbe, 0xf3, 0x00, 0xa2, 0xdb, 0x01, 0x42, 0x02, 0x45, - 0x77, 0x12, 0xe1, 0xc1, 0x22, 0xd8, 0x21, 0x91, 0x90, 0x12, 0x41, 0x60, - 0x45, 0xfd, 0x6a, 0x2d, 0x79, 0x1b, 0x4e, 0xcb, 0x33, 0xc4, 0x0f, 0x7e, - 0x5b, 0xb3, 0xec, 0x13, 0x22, 0xad, 0x79, 0x5f, 0x89, 0x1c, 0xeb, 0xcb, - 0x82, 0x0a, 0x6d, 0xbc, 0x6c, 0xea, 0x06, 0x7d, 0x3d, 0xea, 0x48, 0xd8, - 0x62, 0x1f, 0x1d, 0x09, 0xe6, 0xab, 0x69, 0xbd, 0x88, 0x4f, 0x68, 0x3e, - 0x34, 0x80, 0xcf, 0x0c, 0x15, 0x20, 0x5d, 0xae, 0x75, 0x6b, 0xc5, 0xef, - 0x66, 0xfc, 0x67, 0xac, 0x85, 0x7a, 0x30, 0xac, 0xb8, 0x61, 0xfc, 0x4b, - 0x48, 0xa4, 0xcb, 0x6b, 0x98, 0x02, 0x3c, 0x56, 0xff, 0xb0, 0xbb, 0x59, - 0x41, 0x00, 0xd4, 0x6b, 0x21, 0xef, 0x32, 0x86, 0x25, 0x9d, 0xf2, 0xc4, - 0x98, 0x38, 0xea, 0x20, 0x39, 0x9f, 0x97, 0xae, 0xe1, 0x63, 0xf6, 0x5e, - 0x2d, 0x3a, 0x0d, 0xb6, 0xf6, 0x01, 0xec, 0x8c, 0x87, 0x8d, 0x45, 0x00, - 0xa0, 0xa3, 0xfa, 0xe8, 0xf6, 0x60, 0xaa, 0xe9, 0xab, 0xff, 0xfc, 0x6c, - 0x82, 0xcc, 0x8a, 0x57, 0x82, 0x23, 0xf3, 0x26, 0x80, 0xfb, 0xac, 0x42, - 0xc1, 0xc8, 0xe8, 0x99, 0x21, 0xf3, 0xff, 0x61, 0x02, 0xb6, 0xb7, 0x59, - 0x14, 0xd2, 0xb2, 0x5b, 0xae, 0x7e, 0xa6, 0xf0, 0xed, 0x75, 0xdc, 0xe3, - 0x3f, 0x29, 0xed, 0x48, 0x29, 0x2b, 0x7c, 0xdb, 0x50, 0x85, 0x5f, 0xa9, - 0x6f, 0x8c, 0x0a, 0xf5, 0x0e, 0x29, 0x31, 0xc3, 0x7c, 0xb2, 0xe0, 0xf1, - 0x7f, 0x13, 0xa9, 0x13, 0x8b, 0x4d, 0xfb, 0x06, 0x95, 0x32, 0x61, 0xd1, - 0xd5, 0x62, 0xc5, 0x4f, 0xb1, 0xa5, 0xcf, 0xae, 0x46, 0x87, 0xf5, 0xb9, - 0xf9, 0x43, 0x6c, 0x95, 0x5d, 0x79, 0x1e, 0x6c, 0xec, 0x5c, 0x9a, 0x87, - 0x27, 0x1a, 0x00, 0xe1, 0x53, 0x7c, 0x9c, 0xa8, 0xab, 0xa4, 0x1a, 0x35, - 0x63, 0x60, 0x46, 0x95, 0xf3, 0xc1, 0xa2, 0xa5, 0x65, 0xf8, 0xd3, 0xdd, - 0xba, 0x3f, 0x4e, 0x12, 0xd2, 0xab, 0xba, 0xaf, 0x22, 0x2b, 0xe7, 0x54, - 0x61, 0xab, 0x5d, 0xe8, 0xb6, 0xa2, 0xf9, 0x02, 0x16, 0xc8, 0x31, 0x81, - 0xa4, 0xa5, 0x7a, 0x73, 0xea, 0x41, 0x13, 0x7f, 0x44, 0x06, 0x89, 0x38, - 0xd3, 0x1d, 0xaa, 0xb9, 0x4b, 0xd4, 0x61, 0xb0, 0xf2, 0x19, 0x66, 0x1b, - 0xa0, 0x15, 0xbe, 0xac, 0xb2, 0x93, 0x5c, 0x49, 0x6b, 0x3c, 0x89, 0xad, - 0x19, 0x19, 0xf5, 0x16, 0x46, 0xd7, 0x86, 0x77, 0x4a, 0xc7, 0x55, 0xcf, - 0x7a, 0x9b, 0xb4, 0xa5, 0x8a, 0xdd, 0xcf, 0x55, 0xe6, 0xc0, 0x8b, 0x59, - 0x4a, 0x57, 0xd1, 0x14, 0x76, 0x0b, 0xe5, 0xa5, 0xbc, 0xf3, 0xb4, 0x0a, - 0x93, 0xdf, 0x12, 0x44, 0xd9, 0xf8, 0x57, 0x9d, 0x99, 0xc0, 0x39, 0xe0, - 0xab, 0xa7, 0xcf, 0xe5, 0xa6, 0xd4, 0xd9, 0xcf, 0xf0, 0xc6, 0x0c, 0x15, - 0x23, 0x0c, 0x3f, 0xb5, 0xdd, 0xc9, 0x6b, 0xac, 0x06, 0x0c, 0x12, 0x1c, - 0x32, 0x13, 0x2e, 0x4b, 0x30, 0x7d, 0x1e, 0x5a, 0x22, 0x7a, 0x6a, 0x9b, - 0x09, 0xbb, 0x0c, 0xfd, 0x27, 0x02, 0xc9, 0x3d, 0x2c, 0x1b, 0xf6, 0x8a, - 0xbf, 0x99, 0x4b, 0x7b, 0xa6, 0xfd, 0x60, 0x43, 0xfd, 0x7e, 0x61, 0x0e, - 0xc6, 0x6b, 0x8d, 0xa2, 0x36, 0x06, 0xea, 0xf3, 0x72, 0x0b, 0x11, 0xd1, - 0x2f, 0xd6, 0x09, 0x00, 0x0f, 0xd7, 0x98, 0xd7, 0x76, 0x08, 0xa6, 0x01, - 0x13, 0x25, 0x5b, 0x34, 0x33, 0x4f, 0x78, 0x22, 0x60, 0x7f, 0x9d, 0x68, - 0x31, 0xbc, 0x34, 0x6a, 0xb7, 0xbc, 0x5e, 0x47, 0xdb, 0x57, 0xae, 0x08, - 0x10, 0x30, 0x84, 0x2b, 0xf5, 0x63, 0x85, 0x85, 0x90, 0xb8, 0x14, 0xa5, - 0x4d, 0x59, 0x05, 0x91, 0x75, 0xa0, 0xdb, 0x50, 0x04, 0x82, 0xdc, 0x72, - 0x57, 0x3c, 0x65, 0xd6, 0x75, 0x62, 0x02, 0x3b, 0x67, 0xd6, 0xbf, 0x18, - 0xae, 0xc1, 0x07, 0xde, 0xd4, 0x2c, 0x1b, 0x67, 0x78, 0x1f, 0x67, 0x83, - 0x2e, 0x2e, 0x88, 0xf7, 0x3c, 0x87, 0xc2, 0x6a, 0x55, 0x2b, 0x74, 0x32, - 0x7e, 0xa0, 0x46, 0x7d, 0xcb, 0x5d, 0x77, 0x16, 0x45, 0xa2, 0xd9, 0xc9, - 0xfa, 0xcb, 0x25, 0xef, 0x8d, 0x77, 0xd0, 0xe9, 0x9c, 0x81, 0x8b, 0x79, - 0x9a, 0x9e, 0x56, 0x2f, 0xf2, 0x8e, 0x5c, 0x02, 0xdc, 0x51, 0xde, 0x04, - 0x60, 0xf2, 0x17, 0x59, 0xfa, 0xa3, 0x37, 0x09, 0xb1, 0x2a, 0xec, 0x2d, - 0x9c, 0xf3, 0xe7, 0xab, 0x68, 0x2e, 0x50, 0x50, 0xf6, 0x06, 0x90, 0x79, - 0xc3, 0xf1, 0x22, 0x7a, 0xa3, 0xf6, 0x7f, 0xf9, 0x33, 0x5f, 0x0c, 0xb7, - 0x35, 0x60, 0x4c, 0xca, 0x92, 0x8f, 0x2b, 0x21, 0x4e, 0xcf, 0x6c, 0xe3, - 0x47, 0x46, 0x95, 0x03, 0x9b, 0x31, 0x00, 0x1f, 0xe6, 0xc3, 0xc6, 0x10, - 0x2d, 0x4e, 0x25, 0x4e, 0xce, 0xbd, 0xfc, 0x3e, 0x6d, 0x2b, 0x95, 0x09, - 0x0f, 0xd1, 0x58, 0x44, 0xe9, 0x9f, 0x5a, 0xe9, 0x01, 0x6b, 0x8b, 0xca, - 0xdf, 0xda, 0xd6, 0x47, 0x8c, 0x74, 0x90, 0x6a, 0xf1, 0x1a, 0xfe, 0x79, - 0x91, 0x3d, 0x68, 0x9d, 0x56, 0xb1, 0x53, 0x44, 0x9f, 0x7d, 0x5a, 0x31, - 0x85, 0xab, 0xab, 0xa0, 0x3e, 0x3a, 0xdf, 0x0e, 0xcf, 0x06, 0x97, 0xe2, - 0x04, 0x57, 0x3a, 0x6f, 0xde, 0x15, 0x7f, 0x8b, 0x72, 0x40, 0x2c, 0xc9, - 0xf0, 0xa8, 0x73, 0x73, 0x3c, 0x1b, 0x5d, 0x85, 0x85, 0x15, 0x7e, 0x7a, - 0x52, 0x07, 0x4d, 0xa3, 0xac, 0x30, 0xac, 0x65, 0xb3, 0x5b, 0xd0, 0x81, - 0xe1, 0x42, 0x38, 0xb8, 0x30, 0x9d, 0x50, 0xe6, 0x6e, 0x71, 0x8d, 0x01, - 0xc2, 0x44, 0xd7, 0x52, 0xb9, 0xdb, 0x84, 0x2a, 0xdf, 0xc4, 0x1c, 0xf3, - 0xfb, 0xb3, 0x9d, 0x09, 0x47, 0xab, 0x8b, 0x5c, 0x9c, 0x62, 0xd1, 0xd3, - 0xf0, 0x68, 0x00, 0x4f, 0x42, 0x09, 0x94, 0xe8, 0xcb, 0x56, 0x23, 0x48, - 0xe4, 0x99, 0xfc, 0x23, 0xa5, 0xad, 0x5f, 0x9a, 0x07, 0xcf, 0x99, 0x77, - 0x08, 0x10, 0xd7, 0x76, 0xeb, 0x24, 0x53, 0x0d, 0xd3, 0x25, 0xc0, 0x6f, - 0xcf, 0x57, 0x19, 0x36, 0x2d, 0x69, 0xfa, 0x59, 0xc2, 0x4c, 0x35, 0xa2, - 0xc8, 0x6a, 0x8f, 0xe7, 0x9e, 0x3c, 0x72, 0x12, 0xd3, 0x1a, 0x89, 0xc1, - 0xc8, 0xff, 0x6d, 0xf4, 0x58, 0x36, 0x78, 0xb8, 0x1a, 0xa6, 0x84, 0x6b, - 0x5f, 0xad, 0x10, 0x37, 0xec, 0xe1, 0x1b, 0xe4, 0x0c, 0xa3, 0x45, 0xc9, - 0x0e, 0xa9, 0x7c, 0xc9, 0x5e, 0x1c, 0xb3, 0xfa, 0xd9, 0x8d, 0x44, 0x8a, - 0x6e, 0x45, 0x3b, 0x68, 0x51, 0x5a, 0xb2, 0x64, 0x5b, 0x94, 0x4b, 0x9a, - 0xd9, 0xa1, 0x94, 0xc0, 0xff, 0xe5, 0x89, 0x75, 0x4a, 0x63, 0xa0, 0x6b, - 0x9b, 0x6a, 0x96, 0xb8, 0x8b, 0xbe, 0x6e, 0x10, 0x3e, 0x6e, 0xf9, 0x27, - 0xdc, 0x10, 0x5a, 0xc0, 0x5e, 0x51, 0x0a, 0x25, 0x11, 0x6e, 0xf4, 0x91, - 0x4e, 0xb1, 0x4b, 0x3d, 0xcc, 0x62, 0x92, 0x54, 0xb1, 0x96, 0xbb, 0x68, - 0xe2, 0x1f, 0x1c, 0x2a, 0x33, 0xb7, 0xf0, 0xc8, 0x7e, 0x47, 0xfd, 0x76, - 0x95, 0x41, 0x1b, 0xcc, 0x70, 0x1d, 0x40, 0xfc, 0x16, 0x91, 0xf1, 0xa9, - 0xc1, 0x76, 0xd1, 0x85, 0xa0, 0x95, 0xf2, 0xdb, 0x76, 0xb8, 0x8c, 0xf2, - 0x18, 0x62, 0x9f, 0x9e, 0xe2, 0xff, 0x84, 0x3c, 0x3f, 0xdc, 0x75, 0x3b, - 0x49, 0x6b, 0xd4, 0xd9, 0xa6, 0x17, 0x86, 0x53, 0x26, 0x59, 0x78, 0x12, - 0x40, 0x96, 0x88, 0x82, 0xae, 0xdf, 0x84, 0x26, 0xfc, 0xac, 0x50, 0x28, - 0xc1, 0xdd, 0x87, 0x9e, 0xfa, 0x52, 0xda, 0x12, 0x89, 0x83, 0x49, 0x16, - 0x67, 0xf4, 0xc3, 0x25, 0x48, 0x82, 0x64, 0xb4, 0x1b, 0x83, 0xff, 0xc3, - 0x0f, 0xac, 0x5b, 0xde, 0x07, 0x80, 0x77, 0x3c, 0xcd, 0x4e, 0x17, 0xeb, - 0x5c, 0x01, 0x73, 0x46, 0xc8, 0xce, 0xb3, 0xba, 0xb1, 0xf5, 0x8e, 0xc6, - 0xf7, 0x87, 0xd3, 0x8e, 0x6e, 0x2d, 0x20, 0xad, 0xda, 0x7a, 0xbd, 0xb2, - 0x22, 0xb0, 0xcc, 0xef, 0x38, 0x11, 0xe9, 0x52, 0x38, 0x09, 0x5d, 0x63, - 0xfc, 0xd9, 0xce, 0xfc, 0xc5, 0x12, 0x83, 0x1a, 0x49, 0xb5, 0xb0, 0x19, - 0x86, 0x05, 0x04, 0xed, 0xb0, 0x8e, 0xe4, 0x80, 0x37, 0xf4, 0x74, 0x38, - 0x85, 0x3e, 0xc5, 0x99, 0x57, 0xed, 0xfb, 0xee, 0x52, 0x35, 0x6d, 0x69, - 0x64, 0xe9, 0xc0, 0xfe, 0x35, 0xa3, 0xcd, 0x18, 0x4e, 0xe4, 0x94, 0xe4, - 0xf3, 0x66, 0xe2, 0x76, 0x89, 0xf0, 0xe9, 0xcf, 0xce, 0x3b, 0xc3, 0xcd, - 0x8b, 0x7a, 0x1d, 0x36, 0x9c, 0x05, 0xb8, 0x87, 0xd2, 0x13, 0xe6, 0x13, - 0xec, 0xdc, 0x73, 0x2b, 0x90, 0x21, 0x03, 0x24, 0x8a, 0xe5, 0xf9, 0x30, - 0x6f, 0xd9, 0xa1, 0x4c, 0xea, 0xd9, 0xf2, 0x97, 0xfa, 0x2b, 0x0c, 0x51, - 0xd0, 0x63, 0x83, 0x09, 0x57, 0xdf, 0x48, 0xa8, 0x91, 0x83, 0x9d, 0xc9, - 0xe4, 0xa8, 0xee, 0x11, 0xed, 0x03, 0xa4, 0xab, 0x45, 0x4b, 0x45, 0x97, - 0xd0, 0x9c, 0x19, 0xe1, 0xef, 0x72, 0xec, 0x56, 0xdf, 0x9c, 0xb4, 0xcc, - 0xb4, 0x42, 0x5a, 0x85, 0xcb, 0x3e, 0xfe, 0x3c, 0xdc, 0xbf, 0x39, 0xf3, - 0xdb, 0xb0, 0x10, 0xf9, 0x31, 0xa7, 0x17, 0xf6, 0x23, 0xe4, 0xa7, 0xaf, - 0xab, 0x0d, 0xc1, 0x85, 0x18, 0xa3, 0x18, 0xb8, 0x5b, 0x24, 0x85, 0xb4, - 0xcc, 0xca, 0x93, 0x10, 0x60, 0x1b, 0x92, 0x97, 0x09, 0x3c, 0x92, 0x4f, - 0x27, 0x20, 0x04, 0x1d, 0x49, 0x9a, 0x2c, 0xf2, 0xf1, 0xd3, 0x89, 0x96, - 0x49, 0xe0, 0x44, 0x5c, 0x21, 0x20, 0xf0, 0xec, 0x49, 0xc8, 0xcf, 0x7b, - 0x78, 0x38, 0xaf, 0x0a, 0x63, 0x7a, 0x97, 0x70, 0x73, 0xcc, 0x8e, 0x10, - 0x3a, 0xea, 0xfb, 0x23, 0xe2, 0x01, 0x03, 0x67, 0x05, 0x60, 0xe2, 0xf3, - 0x94, 0x91, 0x6d, 0x1e, 0x26, 0xd0, 0xff, 0x12, 0x21, 0x81, 0xd6, 0xd0, - 0x84, 0x3c, 0x28, 0x9a, 0xbe, 0xdc, 0xce, 0xc4, 0x5c, 0xe1, 0xcd, 0x9e, - 0xaf, 0xce, 0x1a, 0x60, 0x67, 0xf8, 0xbf, 0xb5, 0x60, 0x6d, 0x64, 0x2a, - 0x02, 0xa1, 0xe1, 0x43, 0x52, 0x08, 0xbf, 0xd3, 0x2e, 0xfc, 0xeb, 0x9a, - 0x0d, 0xb2, 0x31, 0xea, 0xf4, 0xf1, 0x86, 0x5c, 0x4a, 0x0f, 0x10, 0x29, - 0x9f, 0x39, 0x25, 0x7a, 0xf9, 0x47, 0xa5, 0x88, 0x3b, 0x46, 0xe9, 0xe7, - 0x7f, 0xff, 0xb9, 0x09, 0x4d, 0x55, 0x6f, 0x81, 0x9b, 0xea, 0x2b, 0x10, - 0xca, 0x6d, 0x0b, 0x0e, 0xda, 0x69, 0x69, 0x87, 0x51, 0x00, 0x1a, 0xd2, - 0x34, 0xa8, 0x2d, 0x9f, 0xc3, 0x14, 0x51, 0x97, 0x99, 0xa3, 0x55, 0x31, - 0x02, 0x89, 0x6f, 0x72, 0xb5, 0x3a, 0xcc, 0x2d, 0xd3, 0x25, 0xb2, 0xfa, - 0xf2, 0x03, 0xc9, 0x4d, 0x78, 0x8b, 0xed, 0x02, 0x05, 0x5f, 0x21, 0x17, - 0x07, 0x41, 0xed, 0x53, 0x61, 0xa4, 0xe5, 0x7c, 0x84, 0x78, 0xfb, 0xde, - 0xde, 0xe0, 0x09, 0x2f, 0xcb, 0xc2, 0x47, 0xdd, 0x64, 0x41, 0x6c, 0xe5, - 0x35, 0xb0, 0xb1, 0x14, 0x81, 0x85, 0xb5, 0xe4, 0xa1, 0xaf, 0x3f, 0xe5, - 0x5a, 0x85, 0x4e, 0x38, 0x83, 0x03, 0x98, 0x1b, 0xb3, 0x7c, 0xb7, 0xf8, - 0x3d, 0x7d, 0x23, 0xf7, 0xa0, 0x22, 0xe4, 0x69, 0x37, 0xe9, 0xf0, 0x19, - 0xed, 0xdb, 0xc3, 0x7d, 0x65, 0x98, 0x1d, 0xe8, 0x3a, 0x33, 0xfa, 0x4f, - 0x95, 0xa9, 0x91, 0x03, 0xfd, 0x5c, 0x41, 0x7c, 0x27, 0x8b, 0xe3, 0xf8, - 0x48, 0x2b, 0xa0, 0x13, 0x68, 0x97, 0x5f, 0x33, 0x90, 0x80, 0xac, 0x19, - 0x68, 0x4b, 0x45, 0x88, 0x22, 0x55, 0xab, 0x77, 0x6c, 0x1d, 0x61, 0x23, - 0x31, 0xdd, 0xd7, 0x60, 0xda, 0x9e, 0x52, 0xc1, 0x29, 0xe7, 0xbd, 0xcb, - 0x36, 0xed, 0xa0, 0x83, 0x6e, 0xbc, 0x28, 0x11 -}; -unsigned int test_data_len = 5000; - -unsigned char test_data_enc[] = { - 0x33, 0x73, 0x47, 0x61, 0x66, 0x4d, 0x62, 0x62, 0x32, 0x6a, 0x31, 0x33, - 0x78, 0x54, 0x66, 0x33, 0x4c, 0x50, 0x45, 0x56, 0x52, 0x2b, 0x52, 0x6a, - 0x35, 0x57, 0x68, 0x69, 0x6a, 0x6d, 0x77, 0x4a, 0x76, 0x64, 0x64, 0x30, - 0x2f, 0x48, 0x4d, 0x41, 0x36, 0x49, 0x4c, 0x43, 0x66, 0x48, 0x4d, 0x62, - 0x4a, 0x75, 0x56, 0x7a, 0x61, 0x2f, 0x66, 0x4d, 0x46, 0x66, 0x62, 0x43, - 0x49, 0x59, 0x38, 0x2b, 0x4b, 0x4e, 0x6d, 0x79, 0x6c, 0x71, 0x2b, 0x57, - 0x37, 0x2f, 0x37, 0x4e, 0x0a, 0x4f, 0x6c, 0x56, 0x6f, 0x78, 0x71, 0x72, - 0x6e, 0x2b, 0x6a, 0x59, 0x30, 0x4e, 0x4b, 0x6d, 0x6e, 0x32, 0x52, 0x38, - 0x51, 0x68, 0x5a, 0x6a, 0x56, 0x53, 0x6e, 0x75, 0x49, 0x42, 0x4c, 0x70, - 0x73, 0x4e, 0x74, 0x74, 0x70, 0x4d, 0x62, 0x30, 0x47, 0x63, 0x50, 0x73, - 0x47, 0x4f, 0x6b, 0x74, 0x50, 0x77, 0x68, 0x48, 0x4b, 0x58, 0x54, 0x6f, - 0x52, 0x44, 0x54, 0x6c, 0x41, 0x47, 0x4b, 0x64, 0x61, 0x30, 0x6e, 0x2b, - 0x46, 0x53, 0x73, 0x38, 0x2b, 0x6e, 0x77, 0x49, 0x6b, 0x0a, 0x42, 0x35, - 0x74, 0x6e, 0x48, 0x67, 0x6c, 0x55, 0x7a, 0x36, 0x75, 0x31, 0x47, 0x4b, - 0x72, 0x54, 0x78, 0x37, 0x31, 0x49, 0x31, 0x52, 0x66, 0x6d, 0x46, 0x70, - 0x4f, 0x4e, 0x4c, 0x6f, 0x54, 0x41, 0x6c, 0x33, 0x47, 0x30, 0x61, 0x71, - 0x34, 0x75, 0x43, 0x77, 0x77, 0x45, 0x72, 0x61, 0x34, 0x6f, 0x54, 0x6d, - 0x4d, 0x69, 0x6d, 0x31, 0x4c, 0x39, 0x6e, 0x76, 0x4f, 0x73, 0x56, 0x49, - 0x32, 0x71, 0x35, 0x42, 0x56, 0x6f, 0x4a, 0x57, 0x73, 0x2b, 0x42, 0x39, - 0x59, 0x4b, 0x0a, 0x46, 0x59, 0x38, 0x33, 0x6f, 0x4c, 0x47, 0x2f, 0x30, - 0x43, 0x54, 0x2f, 0x57, 0x48, 0x50, 0x57, 0x7a, 0x63, 0x72, 0x43, 0x4d, - 0x6a, 0x53, 0x30, 0x43, 0x59, 0x33, 0x34, 0x2b, 0x4b, 0x47, 0x70, 0x75, - 0x73, 0x7a, 0x65, 0x47, 0x33, 0x6c, 0x69, 0x31, 0x30, 0x66, 0x50, 0x4d, - 0x6b, 0x69, 0x38, 0x77, 0x57, 0x62, 0x31, 0x68, 0x2f, 0x6a, 0x4e, 0x6f, - 0x46, 0x72, 0x75, 0x54, 0x34, 0x76, 0x78, 0x61, 0x50, 0x6a, 0x30, 0x59, - 0x78, 0x6c, 0x4d, 0x34, 0x44, 0x77, 0x37, 0x0a, 0x47, 0x6d, 0x6d, 0x50, - 0x39, 0x68, 0x66, 0x69, 0x4f, 0x47, 0x78, 0x54, 0x6d, 0x35, 0x42, 0x7a, - 0x48, 0x39, 0x5a, 0x64, 0x66, 0x66, 0x71, 0x33, 0x67, 0x49, 0x50, 0x6f, - 0x65, 0x72, 0x32, 0x45, 0x43, 0x76, 0x2f, 0x66, 0x41, 0x75, 0x34, 0x70, - 0x64, 0x57, 0x34, 0x6c, 0x6e, 0x54, 0x65, 0x51, 0x59, 0x6c, 0x4e, 0x61, - 0x69, 0x4c, 0x6d, 0x4f, 0x57, 0x76, 0x70, 0x66, 0x62, 0x42, 0x2f, 0x74, - 0x6d, 0x6b, 0x74, 0x70, 0x44, 0x74, 0x4a, 0x68, 0x30, 0x78, 0x64, 0x58, - 0x0a, 0x44, 0x46, 0x49, 0x79, 0x51, 0x34, 0x4e, 0x71, 0x4f, 0x30, 0x46, - 0x44, 0x70, 0x4c, 0x36, 0x35, 0x76, 0x64, 0x58, 0x6e, 0x35, 0x62, 0x49, - 0x57, 0x57, 0x62, 0x71, 0x77, 0x39, 0x62, 0x7a, 0x69, 0x57, 0x33, 0x6d, - 0x57, 0x30, 0x71, 0x43, 0x6a, 0x43, 0x48, 0x61, 0x6f, 0x75, 0x2f, 0x2f, - 0x4c, 0x38, 0x68, 0x56, 0x6d, 0x62, 0x45, 0x6d, 0x62, 0x79, 0x38, 0x57, - 0x4e, 0x73, 0x73, 0x62, 0x71, 0x71, 0x68, 0x63, 0x4a, 0x47, 0x78, 0x79, - 0x48, 0x75, 0x57, 0x66, 0x48, 0x0a, 0x68, 0x63, 0x45, 0x34, 0x35, 0x69, - 0x7a, 0x54, 0x43, 0x5a, 0x66, 0x34, 0x34, 0x4e, 0x4b, 0x78, 0x59, 0x6e, - 0x4c, 0x38, 0x65, 0x58, 0x63, 0x31, 0x75, 0x32, 0x35, 0x55, 0x33, 0x4e, - 0x2b, 0x62, 0x7a, 0x30, 0x62, 0x62, 0x73, 0x72, 0x76, 0x35, 0x75, 0x58, - 0x79, 0x6f, 0x36, 0x77, 0x45, 0x75, 0x4e, 0x37, 0x54, 0x39, 0x50, 0x71, - 0x47, 0x43, 0x61, 0x7a, 0x45, 0x59, 0x63, 0x6a, 0x70, 0x56, 0x66, 0x73, - 0x6d, 0x35, 0x79, 0x42, 0x76, 0x63, 0x32, 0x61, 0x41, 0x57, 0x0a, 0x54, - 0x50, 0x31, 0x74, 0x2f, 0x76, 0x42, 0x71, 0x5a, 0x6f, 0x69, 0x35, 0x49, - 0x47, 0x36, 0x31, 0x54, 0x37, 0x7a, 0x62, 0x6c, 0x4c, 0x73, 0x41, 0x53, - 0x71, 0x4d, 0x2f, 0x65, 0x63, 0x44, 0x30, 0x47, 0x4a, 0x4f, 0x68, 0x4c, - 0x65, 0x79, 0x75, 0x58, 0x6b, 0x4c, 0x4b, 0x46, 0x51, 0x46, 0x41, 0x31, - 0x31, 0x6d, 0x51, 0x44, 0x70, 0x49, 0x7a, 0x6d, 0x49, 0x2f, 0x67, 0x61, - 0x4f, 0x54, 0x71, 0x6a, 0x6a, 0x64, 0x77, 0x50, 0x30, 0x71, 0x44, 0x4a, - 0x77, 0x6a, 0x77, 0x0a, 0x78, 0x7a, 0x6b, 0x50, 0x48, 0x43, 0x47, 0x33, - 0x61, 0x79, 0x2b, 0x65, 0x63, 0x79, 0x45, 0x6a, 0x46, 0x68, 0x58, 0x64, - 0x78, 0x4c, 0x37, 0x76, 0x4e, 0x65, 0x72, 0x59, 0x58, 0x71, 0x32, 0x44, - 0x71, 0x52, 0x50, 0x72, 0x51, 0x4a, 0x52, 0x33, 0x6e, 0x39, 0x76, 0x63, - 0x6c, 0x31, 0x51, 0x42, 0x46, 0x56, 0x67, 0x4a, 0x6a, 0x53, 0x45, 0x63, - 0x34, 0x44, 0x72, 0x45, 0x76, 0x58, 0x55, 0x62, 0x37, 0x34, 0x71, 0x31, - 0x65, 0x4b, 0x6f, 0x6a, 0x65, 0x57, 0x6e, 0x4d, 0x0a, 0x46, 0x55, 0x50, - 0x36, 0x5a, 0x66, 0x56, 0x71, 0x79, 0x69, 0x4e, 0x43, 0x66, 0x6f, 0x34, - 0x5a, 0x2b, 0x77, 0x56, 0x44, 0x72, 0x6b, 0x79, 0x4b, 0x35, 0x74, 0x73, - 0x46, 0x77, 0x62, 0x37, 0x56, 0x4d, 0x57, 0x47, 0x72, 0x31, 0x49, 0x36, - 0x4a, 0x49, 0x65, 0x49, 0x62, 0x71, 0x4d, 0x32, 0x67, 0x39, 0x5a, 0x37, - 0x52, 0x41, 0x44, 0x77, 0x46, 0x74, 0x6b, 0x4b, 0x36, 0x55, 0x34, 0x74, - 0x53, 0x61, 0x33, 0x57, 0x5a, 0x64, 0x6a, 0x45, 0x4a, 0x66, 0x35, 0x32, - 0x6c, 0x0a, 0x6f, 0x2b, 0x51, 0x76, 0x52, 0x59, 0x31, 0x2b, 0x4d, 0x74, - 0x41, 0x7a, 0x30, 0x36, 0x54, 0x53, 0x41, 0x57, 0x64, 0x31, 0x43, 0x50, - 0x64, 0x70, 0x6a, 0x70, 0x33, 0x73, 0x59, 0x33, 0x47, 0x6f, 0x50, 0x4d, - 0x77, 0x73, 0x46, 0x53, 0x51, 0x2b, 0x5a, 0x73, 0x30, 0x6b, 0x37, 0x6e, - 0x69, 0x38, 0x59, 0x45, 0x7a, 0x55, 0x53, 0x38, 0x46, 0x51, 0x52, 0x4c, - 0x36, 0x30, 0x59, 0x4c, 0x6b, 0x69, 0x47, 0x78, 0x49, 0x7a, 0x4e, 0x42, - 0x75, 0x70, 0x42, 0x4a, 0x38, 0x42, 0x0a, 0x61, 0x39, 0x30, 0x66, 0x54, - 0x47, 0x53, 0x59, 0x42, 0x62, 0x68, 0x2f, 0x73, 0x30, 0x48, 0x52, 0x37, - 0x74, 0x6a, 0x76, 0x74, 0x6d, 0x45, 0x33, 0x49, 0x6a, 0x6d, 0x6c, 0x46, - 0x67, 0x36, 0x64, 0x6b, 0x33, 0x52, 0x76, 0x4d, 0x76, 0x43, 0x78, 0x45, - 0x77, 0x42, 0x34, 0x4a, 0x5a, 0x61, 0x51, 0x7a, 0x34, 0x2f, 0x68, 0x47, - 0x71, 0x43, 0x42, 0x78, 0x5a, 0x59, 0x61, 0x6e, 0x49, 0x6d, 0x55, 0x78, - 0x38, 0x4e, 0x4d, 0x37, 0x4f, 0x57, 0x6c, 0x73, 0x6b, 0x31, 0x73, 0x0a, - 0x44, 0x34, 0x30, 0x4a, 0x4e, 0x49, 0x35, 0x55, 0x77, 0x37, 0x74, 0x52, - 0x74, 0x7a, 0x36, 0x43, 0x32, 0x6c, 0x38, 0x68, 0x6a, 0x2f, 0x4e, 0x6f, - 0x67, 0x6a, 0x50, 0x4c, 0x5a, 0x48, 0x47, 0x63, 0x33, 0x36, 0x76, 0x36, - 0x74, 0x46, 0x66, 0x5a, 0x42, 0x33, 0x69, 0x69, 0x36, 0x4b, 0x61, 0x36, - 0x6a, 0x45, 0x67, 0x76, 0x73, 0x35, 0x59, 0x63, 0x48, 0x61, 0x51, 0x63, - 0x34, 0x42, 0x56, 0x75, 0x78, 0x49, 0x44, 0x58, 0x54, 0x58, 0x6a, 0x4f, - 0x6d, 0x6e, 0x63, 0x71, 0x0a, 0x6b, 0x4f, 0x54, 0x65, 0x5a, 0x6f, 0x68, - 0x55, 0x32, 0x68, 0x51, 0x2f, 0x41, 0x6a, 0x42, 0x6e, 0x49, 0x35, 0x52, - 0x32, 0x77, 0x79, 0x6a, 0x6b, 0x47, 0x37, 0x38, 0x33, 0x45, 0x77, 0x2f, - 0x4a, 0x71, 0x64, 0x31, 0x31, 0x59, 0x30, 0x45, 0x48, 0x66, 0x4b, 0x33, - 0x61, 0x73, 0x6d, 0x4b, 0x63, 0x72, 0x78, 0x31, 0x4c, 0x52, 0x6e, 0x45, - 0x57, 0x79, 0x4c, 0x51, 0x45, 0x59, 0x71, 0x4d, 0x63, 0x42, 0x74, 0x31, - 0x59, 0x4f, 0x72, 0x69, 0x44, 0x53, 0x78, 0x79, 0x6f, 0x0a, 0x65, 0x36, - 0x69, 0x63, 0x4e, 0x68, 0x6f, 0x42, 0x49, 0x35, 0x6b, 0x51, 0x39, 0x68, - 0x30, 0x65, 0x4c, 0x6f, 0x44, 0x6b, 0x52, 0x6f, 0x6f, 0x77, 0x51, 0x73, - 0x4a, 0x49, 0x47, 0x48, 0x41, 0x71, 0x59, 0x46, 0x4c, 0x41, 0x56, 0x63, - 0x44, 0x76, 0x4b, 0x69, 0x31, 0x45, 0x58, 0x75, 0x70, 0x33, 0x64, 0x49, - 0x48, 0x65, 0x37, 0x58, 0x52, 0x49, 0x72, 0x43, 0x66, 0x35, 0x58, 0x66, - 0x2b, 0x79, 0x71, 0x39, 0x6c, 0x72, 0x41, 0x31, 0x71, 0x66, 0x61, 0x6e, - 0x31, 0x37, 0x0a, 0x42, 0x61, 0x31, 0x32, 0x55, 0x5a, 0x7a, 0x42, 0x52, - 0x6f, 0x61, 0x62, 0x65, 0x33, 0x32, 0x51, 0x56, 0x78, 0x51, 0x31, 0x2b, - 0x4b, 0x53, 0x32, 0x74, 0x38, 0x30, 0x5a, 0x43, 0x6f, 0x59, 0x33, 0x61, - 0x73, 0x50, 0x70, 0x36, 0x33, 0x68, 0x33, 0x54, 0x51, 0x59, 0x4b, 0x72, - 0x51, 0x72, 0x73, 0x32, 0x32, 0x37, 0x6c, 0x33, 0x46, 0x69, 0x36, 0x5a, - 0x62, 0x38, 0x42, 0x64, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x67, 0x6b, 0x6c, - 0x5a, 0x45, 0x55, 0x52, 0x31, 0x4a, 0x33, 0x0a, 0x73, 0x51, 0x49, 0x5a, - 0x65, 0x58, 0x69, 0x76, 0x63, 0x7a, 0x65, 0x4d, 0x37, 0x51, 0x64, 0x75, - 0x5a, 0x50, 0x37, 0x65, 0x4b, 0x53, 0x30, 0x70, 0x6c, 0x55, 0x37, 0x49, - 0x45, 0x6d, 0x57, 0x4d, 0x6b, 0x33, 0x2b, 0x6e, 0x33, 0x6f, 0x67, 0x44, - 0x75, 0x52, 0x52, 0x65, 0x77, 0x6f, 0x79, 0x58, 0x69, 0x4f, 0x51, 0x77, - 0x4f, 0x73, 0x67, 0x41, 0x55, 0x69, 0x5a, 0x68, 0x6d, 0x49, 0x72, 0x63, - 0x57, 0x52, 0x76, 0x4a, 0x6d, 0x48, 0x58, 0x78, 0x76, 0x38, 0x42, 0x35, - 0x0a, 0x34, 0x47, 0x55, 0x70, 0x30, 0x73, 0x5a, 0x52, 0x4d, 0x32, 0x65, - 0x76, 0x44, 0x38, 0x73, 0x61, 0x69, 0x63, 0x37, 0x35, 0x4a, 0x79, 0x30, - 0x6a, 0x77, 0x31, 0x59, 0x48, 0x74, 0x72, 0x6c, 0x30, 0x43, 0x70, 0x44, - 0x4d, 0x52, 0x31, 0x50, 0x50, 0x64, 0x36, 0x65, 0x64, 0x41, 0x38, 0x5a, - 0x7a, 0x7a, 0x6a, 0x37, 0x46, 0x57, 0x2f, 0x7a, 0x49, 0x61, 0x68, 0x67, - 0x4a, 0x72, 0x43, 0x64, 0x6d, 0x47, 0x48, 0x71, 0x36, 0x6e, 0x6a, 0x33, - 0x52, 0x43, 0x74, 0x33, 0x43, 0x0a, 0x48, 0x6b, 0x41, 0x67, 0x38, 0x51, - 0x56, 0x6d, 0x75, 0x30, 0x79, 0x67, 0x4b, 0x39, 0x43, 0x4c, 0x55, 0x38, - 0x73, 0x31, 0x52, 0x61, 0x4d, 0x4f, 0x64, 0x59, 0x76, 0x71, 0x4a, 0x38, - 0x79, 0x79, 0x6f, 0x39, 0x64, 0x39, 0x72, 0x32, 0x44, 0x4c, 0x59, 0x71, - 0x73, 0x73, 0x4a, 0x4a, 0x4d, 0x70, 0x70, 0x33, 0x48, 0x74, 0x5a, 0x69, - 0x61, 0x59, 0x72, 0x38, 0x6c, 0x72, 0x66, 0x56, 0x66, 0x45, 0x54, 0x37, - 0x64, 0x49, 0x67, 0x51, 0x77, 0x61, 0x77, 0x33, 0x37, 0x65, 0x0a, 0x4d, - 0x2f, 0x38, 0x53, 0x37, 0x4f, 0x6c, 0x73, 0x4c, 0x38, 0x31, 0x6e, 0x46, - 0x6f, 0x42, 0x6e, 0x49, 0x57, 0x73, 0x4a, 0x6a, 0x52, 0x75, 0x6b, 0x30, - 0x4f, 0x78, 0x6a, 0x42, 0x38, 0x49, 0x34, 0x55, 0x4d, 0x31, 0x36, 0x77, - 0x2b, 0x56, 0x44, 0x48, 0x64, 0x41, 0x69, 0x68, 0x6b, 0x2b, 0x6a, 0x68, - 0x41, 0x65, 0x79, 0x77, 0x33, 0x32, 0x4f, 0x74, 0x4c, 0x45, 0x64, 0x34, - 0x48, 0x4d, 0x62, 0x2b, 0x57, 0x2f, 0x4a, 0x59, 0x4b, 0x5a, 0x34, 0x4e, - 0x47, 0x42, 0x6d, 0x0a, 0x30, 0x55, 0x63, 0x6d, 0x65, 0x42, 0x45, 0x6b, - 0x4f, 0x53, 0x63, 0x7a, 0x72, 0x6a, 0x69, 0x57, 0x6c, 0x33, 0x77, 0x55, - 0x66, 0x63, 0x56, 0x30, 0x31, 0x4b, 0x2b, 0x7a, 0x66, 0x53, 0x68, 0x68, - 0x35, 0x53, 0x48, 0x41, 0x75, 0x74, 0x7a, 0x50, 0x56, 0x62, 0x6f, 0x71, - 0x62, 0x38, 0x77, 0x70, 0x6c, 0x6c, 0x37, 0x4b, 0x4e, 0x58, 0x79, 0x38, - 0x6b, 0x2f, 0x43, 0x6f, 0x2b, 0x41, 0x6e, 0x42, 0x70, 0x66, 0x47, 0x79, - 0x42, 0x57, 0x53, 0x68, 0x2b, 0x45, 0x4e, 0x69, 0x0a, 0x36, 0x73, 0x34, - 0x71, 0x77, 0x70, 0x58, 0x4d, 0x45, 0x51, 0x76, 0x32, 0x2f, 0x32, 0x5a, - 0x51, 0x38, 0x50, 0x37, 0x52, 0x6c, 0x61, 0x58, 0x52, 0x69, 0x70, 0x55, - 0x41, 0x61, 0x30, 0x6f, 0x63, 0x46, 0x4e, 0x31, 0x39, 0x39, 0x70, 0x63, - 0x48, 0x76, 0x6a, 0x74, 0x39, 0x57, 0x45, 0x34, 0x4a, 0x37, 0x5a, 0x73, - 0x54, 0x62, 0x73, 0x72, 0x4b, 0x2b, 0x57, 0x59, 0x50, 0x77, 0x79, 0x72, - 0x74, 0x30, 0x65, 0x63, 0x2b, 0x55, 0x67, 0x7a, 0x65, 0x44, 0x65, 0x4d, - 0x43, 0x0a, 0x54, 0x53, 0x6d, 0x73, 0x72, 0x70, 0x2b, 0x34, 0x73, 0x55, - 0x59, 0x38, 0x70, 0x4b, 0x30, 0x6e, 0x64, 0x7a, 0x6c, 0x43, 0x78, 0x77, - 0x6b, 0x4b, 0x45, 0x70, 0x48, 0x39, 0x50, 0x74, 0x51, 0x41, 0x45, 0x35, - 0x76, 0x57, 0x35, 0x38, 0x69, 0x49, 0x4e, 0x58, 0x74, 0x6c, 0x4a, 0x70, - 0x52, 0x30, 0x57, 0x52, 0x71, 0x66, 0x77, 0x54, 0x71, 0x6b, 0x53, 0x69, - 0x76, 0x77, 0x71, 0x6e, 0x37, 0x4a, 0x66, 0x49, 0x2b, 0x2f, 0x46, 0x54, - 0x4b, 0x39, 0x6a, 0x62, 0x4f, 0x6b, 0x0a, 0x6a, 0x68, 0x38, 0x56, 0x48, - 0x55, 0x76, 0x61, 0x39, 0x43, 0x43, 0x6c, 0x7a, 0x41, 0x6e, 0x44, 0x47, - 0x42, 0x68, 0x2b, 0x79, 0x37, 0x4d, 0x34, 0x56, 0x67, 0x64, 0x6e, 0x64, - 0x56, 0x31, 0x54, 0x33, 0x6f, 0x2f, 0x4a, 0x52, 0x61, 0x79, 0x65, 0x73, - 0x71, 0x6c, 0x48, 0x73, 0x47, 0x47, 0x48, 0x6f, 0x44, 0x6d, 0x50, 0x68, - 0x74, 0x36, 0x6a, 0x77, 0x38, 0x68, 0x32, 0x6e, 0x4d, 0x4a, 0x31, 0x41, - 0x6f, 0x46, 0x38, 0x7a, 0x79, 0x43, 0x59, 0x78, 0x77, 0x58, 0x39, 0x0a, - 0x70, 0x69, 0x38, 0x6f, 0x32, 0x35, 0x61, 0x6b, 0x72, 0x51, 0x58, 0x58, - 0x73, 0x6c, 0x58, 0x76, 0x4f, 0x36, 0x4d, 0x77, 0x65, 0x6a, 0x49, 0x30, - 0x54, 0x6d, 0x7a, 0x54, 0x59, 0x35, 0x79, 0x46, 0x69, 0x4b, 0x4f, 0x61, - 0x46, 0x4e, 0x74, 0x74, 0x70, 0x61, 0x71, 0x69, 0x52, 0x54, 0x37, 0x4b, - 0x6c, 0x5a, 0x5a, 0x64, 0x4a, 0x74, 0x43, 0x4c, 0x48, 0x76, 0x4d, 0x61, - 0x50, 0x2b, 0x48, 0x4b, 0x4a, 0x41, 0x6e, 0x42, 0x6d, 0x68, 0x71, 0x37, - 0x75, 0x6f, 0x52, 0x77, 0x0a, 0x47, 0x35, 0x73, 0x77, 0x33, 0x44, 0x4d, - 0x57, 0x74, 0x52, 0x63, 0x33, 0x6b, 0x48, 0x67, 0x57, 0x4c, 0x41, 0x6b, - 0x6b, 0x54, 0x74, 0x79, 0x44, 0x56, 0x52, 0x50, 0x6f, 0x47, 0x55, 0x6e, - 0x36, 0x75, 0x42, 0x6d, 0x4f, 0x67, 0x42, 0x6a, 0x6e, 0x69, 0x61, 0x66, - 0x68, 0x69, 0x44, 0x45, 0x55, 0x31, 0x63, 0x62, 0x66, 0x35, 0x31, 0x36, - 0x56, 0x6e, 0x6b, 0x67, 0x6b, 0x33, 0x51, 0x6b, 0x6f, 0x30, 0x62, 0x76, - 0x67, 0x59, 0x62, 0x73, 0x71, 0x64, 0x72, 0x2f, 0x6c, 0x0a, 0x4b, 0x43, - 0x45, 0x4f, 0x62, 0x32, 0x79, 0x57, 0x75, 0x2f, 0x41, 0x6c, 0x5a, 0x76, - 0x36, 0x79, 0x49, 0x67, 0x64, 0x33, 0x39, 0x52, 0x45, 0x2b, 0x70, 0x78, - 0x30, 0x53, 0x56, 0x51, 0x4e, 0x49, 0x79, 0x61, 0x36, 0x30, 0x68, 0x6b, - 0x54, 0x78, 0x4e, 0x2b, 0x61, 0x53, 0x79, 0x45, 0x33, 0x47, 0x74, 0x4b, - 0x6b, 0x53, 0x78, 0x75, 0x67, 0x51, 0x53, 0x4a, 0x48, 0x71, 0x34, 0x7a, - 0x68, 0x41, 0x68, 0x69, 0x64, 0x44, 0x48, 0x64, 0x38, 0x30, 0x75, 0x33, - 0x70, 0x6b, 0x0a, 0x38, 0x48, 0x34, 0x41, 0x65, 0x53, 0x51, 0x37, 0x61, - 0x78, 0x59, 0x72, 0x48, 0x5a, 0x53, 0x31, 0x78, 0x65, 0x63, 0x57, 0x59, - 0x71, 0x77, 0x51, 0x75, 0x75, 0x43, 0x44, 0x66, 0x74, 0x64, 0x41, 0x30, - 0x6d, 0x38, 0x38, 0x53, 0x53, 0x4a, 0x50, 0x4e, 0x49, 0x4a, 0x56, 0x31, - 0x72, 0x46, 0x57, 0x53, 0x6f, 0x32, 0x50, 0x4e, 0x49, 0x4a, 0x6d, 0x6b, - 0x6c, 0x6a, 0x78, 0x41, 0x57, 0x63, 0x4e, 0x72, 0x4e, 0x74, 0x62, 0x79, - 0x37, 0x7a, 0x6e, 0x31, 0x32, 0x68, 0x43, 0x0a, 0x74, 0x30, 0x63, 0x38, - 0x59, 0x34, 0x77, 0x7a, 0x6c, 0x44, 0x62, 0x36, 0x57, 0x67, 0x77, 0x64, - 0x65, 0x6b, 0x59, 0x6d, 0x62, 0x4c, 0x51, 0x53, 0x41, 0x59, 0x6d, 0x72, - 0x4e, 0x6e, 0x67, 0x46, 0x64, 0x64, 0x70, 0x6a, 0x39, 0x4f, 0x59, 0x67, - 0x4e, 0x32, 0x35, 0x52, 0x36, 0x6e, 0x71, 0x6c, 0x33, 0x64, 0x37, 0x49, - 0x64, 0x47, 0x59, 0x6e, 0x42, 0x56, 0x61, 0x62, 0x76, 0x77, 0x55, 0x78, - 0x64, 0x77, 0x2b, 0x54, 0x74, 0x78, 0x57, 0x34, 0x49, 0x42, 0x4f, 0x44, - 0x0a, 0x43, 0x2b, 0x4c, 0x6d, 0x4e, 0x6a, 0x36, 0x4a, 0x38, 0x44, 0x76, - 0x6a, 0x57, 0x37, 0x2b, 0x4f, 0x75, 0x44, 0x4e, 0x65, 0x51, 0x38, 0x6e, - 0x42, 0x33, 0x5a, 0x72, 0x4e, 0x6d, 0x31, 0x70, 0x59, 0x4c, 0x6d, 0x35, - 0x51, 0x31, 0x42, 0x4e, 0x6b, 0x42, 0x30, 0x5a, 0x2b, 0x67, 0x34, 0x41, - 0x7a, 0x51, 0x39, 0x4f, 0x6e, 0x48, 0x67, 0x63, 0x73, 0x72, 0x77, 0x50, - 0x56, 0x48, 0x33, 0x32, 0x56, 0x39, 0x48, 0x41, 0x49, 0x71, 0x36, 0x6b, - 0x32, 0x2f, 0x2f, 0x4c, 0x46, 0x0a, 0x76, 0x49, 0x4a, 0x65, 0x64, 0x59, - 0x72, 0x51, 0x4d, 0x76, 0x76, 0x30, 0x4e, 0x45, 0x52, 0x43, 0x51, 0x6e, - 0x62, 0x4f, 0x4a, 0x30, 0x4b, 0x54, 0x4b, 0x56, 0x51, 0x68, 0x46, 0x43, - 0x6f, 0x76, 0x6b, 0x39, 0x67, 0x71, 0x36, 0x50, 0x68, 0x45, 0x37, 0x45, - 0x79, 0x4c, 0x32, 0x2b, 0x6e, 0x63, 0x4f, 0x44, 0x58, 0x4b, 0x75, 0x44, - 0x53, 0x66, 0x37, 0x44, 0x49, 0x6b, 0x32, 0x6b, 0x56, 0x76, 0x64, 0x45, - 0x31, 0x43, 0x6f, 0x35, 0x77, 0x59, 0x37, 0x70, 0x45, 0x6c, 0x0a, 0x45, - 0x61, 0x36, 0x38, 0x6c, 0x45, 0x67, 0x4f, 0x6d, 0x6b, 0x39, 0x62, 0x59, - 0x45, 0x46, 0x32, 0x47, 0x67, 0x61, 0x75, 0x47, 0x67, 0x39, 0x58, 0x49, - 0x2b, 0x6a, 0x4e, 0x41, 0x4d, 0x62, 0x43, 0x67, 0x36, 0x49, 0x32, 0x6b, - 0x45, 0x33, 0x78, 0x34, 0x33, 0x37, 0x61, 0x39, 0x76, 0x38, 0x32, 0x4e, - 0x78, 0x42, 0x34, 0x34, 0x6c, 0x39, 0x5a, 0x66, 0x41, 0x66, 0x70, 0x35, - 0x6a, 0x78, 0x36, 0x50, 0x4c, 0x2b, 0x4a, 0x67, 0x4d, 0x34, 0x48, 0x79, - 0x72, 0x7a, 0x75, 0x0a, 0x56, 0x41, 0x6b, 0x53, 0x6f, 0x51, 0x38, 0x30, - 0x34, 0x39, 0x36, 0x4f, 0x6c, 0x74, 0x2f, 0x6c, 0x4e, 0x6d, 0x69, 0x30, - 0x4f, 0x6d, 0x31, 0x52, 0x6c, 0x70, 0x73, 0x51, 0x32, 0x33, 0x34, 0x78, - 0x49, 0x74, 0x4a, 0x67, 0x50, 0x69, 0x39, 0x6a, 0x75, 0x45, 0x42, 0x57, - 0x54, 0x44, 0x32, 0x75, 0x75, 0x6a, 0x73, 0x47, 0x5a, 0x6a, 0x48, 0x49, - 0x70, 0x79, 0x76, 0x71, 0x6f, 0x63, 0x53, 0x4d, 0x67, 0x46, 0x2f, 0x4d, - 0x68, 0x63, 0x54, 0x55, 0x78, 0x58, 0x65, 0x7a, 0x0a, 0x4d, 0x42, 0x2f, - 0x2b, 0x35, 0x68, 0x6c, 0x4b, 0x6c, 0x55, 0x46, 0x58, 0x58, 0x4c, 0x52, - 0x7a, 0x58, 0x58, 0x68, 0x48, 0x41, 0x69, 0x69, 0x52, 0x5a, 0x7a, 0x72, - 0x51, 0x68, 0x69, 0x4f, 0x70, 0x64, 0x42, 0x41, 0x56, 0x65, 0x58, 0x45, - 0x32, 0x62, 0x66, 0x53, 0x7a, 0x69, 0x62, 0x4e, 0x33, 0x70, 0x66, 0x42, - 0x66, 0x4e, 0x34, 0x6e, 0x44, 0x37, 0x4d, 0x2b, 0x41, 0x4b, 0x77, 0x75, - 0x5a, 0x30, 0x2b, 0x55, 0x5a, 0x49, 0x35, 0x53, 0x46, 0x48, 0x77, 0x63, - 0x39, 0x0a, 0x47, 0x54, 0x70, 0x67, 0x71, 0x6e, 0x48, 0x37, 0x38, 0x52, - 0x63, 0x39, 0x32, 0x51, 0x64, 0x43, 0x6b, 0x76, 0x58, 0x46, 0x73, 0x6c, - 0x4e, 0x51, 0x66, 0x41, 0x42, 0x46, 0x74, 0x51, 0x57, 0x68, 0x2b, 0x41, - 0x4b, 0x52, 0x62, 0x70, 0x34, 0x76, 0x57, 0x30, 0x4a, 0x49, 0x41, 0x52, - 0x4a, 0x54, 0x65, 0x62, 0x34, 0x76, 0x47, 0x41, 0x36, 0x67, 0x6a, 0x53, - 0x49, 0x62, 0x2f, 0x56, 0x45, 0x7a, 0x56, 0x68, 0x59, 0x76, 0x4c, 0x6a, - 0x68, 0x31, 0x58, 0x38, 0x31, 0x59, 0x0a, 0x6f, 0x51, 0x77, 0x6e, 0x4e, - 0x51, 0x77, 0x6e, 0x62, 0x66, 0x70, 0x58, 0x6d, 0x52, 0x54, 0x75, 0x34, - 0x63, 0x74, 0x53, 0x31, 0x2b, 0x34, 0x50, 0x4a, 0x50, 0x41, 0x79, 0x38, - 0x32, 0x2b, 0x43, 0x59, 0x35, 0x6d, 0x6a, 0x31, 0x39, 0x65, 0x43, 0x2f, - 0x38, 0x4c, 0x5a, 0x5a, 0x6d, 0x6b, 0x6e, 0x63, 0x79, 0x51, 0x33, 0x72, - 0x50, 0x38, 0x68, 0x6c, 0x30, 0x72, 0x35, 0x75, 0x6e, 0x55, 0x74, 0x69, - 0x55, 0x6b, 0x31, 0x53, 0x67, 0x63, 0x5a, 0x31, 0x34, 0x50, 0x42, 0x0a, - 0x69, 0x57, 0x64, 0x71, 0x56, 0x33, 0x72, 0x34, 0x4b, 0x47, 0x4c, 0x54, - 0x70, 0x69, 0x61, 0x4e, 0x68, 0x65, 0x61, 0x77, 0x6b, 0x52, 0x44, 0x30, - 0x76, 0x57, 0x56, 0x61, 0x6e, 0x6d, 0x49, 0x77, 0x42, 0x31, 0x31, 0x7a, - 0x76, 0x53, 0x6d, 0x76, 0x61, 0x4c, 0x2b, 0x4e, 0x62, 0x36, 0x75, 0x72, - 0x2b, 0x54, 0x36, 0x4f, 0x61, 0x75, 0x54, 0x37, 0x44, 0x37, 0x6e, 0x4a, - 0x36, 0x65, 0x69, 0x2b, 0x73, 0x57, 0x36, 0x42, 0x78, 0x37, 0x65, 0x76, - 0x78, 0x2f, 0x66, 0x45, 0x0a, 0x42, 0x79, 0x77, 0x56, 0x72, 0x37, 0x51, - 0x51, 0x39, 0x58, 0x67, 0x50, 0x55, 0x68, 0x30, 0x73, 0x31, 0x4c, 0x63, - 0x49, 0x79, 0x62, 0x71, 0x61, 0x2b, 0x6b, 0x61, 0x47, 0x46, 0x6e, 0x71, - 0x4e, 0x49, 0x62, 0x61, 0x78, 0x74, 0x64, 0x53, 0x4b, 0x7a, 0x42, 0x59, - 0x71, 0x46, 0x2b, 0x76, 0x4e, 0x73, 0x37, 0x43, 0x77, 0x34, 0x58, 0x55, - 0x4a, 0x46, 0x57, 0x58, 0x59, 0x62, 0x48, 0x50, 0x38, 0x37, 0x53, 0x38, - 0x6b, 0x75, 0x2f, 0x75, 0x38, 0x71, 0x76, 0x54, 0x31, 0x0a, 0x4c, 0x76, - 0x6b, 0x4c, 0x76, 0x72, 0x68, 0x4a, 0x66, 0x66, 0x53, 0x46, 0x72, 0x69, - 0x71, 0x34, 0x42, 0x6a, 0x4e, 0x7a, 0x58, 0x7a, 0x42, 0x69, 0x32, 0x38, - 0x43, 0x7a, 0x49, 0x65, 0x74, 0x4c, 0x4d, 0x77, 0x68, 0x53, 0x6b, 0x64, - 0x79, 0x64, 0x38, 0x58, 0x41, 0x43, 0x52, 0x34, 0x51, 0x61, 0x70, 0x64, - 0x32, 0x63, 0x61, 0x59, 0x2f, 0x78, 0x6c, 0x35, 0x4c, 0x59, 0x76, 0x69, - 0x4c, 0x79, 0x6b, 0x51, 0x37, 0x4b, 0x52, 0x73, 0x45, 0x68, 0x6e, 0x35, - 0x4f, 0x35, 0x0a, 0x69, 0x62, 0x65, 0x37, 0x69, 0x42, 0x43, 0x6a, 0x65, - 0x4b, 0x64, 0x42, 0x36, 0x68, 0x4e, 0x2f, 0x61, 0x6d, 0x4c, 0x45, 0x55, - 0x6b, 0x2f, 0x79, 0x6a, 0x42, 0x62, 0x77, 0x4d, 0x67, 0x68, 0x73, 0x57, - 0x4e, 0x69, 0x35, 0x6e, 0x51, 0x4a, 0x6f, 0x57, 0x53, 0x59, 0x76, 0x73, - 0x58, 0x42, 0x73, 0x77, 0x59, 0x79, 0x38, 0x6f, 0x33, 0x34, 0x50, 0x66, - 0x4c, 0x4a, 0x50, 0x78, 0x54, 0x37, 0x76, 0x37, 0x4b, 0x48, 0x47, 0x69, - 0x6a, 0x55, 0x5a, 0x7a, 0x43, 0x54, 0x63, 0x0a, 0x76, 0x69, 0x51, 0x77, - 0x6a, 0x50, 0x49, 0x61, 0x69, 0x49, 0x33, 0x6d, 0x65, 0x74, 0x44, 0x46, - 0x46, 0x7a, 0x77, 0x64, 0x35, 0x72, 0x54, 0x66, 0x59, 0x75, 0x7a, 0x38, - 0x46, 0x4c, 0x4d, 0x76, 0x41, 0x39, 0x62, 0x49, 0x63, 0x30, 0x4d, 0x53, - 0x46, 0x55, 0x52, 0x53, 0x36, 0x38, 0x6b, 0x71, 0x65, 0x32, 0x77, 0x2b, - 0x67, 0x6c, 0x4b, 0x76, 0x4c, 0x2f, 0x69, 0x6f, 0x31, 0x63, 0x7a, 0x48, - 0x6a, 0x2f, 0x32, 0x39, 0x74, 0x37, 0x37, 0x53, 0x6c, 0x47, 0x6f, 0x42, - 0x0a, 0x66, 0x4b, 0x37, 0x78, 0x4b, 0x71, 0x73, 0x4d, 0x77, 0x6e, 0x70, - 0x69, 0x65, 0x6c, 0x64, 0x7a, 0x4c, 0x6d, 0x77, 0x63, 0x4a, 0x52, 0x66, - 0x59, 0x52, 0x35, 0x4b, 0x62, 0x37, 0x4d, 0x31, 0x7a, 0x57, 0x41, 0x79, - 0x62, 0x54, 0x58, 0x6d, 0x58, 0x45, 0x4b, 0x64, 0x48, 0x34, 0x7a, 0x4f, - 0x36, 0x2b, 0x4a, 0x33, 0x73, 0x53, 0x73, 0x37, 0x33, 0x71, 0x33, 0x69, - 0x61, 0x58, 0x6c, 0x46, 0x6a, 0x47, 0x74, 0x56, 0x48, 0x45, 0x42, 0x38, - 0x70, 0x62, 0x56, 0x51, 0x47, 0x0a, 0x75, 0x62, 0x6e, 0x59, 0x31, 0x57, - 0x43, 0x49, 0x77, 0x34, 0x53, 0x57, 0x43, 0x52, 0x6a, 0x57, 0x49, 0x4b, - 0x58, 0x61, 0x4b, 0x35, 0x33, 0x4b, 0x36, 0x32, 0x6c, 0x55, 0x55, 0x4b, - 0x36, 0x58, 0x41, 0x6b, 0x77, 0x55, 0x68, 0x59, 0x6c, 0x47, 0x54, 0x76, - 0x77, 0x4d, 0x63, 0x58, 0x65, 0x49, 0x73, 0x77, 0x7a, 0x38, 0x55, 0x50, - 0x2f, 0x31, 0x71, 0x59, 0x39, 0x66, 0x36, 0x52, 0x30, 0x48, 0x37, 0x66, - 0x62, 0x64, 0x34, 0x4f, 0x76, 0x42, 0x53, 0x69, 0x58, 0x48, 0x0a, 0x79, - 0x6e, 0x73, 0x51, 0x6a, 0x35, 0x77, 0x52, 0x38, 0x79, 0x50, 0x6d, 0x49, - 0x4f, 0x49, 0x54, 0x4e, 0x4f, 0x4b, 0x49, 0x56, 0x48, 0x65, 0x37, 0x6d, - 0x6a, 0x65, 0x6c, 0x52, 0x39, 0x34, 0x77, 0x6f, 0x42, 0x37, 0x5a, 0x69, - 0x48, 0x4e, 0x4d, 0x42, 0x63, 0x35, 0x59, 0x36, 0x7a, 0x4b, 0x48, 0x5a, - 0x31, 0x70, 0x58, 0x77, 0x6a, 0x67, 0x4f, 0x78, 0x67, 0x43, 0x6b, 0x4e, - 0x34, 0x32, 0x4a, 0x66, 0x36, 0x6d, 0x36, 0x43, 0x5a, 0x39, 0x41, 0x64, - 0x47, 0x48, 0x6c, 0x0a, 0x59, 0x54, 0x72, 0x75, 0x74, 0x48, 0x55, 0x57, - 0x45, 0x35, 0x36, 0x59, 0x47, 0x35, 0x2b, 0x53, 0x46, 0x4e, 0x41, 0x4a, - 0x6e, 0x7a, 0x50, 0x44, 0x4b, 0x64, 0x71, 0x73, 0x57, 0x7a, 0x32, 0x73, - 0x39, 0x58, 0x4f, 0x4a, 0x39, 0x36, 0x41, 0x68, 0x71, 0x2f, 0x45, 0x37, - 0x6c, 0x66, 0x38, 0x6b, 0x64, 0x71, 0x62, 0x6d, 0x42, 0x75, 0x7a, 0x2b, - 0x7a, 0x6c, 0x65, 0x34, 0x61, 0x46, 0x31, 0x7a, 0x70, 0x61, 0x6b, 0x41, - 0x37, 0x57, 0x62, 0x58, 0x42, 0x59, 0x73, 0x6f, 0x0a, 0x2f, 0x2f, 0x47, - 0x52, 0x5a, 0x79, 0x48, 0x68, 0x35, 0x38, 0x31, 0x6c, 0x49, 0x43, 0x4a, - 0x4f, 0x58, 0x52, 0x74, 0x37, 0x4c, 0x5a, 0x30, 0x74, 0x79, 0x62, 0x58, - 0x75, 0x72, 0x31, 0x57, 0x67, 0x47, 0x50, 0x58, 0x58, 0x32, 0x42, 0x37, - 0x77, 0x4f, 0x75, 0x59, 0x6e, 0x31, 0x42, 0x71, 0x54, 0x4f, 0x62, 0x73, - 0x5a, 0x4c, 0x61, 0x37, 0x77, 0x38, 0x4f, 0x34, 0x30, 0x45, 0x76, 0x78, - 0x49, 0x73, 0x4a, 0x66, 0x4f, 0x66, 0x46, 0x4c, 0x64, 0x39, 0x79, 0x71, - 0x62, 0x0a, 0x46, 0x62, 0x54, 0x31, 0x38, 0x78, 0x4d, 0x57, 0x4c, 0x51, - 0x38, 0x77, 0x76, 0x33, 0x76, 0x66, 0x79, 0x6b, 0x54, 0x55, 0x52, 0x69, - 0x64, 0x48, 0x7a, 0x54, 0x79, 0x2f, 0x31, 0x68, 0x76, 0x45, 0x4a, 0x45, - 0x73, 0x65, 0x39, 0x56, 0x42, 0x56, 0x7a, 0x59, 0x53, 0x46, 0x63, 0x55, - 0x62, 0x55, 0x72, 0x47, 0x2b, 0x2f, 0x4c, 0x49, 0x43, 0x34, 0x6a, 0x6c, - 0x54, 0x78, 0x44, 0x64, 0x67, 0x48, 0x64, 0x37, 0x79, 0x74, 0x68, 0x4a, - 0x37, 0x4e, 0x77, 0x4c, 0x68, 0x68, 0x0a, 0x63, 0x77, 0x68, 0x42, 0x2f, - 0x55, 0x2b, 0x7a, 0x34, 0x39, 0x78, 0x62, 0x50, 0x76, 0x37, 0x6c, 0x76, - 0x66, 0x54, 0x4c, 0x71, 0x34, 0x55, 0x61, 0x48, 0x55, 0x34, 0x37, 0x71, - 0x51, 0x37, 0x64, 0x2f, 0x34, 0x73, 0x48, 0x7a, 0x31, 0x73, 0x79, 0x4b, - 0x37, 0x6c, 0x4d, 0x4c, 0x44, 0x37, 0x70, 0x51, 0x31, 0x30, 0x79, 0x61, - 0x61, 0x4c, 0x4a, 0x73, 0x45, 0x38, 0x55, 0x42, 0x79, 0x69, 0x67, 0x4c, - 0x71, 0x56, 0x74, 0x45, 0x77, 0x65, 0x57, 0x6b, 0x4c, 0x46, 0x56, 0x0a, - 0x4d, 0x30, 0x4d, 0x6a, 0x55, 0x35, 0x31, 0x72, 0x69, 0x72, 0x57, 0x70, - 0x52, 0x75, 0x62, 0x72, 0x47, 0x64, 0x53, 0x46, 0x73, 0x58, 0x44, 0x6c, - 0x31, 0x4e, 0x31, 0x57, 0x53, 0x67, 0x65, 0x6f, 0x30, 0x5a, 0x75, 0x75, - 0x37, 0x41, 0x4a, 0x64, 0x74, 0x42, 0x43, 0x68, 0x64, 0x31, 0x62, 0x6d, - 0x53, 0x2f, 0x39, 0x56, 0x39, 0x48, 0x43, 0x69, 0x42, 0x46, 0x79, 0x33, - 0x71, 0x42, 0x43, 0x2b, 0x33, 0x4b, 0x79, 0x34, 0x6f, 0x4e, 0x4d, 0x6b, - 0x6c, 0x4c, 0x46, 0x6f, 0x0a, 0x54, 0x6f, 0x58, 0x77, 0x33, 0x32, 0x63, - 0x43, 0x31, 0x30, 0x34, 0x39, 0x63, 0x49, 0x69, 0x47, 0x35, 0x68, 0x37, - 0x6b, 0x34, 0x54, 0x30, 0x66, 0x42, 0x48, 0x75, 0x75, 0x46, 0x78, 0x42, - 0x7a, 0x71, 0x4e, 0x31, 0x67, 0x34, 0x45, 0x67, 0x70, 0x76, 0x54, 0x69, - 0x6f, 0x52, 0x51, 0x6f, 0x54, 0x62, 0x59, 0x6a, 0x6e, 0x6c, 0x70, 0x4a, - 0x50, 0x6a, 0x68, 0x75, 0x78, 0x51, 0x38, 0x42, 0x32, 0x78, 0x51, 0x77, - 0x38, 0x34, 0x39, 0x6a, 0x78, 0x34, 0x6f, 0x44, 0x44, 0x0a, 0x63, 0x72, - 0x51, 0x64, 0x66, 0x33, 0x6b, 0x4c, 0x50, 0x72, 0x6f, 0x38, 0x69, 0x2f, - 0x48, 0x51, 0x42, 0x67, 0x55, 0x38, 0x67, 0x7a, 0x50, 0x6d, 0x69, 0x41, - 0x6f, 0x51, 0x59, 0x4f, 0x52, 0x41, 0x56, 0x6d, 0x68, 0x47, 0x37, 0x45, - 0x4f, 0x38, 0x4b, 0x5a, 0x74, 0x38, 0x4c, 0x72, 0x76, 0x52, 0x77, 0x49, - 0x49, 0x51, 0x4a, 0x76, 0x70, 0x5a, 0x64, 0x6f, 0x50, 0x4b, 0x6b, 0x38, - 0x39, 0x43, 0x68, 0x48, 0x73, 0x4e, 0x48, 0x7a, 0x4a, 0x6c, 0x35, 0x71, - 0x77, 0x52, 0x0a, 0x4e, 0x32, 0x66, 0x41, 0x73, 0x65, 0x52, 0x30, 0x79, - 0x69, 0x4b, 0x50, 0x30, 0x64, 0x4a, 0x56, 0x50, 0x7a, 0x4d, 0x51, 0x4c, - 0x5a, 0x36, 0x6a, 0x43, 0x73, 0x30, 0x75, 0x57, 0x68, 0x6e, 0x72, 0x75, - 0x56, 0x50, 0x57, 0x43, 0x65, 0x4e, 0x4d, 0x79, 0x6b, 0x41, 0x47, 0x74, - 0x39, 0x34, 0x6d, 0x6b, 0x4b, 0x76, 0x6a, 0x78, 0x6b, 0x6b, 0x55, 0x62, - 0x62, 0x39, 0x5a, 0x53, 0x37, 0x63, 0x39, 0x5a, 0x4f, 0x5a, 0x71, 0x77, - 0x42, 0x76, 0x6f, 0x57, 0x67, 0x6e, 0x54, 0x0a, 0x42, 0x7a, 0x6d, 0x71, - 0x61, 0x54, 0x58, 0x79, 0x77, 0x43, 0x33, 0x68, 0x69, 0x38, 0x43, 0x30, - 0x4c, 0x55, 0x59, 0x30, 0x58, 0x65, 0x73, 0x65, 0x57, 0x77, 0x6c, 0x70, - 0x4e, 0x49, 0x2f, 0x6b, 0x37, 0x55, 0x42, 0x4d, 0x39, 0x63, 0x45, 0x6f, - 0x70, 0x44, 0x46, 0x46, 0x38, 0x2b, 0x63, 0x52, 0x6a, 0x67, 0x4a, 0x63, - 0x31, 0x30, 0x64, 0x4e, 0x41, 0x6f, 0x51, 0x52, 0x76, 0x38, 0x65, 0x36, - 0x30, 0x57, 0x74, 0x73, 0x6d, 0x58, 0x45, 0x35, 0x4c, 0x56, 0x4a, 0x37, - 0x0a, 0x66, 0x4e, 0x57, 0x64, 0x54, 0x69, 0x7a, 0x47, 0x56, 0x6e, 0x4c, - 0x7a, 0x63, 0x6d, 0x47, 0x38, 0x78, 0x45, 0x52, 0x4e, 0x50, 0x30, 0x7a, - 0x5a, 0x4d, 0x55, 0x58, 0x4e, 0x6e, 0x2f, 0x58, 0x34, 0x7a, 0x46, 0x75, - 0x39, 0x51, 0x75, 0x6a, 0x44, 0x6e, 0x6e, 0x59, 0x75, 0x65, 0x35, 0x6c, - 0x50, 0x45, 0x4f, 0x6f, 0x69, 0x72, 0x59, 0x46, 0x43, 0x53, 0x65, 0x4e, - 0x70, 0x71, 0x58, 0x62, 0x53, 0x51, 0x75, 0x79, 0x75, 0x61, 0x59, 0x45, - 0x63, 0x6d, 0x79, 0x57, 0x72, 0x0a, 0x79, 0x75, 0x31, 0x63, 0x56, 0x6f, - 0x51, 0x72, 0x37, 0x76, 0x77, 0x53, 0x78, 0x57, 0x57, 0x2f, 0x66, 0x62, - 0x49, 0x71, 0x5a, 0x56, 0x61, 0x76, 0x39, 0x77, 0x4b, 0x62, 0x64, 0x48, - 0x38, 0x54, 0x56, 0x76, 0x56, 0x52, 0x68, 0x4e, 0x6b, 0x43, 0x36, 0x79, - 0x4f, 0x6f, 0x70, 0x55, 0x48, 0x4b, 0x36, 0x72, 0x62, 0x4d, 0x63, 0x37, - 0x4e, 0x6e, 0x43, 0x37, 0x4e, 0x76, 0x48, 0x73, 0x34, 0x49, 0x7a, 0x30, - 0x75, 0x33, 0x72, 0x57, 0x31, 0x4b, 0x52, 0x41, 0x53, 0x55, 0x0a, 0x46, - 0x56, 0x6b, 0x64, 0x42, 0x4d, 0x38, 0x72, 0x52, 0x5a, 0x4d, 0x70, 0x50, - 0x75, 0x59, 0x66, 0x34, 0x32, 0x6d, 0x42, 0x67, 0x56, 0x59, 0x63, 0x59, - 0x65, 0x58, 0x4c, 0x32, 0x42, 0x4f, 0x58, 0x6a, 0x76, 0x49, 0x42, 0x4c, - 0x37, 0x5a, 0x42, 0x48, 0x2f, 0x6f, 0x6f, 0x66, 0x35, 0x4c, 0x49, 0x55, - 0x6a, 0x68, 0x38, 0x4b, 0x68, 0x2b, 0x4a, 0x42, 0x38, 0x2f, 0x31, 0x79, - 0x42, 0x31, 0x58, 0x67, 0x61, 0x4d, 0x61, 0x53, 0x4e, 0x68, 0x2b, 0x32, - 0x38, 0x4d, 0x66, 0x0a, 0x75, 0x38, 0x7a, 0x79, 0x79, 0x42, 0x65, 0x70, - 0x72, 0x37, 0x63, 0x4c, 0x76, 0x57, 0x37, 0x77, 0x7a, 0x5a, 0x59, 0x69, - 0x41, 0x4e, 0x6f, 0x51, 0x4f, 0x64, 0x4c, 0x46, 0x77, 0x35, 0x4b, 0x63, - 0x77, 0x47, 0x45, 0x69, 0x51, 0x35, 0x30, 0x58, 0x44, 0x79, 0x49, 0x33, - 0x49, 0x75, 0x46, 0x72, 0x30, 0x67, 0x58, 0x58, 0x38, 0x74, 0x76, 0x73, - 0x50, 0x35, 0x6e, 0x6e, 0x68, 0x6b, 0x55, 0x61, 0x54, 0x76, 0x63, 0x7a, - 0x37, 0x2f, 0x45, 0x52, 0x72, 0x62, 0x64, 0x79, 0x0a, 0x6c, 0x58, 0x4e, - 0x34, 0x55, 0x69, 0x79, 0x44, 0x62, 0x78, 0x6b, 0x4e, 0x6e, 0x76, 0x6f, - 0x67, 0x61, 0x6f, 0x4b, 0x2b, 0x6e, 0x33, 0x72, 0x6c, 0x52, 0x79, 0x6e, - 0x32, 0x2f, 0x62, 0x2f, 0x56, 0x50, 0x53, 0x2b, 0x4a, 0x72, 0x4e, 0x4f, - 0x75, 0x72, 0x52, 0x55, 0x68, 0x37, 0x58, 0x49, 0x34, 0x4a, 0x59, 0x35, - 0x6f, 0x32, 0x50, 0x42, 0x79, 0x31, 0x74, 0x34, 0x77, 0x59, 0x45, 0x49, - 0x64, 0x49, 0x42, 0x4d, 0x70, 0x2b, 0x47, 0x78, 0x51, 0x34, 0x67, 0x61, - 0x6d, 0x0a, 0x72, 0x74, 0x77, 0x62, 0x4e, 0x49, 0x77, 0x2b, 0x34, 0x74, - 0x69, 0x4b, 0x43, 0x5a, 0x71, 0x5a, 0x65, 0x72, 0x44, 0x35, 0x4f, 0x4c, - 0x44, 0x31, 0x61, 0x4a, 0x66, 0x39, 0x54, 0x5a, 0x7a, 0x39, 0x6f, 0x5a, - 0x64, 0x58, 0x2f, 0x48, 0x6d, 0x4e, 0x52, 0x38, 0x6f, 0x72, 0x75, 0x6d, - 0x68, 0x43, 0x2f, 0x68, 0x71, 0x45, 0x31, 0x4a, 0x4f, 0x5a, 0x55, 0x59, - 0x2f, 0x6a, 0x73, 0x58, 0x61, 0x47, 0x30, 0x43, 0x52, 0x6d, 0x47, 0x49, - 0x6a, 0x37, 0x47, 0x42, 0x64, 0x47, 0x0a, 0x4d, 0x50, 0x6c, 0x4e, 0x35, - 0x48, 0x70, 0x46, 0x55, 0x6e, 0x6a, 0x75, 0x6f, 0x55, 0x47, 0x6c, 0x31, - 0x6c, 0x31, 0x55, 0x4f, 0x64, 0x32, 0x36, 0x4d, 0x56, 0x79, 0x53, 0x7a, - 0x4d, 0x58, 0x6f, 0x79, 0x36, 0x78, 0x61, 0x76, 0x7a, 0x62, 0x65, 0x35, - 0x72, 0x35, 0x63, 0x37, 0x36, 0x4d, 0x6b, 0x52, 0x69, 0x4f, 0x53, 0x30, - 0x70, 0x62, 0x6f, 0x69, 0x34, 0x6d, 0x75, 0x41, 0x64, 0x37, 0x38, 0x34, - 0x39, 0x36, 0x79, 0x42, 0x4b, 0x73, 0x6e, 0x67, 0x75, 0x7a, 0x55, 0x0a, - 0x33, 0x77, 0x2b, 0x33, 0x6f, 0x31, 0x32, 0x35, 0x59, 0x54, 0x64, 0x67, - 0x66, 0x4c, 0x46, 0x4e, 0x55, 0x65, 0x7a, 0x48, 0x76, 0x76, 0x4d, 0x41, - 0x6f, 0x74, 0x73, 0x42, 0x51, 0x67, 0x4a, 0x46, 0x64, 0x78, 0x4c, 0x68, - 0x77, 0x53, 0x4c, 0x59, 0x49, 0x5a, 0x47, 0x51, 0x45, 0x6b, 0x46, 0x67, - 0x52, 0x66, 0x31, 0x71, 0x4c, 0x58, 0x6b, 0x62, 0x54, 0x73, 0x73, 0x7a, - 0x78, 0x41, 0x39, 0x2b, 0x57, 0x37, 0x50, 0x73, 0x45, 0x79, 0x4b, 0x74, - 0x65, 0x56, 0x2b, 0x4a, 0x0a, 0x48, 0x4f, 0x76, 0x4c, 0x67, 0x67, 0x70, - 0x74, 0x76, 0x47, 0x7a, 0x71, 0x42, 0x6e, 0x30, 0x39, 0x36, 0x6b, 0x6a, - 0x59, 0x59, 0x68, 0x38, 0x64, 0x43, 0x65, 0x61, 0x72, 0x61, 0x62, 0x32, - 0x49, 0x54, 0x32, 0x67, 0x2b, 0x4e, 0x49, 0x44, 0x50, 0x44, 0x42, 0x55, - 0x67, 0x58, 0x61, 0x35, 0x31, 0x61, 0x38, 0x58, 0x76, 0x5a, 0x76, 0x78, - 0x6e, 0x72, 0x49, 0x56, 0x36, 0x4d, 0x4b, 0x79, 0x34, 0x59, 0x66, 0x78, - 0x4c, 0x53, 0x4b, 0x54, 0x4c, 0x61, 0x35, 0x67, 0x43, 0x0a, 0x50, 0x46, - 0x62, 0x2f, 0x73, 0x4c, 0x74, 0x5a, 0x51, 0x51, 0x44, 0x55, 0x61, 0x79, - 0x48, 0x76, 0x4d, 0x6f, 0x59, 0x6c, 0x6e, 0x66, 0x4c, 0x45, 0x6d, 0x44, - 0x6a, 0x71, 0x49, 0x44, 0x6d, 0x66, 0x6c, 0x36, 0x37, 0x68, 0x59, 0x2f, - 0x5a, 0x65, 0x4c, 0x54, 0x6f, 0x4e, 0x74, 0x76, 0x59, 0x42, 0x37, 0x49, - 0x79, 0x48, 0x6a, 0x55, 0x55, 0x41, 0x6f, 0x4b, 0x50, 0x36, 0x36, 0x50, - 0x5a, 0x67, 0x71, 0x75, 0x6d, 0x72, 0x2f, 0x2f, 0x78, 0x73, 0x67, 0x73, - 0x79, 0x4b, 0x0a, 0x56, 0x34, 0x49, 0x6a, 0x38, 0x79, 0x61, 0x41, 0x2b, - 0x36, 0x78, 0x43, 0x77, 0x63, 0x6a, 0x6f, 0x6d, 0x53, 0x48, 0x7a, 0x2f, - 0x32, 0x45, 0x43, 0x74, 0x72, 0x64, 0x5a, 0x46, 0x4e, 0x4b, 0x79, 0x57, - 0x36, 0x35, 0x2b, 0x70, 0x76, 0x44, 0x74, 0x64, 0x64, 0x7a, 0x6a, 0x50, - 0x79, 0x6e, 0x74, 0x53, 0x43, 0x6b, 0x72, 0x66, 0x4e, 0x74, 0x51, 0x68, - 0x56, 0x2b, 0x70, 0x62, 0x34, 0x77, 0x4b, 0x39, 0x51, 0x34, 0x70, 0x4d, - 0x63, 0x4e, 0x38, 0x73, 0x75, 0x44, 0x78, 0x0a, 0x66, 0x78, 0x4f, 0x70, - 0x45, 0x34, 0x74, 0x4e, 0x2b, 0x77, 0x61, 0x56, 0x4d, 0x6d, 0x48, 0x52, - 0x31, 0x57, 0x4c, 0x46, 0x54, 0x37, 0x47, 0x6c, 0x7a, 0x36, 0x35, 0x47, - 0x68, 0x2f, 0x57, 0x35, 0x2b, 0x55, 0x4e, 0x73, 0x6c, 0x56, 0x31, 0x35, - 0x48, 0x6d, 0x7a, 0x73, 0x58, 0x4a, 0x71, 0x48, 0x4a, 0x78, 0x6f, 0x41, - 0x34, 0x56, 0x4e, 0x38, 0x6e, 0x4b, 0x69, 0x72, 0x70, 0x42, 0x6f, 0x31, - 0x59, 0x32, 0x42, 0x47, 0x6c, 0x66, 0x50, 0x42, 0x6f, 0x71, 0x56, 0x6c, - 0x0a, 0x2b, 0x4e, 0x50, 0x64, 0x75, 0x6a, 0x39, 0x4f, 0x45, 0x74, 0x4b, - 0x72, 0x75, 0x71, 0x38, 0x69, 0x4b, 0x2b, 0x64, 0x55, 0x59, 0x61, 0x74, - 0x64, 0x36, 0x4c, 0x61, 0x69, 0x2b, 0x51, 0x49, 0x57, 0x79, 0x44, 0x47, - 0x42, 0x70, 0x4b, 0x56, 0x36, 0x63, 0x2b, 0x70, 0x42, 0x45, 0x33, 0x39, - 0x45, 0x42, 0x6f, 0x6b, 0x34, 0x30, 0x78, 0x32, 0x71, 0x75, 0x55, 0x76, - 0x55, 0x59, 0x62, 0x44, 0x79, 0x47, 0x57, 0x59, 0x62, 0x6f, 0x42, 0x57, - 0x2b, 0x72, 0x4c, 0x4b, 0x54, 0x0a, 0x58, 0x45, 0x6c, 0x72, 0x50, 0x49, - 0x6d, 0x74, 0x47, 0x52, 0x6e, 0x31, 0x46, 0x6b, 0x62, 0x58, 0x68, 0x6e, - 0x64, 0x4b, 0x78, 0x31, 0x58, 0x50, 0x65, 0x70, 0x75, 0x30, 0x70, 0x59, - 0x72, 0x64, 0x7a, 0x31, 0x58, 0x6d, 0x77, 0x49, 0x74, 0x5a, 0x53, 0x6c, - 0x66, 0x52, 0x46, 0x48, 0x59, 0x4c, 0x35, 0x61, 0x57, 0x38, 0x38, 0x37, - 0x51, 0x4b, 0x6b, 0x39, 0x38, 0x53, 0x52, 0x4e, 0x6e, 0x34, 0x56, 0x35, - 0x32, 0x5a, 0x77, 0x44, 0x6e, 0x67, 0x71, 0x36, 0x66, 0x50, 0x0a, 0x35, - 0x61, 0x62, 0x55, 0x32, 0x63, 0x2f, 0x77, 0x78, 0x67, 0x77, 0x56, 0x49, - 0x77, 0x77, 0x2f, 0x74, 0x64, 0x33, 0x4a, 0x61, 0x36, 0x77, 0x47, 0x44, - 0x42, 0x49, 0x63, 0x4d, 0x68, 0x4d, 0x75, 0x53, 0x7a, 0x42, 0x39, 0x48, - 0x6c, 0x6f, 0x69, 0x65, 0x6d, 0x71, 0x62, 0x43, 0x62, 0x73, 0x4d, 0x2f, - 0x53, 0x63, 0x43, 0x79, 0x54, 0x30, 0x73, 0x47, 0x2f, 0x61, 0x4b, 0x76, - 0x35, 0x6c, 0x4c, 0x65, 0x36, 0x62, 0x39, 0x59, 0x45, 0x50, 0x39, 0x66, - 0x6d, 0x45, 0x4f, 0x0a, 0x78, 0x6d, 0x75, 0x4e, 0x6f, 0x6a, 0x59, 0x47, - 0x36, 0x76, 0x4e, 0x79, 0x43, 0x78, 0x48, 0x52, 0x4c, 0x39, 0x59, 0x4a, - 0x41, 0x41, 0x2f, 0x58, 0x6d, 0x4e, 0x64, 0x32, 0x43, 0x4b, 0x59, 0x42, - 0x45, 0x79, 0x56, 0x62, 0x4e, 0x44, 0x4e, 0x50, 0x65, 0x43, 0x4a, 0x67, - 0x66, 0x35, 0x31, 0x6f, 0x4d, 0x62, 0x77, 0x30, 0x61, 0x72, 0x65, 0x38, - 0x58, 0x6b, 0x66, 0x62, 0x56, 0x36, 0x34, 0x49, 0x45, 0x44, 0x43, 0x45, - 0x4b, 0x2f, 0x56, 0x6a, 0x68, 0x59, 0x57, 0x51, 0x0a, 0x75, 0x42, 0x53, - 0x6c, 0x54, 0x56, 0x6b, 0x46, 0x6b, 0x58, 0x57, 0x67, 0x32, 0x31, 0x41, - 0x45, 0x67, 0x74, 0x78, 0x79, 0x56, 0x7a, 0x78, 0x6c, 0x31, 0x6e, 0x56, - 0x69, 0x41, 0x6a, 0x74, 0x6e, 0x31, 0x72, 0x38, 0x59, 0x72, 0x73, 0x45, - 0x48, 0x33, 0x74, 0x51, 0x73, 0x47, 0x32, 0x64, 0x34, 0x48, 0x32, 0x65, - 0x44, 0x4c, 0x69, 0x36, 0x49, 0x39, 0x7a, 0x79, 0x48, 0x77, 0x6d, 0x70, - 0x56, 0x4b, 0x33, 0x51, 0x79, 0x66, 0x71, 0x42, 0x47, 0x66, 0x63, 0x74, - 0x64, 0x0a, 0x64, 0x78, 0x5a, 0x46, 0x6f, 0x74, 0x6e, 0x4a, 0x2b, 0x73, - 0x73, 0x6c, 0x37, 0x34, 0x31, 0x33, 0x30, 0x4f, 0x6d, 0x63, 0x67, 0x59, - 0x74, 0x35, 0x6d, 0x70, 0x35, 0x57, 0x4c, 0x2f, 0x4b, 0x4f, 0x58, 0x41, - 0x4c, 0x63, 0x55, 0x64, 0x34, 0x45, 0x59, 0x50, 0x49, 0x58, 0x57, 0x66, - 0x71, 0x6a, 0x4e, 0x77, 0x6d, 0x78, 0x4b, 0x75, 0x77, 0x74, 0x6e, 0x50, - 0x50, 0x6e, 0x71, 0x32, 0x67, 0x75, 0x55, 0x46, 0x44, 0x32, 0x42, 0x70, - 0x42, 0x35, 0x77, 0x2f, 0x45, 0x69, 0x0a, 0x65, 0x71, 0x50, 0x32, 0x66, - 0x2f, 0x6b, 0x7a, 0x58, 0x77, 0x79, 0x33, 0x4e, 0x57, 0x42, 0x4d, 0x79, - 0x70, 0x4b, 0x50, 0x4b, 0x79, 0x46, 0x4f, 0x7a, 0x32, 0x7a, 0x6a, 0x52, - 0x30, 0x61, 0x56, 0x41, 0x35, 0x73, 0x78, 0x41, 0x42, 0x2f, 0x6d, 0x77, - 0x38, 0x59, 0x51, 0x4c, 0x55, 0x34, 0x6c, 0x54, 0x73, 0x36, 0x39, 0x2f, - 0x44, 0x35, 0x74, 0x4b, 0x35, 0x55, 0x4a, 0x44, 0x39, 0x46, 0x59, 0x52, - 0x4f, 0x6d, 0x66, 0x57, 0x75, 0x6b, 0x42, 0x61, 0x34, 0x76, 0x4b, 0x0a, - 0x33, 0x39, 0x72, 0x57, 0x52, 0x34, 0x78, 0x30, 0x6b, 0x47, 0x72, 0x78, - 0x47, 0x76, 0x35, 0x35, 0x6b, 0x54, 0x31, 0x6f, 0x6e, 0x56, 0x61, 0x78, - 0x55, 0x30, 0x53, 0x66, 0x66, 0x56, 0x6f, 0x78, 0x68, 0x61, 0x75, 0x72, - 0x6f, 0x44, 0x34, 0x36, 0x33, 0x77, 0x37, 0x50, 0x42, 0x70, 0x66, 0x69, - 0x42, 0x46, 0x63, 0x36, 0x62, 0x39, 0x34, 0x56, 0x66, 0x34, 0x74, 0x79, - 0x51, 0x43, 0x7a, 0x4a, 0x38, 0x4b, 0x68, 0x7a, 0x63, 0x7a, 0x77, 0x62, - 0x58, 0x59, 0x57, 0x46, 0x0a, 0x46, 0x58, 0x35, 0x36, 0x55, 0x67, 0x64, - 0x4e, 0x6f, 0x36, 0x77, 0x77, 0x72, 0x47, 0x57, 0x7a, 0x57, 0x39, 0x43, - 0x42, 0x34, 0x55, 0x49, 0x34, 0x75, 0x44, 0x43, 0x64, 0x55, 0x4f, 0x5a, - 0x75, 0x63, 0x59, 0x30, 0x42, 0x77, 0x6b, 0x54, 0x58, 0x55, 0x72, 0x6e, - 0x62, 0x68, 0x43, 0x72, 0x66, 0x78, 0x42, 0x7a, 0x7a, 0x2b, 0x37, 0x4f, - 0x64, 0x43, 0x55, 0x65, 0x72, 0x69, 0x31, 0x79, 0x63, 0x59, 0x74, 0x48, - 0x54, 0x38, 0x47, 0x67, 0x41, 0x54, 0x30, 0x49, 0x4a, 0x0a, 0x6c, 0x4f, - 0x6a, 0x4c, 0x56, 0x69, 0x4e, 0x49, 0x35, 0x4a, 0x6e, 0x38, 0x49, 0x36, - 0x57, 0x74, 0x58, 0x35, 0x6f, 0x48, 0x7a, 0x35, 0x6c, 0x33, 0x43, 0x42, - 0x44, 0x58, 0x64, 0x75, 0x73, 0x6b, 0x55, 0x77, 0x33, 0x54, 0x4a, 0x63, - 0x42, 0x76, 0x7a, 0x31, 0x63, 0x5a, 0x4e, 0x69, 0x31, 0x70, 0x2b, 0x6c, - 0x6e, 0x43, 0x54, 0x44, 0x57, 0x69, 0x79, 0x47, 0x71, 0x50, 0x35, 0x35, - 0x34, 0x38, 0x63, 0x68, 0x4c, 0x54, 0x47, 0x6f, 0x6e, 0x42, 0x79, 0x50, - 0x39, 0x74, 0x0a, 0x39, 0x46, 0x67, 0x32, 0x65, 0x4c, 0x67, 0x61, 0x70, - 0x6f, 0x52, 0x72, 0x58, 0x36, 0x30, 0x51, 0x4e, 0x2b, 0x7a, 0x68, 0x47, - 0x2b, 0x51, 0x4d, 0x6f, 0x30, 0x58, 0x4a, 0x44, 0x71, 0x6c, 0x38, 0x79, - 0x56, 0x34, 0x63, 0x73, 0x2f, 0x72, 0x5a, 0x6a, 0x55, 0x53, 0x4b, 0x62, - 0x6b, 0x55, 0x37, 0x61, 0x46, 0x46, 0x61, 0x73, 0x6d, 0x52, 0x62, 0x6c, - 0x45, 0x75, 0x61, 0x32, 0x61, 0x47, 0x55, 0x77, 0x50, 0x2f, 0x6c, 0x69, - 0x58, 0x56, 0x4b, 0x59, 0x36, 0x42, 0x72, 0x0a, 0x6d, 0x32, 0x71, 0x57, - 0x75, 0x49, 0x75, 0x2b, 0x62, 0x68, 0x41, 0x2b, 0x62, 0x76, 0x6b, 0x6e, - 0x33, 0x42, 0x42, 0x61, 0x77, 0x46, 0x35, 0x52, 0x43, 0x69, 0x55, 0x52, - 0x62, 0x76, 0x53, 0x52, 0x54, 0x72, 0x46, 0x4c, 0x50, 0x63, 0x78, 0x69, - 0x6b, 0x6c, 0x53, 0x78, 0x6c, 0x72, 0x74, 0x6f, 0x34, 0x68, 0x38, 0x63, - 0x4b, 0x6a, 0x4f, 0x33, 0x38, 0x4d, 0x68, 0x2b, 0x52, 0x2f, 0x31, 0x32, - 0x6c, 0x55, 0x45, 0x62, 0x7a, 0x48, 0x41, 0x64, 0x51, 0x50, 0x77, 0x57, - 0x0a, 0x6b, 0x66, 0x47, 0x70, 0x77, 0x58, 0x62, 0x52, 0x68, 0x61, 0x43, - 0x56, 0x38, 0x74, 0x74, 0x32, 0x75, 0x49, 0x7a, 0x79, 0x47, 0x47, 0x4b, - 0x66, 0x6e, 0x75, 0x4c, 0x2f, 0x68, 0x44, 0x77, 0x2f, 0x33, 0x48, 0x55, - 0x37, 0x53, 0x57, 0x76, 0x55, 0x32, 0x61, 0x59, 0x58, 0x68, 0x6c, 0x4d, - 0x6d, 0x57, 0x58, 0x67, 0x53, 0x51, 0x4a, 0x61, 0x49, 0x67, 0x71, 0x37, - 0x66, 0x68, 0x43, 0x62, 0x38, 0x72, 0x46, 0x41, 0x6f, 0x77, 0x64, 0x32, - 0x48, 0x6e, 0x76, 0x70, 0x53, 0x0a, 0x32, 0x68, 0x4b, 0x4a, 0x67, 0x30, - 0x6b, 0x57, 0x5a, 0x2f, 0x54, 0x44, 0x4a, 0x55, 0x69, 0x43, 0x5a, 0x4c, - 0x51, 0x62, 0x67, 0x2f, 0x2f, 0x44, 0x44, 0x36, 0x78, 0x62, 0x33, 0x67, - 0x65, 0x41, 0x64, 0x7a, 0x7a, 0x4e, 0x54, 0x68, 0x66, 0x72, 0x58, 0x41, - 0x46, 0x7a, 0x52, 0x73, 0x6a, 0x4f, 0x73, 0x37, 0x71, 0x78, 0x39, 0x59, - 0x37, 0x47, 0x39, 0x34, 0x66, 0x54, 0x6a, 0x6d, 0x34, 0x74, 0x49, 0x4b, - 0x33, 0x61, 0x65, 0x72, 0x32, 0x79, 0x49, 0x72, 0x44, 0x4d, 0x0a, 0x37, - 0x7a, 0x67, 0x52, 0x36, 0x56, 0x49, 0x34, 0x43, 0x56, 0x31, 0x6a, 0x2f, - 0x4e, 0x6e, 0x4f, 0x2f, 0x4d, 0x55, 0x53, 0x67, 0x78, 0x70, 0x4a, 0x74, - 0x62, 0x41, 0x5a, 0x68, 0x67, 0x55, 0x45, 0x37, 0x62, 0x43, 0x4f, 0x35, - 0x49, 0x41, 0x33, 0x39, 0x48, 0x51, 0x34, 0x68, 0x54, 0x37, 0x46, 0x6d, - 0x56, 0x66, 0x74, 0x2b, 0x2b, 0x35, 0x53, 0x4e, 0x57, 0x31, 0x70, 0x5a, - 0x4f, 0x6e, 0x41, 0x2f, 0x6a, 0x57, 0x6a, 0x7a, 0x52, 0x68, 0x4f, 0x35, - 0x4a, 0x54, 0x6b, 0x0a, 0x38, 0x32, 0x62, 0x69, 0x64, 0x6f, 0x6e, 0x77, - 0x36, 0x63, 0x2f, 0x4f, 0x4f, 0x38, 0x50, 0x4e, 0x69, 0x33, 0x6f, 0x64, - 0x4e, 0x70, 0x77, 0x46, 0x75, 0x49, 0x66, 0x53, 0x45, 0x2b, 0x59, 0x54, - 0x37, 0x4e, 0x78, 0x7a, 0x4b, 0x35, 0x41, 0x68, 0x41, 0x79, 0x53, 0x4b, - 0x35, 0x66, 0x6b, 0x77, 0x62, 0x39, 0x6d, 0x68, 0x54, 0x4f, 0x72, 0x5a, - 0x38, 0x70, 0x66, 0x36, 0x4b, 0x77, 0x78, 0x52, 0x30, 0x47, 0x4f, 0x44, - 0x43, 0x56, 0x66, 0x66, 0x53, 0x4b, 0x69, 0x52, 0x0a, 0x67, 0x35, 0x33, - 0x4a, 0x35, 0x4b, 0x6a, 0x75, 0x45, 0x65, 0x30, 0x44, 0x70, 0x4b, 0x74, - 0x46, 0x53, 0x30, 0x57, 0x58, 0x30, 0x4a, 0x77, 0x5a, 0x34, 0x65, 0x39, - 0x79, 0x37, 0x46, 0x62, 0x66, 0x6e, 0x4c, 0x54, 0x4d, 0x74, 0x45, 0x4a, - 0x61, 0x68, 0x63, 0x73, 0x2b, 0x2f, 0x6a, 0x7a, 0x63, 0x76, 0x7a, 0x6e, - 0x7a, 0x32, 0x37, 0x41, 0x51, 0x2b, 0x54, 0x47, 0x6e, 0x46, 0x2f, 0x59, - 0x6a, 0x35, 0x4b, 0x65, 0x76, 0x71, 0x77, 0x33, 0x42, 0x68, 0x52, 0x69, - 0x6a, 0x0a, 0x47, 0x4c, 0x68, 0x62, 0x4a, 0x49, 0x57, 0x30, 0x7a, 0x4d, - 0x71, 0x54, 0x45, 0x47, 0x41, 0x62, 0x6b, 0x70, 0x63, 0x4a, 0x50, 0x4a, - 0x4a, 0x50, 0x4a, 0x79, 0x41, 0x45, 0x48, 0x55, 0x6d, 0x61, 0x4c, 0x50, - 0x4c, 0x78, 0x30, 0x34, 0x6d, 0x57, 0x53, 0x65, 0x42, 0x45, 0x58, 0x43, - 0x45, 0x67, 0x38, 0x4f, 0x78, 0x4a, 0x79, 0x4d, 0x39, 0x37, 0x65, 0x44, - 0x69, 0x76, 0x43, 0x6d, 0x4e, 0x36, 0x6c, 0x33, 0x42, 0x7a, 0x7a, 0x49, - 0x34, 0x51, 0x4f, 0x75, 0x72, 0x37, 0x0a, 0x49, 0x2b, 0x49, 0x42, 0x41, - 0x32, 0x63, 0x46, 0x59, 0x4f, 0x4c, 0x7a, 0x6c, 0x4a, 0x46, 0x74, 0x48, - 0x69, 0x62, 0x51, 0x2f, 0x78, 0x49, 0x68, 0x67, 0x64, 0x62, 0x51, 0x68, - 0x44, 0x77, 0x6f, 0x6d, 0x72, 0x37, 0x63, 0x7a, 0x73, 0x52, 0x63, 0x34, - 0x63, 0x32, 0x65, 0x72, 0x38, 0x34, 0x61, 0x59, 0x47, 0x66, 0x34, 0x76, - 0x37, 0x56, 0x67, 0x62, 0x57, 0x51, 0x71, 0x41, 0x71, 0x48, 0x68, 0x51, - 0x31, 0x49, 0x49, 0x76, 0x39, 0x4d, 0x75, 0x2f, 0x4f, 0x75, 0x61, 0x0a, - 0x44, 0x62, 0x49, 0x78, 0x36, 0x76, 0x54, 0x78, 0x68, 0x6c, 0x78, 0x4b, - 0x44, 0x78, 0x41, 0x70, 0x6e, 0x7a, 0x6b, 0x6c, 0x65, 0x76, 0x6c, 0x48, - 0x70, 0x59, 0x67, 0x37, 0x52, 0x75, 0x6e, 0x6e, 0x66, 0x2f, 0x2b, 0x35, - 0x43, 0x55, 0x31, 0x56, 0x62, 0x34, 0x47, 0x62, 0x36, 0x69, 0x73, 0x51, - 0x79, 0x6d, 0x30, 0x4c, 0x44, 0x74, 0x70, 0x70, 0x61, 0x59, 0x64, 0x52, - 0x41, 0x42, 0x72, 0x53, 0x4e, 0x4b, 0x67, 0x74, 0x6e, 0x38, 0x4d, 0x55, - 0x55, 0x5a, 0x65, 0x5a, 0x0a, 0x6f, 0x31, 0x55, 0x78, 0x41, 0x6f, 0x6c, - 0x76, 0x63, 0x72, 0x55, 0x36, 0x7a, 0x43, 0x33, 0x54, 0x4a, 0x62, 0x4c, - 0x36, 0x38, 0x67, 0x50, 0x4a, 0x54, 0x58, 0x69, 0x4c, 0x37, 0x51, 0x49, - 0x46, 0x58, 0x79, 0x45, 0x58, 0x42, 0x30, 0x48, 0x74, 0x55, 0x32, 0x47, - 0x6b, 0x35, 0x58, 0x79, 0x45, 0x65, 0x50, 0x76, 0x65, 0x33, 0x75, 0x41, - 0x4a, 0x4c, 0x38, 0x76, 0x43, 0x52, 0x39, 0x31, 0x6b, 0x51, 0x57, 0x7a, - 0x6c, 0x4e, 0x62, 0x43, 0x78, 0x46, 0x49, 0x47, 0x46, 0x0a, 0x74, 0x65, - 0x53, 0x68, 0x72, 0x7a, 0x2f, 0x6c, 0x57, 0x6f, 0x56, 0x4f, 0x4f, 0x49, - 0x4d, 0x44, 0x6d, 0x42, 0x75, 0x7a, 0x66, 0x4c, 0x66, 0x34, 0x50, 0x58, - 0x30, 0x6a, 0x39, 0x36, 0x41, 0x69, 0x35, 0x47, 0x6b, 0x33, 0x36, 0x66, - 0x41, 0x5a, 0x37, 0x64, 0x76, 0x44, 0x66, 0x57, 0x57, 0x59, 0x48, 0x65, - 0x67, 0x36, 0x4d, 0x2f, 0x70, 0x50, 0x6c, 0x61, 0x6d, 0x52, 0x41, 0x2f, - 0x31, 0x63, 0x51, 0x58, 0x77, 0x6e, 0x69, 0x2b, 0x50, 0x34, 0x53, 0x43, - 0x75, 0x67, 0x0a, 0x45, 0x32, 0x69, 0x58, 0x58, 0x7a, 0x4f, 0x51, 0x67, - 0x4b, 0x77, 0x5a, 0x61, 0x45, 0x74, 0x46, 0x69, 0x43, 0x4a, 0x56, 0x71, - 0x33, 0x64, 0x73, 0x48, 0x57, 0x45, 0x6a, 0x4d, 0x64, 0x33, 0x58, 0x59, - 0x4e, 0x71, 0x65, 0x55, 0x73, 0x45, 0x70, 0x35, 0x37, 0x33, 0x4c, 0x4e, - 0x75, 0x32, 0x67, 0x67, 0x32, 0x36, 0x38, 0x4b, 0x42, 0x45, 0x3d, 0x0a -}; -unsigned int test_data_enc_len = 6756; - -unsigned cpl = 76; -int main(int argc, char **argv) { - // Test encoding... - printf("Test encoding...\n"); - unsigned len = Base64EncodeSize(test_data_len, cpl); - printf("Predicted size: %u\n", len); - char *data = (char*)malloc(len); - len = Base64Encode(data, (const char*)&test_data[0], test_data_len, cpl); - if (len != test_data_enc_len || memcmp(data, (const char*)&test_data_enc[0], len) != 0) { - printf("input size: %u\n", test_data_len); - printf("output size: %u\n", len); - printf("expected output size: %u\n", test_data_enc_len); - printf("Encoding differs...\n"); - return 1; - } - free(data); - printf("Pass\n"); - - printf("Test decoding...\n"); - len = Base64DecodeSize(test_data_enc_len); - printf("Predicted size: %u\n", len); - data = (char*)malloc(len); - len = Base64Decode(data, (const char*)&test_data_enc[0], test_data_enc_len); - if (len != test_data_len || memcmp(data, (const char*)&test_data[0], len) != 0) { - printf("input size: %u\n", test_data_enc_len); - printf("output size: %u\n", len); - printf("expected size: %u\n", test_data_len); - printf("Decoding differs...\n"); - return 1; - } - free(data); - printf("Pass\n"); - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_bundleemitter.cc b/src/hos_libvariant/src/libvariant/test/test_bundleemitter.cc deleted file mode 100644 index 466deca1..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_bundleemitter.cc +++ /dev/null @@ -1,96 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include -#include -#include -#include -#include - -#include "../../libvariant/include/Variant/Emitter.h" -#include "../../libvariant/include/Variant/Payload.h" -#include "../../libvariant/include/Variant/Variant.h" -#include "../../libvariant/test/TestAssert.h" -using namespace libvariant; -using namespace std; - -void TestOne() { - cout << "Testing basic functionality" << endl; - Variant v = Variant::MapType; - v["foo"] = 12.33456; - v["bar"] = 873453; - v["boo"] = false; - v["null"] = Variant::NullType; - v["true"] = true; - v["moo"] = "test one two three blah blah blah"; - v["loo"].Append(1).Append(2).Append(3); - const char payload[] = "fp9q8ywtrvapwn98nc4yargcfuiahwer8ytqv9p4tcp98y3crhlei4t8hpse985ytvlseuhrotceyiruth"; - v["payload.data"] = Blob::CreateReferenced((char*)payload, sizeof(payload)); - std::vector buff; - buff.resize(8192); - unsigned len = SerializeBundle(&buff[0], buff.size(), v); - buff.resize(len); - ASSERT((buff.size() - strlen(&buff[0]) - 1) == sizeof(payload)); - ASSERT(memcmp(payload, &buff[strlen(&buff[0]) + 1], sizeof(payload)) == 0); - fwrite(&buff[0], 1, buff.size(), stdout); - printf("\n"); - Variant val = DeserializeBundle(&buff[0], buff.size()); - ASSERT(val["bar"] == v["bar"]); - ASSERT(val["moo"] == v["moo"]); - ASSERT(val["loo"] == v["loo"]); - ASSERT(val["boo"].AsInt() == 0); // bundles don't preserve boolean type information -} - -void TestErrorPaths() { - cout << "Testing error paths" << endl; - std::ostringstream oss; - Emitter e = BundleHdrEmitter(CreateEmitterOutput(oss.rdbuf())); - - // Test error paths - e.BeginDocument(); - try { - e.BeginDocument(); - abort(); - } catch (const std::runtime_error &) {} - e.BeginMap(); - try { - e.BeginMap(); - abort(); - } catch (const std::runtime_error &) {} - try { - e.BeginList(); - abort(); - } catch (const std::runtime_error &) {} - try { - e.EndList(); - abort(); - } catch (const std::runtime_error &) {} - try { - e.Emit("key").Emit((ConstBlobPtr)Blob::CreateCopy((void*)0,0)); - abort(); - } catch (const std::runtime_error &) {} - e.Emit(true); - e.EndMap(); - try { - e.EndMap(); - abort(); - } catch (const std::runtime_error &) {} - try { - e.Emit("abc"); - abort(); - } catch (const std::runtime_error &) {} - e.EndDocument(); - try { - e.EndDocument(); - abort(); - } catch (const std::runtime_error &) {} -} - -int main(int argc, char **argv) { - TestOne(); - TestErrorPaths(); - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_bundlehdr.cc b/src/hos_libvariant/src/libvariant/test/test_bundlehdr.cc deleted file mode 100644 index 6582e439..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_bundlehdr.cc +++ /dev/null @@ -1,49 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - * - */ - -#include -#include -#include -#include -#include -#include "../../libvariant/include/Variant/Emitter.h" -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/include/Variant/Variant.h" - -using namespace libvariant; - -const char example_bundle[] = -"bundle.version: 0.0\n" -"keyone: value\n" -"listkey: value1|value2|value3\n" -"doodle: 1234 # comments!\n" -"foo: 0.234245\n" -"singlelist: blah|\n" -"emptylist: |\n" -"\n\n\n\n\0"; - -const char expected[] = "{ \"keyone\": \"value\"," -"\"listkey\": [ \"value1\", \"value2\", \"value3\" ], \"doodle\": 1234, \"foo\": 0.234245," -"\"singlelist\": [ \"blah\" ], \"emptylist\": [] }"; - -int main(int argc, char **argv) { - std::istringstream iss(std::string(&example_bundle[0], strlen(&example_bundle[0])+1)); - Parser parser = BundleHdrParser(CreateParserInputFile(iss.rdbuf())); - - Variant v = ParseVariant(parser); - Variant ex = DeserializeJSON(expected); - if (v != ex) { - puts(""); - SerializeJSON(stdout, v); - puts(""); - SerializeJSON(stdout, ex); - puts(""); - return 1; - } - Emitter emitter = BundleHdrEmitter(CreateEmitterOutput(stdout)); - emitter << v; - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_bundleparser.cc b/src/hos_libvariant/src/libvariant/test/test_bundleparser.cc deleted file mode 100644 index 5bc6b856..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_bundleparser.cc +++ /dev/null @@ -1,93 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include -#include -#include -#include "../../libvariant/include/Variant/Payload.h" -#include "../../libvariant/include/Variant/Variant.h" -#include "../../libvariant/test/TestAssert.h" - -using namespace libvariant; -using namespace std; - -const char bundle_str[] = -"bundle.version: 0.0\n" -"id: 1\n" -"payload.length: 40\n" -"\0" -"1234567890" -"1234567890" -"1234567890" -"1234567890" -"bundle.version: 0.0\n" -"id: 2 # comments\n" -"payload.length: 40\n" -"#comments\n" -"\0" -"\000\00\00\00" -"\001\00\00\00" -"\002\00\00\00" -"\003\00\00\00" -"\004\00\00\00" -"\005\00\00\00" -"\006\00\00\00" -"\007\00\00\00" -"\010\00\00\00" -"\011\00\00\00" -"bundle.version: 0.0\n" -"id: 3\n" -"payload.length: 70\n" -"erroniouskey\n" -"\n\n\n\n\n" -"\0" -"1234567890" -"blakdsflks" -"sdkjhasdfs" -"347iuhafgj" -"347aguhfdh" -"iouq5478q7" -"8oq34guily" -; - -std::ostream &operator<<(std::ostream &os, Variant v) { -#ifdef ENABLE_YAML - SerializeYAML(os.rdbuf(), v); -#endif - return os; -} - -int main(int argc, char **argv) { - // Need the -1 there because of the \0 at the end of the string (it looks like an empty bundle at the end...) - shared_ptr input = CreateParserInput(&bundle_str[0], sizeof(bundle_str) - 1); - - Variant v = DeserializeWithPayload(input, SERIALIZE_BUNDLEHDR); - cout << v; - cout << endl << "Payload size: " << v["payload.data"].Size() << endl; - ASSERT(v["id"].AsUnsigned() == 1); - ASSERT(v["payload.data"].Size() == 40); - ASSERT(memcmp("1234567890123456789012345678901234567890", v["payload.data"].AsBlob()->GetPtr(0), 40) == 0); - - v = DeserializeWithPayload(input, SERIALIZE_BUNDLEHDR); - cout << v << endl; - ASSERT(v["id"].AsUnsigned() == 2); - ASSERT(v["payload.data"].Size() == 40); - std::vector buf; - for (int i = 0; i < 10; ++i) { buf.push_back(i); } - ASSERT(memcmp(&buf[0], v["payload.data"].AsBlob()->GetPtr(0), 40) == 0); - - v = DeserializeWithPayload(input, SERIALIZE_BUNDLEHDR); - cout << v << endl; - ASSERT(v["payload.data"].Size() == 70); - string orig = "1234567890" "blakdsflks" "sdkjhasdfs" "347iuhafgj" "347aguhfdh" "iouq5478q7" "8oq34guily"; - std::string p((char *)v["payload.data"].AsBlob()->GetPtr(0), 70); - ASSERT(orig == p); - - // Test that the unsafe zero copy does what it is supposed to do - v = DeserializeBundle(&bundle_str[0], sizeof(bundle_str) - 1); - ASSERT(v["payload.data"].AsBlob()->GetPtr(0) != &bundle_str[strlen(&bundle_str[0])+1]); - v = DeserializeBundle(&bundle_str[0], sizeof(bundle_str) - 1, false); - ASSERT(v["payload.data"].AsBlob()->GetPtr(0) == &bundle_str[strlen(&bundle_str[0])+1]); - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_empty.cc b/src/hos_libvariant/src/libvariant/test/test_empty.cc deleted file mode 100644 index a995437a..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_empty.cc +++ /dev/null @@ -1,57 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include - -#include "../../libvariant/include/Variant/Emitter.h" -#include "../../libvariant/include/Variant/Variant.h" -using namespace libvariant; -using namespace std; - -int main(int argc, char **argv) { -#ifdef ENABLE_YAML - Emitter emitter = YAMLEmitter(CreateEmitterOutput(std::cout.rdbuf())); -#else - Emitter emitter = JSONEmitter(CreateEmitterOutput(std::cout.rdbuf()), Variant().Set("pretty", true)); -#endif - emitter.BeginList(); - try { - Variant v = DeserializeJSON(""); - emitter << v; - return 1; - } catch (const std::exception &e) { - emitter << "JSON passed"; - } - - try { - Variant v = DeserializeJSON(" "); - emitter << v; - return 1; - } catch (const std::exception &e) { - emitter << "JSON passed"; - } - emitter.Flush(); - -#ifdef ENABLE_YAML - { - Variant v = DeserializeYAML(""); - emitter << v; - emitter.Flush(); - emitter << "YAML passed"; - } -#endif - -#ifdef ENABLE_XML - try { - Variant v = DeserializeXMLPLIST(""); - emitter << v; - return 1; - } catch (const std::exception &e) { - emitter << "XML passed"; - } -#endif - emitter.EndList(); - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_extensions.cc b/src/hos_libvariant/src/libvariant/test/test_extensions.cc deleted file mode 100644 index 728cc403..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_extensions.cc +++ /dev/null @@ -1,679 +0,0 @@ -//============================================================================= -//! @file VariantExtensions.cc -//! @author Josh Staley staley@arlut.utexas.edu -//! @brief -//============================================================================= - -//=== Includes ================================================================ - -#include - -#include "../../libvariant/include/Variant/Extensions.h" -#include "../../libvariant/include/Variant/Variant.h" - -using namespace std; -using namespace libvariant; - -//=== Function Declarations =================================================== - -bool TestFlattenPath ( bool verbose = false ); -bool TestExpandPath ( bool verbose = false ); -bool TestRDiff ( bool verbose = false ); -bool TestRUpdate ( bool verbose = false ); -bool TestJSONPointer ( bool verbose = false ); -bool TestJSONDiff ( bool verbose = false ); - -//=== Main ==================================================================== - -//----------------------------------------------------------------------------- -int main ( int argc, char * argv [] ) -//----------------------------------------------------------------------------- -{ - //--- Any are will turn verbosity on --- - bool verbose = false; - if ( argc > 1 ) - verbose = true; - - bool testFlattenPath, testExpandPath, testDiff, testRUpdate, testJSONPointer, testJSONDiff; - - try - { - // FlattenPath() - testFlattenPath = TestFlattenPath( verbose ); - if ( testFlattenPath ) - cout << "FlattenPath - PASSED" << endl; - else - cout << "FlattenPath - FAILED" << endl; - - // ExpandPath() - testExpandPath = TestExpandPath( verbose ); - if ( testExpandPath ) - cout << "ExpandPath - PASSED" << endl; - else - cout << "ExpandPath - FAILED" << endl; - - // RDiff() - testDiff = TestRDiff( verbose ); - if ( testDiff ) - cout << "RDiff - PASSED" << endl; - else - cout << "RDiff - FAILED" << endl; - - // RUpdate() - testRUpdate = TestRUpdate( verbose ); - if ( testRUpdate ) - cout << "RUpdate - PASSED" << endl; - else - cout << "RUpdate - FAILED" << endl; - - testJSONPointer = TestJSONPointer( verbose ); - if ( testJSONPointer ) - cout << "JSONPointer - PASSED" << endl; - else - cout << "JSONPointer - FAILED" << endl; - - testJSONDiff = TestJSONDiff( verbose ); - if ( testJSONDiff ) - cout << "JSONDiff - PASSED" << endl; - else - cout << "JSONDiff - FAILED" << endl; - } - catch ( exception & e ) - { - cerr << "# " << e.what() << endl; - return -1; - } - - cout << "Done" << endl; - - bool passed = testFlattenPath && testExpandPath && testDiff && testRUpdate && testJSONPointer && testJSONDiff; - return passed ? 0 : 1; -} - -//=== Functions =============================================================== - -//----------------------------------------------------------------------------- -bool TestFlattenPath ( bool verbose_ ) -//----------------------------------------------------------------------------- -{ - Variant orig, flat, ideal; - - orig = 10; - ideal = 10; - flat = FlattenPath(orig); - if (flat != ideal) { return false; } - - orig = Variant::MapType; - ideal = Variant::MapType; - - orig["1"]["A"] = Variant::NullType; - orig["1"]["B"] = true; - orig["1"]["C"] = 2; - orig["1"]["D"] = -3; - orig["1"]["E"] = 4.0; - orig["1"]["F"] = "five"; - orig["1"]["G"][0] = Variant::NullType; - orig["1"]["G"][1] = true; - orig["1"]["G"][2] = 2; - orig["1"]["G"][3] = -3; - orig["1"]["G"][4] = 4.0; - orig["1"]["G"][5] = "five"; - orig["2"][0] = Variant::NullType; - orig["2"][1] = true; - orig["2"][2] = 2; - orig["2"][3] = -3; - orig["2"][4] = 4.0; - orig["2"][5] = "five"; - orig["2"][6]["a"] = true; - orig["2"][6]["b"] = "test"; - - ideal["1/A"] = Variant::NullType; - ideal["1/B"] = true; - ideal["1/C"] = 2; - ideal["1/D"] = -3; - ideal["1/E"] = 4.0; - ideal["1/F"] = "five"; - ideal["1/G[0]"] = Variant::NullType; - ideal["1/G[1]"] = true; - ideal["1/G[2]"] = 2; - ideal["1/G[3]"] = -3; - ideal["1/G[4]"] = 4.0; - ideal["1/G[5]"] = "five"; - ideal["2[0]"] = Variant::NullType; - ideal["2[1]"] = true; - ideal["2[2]"] = 2; - ideal["2[3]"] = -3; - ideal["2[4]"] = 4.0; - ideal["2[5]"] = "five"; - ideal["2[6]/a"] = true; - ideal["2[6]/b"] = "test"; - - - try { - flat = FlattenPath( orig, 123); - return false; - } catch (const std::exception &) {} - - try - { - flat = FlattenPath( orig ); - } - catch ( exception & e) - { - cout << "# " << e.what() << endl; - return false; - } - - if ( verbose_ ) - { - cout << "--- flat ---" << endl; - SerializeJSON(cout.rdbuf(), flat, true); - cout << endl; - - cout << "--- ideal ---" << endl; - SerializeJSON(cout.rdbuf(), ideal, true); - cout << endl; - } - - return flat == ideal; -} - -//----------------------------------------------------------------------------- -bool TestExpandPath ( bool verbose_ ) -//----------------------------------------------------------------------------- -{ - // TODO - implement tests - return true; -} - -//----------------------------------------------------------------------------- -bool TestRDiff ( bool verbose_ ) -//----------------------------------------------------------------------------- -{ - Variant base, compare, ideal, diff; - - base["1"]["A"] = Variant::NullType; - base["1"]["B"] = true; - base["1"]["C"] = 2; - base["1"]["D"] = -3; - base["1"]["E"] = 4.0; - base["1"]["F"] = "five"; - base["1"]["G"][0] = Variant::NullType; - base["1"]["G"][1] = true; - base["1"]["G"][2] = 2; - base["1"]["G"][3] = -3; - base["1"]["G"][4] = 4.0; - base["1"]["G"][5] = "five"; - base["2"][0] = Variant::NullType; - base["2"][1] = true; - base["2"][2] = 2; - base["2"][3] = -3; - base["2"][4] = 4.0; - base["2"][5] = "five"; - base["2"][6]["a"] = true; - base["2"][6]["b"] = "test"; - base["3"] = 5; - base["5"] = Variant().Set("a", 1).Set("b", 2); - - compare["1"]["B"] = false; - compare["1"]["C"] = -2; - compare["1"]["D"] = 3.0; - compare["1"]["E"] = "four"; - compare["1"]["F"] = 5.0; - compare["1"]["G"][0] = Variant::NullType; - compare["1"]["G"][1] = true; - compare["1"]["G"][2] = 2; - compare["1"]["G"][3] = -3; - compare["1"]["G"][4] = 4.0; - compare["1"]["G"][5] = "five"; - compare["2"][0] = Variant::NullType; - compare["2"][1] = true; - compare["2"][2] = 2; - compare["2"][3] = -3; - compare["2"][4] = 4.0; - compare["2"][5] = "five"; - compare["2"][6]["a"] = false; - compare["2"][6]["b"] = "test"; - compare["3"] = Variant().Set("a", 1); - compare["4"] = Variant().Set("emptymap", Variant::MapType); - compare["5"] = Variant::MapType; - - ideal["1"]["B"] = false; - ideal["1"]["C"] = -2; - ideal["1"]["D"] = 3.0; - ideal["1"]["E"] = "four"; - ideal["1"]["F"] = 5.0; - ideal["2"][0] = Variant::NullType; - ideal["2"][1] = true; - ideal["2"][2] = 2; - ideal["2"][3] = -3; - ideal["2"][4] = 4.0; - ideal["2"][5] = "five"; - ideal["2"][6]["a"] = false; - ideal["2"][6]["b"] = "test"; - ideal["3"] = Variant().Set("a", 1); - ideal["4"] = Variant().Set("emptymap", Variant::MapType); - // ideal["5"] is removed because it's empty - - try - { - diff = RDiff( base, compare ); - } - catch (exception & e) - { - cout << "# " << e.what() << endl; - return false; - } - - if ( verbose_ ) - { - cout << "--- diff ---" << endl; - SerializeJSON(cout.rdbuf(), diff, true); - cout << endl; - - cout << "--- ideal ---" << endl; - SerializeJSON(cout.rdbuf(), ideal, true); - cout << endl; - } - - return diff == ideal; -} - -//----------------------------------------------------------------------------- -bool TestFlattenPathVariantToStringMap ( bool verbose_ ) -//----------------------------------------------------------------------------- -// TODO - Fix this and add to list of tests in main -//----------------------------------------------------------------------------- -{ - Variant orig; - map flatMap, ideal; - - orig["ONE"]["A"] = true; - orig["ONE"]["B"] = 1; - orig["ONE"]["C"] = -2; - orig["ONE"]["D"] = 3; - orig["ONE"]["E"] = "4"; - orig["ONE"]["F"][0] = false; - orig["ONE"]["F"][1] = 1; - orig["ONE"]["F"][2] = -2; - orig["ONE"]["F"][3] = 3; - orig["ONE"]["F"][4] = "4"; - orig["TWO"][0] = true; - orig["TWO"][1] = 1; - orig["TWO"][2] = -2; - orig["TWO"][3] = 3; - orig["TWO"][4] = "4"; - orig["TWO"][5]["a"] = true; - orig["TWO"][5]["b"] = "test"; - - ideal["ONE.A"] = "true"; - ideal["ONE.B"] = "1"; - ideal["ONE.C"] = "-2"; - ideal["ONE.D"] = "3"; - ideal["ONE.E"] = "4"; - ideal["ONE.F"] = "false,1,-2,3,4"; - ideal["TWO.0"] = "true"; - ideal["TWO.1"] = "1"; - ideal["TWO.2"] = "-2"; - ideal["TWO.3"] = "3"; - ideal["TWO.4"] = "4"; - ideal["TWO.5.a"] = "true"; - ideal["TWO.5.b"] = "test"; - - try - { - flatMap = FlattenPathToStrStrMap( orig ); - } - catch (exception& e) - { - cout << "# " << e.what() << endl; - } - - if( verbose_ ) - { - for( map::iterator i(ideal.begin()), e(ideal.end()); i != e; ++i) - { - cout << flatMap[i->first] << " = " << ideal[i->first] << endl; - } - } - - return ideal == flatMap; -} - -//----------------------------------------------------------------------------- -bool TestRUpdate ( bool verbose ) -//----------------------------------------------------------------------------- -{ - Variant base, update, ideal; - - base["1"]["A"] = Variant::NullType; - base["1"]["B"] = true; - base["1"]["C"] = 2; - base["1"]["D"] = -3; - base["1"]["E"] = 4.0; - base["1"]["F"] = "five"; - base["1"]["G"][0] = Variant::NullType; - base["1"]["G"][1] = true; - base["1"]["G"][2] = 2; - base["1"]["G"][3] = -3; - base["1"]["G"][4] = 4.0; - base["1"]["G"][5] = "five"; - base["2"][0] = Variant::NullType; - base["2"][1] = true; - base["2"][2] = 2; - base["2"][3] = -3; - base["2"][4] = 4.0; - base["2"][5] = "five"; - base["2"][6]["a"] = true; - base["2"][6]["b"] = "test"; - base["3"] = 5; - base["5"] = Variant().Set("a", 1).Set("b", 2); - - update["1"]["B"] = false; - update["1"]["C"] = -2; - update["1"]["D"] = 3.0; - update["1"]["E"] = "four"; - update["1"]["F"] = 5.0; - update["2"][0] = Variant::NullType; - update["2"][1] = true; - update["2"][2] = 2; - update["2"][3] = -3; - update["2"][4] = 4.0; - update["2"][5] = "five"; - update["2"][6]["a"] = false; - update["2"][6]["b"] = "test"; - update["3"] = Variant().Set("a", 1); - update["4"] = Variant().Set("emptymap", Variant::MapType); - - ideal["1"]["A"] = Variant::NullType; - ideal["1"]["B"] = false; - ideal["1"]["C"] = -2; - ideal["1"]["D"] = 3.0; - ideal["1"]["E"] = "four"; - ideal["1"]["F"] = 5.0; - ideal["1"]["G"][0] = Variant::NullType; - ideal["1"]["G"][1] = true; - ideal["1"]["G"][2] = 2; - ideal["1"]["G"][3] = -3; - ideal["1"]["G"][4] = 4.0; - ideal["1"]["G"][5] = "five"; - ideal["2"][0] = Variant::NullType; - ideal["2"][1] = true; - ideal["2"][2] = 2; - ideal["2"][3] = -3; - ideal["2"][4] = 4.0; - ideal["2"][5] = "five"; - ideal["2"][6]["a"] = false; - ideal["2"][6]["b"] = "test"; - ideal["3"] = Variant().Set("a", 1); - ideal["4"] = Variant().Set("emptymap", Variant::MapType); - ideal["5"] = Variant().Set("a", 1).Set("b", 2); - - try { - RUpdate(base, update); - } catch (const exception &e) { - cerr << "# " << e.what() << endl; - return false; - } - if ( verbose ) - { - cout << "--- result ---" << endl; - SerializeJSON(cout.rdbuf(), base, true); - cout << endl; - - cout << "--- ideal ---" << endl; - SerializeJSON(cout.rdbuf(), ideal, true); - cout << endl; - } - return base == ideal; -} - - -bool TestJSONPointer(bool verbose) -{ - Variant test_one = DeserializeJSON("{" - "\"foo\": [\"bar\", \"baz\"]," - "\"\": 0," - "\"a/b\": 1," - "\"c%d\": 2," - "\"e^f\": 3," - "\"g|h\": 4," - "\"i\\\\j\": 5," - "\"k\\\"l\": 6," - "\" \": 7," - "\"m~n\": 8" - "}"); - - std::map pointer_path_map; - pointer_path_map[""] = ""; - pointer_path_map["/foo"] = "foo"; - pointer_path_map["/foo/0"] = "/foo[0]"; - pointer_path_map["/"] = "//"; - pointer_path_map["/a~1b"] = "/a\\/b"; - pointer_path_map["/c%d"] = "c%d"; - pointer_path_map["/e^f"] = "e^f"; - pointer_path_map["/g|h"] = "g|h"; - pointer_path_map["/i\\j"] = "i\\\\j"; - pointer_path_map["/k\"l"] = "k\"l"; - pointer_path_map["/ "] = " "; - pointer_path_map["/m~0n"] = "m~n"; - - bool passed = true; - std::map::iterator i, e; - for (i = pointer_path_map.begin(), e = pointer_path_map.end(); i != e; ++i) { - if (verbose) { - cout << "Testing: \"" << i->first << "\" == \"" << i->second << "\""; - } - if (JSONPointerLookup(i->first, test_one) != test_one.GetPath(i->second)) { - passed = false; - if (verbose) { cout << " FAIL!"; } - } - if (verbose) { cout << endl; } - } - return passed; -} - -bool TestJSONDiff(bool verbose) { - -#define PRINT(x) if (verbose) { std::cout << x << std::endl; } else (void)0 - - Variant base = Variant() - .Set("a", Variant().Set("foo", 1)); - Variant expected = base.Copy(); - expected.SetPath("/a/b", 3); - - Variant diff = Variant() - .Set("op", "add") - .Set("path", "/a/b") - .Set("value", 3); - Variant comp = base.Copy(); - PRINT("Testing add /a/b"); - std::pair result = JSONPatch(comp, diff); - if (!result.first) { PRINT("Patch failed: " << result.second); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - base = Variant() - .Set("q", Variant().Set("bar", 2)); - comp = base.Copy(); - PRINT("Testing add /q/bar invalid"); - if (JSONPatch(comp, diff).first) { PRINT("Patch suceeded"); return false; } - if (comp != base) { PRINT("Expected: " << SerializeJSON(base) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - base = Variant() - .Set("list", Variant().Append(1).Append(2)) - .Set("a", Variant().Set("foo", 1)); - expected = base.Copy() - .Set("list", Variant().Append(1).Append(3).Append(2)); - diff = Variant() - .Set("op", "add") - .Set("path", "/list/1") - .Set("value", 3); - comp = base.Copy(); - PRINT("Testing add list"); - result = JSONPatch(comp, diff); - if (!result.first) { PRINT("Patch failed: " << result.second); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - expected = base.Copy(); - expected.At("list").Append(3); - - diff = Variant() - .Set("op", "add") - .Set("path", "/list/-") - .Set("value", 3); - comp = base.Copy(); - PRINT("Testing append list"); - result = JSONPatch(comp, diff); - if (!result.first) { PRINT("Patch failed: " << result.second); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - expected = base.Copy(); - base.SetPath("a/bar", 4); - diff = Variant() - .Set("op", "remove") - .Set("path", "/a/bar"); - comp = base.Copy(); - PRINT("Testing remove map"); - result = JSONPatch(comp, diff); - if (!result.first) { PRINT("Patch failed: " << result.second); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - diff = Variant() - .Set("op", "remove") - .Set("path", "/a/mar"); - expected = base.Copy(); - comp = base.Copy(); - PRINT("Testing remove not present"); - if (JSONPatch(comp, diff).first) { PRINT("Patch succeeded"); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - diff = Variant() - .Set("op", "remove") - .Set("path", "/c/mar"); - comp = base.Copy(); - PRINT("Testing invalid remove"); - if (JSONPatch(comp, diff).first) { PRINT("Patch succeeded"); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - diff = Variant() - .Set("op", "replace") - .Set("path", "/list/0") - .Set("value", 42); - comp = base.Copy(); - expected = comp.Copy(); - expected.SetPath("/list[0]", 42); - PRINT("Testing replace list element"); - result = JSONPatch(comp, diff); - if (!result.first) { PRINT("Patch failed: " << result.second); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - diff = Variant() - .Set("op", "replace") - .Set("path", "/a/foo") - .Set("value", 42); - comp = base.Copy(); - expected = comp.Copy(); - expected.SetPath("/a/foo", 42); - PRINT("Testing replace map element"); - result = JSONPatch(comp, diff); - if (!result.first) { PRINT("Patch failed: " << result.second); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - diff = Variant() - .Set("op", "replace") - .Set("path", "/a/moo") - .Set("value", 42); - comp = base.Copy(); - expected = comp.Copy(); - PRINT("Testing replace not present"); - if (JSONPatch(comp, diff).first) { PRINT("Patch succeeded"); } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - diff = Variant() - .Set("op", "replace") - .Set("path", "/a/foo") - .Set("value", 42); - comp = base.Copy(); - expected = comp.Copy(); - expected.SetPath("/a/foo", 42); - PRINT("Testing replace map element"); - result = JSONPatch(comp, diff); - if (!result.first) { PRINT("Patch failed: " << result.second); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - diff = Variant() - .Set("op", "move") - .Set("path", "/a/moo") - .Set("from", "/a/foo"); - comp = base.Copy(); - expected = comp.Copy(); - expected.SetPath("/a/moo", expected.GetPath("/a/foo")); - expected.ErasePath("/a/foo"); - PRINT("Testing move map element"); - result = JSONPatch(comp, diff); - if (!result.first) { PRINT("Patch failed: " << result.second); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - diff = Variant() - .Set("op", "copy") - .Set("path", "/a/moo") - .Set("from", "/a/foo"); - comp = base.Copy(); - expected = comp.Copy(); - expected.SetPath("/a/moo", expected.GetPath("/a/foo")); - PRINT("Testing copy map element"); - result = JSONPatch(comp, diff); - if (!result.first) { PRINT("Patch failed: " << result.second); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - PRINT("Diff: " << SerializeJSON(JSONDiff(base, comp))); - - diff = Variant() - .Set("op", "test") - .Set("path", "/a/foo") - .Set("value", 1); - comp = base.Copy(); - expected = comp.Copy(); - PRINT("Testing test map element"); - result = JSONPatch(comp, diff); - if (!result.first) { PRINT("Patch failed: " << result.second); return false; } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - diff = Variant() - .Append( Variant().Set("op", "add").Set("path", "/a/foo").Set("value", 2) ) - .Append( Variant().Set("op", "test").Set("path", "/a/foo").Set("value", 1) ) - ; - comp = base.Copy(); - expected = base.Copy(); - PRINT("Testing test map element, failing patch"); - if (JSONPatch(comp, diff).first) { PRINT("Patch succeeded"); } - if (comp != expected) { PRINT("Expected: " << SerializeJSON(expected) << "\nGot: " << SerializeJSON(comp)); return false; } - - return true; -} - -//============================================================================= diff --git a/src/hos_libvariant/src/libvariant/test/test_guess.cc b/src/hos_libvariant/src/libvariant/test/test_guess.cc deleted file mode 100644 index 1f33390f..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_guess.cc +++ /dev/null @@ -1,48 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include -#include "../../libvariant/include/Variant/Variant.h" -#include "../../libvariant/test/TestAssert.h" - -using namespace libvariant; -using namespace std; - -int main(int argc, char **argv) { - Variant v = Variant::MapType; - v["key1"] = 1; - v["blah"] = "murmur"; - v["foo"] = 1.2356; - v["bar"] = 49834; - const char *l[] = { "lisp", "erlang", "haskel", "python", "lua", "c", "c++", "java", "c#", "tcl", 0}; - for (const char **c = &l[0]; *c; c += 1) { v["l"].Append(*c); } - Variant v2; -#ifdef ENABLE_YAML - printf("As yaml\n"); - string yaml = SerializeYAML(v); - printf("%s\n", yaml.c_str()); - v2 = DeserializeGuess(yaml); - ASSERT(v2 == v); - - string empty = " #blah\nnull "; - v2 = DeserializeGuess(empty); - ASSERT(v2 == Variant::NullType); -#endif -#ifdef ENABLE_XML - printf("As xml plist\n"); - string xmlplist = SerializeXMLPLIST(v); - printf("%s\n", xmlplist.c_str()); - v2 = DeserializeGuess(xmlplist); - ASSERT(v2 == v); -#endif - printf("As JSON\n"); - string json = SerializeJSON(v); - printf("%s\n", json.c_str()); - v2 = DeserializeGuess(json); - ASSERT(v2 == v); - - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_json_parser.cc b/src/hos_libvariant/src/libvariant/test/test_json_parser.cc deleted file mode 100644 index ee6c14b7..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_json_parser.cc +++ /dev/null @@ -1,56 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include - -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/test/TestCommon.h" - -using namespace libvariant; - -static const char *input_document = "\n\n\n\n{\n" -"\"string\": \"value\",\n" -"\"int10\": 1234,\n" -"\"truth\": true,\n" -"\"float\": [ 0.1, 0.12, 1.0e-2 ],\n" -"\"strnum\": \"12345\"\n," -"\"maxuint64\": 18446744073709551615\n" -"}\n"; - -void ExpectedEvents(Emitter e) { - e.BeginDocument(); - e.BeginMap(); - e.Emit("string"), - e.Emit("value"), - e.Emit("int10"), - e.Emit(intmax_t(1234ll)), - e.Emit("truth"), - e.Emit(true), - e.Emit("float"), - e.BeginList(); - e.Emit(0.1), - e.Emit(.12), - e.Emit(1.0e-2), - e.EndList(); - e.Emit("strnum"), - e.Emit("12345"), - e.Emit("maxuint64"), - e.Emit((uintmax_t)std::numeric_limits::max()), - e.EndMap(); - e.EndDocument(); -} - -int main(int argc, char **argv) { - Parser parser = JSONParser(CreateParserInput(input_document)); - shared_ptr expected(new EventBuffer); - ExpectedEvents(Emitter(expected)); - shared_ptr result(new EventBuffer); - - result->Fill(parser); - - if (!ErrorCheckEventBuffer(expected, result)) { - return 1; - } - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_loadall.cc b/src/hos_libvariant/src/libvariant/test/test_loadall.cc deleted file mode 100644 index e825ca58..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_loadall.cc +++ /dev/null @@ -1,33 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include "../../libvariant/include/Variant/Variant.h" - -using namespace libvariant; - -const char test_string[] = "---\n" -"key1: value1\n" -"sublist: [ 1,2 ,3, 4]\n" -"...\n" -"---\n" -"second document\n" -"...\n" -"---\n" -"- a\n- b\n- c\n" -"...\n" -"--- last document\n"; - -int main(int argc, char **argv) { - - LoadAllIterator iter = DeserializeYAMLAll(test_string); - LoadAllIterator end; - while (iter != end) { - Variant v = *iter; - SerializeYAML(stdout, v); - ++iter; - } - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_memoryoutput.cc b/src/hos_libvariant/src/libvariant/test/test_memoryoutput.cc deleted file mode 100644 index 89825649..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_memoryoutput.cc +++ /dev/null @@ -1,30 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include - -#include "../../libvariant/include/Variant/Variant.h" -using namespace libvariant; - -int main(int argc, char **argv) { - Variant v; - v["a key"] = "some value"; - v["another key"] = 1234u; - std::vector buffer(8192); - printf("JSON\n"); - unsigned len = SerializeJSON(&buffer[0], buffer.size(), v); - fwrite(&buffer[0], len, 1, stdout); -#ifdef ENABLE_YAML - printf("\nYAML\n"); - len = SerializeYAML(&buffer[0], buffer.size(), v); - fwrite(&buffer[0], len, 1, stdout); -#endif -#ifdef ENABLE_XML - printf("\nPLIST\n"); - len = SerializeXMLPLIST(&buffer[0], buffer.size(), v); - fwrite(&buffer[0], len, 1, stdout); -#endif - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_numerics.cc b/src/hos_libvariant/src/libvariant/test/test_numerics.cc deleted file mode 100644 index f39a61a7..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_numerics.cc +++ /dev/null @@ -1,328 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include -#include -#include -#include -#include -#include - -#include "../../libvariant/include/Variant/Variant.h" -#include "../../libvariant/test/TestAssert.h" -using namespace libvariant; -using namespace std; - -ostream &operator<<(ostream &os, const type_info &t) { - const char *name = t.name(); - int status = -1; - char *dem = 0; - dem = abi::__cxa_demangle(name, 0, 0, &status); - if (status == 0) { - os << dem; - free(dem); - } else { - os << name; - } - return os; -} - -ostream &operator<<(ostream &os, const Variant &v) { - Serialize(os.rdbuf(), v, SERIALIZE_JSON); - return os; -} - -template -void assignCheck(T check) -{ - T a = check; - Variant b = a; - a = variant_cast(b); - if (a != check) { - ostringstream oss; - oss << "Assignment of " << check << " with type " << typeid(T) << " returned " << a; - throw runtime_error(oss.str()); - } - cout << "."; -} - -template -T my_modulus(T r, T l) { return r % l; } -template<> float my_modulus(float r, float l) { return fmod(r, l); } -template<> double my_modulus(double r, double l) { return fmod(r, l); } -template<> long double my_modulus(long double r, long double l) { return fmod(r, l); } - -template -void TestOperations(Variant::Type_t type) { - Variant val = Variant(); - ASSERT(val.IsNull()); - for (T i = 0; i < 1000; i += 10) { - val = Variant(i); - ASSERT(val.As() == i); - ASSERT(val.GetType() == type); - } - - Variant zero = T(0); - Variant one = T(1); - Variant two = T(2); - ASSERT(one + one == two); - ASSERT(one == T(1)); - ASSERT(two == T(2)); - ASSERT(two - one == one); - ASSERT(one == T(1)); - ASSERT(two == T(2)); - ASSERT(one - one == zero); - ASSERT(zero == T(0)); - ASSERT(one == T(1)); - ASSERT(two == T(2)); - ASSERT(zero == zero); - ASSERT(one / two == T(1)/T(2)); - ASSERT(one == T(1)); - ASSERT(two == T(2)); - ASSERT(two * two == T(2) * T(2)); - ASSERT(one == T(1)); - ASSERT(two == T(2)); - ASSERT((two + one) % two == my_modulus((T(2) + T(1)), T(2))); - ASSERT(one == T(1)); - ASSERT(two == T(2)); - // Test doesn't make sense if unsigned - if (!two.IsUnsigned()) { - ASSERT(-two == -T(2)); - } - ASSERT(two == T(2)); - val = two; - ASSERT(one == --val); - ASSERT(one == val); - val = two; - ASSERT(two == val--); - ASSERT(one == val); - val = one; - ASSERT(two == ++val); - ASSERT(two == val); - val = one; - ASSERT(one == val++); - ASSERT(two == val); -} - - -int main(int argc, char **argv) { - assignCheck(true); - assignCheck(false); - // max integer shall be preserved - assignCheck(numeric_limits::max()); - // min integer shall be preserved - assignCheck(numeric_limits::min()); - // max unsigned integer shall be preserved - assignCheck(numeric_limits::max()); - - - // float precision shall be preserved - float ff[] = { __FLT_EPSILON__, __FLT_MIN__, __FLT_MAX__ }; - float f; - for (uint32_t i=0; i(); - if (f!=ff[i]) { - ostringstream oss; - oss << "Float precision test" << v.As() << " != " << ff[i]; - throw runtime_error(oss.str()); - } - } - - // double precision shall be preserved - double dd[] = { __DBL_EPSILON__, __DBL_MIN__, __DBL_MAX__ }; - double d; - for (uint32_t i=0; i() << " != " << dd[i]; - throw runtime_error(oss.str()); - } - } - - // long double precision shall be preserved - long double ldd[] = { __LDBL_EPSILON__, __LDBL_MIN__, __LDBL_MAX__ }; - long double ld; - for (uint32_t i=0; i() << " != " << dd[i]; - throw runtime_error(oss.str()); - } - } - - cout << endl; - cout << "Math tests." << endl; - Variant v = 5; - Variant o = v + 5; - cout << o << endl; - ASSERT(o.AsInt() == 10); - o = v - 2; - cout << o << endl; - ASSERT(o.AsInt() == 3); - o = 7; - o /= 3; - cout << o << endl; - ASSERT(o.AsInt() == 2); - ASSERT(o.IsInt()); - v = 0.1; - cout << o << "/" << v << " = "; - o = o / v; - cout << o << endl; - ASSERT(o.IsFloat()); - o %= 9; - cout << o << endl; - o = 2; - v = o++; - cout << o << " " << v << endl; - ASSERT(v.AsInt() == 2); - ASSERT(o.AsInt() == 3); - --o; - v = o--; - ASSERT(v.AsInt() == 2); - ASSERT(o.AsInt() == 1); - Variant::Type_t extlist[] = { Variant::NullType, Variant::MapType, Variant::ListType, - Variant::StringType, Variant::BlobType, Variant::BoolType }; - - cout << "Verify that numerics throw on non-numeric types." << endl; - for (uint32_t i=0; i(Variant::IntegerType); - TestOperations(Variant::UnsignedType); - TestOperations(Variant::IntegerType); - TestOperations(Variant::UnsignedType); - TestOperations(Variant::IntegerType); - TestOperations(Variant::UnsignedType); - TestOperations(Variant::FloatType); - TestOperations(Variant::FloatType); - TestOperations(Variant::FloatType); - - cout << "Verifying numeric up convert." << endl; - - // T + T == T - { - Variant one(int(1)); - Variant two = one + one; - cout << one.GetType() << " + " << one.GetType() << " = " << two.GetType() << endl; - ASSERT(two == 2); - ASSERT(two.IsInt()); - } - { - Variant one(unsigned(1)); - Variant two = one + one; - cout << one.GetType() << " + " << one.GetType() << " = " << two.GetType() << endl; - ASSERT(two == 2u); - ASSERT(two.IsUnsigned()); - } - { - Variant one(double(1)); - Variant two = one + one; - cout << one.GetType() << " + " << one.GetType() << " = " << two.GetType() << endl; - ASSERT(two == 2.0); - ASSERT(two.IsFloat()); - } - // anything + float == float - { - Variant i_one(int(1)); - Variant f_one(float(1)); - Variant two = i_one + f_one; - cout << i_one.GetType() << " + " << f_one.GetType() << " = " << two.GetType() << endl; - ASSERT(two == 2.0); - ASSERT(two.IsFloat()); - } - { - Variant u_one(unsigned(1)); - Variant f_one(float(1)); - Variant two = u_one + f_one; - cout << u_one.GetType() << " + " << f_one.GetType() << " = " << two.GetType() << endl; - ASSERT(two == 2.0); - ASSERT(two.IsFloat()); - } - - // int + unsigned == unsigned - { - Variant u_one(unsigned(1)); - Variant i_one(int(1)); - Variant two = u_one + i_one; - cout << u_one.GetType() << " + " << i_one.GetType() << " = " << two.GetType() << endl; - ASSERT(two == 2u); - ASSERT(two.IsUnsigned()); - two = i_one + u_one; - cout << i_one.GetType() << " + " << u_one.GetType() << " = " << two.GetType() << endl; - ASSERT(two == 2u); - ASSERT(two.IsUnsigned()); - } - - cout << "PASS" << endl; - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_path.cc b/src/hos_libvariant/src/libvariant/test/test_path.cc deleted file mode 100644 index 84aaccc9..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_path.cc +++ /dev/null @@ -1,230 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include -#include "../../libvariant/include/Variant/Path.h" -#include "../../libvariant/include/Variant/Variant.h" -#include "../../libvariant/test/TestAssert.h" - -using namespace libvariant; -using namespace std; - -// { -// "key1": [ 1, 2, 3, { "blork": true } ], -// "key2": { -// "subkey": [ "a", { "furple": 1 }, 2 ], -// "sub/key2": true -// } -// } -// -// Then all paths enumerated are: -// Path Value -// "/" Identity -// "/key1" [ 1, 2, 3, { "blork": true } ], -// "/key1[0]" 1 -// "/key1[1]" 2 -// "/key1[2]" 3 -// "/key1[3]" { "blork": true } -// "/key1[3]/blork" true -// "/key2" { "subkey": [ "a", { "furple": 1 }, 2 ], "sub/key2": true } -// "/key2/subkey" [ "a", { "furple": 1 }, 2 ] -// "/key2/subkey[0]" "a" -// "/key2/subkey[1]" { "furple": 1 } -// "/key2/subkey[1]/furple" 1 -// "/key2/subkey[2]" 2 -// "/key2/sub\/key2" true -void TestOne() { - - Variant v = Variant::MapType; - Variant l = Variant::ListType; - l[0] = 1; l[1] = 2; l[2] = 3; - l[3] = Variant::MapType; - l[3]["blork"] = true; - v["key1"] = l; - Variant sub = Variant::MapType; - l = Variant::ListType; - l[0] = "a"; - l[1] = Variant::MapType; - l[1]["furple"] = 1; - l[2] = 2; - sub["subkey"] = l; - sub["sub/key"] = true; - v["key2"] = sub; - - ASSERT(v.GetPath("/") == v); - ASSERT(v.GetPath("") == v); - ASSERT(v.GetPath("/key1") == v["key1"]); - ASSERT(v.GetPath("/key1[0]") == v["key1"][0]); - ASSERT(v.GetPath("/key1[1]") == v["key1"][1]); - ASSERT(v.GetPath("/key1[2]") == v["key1"][2]); - ASSERT(v.GetPath("/key1[3]") == v["key1"][3]); - ASSERT(v.GetPath("/key1[3]/blork") == v["key1"][3]["blork"]); - ASSERT(v.GetPath("/key2") == v["key2"]); - ASSERT(v.GetPath("/key2/subkey") == v["key2"]["subkey"]); - ASSERT(v.GetPath("/key2/subkey[0]") == v["key2"]["subkey"][0]); - ASSERT(v.GetPath("/key2/subkey[1]") == v["key2"]["subkey"][1]); - ASSERT(v.GetPath("/key2/subkey[1]/furple") == v["key2"]["subkey"][1]["furple"]); - ASSERT(v.GetPath("/key2/subkey[2]") == v["key2"]["subkey"][2]); - ASSERT(v.GetPath("/key2/sub\\/key") == v["key2"]["sub/key"]); - - ASSERT(v.GetPath("/key1/") == v["key1"]); - ASSERT(v.GetPath("/key1[0]/") == v["key1"][0]); - ASSERT(v.GetPath("/key1[1]/") == v["key1"][1]); - ASSERT(v.GetPath("/key1[2]/") == v["key1"][2]); - ASSERT(v.GetPath("/key1[3]/") == v["key1"][3]); - ASSERT(v.GetPath("/key1[3]/blork/") == v["key1"][3]["blork"]); - ASSERT(v.GetPath("/key2/") == v["key2"]); - ASSERT(v.GetPath("/key2/subkey/") == v["key2"]["subkey"]); - ASSERT(v.GetPath("/key2/subkey[0]/") == v["key2"]["subkey"][0]); - ASSERT(v.GetPath("/key2/subkey[1]/") == v["key2"]["subkey"][1]); - ASSERT(v.GetPath("/key2/subkey[1]/furple/") == v["key2"]["subkey"][1]["furple"]); - ASSERT(v.GetPath("/key2/subkey[2]/") == v["key2"]["subkey"][2]); - ASSERT(v.GetPath("/key2/sub\\/key/") == v["key2"]["sub/key"]); - - ASSERT(!v.HasPath("/nothing")); - - ASSERT(v.GetPath("key1/") == v["key1"]); - ASSERT(v.GetPath("key1[0]/") == v["key1"][0]); - ASSERT(v.GetPath("key1[1]/") == v["key1"][1]); - ASSERT(v.GetPath("key1[2]/") == v["key1"][2]); - ASSERT(v.GetPath("key1[3]/") == v["key1"][3]); - ASSERT(v.GetPath("key1[3]/blork/") == v["key1"][3]["blork"]); - ASSERT(v.GetPath("key2/") == v["key2"]); - ASSERT(v.GetPath("key2/subkey/") == v["key2"]["subkey"]); - ASSERT(v.GetPath("key2/subkey[0]/") == v["key2"]["subkey"][0]); - ASSERT(v.GetPath("key2/subkey[1]/") == v["key2"]["subkey"][1]); - ASSERT(v.GetPath("key2/subkey[1]/furple/") == v["key2"]["subkey"][1]["furple"]); - ASSERT(v.GetPath("key2/subkey[2]/") == v["key2"]["subkey"][2]); - ASSERT(v.GetPath("key2/sub\\/key/") == v["key2"]["sub/key"]); - - - ASSERT(v.AtPath("key1/") == v["key1"]); - ASSERT(v.AtPath("key1[0]/") == v["key1"][0]); - ASSERT(v.AtPath("key1[1]/") == v["key1"][1]); - ASSERT(v.AtPath("key1[2]/") == v["key1"][2]); - ASSERT(v.AtPath("key1[3]/") == v["key1"][3]); - ASSERT(v.AtPath("key1[3]/blork/") == v["key1"][3]["blork"]); - ASSERT(v.AtPath("key2/") == v["key2"]); - ASSERT(v.AtPath("key2/subkey/") == v["key2"]["subkey"]); - ASSERT(v.AtPath("key2/subkey[0]/") == v["key2"]["subkey"][0]); - ASSERT(v.AtPath("key2/subkey[1]/") == v["key2"]["subkey"][1]); - ASSERT(v.AtPath("key2/subkey[1]/furple/") == v["key2"]["subkey"][1]["furple"]); - ASSERT(v.AtPath("key2/subkey[2]/") == v["key2"]["subkey"][2]); - ASSERT(v.AtPath("key2/sub\\/key/") == v["key2"]["sub/key"]); - - Variant o; - o["foo"] = v; - VariantRef p = o["foo"]; - ASSERT(p.AtPath("key1/") == v["key1"]); - ASSERT(p.GetPath("key1/") == v["key1"]); - ASSERT(!p.HasPath("/nothing")); - - try { - Variant v2; - v2 = v.AtPath("/nothing"); - VariantPrint(v2); - VariantPrint(v); - abort(); - } catch (const std::runtime_error &) {} - - try { - Variant v2 = v.AtPath("/nothing"); - VariantPrint(v2); - VariantPrint(v); - abort(); - } catch (const std::runtime_error &) {} - - try { - Variant v2 = v.AtPath("/key1/nothing"); - VariantPrint(v2); - abort(); - } catch (const std::runtime_error &) {} - - Variant v2; - v2.AtPath("abc/rxy") = 123; - VariantPrint(v2); - - Variant s; - s.SetPath("/key1[0]", 1) - .SetPath("/key1[1]", 2) - .SetPath("/key1[2]", 3) - .SetPath("/key1[3]/blork", true) - .SetPath("/key2/subkey[0]", "a") - .SetPath("/key2/subkey[1]/furple", 1) - .SetPath("/key2/subkey[2]", 2) - .SetPath("/key2/sub\\/key", true); - ASSERT(v == s); - - s.SetPath("/a/b/c", true); - ASSERT(s["a"]["b"]["c"].IsTrue()); - s.SetPath("/a/b/c", false); - ASSERT(s["a"]["b"]["c"].IsFalse()); - s.SetPath("/a/c[0]", 1); - ASSERT(s["a"]["c"][0].AsInt() == 1); - try { - s.SetPath("/a/c/c", 123); - abort(); - } catch (const std::runtime_error &) {} - try { - s.SetPath("/a/b/d[abc]", 1); - abort(); - } catch (const std::runtime_error &) {} -} - -void TestTwo() { - Variant l = Variant::ListType; - l.Append("a"); - l.Append("b"); - l.Append(Variant::MapType); - l[2]["a"] = 1; - l[2]["b"] = Variant::MapType; - l[2]["b"]["c"] = 3u; - ASSERT(l.GetPath("[0]") == "a"); - ASSERT(l.GetPath("[1]") == "b"); - ASSERT(l.GetPath("[2]/a") == 1); - ASSERT(l.GetPath("[2]/b/c") == 3u); - ASSERT(l.GetPath("[2]/b/c").IsUnsigned()); - ASSERT(l.GetPath("[3]/a", 4) == 4); - ASSERT(l.Contains(3) == false); - - Variant s; - s.SetPath("[0]", "a") - .SetPath("[1]", "b") - .SetPath("[2]/a", 1) - .SetPath("[2]/b/c", 3u); - ASSERT(l == s); - s.SetPath("[3]/a/b/c", 123); - ASSERT(s[3]["a"]["b"]["c"].AsInt() == 123); - try { - s.SetPath("/a/b/c", 123); - ASSERT(false); - } catch (const std::runtime_error &) {} - try { - s.GetPath("[a]"); - ASSERT(false); - } catch (const std::runtime_error &) {} -} - -int main(int argc, char **argv) { - TestOne(); - TestTwo(); - - Variant v; - Variant b = v.AtPath("abc/123", Variant::MapType); - ASSERT(b.IsMap()); - b["def"] = 123; - ASSERT(v["abc"].AtPath("123/def") == 123); - ASSERT(v["abc"].At("456", "foo") == "foo"); - ASSERT(v["abc"]["456"] == "foo"); - ASSERT(v["abc"].AtPath("123/rst", "abc") == "abc"); - ASSERT(b["rst"] == "abc"); - b = v.At("list", Variant::ListType); - ASSERT(b.IsList()); - ASSERT(v.AtPath("list[1]", "123") == "123"); - ASSERT(v.AtPath("list[0]/abc", "abc") == "abc"); - VariantPrint(v); - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_payload.cc b/src/hos_libvariant/src/libvariant/test/test_payload.cc deleted file mode 100644 index 10657de4..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_payload.cc +++ /dev/null @@ -1,121 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include -#include -#include "../../libvariant/include/Variant/ParserInput.h" -#include "../../libvariant/include/Variant/Payload.h" -#include "../../libvariant/test/TestAssert.h" - -using namespace libvariant; -using namespace std; - -#define TESTPAYLOAD \ -"1234567890"\ -"1234567890"\ -"1234567890"\ -"1234567890"\ -"1234567890"\ -"1234567890"\ -"1234567890"\ -"1234567890"\ -"1234567890"\ -"1234567890" - -#define TESTPAYLOAD_LEN 100 -#define TESTPAYLOAD_LEN_STR "100" - -const char test_input[] = -"{\"payload\": { \"length\": " TESTPAYLOAD_LEN_STR " }, \"abc\": 123 }" -"\n\n\n\n\n" -"\0" -TESTPAYLOAD - -"{\"payload\": { \"length\": " TESTPAYLOAD_LEN_STR ", \"data\": null }, \"abc\": 123 }" -"\n\n\n\n\n" -"\n\n\n\n\n" -"\0" -TESTPAYLOAD -"{ \"abc\": 123 }" -"\0" -"{ \"payload\": { \"length\": " TESTPAYLOAD_LEN_STR "} }" -"\n\n\n\n\n" -"\n\n\n\n\n" -"\n\n\n\n\n" -"\0" -TESTPAYLOAD -"{ \"payload\": { \"length\": 0 } }" -; - -void TestParse() { - shared_ptr input(CreateParserInput(&test_input[0], sizeof(test_input) - 1)); - const char *datapath = "/payload/data"; - const char *lenpath = "/payload/length"; - Variant params = Variant().Set("length_path", lenpath).Set("data_path", datapath); - - Variant v = DeserializeWithPayload(input, SERIALIZE_JSON, params); - ASSERT(v.GetPath(lenpath) == 100); - ASSERT(v.GetPath("abc") == 123); - BlobPtr b = v.GetPath(datapath).AsBlob(); - ASSERT(b->GetNumBuffers() == 1); - ASSERT(memcmp(b->GetPtr(0), TESTPAYLOAD, TESTPAYLOAD_LEN) == 0); - - v = DeserializeWithPayload(input, SERIALIZE_JSON, params); - ASSERT(v.GetPath(lenpath) == 100); - ASSERT(v.GetPath("abc") == 123); - b = v.GetPath(datapath).AsBlob(); - ASSERT(b->GetNumBuffers() == 1); - ASSERT(memcmp(b->GetPtr(0), TESTPAYLOAD, TESTPAYLOAD_LEN) == 0); - - v = DeserializeWithPayload(input, SERIALIZE_JSON, params); - ASSERT(v.HasPath(datapath) == false); - ASSERT(v.GetPath("abc") == 123); - ASSERT(v.HasPath(lenpath) == false); - - v = DeserializeWithPayload(input, SERIALIZE_JSON, Variant(params.Copy()).Set("data_path", "other/data")); - ASSERT(v.GetPath(lenpath) == 100); - b = v.GetPath("other/data").AsBlob(); - ASSERT(b->GetNumBuffers() == 1); - ASSERT(memcmp(b->GetPtr(0), TESTPAYLOAD, TESTPAYLOAD_LEN) == 0); - - v = DeserializeWithPayload(input, SERIALIZE_JSON, params); - ASSERT(v.GetPath(lenpath) == 0); - ASSERT(v.HasPath(datapath) == false); -} - -void TestEmit() { - - Variant params; - params.Set("length_path", "payload/length").Set("data_path", "other/data"); - Variant v; - BlobPtr b = Blob::CreateCopy(TESTPAYLOAD, TESTPAYLOAD_LEN); - v.SetPath("other/data", b); - SerializeWithPayload(cout.rdbuf(), v, SERIALIZE_JSON, params); - cout << "\n--------------------------------------------------------------------------------\n"; - params.Set("ignore_payload", true); - SerializeWithPayload(cout.rdbuf(), v, SERIALIZE_JSON, params); - cout << "\n--------------------------------------------------------------------------------\n"; - params.Set("ignore_payload", false); - params.Set("payload_length", 5); - SerializeWithPayload(cout.rdbuf(), v, SERIALIZE_JSON, params); - cout << "\n--------------------------------------------------------------------------------\n"; - params.Set("ignore_payload", true); - params.Set("payload_length", 5); - SerializeWithPayload(cout.rdbuf(), v, SERIALIZE_JSON, params); - cout << "\n\n"; -} - -int main(int argc, char **argv) { -try{ - TestParse(); - TestEmit(); - cout << endl; -} catch (const std::exception &e) { - cerr << e.what() << endl; - exit(1); -} - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_roundtrip.cc b/src/hos_libvariant/src/libvariant/test/test_roundtrip.cc deleted file mode 100644 index 34f7d96e..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_roundtrip.cc +++ /dev/null @@ -1,91 +0,0 @@ -#include -#include - -#include "../../libvariant/include/Variant/Variant.h" -using namespace libvariant; -using namespace std; - -#include - -int DoTest(SerializeType stype) { - Variant v1; - v1["bool_true"] = true; - v1["bool_false"] = false; - v1["long_double_max"] = numeric_limits::max(); - v1["long_double_min"] = numeric_limits::min(); - v1["double_max"] = numeric_limits::max(); - v1["double_min"] = numeric_limits::min(); - v1["int_max"] = numeric_limits::max(); - v1["int_min"] = numeric_limits::min(); - v1["uint_max"] = numeric_limits::max(); - v1["uint_min"] = numeric_limits::min(); - - string s = Serialize(v1, stype); - Variant v2 = Deserialize(s, stype); - - int result = 0; - - if (variant_cast(v2["bool_true"]) != true) { - cerr << "bool true failed" << endl; - result++; - } - if (variant_cast(v2["bool_false"]) != false) { - cerr << "bool false failed" << endl; - result++; - } - -#if 0 - // long double doesn't roundtrip! - - if (variant_cast(v2["long_double_max"]) != numeric_limits::max()) { - cerr << "long double max failed" << endl; - result++; - } - if (variant_cast(v2["long_double_min"]) != numeric_limits::min()) { - cerr << "long double min failed" << endl; - result++; - } -#endif - - if (variant_cast(v2["double_max"]) != numeric_limits::max()) { - cerr << "double max failed" << endl; - result++; - } - if (variant_cast(v2["double_min"]) != numeric_limits::min()) { - cerr << "double min failed" << endl; - result++; - } - - if (variant_cast(v2["int_max"]) != numeric_limits::max()) { - cerr << "intmax_t max failed" << endl; - result++; - } - if (variant_cast(v2["int_min"]) != numeric_limits::min()) { - cerr << "intmax_t min failed" << endl; - result++; - } - - if (variant_cast(v2["uint_max"]) != numeric_limits::max()) { - cerr << "uintmax_t max failed" << endl; - result++; - } - if (variant_cast(v2["uint_min"]) != numeric_limits::min()) { - cerr << "uintmax_t min failed" << endl; - result++; - } - - return result; -} - -int main(int argv, char** argc) { - int result = 0; - result += DoTest(SERIALIZE_JSON); -#if ENABLE_YAML - result += DoTest(SERIALIZE_YAML); -#endif -#if ENABLE_XML - result += DoTest(SERIALIZE_XMLPLIST); -#endif - result += DoTest(SERIALIZE_BUNDLEHDR); - return result; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_schema.cc b/src/hos_libvariant/src/libvariant/test/test_schema.cc deleted file mode 100644 index ba087367..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema.cc +++ /dev/null @@ -1,410 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ - -#include -#include -#include -#include -#include -#include -#include -#include "../../libvariant/include/Variant/Schema.h" -#include "../../libvariant/include/Variant/SchemaLoader.h" - -using namespace libvariant; -using namespace std; - -int TestNormalise() { - int ret = 0; - cout << "Test Normalise\n"; - - cout << "normalise - untouched immediate $ref "; - Variant schema; - schema["items"]["$ref"] = "#"; - SchemaLoader::NormSchema(schema, ""); - if (schema["items"]["$ref"] == "#") { - cout << "PASS" << endl; - } else { - cout << "!!! FAIL !!!" << endl; - ++ret; - abort(); - } - - cout << "normalise - id as base "; - schema = Variant::NullType; - schema["id"] = "baseUrl"; - schema["items"]["$ref"] = "#"; - SchemaLoader::NormSchema(schema, ""); - if (schema["items"]["$ref"] == "baseUrl#") { - cout << "PASS" << endl; - } else { - cout << "!!! FAIL !!!" << endl; - ++ret; - abort(); - } - - cout << "normalise - id relative to parent "; - schema = Variant::NullType; - schema["id"] = "http://example.com/schema"; - schema["items"]["id"] = "otherSchema"; - schema["items"]["items"]["$ref"] = "#"; - SchemaLoader::NormSchema(schema, ""); - if (schema["items"]["id"] == "http://example.com/otherSchema" - && schema["items"]["items"]["$ref"] == "http://example.com/otherSchema#" - ) { - cout << "PASS" << endl; - } else { - cout << "!!! FAIL !!!" << endl; - ++ret; - abort(); - } - - cout << "normalise - do not touch contents of \"enum\" "; - - schema = Variant::NullType; - schema["id"] = "http://example.com/schema"; - schema["items"]["id"] = "otherSchema"; - schema["items"]["enum"][0]["$ref"] = "#"; - SchemaLoader::NormSchema(schema, ""); - - if (schema["items"]["enum"][0]["$ref"] == "#") { - cout << "PASS" << endl; - } else { - cout << "!!! FAIL !!!" << endl; - ++ret; - abort(); - } - - cout << "Only normalise id and $ref if they are strings "; - schema = Variant::NullType; - schema["properties"]["id"]["type"] = "integer"; - schema["properties"]["$ref"]["type"] = "integer"; - Variant data; - data["id"] = "test"; - data["$ref"] = "test"; - SchemaLoader::NormSchema(schema, ""); - if (!SchemaValidate(schema, data).Error()) { - cout << " !!! FAIL !!! " << endl; - ++ret; - abort(); - } else { - cout << " PASS " << endl; - } - - return ret; -} - -bool TestMissingHandler(SchemaLoader *sb, const std::string &uri, SchemaLoader::LoaderError &error, void *m) { - vector &missing = *(vector*)(m); - cout << endl; - cout << "Validator missing schema: \"" << uri << "\"" << endl; - missing.push_back(uri); - return true; -} - -int TestFile(const std::string &testfile) { - int ret = 0; - cout << "Processing file " << testfile << endl; - cout << "-------------------------------------\n"; - cout.flush(); - Variant tests = DeserializeJSONFile(testfile.c_str()); - for (Variant::ListIterator i(tests.ListBegin()), e(tests.ListEnd()); i != e; ++i) { - std::string name = i->At("name").AsString(); - Variant data = i->At("data"); - Variant schema = i->At("schema"); - bool fail = i->Get("fail", false).AsBool(); - bool exception = i->Get("exception", false).AsBool(); - cout << "Running " << (fail ? "negative " : "") << "test \"" << name << "\" "; - cout.flush(); - SchemaLoader loader; - std::vector missing; - loader.SetMissingHandler(&TestMissingHandler, &missing); - SchemaResult result; - try { - result = SchemaValidate(schema, data, &loader); - } catch (const std::exception &e) { - if (exception) { - cout << " PASS with exception\n"; - cout << e.what() << endl; - continue; - } - cout << "\n!!!!FAIL!!!!\n"; - cout << e.what() << endl; - ++ret; - abort(); - } - if (exception) { - cout << "\n!!!!FAIL!!!!\n"; - cout << "Excepted SchemaValidate to throw!\n"; - ++ret; - abort(); - } - - for (unsigned k = 0; k < missing.size(); ++k) { - bool found = false; - Variant m = i->Get("missing", Variant::ListType); - for (Variant::ListIterator j(m.ListBegin()), e(m.ListEnd()); j != e && !found; ++j) { - if (*j == missing[k]) { - found = true; - } - } - if (!found) { - cout << "\n!!!!FAIL!!!!\n"; - cout << "Unexpected missing schema: \"" << missing[k] << "\"\n"; - ++ret; - abort(); - } - } - - if (fail && !result.Error()) { - cout << "\n!!!!!FAIL!!!!!\n"; - cout << result; - ++ret; - abort(); - } else if (!fail && result.Error()) { - cout << "\n!!!!!FAIL!!!!!\n"; - cout << result; - ++ret; - abort(); - } else { - cout << " PASS"; - if (result.Error()) { - cout << endl << result; - } - } - cout << endl; - } - cout << endl; - return ret; -} - -int TestDirectory(const std::string &dirname) { - int ret = 0; - DIR *dir = opendir(dirname.c_str()); - if (!dir) { return 1; } - cout << "\nProcessing " << dirname << " for tests." << endl; - cout << "=========================================\n"; - dirent *ep; - while ((ep = readdir(dir))) { - string fname = ep->d_name; - if (fname == ".") continue; - if (fname == "..") continue; - if (ep->d_type == DT_REG) { - if (fname.find(".") < fname.size() && fname.substr(fname.rfind(".")) == ".test") { - ret += TestFile(dirname + "/" + fname); - } - } - if (ep->d_type == DT_DIR) { - ret += TestDirectory(dirname + "/" + fname); - } - } - cout << endl; - closedir(dir); - return ret; -} - -int TestSchemaLoader() { - cout << "Test advanced schema loader\n"; - int ret = 0; - Variant data = DeserializeGuessFile(TEST_SCHEMA_DATA "/simple-test.json"); - Variant faildata = DeserializeGuessFile(TEST_SCHEMA_DATA "/simple-test-fail.json"); - try { - AdvSchemaLoader loader; - SchemaResult result = SchemaValidate("simple-test-schema.json", data, &loader); - cout << "Look up of schema without path succeeded."; - abort(); - ++ret; - } catch (const std::exception &e) {} - cout << endl; - - { - AdvSchemaLoader loader; - cout << "Testing absolute path.\n"; - SchemaResult result = SchemaValidate(TEST_SCHEMA_DATA "/simple-test-schema.json", data, &loader); - SchemaResult failresult = SchemaValidate(TEST_SCHEMA_DATA "/simple-test-schema.json", faildata, &loader); - if (result.Error()) { - cout << result << endl; - ++ret; - } - if (!failresult.Error()) { - cout << "!!! Negative test failed\n"; - ++ret; - } else { - //cout << failresult << endl; - } - } - cout << endl; - - { - AdvSchemaLoader loader; - cout << "Testing advanced schema loader, loading a file through the path.\n"; - loader.AddPath(TEST_SCHEMA_DATA); - SchemaResult result = SchemaValidate("simple-test-schema.json", data, &loader); - SchemaResult failresult = SchemaValidate("simple-test-schema.json", faildata, &loader); - if (result.Error()) { - cout << result << endl; - ++ret; - } - if (!failresult.Error()) { - cout << "!!! Negative test failed\n"; - ++ret; - } else { - //cout << failresult << endl; - } - } - cout << endl; - - { - AdvSchemaLoader loader; - cout << "Testing file:// absolute path\n"; - SchemaResult result = SchemaValidate("file://" TEST_SCHEMA_DATA "/simple-test-schema.json", data, &loader); - SchemaResult failresult = SchemaValidate("file://" TEST_SCHEMA_DATA "/simple-test-schema.json", faildata, &loader); - if (result.Error()) { - cout << result << endl; - ++ret; - } - if (!failresult.Error()) { - cout << "!!! Negative test failed\n"; - ++ret; - abort(); - } else { - //cout << failresult << endl; - } - } - cout << endl; - - { - AdvSchemaLoader loader; - cout << "Testing file:// relative path\n"; - loader.AddPath(TEST_SCHEMA_DATA); - SchemaResult result = SchemaValidate("file://" "simple-test-schema.json", data, &loader); - SchemaResult failresult = SchemaValidate("file://" "simple-test-schema.json", faildata, &loader); - if (result.Error()) { - cout << result << endl; - ++ret; - } - if (!failresult.Error()) { - cout << "!!! Negative test failed\n"; - ++ret; - abort(); - } else { - //cout << failresult << endl; - } - } - cout << endl; - - try { - AdvSchemaLoader loader; - loader.AddPath(TEST_SCHEMA_DATA); - cout << "Test that missing schema works right...\n"; - SchemaResult result = SchemaValidate("abc-no-such-schema", data, &loader); - cout << "Failed!\n"; - ++ret; - } catch (const std::exception &e) { - cout << "Error:\n" << e.what() << endl; - } - - return ret; -} - -int TestSchemaDefaults() { - cerr << "Testing schema defaults\n"; - int ret = 0; - Variant schema; - schema.SetPath("properties/foo/default", 123) - .SetPath("properties/bar/default", "abc") - .SetPath("default/foo", 456) - .SetPath("default/bar", "def") - .SetPath("properties/list/items/default", false) - .SetPath("definitions/zero/default", 0) - .SetPath("properties/zero/$ref", "#/definitions/zero"); - - - Variant data; - AddSchemaDefaults(schema, data); - if ((data["foo"] != 456 || data["bar"] != "def") && !data.Contains("list")) { - cerr << "Defaults test failed:\n" - "Got: \n"; - Serialize(cerr.rdbuf(), data, SERIALIZE_JSON); - ++ret; - } - data.Erase("foo"); - AddSchemaDefaults(schema, data); - if (data["foo"] != 123 || !data["list"][0].IsFalse() || data["zero"] != 0) { - cerr << "Defaults test failed:\n" - "Got: \n"; - Serialize(cerr.rdbuf(), data, SERIALIZE_JSON); - ++ret; - } - schema.SetPath("properties/alltest/allOf[0]/default", "test"); - AddSchemaDefaults(schema, data); - if (data["alltest"] != "test") { - cerr << "Defaults test failed:\n" - "Got: \n"; - Serialize(cerr.rdbuf(), data, SERIALIZE_JSON); - ++ret; - } - return ret; -} - -int main(int argc, char **argv) { - while (true) { - int c = getopt(argc, argv, "f:"); - if (c == -1) { break; } - switch (c) { - case 'f': - return TestFile(optarg); - default: - break; - } - - } - int i = 0; - int ret = 0; - cout << "Testing SchemaLoader::ResolveURI "; - std::string ruri_file = TEST_SCHEMA_DATA; - ruri_file += "/test_resolveuri.json"; - Variant v = DeserializeJSONFile(ruri_file.c_str()); - while (true) { - std::string ref, base, expected; - ref = v[3*i].AsString(); - base = v[3*i+1].AsString(); - expected = v[3*i+2].AsString(); - if (ref == "" && base == "" && expected == "") { break; } - string res = SchemaLoader::ResolveURI(base, ref); - if (res != expected) { - cout << "\nResolveURI test " << i << " failed\n" - << "ref: \"" << ref << "\"\n" - << "base: \"" << base << "\"\n" - << "result: \"" << res << "\"\n" - << "expected: \"" << expected << "\"" - << endl; - ++ret; - abort(); - } else if (i%5 == 0) { - cout << "."; - cout.flush(); - } - ++i; - } - cout << endl; - - ret += TestNormalise(); - - cout << "Performing schema validation tests" << endl; - ret += TestDirectory(TEST_SCHEMA_DATA); - - ret += TestSchemaLoader(); - - ret += TestSchemaDefaults(); - - cerr << "================================================================================\n"; - if (ret > 0) { - cerr << "FAIL!\n"; - } else { - cerr << "All tests PASS\n"; - } - return ret == 0 ? 0 : 1; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/invalid-schema.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/invalid-schema.test deleted file mode 100644 index ad8b3443..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/invalid-schema.test +++ /dev/null @@ -1,168 +0,0 @@ -[ - { - "name": "Invalid anyOf", - "schema": { - "anyOf": { "type": "integer" } - }, - "data": 1234, - "fail": true - }, - { - "name": "Invalid allOf", - "schema": { - "allOf": { "type": "integer" } - }, - "data": 1234, - "fail": true - }, - { - "name": "Invalid oneOf", - "schema": { - "oneOf": { "type": "integer" } - }, - "data": 1234, - "fail": true - }, - { - "name": "Invalid dependencies 1", - "schema": { - "dependencies": 123 - }, - "data": { "a": 1, "b": 2 }, - "fail": true - }, - { - "name": "Invalid dependencies 1", - "schema": { - "dependencies": { "a": 123 } - }, - "data": { "a": 1, "b": 2 }, - "fail": true - }, - { - "name": "Invalid pattern property regex", - "schema": { - "patternProperties": { - "[": {} - } - }, - "data": { - "abc": 123 - }, - "fail": true - }, - { - "name": "Invalid pattern property not an object", - "schema": { - "patternProperties": 123 - }, - "data": { - "abc": 123 - }, - "fail": true - }, - { - "name": "Inavlid properties, not an object", - "schema": { - "properties": 123 - }, - "data": { "abc": 123 }, - "fail": true - }, - { - "name": "uniqueItems not a bool", - "schema": { - "uniqueItems": 123 - }, - "data": [ 1,2,3 ], - "fail": true - }, - { - "name": "minItems not a number", - "schema": { - "minItems": "abc" - }, - "data": [ 1,2,3 ], - "fail": true - }, - { - "name": "maxItems not a number", - "schema": { - "maxItems": "abc" - }, - "data": [ 1,2,3 ], - "fail": true - }, - { - "name": "string pattern not a string", - "schema": { - "pattern": 123 - }, - "data": "abc", - "fail": true - }, - { - "name": "string pattern invalid regex", - "schema": { - "pattern": "[" - }, - "data": "abc", - "fail": true - }, - { - "name": "required keys not a list", - "schema": { - "required": "abc" - }, - "data": { "a": 1, "b": 2 }, - "fail": true - }, - { - "name": "minProperties not a number", - "schema": { - "minProperties": "abc" - }, - "data": { "a": 1, "b": 2 }, - "fail": true - }, - { - "name": "maxProperties not a number", - "schema": { - "maxProperties": "abc" - }, - "data": { "a": 1, "b": 2 }, - "fail": true - }, - { - "name": "minLength not a number", - "schema": { - "minLength": "abc" - }, - "data": "abc", - "fail": true - }, - { - "name": "maxLength not a number", - "schema": { - "maxLength": "abc" - }, - "data": "abc", - "fail": true - }, - { - "name": "minimum not a number", - "schema": { - "minimum": "abc" - }, - "data": 123, - "fail": true - }, - { - "name": "maximum not a number", - "schema": { - "maximum": "abc" - }, - "data": 123, - "fail": true - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/invalid_path.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/invalid_path.test deleted file mode 100644 index 72464395..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/invalid_path.test +++ /dev/null @@ -1,34 +0,0 @@ -[ - { - "name": "Invalid ref paths - malformed", - "schema": { - "definitions": { - "foo": { - "type": "string" - } - }, - "type": "object", - "properties": { - "foo": { "$ref": "#definitions/foo" } - } - }, - "data": { "foo": "abc" }, - "exception": true - }, - { - "name": "Invalid ref paths - path does not match", - "schema": { - "definitions": { - "foo": { - "type": "string" - } - }, - "type": "object", - "properties": { - "foo": { "$ref": "#/definitions/bar/mar" } - } - }, - "data": { "foo": 123 }, - "exception": true - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/Makefile b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/Makefile deleted file mode 100644 index 01e90387..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/Makefile +++ /dev/null @@ -1,7 +0,0 @@ - -TARGETS := $(patsubst %.json,%.test,$(wildcard *.json)) - -all: $(TARGETS) - -%.test: %.json - python convert.py < $< > $@ diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/README b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/README deleted file mode 100644 index a14cc8fe..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/README +++ /dev/null @@ -1,26 +0,0 @@ - -The tests in this folder where copied directly from jsonschema by Julian -https://github.com/Julian/jsonschema -https://python-jsonschema.readthedocs.org/ - -Copyright (c) 2013 Julian Berman - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalItems.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalItems.json deleted file mode 100644 index 521745c8..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalItems.json +++ /dev/null @@ -1,82 +0,0 @@ -[ - { - "description": "additionalItems as schema", - "schema": { - "items": [{}], - "additionalItems": {"type": "integer"} - }, - "tests": [ - { - "description": "additional items match schema", - "data": [ null, 2, 3, 4 ], - "valid": true - }, - { - "description": "additional items do not match schema", - "data": [ null, 2, 3, "foo" ], - "valid": false - } - ] - }, - { - "description": "items is schema, no additionalItems", - "schema": { - "items": {}, - "additionalItems": false - }, - "tests": [ - { - "description": "all items match schema", - "data": [ 1, 2, 3, 4, 5 ], - "valid": true - } - ] - }, - { - "description": "array of items with no additionalItems", - "schema": { - "items": [{}, {}, {}], - "additionalItems": false - }, - "tests": [ - { - "description": "no additional items present", - "data": [ 1, 2, 3 ], - "valid": true - }, - { - "description": "additional items are not permitted", - "data": [ 1, 2, 3, 4 ], - "valid": false - } - ] - }, - { - "description": "additionalItems as false without items", - "schema": {"additionalItems": false}, - "tests": [ - { - "description": - "items defaults to empty schema so everything is valid", - "data": [ 1, 2, 3, 4, 5 ], - "valid": true - }, - { - "description": "ignores non-arrays", - "data": {"foo" : "bar"}, - "valid": true - } - ] - }, - { - "description": "additionalItems are allowed by default", - "schema": {"items": [{"type": "integer"}]}, - "tests": [ - { - "description": "only the first item is validated", - "data": [1, "foo", false], - "valid": true - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalItems.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalItems.test deleted file mode 100644 index abe443c8..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalItems.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": [null, 2, 3, 4], "name": "additionalItems as schema -- additional items match schema", "schema": {"items": [{}], "additionalItems": {"type": "integer"}}}, {"fail": true, "data": [null, 2, 3, "foo"], "name": "additionalItems as schema -- additional items do not match schema", "schema": {"items": [{}], "additionalItems": {"type": "integer"}}}, {"fail": false, "data": [1, 2, 3, 4, 5], "name": "items is schema, no additionalItems -- all items match schema", "schema": {"items": {}, "additionalItems": false}}, {"fail": false, "data": [1, 2, 3], "name": "array of items with no additionalItems -- no additional items present", "schema": {"items": [{}, {}, {}], "additionalItems": false}}, {"fail": true, "data": [1, 2, 3, 4], "name": "array of items with no additionalItems -- additional items are not permitted", "schema": {"items": [{}, {}, {}], "additionalItems": false}}, {"fail": false, "data": [1, 2, 3, 4, 5], "name": "additionalItems as false without items -- items defaults to empty schema so everything is valid", "schema": {"additionalItems": false}}, {"fail": false, "data": {"foo": "bar"}, "name": "additionalItems as false without items -- ignores non-arrays", "schema": {"additionalItems": false}}, {"fail": false, "data": [1, "foo", false], "name": "additionalItems are allowed by default -- only the first item is validated", "schema": {"items": [{"type": "integer"}]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalProperties.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalProperties.json deleted file mode 100644 index c997f75d..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalProperties.json +++ /dev/null @@ -1,63 +0,0 @@ -[ - { - "description": - "additionalProperties being false does not allow other properties", - "schema": { - "properties": {"foo": {}, "bar": {}}, - "additionalProperties": false - }, - "tests": [ - { - "description": "no additional properties is valid", - "data": {"foo": 1}, - "valid": true - }, - { - "description": "an additional property is invalid", - "data": {"foo" : 1, "bar" : 2, "quux" : "boom"}, - "valid": false - }, - { - "description": "ignores non-objects", - "data": [1, 2, 3], - "valid": true - } - ] - }, - { - "description": - "additionalProperties allows a schema which should validate", - "schema": { - "properties": {"foo": {}, "bar": {}}, - "additionalProperties": {"type": "boolean"} - }, - "tests": [ - { - "description": "no additional properties is valid", - "data": {"foo": 1}, - "valid": true - }, - { - "description": "an additional valid property is valid", - "data": {"foo" : 1, "bar" : 2, "quux" : true}, - "valid": true - }, - { - "description": "an additional invalid property is invalid", - "data": {"foo" : 1, "bar" : 2, "quux" : 12}, - "valid": false - } - ] - }, - { - "description": "additionalProperties are allowed by default", - "schema": {"properties": {"foo": {}, "bar": {}}}, - "tests": [ - { - "description": "additional properties are allowed", - "data": {"foo": 1, "bar": 2, "quux": true}, - "valid": true - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalProperties.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalProperties.test deleted file mode 100644 index 016cc774..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/additionalProperties.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": {"foo": 1}, "name": "additionalProperties being false does not allow other properties -- no additional properties is valid", "schema": {"additionalProperties": false, "properties": {"foo": {}, "bar": {}}}}, {"fail": true, "data": {"quux": "boom", "foo": 1, "bar": 2}, "name": "additionalProperties being false does not allow other properties -- an additional property is invalid", "schema": {"additionalProperties": false, "properties": {"foo": {}, "bar": {}}}}, {"fail": false, "data": [1, 2, 3], "name": "additionalProperties being false does not allow other properties -- ignores non-objects", "schema": {"additionalProperties": false, "properties": {"foo": {}, "bar": {}}}}, {"fail": false, "data": {"foo": 1}, "name": "additionalProperties allows a schema which should validate -- no additional properties is valid", "schema": {"additionalProperties": {"type": "boolean"}, "properties": {"foo": {}, "bar": {}}}}, {"fail": false, "data": {"quux": true, "foo": 1, "bar": 2}, "name": "additionalProperties allows a schema which should validate -- an additional valid property is valid", "schema": {"additionalProperties": {"type": "boolean"}, "properties": {"foo": {}, "bar": {}}}}, {"fail": true, "data": {"quux": 12, "foo": 1, "bar": 2}, "name": "additionalProperties allows a schema which should validate -- an additional invalid property is invalid", "schema": {"additionalProperties": {"type": "boolean"}, "properties": {"foo": {}, "bar": {}}}}, {"fail": false, "data": {"quux": true, "foo": 1, "bar": 2}, "name": "additionalProperties are allowed by default -- additional properties are allowed", "schema": {"properties": {"foo": {}, "bar": {}}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/allOf.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/allOf.json deleted file mode 100644 index bbb5f89e..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/allOf.json +++ /dev/null @@ -1,112 +0,0 @@ -[ - { - "description": "allOf", - "schema": { - "allOf": [ - { - "properties": { - "bar": {"type": "integer"} - }, - "required": ["bar"] - }, - { - "properties": { - "foo": {"type": "string"} - }, - "required": ["foo"] - } - ] - }, - "tests": [ - { - "description": "allOf", - "data": {"foo": "baz", "bar": 2}, - "valid": true - }, - { - "description": "mismatch second", - "data": {"foo": "baz"}, - "valid": false - }, - { - "description": "mismatch first", - "data": {"bar": 2}, - "valid": false - }, - { - "description": "wrong type", - "data": {"foo": "baz", "bar": "quux"}, - "valid": false - } - ] - }, - { - "description": "allOf with base schema", - "schema": { - "properties": {"bar": {"type": "integer"}}, - "required": ["bar"], - "allOf" : [ - { - "properties": { - "foo": {"type": "string"} - }, - "required": ["foo"] - }, - { - "properties": { - "baz": {"type": "null"} - }, - "required": ["baz"] - } - ] - }, - "tests": [ - { - "description": "valid", - "data": {"foo": "quux", "bar": 2, "baz": null}, - "valid": true - }, - { - "description": "mismatch base schema", - "data": {"foo": "quux", "baz": null}, - "valid": false - }, - { - "description": "mismatch first allOf", - "data": {"bar": 2, "baz": null}, - "valid": false - }, - { - "description": "mismatch second allOf", - "data": {"foo": "quux", "bar": 2}, - "valid": false - }, - { - "description": "mismatch both", - "data": {"bar": 2}, - "valid": false - } - ] - }, - { - "description": "allOf simple types", - "schema": { - "allOf": [ - {"maximum": 30}, - {"minimum": 20} - ] - }, - "tests": [ - { - "description": "valid", - "data": 25, - "valid": true - }, - { - "description": "mismatch one", - "data": 35, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/allOf.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/allOf.test deleted file mode 100644 index c03b0ddb..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/allOf.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": {"foo": "baz", "bar": 2}, "name": "allOf -- allOf", "schema": {"allOf": [{"required": ["bar"], "properties": {"bar": {"type": "integer"}}}, {"required": ["foo"], "properties": {"foo": {"type": "string"}}}]}}, {"fail": true, "data": {"foo": "baz"}, "name": "allOf -- mismatch second", "schema": {"allOf": [{"required": ["bar"], "properties": {"bar": {"type": "integer"}}}, {"required": ["foo"], "properties": {"foo": {"type": "string"}}}]}}, {"fail": true, "data": {"bar": 2}, "name": "allOf -- mismatch first", "schema": {"allOf": [{"required": ["bar"], "properties": {"bar": {"type": "integer"}}}, {"required": ["foo"], "properties": {"foo": {"type": "string"}}}]}}, {"fail": true, "data": {"foo": "baz", "bar": "quux"}, "name": "allOf -- wrong type", "schema": {"allOf": [{"required": ["bar"], "properties": {"bar": {"type": "integer"}}}, {"required": ["foo"], "properties": {"foo": {"type": "string"}}}]}}, {"fail": false, "data": {"baz": null, "foo": "quux", "bar": 2}, "name": "allOf with base schema -- valid", "schema": {"required": ["bar"], "properties": {"bar": {"type": "integer"}}, "allOf": [{"required": ["foo"], "properties": {"foo": {"type": "string"}}}, {"required": ["baz"], "properties": {"baz": {"type": "null"}}}]}}, {"fail": true, "data": {"foo": "quux", "baz": null}, "name": "allOf with base schema -- mismatch base schema", "schema": {"required": ["bar"], "properties": {"bar": {"type": "integer"}}, "allOf": [{"required": ["foo"], "properties": {"foo": {"type": "string"}}}, {"required": ["baz"], "properties": {"baz": {"type": "null"}}}]}}, {"fail": true, "data": {"baz": null, "bar": 2}, "name": "allOf with base schema -- mismatch first allOf", "schema": {"required": ["bar"], "properties": {"bar": {"type": "integer"}}, "allOf": [{"required": ["foo"], "properties": {"foo": {"type": "string"}}}, {"required": ["baz"], "properties": {"baz": {"type": "null"}}}]}}, {"fail": true, "data": {"foo": "quux", "bar": 2}, "name": "allOf with base schema -- mismatch second allOf", "schema": {"required": ["bar"], "properties": {"bar": {"type": "integer"}}, "allOf": [{"required": ["foo"], "properties": {"foo": {"type": "string"}}}, {"required": ["baz"], "properties": {"baz": {"type": "null"}}}]}}, {"fail": true, "data": {"bar": 2}, "name": "allOf with base schema -- mismatch both", "schema": {"required": ["bar"], "properties": {"bar": {"type": "integer"}}, "allOf": [{"required": ["foo"], "properties": {"foo": {"type": "string"}}}, {"required": ["baz"], "properties": {"baz": {"type": "null"}}}]}}, {"fail": false, "data": 25, "name": "allOf simple types -- valid", "schema": {"allOf": [{"maximum": 30}, {"minimum": 20}]}}, {"fail": true, "data": 35, "name": "allOf simple types -- mismatch one", "schema": {"allOf": [{"maximum": 30}, {"minimum": 20}]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/anyOf.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/anyOf.json deleted file mode 100644 index a58714af..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/anyOf.json +++ /dev/null @@ -1,68 +0,0 @@ -[ - { - "description": "anyOf", - "schema": { - "anyOf": [ - { - "type": "integer" - }, - { - "minimum": 2 - } - ] - }, - "tests": [ - { - "description": "first anyOf valid", - "data": 1, - "valid": true - }, - { - "description": "second anyOf valid", - "data": 2.5, - "valid": true - }, - { - "description": "both anyOf valid", - "data": 3, - "valid": true - }, - { - "description": "neither anyOf valid", - "data": 1.5, - "valid": false - } - ] - }, - { - "description": "anyOf with base schema", - "schema": { - "type": "string", - "anyOf" : [ - { - "maxLength": 2 - }, - { - "minLength": 4 - } - ] - }, - "tests": [ - { - "description": "mismatch base schema", - "data": 3, - "valid": false - }, - { - "description": "one anyOf valid", - "data": "foobar", - "valid": true - }, - { - "description": "both anyOf invalid", - "data": "foo", - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/anyOf.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/anyOf.test deleted file mode 100644 index 5d24c4e8..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/anyOf.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": 1, "name": "anyOf -- first anyOf valid", "schema": {"anyOf": [{"type": "integer"}, {"minimum": 2}]}}, {"fail": false, "data": 2.5, "name": "anyOf -- second anyOf valid", "schema": {"anyOf": [{"type": "integer"}, {"minimum": 2}]}}, {"fail": false, "data": 3, "name": "anyOf -- both anyOf valid", "schema": {"anyOf": [{"type": "integer"}, {"minimum": 2}]}}, {"fail": true, "data": 1.5, "name": "anyOf -- neither anyOf valid", "schema": {"anyOf": [{"type": "integer"}, {"minimum": 2}]}}, {"fail": true, "data": 3, "name": "anyOf with base schema -- mismatch base schema", "schema": {"anyOf": [{"maxLength": 2}, {"minLength": 4}], "type": "string"}}, {"fail": false, "data": "foobar", "name": "anyOf with base schema -- one anyOf valid", "schema": {"anyOf": [{"maxLength": 2}, {"minLength": 4}], "type": "string"}}, {"fail": true, "data": "foo", "name": "anyOf with base schema -- both anyOf invalid", "schema": {"anyOf": [{"maxLength": 2}, {"minLength": 4}], "type": "string"}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/convert.py b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/convert.py deleted file mode 100644 index 99bcec58..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/convert.py +++ /dev/null @@ -1,16 +0,0 @@ - -import json -import sys - -tests = json.load(sys.stdin) - -out = [] -for t in tests: - for case in t['tests']: - out.append({ - 'name': t['description'] + ' -- ' + case['description'], - 'schema': t['schema'], - 'data': case['data'], - 'fail': not case['valid'] - }) -json.dump(out, sys.stdout) diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/definitions.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/definitions.json deleted file mode 100644 index cf935a32..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/definitions.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "description": "valid definition", - "schema": {"$ref": "http://json-schema.org/draft-04/schema#"}, - "tests": [ - { - "description": "valid definition schema", - "data": { - "definitions": { - "foo": {"type": "integer"} - } - }, - "valid": true - } - ] - }, - { - "description": "invalid definition", - "schema": {"$ref": "http://json-schema.org/draft-04/schema#"}, - "tests": [ - { - "description": "invalid definition schema", - "data": { - "definitions": { - "foo": {"type": 1} - } - }, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/definitions.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/definitions.test deleted file mode 100644 index 4bd8350a..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/definitions.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": {"definitions": {"foo": {"type": "integer"}}}, "name": "valid definition -- valid definition schema", "schema": {"$ref": "http://json-schema.org/draft-04/schema#"}}, {"fail": true, "data": {"definitions": {"foo": {"type": 1}}}, "name": "invalid definition -- invalid definition schema", "schema": {"$ref": "http://json-schema.org/draft-04/schema#"}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/dependencies.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/dependencies.json deleted file mode 100644 index 7b9b16a7..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/dependencies.json +++ /dev/null @@ -1,113 +0,0 @@ -[ - { - "description": "dependencies", - "schema": { - "dependencies": {"bar": ["foo"]} - }, - "tests": [ - { - "description": "neither", - "data": {}, - "valid": true - }, - { - "description": "nondependant", - "data": {"foo": 1}, - "valid": true - }, - { - "description": "with dependency", - "data": {"foo": 1, "bar": 2}, - "valid": true - }, - { - "description": "missing dependency", - "data": {"bar": 2}, - "valid": false - }, - { - "description": "ignores non-objects", - "data": "foo", - "valid": true - } - ] - }, - { - "description": "multiple dependencies", - "schema": { - "dependencies": {"quux": ["foo", "bar"]} - }, - "tests": [ - { - "description": "neither", - "data": {}, - "valid": true - }, - { - "description": "nondependants", - "data": {"foo": 1, "bar": 2}, - "valid": true - }, - { - "description": "with dependencies", - "data": {"foo": 1, "bar": 2, "quux": 3}, - "valid": true - }, - { - "description": "missing dependency", - "data": {"foo": 1, "quux": 2}, - "valid": false - }, - { - "description": "missing other dependency", - "data": {"bar": 1, "quux": 2}, - "valid": false - }, - { - "description": "missing both dependencies", - "data": {"quux": 1}, - "valid": false - } - ] - }, - { - "description": "multiple dependencies subschema", - "schema": { - "dependencies": { - "bar": { - "properties": { - "foo": {"type": "integer"}, - "bar": {"type": "integer"} - } - } - } - }, - "tests": [ - { - "description": "valid", - "data": {"foo": 1, "bar": 2}, - "valid": true - }, - { - "description": "no dependency", - "data": {"foo": "quux"}, - "valid": true - }, - { - "description": "wrong type", - "data": {"foo": "quux", "bar": 2}, - "valid": false - }, - { - "description": "wrong type other", - "data": {"foo": 2, "bar": "quux"}, - "valid": false - }, - { - "description": "wrong type both", - "data": {"foo": "quux", "bar": "quux"}, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/dependencies.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/dependencies.test deleted file mode 100644 index f54a1118..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/dependencies.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": {}, "name": "dependencies -- neither", "schema": {"dependencies": {"bar": ["foo"]}}}, {"fail": false, "data": {"foo": 1}, "name": "dependencies -- nondependant", "schema": {"dependencies": {"bar": ["foo"]}}}, {"fail": false, "data": {"foo": 1, "bar": 2}, "name": "dependencies -- with dependency", "schema": {"dependencies": {"bar": ["foo"]}}}, {"fail": true, "data": {"bar": 2}, "name": "dependencies -- missing dependency", "schema": {"dependencies": {"bar": ["foo"]}}}, {"fail": false, "data": "foo", "name": "dependencies -- ignores non-objects", "schema": {"dependencies": {"bar": ["foo"]}}}, {"fail": false, "data": {}, "name": "multiple dependencies -- neither", "schema": {"dependencies": {"quux": ["foo", "bar"]}}}, {"fail": false, "data": {"foo": 1, "bar": 2}, "name": "multiple dependencies -- nondependants", "schema": {"dependencies": {"quux": ["foo", "bar"]}}}, {"fail": false, "data": {"quux": 3, "foo": 1, "bar": 2}, "name": "multiple dependencies -- with dependencies", "schema": {"dependencies": {"quux": ["foo", "bar"]}}}, {"fail": true, "data": {"quux": 2, "foo": 1}, "name": "multiple dependencies -- missing dependency", "schema": {"dependencies": {"quux": ["foo", "bar"]}}}, {"fail": true, "data": {"quux": 2, "bar": 1}, "name": "multiple dependencies -- missing other dependency", "schema": {"dependencies": {"quux": ["foo", "bar"]}}}, {"fail": true, "data": {"quux": 1}, "name": "multiple dependencies -- missing both dependencies", "schema": {"dependencies": {"quux": ["foo", "bar"]}}}, {"fail": false, "data": {"foo": 1, "bar": 2}, "name": "multiple dependencies subschema -- valid", "schema": {"dependencies": {"bar": {"properties": {"foo": {"type": "integer"}, "bar": {"type": "integer"}}}}}}, {"fail": false, "data": {"foo": "quux"}, "name": "multiple dependencies subschema -- no dependency", "schema": {"dependencies": {"bar": {"properties": {"foo": {"type": "integer"}, "bar": {"type": "integer"}}}}}}, {"fail": true, "data": {"foo": "quux", "bar": 2}, "name": "multiple dependencies subschema -- wrong type", "schema": {"dependencies": {"bar": {"properties": {"foo": {"type": "integer"}, "bar": {"type": "integer"}}}}}}, {"fail": true, "data": {"foo": 2, "bar": "quux"}, "name": "multiple dependencies subschema -- wrong type other", "schema": {"dependencies": {"bar": {"properties": {"foo": {"type": "integer"}, "bar": {"type": "integer"}}}}}}, {"fail": true, "data": {"foo": "quux", "bar": "quux"}, "name": "multiple dependencies subschema -- wrong type both", "schema": {"dependencies": {"bar": {"properties": {"foo": {"type": "integer"}, "bar": {"type": "integer"}}}}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/enum.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/enum.json deleted file mode 100644 index a539edb7..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/enum.json +++ /dev/null @@ -1,39 +0,0 @@ -[ - { - "description": "simple enum validation", - "schema": {"enum": [1, 2, 3]}, - "tests": [ - { - "description": "one of the enum is valid", - "data": 1, - "valid": true - }, - { - "description": "something else is invalid", - "data": 4, - "valid": false - } - ] - }, - { - "description": "heterogeneous enum validation", - "schema": {"enum": [6, "foo", [], true, {"foo": 12}]}, - "tests": [ - { - "description": "one of the enum is valid", - "data": [], - "valid": true - }, - { - "description": "something else is invalid", - "data": null, - "valid": false - }, - { - "description": "objects are deep compared", - "data": {"foo": false}, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/enum.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/enum.test deleted file mode 100644 index 916e4375..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/enum.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": 1, "name": "simple enum validation -- one of the enum is valid", "schema": {"enum": [1, 2, 3]}}, {"fail": true, "data": 4, "name": "simple enum validation -- something else is invalid", "schema": {"enum": [1, 2, 3]}}, {"fail": false, "data": [], "name": "heterogeneous enum validation -- one of the enum is valid", "schema": {"enum": [6, "foo", [], true, {"foo": 12}]}}, {"fail": true, "data": null, "name": "heterogeneous enum validation -- something else is invalid", "schema": {"enum": [6, "foo", [], true, {"foo": 12}]}}, {"fail": true, "data": {"foo": false}, "name": "heterogeneous enum validation -- objects are deep compared", "schema": {"enum": [6, "foo", [], true, {"foo": 12}]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/items.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/items.json deleted file mode 100644 index f5e18a13..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/items.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "description": "a schema given for items", - "schema": { - "items": {"type": "integer"} - }, - "tests": [ - { - "description": "valid items", - "data": [ 1, 2, 3 ], - "valid": true - }, - { - "description": "wrong type of items", - "data": [1, "x"], - "valid": false - }, - { - "description": "ignores non-arrays", - "data": {"foo" : "bar"}, - "valid": true - } - ] - }, - { - "description": "an array of schemas for items", - "schema": { - "items": [ - {"type": "integer"}, - {"type": "string"} - ] - }, - "tests": [ - { - "description": "correct types", - "data": [ 1, "foo" ], - "valid": true - }, - { - "description": "wrong types", - "data": [ "foo", 1 ], - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/items.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/items.test deleted file mode 100644 index 6975dbd9..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/items.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": [1, 2, 3], "name": "a schema given for items -- valid items", "schema": {"items": {"type": "integer"}}}, {"fail": true, "data": [1, "x"], "name": "a schema given for items -- wrong type of items", "schema": {"items": {"type": "integer"}}}, {"fail": false, "data": {"foo": "bar"}, "name": "a schema given for items -- ignores non-arrays", "schema": {"items": {"type": "integer"}}}, {"fail": false, "data": [1, "foo"], "name": "an array of schemas for items -- correct types", "schema": {"items": [{"type": "integer"}, {"type": "string"}]}}, {"fail": true, "data": ["foo", 1], "name": "an array of schemas for items -- wrong types", "schema": {"items": [{"type": "integer"}, {"type": "string"}]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxItems.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxItems.json deleted file mode 100644 index 3b53a6b3..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxItems.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "description": "maxItems validation", - "schema": {"maxItems": 2}, - "tests": [ - { - "description": "shorter is valid", - "data": [1], - "valid": true - }, - { - "description": "exact length is valid", - "data": [1, 2], - "valid": true - }, - { - "description": "too long is invalid", - "data": [1, 2, 3], - "valid": false - }, - { - "description": "ignores non-arrays", - "data": "foobar", - "valid": true - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxItems.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxItems.test deleted file mode 100644 index a573f4c0..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxItems.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": [1], "name": "maxItems validation -- shorter is valid", "schema": {"maxItems": 2}}, {"fail": false, "data": [1, 2], "name": "maxItems validation -- exact length is valid", "schema": {"maxItems": 2}}, {"fail": true, "data": [1, 2, 3], "name": "maxItems validation -- too long is invalid", "schema": {"maxItems": 2}}, {"fail": false, "data": "foobar", "name": "maxItems validation -- ignores non-arrays", "schema": {"maxItems": 2}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxLength.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxLength.json deleted file mode 100644 index 561767b9..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxLength.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "description": "maxLength validation", - "schema": {"maxLength": 2}, - "tests": [ - { - "description": "shorter is valid", - "data": "f", - "valid": true - }, - { - "description": "exact length is valid", - "data": "fo", - "valid": true - }, - { - "description": "too long is invalid", - "data": "foo", - "valid": false - }, - { - "description": "ignores non-strings", - "data": 10, - "valid": true - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxLength.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxLength.test deleted file mode 100644 index 4933e821..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxLength.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": "f", "name": "maxLength validation -- shorter is valid", "schema": {"maxLength": 2}}, {"fail": false, "data": "fo", "name": "maxLength validation -- exact length is valid", "schema": {"maxLength": 2}}, {"fail": true, "data": "foo", "name": "maxLength validation -- too long is invalid", "schema": {"maxLength": 2}}, {"fail": false, "data": 10, "name": "maxLength validation -- ignores non-strings", "schema": {"maxLength": 2}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxProperties.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxProperties.json deleted file mode 100644 index d282446a..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxProperties.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "description": "maxProperties validation", - "schema": {"maxProperties": 2}, - "tests": [ - { - "description": "shorter is valid", - "data": {"foo": 1}, - "valid": true - }, - { - "description": "exact length is valid", - "data": {"foo": 1, "bar": 2}, - "valid": true - }, - { - "description": "too long is invalid", - "data": {"foo": 1, "bar": 2, "baz": 3}, - "valid": false - }, - { - "description": "ignores non-objects", - "data": "foobar", - "valid": true - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxProperties.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxProperties.test deleted file mode 100644 index dc132fa5..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maxProperties.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": {"foo": 1}, "name": "maxProperties validation -- shorter is valid", "schema": {"maxProperties": 2}}, {"fail": false, "data": {"foo": 1, "bar": 2}, "name": "maxProperties validation -- exact length is valid", "schema": {"maxProperties": 2}}, {"fail": true, "data": {"baz": 3, "foo": 1, "bar": 2}, "name": "maxProperties validation -- too long is invalid", "schema": {"maxProperties": 2}}, {"fail": false, "data": "foobar", "name": "maxProperties validation -- ignores non-objects", "schema": {"maxProperties": 2}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maximum.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maximum.json deleted file mode 100644 index 86c7b89c..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maximum.json +++ /dev/null @@ -1,42 +0,0 @@ -[ - { - "description": "maximum validation", - "schema": {"maximum": 3.0}, - "tests": [ - { - "description": "below the maximum is valid", - "data": 2.6, - "valid": true - }, - { - "description": "above the maximum is invalid", - "data": 3.5, - "valid": false - }, - { - "description": "ignores non-numbers", - "data": "x", - "valid": true - } - ] - }, - { - "description": "exclusiveMaximum validation", - "schema": { - "maximum": 3.0, - "exclusiveMaximum": true - }, - "tests": [ - { - "description": "below the maximum is still valid", - "data": 2.2, - "valid": true - }, - { - "description": "boundary point is invalid", - "data": 3.0, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maximum.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maximum.test deleted file mode 100644 index 70b916e2..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/maximum.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": 2.6000000000000001, "name": "maximum validation -- below the maximum is valid", "schema": {"maximum": 3.0}}, {"fail": true, "data": 3.5, "name": "maximum validation -- above the maximum is invalid", "schema": {"maximum": 3.0}}, {"fail": false, "data": "x", "name": "maximum validation -- ignores non-numbers", "schema": {"maximum": 3.0}}, {"fail": false, "data": 2.2000000000000002, "name": "exclusiveMaximum validation -- below the maximum is still valid", "schema": {"exclusiveMaximum": true, "maximum": 3.0}}, {"fail": true, "data": 3.0, "name": "exclusiveMaximum validation -- boundary point is invalid", "schema": {"exclusiveMaximum": true, "maximum": 3.0}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minItems.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minItems.json deleted file mode 100644 index ed511881..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minItems.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "description": "minItems validation", - "schema": {"minItems": 1}, - "tests": [ - { - "description": "longer is valid", - "data": [1, 2], - "valid": true - }, - { - "description": "exact length is valid", - "data": [1], - "valid": true - }, - { - "description": "too short is invalid", - "data": [], - "valid": false - }, - { - "description": "ignores non-arrays", - "data": "", - "valid": true - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minItems.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minItems.test deleted file mode 100644 index 4e482def..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minItems.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": [1, 2], "name": "minItems validation -- longer is valid", "schema": {"minItems": 1}}, {"fail": false, "data": [1], "name": "minItems validation -- exact length is valid", "schema": {"minItems": 1}}, {"fail": true, "data": [], "name": "minItems validation -- too short is invalid", "schema": {"minItems": 1}}, {"fail": false, "data": "", "name": "minItems validation -- ignores non-arrays", "schema": {"minItems": 1}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minLength.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minLength.json deleted file mode 100644 index e9c14b17..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minLength.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "description": "minLength validation", - "schema": {"minLength": 2}, - "tests": [ - { - "description": "longer is valid", - "data": "foo", - "valid": true - }, - { - "description": "exact length is valid", - "data": "fo", - "valid": true - }, - { - "description": "too short is invalid", - "data": "f", - "valid": false - }, - { - "description": "ignores non-strings", - "data": 1, - "valid": true - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minLength.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minLength.test deleted file mode 100644 index f4fb32ab..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minLength.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": "foo", "name": "minLength validation -- longer is valid", "schema": {"minLength": 2}}, {"fail": false, "data": "fo", "name": "minLength validation -- exact length is valid", "schema": {"minLength": 2}}, {"fail": true, "data": "f", "name": "minLength validation -- too short is invalid", "schema": {"minLength": 2}}, {"fail": false, "data": 1, "name": "minLength validation -- ignores non-strings", "schema": {"minLength": 2}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minProperties.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minProperties.json deleted file mode 100644 index a72c7d29..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minProperties.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "description": "minProperties validation", - "schema": {"minProperties": 1}, - "tests": [ - { - "description": "longer is valid", - "data": {"foo": 1, "bar": 2}, - "valid": true - }, - { - "description": "exact length is valid", - "data": {"foo": 1}, - "valid": true - }, - { - "description": "too short is invalid", - "data": {}, - "valid": false - }, - { - "description": "ignores non-objects", - "data": "", - "valid": true - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minProperties.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minProperties.test deleted file mode 100644 index e9fdab6b..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minProperties.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": {"foo": 1, "bar": 2}, "name": "minProperties validation -- longer is valid", "schema": {"minProperties": 1}}, {"fail": false, "data": {"foo": 1}, "name": "minProperties validation -- exact length is valid", "schema": {"minProperties": 1}}, {"fail": true, "data": {}, "name": "minProperties validation -- too short is invalid", "schema": {"minProperties": 1}}, {"fail": false, "data": "", "name": "minProperties validation -- ignores non-objects", "schema": {"minProperties": 1}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minimum.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minimum.json deleted file mode 100644 index d5bf000b..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minimum.json +++ /dev/null @@ -1,42 +0,0 @@ -[ - { - "description": "minimum validation", - "schema": {"minimum": 1.1}, - "tests": [ - { - "description": "above the minimum is valid", - "data": 2.6, - "valid": true - }, - { - "description": "below the minimum is invalid", - "data": 0.6, - "valid": false - }, - { - "description": "ignores non-numbers", - "data": "x", - "valid": true - } - ] - }, - { - "description": "exclusiveMinimum validation", - "schema": { - "minimum": 1.1, - "exclusiveMinimum": true - }, - "tests": [ - { - "description": "above the minimum is still valid", - "data": 1.2, - "valid": true - }, - { - "description": "boundary point is invalid", - "data": 1.1, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minimum.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minimum.test deleted file mode 100644 index ae413de4..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/minimum.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": 2.6000000000000001, "name": "minimum validation -- above the minimum is valid", "schema": {"minimum": 1.1000000000000001}}, {"fail": true, "data": 0.59999999999999998, "name": "minimum validation -- below the minimum is invalid", "schema": {"minimum": 1.1000000000000001}}, {"fail": false, "data": "x", "name": "minimum validation -- ignores non-numbers", "schema": {"minimum": 1.1000000000000001}}, {"fail": false, "data": 1.2, "name": "exclusiveMinimum validation -- above the minimum is still valid", "schema": {"minimum": 1.1000000000000001, "exclusiveMinimum": true}}, {"fail": true, "data": 1.1000000000000001, "name": "exclusiveMinimum validation -- boundary point is invalid", "schema": {"minimum": 1.1000000000000001, "exclusiveMinimum": true}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/multipleOf.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/multipleOf.json deleted file mode 100644 index ca3b7618..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/multipleOf.json +++ /dev/null @@ -1,60 +0,0 @@ -[ - { - "description": "by int", - "schema": {"multipleOf": 2}, - "tests": [ - { - "description": "int by int", - "data": 10, - "valid": true - }, - { - "description": "int by int fail", - "data": 7, - "valid": false - }, - { - "description": "ignores non-numbers", - "data": "foo", - "valid": true - } - ] - }, - { - "description": "by number", - "schema": {"multipleOf": 1.5}, - "tests": [ - { - "description": "zero is multiple of anything", - "data": 0, - "valid": true - }, - { - "description": "4.5 is multiple of 1.5", - "data": 4.5, - "valid": true - }, - { - "description": "35 is not multiple of 1.5", - "data": 35, - "valid": false - } - ] - }, - { - "description": "by small number", - "schema": {"multipleOf": 0.0001}, - "tests": [ - { - "description": "0.0075 is multiple of 0.0001", - "data": 0.0075, - "valid": true - }, - { - "description": "0.00751 is not multiple of 0.0001", - "data": 0.00751, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/multipleOf.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/multipleOf.test deleted file mode 100644 index 0debf687..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/multipleOf.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": 10, "name": "by int -- int by int", "schema": {"multipleOf": 2}}, {"fail": true, "data": 7, "name": "by int -- int by int fail", "schema": {"multipleOf": 2}}, {"fail": false, "data": "foo", "name": "by int -- ignores non-numbers", "schema": {"multipleOf": 2}}, {"fail": false, "data": 0, "name": "by number -- zero is multiple of anything", "schema": {"multipleOf": 1.5}}, {"fail": false, "data": 4.5, "name": "by number -- 4.5 is multiple of 1.5", "schema": {"multipleOf": 1.5}}, {"fail": true, "data": 35, "name": "by number -- 35 is not multiple of 1.5", "schema": {"multipleOf": 1.5}}, {"fail": false, "data": 0.0074999999999999997, "name": "by small number -- 0.0075 is multiple of 0.0001", "schema": {"multipleOf": 0.0001}}, {"fail": true, "data": 0.0075100000000000002, "name": "by small number -- 0.00751 is not multiple of 0.0001", "schema": {"multipleOf": 0.0001}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/not.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/not.json deleted file mode 100644 index 2cdc9790..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/not.json +++ /dev/null @@ -1,73 +0,0 @@ -[ - { - "description": "not", - "schema": { - "not": {"type": "integer"} - }, - "tests": [ - { - "description": "allowed", - "data": "foo", - "valid": true - }, - { - "description": "disallowed", - "data": 1, - "valid": false - } - ] - }, - { - "description": "not multiple types", - "schema": { - "not": {"type": ["integer", "boolean"]} - }, - "tests": [ - { - "description": "valid", - "data": "foo", - "valid": true - }, - { - "description": "mismatch", - "data": 1, - "valid": false - }, - { - "description": "other mismatch", - "data": true, - "valid": false - } - ] - }, - { - "description": "not more complex schema", - "schema": { - "not": { - "type": "object", - "properties": { - "foo": { - "type": "string" - } - } - } - }, - "tests": [ - { - "description": "match", - "data": 1, - "valid": true - }, - { - "description": "other match", - "data": {"foo": 1}, - "valid": true - }, - { - "description": "mismatch", - "data": {"foo": "bar"}, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/not.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/not.test deleted file mode 100644 index 1761ab0f..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/not.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": "foo", "name": "not -- allowed", "schema": {"not": {"type": "integer"}}}, {"fail": true, "data": 1, "name": "not -- disallowed", "schema": {"not": {"type": "integer"}}}, {"fail": false, "data": "foo", "name": "not multiple types -- valid", "schema": {"not": {"type": ["integer", "boolean"]}}}, {"fail": true, "data": 1, "name": "not multiple types -- mismatch", "schema": {"not": {"type": ["integer", "boolean"]}}}, {"fail": true, "data": true, "name": "not multiple types -- other mismatch", "schema": {"not": {"type": ["integer", "boolean"]}}}, {"fail": false, "data": 1, "name": "not more complex schema -- match", "schema": {"not": {"type": "object", "properties": {"foo": {"type": "string"}}}}}, {"fail": false, "data": {"foo": 1}, "name": "not more complex schema -- other match", "schema": {"not": {"type": "object", "properties": {"foo": {"type": "string"}}}}}, {"fail": true, "data": {"foo": "bar"}, "name": "not more complex schema -- mismatch", "schema": {"not": {"type": "object", "properties": {"foo": {"type": "string"}}}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/oneOf.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/oneOf.json deleted file mode 100644 index 1eaa4e47..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/oneOf.json +++ /dev/null @@ -1,68 +0,0 @@ -[ - { - "description": "oneOf", - "schema": { - "oneOf": [ - { - "type": "integer" - }, - { - "minimum": 2 - } - ] - }, - "tests": [ - { - "description": "first oneOf valid", - "data": 1, - "valid": true - }, - { - "description": "second oneOf valid", - "data": 2.5, - "valid": true - }, - { - "description": "both oneOf valid", - "data": 3, - "valid": false - }, - { - "description": "neither oneOf valid", - "data": 1.5, - "valid": false - } - ] - }, - { - "description": "oneOf with base schema", - "schema": { - "type": "string", - "oneOf" : [ - { - "minLength": 2 - }, - { - "maxLength": 4 - } - ] - }, - "tests": [ - { - "description": "mismatch base schema", - "data": 3, - "valid": false - }, - { - "description": "one oneOf valid", - "data": "foobar", - "valid": true - }, - { - "description": "both oneOf valid", - "data": "foo", - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/oneOf.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/oneOf.test deleted file mode 100644 index f56d6071..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/oneOf.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": 1, "name": "oneOf -- first oneOf valid", "schema": {"oneOf": [{"type": "integer"}, {"minimum": 2}]}}, {"fail": false, "data": 2.5, "name": "oneOf -- second oneOf valid", "schema": {"oneOf": [{"type": "integer"}, {"minimum": 2}]}}, {"fail": true, "data": 3, "name": "oneOf -- both oneOf valid", "schema": {"oneOf": [{"type": "integer"}, {"minimum": 2}]}}, {"fail": true, "data": 1.5, "name": "oneOf -- neither oneOf valid", "schema": {"oneOf": [{"type": "integer"}, {"minimum": 2}]}}, {"fail": true, "data": 3, "name": "oneOf with base schema -- mismatch base schema", "schema": {"oneOf": [{"minLength": 2}, {"maxLength": 4}], "type": "string"}}, {"fail": false, "data": "foobar", "name": "oneOf with base schema -- one oneOf valid", "schema": {"oneOf": [{"minLength": 2}, {"maxLength": 4}], "type": "string"}}, {"fail": true, "data": "foo", "name": "oneOf with base schema -- both oneOf valid", "schema": {"oneOf": [{"minLength": 2}, {"maxLength": 4}], "type": "string"}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/pattern.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/pattern.json deleted file mode 100644 index befc4b56..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/pattern.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "description": "pattern validation", - "schema": {"pattern": "^a*$"}, - "tests": [ - { - "description": "a matching pattern is valid", - "data": "aaa", - "valid": true - }, - { - "description": "a non-matching pattern is invalid", - "data": "abc", - "valid": false - }, - { - "description": "ignores non-strings", - "data": true, - "valid": true - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/pattern.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/pattern.test deleted file mode 100644 index 0485d619..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/pattern.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": "aaa", "name": "pattern validation -- a matching pattern is valid", "schema": {"pattern": "^a*$"}}, {"fail": true, "data": "abc", "name": "pattern validation -- a non-matching pattern is invalid", "schema": {"pattern": "^a*$"}}, {"fail": false, "data": true, "name": "pattern validation -- ignores non-strings", "schema": {"pattern": "^a*$"}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/patternProperties.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/patternProperties.json deleted file mode 100644 index 18586e5d..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/patternProperties.json +++ /dev/null @@ -1,110 +0,0 @@ -[ - { - "description": - "patternProperties validates properties matching a regex", - "schema": { - "patternProperties": { - "f.*o": {"type": "integer"} - } - }, - "tests": [ - { - "description": "a single valid match is valid", - "data": {"foo": 1}, - "valid": true - }, - { - "description": "multiple valid matches is valid", - "data": {"foo": 1, "foooooo" : 2}, - "valid": true - }, - { - "description": "a single invalid match is invalid", - "data": {"foo": "bar", "fooooo": 2}, - "valid": false - }, - { - "description": "multiple invalid matches is invalid", - "data": {"foo": "bar", "foooooo" : "baz"}, - "valid": false - }, - { - "description": "ignores non-objects", - "data": 12, - "valid": true - } - ] - }, - { - "description": "multiple simultaneous patternProperties are validated", - "schema": { - "patternProperties": { - "a*": {"type": "integer"}, - "aaa*": {"maximum": 20} - } - }, - "tests": [ - { - "description": "a single valid match is valid", - "data": {"a": 21}, - "valid": true - }, - { - "description": "a simultaneous match is valid", - "data": {"aaaa": 18}, - "valid": true - }, - { - "description": "multiple matches is valid", - "data": {"a": 21, "aaaa": 18}, - "valid": true - }, - { - "description": "an invalid due to one is invalid", - "data": {"a": "bar"}, - "valid": false - }, - { - "description": "an invalid due to the other is invalid", - "data": {"aaaa": 31}, - "valid": false - }, - { - "description": "an invalid due to both is invalid", - "data": {"aaa": "foo", "aaaa": 31}, - "valid": false - } - ] - }, - { - "description": "regexes are not anchored by default and are case sensitive", - "schema": { - "patternProperties": { - "[0-9]{2,}": { "type": "boolean" }, - "X_": { "type": "string" } - } - }, - "tests": [ - { - "description": "non recognized members are ignored", - "data": { "answer 1": "42" }, - "valid": true - }, - { - "description": "recognized members are accounted for", - "data": { "a31b": null }, - "valid": false - }, - { - "description": "regexes are case sensitive", - "data": { "a_x_3": 3 }, - "valid": true - }, - { - "description": "regexes are case sensitive, 2", - "data": { "a_X_3": 3 }, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/patternProperties.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/patternProperties.test deleted file mode 100644 index a5ff2de2..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/patternProperties.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": {"foo": 1}, "name": "patternProperties validates properties matching a regex -- a single valid match is valid", "schema": {"patternProperties": {"f.*o": {"type": "integer"}}}}, {"fail": false, "data": {"foooooo": 2, "foo": 1}, "name": "patternProperties validates properties matching a regex -- multiple valid matches is valid", "schema": {"patternProperties": {"f.*o": {"type": "integer"}}}}, {"fail": true, "data": {"foo": "bar", "fooooo": 2}, "name": "patternProperties validates properties matching a regex -- a single invalid match is invalid", "schema": {"patternProperties": {"f.*o": {"type": "integer"}}}}, {"fail": true, "data": {"foooooo": "baz", "foo": "bar"}, "name": "patternProperties validates properties matching a regex -- multiple invalid matches is invalid", "schema": {"patternProperties": {"f.*o": {"type": "integer"}}}}, {"fail": false, "data": 12, "name": "patternProperties validates properties matching a regex -- ignores non-objects", "schema": {"patternProperties": {"f.*o": {"type": "integer"}}}}, {"fail": false, "data": {"a": 21}, "name": "multiple simultaneous patternProperties are validated -- a single valid match is valid", "schema": {"patternProperties": {"a*": {"type": "integer"}, "aaa*": {"maximum": 20}}}}, {"fail": false, "data": {"aaaa": 18}, "name": "multiple simultaneous patternProperties are validated -- a simultaneous match is valid", "schema": {"patternProperties": {"a*": {"type": "integer"}, "aaa*": {"maximum": 20}}}}, {"fail": false, "data": {"a": 21, "aaaa": 18}, "name": "multiple simultaneous patternProperties are validated -- multiple matches is valid", "schema": {"patternProperties": {"a*": {"type": "integer"}, "aaa*": {"maximum": 20}}}}, {"fail": true, "data": {"a": "bar"}, "name": "multiple simultaneous patternProperties are validated -- an invalid due to one is invalid", "schema": {"patternProperties": {"a*": {"type": "integer"}, "aaa*": {"maximum": 20}}}}, {"fail": true, "data": {"aaaa": 31}, "name": "multiple simultaneous patternProperties are validated -- an invalid due to the other is invalid", "schema": {"patternProperties": {"a*": {"type": "integer"}, "aaa*": {"maximum": 20}}}}, {"fail": true, "data": {"aaaa": 31, "aaa": "foo"}, "name": "multiple simultaneous patternProperties are validated -- an invalid due to both is invalid", "schema": {"patternProperties": {"a*": {"type": "integer"}, "aaa*": {"maximum": 20}}}}, {"fail": false, "data": {"answer 1": "42"}, "name": "regexes are not anchored by default and are case sensitive -- non recognized members are ignored", "schema": {"patternProperties": {"X_": {"type": "string"}, "[0-9]{2,}": {"type": "boolean"}}}}, {"fail": true, "data": {"a31b": null}, "name": "regexes are not anchored by default and are case sensitive -- recognized members are accounted for", "schema": {"patternProperties": {"X_": {"type": "string"}, "[0-9]{2,}": {"type": "boolean"}}}}, {"fail": false, "data": {"a_x_3": 3}, "name": "regexes are not anchored by default and are case sensitive -- regexes are case sensitive", "schema": {"patternProperties": {"X_": {"type": "string"}, "[0-9]{2,}": {"type": "boolean"}}}}, {"fail": true, "data": {"a_X_3": 3}, "name": "regexes are not anchored by default and are case sensitive -- regexes are case sensitive, 2", "schema": {"patternProperties": {"X_": {"type": "string"}, "[0-9]{2,}": {"type": "boolean"}}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/properties.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/properties.json deleted file mode 100644 index cd1644dc..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/properties.json +++ /dev/null @@ -1,92 +0,0 @@ -[ - { - "description": "object properties validation", - "schema": { - "properties": { - "foo": {"type": "integer"}, - "bar": {"type": "string"} - } - }, - "tests": [ - { - "description": "both properties present and valid is valid", - "data": {"foo": 1, "bar": "baz"}, - "valid": true - }, - { - "description": "one property invalid is invalid", - "data": {"foo": 1, "bar": {}}, - "valid": false - }, - { - "description": "both properties invalid is invalid", - "data": {"foo": [], "bar": {}}, - "valid": false - }, - { - "description": "doesn't invalidate other properties", - "data": {"quux": []}, - "valid": true - }, - { - "description": "ignores non-objects", - "data": [], - "valid": true - } - ] - }, - { - "description": - "properties, patternProperties, additionalProperties interaction", - "schema": { - "properties": { - "foo": {"type": "array", "maxItems": 3}, - "bar": {"type": "array"} - }, - "patternProperties": {"f.o": {"minItems": 2}}, - "additionalProperties": {"type": "integer"} - }, - "tests": [ - { - "description": "property validates property", - "data": {"foo": [1, 2]}, - "valid": true - }, - { - "description": "property invalidates property", - "data": {"foo": [1, 2, 3, 4]}, - "valid": false - }, - { - "description": "patternProperty invalidates property", - "data": {"foo": []}, - "valid": false - }, - { - "description": "patternProperty validates nonproperty", - "data": {"fxo": [1, 2]}, - "valid": true - }, - { - "description": "patternProperty invalidates nonproperty", - "data": {"fxo": []}, - "valid": false - }, - { - "description": "additionalProperty ignores property", - "data": {"bar": []}, - "valid": true - }, - { - "description": "additionalProperty validates others", - "data": {"quux": 3}, - "valid": true - }, - { - "description": "additionalProperty invalidates others", - "data": {"quux": "foo"}, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/properties.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/properties.test deleted file mode 100644 index 61186f68..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/properties.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": {"foo": 1, "bar": "baz"}, "name": "object properties validation -- both properties present and valid is valid", "schema": {"properties": {"foo": {"type": "integer"}, "bar": {"type": "string"}}}}, {"fail": true, "data": {"foo": 1, "bar": {}}, "name": "object properties validation -- one property invalid is invalid", "schema": {"properties": {"foo": {"type": "integer"}, "bar": {"type": "string"}}}}, {"fail": true, "data": {"foo": [], "bar": {}}, "name": "object properties validation -- both properties invalid is invalid", "schema": {"properties": {"foo": {"type": "integer"}, "bar": {"type": "string"}}}}, {"fail": false, "data": {"quux": []}, "name": "object properties validation -- doesn't invalidate other properties", "schema": {"properties": {"foo": {"type": "integer"}, "bar": {"type": "string"}}}}, {"fail": false, "data": [], "name": "object properties validation -- ignores non-objects", "schema": {"properties": {"foo": {"type": "integer"}, "bar": {"type": "string"}}}}, {"fail": false, "data": {"foo": [1, 2]}, "name": "properties, patternProperties, additionalProperties interaction -- property validates property", "schema": {"additionalProperties": {"type": "integer"}, "patternProperties": {"f.o": {"minItems": 2}}, "properties": {"foo": {"type": "array", "maxItems": 3}, "bar": {"type": "array"}}}}, {"fail": true, "data": {"foo": [1, 2, 3, 4]}, "name": "properties, patternProperties, additionalProperties interaction -- property invalidates property", "schema": {"additionalProperties": {"type": "integer"}, "patternProperties": {"f.o": {"minItems": 2}}, "properties": {"foo": {"type": "array", "maxItems": 3}, "bar": {"type": "array"}}}}, {"fail": true, "data": {"foo": []}, "name": "properties, patternProperties, additionalProperties interaction -- patternProperty invalidates property", "schema": {"additionalProperties": {"type": "integer"}, "patternProperties": {"f.o": {"minItems": 2}}, "properties": {"foo": {"type": "array", "maxItems": 3}, "bar": {"type": "array"}}}}, {"fail": false, "data": {"fxo": [1, 2]}, "name": "properties, patternProperties, additionalProperties interaction -- patternProperty validates nonproperty", "schema": {"additionalProperties": {"type": "integer"}, "patternProperties": {"f.o": {"minItems": 2}}, "properties": {"foo": {"type": "array", "maxItems": 3}, "bar": {"type": "array"}}}}, {"fail": true, "data": {"fxo": []}, "name": "properties, patternProperties, additionalProperties interaction -- patternProperty invalidates nonproperty", "schema": {"additionalProperties": {"type": "integer"}, "patternProperties": {"f.o": {"minItems": 2}}, "properties": {"foo": {"type": "array", "maxItems": 3}, "bar": {"type": "array"}}}}, {"fail": false, "data": {"bar": []}, "name": "properties, patternProperties, additionalProperties interaction -- additionalProperty ignores property", "schema": {"additionalProperties": {"type": "integer"}, "patternProperties": {"f.o": {"minItems": 2}}, "properties": {"foo": {"type": "array", "maxItems": 3}, "bar": {"type": "array"}}}}, {"fail": false, "data": {"quux": 3}, "name": "properties, patternProperties, additionalProperties interaction -- additionalProperty validates others", "schema": {"additionalProperties": {"type": "integer"}, "patternProperties": {"f.o": {"minItems": 2}}, "properties": {"foo": {"type": "array", "maxItems": 3}, "bar": {"type": "array"}}}}, {"fail": true, "data": {"quux": "foo"}, "name": "properties, patternProperties, additionalProperties interaction -- additionalProperty invalidates others", "schema": {"additionalProperties": {"type": "integer"}, "patternProperties": {"f.o": {"minItems": 2}}, "properties": {"foo": {"type": "array", "maxItems": 3}, "bar": {"type": "array"}}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/ref.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/ref.json deleted file mode 100644 index 168f207d..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/ref.json +++ /dev/null @@ -1,123 +0,0 @@ -[ - { - "description": "root pointer ref", - "schema": { - "properties": { - "foo": {"$ref": "#"} - }, - "additionalProperties": false - }, - "tests": [ - { - "description": "match", - "data": {"foo": false}, - "valid": true - }, - { - "description": "recursive match", - "data": {"foo": {"foo": false}}, - "valid": true - }, - { - "description": "mismatch", - "data": {"bar": false}, - "valid": false - }, - { - "description": "recursive mismatch", - "data": {"foo": {"bar": false}}, - "valid": false - } - ] - }, - { - "description": "relative pointer ref", - "schema": { - "properties": { - "foo": {"type": "integer"}, - "bar": {"$ref": "#/properties/foo"} - } - }, - "tests": [ - { - "description": "match", - "data": {"bar": 3}, - "valid": true - }, - { - "description": "mismatch", - "data": {"bar": true}, - "valid": false - } - ] - }, - { - "description": "escaped pointer ref", - "schema": { - "tilda~field": {"type": "integer"}, - "slash/field": {"type": "integer"}, - "percent%field": {"type": "integer"}, - "properties": { - "tilda": {"$ref": "#/tilda~0field"}, - "slash": {"$ref": "#/slash~1field"}, - "percent": {"$ref": "#/percent%25field"} - } - }, - "tests": [ - { - "description": "slash", - "data": {"slash": "aoeu"}, - "valid": false - }, - { - "description": "tilda", - "data": {"tilda": "aoeu"}, - "valid": false - }, - { - "description": "percent", - "data": {"percent": "aoeu"}, - "valid": false - } - ] - }, - { - "description": "nested refs", - "schema": { - "definitions": { - "a": {"type": "integer"}, - "b": {"$ref": "#/definitions/a"}, - "c": {"$ref": "#/definitions/b"} - }, - "$ref": "#/definitions/c" - }, - "tests": [ - { - "description": "nested ref valid", - "data": 5, - "valid": true - }, - { - "description": "nested ref invalid", - "data": "a", - "valid": false - } - ] - }, - { - "description": "remote ref, containing refs itself", - "schema": {"$ref": "http://json-schema.org/draft-04/schema#"}, - "tests": [ - { - "description": "remote ref valid", - "data": {"minLength": 1}, - "valid": true - }, - { - "description": "remote ref invalid", - "data": {"minLength": -1}, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/ref.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/ref.test deleted file mode 100644 index ab6631c3..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/ref.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": {"foo": false}, "name": "root pointer ref -- match", "schema": {"additionalProperties": false, "properties": {"foo": {"$ref": "#"}}}}, {"fail": false, "data": {"foo": {"foo": false}}, "name": "root pointer ref -- recursive match", "schema": {"additionalProperties": false, "properties": {"foo": {"$ref": "#"}}}}, {"fail": true, "data": {"bar": false}, "name": "root pointer ref -- mismatch", "schema": {"additionalProperties": false, "properties": {"foo": {"$ref": "#"}}}}, {"fail": true, "data": {"foo": {"bar": false}}, "name": "root pointer ref -- recursive mismatch", "schema": {"additionalProperties": false, "properties": {"foo": {"$ref": "#"}}}}, {"fail": false, "data": {"bar": 3}, "name": "relative pointer ref -- match", "schema": {"properties": {"foo": {"type": "integer"}, "bar": {"$ref": "#/properties/foo"}}}}, {"fail": true, "data": {"bar": true}, "name": "relative pointer ref -- mismatch", "schema": {"properties": {"foo": {"type": "integer"}, "bar": {"$ref": "#/properties/foo"}}}}, {"fail": true, "data": {"slash": "aoeu"}, "name": "escaped pointer ref -- slash", "schema": {"slash/field": {"type": "integer"}, "tilda~field": {"type": "integer"}, "percent%field": {"type": "integer"}, "properties": {"tilda": {"$ref": "#/tilda~0field"}, "percent": {"$ref": "#/percent%25field"}, "slash": {"$ref": "#/slash~1field"}}}}, {"fail": true, "data": {"tilda": "aoeu"}, "name": "escaped pointer ref -- tilda", "schema": {"slash/field": {"type": "integer"}, "tilda~field": {"type": "integer"}, "percent%field": {"type": "integer"}, "properties": {"tilda": {"$ref": "#/tilda~0field"}, "percent": {"$ref": "#/percent%25field"}, "slash": {"$ref": "#/slash~1field"}}}}, {"fail": true, "data": {"percent": "aoeu"}, "name": "escaped pointer ref -- percent", "schema": {"slash/field": {"type": "integer"}, "tilda~field": {"type": "integer"}, "percent%field": {"type": "integer"}, "properties": {"tilda": {"$ref": "#/tilda~0field"}, "percent": {"$ref": "#/percent%25field"}, "slash": {"$ref": "#/slash~1field"}}}}, {"fail": false, "data": 5, "name": "nested refs -- nested ref valid", "schema": {"definitions": {"a": {"type": "integer"}, "c": {"$ref": "#/definitions/b"}, "b": {"$ref": "#/definitions/a"}}, "$ref": "#/definitions/c"}}, {"fail": true, "data": "a", "name": "nested refs -- nested ref invalid", "schema": {"definitions": {"a": {"type": "integer"}, "c": {"$ref": "#/definitions/b"}, "b": {"$ref": "#/definitions/a"}}, "$ref": "#/definitions/c"}}, {"fail": false, "data": {"minLength": 1}, "name": "remote ref, containing refs itself -- remote ref valid", "schema": {"$ref": "http://json-schema.org/draft-04/schema#"}}, {"fail": true, "data": {"minLength": -1}, "name": "remote ref, containing refs itself -- remote ref invalid", "schema": {"$ref": "http://json-schema.org/draft-04/schema#"}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/required.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/required.json deleted file mode 100644 index 612f73f3..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/required.json +++ /dev/null @@ -1,39 +0,0 @@ -[ - { - "description": "required validation", - "schema": { - "properties": { - "foo": {}, - "bar": {} - }, - "required": ["foo"] - }, - "tests": [ - { - "description": "present required property is valid", - "data": {"foo": 1}, - "valid": true - }, - { - "description": "non-present required property is invalid", - "data": {"bar": 1}, - "valid": false - } - ] - }, - { - "description": "required default validation", - "schema": { - "properties": { - "foo": {} - } - }, - "tests": [ - { - "description": "not required by default", - "data": {}, - "valid": true - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/required.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/required.test deleted file mode 100644 index c9762a4d..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/required.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": {"foo": 1}, "name": "required validation -- present required property is valid", "schema": {"required": ["foo"], "properties": {"foo": {}, "bar": {}}}}, {"fail": true, "data": {"bar": 1}, "name": "required validation -- non-present required property is invalid", "schema": {"required": ["foo"], "properties": {"foo": {}, "bar": {}}}}, {"fail": false, "data": {}, "name": "required default validation -- not required by default", "schema": {"properties": {"foo": {}}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/type.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/type.json deleted file mode 100644 index 257f0512..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/type.json +++ /dev/null @@ -1,330 +0,0 @@ -[ - { - "description": "integer type matches integers", - "schema": {"type": "integer"}, - "tests": [ - { - "description": "an integer is an integer", - "data": 1, - "valid": true - }, - { - "description": "a float is not an integer", - "data": 1.1, - "valid": false - }, - { - "description": "a string is not an integer", - "data": "foo", - "valid": false - }, - { - "description": "an object is not an integer", - "data": {}, - "valid": false - }, - { - "description": "an array is not an integer", - "data": [], - "valid": false - }, - { - "description": "a boolean is not an integer", - "data": true, - "valid": false - }, - { - "description": "null is not an integer", - "data": null, - "valid": false - } - ] - }, - { - "description": "number type matches numbers", - "schema": {"type": "number"}, - "tests": [ - { - "description": "an integer is a number", - "data": 1, - "valid": true - }, - { - "description": "a float is a number", - "data": 1.1, - "valid": true - }, - { - "description": "a string is not a number", - "data": "foo", - "valid": false - }, - { - "description": "an object is not a number", - "data": {}, - "valid": false - }, - { - "description": "an array is not a number", - "data": [], - "valid": false - }, - { - "description": "a boolean is not a number", - "data": true, - "valid": false - }, - { - "description": "null is not a number", - "data": null, - "valid": false - } - ] - }, - { - "description": "string type matches strings", - "schema": {"type": "string"}, - "tests": [ - { - "description": "1 is not a string", - "data": 1, - "valid": false - }, - { - "description": "a float is not a string", - "data": 1.1, - "valid": false - }, - { - "description": "a string is a string", - "data": "foo", - "valid": true - }, - { - "description": "an object is not a string", - "data": {}, - "valid": false - }, - { - "description": "an array is not a string", - "data": [], - "valid": false - }, - { - "description": "a boolean is not a string", - "data": true, - "valid": false - }, - { - "description": "null is not a string", - "data": null, - "valid": false - } - ] - }, - { - "description": "object type matches objects", - "schema": {"type": "object"}, - "tests": [ - { - "description": "an integer is not an object", - "data": 1, - "valid": false - }, - { - "description": "a float is not an object", - "data": 1.1, - "valid": false - }, - { - "description": "a string is not an object", - "data": "foo", - "valid": false - }, - { - "description": "an object is an object", - "data": {}, - "valid": true - }, - { - "description": "an array is not an object", - "data": [], - "valid": false - }, - { - "description": "a boolean is not an object", - "data": true, - "valid": false - }, - { - "description": "null is not an object", - "data": null, - "valid": false - } - ] - }, - { - "description": "array type matches arrays", - "schema": {"type": "array"}, - "tests": [ - { - "description": "an integer is not an array", - "data": 1, - "valid": false - }, - { - "description": "a float is not an array", - "data": 1.1, - "valid": false - }, - { - "description": "a string is not an array", - "data": "foo", - "valid": false - }, - { - "description": "an object is not an array", - "data": {}, - "valid": false - }, - { - "description": "an array is not an array", - "data": [], - "valid": true - }, - { - "description": "a boolean is not an array", - "data": true, - "valid": false - }, - { - "description": "null is not an array", - "data": null, - "valid": false - } - ] - }, - { - "description": "boolean type matches booleans", - "schema": {"type": "boolean"}, - "tests": [ - { - "description": "an integer is not a boolean", - "data": 1, - "valid": false - }, - { - "description": "a float is not a boolean", - "data": 1.1, - "valid": false - }, - { - "description": "a string is not a boolean", - "data": "foo", - "valid": false - }, - { - "description": "an object is not a boolean", - "data": {}, - "valid": false - }, - { - "description": "an array is not a boolean", - "data": [], - "valid": false - }, - { - "description": "a boolean is not a boolean", - "data": true, - "valid": true - }, - { - "description": "null is not a boolean", - "data": null, - "valid": false - } - ] - }, - { - "description": "null type matches only the null object", - "schema": {"type": "null"}, - "tests": [ - { - "description": "an integer is not null", - "data": 1, - "valid": false - }, - { - "description": "a float is not null", - "data": 1.1, - "valid": false - }, - { - "description": "a string is not null", - "data": "foo", - "valid": false - }, - { - "description": "an object is not null", - "data": {}, - "valid": false - }, - { - "description": "an array is not null", - "data": [], - "valid": false - }, - { - "description": "a boolean is not null", - "data": true, - "valid": false - }, - { - "description": "null is null", - "data": null, - "valid": true - } - ] - }, - { - "description": "multiple types can be specified in an array", - "schema": {"type": ["integer", "string"]}, - "tests": [ - { - "description": "an integer is valid", - "data": 1, - "valid": true - }, - { - "description": "a string is valid", - "data": "foo", - "valid": true - }, - { - "description": "a float is invalid", - "data": 1.1, - "valid": false - }, - { - "description": "an object is invalid", - "data": {}, - "valid": false - }, - { - "description": "an array is invalid", - "data": [], - "valid": false - }, - { - "description": "a boolean is invalid", - "data": true, - "valid": false - }, - { - "description": "null is invalid", - "data": null, - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/type.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/type.test deleted file mode 100644 index d93bceae..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/type.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": 1, "name": "integer type matches integers -- an integer is an integer", "schema": {"type": "integer"}}, {"fail": true, "data": 1.1000000000000001, "name": "integer type matches integers -- a float is not an integer", "schema": {"type": "integer"}}, {"fail": true, "data": "foo", "name": "integer type matches integers -- a string is not an integer", "schema": {"type": "integer"}}, {"fail": true, "data": {}, "name": "integer type matches integers -- an object is not an integer", "schema": {"type": "integer"}}, {"fail": true, "data": [], "name": "integer type matches integers -- an array is not an integer", "schema": {"type": "integer"}}, {"fail": true, "data": true, "name": "integer type matches integers -- a boolean is not an integer", "schema": {"type": "integer"}}, {"fail": true, "data": null, "name": "integer type matches integers -- null is not an integer", "schema": {"type": "integer"}}, {"fail": false, "data": 1, "name": "number type matches numbers -- an integer is a number", "schema": {"type": "number"}}, {"fail": false, "data": 1.1000000000000001, "name": "number type matches numbers -- a float is a number", "schema": {"type": "number"}}, {"fail": true, "data": "foo", "name": "number type matches numbers -- a string is not a number", "schema": {"type": "number"}}, {"fail": true, "data": {}, "name": "number type matches numbers -- an object is not a number", "schema": {"type": "number"}}, {"fail": true, "data": [], "name": "number type matches numbers -- an array is not a number", "schema": {"type": "number"}}, {"fail": true, "data": true, "name": "number type matches numbers -- a boolean is not a number", "schema": {"type": "number"}}, {"fail": true, "data": null, "name": "number type matches numbers -- null is not a number", "schema": {"type": "number"}}, {"fail": true, "data": 1, "name": "string type matches strings -- 1 is not a string", "schema": {"type": "string"}}, {"fail": true, "data": 1.1000000000000001, "name": "string type matches strings -- a float is not a string", "schema": {"type": "string"}}, {"fail": false, "data": "foo", "name": "string type matches strings -- a string is a string", "schema": {"type": "string"}}, {"fail": true, "data": {}, "name": "string type matches strings -- an object is not a string", "schema": {"type": "string"}}, {"fail": true, "data": [], "name": "string type matches strings -- an array is not a string", "schema": {"type": "string"}}, {"fail": true, "data": true, "name": "string type matches strings -- a boolean is not a string", "schema": {"type": "string"}}, {"fail": true, "data": null, "name": "string type matches strings -- null is not a string", "schema": {"type": "string"}}, {"fail": true, "data": 1, "name": "object type matches objects -- an integer is not an object", "schema": {"type": "object"}}, {"fail": true, "data": 1.1000000000000001, "name": "object type matches objects -- a float is not an object", "schema": {"type": "object"}}, {"fail": true, "data": "foo", "name": "object type matches objects -- a string is not an object", "schema": {"type": "object"}}, {"fail": false, "data": {}, "name": "object type matches objects -- an object is an object", "schema": {"type": "object"}}, {"fail": true, "data": [], "name": "object type matches objects -- an array is not an object", "schema": {"type": "object"}}, {"fail": true, "data": true, "name": "object type matches objects -- a boolean is not an object", "schema": {"type": "object"}}, {"fail": true, "data": null, "name": "object type matches objects -- null is not an object", "schema": {"type": "object"}}, {"fail": true, "data": 1, "name": "array type matches arrays -- an integer is not an array", "schema": {"type": "array"}}, {"fail": true, "data": 1.1000000000000001, "name": "array type matches arrays -- a float is not an array", "schema": {"type": "array"}}, {"fail": true, "data": "foo", "name": "array type matches arrays -- a string is not an array", "schema": {"type": "array"}}, {"fail": true, "data": {}, "name": "array type matches arrays -- an object is not an array", "schema": {"type": "array"}}, {"fail": false, "data": [], "name": "array type matches arrays -- an array is not an array", "schema": {"type": "array"}}, {"fail": true, "data": true, "name": "array type matches arrays -- a boolean is not an array", "schema": {"type": "array"}}, {"fail": true, "data": null, "name": "array type matches arrays -- null is not an array", "schema": {"type": "array"}}, {"fail": true, "data": 1, "name": "boolean type matches booleans -- an integer is not a boolean", "schema": {"type": "boolean"}}, {"fail": true, "data": 1.1000000000000001, "name": "boolean type matches booleans -- a float is not a boolean", "schema": {"type": "boolean"}}, {"fail": true, "data": "foo", "name": "boolean type matches booleans -- a string is not a boolean", "schema": {"type": "boolean"}}, {"fail": true, "data": {}, "name": "boolean type matches booleans -- an object is not a boolean", "schema": {"type": "boolean"}}, {"fail": true, "data": [], "name": "boolean type matches booleans -- an array is not a boolean", "schema": {"type": "boolean"}}, {"fail": false, "data": true, "name": "boolean type matches booleans -- a boolean is not a boolean", "schema": {"type": "boolean"}}, {"fail": true, "data": null, "name": "boolean type matches booleans -- null is not a boolean", "schema": {"type": "boolean"}}, {"fail": true, "data": 1, "name": "null type matches only the null object -- an integer is not null", "schema": {"type": "null"}}, {"fail": true, "data": 1.1000000000000001, "name": "null type matches only the null object -- a float is not null", "schema": {"type": "null"}}, {"fail": true, "data": "foo", "name": "null type matches only the null object -- a string is not null", "schema": {"type": "null"}}, {"fail": true, "data": {}, "name": "null type matches only the null object -- an object is not null", "schema": {"type": "null"}}, {"fail": true, "data": [], "name": "null type matches only the null object -- an array is not null", "schema": {"type": "null"}}, {"fail": true, "data": true, "name": "null type matches only the null object -- a boolean is not null", "schema": {"type": "null"}}, {"fail": false, "data": null, "name": "null type matches only the null object -- null is null", "schema": {"type": "null"}}, {"fail": false, "data": 1, "name": "multiple types can be specified in an array -- an integer is valid", "schema": {"type": ["integer", "string"]}}, {"fail": false, "data": "foo", "name": "multiple types can be specified in an array -- a string is valid", "schema": {"type": ["integer", "string"]}}, {"fail": true, "data": 1.1000000000000001, "name": "multiple types can be specified in an array -- a float is invalid", "schema": {"type": ["integer", "string"]}}, {"fail": true, "data": {}, "name": "multiple types can be specified in an array -- an object is invalid", "schema": {"type": ["integer", "string"]}}, {"fail": true, "data": [], "name": "multiple types can be specified in an array -- an array is invalid", "schema": {"type": ["integer", "string"]}}, {"fail": true, "data": true, "name": "multiple types can be specified in an array -- a boolean is invalid", "schema": {"type": ["integer", "string"]}}, {"fail": true, "data": null, "name": "multiple types can be specified in an array -- null is invalid", "schema": {"type": ["integer", "string"]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/uniqueItems.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/uniqueItems.json deleted file mode 100644 index c1f4ab99..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/uniqueItems.json +++ /dev/null @@ -1,79 +0,0 @@ -[ - { - "description": "uniqueItems validation", - "schema": {"uniqueItems": true}, - "tests": [ - { - "description": "unique array of integers is valid", - "data": [1, 2], - "valid": true - }, - { - "description": "non-unique array of integers is invalid", - "data": [1, 1], - "valid": false - }, - { - "description": "numbers are unique if mathematically unequal", - "data": [1.0, 1.00, 1], - "valid": false - }, - { - "description": "unique array of objects is valid", - "data": [{"foo": "bar"}, {"foo": "baz"}], - "valid": true - }, - { - "description": "non-unique array of objects is invalid", - "data": [{"foo": "bar"}, {"foo": "bar"}], - "valid": false - }, - { - "description": "unique array of nested objects is valid", - "data": [ - {"foo": {"bar" : {"baz" : true}}}, - {"foo": {"bar" : {"baz" : false}}} - ], - "valid": true - }, - { - "description": "non-unique array of nested objects is invalid", - "data": [ - {"foo": {"bar" : {"baz" : true}}}, - {"foo": {"bar" : {"baz" : true}}} - ], - "valid": false - }, - { - "description": "unique array of arrays is valid", - "data": [["foo"], ["bar"]], - "valid": true - }, - { - "description": "non-unique array of arrays is invalid", - "data": [["foo"], ["foo"]], - "valid": false - }, - { - "description": "1 and true are unique", - "data": [1, true], - "valid": true - }, - { - "description": "0 and false are unique", - "data": [0, false], - "valid": true - }, - { - "description": "unique heterogeneous types are valid", - "data": [{}, [1], true, null, 1], - "valid": true - }, - { - "description": "non-unique heterogeneous types are invalid", - "data": [{}, [1], true, null, {}, 1], - "valid": false - } - ] - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/uniqueItems.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/uniqueItems.test deleted file mode 100644 index 5ebe141c..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/jsonschema-tests/uniqueItems.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": false, "data": [1, 2], "name": "uniqueItems validation -- unique array of integers is valid", "schema": {"uniqueItems": true}}, {"fail": true, "data": [1, 1], "name": "uniqueItems validation -- non-unique array of integers is invalid", "schema": {"uniqueItems": true}}, {"fail": true, "data": [1.0, 1.0, 1], "name": "uniqueItems validation -- numbers are unique if mathematically unequal", "schema": {"uniqueItems": true}}, {"fail": false, "data": [{"foo": "bar"}, {"foo": "baz"}], "name": "uniqueItems validation -- unique array of objects is valid", "schema": {"uniqueItems": true}}, {"fail": true, "data": [{"foo": "bar"}, {"foo": "bar"}], "name": "uniqueItems validation -- non-unique array of objects is invalid", "schema": {"uniqueItems": true}}, {"fail": false, "data": [{"foo": {"bar": {"baz": true}}}, {"foo": {"bar": {"baz": false}}}], "name": "uniqueItems validation -- unique array of nested objects is valid", "schema": {"uniqueItems": true}}, {"fail": true, "data": [{"foo": {"bar": {"baz": true}}}, {"foo": {"bar": {"baz": true}}}], "name": "uniqueItems validation -- non-unique array of nested objects is invalid", "schema": {"uniqueItems": true}}, {"fail": false, "data": [["foo"], ["bar"]], "name": "uniqueItems validation -- unique array of arrays is valid", "schema": {"uniqueItems": true}}, {"fail": true, "data": [["foo"], ["foo"]], "name": "uniqueItems validation -- non-unique array of arrays is invalid", "schema": {"uniqueItems": true}}, {"fail": false, "data": [1, true], "name": "uniqueItems validation -- 1 and true are unique", "schema": {"uniqueItems": true}}, {"fail": false, "data": [0, false], "name": "uniqueItems validation -- 0 and false are unique", "schema": {"uniqueItems": true}}, {"fail": false, "data": [{}, [1], true, null, 1], "name": "uniqueItems validation -- unique heterogeneous types are valid", "schema": {"uniqueItems": true}}, {"fail": true, "data": [{}, [1], true, null, {}, 1], "name": "uniqueItems validation -- non-unique heterogeneous types are invalid", "schema": {"uniqueItems": true}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/negative-unique-items.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/negative-unique-items.test deleted file mode 100644 index a1d53187..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/negative-unique-items.test +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "name": "Negative unique items", - "schema": { - "type": "array", - "uniqueItems": false - }, - "data": [ "a", "b", "a", "c" ] - }, - { - "name": "Negative unique items", - "schema": { - "type": "array", - "uniqueItems": true - }, - "data": [ "a", "b", "a", "c" ], - "fail": true - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/recursion.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/recursion.test deleted file mode 100644 index 30d2e8b4..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/recursion.test +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "name": "infinite recursion test", - "schema": { - "definitions": { - "a": { "$ref": "#/definitions/b" }, - "b": { "$ref": "#/definitions/a" } - }, - "properties": { - "a": { "$ref": "#/definitions/a" } - } - }, - "data": { "a": { "a": {} } }, - "fail": true - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/sample-test.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/sample-test.test deleted file mode 100644 index 0ebeb3f4..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/sample-test.test +++ /dev/null @@ -1,78 +0,0 @@ -[ - { - "name": "sample test", - "schema": { - "$schema": "http://json-schema.org/draft-04/schema", - "type":"object", - "additionalProperties":false, - "properties":{ - "fw": { - "type":"number" - }, - "sw": { - "type":"number" - }, - "repos": { - "type":"object", - "additionalProperties": { - "type":"string" - } - } - }, - "required": ["fw", "sw"] - }, - "data": { - "fw": 21, - "repos": { - "abc1": "f4562e9b588a 109 default tip", - "blah2": "b8a9198883cf 22 default tip", - "arg4": "686bb1a70728 1043 default tip lwlcca-development", - "mmmooo": "heads/lwlcca-0-ge679eade196c", - "aaaaaa": "ac7006fded4e 519 default tip", - "....s;iodufhaj": "1e63ee2e1813 568 default tip", - "ufksdid": "b563665d4a02 17 default tip", - "naaa": "5a7cd1abfd8e 59 default tip" - }, - "sw": 21 - } - }, - { - "name": "sample test - failure", - "schema": { - "$schema": "http://json-schema.org/draft-04/schema", - "type":"object", - "additionalProperties":false, - "properties":{ - "fw": { - "type":"number" - }, - "sw": { - "type":"number" - }, - "repos": { - "type":"object", - "additionalProperties": { - "type":"string" - } - } - }, - "required": ["fw", "sw"] - }, - "data": { - "fw": 21, - "repos": { - "abc1": "f4562e9b588a 109 default tip", - "blah2": "b8a9198883cf 22 default tip", - "arg4": "686bb1a70728 1043 default tip lwlcca-development", - "mmmooo": "heads/lwlcca-0-ge679eade196c", - "aaaaaa": "ac7006fded4e 519 default tip", - "....s;iodufhaj": "1e63ee2e1813 568 default tip", - "ufksdid": "b563665d4a02 17 default tip", - "naaa": "5a7cd1abfd8e 59 default tip", - "foo": 21 - }, - "sw": 21 - }, - "fail": true - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/simple-test-fail.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/simple-test-fail.json deleted file mode 100644 index 5267a612..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/simple-test-fail.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "fw": 21, - "repos": { - "abc1": "f4562e9b588a 109 default tip", - "blah2": "b8a9198883cf 22 default tip", - "arg4": "686bb1a70728 1043 default tip lwlcca-development", - "mmmooo": "heads/lwlcca-0-ge679eade196c", - "aaaaaa": "ac7006fded4e 519 default tip", - "....s;iodufhaj": "1e63ee2e1813 568 default tip", - "ufksdid": "b563665d4a02 17 default tip", - "naaa": "5a7cd1abfd8e 59 default tip" - } -} diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/simple-test-schema.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/simple-test-schema.json deleted file mode 100644 index c3d98d9c..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/simple-test-schema.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema", - "type":"object", - "additionalProperties":false, - "properties":{ - "fw": { - "type":"number" - }, - "sw": { - "type":"number" - }, - "repos": { - "type":"object", - "additionalProperties": { - "type":"string" - } - } - }, - "required": ["fw", "sw"] -} diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/simple-test.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/simple-test.json deleted file mode 100644 index 38f8eeb9..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/simple-test.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "fw": 21, - "repos": { - "abc1": "f4562e9b588a 109 default tip", - "blah2": "b8a9198883cf 22 default tip", - "arg4": "686bb1a70728 1043 default tip lwlcca-development", - "mmmooo": "heads/lwlcca-0-ge679eade196c", - "aaaaaa": "ac7006fded4e 519 default tip", - "....s;iodufhaj": "1e63ee2e1813 568 default tip", - "ufksdid": "b563665d4a02 17 default tip", - "naaa": "5a7cd1abfd8e 59 default tip" - }, - "sw": 21 -} diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/test_resolveuri.json b/src/hos_libvariant/src/libvariant/test/test_schema_data/test_resolveuri.json deleted file mode 100644 index 3e59369b..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/test_resolveuri.json +++ /dev/null @@ -1,203 +0,0 @@ -[ -/* These tests where taken verbatim from: -// http://skew.org/uri/uri_tests.html#absoluteizeURI -// They are in the format of reference, base, expected result -// ends in a empty string -These where then modified for the slightly different behavior we want -regarding .. segments. -*/ -"","http://example.com/path?query#frag","http://example.com/path?query", -"../c","foo:a/b","foo:c", -"foo:.","foo:a","foo:", -"/foo/../../../bar","zz:abc","zz:/bar", -"/foo/../bar","zz:abc","zz:/bar", -"foo/../../../bar","zz:abc","zz:bar", -"foo/../bar","zz:abc","zz:bar", -"zz:.","zz:abc","zz:", -"/.","http://a/b/c/d;p?q","http://a/", -"/.foo","http://a/b/c/d;p?q","http://a/.foo", -".foo","http://a/b/c/d;p?q","http://a/b/c/.foo", -"g:h","http://a/b/c/d;p?q","g:h", -"g","http://a/b/c/d;p?q","http://a/b/c/g", -"./g","http://a/b/c/d;p?q","http://a/b/c/g", -"g/","http://a/b/c/d;p?q","http://a/b/c/g/", -"/g","http://a/b/c/d;p?q","http://a/g", -"//g","http://a/b/c/d;p?q","http://g", -"?y","http://a/b/c/d;p?q","http://a/b/c/d;p?y", -"g?y","http://a/b/c/d;p?q","http://a/b/c/g?y", -"#s","http://a/b/c/d;p?q","http://a/b/c/d;p?q#s", -"g#s","http://a/b/c/d;p?q","http://a/b/c/g#s", -"g?y#s","http://a/b/c/d;p?q","http://a/b/c/g?y#s", -";x","http://a/b/c/d;p?q","http://a/b/c/;x", -"g;x","http://a/b/c/d;p?q","http://a/b/c/g;x", -"g;x?y#s","http://a/b/c/d;p?q","http://a/b/c/g;x?y#s", -"","http://a/b/c/d;p?q","http://a/b/c/d;p?q", -".","http://a/b/c/d;p?q","http://a/b/c/", -"./","http://a/b/c/d;p?q","http://a/b/c/", -"..","http://a/b/c/d;p?q","http://a/b/", -"../","http://a/b/c/d;p?q","http://a/b/", -"../g","http://a/b/c/d;p?q","http://a/b/g", -"../..","http://a/b/c/d;p?q","http://a/", -"../../","http://a/b/c/d;p?q","http://a/", -"../../g","http://a/b/c/d;p?q","http://a/g", -"../../../g","http://a/b/c/d;p?q","http://a/../g", -"../../../../g","http://a/b/c/d;p?q","http://a/g", -"/./g","http://a/b/c/d;p?q","http://a/g", -"/../g","http://a/b/c/d;p?q","http://a/../g", -"g.","http://a/b/c/d;p?q","http://a/b/c/g.", -".g","http://a/b/c/d;p?q","http://a/b/c/.g", -"g..","http://a/b/c/d;p?q","http://a/b/c/g..", -"..g","http://a/b/c/d;p?q","http://a/b/c/..g", -"./../g","http://a/b/c/d;p?q","http://a/b/g", -"./g/.","http://a/b/c/d;p?q","http://a/b/c/g/", -"g/./h","http://a/b/c/d;p?q","http://a/b/c/g/h", -"g/../h","http://a/b/c/d;p?q","http://a/b/c/h", -"g;x=1/./y","http://a/b/c/d;p?q","http://a/b/c/g;x=1/y", -"g;x=1/../y","http://a/b/c/d;p?q","http://a/b/c/y", -"g?y/./x","http://a/b/c/d;p?q","http://a/b/c/g?y/./x", -"g?y/../x","http://a/b/c/d;p?q","http://a/b/c/g?y/../x", -"g#s/./x","http://a/b/c/d;p?q","http://a/b/c/g#s/./x", -"g#s/../x","http://a/b/c/d;p?q","http://a/b/c/g#s/../x", -"http:g","http://a/b/c/d;p?q","http:g", -"http:","http://a/b/c/d;p?q","http:", -"/a/b/c/./../../g","http://a/b/c/d;p?q","http://a/a/g", -"g","http://a/b/c/d;p?q=1/2","http://a/b/c/g", -"./g","http://a/b/c/d;p?q=1/2","http://a/b/c/g", -"g/","http://a/b/c/d;p?q=1/2","http://a/b/c/g/", -"/g","http://a/b/c/d;p?q=1/2","http://a/g", -"//g","http://a/b/c/d;p?q=1/2","http://g", -"?y","http://a/b/c/d;p?q=1/2","http://a/b/c/d;p?y", -"g?y","http://a/b/c/d;p?q=1/2","http://a/b/c/g?y", -"g?y/./x","http://a/b/c/d;p?q=1/2","http://a/b/c/g?y/./x", -"g?y/../x","http://a/b/c/d;p?q=1/2","http://a/b/c/g?y/../x", -"g#s","http://a/b/c/d;p?q=1/2","http://a/b/c/g#s", -"g#s/./x","http://a/b/c/d;p?q=1/2","http://a/b/c/g#s/./x", -"g#s/../x","http://a/b/c/d;p?q=1/2","http://a/b/c/g#s/../x", -"./","http://a/b/c/d;p?q=1/2","http://a/b/c/", -"../","http://a/b/c/d;p?q=1/2","http://a/b/", -"../g","http://a/b/c/d;p?q=1/2","http://a/b/g", -"../../","http://a/b/c/d;p?q=1/2","http://a/", -"../../g","http://a/b/c/d;p?q=1/2","http://a/g", -"g","http://a/b/c/d;p=1/2?q","http://a/b/c/d;p=1/g", -"./g","http://a/b/c/d;p=1/2?q","http://a/b/c/d;p=1/g", -"g/","http://a/b/c/d;p=1/2?q","http://a/b/c/d;p=1/g/", -"g?y","http://a/b/c/d;p=1/2?q","http://a/b/c/d;p=1/g?y", -";x","http://a/b/c/d;p=1/2?q","http://a/b/c/d;p=1/;x", -"g;x","http://a/b/c/d;p=1/2?q","http://a/b/c/d;p=1/g;x", -"g;x=1/./y","http://a/b/c/d;p=1/2?q","http://a/b/c/d;p=1/g;x=1/y", -"g;x=1/../y","http://a/b/c/d;p=1/2?q","http://a/b/c/d;p=1/y", -"./","http://a/b/c/d;p=1/2?q","http://a/b/c/d;p=1/", -"../","http://a/b/c/d;p=1/2?q","http://a/b/c/", -"../g","http://a/b/c/d;p=1/2?q","http://a/b/c/g", -"../../","http://a/b/c/d;p=1/2?q","http://a/b/", -"../../g","http://a/b/c/d;p=1/2?q","http://a/b/g", -"g:h","fred:///s//a/b/c","g:h", -"g","fred:///s//a/b/c","fred:///s//a/b/g", -"./g","fred:///s//a/b/c","fred:///s//a/b/g", -"g/","fred:///s//a/b/c","fred:///s//a/b/g/", -"/g","fred:///s//a/b/c","fred:///g", -"//g","fred:///s//a/b/c","fred://g", -"//g/x","fred:///s//a/b/c","fred://g/x", -"///g","fred:///s//a/b/c","fred:///g", -"./","fred:///s//a/b/c","fred:///s//a/b/", -"../","fred:///s//a/b/c","fred:///s//a/", -"../g","fred:///s//a/b/c","fred:///s//a/g", -"../../","fred:///s//a/b/c","fred:///s//", -"../../g","fred:///s//a/b/c","fred:///s//g", -"../../../g","fred:///s//a/b/c","fred:///s/g", -"../../../../g","fred:///s//a/b/c","fred:///g", -"g:h","http:///s//a/b/c","g:h", -"g","http:///s//a/b/c","http:///s//a/b/g", -"./g","http:///s//a/b/c","http:///s//a/b/g", -"g/","http:///s//a/b/c","http:///s//a/b/g/", -"/g","http:///s//a/b/c","http:///g", -"//g","http:///s//a/b/c","http://g", -"//g/x","http:///s//a/b/c","http://g/x", -"///g","http:///s//a/b/c","http:///g", -"./","http:///s//a/b/c","http:///s//a/b/", -"../","http:///s//a/b/c","http:///s//a/", -"../g","http:///s//a/b/c","http:///s//a/g", -"../../","http:///s//a/b/c","http:///s//", -"../../g","http:///s//a/b/c","http:///s//g", -"../../../g","http:///s//a/b/c","http:///s/g", -"../../../../g","http:///s//a/b/c","http:///g", -"bar:abc","foo:xyz","bar:abc", -"../abc","http://example/x/y/z","http://example/x/abc", -"http://example/x/abc","http://example2/x/y/z","http://example/x/abc", -"../r","http://ex/x/y/z","http://ex/x/r", -"q/r","http://ex/x/y","http://ex/x/q/r", -"q/r#s","http://ex/x/y","http://ex/x/q/r#s", -"q/r#s/t","http://ex/x/y","http://ex/x/q/r#s/t", -"ftp://ex/x/q/r","http://ex/x/y","ftp://ex/x/q/r", -"","http://ex/x/y","http://ex/x/y", -"","http://ex/x/y/","http://ex/x/y/", -"","http://ex/x/y/pdq","http://ex/x/y/pdq", -"z/","http://ex/x/y/","http://ex/x/y/z/", -"#Animal","file:/swap/test/animal.rdf","file:/swap/test/animal.rdf#Animal", -"../abc","file:/e/x/y/z","file:/e/x/abc", -"/example/x/abc","file:/example2/x/y/z","file:/example/x/abc", -"../r","file:/ex/x/y/z","file:/ex/x/r", -"/r","file:/ex/x/y/z","file:/r", -"q/r","file:/ex/x/y","file:/ex/x/q/r", -"q/r#s","file:/ex/x/y","file:/ex/x/q/r#s", -"q/r#","file:/ex/x/y","file:/ex/x/q/r#", -"q/r#s/t","file:/ex/x/y","file:/ex/x/q/r#s/t", -"ftp://ex/x/q/r","file:/ex/x/y","ftp://ex/x/q/r", -"","file:/ex/x/y","file:/ex/x/y", -"","file:/ex/x/y/","file:/ex/x/y/", -"","file:/ex/x/y/pdq","file:/ex/x/y/pdq", -"z/","file:/ex/x/y/","file:/ex/x/y/z/", -"file://meetings.example.com/cal#m1","file:/devel/WWW/2000/10/swap/test/reluri-1.n3","file://meetings.example.com/cal#m1", -"file://meetings.example.com/cal#m1","file:/home/connolly/w3ccvs/WWW/2000/10/swap/test/reluri-1.n3","file://meetings.example.com/cal#m1", -"./#blort","file:/some/dir/foo","file:/some/dir/#blort", -"./#","file:/some/dir/foo","file:/some/dir/#", -"./","http://example/x/abc.efg","http://example/x/", -"//example/x/abc","http://example2/x/y/z","http://example/x/abc", -"/r","http://ex/x/y/z","http://ex/r", -"./q:r","http://ex/x/y","http://ex/x/q:r", -"./p=q:r","http://ex/x/y","http://ex/x/p=q:r", -"?pp/rr","http://ex/x/y?pp/qq","http://ex/x/y?pp/rr", -"y/z","http://ex/x/y?pp/qq","http://ex/x/y/z", -"local/qual@domain.org#frag","mailto:local","mailto:local/qual@domain.org#frag", -"more/qual2@domain2.org#frag","mailto:local/qual1@domain1.org","mailto:local/more/qual2@domain2.org#frag", -"y?q","http://ex/x/y?q","http://ex/x/y?q", -"/x/y?q","http://ex?p","http://ex/x/y?q", -"c/d","foo:a/b","foo:a/c/d", -"/c/d","foo:a/b","foo:/c/d", -"","foo:a/b?c#d","foo:a/b?c", -"b/c","foo:a","foo:b/c", -"../b/c","foo:/a/y/z","foo:/a/b/c", -"./b/c","foo:a","foo:b/c", -"/./b/c","foo:a","foo:/b/c", -"../../d","foo://a//b/c","foo://a/d", -".","foo:a","foo:", -"..","foo:a","foo:..", -"abc","http://example/x/y%2Fz","http://example/x/abc", -"../../x%2Fabc","http://example/a/x/y/z","http://example/a/x%2Fabc", -"../x%2Fabc","http://example/a/x/y%2Fz","http://example/a/x%2Fabc", -"abc","http://example/x%2Fy/z","http://example/x%2Fy/abc", -"q%3Ar","http://ex/x/y","http://ex/x/q%3Ar", -"/x%2Fabc","http://example/x/y%2Fz","http://example/x%2Fabc", -"/x%2Fabc","http://example/x/y/z","http://example/x%2Fabc", -"local2@domain2","mailto:local1@domain1?query1","mailto:local2@domain2", -"local2@domain2?query2","mailto:local1@domain1","mailto:local2@domain2?query2", -"local2@domain2?query2","mailto:local1@domain1?query1","mailto:local2@domain2?query2", -"?query2","mailto:local@domain?query1","mailto:local@domain?query2", -"local@domain?query2","mailto:?query1","mailto:local@domain?query2", -"?query2","mailto:local@domain?query1","mailto:local@domain?query2", -"http://example/a/b?c/../d","foo:bar","http://example/a/b?c/../d", -"http://example/a/b#c/../d","foo:bar","http://example/a/b#c/../d", -"http:this","http://example.org/base/uri","http:this", -"http:this","http:base","http:this", -".//g","f:/a","f://g", -"b/c//d/e","f://example.org/base/a","f://example.org/base/b/c//d/e", -"m2@example.ord/c2@example.org","mid:m@example.ord/c@example.org","mid:m@example.ord/m2@example.ord/c2@example.org", -"mini1.xml","file:///C:/DEV/Haskell/lib/HXmlToolbox-3.01/examples/","file:///C:/DEV/Haskell/lib/HXmlToolbox-3.01/examples/mini1.xml", -"../b/c","foo:a/y/z","foo:a/b/c", -"b","foo:","foo:b", -"b","foo://a","foo://a/b", -"b","foo://a?q","foo://a/b", -"b?q","foo://a","foo://a/b?q", -"b?q","foo://a?r","foo://a/b?q", -"", "", "" -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/01-type.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/01-type.test deleted file mode 100644 index 78c4d842..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/01-type.test +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "name": "no type specified", - "data": {}, - "schema": {} - }, - { - "name": "must be object, is object", - "data": {}, - "schema": { "type": "object" } - }, - { - "name": "must be object or string, is object", - "data": {}, - "schema": { "type": ["object", "string"] } - }, - { - "name": "must be object or string, is array", - "data": [], - "schema": { "type": ["object", "string"] }, - "fail": true - }, - { - "name": "must be array, is object", - "data": {}, - "schema": { "type": ["array"] }, - "fail": true - }, - { - "name": "must be string, is integer", - "data": 5, - "schema": {"type": ["string"] }, - "fail": true - }, - { - "name": "must be object, is null", - "data": null, - "schema": { "type": ["object"] }, - "fail": true - }, - { - "name": "must be null, is null", - "data": null, - "schema": { "type": "null" } - } -] diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/02-enum.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/02-enum.test deleted file mode 100644 index c8c533b1..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/02-enum.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": 1, "name": "enum [1], was 1", "schema": {"enum": [1]}}, {"fail": true, "data": "1", "name": "enum[1], was \"1\"", "schema": {"enum": [1]}}, {"data": {}, "name": "enum [{}], was {}", "schema": {"enum": [{}]}}, {"fail": true, "data": {}, "name": "enum [{\"key\":\"value\"}], was {}", "schema": {"enum": [{"key": "value"}]}}, {"fail": false, "data": {"key": "value"}, "name": "enum [{\"key\":\"value\", was {\"key\": \"value\"}", "schema": {"enum": [{"key": "value"}]}}, {"fail": false, "data": [1, true, 0], "name": "Enum with array value - success", "schema": {"enum": [[1, true, 0], 5, {}]}}, {"fail": true, "data": [1, true, 0, 5], "name": "Enum with array value - failure 1", "schema": {"enum": [[1, true, 0], 5, {}]}}, {"fail": true, "data": [1, true, 5], "name": "Enum with array value - failure 2", "schema": {"enum": [[1, true, 0], 5, {}]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/02-enum.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/02-enum.yaml deleted file mode 100644 index f8f3d20b..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/02-enum.yaml +++ /dev/null @@ -1,30 +0,0 @@ -- name: enum [1], was 1 - data: 1 - schema: { enum: [1] } -- name: enum[1], was "1" - data: "1" - schema: { enum: [1] } - fail: true -- name: enum [{}], was {} - data: {} - schema: { enum: [{}] } -- name: enum [{"key":"value"}], was {} - data: {} - schema: { enum: [{ key: value}] } - fail: true -- name: 'enum [{"key":"value", was {"key": "value"}' - data: { key: value } - schema: { enum: [{ key: value }] } - fail: false -- name: Enum with array value - success - data: [ 1, true, 0] - schema: { enum: [[1, true, 0], 5, {}] } - fail: false -- name: Enum with array value - failure 1 - data: [1, true, 0, 5] - schema: { enum: [[1, true, 0], 5, {}] } - fail: true -- name: Enum with array value - failure 2 - data: [1, true, 5] - schema: { enum: [[1, true, 0], 5, {}] } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/Makefile b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/Makefile deleted file mode 100644 index 91c369e5..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/01-any-type/Makefile +++ /dev/null @@ -1,5 +0,0 @@ - -tests: 02-enum.test - -02-enum.test: 02-enum.yaml - python -c "import json; import yaml; import sys; json.dump(yaml.load(sys.stdin), sys.stdout);" < $< > $@ diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/01-min-max.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/01-min-max.test deleted file mode 100644 index 45f121dd..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/01-min-max.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": 5, "name": "minimum success", "schema": {"minimum": 2.5}}, {"fail": true, "data": 5, "name": "minimum failure", "schema": {"minimum": 7}}, {"data": 5, "name": "minimum equality success", "schema": {"minimum": 5}}, {"fail": true, "data": 5, "name": "minimum equality failure", "schema": {"minimum": 5, "exclusiveMinimum": true}}, {"data": 5, "name": "maximum success", "schema": {"maximum": 7}}, {"fail": true, "data": -5, "name": "maximum failure", "schema": {"maximum": -7}}, {"data": 5, "name": "exclusive maximum success", "schema": {"maximum": 5}}, {"fail": true, "data": 5, "name": "exclusive maximum failure", "schema": {"exclusiveMaximum": true, "maximum": 5}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/01-min-max.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/01-min-max.yaml deleted file mode 100644 index 89390321..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/01-min-max.yaml +++ /dev/null @@ -1,28 +0,0 @@ -- name: minimum success - data: 5 - schema: { minimum: 2.5 } -- name: minimum failure - data: 5 - schema: { minimum: 7 } - fail: true -- name: minimum equality success - data: 5 - schema: { minimum: 5 } -- name: minimum equality failure - data: 5 - schema: { minimum: 5, exclusiveMinimum: true } - fail: true -- name: maximum success - data: 5 - schema: { maximum: 7 } -- name: maximum failure - data: -5 - schema: { maximum: -7 } - fail: true -- name: exclusive maximum success - data: 5 - schema: { maximum: 5 } -- name: exclusive maximum failure - data: 5 - schema: { maximum: 5, exclusiveMaximum: true } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/02-multipleOf.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/02-multipleOf.test deleted file mode 100644 index f7b0e24a..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/02-multipleOf.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": 5, "name": "multipleOf", "schema": {"multipleOf": 2.5}}, {"fail": true, "data": 5, "name": "multipleOf failure", "schema": {"multipleOf": 0.75}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/02-multipleOf.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/02-multipleOf.yaml deleted file mode 100644 index ba0fc6aa..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/02-multipleOf.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- name: multipleOf - data: 5 - schema: { multipleOf: 2.5 } -- name: multipleOf failure - data: 5 - schema: { multipleOf: 0.75 } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/Makefile b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/Makefile deleted file mode 120000 index b261c621..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/02-numeric/Makefile +++ /dev/null @@ -1 +0,0 @@ -../submakefile \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/01-min-max-length.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/01-min-max-length.test deleted file mode 100644 index ba630590..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/01-min-max-length.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": "test", "name": "no length constraints", "schema": {}}, {"data": "test", "name": "minimum length success", "schema": {"minLength": 3}}, {"fail": true, "data": "test", "name": "min length failure", "schema": {"minLength": 5}}, {"data": "test1234", "name": "maximum length success", "schema": {"maxLength": 10}}, {"fail": true, "data": "test1234", "name": "maximum length failure", "schema": {"maxLength": 5}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/01-min-max-length.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/01-min-max-length.yaml deleted file mode 100644 index c32d4c70..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/01-min-max-length.yaml +++ /dev/null @@ -1,17 +0,0 @@ -- name: no length constraints - data: test - schema: {} -- name: minimum length success - data: test - schema: { minLength: 3 } -- name: min length failure - data: test - schema: { minLength: 5 } - fail: true -- name: maximum length success - data: test1234 - schema: { maxLength: 10 } -- name: maximum length failure - data: test1234 - schema: { maxLength: 5 } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/02-pattern.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/02-pattern.test deleted file mode 100644 index 5ac7fa12..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/02-pattern.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": "9test", "name": "pattern success", "schema": {"pattern": "^[0-9][a-zA-Z]*$"}}, {"fail": true, "data": "9test9", "name": "pattern failure", "schema": {"pattern": "^[0-9][a-zA-Z]*$"}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/02-pattern.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/02-pattern.yaml deleted file mode 100644 index bfe04876..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/02-pattern.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- name: pattern success - data: 9test - schema: { pattern: "^[0-9][a-zA-Z]*$" } -- name: pattern failure - data: 9test9 - schema: { pattern: "^[0-9][a-zA-Z]*$" } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/Makefile b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/Makefile deleted file mode 120000 index b261c621..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/03-strings/Makefile +++ /dev/null @@ -1 +0,0 @@ -../submakefile \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/01-min-max-length.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/01-min-max-length.test deleted file mode 100644 index c7369388..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/01-min-max-length.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": [1, 2, 3], "name": "no length contraints", "schema": {}}, {"data": [1, 2, 3], "name": "minimum length success", "schema": {"minItems": 3}}, {"fail": true, "data": [1, 2, 3], "name": "minimum length failure", "schema": {"minItems": 5}}, {"data": [1, 2, 3, 4, 5], "name": "maximum length success", "schema": {"maxItems": 10}}, {"fail": true, "data": [1, 2, 3, 4, 5], "name": "maximum length failure", "schema": {"maxItems": 3}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/01-min-max-length.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/01-min-max-length.yaml deleted file mode 100644 index a399502c..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/01-min-max-length.yaml +++ /dev/null @@ -1,17 +0,0 @@ -- name: no length contraints - data: [1,2,3] - schema: {} -- name: minimum length success - data: [1,2,3] - schema: { minItems: 3 } -- name: minimum length failure - data: [1,2,3] - schema: { minItems: 5 } - fail: true -- name: maximum length success - data: [1,2,3,4,5] - schema: { maxItems: 10 } -- name: maximum length failure - data: [1,2,3,4,5] - schema: { maxItems: 3 } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/02-uniqueitems.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/02-uniqueitems.test deleted file mode 100644 index 30ee13a0..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/02-uniqueitems.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": [1, true, "1"], "name": "uniqueItems success", "schema": {"uniqueItems": true}}, {"fail": true, "data": [1, true, "1", 1], "name": "uniqueItems failure", "schema": {"uniqueItems": true}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/02-uniqueitems.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/02-uniqueitems.yaml deleted file mode 100644 index 8cf319c4..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/02-uniqueitems.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- name: uniqueItems success - data: [1, true, "1"] - schema: { uniqueItems: true } -- name: uniqueItems failure - data: [1, true, "1", 1] - schema: { uniqueItems: true } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/03-items-plain.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/03-items-plain.test deleted file mode 100644 index bf60b9b9..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/03-items-plain.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": [1, 2, 3, 4], "name": "plain item success", "schema": {"items": {"type": "integer"}}}, {"fail": true, "data": [1, 2, true, 4], "name": "plain item failure", "schema": {"items": {"type": "integer"}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/03-items-plain.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/03-items-plain.yaml deleted file mode 100644 index 16930d55..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/03-items-plain.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- name: plain item success - data: [1,2,3,4] - schema: { items: { type: integer } } -- name: plain item failure - data: [1,2,true,4] - schema: { items: { type: integer } } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/04-items-tuple-typing.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/04-items-tuple-typing.test deleted file mode 100644 index 77084821..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/04-items-tuple-typing.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": [1, true, "one"], "name": "items success", "schema": {"items": [{"type": "integer"}, {"type": "boolean"}]}}, {"fail": true, "data": [1, null, "one"], "name": "items failure", "schema": {"items": [{"type": "integer"}, {"type": "boolean"}]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/04-items-tuple-typing.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/04-items-tuple-typing.yaml deleted file mode 100644 index 89850307..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/04-items-tuple-typing.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- name: items success - data: [1, true, "one"] - schema: { items: [ { type: integer} , { type: boolean } ] } -- name: items failure - data: [1, null, "one"] - schema: { items: [ { type: integer} , { type: boolean } ] } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/05-additionalitems.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/05-additionalitems.test deleted file mode 100644 index f7c59a57..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/05-additionalitems.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": [1, true, "one", "uno"], "name": "additional items schema success", "schema": {"items": [{"type": "integer"}, {"type": "boolean"}], "additionalItems": {"type": "string"}}}, {"fail": true, "data": [1, true, "one", 1], "name": "additional items schema failure", "schema": {"items": [{"type": "integer"}, {"type": "boolean"}], "additionalItems": {"type": "string"}}}, {"data": [1, true, "one", "uno"], "name": "additional items boolean success", "schema": {"items": [{"type": "integer"}, {"type": "boolean"}], "additionalItems": true}}, {"fail": true, "data": [1, true, "one", "uno"], "name": "additional items boolean failure", "schema": {"items": [{"type": "integer"}, {"type": "boolean"}], "additionalItems": false}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/05-additionalitems.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/05-additionalitems.yaml deleted file mode 100644 index ee6ad935..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/05-additionalitems.yaml +++ /dev/null @@ -1,31 +0,0 @@ -- name: additional items schema success - data: [1, true, "one", "uno"] - schema: - items: - - type: integer - - type: boolean - additionalItems: { type: string } -- name: additional items schema failure - data: [1, true, "one", 1] - schema: - items: - - type: integer - - type: boolean - additionalItems: { type: string } - fail: true -- name: additional items boolean success - data: [1, true, "one", "uno"] - schema: - items: - - type: integer - - type: boolean - additionalItems: true -- name: additional items boolean failure - data: [1, true, "one", "uno"] - schema: - items: - - type: integer - - type: boolean - additionalItems: false - fail: true - diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/Makefile b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/Makefile deleted file mode 120000 index b261c621..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/04-arrays/Makefile +++ /dev/null @@ -1 +0,0 @@ -../submakefile \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/01-min-max-properties.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/01-min-max-properties.test deleted file mode 100644 index 9eecafed..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/01-min-max-properties.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": {"key3": 3, "key2": 2, "key": 1}, "name": "minimum length success", "schema": {"minProperties": 3}}, {"fail": true, "data": {"key3": 3, "key2": 2, "key": 1}, "name": "minimum length failure", "schema": {"minProperties": 5}}, {"data": {"key3": 3, "key2": 2, "key": 1}, "name": "maximum length success", "schema": {"maxProperties": 5}}, {"fail": true, "data": {"key3": 3, "key2": 2, "key": 1}, "name": "maximum length failure", "schema": {"maxProperties": 2}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/01-min-max-properties.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/01-min-max-properties.yaml deleted file mode 100644 index 01151718..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/01-min-max-properties.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- name: minimum length success - data: { key: 1, key2: 2, key3: 3 } - schema: { minProperties: 3 } -- name: minimum length failure - data: { key: 1, key2: 2, key3: 3 } - schema: { minProperties: 5 } - fail: true -- name: maximum length success - data: { key: 1, key2: 2, key3: 3 } - schema: { maxProperties: 5 } -- name: maximum length failure - data: { key: 1, key2: 2, key3: 3 } - schema: { maxProperties: 2 } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/02-required.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/02-required.test deleted file mode 100644 index c33d9b7d..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/02-required.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": {"key3": 3, "key2": 2, "key1": 1}, "name": "required success", "schema": {"required": ["key1", "key2"]}}, {"fail": true, "data": {"key3": 3, "key2": 2, "key1": 1}, "name": "required failure", "schema": {"required": ["key1", "notDefined"]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/02-required.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/02-required.yaml deleted file mode 100644 index 0acc7e51..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/02-required.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- name: required success - data: { key1: 1, key2: 2, key3: 3 } - schema: { required: [ key1, key2 ] } -- name: required failure - data: { key1: 1, key2: 2, key3: 3 } - schema: { required: [ key1, notDefined ] } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/03-properties.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/03-properties.test deleted file mode 100644 index 84cd7400..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/03-properties.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": {"stringKey": "one", "intKey": 1}, "name": "properties success", "schema": {"properties": {"stringKey": {"type": "string"}, "intKey": {"type": "integer"}}}}, {"fail": true, "data": {"stringKey": false, "intKey": 1}, "name": "properties failure", "schema": {"properties": {"stringKey": {"type": "string"}, "intKey": {"type": "integer"}}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/03-properties.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/03-properties.yaml deleted file mode 100644 index 024d09eb..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/03-properties.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- name: properties success - data: { intKey: 1, stringKey: "one" } - schema: - properties: - intKey: { type: integer } - stringKey: { type: string } -- name: properties failure - data: { intKey: 1, stringKey: false } - schema: - properties: - intKey: { type: integer } - stringKey: { type: string } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/04-patternproperties.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/04-patternproperties.test deleted file mode 100644 index 2b911b39..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/04-patternproperties.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": {"intKey2": 5, "intKey": 1}, "name": "patternProperties success", "schema": {"patternProperties": {"^int": {"minimum": 0}}, "properties": {"intKey": {"type": "integer"}}}}, {"fail": true, "data": {"intKey2": 5, "intKey": 1}, "name": "patternProperties failure 1", "schema": {"patternProperties": {"^int": {"type": "integer"}}, "properties": {"intKey": {"minimum": 5}}}}, {"fail": true, "data": {"intKey2": "string value", "intkey": 10}, "name": "patternProperties failure 2", "schema": {"patternProperties": {"^int": {"type": "integer"}}, "properties": {"intKey": {"minimum": 5}}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/04-patternproperties.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/04-patternproperties.yaml deleted file mode 100644 index d4beb524..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/04-patternproperties.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- name: patternProperties success - data: { intKey: 1, intKey2: 5 } - schema: - properties: - intKey: { type: integer } - patternProperties: - "^int": { minimum: 0 } -- name: patternProperties failure 1 - data: { intKey: 1, intKey2: 5 } - schema: - properties: - intKey: { minimum: 5 } - patternProperties: - "^int": { type: integer } - fail: true -- name: patternProperties failure 2 - data: { intkey: 10, intKey2: "string value" } - schema: - properties: - intKey: { minimum: 5 } - patternProperties: - "^int": { type: integer } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/05-additionalproperties.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/05-additionalproperties.test deleted file mode 100644 index 2d5f0bc4..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/05-additionalproperties.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": {"stringKey": "string", "intKey2": 5, "intKey": 1}, "name": "additionalProperties schema success", "schema": {"additionalProperties": {"type": "string"}, "patternProperties": {"^int": {"minimum": 0}}, "properties": {"intKey": {"type": "integer"}}}}, {"fail": true, "data": {"stringKey": null, "intKey2": 5, "intKey": 10}, "name": "additionalProperties schema failure", "schema": {"additionalProperties": {"type": "string"}, "patternProperties": {"^int": {"type": "integer"}}, "properties": {"intKey": {"minimum": 5}}}}, {"data": {"stringKey": null, "intKey2": 5, "intKey": 10}, "name": "additionalProperties boolean success", "schema": {"additionalProperties": true, "patternProperties": {"^int": {"type": "integer"}}, "properties": {"intKey": {"minimum": 5}}}}, {"fail": true, "data": {"stringKey": null, "intKey2": 5, "intKey": 10}, "name": "additionalProperties boolean failure", "schema": {"additionalProperties": false, "patternProperties": {"^int": {"type": "integer"}}, "properties": {"intKey": {"minimum": 5}}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/05-additionalproperties.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/05-additionalproperties.yaml deleted file mode 100644 index f3fb4fbd..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/05-additionalproperties.yaml +++ /dev/null @@ -1,34 +0,0 @@ -- name: additionalProperties schema success - data: { intKey: 1, intKey2: 5, stringKey: string } - schema: - properties: - intKey: { type: integer } - patternProperties: - "^int": { minimum: 0 } - additionalProperties: { type: string } -- name: additionalProperties schema failure - data: { intKey: 10, intKey2: 5, stringKey: null } - schema: - properties: - intKey: { minimum: 5 } - patternProperties: - "^int": { type: integer } - additionalProperties: { type: string } - fail: true -- name: additionalProperties boolean success - data: { intKey: 10, intKey2: 5, stringKey: null } - schema: - properties: - intKey: { minimum: 5 } - patternProperties: - "^int": { type: integer } - additionalProperties: true -- name: additionalProperties boolean failure - data: { intKey: 10, intKey2: 5, stringKey: null } - schema: - properties: - intKey: { minimum: 5 } - patternProperties: - "^int": { type: integer } - additionalProperties: false - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/06-dependencies.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/06-dependencies.test deleted file mode 100644 index 2a4c7600..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/06-dependencies.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": {"key2": "string", "key1": 5}, "name": "string dependency success", "schema": {"dependencies": {"key1": "key2"}}}, {"fail": true, "data": {"key1": 5}, "name": "string dependency failure", "schema": {"dependencies": {"key1": "key2"}}}, {"data": {"key2": "string", "key1": 5}, "name": "array dependency success", "schema": {"dependencies": {"key1": ["key2"]}}}, {"fail": true, "data": {"key1": 5}, "name": "array dependency failure", "schema": {"dependencies": {"key1": ["key2"]}}}, {"data": {"key2": "string", "key1": 5}, "name": "schema dependency success", "schema": {"dependencies": {"key1": {"properties": {"key2": {"type": "string"}}}}}}, {"fail": true, "data": {"key2": 5, "key1": 5}, "name": "schema dependency failure", "schema": {"dependencies": {"key1": {"properties": {"key2": {"type": "string"}}}}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/06-dependencies.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/06-dependencies.yaml deleted file mode 100644 index e33a7d81..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/06-dependencies.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- name: string dependency success - data: { key1: 5, key2: string } - schema: { dependencies: { key1: key2 } } -- name: string dependency failure - data: { key1: 5 } - schema: { dependencies: { key1: key2 } } - fail: true -- name: array dependency success - data: { key1: 5, key2: string } - schema: { dependencies: { key1: [ key2 ] } } -- name: array dependency failure - data: { key1: 5 } - schema: { dependencies: { key1: [ key2 ] } } - fail: true -- name: schema dependency success - data: { key1: 5, key2: string } - schema: { dependencies: { key1: { properties: { key2: { type: string } } } } } -- name: schema dependency failure - data: { key1: 5, key2: 5 } - schema: { dependencies: { key1: { properties: { key2: { type: string } } } } } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/Makefile b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/Makefile deleted file mode 120000 index b261c621..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/05-objects/Makefile +++ /dev/null @@ -1 +0,0 @@ -../submakefile \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/01-allOf.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/01-allOf.test deleted file mode 100644 index c2da9972..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/01-allOf.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": 10, "name": "allOf success", "schema": {"allOf": [{"type": "integer"}, {"minimum": 5}]}}, {"fail": true, "data": 1, "name": "allOf failure", "schema": {"allOf": [{"type": "integer"}, {"minimum": 5}]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/01-allOf.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/01-allOf.yaml deleted file mode 100644 index 47673f6b..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/01-allOf.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- name: allOf success - data: 10 - schema: - allOf: - - type: integer - - minimum: 5 -- name: allOf failure - data: 1 - schema: - allOf: - - type: integer - - minimum: 5 - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/02-anyOf.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/02-anyOf.test deleted file mode 100644 index 8215a2ba..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/02-anyOf.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": "hello", "name": "anyOf success", "schema": {"anyOf": [{"type": "integer"}, {"type": "string"}, {"minlength": 1}]}}, {"fail": true, "data": true, "name": "anyOf failure", "schema": {"anyOf": [{"type": "integer"}, {"type": "string"}]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/02-anyOf.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/02-anyOf.yaml deleted file mode 100644 index 708f3ed7..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/02-anyOf.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- name: anyOf success - data: hello - schema: - anyOf: - - type: integer - - type: string - - minlength: 1 -- name: anyOf failure - data: true - schema: - anyOf: - - type: integer - - type: string - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/03-oneOf.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/03-oneOf.test deleted file mode 100644 index 6142b60b..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/03-oneOf.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": 5, "name": "oneOf success", "schema": {"oneOf": [{"type": "integer"}, {"type": "string"}, {"minLength": 1, "type": "string"}]}}, {"fail": true, "data": "string", "name": "oneOf failure (too many)", "schema": {"oneOf": [{"type": "integer"}, {"type": "string"}, {"minLength": 1, "type": "string"}]}}, {"fail": true, "data": false, "name": "oneOf failure (no matches)", "schema": {"oneOf": [{"type": "integer"}, {"type": "string"}, {"minLength": 1, "type": "string"}]}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/03-oneOf.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/03-oneOf.yaml deleted file mode 100644 index 259e2597..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/03-oneOf.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- name: oneOf success - data: 5 - schema: - oneOf: - - type: integer - - type: string - - { type: string, minLength: 1 } -- name: oneOf failure (too many) - data: string - schema: - oneOf: - - type: integer - - type: string - - { type: string, minLength: 1 } - fail: true -- name: oneOf failure (no matches) - data: false - schema: - oneOf: - - type: integer - - type: string - - { type: string, minLength: 1 } - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/04-not.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/04-not.test deleted file mode 100644 index 0589f2fd..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/04-not.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": 5, "name": "not success", "schema": {"not": {"type": "string"}}}, {"fail": true, "data": "test", "name": "not failure", "schema": {"not": {"type": "string"}}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/04-not.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/04-not.yaml deleted file mode 100644 index 89774327..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/04-not.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- name: not success - data: 5 - schema: - not: - type: string -- name: not failure - data: test - schema: - not: - type: string - fail: true diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/Makefile b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/Makefile deleted file mode 120000 index b261c621..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/06-combinations/Makefile +++ /dev/null @@ -1 +0,0 @@ -../submakefile \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/04-ref.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/04-ref.test deleted file mode 100644 index 4df30aeb..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/04-ref.test +++ /dev/null @@ -1 +0,0 @@ -[{"data": [[], [[]]], "name": "internal $ref 1", "schema": {"items": {"$ref": "#"}, "type": "array"}}, {"fail": true, "data": [1, 2, 3, 4], "name": "internal $ref 2", "schema": {"items": {"$ref": "#"}, "type": "array"}}, {"fail": true, "data": [[false], [[]]], "name": "internal $ref 2", "schema": {"items": {"$ref": "#"}, "type": "array"}}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/04-ref.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/04-ref.yaml deleted file mode 100644 index 819de210..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/04-ref.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- name: internal $ref 1 - schema: { type: array, items: { "$ref": "#" } } - data: [[],[[]]] -- name: internal $ref 2 - schema: { type: array, items: { "$ref": "#" } } - data: [1,2,3,4] - fail: true -- name: internal $ref 2 - schema: { type: array, items: { "$ref": "#" } } - data: [[false],[[]]] - fail: true - diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/05-inline-addressing.test b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/05-inline-addressing.test deleted file mode 100644 index e096a487..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/05-inline-addressing.test +++ /dev/null @@ -1 +0,0 @@ -[{"fail": true, "data": [0, false], "name": "inline addressing for fragments", "schema": {"items": {"$ref": "#test"}, "type": "array", "testSchema": {"type": "boolean", "id": "#test"}}}, {"schema": {"items": {"$ref": "other-schema"}, "type": "array", "id": "http://example.com/123/schema", "testSchema": {"type": "boolean", "id": "/other-schema"}}, "data": [0, false], "name": "don't trust non sub-paths", "missing": ["http://example.com/123/other-schema"]}] \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/05-inline-addressing.yaml b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/05-inline-addressing.yaml deleted file mode 100644 index 06fdbfdb..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/05-inline-addressing.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- name: inline addressing for fragments - data: [0, false] - schema: - type: array - items: { "$ref": "#test" } - testSchema: - id: "#test" - type: boolean - fail: true -- name: "don't trust non sub-paths" - data: [0, false] - schema: - id: 'http://example.com/123/schema' - type: array - items: { "$ref": "other-schema" } - testSchema: - id: "/other-schema" - type: boolean - missing: - - 'http://example.com/123/other-schema' diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/Makefile b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/Makefile deleted file mode 120000 index b261c621..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/07-ref/Makefile +++ /dev/null @@ -1 +0,0 @@ -../submakefile \ No newline at end of file diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/Makefile b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/Makefile deleted file mode 100644 index de57236d..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -all: - $(MAKE) -C 01-any-type - $(MAKE) -C 02-numeric - $(MAKE) -C 03-strings - $(MAKE) -C 04-arrays - $(MAKE) -C 05-objects - $(MAKE) -C 06-combinations - $(MAKE) -C 07-ref - - diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/README b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/README deleted file mode 100644 index f7613fc4..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/README +++ /dev/null @@ -1,4 +0,0 @@ - -All the tests in this folder came from the tv4 javascript implementation. - -http://geraintluff.github.com/tv4/ diff --git a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/submakefile b/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/submakefile deleted file mode 100644 index a4899796..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_schema_data/tv4-tests/submakefile +++ /dev/null @@ -1,9 +0,0 @@ - -TARGETS := $(patsubst %.yaml,%.test,$(wildcard *.yaml)) - -tests: $(TARGETS) - - -%.test: %.yaml - python -c "import json; import yaml; import sys; json.dump(yaml.load(sys.stdin), sys.stdout);" < $< > $@ - diff --git a/src/hos_libvariant/src/libvariant/test/test_variant.cc b/src/hos_libvariant/src/libvariant/test/test_variant.cc deleted file mode 100644 index dcb03502..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_variant.cc +++ /dev/null @@ -1,744 +0,0 @@ -//============================================================================= -// This library is free software; you can redistribute it and/or modify it -// under the terms of the GNU Library General Public License as published -// by the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// The GNU Public License is available in the file LICENSE, or you -// can write to the Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA, or you can find it on the -// World Wide Web at http://www.fsf.org. -//============================================================================= -/** \file - * \author John Bridgman - * \brief A simple test for the Variant and JSONToVariant parser. - */ -#include -#include -#include -#include -#include -#include "../../libvariant/include/Variant/Emitter.h" -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/include/Variant/Variant.h" -#include "../../libvariant/test/TestAssert.h" -#include "../../libvariant/test/TestCommon.h" - -using namespace libvariant; -using namespace std; - - -void VariantTest() { - std::cout << "Testing some of Variant's functionality\n"; - - Variant null; - ASSERT(null.IsNull()); - Variant v; - v = 5; - ASSERT(!v.IsNull()); - ASSERT(v.AsInt() == 5); - ASSERT(v.AsUnsigned() == 5u); - ASSERT(v.AsDouble() == 5.0); - ASSERT(v == Variant(5)); - ASSERT(v != "5"); - Variant b = true; - ASSERT(b.IsBool()); - ASSERT(b.IsTrue()); - ASSERT(!b.IsFalse()); - b = false; - ASSERT(b.IsBool()); - ASSERT(b.IsFalse()); - ASSERT(!b.IsTrue()); - Variant map; - ASSERT(map.Empty()); - map["one"] = v; - map["two"] = "two"; - ASSERT(map["one"] == v); - ASSERT(v == map["one"]); - ASSERT(map.Empty() == false); - ASSERT(map["one"].Exists()); - ASSERT(!map["nothing"].Exists()); - ASSERT(map.Exists()); - Variant list; - ASSERT(list.GetType() == Variant::NullType); - list[0] = 1; - list[2] = "two"; - list[5] = map; - list[4] = 123u; - list[6] = 0.3535566; - ASSERT(list.GetType() == Variant::ListType); - ASSERT(!list.Empty()); - ASSERT(list.Size() == 7); - ASSERT(list[0].GetType() == Variant::IntegerType); - ASSERT(list[2].GetType() == Variant::StringType); - ASSERT(list[4].GetType() == Variant::UnsignedType); - ASSERT(list[5].GetType() == Variant::MapType); - ASSERT(list[6].GetType() == Variant::FloatType); - - ASSERT(list.Index("two") == 2); - ASSERT(list.Index("not here") == list.Size()); - - VariantRef listref = list; - ASSERT(listref.Index("two") == 2); - ASSERT(listref.Index("not here") == listref.Size()); - - try { - map.Index("abc"); - abort(); - } catch (const std::runtime_error &) {} - - try { - map.AsBool(); - abort(); - } catch (const std::runtime_error &) {} - try { - map.AsInt(); - abort(); - } catch (const std::runtime_error &) {} - try { - map.AsUnsigned(); - abort(); - } catch (const std::runtime_error &) {} - try { - map.AsLongDouble(); - abort(); - } catch (const std::runtime_error &) {} - try { - map.AsString(); - abort(); - } catch (const std::runtime_error &) {} - try { - map.AsBlob(); - abort(); - } catch (const std::runtime_error &) {} - try { - map.AsList(); - abort(); - } catch (const std::runtime_error &) {} - try { - map[1]; - abort(); - } catch (const std::runtime_error &) {} - try { - list.AsMap(); - abort(); - } catch (const std::runtime_error &) {} - try { - list["test"]; - abort(); - } catch (const std::runtime_error &) {} - try { - b.Size(); - abort(); - } catch (const std::runtime_error &) {} - ASSERT(b.IsBool()); - try { - b.Empty(); - abort(); - } catch (const std::runtime_error &) {} - try { - b.Erase("abc"); - abort(); - } catch (const std::runtime_error &) {} - try { - b.At("abc"); - abort(); - } catch (const std::runtime_error &) {} - try { - b.At(1); - abort(); - } catch (const std::runtime_error &) {} - try { - b.Get("abc"); - abort(); - } catch (const std::runtime_error &) {} - try { - b.Get(1); - abort(); - } catch (const std::runtime_error &) {} - try { - list.AtPath("[0][1]").As(); - abort(); - } catch (const std::runtime_error &) {} - try { - b.Set("abc", 1); - abort(); - } catch (const std::runtime_error &) {} - try { - b.Set(1, 1); - abort(); - } catch (const std::runtime_error &) {} - - b.Clear(); - ASSERT(b.IsNull()); - ASSERT(!b.Contains(123)); - ASSERT(!b.Contains("abc")); - ASSERT(b.AsBool() == false); - ASSERT(b.AsInt() == 0); - ASSERT(b.AsUnsigned() == 0); - ASSERT(b.AsLongDouble() == 0.0); - ASSERT(b.AsString() == ""); - ASSERT(b.Empty()); - ASSERT(b.Size() == 0); - b.Clear(); - b.Erase("abc"); - b.AsMap(); - ASSERT(b.IsMap()); - b.Clear(); - ASSERT(Variant(true).AsString() == "true"); - ASSERT(Variant(false).AsString() == "false"); - ASSERT(Variant(true).AsInt() == 1); - ASSERT(Variant(false).AsInt() == 0); - ASSERT(Variant(true).AsUnsigned() == 1); - ASSERT(Variant(false).AsUnsigned() == 0); - ASSERT(Variant(true).AsLongDouble() == 1.); - ASSERT(Variant(false).AsLongDouble() == 0.); - ASSERT(Variant(false) != Variant()); - ASSERT(Variant(123u).AsBool()); - ASSERT(Variant(123.456).AsUnsigned() == 123u); - ASSERT(Variant(123.456).AsInt() == 123); - ASSERT(Variant(123.456).AsBool() == true); - ASSERT(Variant(0.0).AsBool() == false); - ASSERT(Variant("true").AsBool() == true); - ASSERT(Variant("anything").AsBool() == true); - ASSERT(Variant("false").AsBool() == false); - ASSERT(Variant("555.5").AsLongDouble() == 555.5); - ASSERT(Variant("123").AsUnsigned() == 123u); - ASSERT(Variant("123").AsInt() == 123); - ASSERT(Variant("").Empty()); - ASSERT(!Variant("abc").Empty()); - b = "abc"; - b.Clear(); - ASSERT(b.Empty()); - - cout << "Some simple path testing\n"; - - ASSERT(map.GetPath("/") == map); - ASSERT(map.GetPath("/one") == v); - ASSERT(list.GetPath("[5]/two") == "two"); - - cout << "Testing that the proxy works as expected.\n"; - list[1] = map["one"]; - VariantRef ref = map["three"]; - ref = 3; - ASSERT(map["three"].AsInt() == 3); - - VariantRef ref2 = map["nothing"]; - ref2 = 4; - map.Erase("nothing"); - try { - ref2.AsUnsigned(); - abort(); - } catch (const std::runtime_error &) {} - - try { - map["four"].IsNull(); - ASSERT(false); - } catch (const KeyError &e) {} - ASSERT(!map.Contains("four")); - ASSERT(map.AsMap().find("four") == map.MapEnd()); - - try { - Variant tmp; - tmp = map["four"]; - SerializeJSON(stdout, map); - ASSERT(false); - } catch (const KeyError &e) {} - ASSERT(!map.Contains("four")); - ASSERT(map.AsMap().find("four") == map.MapEnd()); - - try { - Variant tmp = map["four"]; - SerializeJSON(stdout, map); - ASSERT(false); - } catch (const KeyError &e) {} - ASSERT(!map.Contains("four")); - ASSERT(map.AsMap().find("four") == map.MapEnd()); - - cout << "Testing vector constructor\n"; - std::vector intvec; - intvec.push_back(1); - intvec.push_back(2); - intvec.push_back(3); - intvec.push_back(4); - Variant v2 = intvec; - ASSERT(intvec == variant_cast< std::vector >(v2)); - - std::vector< std::complex< float > > complexvec; - complexvec.push_back(std::complex(1, 3)); - complexvec.push_back(std::complex(0, 2)); - complexvec.push_back(std::complex(10, 0)); - complexvec.push_back(std::complex(4, 0)); - Variant complexvec1 = Variant() - .Append(Variant().Set("real", 1).Set("imag", 3)) - .Append(Variant().Set("imag", 2)) - .Append(Variant().Set("real", 10)) - .Append(4); - ASSERT(complexvec == variant_cast< std::vector< std::complex > >(complexvec1)); - Variant complexvec2 = Variant() - .Append(Variant().Append(1).Append(3)) - .Append(Variant().Append(0).Append(2)) - .Append(10) - .Append(Variant().Append(4)); - std::vector< std::complex< float > > complexvec4 = variant_cast< std::vector< std::complex > >(complexvec2); - ASSERT(complexvec == complexvec4); - - cout << "Testing map constructor\n"; - std::map intmap; - intmap["key1"] = 1; - intmap["key2"] = 2; - v2.Append(intmap); - ASSERT( (intmap == variant_cast< std::map >(v2[4])) ); - ASSERT(variant_cast(v2[1]) == 2); - std::vector intvec2(4); - transform(v2.ListBegin(), v2.ListEnd() - 1, intvec2.begin(), variant_cast); - ASSERT(intvec2 == intvec); - ASSERT(v2 == variant_cast(v2)); - - VariantPrint(v2); - // Test a case where proxy had a dangling reference on resize. - for (unsigned i = v2.Size(), end = v2.AsList().capacity()*2; i < end; ++i) { - v2[i] = v2[i-1]; - } - - cout << "Test Get and GetInto\n"; - int ival; - map.GetInto(ival, "one", 0); - ASSERT(ival == v.AsInt()); - ASSERT(map.Get("three").AsUnsigned() == 3); - map["intmap"] = intmap; - ival = 0; - map["intmap"].GetInto(ival, "key1", 0); - ASSERT(ival == 1); - try { - map["none"].GetInto(ival, "blah", 0); - ASSERT(false); - } catch (const KeyError &e) {} - - // list == [ 1, 5, "two", null, 123, { "intmap": { "key1": 1, "key2": 2 }, "one": 5, "two": "two", "three": 3 }, 0.3535566 ] - ASSERT(list == Variant().Append(1).Append(5).Append("two").Append(Variant::NullType) - .Append(123u).Append( - Variant().Set("intmap", Variant().Set("key1", 1).Set("key2", 2)) - .Set("one", 5).Set("two", "two").Set("three", 3) - ).Append(0.3535566) - ); - - list.Clear(); - ASSERT(list.Empty()); - ASSERT(list.Size() == 0); - ASSERT(list.Get(2, 123) == 123); - ASSERT(list.At(2, 123) == 123); - ASSERT(list.Get(2) == 123); - list.Set(2, 345); - ASSERT(list.Get(2) == 345); -} - -void TestCopy() { - cout << "Testing Copy\n"; - Variant v1; - v1.SetPath("foo/bar", 3); - v1.SetPath("list[0]", "abc"); - Variant v2 = v1; - ASSERT(v1 == v2); - v2 = v1.Copy(); - v2.SetPath("foo/goo", 4); - ASSERT(v1 != v2); - v2 = v1.Copy(); - v2.SetPath("list[1]", 123); - ASSERT(v1 != v2); -} - -void TestRefReassign() { - cout << "Testing VariantRef reassign\n"; - - Variant v1; - v1.SetPath("a/b/c", 1) - .SetPath("a/b/d", 2) - .SetPath("a/d", 4); - VariantRef ref = v1["a"]["b"]["c"]; - ASSERT(ref == 1); - ref.ReassignRef(v1.AtPath("a/b/d")); - ASSERT(ref == 2); - ref = 5; - ASSERT(v1.GetPath("a/b/c") == 1); - ASSERT(v1.GetPath("a/b/d") == 5); - - VariantRef ref1 = v1.AtPath("foo/bar"); - VariantRef ref2 = v1.AtPath("foo").AtPath("bar"); - VariantPrint(v1); - ASSERT(!v1.HasPath("foo")); - ASSERT(!v1.HasPath("foo/bar")); - -} - -void TestProxy() { - Variant v = Variant().Set("abc", 123).Set("def", 0.456); - // Error cases - try { - v["none"].GetType(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].AsBool(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].AsLongDouble(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].AsUnsigned(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].AsInt(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].AsString(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].AsBlob(); - abort(); - } catch (const std::runtime_error &) {} - try { - ((const Variant &)v["none"]).AsList(); - abort(); - } catch (const std::runtime_error &) {} - try { - ((const Variant &)v["none"]).AsMap(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Size(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Empty(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Clear(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Contains(1); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Contains("1"); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Erase("1"); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Add(1); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Sub(1); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Mul(1); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Div(1); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Rem(1); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Incr(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Decr(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Neg(); - abort(); - } catch (const std::runtime_error &) {} - try { - v["none"].Compare("abc"); - abort(); - } catch (const std::runtime_error &) {} - - std::map map; - map["abc"] = 123; - std::vector list; - list.push_back(123); - v["map"] = map; - v["list"] = list; - - v["abc"].GetType(); - v["abc"].AsBool(); - v["abc"].AsLongDouble(); - v["abc"].AsInt(); - v["abc"].AsUnsigned(); - v["map"].AsMap(); - v["list"].AsList(); - v["map"].Size(); - v["map"].Empty(); - v["map"].Clear(); - v["map"].Contains("abc"); - v["list"].Contains(1); - v["map"].Erase("foo"); - v["n"] = 0; - v["n"]++; - v["n"]--; - v["n"] + 1; - v["n"] - 1; - v["n"] * 1; - v["n"] / 1; - v["n"] % 1; - -v["n"]; - - VariantRef ref = v["n"].Ref(); - ASSERT(ref == v["n"]); - ASSERT(v["map"].Copy() == v["map"]); - ASSERT(ref.Resolve() == v["n"]); - - ASSERT(ref.As() == v["n"].As()); - - Variant v_copy = v.Copy(); - try { - v.AtPath("/some/path/string").As(); - abort(); - } catch (const KeyError &) {} - try { - v_copy["some"]["path"]["string"].As(); - abort(); - } catch (const KeyError &) {} - try { - const VariantRef const_ref = v_copy["does not exist"]; - const_ref.Resolve(); - abort(); - } catch (const KeyError &) {} - ASSERT(v_copy == v); - - VariantRef p = v["p"].Ref(); - v["p"] = 123; - ASSERT(p == 123); - - try { - v.GetPath("/some/path/string"); - abort(); - } catch (const KeyError &) {} - ASSERT(v.AtPath("/some/path/string", "value") == "value"); - v.AtPath("/some/other/path") = 123; - ASSERT(v.GetPath("/some/other/path") == 123); - VariantRef ref_copy = v_copy.AtPath("/some/path/string"); - ref_copy.Resolve() = "value"; - ASSERT(v_copy.AtPath("/some/path/string") == "value"); - - v.AtPath("/one/two/three").Resolve(123); - v.AtPath("/some/path/string").Resolve(123); - ASSERT(v.GetPath("/one/two/three") == 123); - ASSERT(v.GetPath("/some/path/string") == "value"); - v.ErasePath("/one/two/three", true); - v.ErasePath("p"); - v.ErasePath("some/other/path", true); - v.ErasePath("/some/path/string"); - v_copy.ErasePath("/some/path/string"); - ASSERT(v == v_copy); - ASSERT(v.HasPath("some/path")); - v.SetPath("list[1]/a", 123); - v.ErasePath("list[1]/a", true); - ASSERT(v == v_copy); - -} - -void VariantTestJSONParsing() { - std::cout << "Testing JSON -> Variant parsing\n"; - Variant v; - Variant param; - param["pretty"] = true; - Emitter emitter = JSONEmitter(CreateEmitterOutput(std::cout.rdbuf()), param); - std::string text = "[1,2,3,4,{\"A\":2}, \"text\"]"; - text += "[\"doodle\", \"foo\", \"bar\", \"\\b\\f\\r\\u0001\\u1111\", true, false]"; - std::istringstream iss(text); - Parser jv = JSONParser(CreateParserInputFile(iss.rdbuf())); - v = ParseVariant(jv); - emitter << v; - v = v; - ASSERT(v.IsList()); - ASSERT(v[4].IsMap()); - ASSERT(v[5].IsString()); - ASSERT(v[4]["A"].IsNumber()); - v[4]["b"]; - ASSERT(!v[4].Contains("b")); - v[10]; - ASSERT(!v.Contains(10)); - const Variant cv = v; - ASSERT(cv.IsList()); - ASSERT(cv[4].IsMap()); - ASSERT(cv[5].IsString()); - ASSERT(cv[4]["A"].IsNumber()); - ASSERT(!cv[4].Contains("b")); - try { - cv[10]; - ASSERT(false); - } catch (const std::out_of_range&) { - - } - v = v[4]; - v = "\n"; - - jv.Reset(); - v = ParseVariant(jv); - ASSERT(jv.Done()); - ASSERT(v[1].AsString() == "foo"); - - emitter.Flush(); - std::cout << std::endl; - // Test that really big indents work... - Serialize(std::cout.rdbuf(), v, SERIALIZE_JSON, Variant().Set("pretty", true).Set("indent", 200)); - std::cout << std::endl; - -} - -void VariantTestYAMLParsing() { - std::cout << "Testing YAML -> Variant parsing\n"; - std::string text = "some: yaml\na key: and a value\n" - "some more: [a, list, 123, values, 1.23, null, true, false]\n" - "max uintmax: 18446744073709551616\n" - "---\n" - "Lets try multiple documents!\n"; - Parser parser = YAMLParser(CreateParserInput(text.c_str(), text.length())); - Variant v1 = ParseVariant(parser); - Variant v2 = ParseVariant(parser); - ASSERT(v1["some"].IsString()); - ASSERT(v1["some more"].IsList()); - ASSERT(v1["some more"].Size() == 8); - ASSERT(v1["some more"][6].IsTrue()); - ASSERT(v1["max uintmax"].AsUnsigned() == std::numeric_limits::max()); - ASSERT(v2.IsString()); -} - -void PrintError(std::vector &stack, const std::string &msg, Variant orig, Variant cur) { - cerr << "Error comparing variants at: "; - for (std::vector::iterator i(stack.begin()), e(stack.end()); i!=e; ++i) { - cerr << i->AsString() << ": "; - } - cerr << "\n\n" << msg; - Emitter emitter = JSONEmitter(CreateEmitterOutput(cerr.rdbuf())); - emitter.BeginMap(); - emitter << "orig" << orig << "cur" << cur; - emitter.EndMap(); - emitter.Close(); - cerr << "\n"; - abort(); -} - -void DoDiff(Variant orig, Variant cur, std::vector &stack) { - if (orig != cur) { - if (orig.GetType() != cur.GetType()) { - PrintError(stack, "differing types", orig, cur); - } - // find the difference and print it out - switch (orig.GetType()) { - case Variant::NullType: - abort(); - case Variant::BoolType: - PrintError(stack, "differing boolean", orig, cur); - abort(); - break; - case Variant::IntegerType: - case Variant::UnsignedType: - case Variant::FloatType: - abort(); - break; - case Variant::StringType: - abort(); - break; - case Variant::ListType: - for (unsigned i = 0; i < orig.Size(); ++i) { - stack.push_back(i); - DoDiff(orig[i], cur[i], stack); - stack.pop_back(); - } - break; - case Variant::MapType: - for (Variant::MapIterator i(orig.MapBegin()), e(orig.MapEnd()); i!=e; i++) { - stack.push_back(i->first); - DoDiff(i->second, cur[i->first], stack); - stack.pop_back(); - } - break; - case Variant::BlobType: - abort(); - break; - } - PrintError(stack, "Comparison showed different but cannot find difference", orig, cur); - } -} - -void Diff(Variant orig, Variant cur) { - std::vector stack; - DoDiff(orig, cur, stack); -} - -void TestVariantEmitParseRandom(int verbose, int numtests, Parser (*Parser_t)(shared_ptr), Emitter (*Emitter_t)(shared_ptr, Variant), bool allow_nan) { - for (int i = 0; i < numtests; ++i) { - if (verbose > 0) { - std::cout << "Random test number " << i << std::endl; - } - Variant v = GenerateRandomVariant(allow_nan); - ASSERT(!v.IsNull()); - std::stringstream ss; - Emitter emitter = Emitter_t(CreateEmitterOutput(ss.rdbuf()), Variant()); - emitter << v; - emitter.Close(); - if (verbose > 1) { - std::cout << ss.str() << std::endl; - } - Parser parser = Parser_t(CreateParserInputFile(ss.rdbuf())); - Variant v2 = ParseVariant(parser); - Diff(v, v2); - if (verbose > 0) { - std::cout << "End random test number " << i << std::endl; - } - } -} - -int main(int argv, char** argc) { - VariantTest(); - TestCopy(); - TestRefReassign(); - TestProxy(); - VariantTestJSONParsing(); -#ifdef ENABLE_YAML - VariantTestYAMLParsing(); -#endif - int verbose = 1; - int num_tests = 100; - - cout << "Random test of JSON\n"; - TestVariantEmitParseRandom(verbose, num_tests, JSONParser, JSONEmitter, false); -#ifdef ENABLE_YAML - cout << "Random test of YAML\n"; - TestVariantEmitParseRandom(verbose, num_tests, YAMLParser, YAMLEmitter, true); -#endif -#ifdef ENABLE_XML - cout << "Random test of XML\n"; - TestVariantEmitParseRandom(verbose, num_tests, XMLPLISTParser, XMLPLISTEmitter, true); -#endif -#ifdef ENABLE_MSGPACK - cout << "Random test of MsgPack\n"; - TestVariantEmitParseRandom(verbose, num_tests, MsgPackParser, MsgPackEmitter, true); -#endif - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_xml_parser.cc b/src/hos_libvariant/src/libvariant/test/test_xml_parser.cc deleted file mode 100644 index 839c2e7b..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_xml_parser.cc +++ /dev/null @@ -1,32 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include -#include "../../libvariant/include/Variant/Variant.h" -#include "../../libvariant/test/TestAssert.h" - -using namespace libvariant; -using namespace std; - -const char *test_xml = -"\n" -" \n" -"\n\n" -" some value with spaces \n" -"\n\n\n" -"\n" -"\tSome formated\n" -"\tstring with strange stuff in it...\n" -"\n" -"\n" -"\n"; - -int main(int argc, char **argv) { - Variant v = DeserializeXMLPLIST(test_xml); - SerializeJSON(cout.rdbuf(), v, true); - cout << endl; - Variant v2 = DeserializeXMLPLIST(SerializeXMLPLIST(v, true)); - ASSERT(v2 == v); - return 0; -} diff --git a/src/hos_libvariant/src/libvariant/test/test_yaml_parser.cc b/src/hos_libvariant/src/libvariant/test/test_yaml_parser.cc deleted file mode 100644 index a5735530..00000000 --- a/src/hos_libvariant/src/libvariant/test/test_yaml_parser.cc +++ /dev/null @@ -1,64 +0,0 @@ -/** \file - * \author John Bridgman - * \brief - */ -#include -#include -#include "../../libvariant/include/Variant/Parser.h" -#include "../../libvariant/src/EventBuffer.h" -#include "../../libvariant/test/TestCommon.h" - -using namespace libvariant; - -static const char *input_document = "---\n" -"string: value\n" -"int10: 1234\n" -"int8: 0o234\n" -"int16: 0x2F\n" -"float: [ 0.1, .12, 1.0e-2 ]\n" -"nan: .nan\n" -"inf: .inf\n" -"strnum: '12345'\n" -"...\n"; - -void ExpectedEvents(Emitter e) { - e.BeginDocument(); - e.BeginMap(); - e.Emit("string"); - e.Emit("value"); - e.Emit("int10"); - e.Emit(intmax_t(1234ll)); - e.Emit("int8"); - e.Emit(uintmax_t(0234ll)); - e.Emit("int16"); - e.Emit(uintmax_t(0x2Fll)); - e.Emit("float"); - e.BeginList(); - e.Emit(0.1); - e.Emit(.12); - e.Emit(1.0e-2); - e.EndList(); - e.Emit("nan"), - e.Emit(std::numeric_limits::quiet_NaN()), - e.Emit("inf"), - e.Emit(std::numeric_limits::infinity()), - e.Emit("strnum"), - e.Emit("12345"), - e.EndMap(); - e.EndDocument(); -} - - -int main(int argc, char **argv) { - Parser parser = YAMLParser(CreateParserInput(input_document)); - shared_ptr expected(new EventBuffer); - ExpectedEvents(Emitter(expected)); - shared_ptr result(new EventBuffer); - - result->Fill(parser); - - if (!ErrorCheckEventBuffer(expected, result)) { - return 1; - } - return 0; -}